+
-
-
diff --git a/web/src/components/charts/index.vue b/web/src/components/charts/index.vue
index 4ea5a75d17..089543482b 100644
--- a/web/src/components/charts/index.vue
+++ b/web/src/components/charts/index.vue
@@ -14,43 +14,41 @@
/>
-
diff --git a/web/src/components/commandMenu/index.vue b/web/src/components/commandMenu/index.vue
index a36d174d20..3d3b72395b 100644
--- a/web/src/components/commandMenu/index.vue
+++ b/web/src/components/commandMenu/index.vue
@@ -10,20 +10,16 @@
v-model="searchInput"
class="quick-input"
placeholder="请输入你需要快捷到达的功能"
- >
+ />
-
-
{{ option.label }}
+
+
+ {{ option.label }}
+
@@ -40,158 +36,164 @@
diff --git a/web/src/components/customPic/index.vue b/web/src/components/customPic/index.vue
index 63743d535d..6a265dee4c 100644
--- a/web/src/components/customPic/index.vue
+++ b/web/src/components/customPic/index.vue
@@ -1,28 +1,12 @@
-
+
- ![]()
- ![]()
+ ![]()
+ ![]()
diff --git a/web/src/components/exportExcel/exportExcel.vue b/web/src/components/exportExcel/exportExcel.vue
index 26ceb18757..bad794f357 100644
--- a/web/src/components/exportExcel/exportExcel.vue
+++ b/web/src/components/exportExcel/exportExcel.vue
@@ -1,58 +1,59 @@
- 导出
+ 导出
diff --git a/web/src/components/exportExcel/exportTemplate.vue b/web/src/components/exportExcel/exportTemplate.vue
index 9e099ebaed..a548265ea4 100644
--- a/web/src/components/exportExcel/exportTemplate.vue
+++ b/web/src/components/exportExcel/exportTemplate.vue
@@ -1,28 +1,26 @@
- 下载模板
+ 下载模板
diff --git a/web/src/components/exportExcel/importExcel.vue b/web/src/components/exportExcel/importExcel.vue
index 2f6f28d305..80bbc98c1e 100644
--- a/web/src/components/exportExcel/importExcel.vue
+++ b/web/src/components/exportExcel/importExcel.vue
@@ -5,38 +5,32 @@
:on-success="handleSuccess"
:multiple="false"
>
-
- 导入
-
+ 导入
diff --git a/web/src/components/office/docx.vue b/web/src/components/office/docx.vue
index 35e3e5a5a7..e607d0bc54 100644
--- a/web/src/components/office/docx.vue
+++ b/web/src/components/office/docx.vue
@@ -1,35 +1,31 @@
-
-
+
+ ![图片]()
+ ![图片]()
+
- 上传文件
-
+ 上传文件
-
diff --git a/web/src/components/selectImage/selectComponent.vue b/web/src/components/selectImage/selectComponent.vue
index 1ff6e04cfc..6124531d1d 100644
--- a/web/src/components/selectImage/selectComponent.vue
+++ b/web/src/components/selectImage/selectComponent.vue
@@ -15,10 +15,15 @@
muted
preload="metadata"
>
-
+
-
+
diff --git a/web/src/components/richtext/rich-view.vue b/web/src/components/richtext/rich-view.vue
index 2e84ed5dc2..b1de744f2d 100644
--- a/web/src/components/richtext/rich-view.vue
+++ b/web/src/components/richtext/rich-view.vue
@@ -11,48 +11,48 @@
-
+
diff --git a/web/src/components/selectFile/selectFile.vue b/web/src/components/selectFile/selectFile.vue
index c7ae4afedf..e662f78d93 100644
--- a/web/src/components/selectFile/selectFile.vue
+++ b/web/src/components/selectFile/selectFile.vue
@@ -12,76 +12,70 @@
:accept="accept"
class="upload-btn"
>
-
-
diff --git a/web/src/components/office/pdf.vue b/web/src/components/office/pdf.vue
index 8098f06ff8..2ca4363a59 100644
--- a/web/src/components/office/pdf.vue
+++ b/web/src/components/office/pdf.vue
@@ -1,36 +1,39 @@
+
-
diff --git a/web/src/components/selectImage/selectImage.vue b/web/src/components/selectImage/selectImage.vue
index 0ca5ce72ed..3be279db0d 100644
--- a/web/src/components/selectImage/selectImage.vue
+++ b/web/src/components/selectImage/selectImage.vue
@@ -1,96 +1,80 @@
+
-
+
-
+
查询
-
-
diff --git a/web/src/components/warningBar/warningBar.vue b/web/src/components/warningBar/warningBar.vue
index 4fac6c0b9f..9d018812ff 100644
--- a/web/src/components/warningBar/warningBar.vue
+++ b/web/src/components/warningBar/warningBar.vue
@@ -1,7 +1,7 @@
@@ -13,21 +13,21 @@
diff --git a/web/src/core/config.js b/web/src/core/config.js
index 582ac01f23..847b68dc9b 100644
--- a/web/src/core/config.js
+++ b/web/src/core/config.js
@@ -1,30 +1,52 @@
/**
* 网站配置文件
*/
-const greenText = (text) => `\x1b[32m${text}\x1b[0m`;
+const greenText = (text) => `\x1b[32m${text}\x1b[0m`
const config = {
appName: 'Gin-Vue-Admin',
appLogo: 'logo.png',
showViteLogo: true,
- logs: [],
+ logs: []
}
export const viteLogo = (env) => {
if (config.showViteLogo) {
- console.log(greenText(`> 欢迎使用Gin-Vue-Admin，开源地址：https://github.com/flipped-aurora/gin-vue-admin`));
- console.log(greenText(`> 当前版本:v2.7.7`));
- console.log(greenText(`> 加群方式:微信：shouzi_1994 QQ群：470239250`));
- console.log(greenText(`> 项目地址：https://github.com/flipped-aurora/gin-vue-admin`));
- console.log(greenText(`> 插件市场:https://plugin.gin-vue-admin.com`));
- console.log(greenText(`> GVA讨论社区:https://support.qq.com/products/371961`));
- console.log(greenText(`> 默认自动化文档地址:http://127.0.0.1:${env.VITE_SERVER_PORT}/swagger/index.html`));
- console.log(greenText(`> 默认前端文件运行地址:http://127.0.0.1:${env.VITE_CLI_PORT}`));
- console.log(greenText(`--------------------------------------版权声明--------------------------------------`));
- console.log(greenText(`** 版权所有方：flipped-aurora开源团队 **`));
- console.log(greenText(`** 版权持有公司：北京翻转极光科技有限责任公司 **`));
- console.log(greenText(`** 剔除授权标识需购买商用授权：https://gin-vue-admin.com/empower/index.html **`));
- console.log('\n');
+ console.log(
+ greenText(
+ `> 欢迎使用Gin-Vue-Admin，开源地址：https://github.com/flipped-aurora/gin-vue-admin`
+ )
+ )
+ console.log(greenText(`> 当前版本:v2.7.7`))
+ console.log(greenText(`> 加群方式:微信：shouzi_1994 QQ群：470239250`))
+ console.log(
+ greenText(`> 项目地址：https://github.com/flipped-aurora/gin-vue-admin`)
+ )
+ console.log(greenText(`> 插件市场:https://plugin.gin-vue-admin.com`))
+ console.log(
+ greenText(`> GVA讨论社区:https://support.qq.com/products/371961`)
+ )
+ console.log(
+ greenText(
+ `> 默认自动化文档地址:http://127.0.0.1:${env.VITE_SERVER_PORT}/swagger/index.html`
+ )
+ )
+ console.log(
+ greenText(`> 默认前端文件运行地址:http://127.0.0.1:${env.VITE_CLI_PORT}`)
+ )
+ console.log(
+ greenText(
+ `--------------------------------------版权声明--------------------------------------`
+ )
+ )
+ console.log(greenText(`** 版权所有方：flipped-aurora开源团队 **`))
+ console.log(greenText(`** 版权持有公司：北京翻转极光科技有限责任公司 **`))
+ console.log(
+ greenText(
+ `** 剔除授权标识需购买商用授权：https://gin-vue-admin.com/empower/index.html **`
+ )
+ )
+ console.log('\n')
}
}
diff --git a/web/src/core/global.js b/web/src/core/global.js
index 2ef1ffef43..b402b7053c 100644
--- a/web/src/core/global.js
+++ b/web/src/core/global.js
@@ -10,21 +10,26 @@ const createIconComponent = (name) => ({
name: 'SvgIcon',
render() {
return h(svgIcon, {
- name: name,
+ name: name
})
- },
+ }
})
-const registerIcons = async(app) => {
+const registerIcons = async (app) => {
const iconModules = import.meta.glob('@/assets/icons/**/*.svg') // 系统目录 svg 图标
- const pluginIconModules = import.meta.glob('@/plugin/**/assets/icons/**/*.svg') // 插件目录 svg 图标
- const mergedIconModules = Object.assign({}, iconModules, pluginIconModules); // 合并所有 svg 图标
+ const pluginIconModules = import.meta.glob(
+ '@/plugin/**/assets/icons/**/*.svg'
+ ) // 插件目录 svg 图标
+ const mergedIconModules = Object.assign({}, iconModules, pluginIconModules) // 合并所有 svg 图标
for (const path in mergedIconModules) {
- let pluginName = ""
- if (path.startsWith("/src/plugin/")) {
+ let pluginName = ''
+ if (path.startsWith('/src/plugin/')) {
pluginName = `${path.split('/')[3]}-`
}
- const iconName = path.split('/').pop().replace(/\.svg$/, '')
+ const iconName = path
+ .split('/')
+ .pop()
+ .replace(/\.svg$/, '')
// 如果iconName带空格则不加入到图标库中并且提示名称不合法
if (iconName.indexOf(' ') !== -1) {
console.error(`icon ${iconName}.svg includes whitespace in ${path}`)
@@ -32,11 +37,12 @@ const registerIcons = async(app) => {
}
const key = `${pluginName}${iconName}`
// 开发模式下列出所有 svg 图标，方便开发者直接查找复制使用
- import.meta.env.MODE == 'development' && console.log(`svg-icon-component: <${key} />`)
+ import.meta.env.MODE == 'development' &&
+ console.log(`svg-icon-component: <${key} />`)
const iconComponent = createIconComponent(key)
config.logs.push({
- 'key': key,
- 'label': key,
+ key: key,
+ label: key
})
app.component(key, iconComponent)
}
diff --git a/web/src/directive/auth.js b/web/src/directive/auth.js
index 50594d45fd..d2b9b6a8f9 100644
--- a/web/src/directive/auth.js
+++ b/web/src/directive/auth.js
@@ -5,7 +5,7 @@ export default {
const userStore = useUserStore()
app.directive('auth', {
// 当被绑定的元素插入到 DOM 中时……
- mounted: function(el, binding) {
+ mounted: function (el, binding) {
const userInfo = userStore.userInfo
let type = ''
switch (Object.prototype.toString.call(binding.value)) {
@@ -27,7 +27,7 @@ export default {
return
}
const waitUse = binding.value.toString().split(',')
- let flag = waitUse.some(item => Number(item) === userInfo.authorityId)
+ let flag = waitUse.some((item) => Number(item) === userInfo.authorityId)
if (binding.modifiers.not) {
flag = !flag
}
@@ -38,4 +38,3 @@ export default {
})
}
}
-
diff --git a/web/src/hooks/charts.js b/web/src/hooks/charts.js
index e7a14b1b0a..9f03b0e6a4 100644
--- a/web/src/hooks/charts.js
+++ b/web/src/hooks/charts.js
@@ -1,19 +1,18 @@
// 本组件参考 arco-pro 的实现
// https://github.com/arco-design/arco-design-pro-vue/blob/main/arco-design-pro-vite/src/hooks/chart-option.ts
-import { computed } from 'vue';
-import { useAppStore } from '@/pinia';
-
+import { computed } from 'vue'
+import { useAppStore } from '@/pinia'
export default function useChartOption(sourceOption) {
- const appStore = useAppStore();
+ const appStore = useAppStore()
const isDark = computed(() => {
- return appStore.theme === 'dark';
- });
+ return appStore.theme === 'dark'
+ })
const chartOption = computed(() => {
- return sourceOption(isDark.value);
- });
+ return sourceOption(isDark.value)
+ })
return {
- chartOption,
- };
+ chartOption
+ }
}
diff --git a/web/src/hooks/responsive.js b/web/src/hooks/responsive.js
index 417c1f9992..e324c1688b 100644
--- a/web/src/hooks/responsive.js
+++ b/web/src/hooks/responsive.js
@@ -1,35 +1,35 @@
// 本组件参考 arco-pro 的实现
// https://github.com/arco-design/arco-design-pro-vue/blob/main/arco-design-pro-vite/src/hooks/responsive.ts
-import { onMounted, onBeforeMount, onBeforeUnmount } from 'vue';
-import { useDebounceFn } from '@vueuse/core';
-import { useAppStore } from '@/pinia';
-import { addEventListen, removeEventListen } from '@/utils/event';
+import { onMounted, onBeforeMount, onBeforeUnmount } from 'vue'
+import { useDebounceFn } from '@vueuse/core'
+import { useAppStore } from '@/pinia'
+import { addEventListen, removeEventListen } from '@/utils/event'
-const WIDTH = 992;
+const WIDTH = 992
function queryDevice() {
- const rect = document.body.getBoundingClientRect();
- return rect.width - 1 < WIDTH;
+ const rect = document.body.getBoundingClientRect()
+ return rect.width - 1 < WIDTH
}
export default function useResponsive(immediate) {
- const appStore = useAppStore();
- function resizeHandler() {
- if (!document.hidden) {
- const isMobile = queryDevice();
- appStore.toggleDevice(isMobile ? 'mobile' : 'desktop');
- // appStore.toggleDevice(isMobile);
- }
+ const appStore = useAppStore()
+ function resizeHandler() {
+ if (!document.hidden) {
+ const isMobile = queryDevice()
+ appStore.toggleDevice(isMobile ? 'mobile' : 'desktop')
+ // appStore.toggleDevice(isMobile);
}
- const debounceFn = useDebounceFn(resizeHandler, 100);
- onMounted(() => {
- if (immediate) debounceFn();
- });
- onBeforeMount(() => {
- addEventListen(window, 'resize', debounceFn);
- });
- onBeforeUnmount(() => {
- removeEventListen(window, 'resize', debounceFn);
- });
+ }
+ const debounceFn = useDebounceFn(resizeHandler, 100)
+ onMounted(() => {
+ if (immediate) debounceFn()
+ })
+ onBeforeMount(() => {
+ addEventListen(window, 'resize', debounceFn)
+ })
+ onBeforeUnmount(() => {
+ removeEventListen(window, 'resize', debounceFn)
+ })
}
diff --git a/web/src/hooks/use-windows-resize.js b/web/src/hooks/use-windows-resize.js
index 4ddf3f0fbf..a3e1490ef9 100644
--- a/web/src/hooks/use-windows-resize.js
+++ b/web/src/hooks/use-windows-resize.js
@@ -18,6 +18,6 @@ export const useWindowResize = (cb) => {
useEventListener('resize', onResize, { passive: true })
return {
width,
- height,
+ height
}
}
diff --git a/web/src/main.js b/web/src/main.js
index 8f43f06ada..9bb4f47a0b 100644
--- a/web/src/main.js
+++ b/web/src/main.js
@@ -19,11 +19,5 @@ import 'default-passive-events'
const app = createApp(App)
app.config.productionTip = false
-app
- .use(run)
- .use(ElementPlus)
- .use(store)
- .use(auth)
- .use(router)
- .mount('#app')
+app.use(run).use(ElementPlus).use(store).use(auth).use(router).mount('#app')
export default app
diff --git a/web/src/pathInfo.json b/web/src/pathInfo.json
index e08798c046..889d02a33f 100644
--- a/web/src/pathInfo.json
+++ b/web/src/pathInfo.json
@@ -64,4 +64,4 @@
"/src/plugin/announcement/form/info.vue": "InfoForm",
"/src/plugin/announcement/view/info.vue": "Info",
"/src/plugin/email/view/index.vue": "Email"
-}
\ No newline at end of file
+}
diff --git a/web/src/permission.js b/web/src/permission.js
index b0c39af513..70c21bee89 100644
--- a/web/src/permission.js
+++ b/web/src/permission.js
@@ -8,26 +8,25 @@ Nprogress.configure({ showSpinner: false, ease: 'ease', speed: 500 })
const whiteList = ['Login', 'Init']
-const getRouter = async(userStore) => {
+const getRouter = async (userStore) => {
const routerStore = useRouterStore()
await routerStore.SetAsyncRouter()
await userStore.GetUserInfo()
const asyncRouters = routerStore.asyncRouters
- asyncRouters.forEach(asyncRouter => {
+ asyncRouters.forEach((asyncRouter) => {
router.addRoute(asyncRouter)
})
}
const removeLoading = () => {
- const element = document.getElementById('gva-loading-box');
+ const element = document.getElementById('gva-loading-box')
if (element) {
- element.remove();
+ element.remove()
}
}
-
async function handleKeepAlive(to) {
- if (to.matched.some(item => item.meta.keepAlive)) {
+ if (to.matched.some((item) => item.meta.keepAlive)) {
if (to.matched && to.matched.length > 2) {
for (let i = 1; i < to.matched.length; i++) {
const element = to.matched[i - 1]
@@ -45,7 +44,7 @@ async function handleKeepAlive(to) {
}
}
-router.beforeEach(async(to, from) => {
+router.beforeEach(async (to, from) => {
const routerStore = useRouterStore()
Nprogress.start()
const userStore = useUserStore()
@@ -54,7 +53,7 @@ router.beforeEach(async(to, from) => {
const token = userStore.token
// 在白名单中的判断情况
document.title = getPageTitle(to.meta.title, to)
- if(to.meta.client) {
+ if (to.meta.client) {
return true
}
if (whiteList.indexOf(to.name) > -1) {
@@ -85,9 +84,9 @@ router.beforeEach(async(to, from) => {
} else {
// 不在白名单中并且已经登录的时候
if (token) {
- if(sessionStorage.getItem("needToHome") === 'true') {
- sessionStorage.removeItem("needToHome")
- return { path: '/'}
+ if (sessionStorage.getItem('needToHome') === 'true') {
+ sessionStorage.removeItem('needToHome')
+ return { path: '/' }
}
// 添加flag防止多次获取动态路由和栈溢出
if (!routerStore.asyncRouterFlag && whiteList.indexOf(from.name) < 0) {
@@ -124,7 +123,6 @@ router.beforeEach(async(to, from) => {
}
})
-
router.afterEach(() => {
// 路由加载完成后关闭进度条
document.getElementsByClassName('main-cont main-right')[0]?.scrollTo(0, 0)
diff --git a/web/src/pinia/index.js b/web/src/pinia/index.js
index 49c389e99d..85e45e84e9 100644
--- a/web/src/pinia/index.js
+++ b/web/src/pinia/index.js
@@ -5,9 +5,4 @@ import { useDictionaryStore } from '@/pinia/modules/dictionary'
const store = createPinia()
-export {
- store,
- useAppStore,
- useUserStore,
- useDictionaryStore
-}
+export { store, useAppStore, useUserStore, useDictionaryStore }
diff --git a/web/src/pinia/modules/app.js b/web/src/pinia/modules/app.js
index 91e222e721..2a37f4d4d1 100644
--- a/web/src/pinia/modules/app.js
+++ b/web/src/pinia/modules/app.js
@@ -1,58 +1,56 @@
-
import { defineStore } from 'pinia'
import { ref, watchEffect, reactive } from 'vue'
-import { setBodyPrimaryColor } from '@/utils/format'
+import { setBodyPrimaryColor } from '@/utils/format'
export const useAppStore = defineStore('app', () => {
-
- const device = ref("")
+ const device = ref('')
const config = reactive({
weakness: false,
grey: false,
primaryColor: '#3b82f6',
showTabs: true,
darkMode: 'auto',
- layout_side_width : 256,
- layout_side_collapsed_width : 80,
- layout_side_item_height : 48,
+ layout_side_width: 256,
+ layout_side_collapsed_width: 80,
+ layout_side_item_height: 48,
show_watermark: true,
- side_mode : 'normal'
+ side_mode: 'normal'
})
- const theme = ref( 'auto')
+ const theme = ref('auto')
const toggleTheme = (dark) => {
if (dark) {
- theme.value = 'dark';
+ theme.value = 'dark'
} else {
- theme.value = 'light';
+ theme.value = 'light'
}
}
const toggleWeakness = (e) => {
- config.weakness = e;
+ config.weakness = e
}
const toggleGrey = (e) => {
- config.grey = e;
+ config.grey = e
}
const togglePrimaryColor = (e) => {
- config.primaryColor = e;
+ config.primaryColor = e
}
const toggleTabs = (e) => {
- config.showTabs = e;
+ config.showTabs = e
}
const toggleDevice = (e) => {
- device.value = e;
+ device.value = e
}
const toggleDarkMode = (e) => {
config.darkMode = e
}
- const toggleDarkModeAuto = () =>{
+ const toggleDarkModeAuto = () => {
// 处理浏览器主题
const darkQuery = window.matchMedia('(prefers-color-scheme: dark)')
const dark = darkQuery.matches
@@ -63,61 +61,59 @@ export const useAppStore = defineStore('app', () => {
}
const toggleConfigSideWidth = (e) => {
- config.layout_side_width = e;
+ config.layout_side_width = e
}
const toggleConfigSideCollapsedWidth = (e) => {
- config.layout_side_collapsed_width = e;
+ config.layout_side_collapsed_width = e
}
const toggleConfigSideItemHeight = (e) => {
- config.layout_side_item_height = e;
+ config.layout_side_item_height = e
}
const toggleConfigWatermark = (e) => {
- config.show_watermark = e;
+ config.show_watermark = e
}
- const toggleSideModel= (e) =>{
+ const toggleSideModel = (e) => {
config.side_mode = e
}
watchEffect(() => {
if (theme.value === 'dark') {
- document.documentElement.classList.add('dark');
- document.documentElement.classList.remove('light');
+ document.documentElement.classList.add('dark')
+ document.documentElement.classList.remove('light')
} else {
- document.documentElement.classList.add('light');
- document.documentElement.classList.remove('dark');
+ document.documentElement.classList.add('light')
+ document.documentElement.classList.remove('dark')
}
})
watchEffect(() => {
// 色弱模式监听处理
if (config.weakness) {
- document.documentElement.classList.add('html-weakenss');
+ document.documentElement.classList.add('html-weakenss')
} else {
- document.documentElement.classList.remove('html-weakenss');
+ document.documentElement.classList.remove('html-weakenss')
}
})
watchEffect(() => {
// 灰色模式监听处理
if (config.grey) {
- document.documentElement.classList.add('html-grey');
+ document.documentElement.classList.add('html-grey')
} else {
- document.documentElement.classList.remove('html-grey');
+ document.documentElement.classList.remove('html-grey')
}
})
-
-
watchEffect(() => {
- if(config.darkMode === 'auto'){
+ if (config.darkMode === 'auto') {
toggleDarkModeAuto()
}
- if(config.darkMode === 'dark'){
+ if (config.darkMode === 'dark') {
toggleTheme(true)
- }else{
+ } else {
toggleTheme(false)
}
})
@@ -143,5 +139,4 @@ export const useAppStore = defineStore('app', () => {
toggleConfigWatermark,
toggleSideModel
}
-
})
diff --git a/web/src/pinia/modules/dictionary.js b/web/src/pinia/modules/dictionary.js
index cd88f8c728..57a2844970 100644
--- a/web/src/pinia/modules/dictionary.js
+++ b/web/src/pinia/modules/dictionary.js
@@ -10,7 +10,7 @@ export const useDictionaryStore = defineStore('dictionary', () => {
dictionaryMap.value = { ...dictionaryMap.value, ...dictionaryRes }
}
- const getDictionary = async(type) => {
+ const getDictionary = async (type) => {
if (dictionaryMap.value[type] && dictionaryMap.value[type].length) {
return dictionaryMap.value[type]
} else {
@@ -18,13 +18,14 @@ export const useDictionaryStore = defineStore('dictionary', () => {
if (res.code === 0) {
const dictionaryRes = {}
const dict = []
- res.data.resysDictionary.sysDictionaryDetails && res.data.resysDictionary.sysDictionaryDetails.forEach(item => {
- dict.push({
- label: item.label,
- value: item.value,
- extend: item.extend
+ res.data.resysDictionary.sysDictionaryDetails &&
+ res.data.resysDictionary.sysDictionaryDetails.forEach((item) => {
+ dict.push({
+ label: item.label,
+ value: item.value,
+ extend: item.extend
+ })
})
- })
dictionaryRes[res.data.resysDictionary.type] = dict
setDictionaryMap(dictionaryRes)
return dictionaryMap.value[type]
diff --git a/web/src/pinia/modules/router.js b/web/src/pinia/modules/router.js
index a4bb9a45f6..8afd8c3e61 100644
--- a/web/src/pinia/modules/router.js
+++ b/web/src/pinia/modules/router.js
@@ -2,43 +2,48 @@ import { asyncRouterHandle } from '@/utils/asyncRouter'
import { emitter } from '@/utils/bus.js'
import { asyncMenu } from '@/api/menu'
import { defineStore } from 'pinia'
-import { ref,watchEffect } from 'vue'
-import pathInfo from "@/pathInfo.json";
+import { ref, watchEffect } from 'vue'
+import pathInfo from '@/pathInfo.json'
const notLayoutRouterArr = []
const keepAliveRoutersArr = []
const nameMap = {}
const formatRouter = (routes, routeMap, parent) => {
- routes && routes.forEach(item => {
- item.parent = parent
- item.meta.btns = item.btns
- item.meta.hidden = item.hidden
- if (item.meta.defaultMenu === true) {
- if (!parent) {
- item = { ...item, path: `/${item.path}` }
- notLayoutRouterArr.push(item)
+ routes &&
+ routes.forEach((item) => {
+ item.parent = parent
+ item.meta.btns = item.btns
+ item.meta.hidden = item.hidden
+ if (item.meta.defaultMenu === true) {
+ if (!parent) {
+ item = { ...item, path: `/${item.path}` }
+ notLayoutRouterArr.push(item)
+ }
}
- }
- routeMap[item.name] = item
- if (item.children && item.children.length > 0) {
- formatRouter(item.children, routeMap, item)
- }
- })
+ routeMap[item.name] = item
+ if (item.children && item.children.length > 0) {
+ formatRouter(item.children, routeMap, item)
+ }
+ })
}
const KeepAliveFilter = (routes) => {
- routes && routes.forEach(item => {
- // 子菜单中有 keep-alive 的，父菜单也必须 keep-alive，否则无效。这里将子菜单中有 keep-alive 的父菜单也加入。
- if ((item.children && item.children.some(ch => ch.meta.keepAlive) || item.meta.keepAlive)) {
- const path = item.meta.path
- keepAliveRoutersArr.push(pathInfo[path])
- nameMap[item.name] = pathInfo[path]
- }
- if (item.children && item.children.length > 0) {
- KeepAliveFilter(item.children)
- }
- })
+ routes &&
+ routes.forEach((item) => {
+ // 子菜单中有 keep-alive 的，父菜单也必须 keep-alive，否则无效。这里将子菜单中有 keep-alive 的父菜单也加入。
+ if (
+ (item.children && item.children.some((ch) => ch.meta.keepAlive)) ||
+ item.meta.keepAlive
+ ) {
+ const path = item.meta.path
+ keepAliveRoutersArr.push(pathInfo[path])
+ nameMap[item.name] = pathInfo[path]
+ }
+ if (item.children && item.children.length > 0) {
+ KeepAliveFilter(item.children)
+ }
+ })
}
export const useRouterStore = defineStore('router', () => {
@@ -46,7 +51,7 @@ export const useRouterStore = defineStore('router', () => {
const asyncRouterFlag = ref(0)
const setKeepAliveRouters = (history) => {
const keepArrTemp = []
- history.forEach(item => {
+ history.forEach((item) => {
if (nameMap[item.name]) {
keepArrTemp.push(nameMap[item.name])
}
@@ -63,64 +68,63 @@ export const useRouterStore = defineStore('router', () => {
const menuMap = {}
- const topActive = ref("")
-
-
-
-
+ const topActive = ref('')
const setLeftMenu = (name) => {
sessionStorage.setItem('topActive', name)
topActive.value = name
- if(menuMap[name]?.children){
+ if (menuMap[name]?.children) {
leftMenu.value = menuMap[name].children
}
return menuMap[name]?.children
}
- watchEffect(()=>{
- let topActive = sessionStorage.getItem("topActive")
+ watchEffect(() => {
+ let topActive = sessionStorage.getItem('topActive')
let firstHasChildren = ''
asyncRouters.value[0]?.children.forEach((item) => {
- if (item.hidden) return;
- menuMap[item.name] = item;
+ if (item.hidden) return
+ menuMap[item.name] = item
if (!firstHasChildren && item.children && item.children.length > 0) {
firstHasChildren = item.name
}
- topMenu.value.push({...item, children: []})
- });
+ topMenu.value.push({ ...item, children: [] })
+ })
- if(!menuMap[topActive]?.children && firstHasChildren){
- topActive = firstHasChildren
+ if (!menuMap[topActive]?.children && firstHasChildren) {
+ topActive = firstHasChildren
}
setLeftMenu(topActive)
})
- const routeMap = ({})
+ const routeMap = {}
// 从后台获取动态路由
- const SetAsyncRouter = async() => {
+ const SetAsyncRouter = async () => {
asyncRouterFlag.value++
- const baseRouter = [{
- path: '/layout',
- name: 'layout',
- component: 'view/layout/index.vue',
- meta: {
- title: '底层layout'
- },
- children: []
- }]
+ const baseRouter = [
+ {
+ path: '/layout',
+ name: 'layout',
+ component: 'view/layout/index.vue',
+ meta: {
+ title: '底层layout'
+ },
+ children: []
+ }
+ ]
const asyncRouterRes = await asyncMenu()
const asyncRouter = asyncRouterRes.data.menus
- asyncRouter && asyncRouter.push({
- path: 'reload',
- name: 'Reload',
- hidden: true,
- meta: {
- title: '',
- closeTab: true,
- },
- component: 'view/error/reload.vue'
- })
+ asyncRouter &&
+ asyncRouter.push({
+ path: 'reload',
+ name: 'Reload',
+ hidden: true,
+ meta: {
+ title: '',
+ closeTab: true
+ },
+ component: 'view/error/reload.vue'
+ })
formatRouter(asyncRouter, routeMap)
baseRouter[0].children = asyncRouter
if (notLayoutRouterArr.length !== 0) {
@@ -144,4 +148,3 @@ export const useRouterStore = defineStore('router', () => {
routeMap
}
})
-
diff --git a/web/src/pinia/modules/user.js b/web/src/pinia/modules/user.js
index 1dd7b0eaf4..82d1cb08ef 100644
--- a/web/src/pinia/modules/user.js
+++ b/web/src/pinia/modules/user.js
@@ -7,7 +7,7 @@ import { ref, watch } from 'vue'
import { useRouterStore } from './router'
import cookie from 'js-cookie'
-import {useAppStore} from "@/pinia";
+import { useAppStore } from '@/pinia'
export const useUserStore = defineStore('user', () => {
const appStore = useAppStore()
@@ -17,13 +17,15 @@ export const useUserStore = defineStore('user', () => {
uuid: '',
nickName: '',
headerImg: '',
- authority: {},
+ authority: {}
})
- const token = ref(window.localStorage.getItem('token') || cookie.get('x-token') || '')
+ const token = ref(
+ window.localStorage.getItem('token') || cookie.get('x-token') || ''
+ )
const setUserInfo = (val) => {
userInfo.value = val
- if(val.originSetting){
- Object.keys(appStore.config).forEach(key => {
+ if (val.originSetting) {
+ Object.keys(appStore.config).forEach((key) => {
appStore.config[key] = val.originSetting[key]
})
}
@@ -36,7 +38,7 @@ export const useUserStore = defineStore('user', () => {
const NeedInit = async () => {
token.value = ''
window.localStorage.removeItem('token')
- await router.push({name: 'Init', replace: true})
+ await router.push({ name: 'Init', replace: true })
}
const ResetUserInfo = (value = {}) => {
@@ -46,7 +48,7 @@ export const useUserStore = defineStore('user', () => {
}
}
/* 获取用户信息*/
- const GetUserInfo = async() => {
+ const GetUserInfo = async () => {
const res = await getUserInfo()
if (res.code === 0) {
setUserInfo(res.data.userInfo)
@@ -54,10 +56,10 @@ export const useUserStore = defineStore('user', () => {
return res
}
/* 登录*/
- const LoginIn = async(loginInfo) => {
+ const LoginIn = async (loginInfo) => {
loadingInstance.value = ElLoading.service({
fullscreen: true,
- text: '登录中，请稍候...',
+ text: '登录中，请稍候...'
})
const res = await login(loginInfo)
@@ -78,7 +80,7 @@ export const useUserStore = defineStore('user', () => {
const asyncRouters = routerStore.asyncRouters
// 注册到路由表里
- asyncRouters.forEach(asyncRouter => {
+ asyncRouters.forEach((asyncRouter) => {
router.addRoute(asyncRouter)
})
@@ -95,13 +97,12 @@ export const useUserStore = defineStore('user', () => {
window.localStorage.setItem('osType', 'MAC')
}
-
// 全部操作均结束，关闭loading并返回
loadingInstance.value.close()
return true
}
/* 登出*/
- const LoginOut = async() => {
+ const LoginOut = async () => {
const res = await jsonInBlacklist()
// 登出失败
@@ -116,7 +117,7 @@ export const useUserStore = defineStore('user', () => {
window.location.reload()
}
/* 清理数据 */
- const ClearStorage = async() => {
+ const ClearStorage = async () => {
token.value = ''
sessionStorage.clear()
window.localStorage.removeItem('token')
@@ -124,9 +125,12 @@ export const useUserStore = defineStore('user', () => {
localStorage.removeItem('originSetting')
}
- watch(() => token.value, () => {
- window.localStorage.setItem('token', token.value)
- })
+ watch(
+ () => token.value,
+ () => {
+ window.localStorage.setItem('token', token.value)
+ }
+ )
return {
userInfo,
diff --git a/web/src/plugin/announcement/api/info.js b/web/src/plugin/announcement/api/info.js
index e0b5fec7c7..e19770bd2b 100644
--- a/web/src/plugin/announcement/api/info.js
+++ b/web/src/plugin/announcement/api/info.js
@@ -105,6 +105,6 @@ export const getInfoList = (params) => {
export const getInfoDataSource = () => {
return service({
url: '/info/getInfoDataSource',
- method: 'get',
+ method: 'get'
})
}
diff --git a/web/src/plugin/announcement/form/info.vue b/web/src/plugin/announcement/form/info.vue
index 3c3c5399ed..9824048ba1 100644
--- a/web/src/plugin/announcement/form/info.vue
+++ b/web/src/plugin/announcement/form/info.vue
@@ -1,21 +1,41 @@
+
+
-
-
-
+
@@ -136,42 +223,42 @@
diff --git a/web/src/plugin/email/api/email.js b/web/src/plugin/email/api/email.js
index 590c862f46..c3f6c7b24c 100644
--- a/web/src/plugin/email/api/email.js
+++ b/web/src/plugin/email/api/email.js
@@ -27,4 +27,3 @@ export const sendEmail = (data) => {
data
})
}
-
diff --git a/web/src/plugin/email/view/index.vue b/web/src/plugin/email/view/index.vue
index 11d57e44f3..188c45be55 100644
--- a/web/src/plugin/email/view/index.vue
+++ b/web/src/plugin/email/view/index.vue
@@ -1,6 +1,8 @@
-
+
+ />
@@ -28,7 +25,7 @@
class="dom-center"
src="https://img.shields.io/github/watchers/flipped-aurora/gin-vue-admin.svg?label=Watch"
alt=""
- >
+ />
@@ -37,7 +34,7 @@
class="dom-center"
src="https://img.shields.io/github/stars/flipped-aurora/gin-vue-admin.svg?style=social"
alt=""
- >
+ />
@@ -46,7 +43,7 @@
class="dom-center"
src="https://img.shields.io/github/forks/flipped-aurora/gin-vue-admin.svg?label=Fork"
alt=""
- >
+ />
@@ -58,34 +55,27 @@
-
+
+ />
-
+
diff --git a/web/src/components/svgIcon/svgIcon.vue b/web/src/components/svgIcon/svgIcon.vue
index c6f7665323..a72a421e24 100644
--- a/web/src/components/svgIcon/svgIcon.vue
+++ b/web/src/components/svgIcon/svgIcon.vue
@@ -1,39 +1,32 @@
-
diff --git a/web/src/components/upload/common.vue b/web/src/components/upload/common.vue
index 97255da115..1505024b9b 100644
--- a/web/src/components/upload/common.vue
+++ b/web/src/components/upload/common.vue
@@ -15,62 +15,61 @@
-
diff --git a/web/src/components/upload/image.vue b/web/src/components/upload/image.vue
index e65bcf74d4..d7f021ca94 100644
--- a/web/src/components/upload/image.vue
+++ b/web/src/components/upload/image.vue
@@ -1,4 +1,3 @@
-
+
-
+
{{ item.name }}
-
+
-
+
-
+
-
-
-
+
+
+
+
保存
返回
@@ -26,42 +46,41 @@
-
+
diff --git a/web/src/plugin/announcement/view/info.vue b/web/src/plugin/announcement/view/info.vue
index 9c3fa96948..7c317d409b 100644
--- a/web/src/plugin/announcement/view/info.vue
+++ b/web/src/plugin/announcement/view/info.vue
@@ -1,22 +1,50 @@
- {{ filterDataSource(dataSource.userID,scope.row.userID) }}
+ {{
+ filterDataSource(dataSource.userID, scope.row.userID)
+ }}
-
+
-
+
变更
-
+
删除
@@ -100,31 +165,53 @@
/>
-
-
+
创建日期
-
+
-
-
@@ -25,13 +53,23 @@
查询
-
- 重置
-
-
+ 重置
+
展开
-
+
收起
@@ -42,7 +80,12 @@
新增
-
+
删除
@@ -65,24 +108,46 @@
-
+
{{ file.name }}
- {{ type==='create'?'添加':'修改' }}
+ {{ type === 'create' ? '添加' : '修改' }}
-
-
- 确 定
-
-
- 取 消
-
+ 确 定
+ 取 消
-
-
发送测试邮件
@@ -27,37 +26,35 @@
-
-
diff --git a/web/src/router/index.js b/web/src/router/index.js
index 52d376307e..d5203b2f87 100644
--- a/web/src/router/index.js
+++ b/web/src/router/index.js
@@ -1,31 +1,32 @@
import { createRouter, createWebHashHistory } from 'vue-router'
-const routes = [{
- path: '/',
- redirect: '/login'
-},
-{
- path: '/init',
- name: 'Init',
- component: () => import('@/view/init/index.vue')
-},
-{
- path: '/login',
- name: 'Login',
- component: () => import('@/view/login/index.vue')
-},
-{
- path: '/:catchAll(.*)',
- meta: {
- closeTab: true,
+const routes = [
+ {
+ path: '/',
+ redirect: '/login'
},
- component: () => import('@/view/error/index.vue')
-}
+ {
+ path: '/init',
+ name: 'Init',
+ component: () => import('@/view/init/index.vue')
+ },
+ {
+ path: '/login',
+ name: 'Login',
+ component: () => import('@/view/login/index.vue')
+ },
+ {
+ path: '/:catchAll(.*)',
+ meta: {
+ closeTab: true
+ },
+ component: () => import('@/view/error/index.vue')
+ }
]
const router = createRouter({
history: createWebHashHistory(),
- routes,
+ routes
})
export default router
diff --git a/web/src/style/element/index.scss b/web/src/style/element/index.scss
index 40ef0df5c3..0c2de8ddf6 100644
--- a/web/src/style/element/index.scss
+++ b/web/src/style/element/index.scss
@@ -1,24 +1,24 @@
@forward 'element-plus/theme-chalk/src/common/var.scss' with (
$colors: (
- 'white': #ffffff,
+ 'white': #ffffff,
'black': #000000,
'primary': (
- 'base': #4d70ff,
+ 'base': #4d70ff
),
'success': (
- 'base': #67c23a,
+ 'base': #67c23a
),
'warning': (
- 'base': #e6a23c,
+ 'base': #e6a23c
),
'danger': (
- 'base': #f56c6c,
+ 'base': #f56c6c
),
'error': (
- 'base': #f56c6c,
+ 'base': #f56c6c
),
'info': (
- 'base': #909399,
- ),
+ 'base': #909399
+ )
)
);
diff --git a/web/src/style/element_visiable.scss b/web/src/style/element_visiable.scss
index fad0754e39..4d33aef7b4 100644
--- a/web/src/style/element_visiable.scss
+++ b/web/src/style/element_visiable.scss
@@ -1,138 +1,136 @@
@use '@/style/main.scss';
-@use "@/style/reset";
+@use '@/style/reset';
@tailwind base;
@tailwind components;
@tailwind utilities;
.el-button {
- font-weight: 400;
- border-radius: 2px;
+ font-weight: 400;
+ border-radius: 2px;
}
.gva-pagination {
- @apply flex justify-end;
- .el-pagination__editor {
- .el-input__inner {
- @apply h-8;
- }
+ @apply flex justify-end;
+ .el-pagination__editor {
+ .el-input__inner {
+ @apply h-8;
}
+ }
- .is-active {
- @apply rounded text-white;
- background: var(--el-color-primary);
- color: #ffffff !important;
- }
+ .is-active {
+ @apply rounded text-white;
+ background: var(--el-color-primary);
+ color: #ffffff !important;
+ }
}
-
-.el-drawer__header{
- margin-bottom: 0 !important;
- padding-top: 16px !important;
- padding-bottom: 16px !important;
- @apply border-0 border-b border-solid border-gray-200;
+.el-drawer__header {
+ margin-bottom: 0 !important;
+ padding-top: 16px !important;
+ padding-bottom: 16px !important;
+ @apply border-0 border-b border-solid border-gray-200;
}
-
.el-form--inline {
- .el-form-item {
- & > .el-input, .el-cascader, .el-select, .el-date-editor, .el-autocomplete {
- @apply w-52;
- }
+ .el-form-item {
+ & > .el-input,
+ .el-cascader,
+ .el-select,
+ .el-date-editor,
+ .el-autocomplete {
+ @apply w-52;
}
+ }
}
.el-dropdown {
- @apply overflow-hidden
+ @apply overflow-hidden;
}
-
.el-table {
- tr{
- th {
- @apply dark:bg-slate-900;
- .cell {
- @apply leading-[36px] text-gray-700 dark:text-gray-200;
- }
- }
+ tr {
+ th {
+ @apply dark:bg-slate-900;
+ .cell {
+ @apply leading-[36px] text-gray-700 dark:text-gray-200;
+ }
}
- .el-table__row {
- td {
- @apply dark:bg-slate-900;
- .cell {
- @apply leading-[32px] text-gray-600 dark:text-gray-300;
- }
- }
+ }
+ .el-table__row {
+ td {
+ @apply dark:bg-slate-900;
+ .cell {
+ @apply leading-[32px] text-gray-600 dark:text-gray-300;
+ }
}
- tr{
- th{
- &.is-leaf {
- @apply dark:bg-slate-900;
- }
- }
-
+ }
+ tr {
+ th {
+ &.is-leaf {
+ @apply dark:bg-slate-900;
+ }
}
+ }
}
// layout
// table
.el-pagination {
- @apply mt-8;
- .btn-prev,
- .btn-next {
- @apply border border-solid border-gray-300 dark:border-gray-700 rounded;
- }
- .el-pager {
- li {
- @apply border border-solid border-gray-300 dark:border-gray-600 rounded text-gray-600 text-sm mx-1;
- }
+ @apply mt-8;
+ .btn-prev,
+ .btn-next {
+ @apply border border-solid border-gray-300 dark:border-gray-700 rounded;
+ }
+ .el-pager {
+ li {
+ @apply border border-solid border-gray-300 dark:border-gray-600 rounded text-gray-600 text-sm mx-1;
}
+ }
}
-.el-menu{
- li{
- @apply my-1;
- }
+.el-menu {
+ li {
+ @apply my-1;
+ }
}
-.el-menu--vertical{
- .el-menu-item{
- border-radius: 2px;
- &.is-active{
- background-color: var(--el-color-primary) !important;
- color: #fff !important;
- }
+.el-menu--vertical {
+ .el-menu-item {
+ border-radius: 2px;
+ &.is-active {
+ background-color: var(--el-color-primary) !important;
+ color: #fff !important;
}
+ }
}
-
-.el-sub-menu.el-sub-menu__hide-arrow{
- height: 44px;
+.el-sub-menu.el-sub-menu__hide-arrow {
+ height: 44px;
}
-
-.el-tabs__header{
- margin: 0 0 1px !important;
+.el-tabs__header {
+ margin: 0 0 1px !important;
}
-.el-sub-menu.is-active{
- > .el-sub-menu__title{
- color: var(--el-color-primary) !important;
- }
+.el-sub-menu.is-active {
+ > .el-sub-menu__title {
+ color: var(--el-color-primary) !important;
+ }
}
.el-sub-menu__title.el-tooltip__trigger,
-.el-menu-item .el-menu-tooltip__trigger{
- justify-content: center;
+.el-menu-item .el-menu-tooltip__trigger {
+ justify-content: center;
}
-.el-menu--horizontal .el-menu .el-sub-menu__title{
- justify-content: flex-start;
+.el-menu--horizontal .el-menu .el-sub-menu__title {
+ justify-content: flex-start;
}
html.dark {
- /* 自定义深色背景颜色 */
- --el-bg-color: rgb(30 ,41 ,59);
- --el-bg-color-overlay: rgb(40 ,51 ,69);
- --el-fill-color-light: rgb(15 ,23 ,42);
- --el-fill-color : rgb(15 ,23 ,42);
+ /* 自定义深色背景颜色 */
+ --el-bg-color: rgb(30, 41, 59);
+ --el-bg-color-overlay: rgb(40, 51, 69);
+ --el-fill-color-light: rgb(15, 23, 42);
+ --el-fill-color: rgb(15, 23, 42);
}
diff --git a/web/src/style/iconfont.css b/web/src/style/iconfont.css
index bc091a05c3..623bf13b52 100644
--- a/web/src/style/iconfont.css
+++ b/web/src/style/iconfont.css
@@ -1,47 +1,47 @@
@font-face {
- font-family: 'gvaIcon';
- src: url('data:font/ttf;charset=utf-8;base64,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AAAAAAALABMBkAADAAEECQAAACYAAAADAAEECQABABAAPAADAAEECQACAA4AVwADAAEECQADABAAbwADAAEECQAEABAAigADAAEECQAFABYApQADAAEECQAGABAAyQADAAEECQAKAFYA5AADAAEECQALACYBaABDAHIAZQBhAHQAZQBkACAAYgB5ACAAaQBjAG8AbgBmAG8AbgB0AABDcmVhdGVkIGJ5IGljb25mb250AABpAGMAbwBuAGYAbwBuAHQAAGljb25mb250AABSAGUAZwB1AGwAYQByAABSZWd1bGFyAABpAGMAbwBuAGYAbwBuAHQAAGljb25mb250AABpAGMAbwBuAGYAbwBuAHQAAGljb25mb250AABWAGUAcgBzAGkAbwBuACAAMQAuADAAAFZlcnNpb24gMS4wAABpAGMAbwBuAGYAbwBuAHQAAGljb25mb250AABHAGUAbgBlAHIAYQB0AGUAZAAgAGIAeQAgAHMAdgBnADIAdAB0AGYAIABmAHIAbwBtACAARgBvAG4AdABlAGwAbABvACAAcAByAG8AagBlAGMAdAAuAABHZW5lcmF0ZWQgYnkgc3ZnMnR0ZiBmcm9tIEZvbnRlbGxvIHByb2plY3QuAABoAHQAdABwADoALwAvAGYAbwBuAHQAZQBsAGwAbwAuAGMAbwBtAABodHRwOi8vZm9udGVsbG8uY29tAAAAAAIAAAAAAAAACgAAAAAAAQAAAAAAAAAAAAAAAAAAAAAACwAAAAEAAgECAQMBBAEFAQYBBwEIAQkRYXJyb3ctZG91YmxlLWxlZnQSYXJyb3ctZG91YmxlLXJpZ2h0EGN1c3RvbWVyLXNlcnZpY2URZnVsbHNjcmVlbi1leHBhbmQRZnVsbHNjcmVlbi1zaHJpbmsGcHJvbXB0B3JlZnJlc2gGc2VhcmNoAAAAAf//AAIAAQAAAAwAAAAWAAAAAgABAAMACgABAAQAAAACAAAAAAAAAAEAAAAA1aQnCAAAAADeWFEjAAAAAN5YUSM=') format('truetype');
- font-weight: 600;
- font-style: normal;
- font-display: swap;
+ font-family: 'gvaIcon';
+ src: url('data:font/ttf;charset=utf-8;base64,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AAAAAAALABMBkAADAAEECQAAACYAAAADAAEECQABABAAPAADAAEECQACAA4AVwADAAEECQADABAAbwADAAEECQAEABAAigADAAEECQAFABYApQADAAEECQAGABAAyQADAAEECQAKAFYA5AADAAEECQALACYBaABDAHIAZQBhAHQAZQBkACAAYgB5ACAAaQBjAG8AbgBmAG8AbgB0AABDcmVhdGVkIGJ5IGljb25mb250AABpAGMAbwBuAGYAbwBuAHQAAGljb25mb250AABSAGUAZwB1AGwAYQByAABSZWd1bGFyAABpAGMAbwBuAGYAbwBuAHQAAGljb25mb250AABpAGMAbwBuAGYAbwBuAHQAAGljb25mb250AABWAGUAcgBzAGkAbwBuACAAMQAuADAAAFZlcnNpb24gMS4wAABpAGMAbwBuAGYAbwBuAHQAAGljb25mb250AABHAGUAbgBlAHIAYQB0AGUAZAAgAGIAeQAgAHMAdgBnADIAdAB0AGYAIABmAHIAbwBtACAARgBvAG4AdABlAGwAbABvACAAcAByAG8AagBlAGMAdAAuAABHZW5lcmF0ZWQgYnkgc3ZnMnR0ZiBmcm9tIEZvbnRlbGxvIHByb2plY3QuAABoAHQAdABwADoALwAvAGYAbwBuAHQAZQBsAGwAbwAuAGMAbwBtAABodHRwOi8vZm9udGVsbG8uY29tAAAAAAIAAAAAAAAACgAAAAAAAQAAAAAAAAAAAAAAAAAAAAAACwAAAAEAAgECAQMBBAEFAQYBBwEIAQkRYXJyb3ctZG91YmxlLWxlZnQSYXJyb3ctZG91YmxlLXJpZ2h0EGN1c3RvbWVyLXNlcnZpY2URZnVsbHNjcmVlbi1leHBhbmQRZnVsbHNjcmVlbi1zaHJpbmsGcHJvbXB0B3JlZnJlc2gGc2VhcmNoAAAAAf//AAIAAQAAAAwAAAAWAAAAAgABAAMACgABAAQAAAACAAAAAAAAAAEAAAAA1aQnCAAAAADeWFEjAAAAAN5YUSM=')
+ format('truetype');
+ font-weight: 600;
+ font-style: normal;
+ font-display: swap;
}
.gvaIcon {
- font-family: "gvaIcon" !important;
- font-size: 16px;
- font-style: normal;
- font-weight: 800;
- -webkit-font-smoothing: antialiased;
- -moz-osx-font-smoothing: grayscale;
- }
+ font-family: 'gvaIcon' !important;
+ font-size: 16px;
+ font-style: normal;
+ font-weight: 800;
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+}
.gvaIcon-arrow-double-left:before {
- content: "\e665";
- }
+ content: '\e665';
+}
.gvaIcon-arrow-double-right:before {
- content: "\e666";
+ content: '\e666';
}
.gvaIcon-fullscreen-shrink:before {
- content: "\e676";
+ content: '\e676';
}
.gvaIcon-customer-service:before {
- content: "\e66a";
- }
+ content: '\e66a';
+}
.gvaIcon-fullscreen-expand:before {
- content: "\e675";
+ content: '\e675';
}
.gvaIcon-prompt:before {
- content: "\e67b";
+ content: '\e67b';
}
.gvaIcon-refresh:before {
- content: "\e67c";
+ content: '\e67c';
}
.gvaIcon-search:before {
- content: "\e67d";
+ content: '\e67d';
}
-
diff --git a/web/src/style/main.scss b/web/src/style/main.scss
index 12318e5ac8..ac5622d977 100644
--- a/web/src/style/main.scss
+++ b/web/src/style/main.scss
@@ -1,53 +1,50 @@
-
@use '@/style/iconfont.css';
-.html-grey{
- filter: grayscale(100%);
+.html-grey {
+ filter: grayscale(100%);
}
-.html-weakenss{
- filter: invert(80%);
+.html-weakenss {
+ filter: invert(80%);
}
.gva-table-box {
- @apply p-4 bg-white text-slate-700 dark:text-slate-400 dark:bg-slate-900 rounded my-2;
- .el-table{
- @apply border-x border-t border-b-0 rounded border-table-border border-solid -mx-[1px];
- }
+ @apply p-4 bg-white text-slate-700 dark:text-slate-400 dark:bg-slate-900 rounded my-2;
+ .el-table {
+ @apply border-x border-t border-b-0 rounded border-table-border border-solid -mx-[1px];
+ }
}
.gva-btn-list {
- @apply mb-3 flex items-center;
+ @apply mb-3 flex items-center;
}
-
#nprogress .bar {
- background: #29d !important;
+ background: #29d !important;
}
-.gva-customer-icon{
- @apply w-4 h-4;
+.gva-customer-icon {
+ @apply w-4 h-4;
}
::-webkit-scrollbar {
- @apply hidden;
+ @apply hidden;
}
-
.gva-search-box {
- @apply p-4 bg-white text-slate-700 dark:text-slate-400 dark:bg-slate-900 rounded my-2;
+ @apply p-4 bg-white text-slate-700 dark:text-slate-400 dark:bg-slate-900 rounded my-2;
}
.gva-form-box {
- @apply p-4 bg-white text-slate-700 dark:text-slate-400 dark:bg-slate-900 rounded my-2;
+ @apply p-4 bg-white text-slate-700 dark:text-slate-400 dark:bg-slate-900 rounded my-2;
}
-.el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content{
- background: var(--el-color-primary-bg) !important;
+.el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content {
+ background: var(--el-color-primary-bg) !important;
}
-.el-dropdown{
+.el-dropdown {
+ outline: none;
+ * {
outline: none;
- *{
- outline: none;
- }
+ }
}
diff --git a/web/src/style/reset.scss b/web/src/style/reset.scss
index 745bcdb07e..2cd44c7022 100644
--- a/web/src/style/reset.scss
+++ b/web/src/style/reset.scss
@@ -1,7 +1,6 @@
/* Document
========================================================================== */
-
/**
* 1. Correct the line height in all browsers.
* 2. Prevent adjustments of font size after orientation changes in iOS.
@@ -14,11 +13,9 @@ html {
/* 2 */
}
-
/* Sections
========================================================================== */
-
/**
* Remove the margin in all browsers.
*/
@@ -27,7 +24,6 @@ body {
margin: 0;
}
-
/**
* Render the `main` element consistently in IE.
*/
@@ -36,7 +32,6 @@ main {
display: block;
}
-
/**
* Correct the font size and margin on `h1` elements within `section` and
* `article` contexts in Chrome, Firefox, and Safari.
@@ -47,11 +42,9 @@ h1 {
margin: 0.67em 0;
}
-
/* Grouping content
========================================================================== */
-
/**
* 1. Add the correct box sizing in Firefox.
* 2. Show the overflow in Edge and IE.
@@ -66,7 +59,6 @@ hr {
/* 2 */
}
-
/**
* 1. Correct the inheritance and scaling of font size in all browsers.
* 2. Correct the odd `em` font sizing in all browsers.
@@ -79,11 +71,9 @@ pre {
/* 2 */
}
-
/* Text-level semantics
========================================================================== */
-
/**
* Remove the gray background on active links in IE 10.
*/
@@ -92,7 +82,6 @@ a {
background-color: transparent;
}
-
/**
* 1. Remove the bottom border in Chrome 57-
* 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari.
@@ -107,7 +96,6 @@ abbr[title] {
/* 2 */
}
-
/**
* Add the correct font weight in Chrome, Edge, and Safari.
*/
@@ -117,7 +105,6 @@ strong {
font-weight: bolder;
}
-
/**
* 1. Correct the inheritance and scaling of font size in all browsers.
* 2. Correct the odd `em` font sizing in all browsers.
@@ -132,7 +119,6 @@ samp {
/* 2 */
}
-
/**
* Add the correct font size in all browsers.
*/
@@ -141,7 +127,6 @@ small {
font-size: 80%;
}
-
/**
* Prevent `sub` and `sup` elements from affecting the line height in
* all browsers.
@@ -163,11 +148,9 @@ sup {
top: -0.5em;
}
-
/* Embedded content
========================================================================== */
-
/**
* Remove the border on images inside links in IE 10.
*/
@@ -176,11 +159,9 @@ img {
border-style: none;
}
-
/* Forms
========================================================================== */
-
/**
* 1. Change the font styles in all browsers.
* 2. Remove the margin in Firefox and Safari.
@@ -201,7 +182,6 @@ textarea {
/* 2 */
}
-
/**
* Show the overflow in IE.
* 1. Show the overflow in Edge.
@@ -213,7 +193,6 @@ input {
overflow: visible;
}
-
/**
* Remove the inheritance of text transform in Edge, Firefox, and IE.
* 1. Remove the inheritance of text transform in Firefox.
@@ -225,44 +204,40 @@ select {
text-transform: none;
}
-
/**
* Correct the inability to style clickable types in iOS and Safari.
*/
button,
-[type="button"],
-[type="reset"],
-[type="submit"] {
+[type='button'],
+[type='reset'],
+[type='submit'] {
-webkit-appearance: button;
}
-
/**
* Remove the inner border and padding in Firefox.
*/
button::-moz-focus-inner,
-[type="button"]::-moz-focus-inner,
-[type="reset"]::-moz-focus-inner,
-[type="submit"]::-moz-focus-inner {
+[type='button']::-moz-focus-inner,
+[type='reset']::-moz-focus-inner,
+[type='submit']::-moz-focus-inner {
border-style: none;
padding: 0;
}
-
/**
* Restore the focus styles unset by the previous rule.
*/
button:-moz-focusring,
-[type="button"]:-moz-focusring,
-[type="reset"]:-moz-focusring,
-[type="submit"]:-moz-focusring {
+[type='button']:-moz-focusring,
+[type='reset']:-moz-focusring,
+[type='submit']:-moz-focusring {
outline: 1px dotted ButtonText;
}
-
/**
* Correct the padding in Firefox.
*/
@@ -271,7 +246,6 @@ fieldset {
padding: 0.35em 0.75em 0.625em;
}
-
/**
* 1. Correct the text wrapping in Edge and IE.
* 2. Correct the color inheritance from `fieldset` elements in IE.
@@ -294,7 +268,6 @@ legend {
/* 1 */
}
-
/**
* Add the correct vertical alignment in Chrome, Firefox, and Opera.
*/
@@ -303,7 +276,6 @@ progress {
vertical-align: baseline;
}
-
/**
* Remove the default vertical scrollbar in IE 10+.
*/
@@ -312,53 +284,48 @@ textarea {
overflow: auto;
}
-
/**
* 1. Add the correct box sizing in IE 10.
* 2. Remove the padding in IE 10.
*/
-[type="checkbox"],
-[type="radio"] {
+[type='checkbox'],
+[type='radio'] {
box-sizing: border-box;
/* 1 */
padding: 0;
/* 2 */
}
-
/**
* Correct the cursor style of increment and decrement buttons in Chrome.
*/
-[type="number"]::-webkit-inner-spin-button,
-[type="number"]::-webkit-outer-spin-button {
+[type='number']::-webkit-inner-spin-button,
+[type='number']::-webkit-outer-spin-button {
height: auto;
}
-
/**
* 1. Correct the odd appearance in Chrome and Safari.
* 2. Correct the outline style in Safari.
*/
-[type="search"] {
+[type='search'] {
-webkit-appearance: textfield;
/* 1 */
outline-offset: -2px;
/* 2 */
}
-
/**
* Remove the inner padding in Chrome and Safari on macOS.
*/
-[type="search"]::-webkit-search-decoration {
+[type='search']::-webkit-search-decoration {
-webkit-appearance: none;
}
-
/**
* 1. Correct the inability to style clickable types in iOS and Safari.
* 2. Change font properties to `inherit` in Safari.
@@ -371,11 +338,9 @@ textarea {
/* 2 */
}
-
/* Interactive
========================================================================== */
-
/*
* Add the correct display in Edge, IE 10+, and Firefox.
*/
@@ -384,7 +349,6 @@ details {
display: block;
}
-
/*
* Add the correct display in all browsers.
*/
@@ -393,11 +357,9 @@ summary {
display: list-item;
}
-
/* Misc
========================================================================== */
-
/**
* Add the correct display in IE 10+.
*/
@@ -406,7 +368,6 @@ template {
display: none;
}
-
/**
* Add the correct display in IE 10.
*/
@@ -433,7 +394,8 @@ table,
th,
td {
border: none;
- font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑", Arial, sans-serif;
+ font-family: 'Helvetica Neue', Helvetica, 'PingFang SC', 'Hiragino Sans GB',
+ 'Microsoft YaHei', '微软雅黑', Arial, sans-serif;
font-size: 14px;
margin: 0px;
padding: 0px;
@@ -486,8 +448,8 @@ input::-moz-placeholder {
color: #ccc;
}
-input[type=submit],
-input[type=button] {
+input[type='submit'],
+input[type='button'] {
cursor: pointer;
}
diff --git a/web/src/utils/asyncRouter.js b/web/src/utils/asyncRouter.js
index 26c3df0a07..9e7a5cae22 100644
--- a/web/src/utils/asyncRouter.js
+++ b/web/src/utils/asyncRouter.js
@@ -2,9 +2,9 @@ const viewModules = import.meta.glob('../view/**/*.vue')
const pluginModules = import.meta.glob('../plugin/**/*.vue')
export const asyncRouterHandle = (asyncRouter) => {
- asyncRouter.forEach(item => {
+ asyncRouter.forEach((item) => {
if (item.component && typeof item.component === 'string') {
- item.meta.path = "/src/"+item.component
+ item.meta.path = '/src/' + item.component
if (item.component.split('/')[0] === 'view') {
item.component = dynamicImport(viewModules, item.component)
} else if (item.component.split('/')[0] === 'plugin') {
@@ -17,10 +17,7 @@ export const asyncRouterHandle = (asyncRouter) => {
})
}
-function dynamicImport(
- dynamicViewsModules,
- component
-) {
+function dynamicImport(dynamicViewsModules, component) {
const keys = Object.keys(dynamicViewsModules)
const matchKeys = keys.filter((key) => {
const k = key.replace('../', '')
diff --git a/web/src/utils/bus.js b/web/src/utils/bus.js
index 4b673fa2f9..f2a3b92382 100644
--- a/web/src/utils/bus.js
+++ b/web/src/utils/bus.js
@@ -1,6 +1,4 @@
-
// using ES6 modules
import mitt from 'mitt'
export const emitter = mitt()
-
diff --git a/web/src/utils/date.js b/web/src/utils/date.js
index 57433009e3..0744cfb83d 100644
--- a/web/src/utils/date.js
+++ b/web/src/utils/date.js
@@ -3,7 +3,7 @@
// 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
// (new Date()).Format("yyyy-MM-dd hh:mm:ss.S") ==> 2006-07-02 08:09:04.423
// (new Date()).Format("yyyy-M-d h:m:s.S") ==> 2006-7-2 8:9:4.18
-Date.prototype.Format = function(fmt) {
+Date.prototype.Format = function (fmt) {
const o = {
'M+': this.getMonth() + 1, // 月份
'd+': this.getDate(), // 日
@@ -11,11 +11,21 @@ Date.prototype.Format = function(fmt) {
'm+': this.getMinutes(), // 分
's+': this.getSeconds(), // 秒
'q+': Math.floor((this.getMonth() + 3) / 3), // 季度
- 'S': this.getMilliseconds() // 毫秒
+ S: this.getMilliseconds() // 毫秒
+ }
+ if (/(y+)/.test(fmt)) {
+ fmt = fmt.replace(
+ RegExp.$1,
+ (this.getFullYear() + '').substr(4 - RegExp.$1.length)
+ )
}
- if (/(y+)/.test(fmt)) { fmt = fmt.replace(RegExp.$1, (this.getFullYear() + '').substr(4 - RegExp.$1.length)) }
for (const k in o) {
- if (new RegExp('(' + k + ')').test(fmt)) { fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? (o[k]) : (('00' + o[k]).substr(('' + o[k]).length))) }
+ if (new RegExp('(' + k + ')').test(fmt)) {
+ fmt = fmt.replace(
+ RegExp.$1,
+ RegExp.$1.length === 1 ? o[k] : ('00' + o[k]).substr(('' + o[k]).length)
+ )
+ }
}
return fmt
}
diff --git a/web/src/utils/dictionary.js b/web/src/utils/dictionary.js
index 440fe5e1a8..679a6b9886 100644
--- a/web/src/utils/dictionary.js
+++ b/web/src/utils/dictionary.js
@@ -1,7 +1,7 @@
import { useDictionaryStore } from '@/pinia/modules/dictionary'
import { getSysParam } from '@/api/sysParams'
// 获取字典方法 使用示例 getDict('sex').then(res) 或者 async函数下 const res = await getDict('sex')
-export const getDict = async(type) => {
+export const getDict = async (type) => {
const dictionaryStore = useDictionaryStore()
await dictionaryStore.getDictionary(type)
return dictionaryStore.dictionaryMap[type]
@@ -18,7 +18,7 @@ export const showDictLabel = (
return ''
}
const dictMap = {}
- dict.forEach(item => {
+ dict.forEach((item) => {
if (Reflect.has(item, keyCode) && Reflect.has(item, valueCode)) {
dictMap[item[keyCode]] = item[valueCode]
}
@@ -26,10 +26,9 @@ export const showDictLabel = (
return Reflect.has(dictMap, code) ? dictMap[code] : ''
}
-
-export const getParams = async (key)=>{
- const res = await getSysParam({key})
- if(res.code === 0){
+export const getParams = async (key) => {
+ const res = await getSysParam({ key })
+ if (res.code === 0) {
return res.data.value
}
}
diff --git a/web/src/utils/downloadImg.js b/web/src/utils/downloadImg.js
index 93fb2222d4..10506c791f 100644
--- a/web/src/utils/downloadImg.js
+++ b/web/src/utils/downloadImg.js
@@ -1,7 +1,8 @@
-export const downloadImage = (imgsrc, name) => { // 下载图片地址和图片名
+export const downloadImage = (imgsrc, name) => {
+ // 下载图片地址和图片名
var image = new Image()
image.setAttribute('crossOrigin', 'anonymous')
- image.onload = function() {
+ image.onload = function () {
var canvas = document.createElement('canvas')
canvas.width = image.width
canvas.height = image.height
diff --git a/web/src/utils/event.js b/web/src/utils/event.js
index 5063d8cba5..4861bf703c 100644
--- a/web/src/utils/event.js
+++ b/web/src/utils/event.js
@@ -1,29 +1,17 @@
-export function addEventListen(
- target,
- event,
- handler,
- capture = false
-) {
+export function addEventListen(target, event, handler, capture = false) {
if (
target.addEventListener &&
typeof target.addEventListener === 'function'
) {
- target.addEventListener(event, handler, capture);
+ target.addEventListener(event, handler, capture)
}
}
-export function removeEventListen(
- target,
- event,
- handler,
- capture = false
-) {
+export function removeEventListen(target, event, handler, capture = false) {
if (
target.removeEventListener &&
typeof target.removeEventListener === 'function'
) {
- target.removeEventListener(event, handler, capture);
+ target.removeEventListener(event, handler, capture)
}
}
-
-
diff --git a/web/src/utils/format.js b/web/src/utils/format.js
index 0cf75dc633..c0f6fabfb1 100644
--- a/web/src/utils/format.js
+++ b/web/src/utils/format.js
@@ -1,6 +1,6 @@
import { formatTimeToStr } from '@/utils/date'
import { getDict } from '@/utils/dictionary'
-import {ref} from "vue";
+import { ref } from 'vue'
export const formatBoolean = (bool) => {
if (bool !== null) {
@@ -19,30 +19,32 @@ export const formatDate = (time) => {
}
export const filterDict = (value, options) => {
- const rowLabel = options && options.filter(item => item.value === value)
+ const rowLabel = options && options.filter((item) => item.value === value)
return rowLabel && rowLabel[0] && rowLabel[0].label
}
export const filterDataSource = (dataSource, value) => {
if (Array.isArray(value)) {
- return value.map(item => {
- const rowLabel = dataSource && dataSource.find(i => i.value === item)
+ return value.map((item) => {
+ const rowLabel = dataSource && dataSource.find((i) => i.value === item)
return rowLabel?.label
})
}
- const rowLabel = dataSource && dataSource.find(item => item.value === value)
+ const rowLabel = dataSource && dataSource.find((item) => item.value === value)
return rowLabel?.label
}
-export const getDictFunc = async(type) => {
+export const getDictFunc = async (type) => {
const dicts = await getDict(type)
return dicts
}
-const path = import.meta.env.VITE_BASE_PATH + ':' + import.meta.env.VITE_SERVER_PORT + '/'
+const path =
+ import.meta.env.VITE_BASE_PATH + ':' + import.meta.env.VITE_SERVER_PORT + '/'
export const ReturnArrImg = (arr) => {
const imgArr = []
- if (arr instanceof Array) { // 如果是数组类型
+ if (arr instanceof Array) {
+ // 如果是数组类型
for (const arrKey in arr) {
if (arr[arrKey].slice(0, 4) !== 'http') {
imgArr.push(path + arr[arrKey])
@@ -50,7 +52,8 @@ export const ReturnArrImg = (arr) => {
imgArr.push(arr[arrKey])
}
}
- } else { // 如果不是数组类型
+ } else {
+ // 如果不是数组类型
if (arr.slice(0, 4) !== 'http') {
imgArr.push(path + arr)
} else {
@@ -65,65 +68,69 @@ export const returnArrImg = ReturnArrImg
export const onDownloadFile = (url) => {
window.open(path + url)
}
-const colorToHex = u=>{
- let e = u.replace("#", "").match(/../g);
- for (let t = 0; t < 3; t++)
- e[t] = parseInt(e[t], 16);
+const colorToHex = (u) => {
+ let e = u.replace('#', '').match(/../g)
+ for (let t = 0; t < 3; t++) e[t] = parseInt(e[t], 16)
return e
}
-const hexToColor = (u,e,t)=>{
- let a = [u.toString(16), e.toString(16), t.toString(16)];
- for (let n = 0; n < 3; n++)
- a[n].length === 1 && (a[n] = `0${a[n]}`);
- return `#${a.join("")}`
+const hexToColor = (u, e, t) => {
+ let a = [u.toString(16), e.toString(16), t.toString(16)]
+ for (let n = 0; n < 3; n++) a[n].length === 1 && (a[n] = `0${a[n]}`)
+ return `#${a.join('')}`
}
-const generateAllColors = (u,e)=> {
- let t = colorToHex(u);
- const target = [10, 10, 30];
- for (let a = 0; a < 3; a++)
- t[a] = Math.floor(t[a] * (1 - e) + target[a] * e);
+const generateAllColors = (u, e) => {
+ let t = colorToHex(u)
+ const target = [10, 10, 30]
+ for (let a = 0; a < 3; a++) t[a] = Math.floor(t[a] * (1 - e) + target[a] * e)
return hexToColor(t[0], t[1], t[2])
}
const generateAllLightColors = (u, e) => {
- let t = colorToHex(u);
- const target = [240, 248, 255]; // RGB for blue white color
- for (let a = 0; a < 3; a++)
- t[a] = Math.floor(t[a] * (1 - e) + target[a] * e);
- return hexToColor(t[0], t[1], t[2]);
+ let t = colorToHex(u)
+ const target = [240, 248, 255] // RGB for blue white color
+ for (let a = 0; a < 3; a++) t[a] = Math.floor(t[a] * (1 - e) + target[a] * e)
+ return hexToColor(t[0], t[1], t[2])
}
-
function addOpacityToColor(u, opacity) {
- let t = colorToHex(u);
- return `rgba(${t[0]}, ${t[1]}, ${ t[2]}, ${opacity})`;
+ let t = colorToHex(u)
+ return `rgba(${t[0]}, ${t[1]}, ${t[2]}, ${opacity})`
}
-
-export const setBodyPrimaryColor = (primaryColor, darkMode) =>{
-
+export const setBodyPrimaryColor = (primaryColor, darkMode) => {
let fmtColorFunc = generateAllColors
if (darkMode === 'light') {
fmtColorFunc = generateAllLightColors
}
document.documentElement.style.setProperty('--el-color-primary', primaryColor)
- document.documentElement.style.setProperty('--el-color-primary-bg', addOpacityToColor(primaryColor, 0.4))
+ document.documentElement.style.setProperty(
+ '--el-color-primary-bg',
+ addOpacityToColor(primaryColor, 0.4)
+ )
for (let times = 1; times <= 2; times++) {
- document.documentElement.style.setProperty(`--el-color-primary-dark-${times}`, fmtColorFunc(primaryColor, times / 10))
+ document.documentElement.style.setProperty(
+ `--el-color-primary-dark-${times}`,
+ fmtColorFunc(primaryColor, times / 10)
+ )
}
for (let times = 1; times <= 10; times++) {
- document.documentElement.style.setProperty(`--el-color-primary-light-${times}`, fmtColorFunc(primaryColor, times / 10))
+ document.documentElement.style.setProperty(
+ `--el-color-primary-light-${times}`,
+ fmtColorFunc(primaryColor, times / 10)
+ )
}
- document.documentElement.style.setProperty(`--el-menu-hover-bg-color`, addOpacityToColor(primaryColor, 0.2))
+ document.documentElement.style.setProperty(
+ `--el-menu-hover-bg-color`,
+ addOpacityToColor(primaryColor, 0.2)
+ )
}
-
const baseUrl = ref(import.meta.env.VITE_BASE_API)
export const getBaseUrl = () => {
- return baseUrl.value === "/" ? "" : baseUrl.value
+ return baseUrl.value === '/' ? '' : baseUrl.value
}
export const CreateUUID = () => {
@@ -132,8 +139,8 @@ export const CreateUUID = () => {
d += performance.now()
}
return '00000000-0000-0000-0000-000000000000'.replace(/0/g, (c) => {
- const r = (d + Math.random() * 16) % 16 | 0 // d是随机种子
+ const r = (d + Math.random() * 16) % 16 | 0 // d是随机种子
d = Math.floor(d / 16)
- return (c === '0' ? r : (r & 0x3 | 0x8)).toString(16)
+ return (c === '0' ? r : (r & 0x3) | 0x8).toString(16)
})
}
diff --git a/web/src/utils/image.js b/web/src/utils/image.js
index 9a929588c3..a2d3241e85 100644
--- a/web/src/utils/image.js
+++ b/web/src/utils/image.js
@@ -9,7 +9,7 @@ export default class ImageCompress {
// 压缩
const fileType = this.file.type
const fileSize = this.file.size / 1024
- return new Promise(resolve => {
+ return new Promise((resolve) => {
const reader = new FileReader()
reader.readAsDataURL(this.file)
reader.onload = () => {
@@ -26,7 +26,7 @@ export default class ImageCompress {
ctx.clearRect(0, 0, canvas.width, canvas.height)
ctx.drawImage(img, 0, 0, canvas.width, canvas.height)
- const newImgData = canvas.toDataURL(fileType, 0.90)
+ const newImgData = canvas.toDataURL(fileType, 0.9)
// 压缩宽高后的图像大小
const newImgSize = this.fileSizeKB(newImgData)
@@ -69,7 +69,7 @@ export default class ImageCompress {
fileSizeKB(dataURL) {
let sizeKB = 0
- sizeKB = Math.round((dataURL.split(',')[1].length * 3 / 4) / 1024)
+ sizeKB = Math.round((dataURL.split(',')[1].length * 3) / 4 / 1024)
return sizeKB
}
@@ -93,21 +93,30 @@ export default class ImageCompress {
const path = import.meta.env.VITE_FILE_API
export const getUrl = (url) => {
- if (url && url.slice(0, 4) !== 'http'){
- if (path === "/"){
- return url
+ if (url && url.slice(0, 4) !== 'http') {
+ if (path === '/') {
+ return url
}
- if (url.slice(0, 1) === "/"){
- return path + url
+ if (url.slice(0, 1) === '/') {
+ return path + url
}
- return path + "/" + url
- }else{
+ return path + '/' + url
+ } else {
return url
}
}
-export const isVideoExt = (url) => url.endsWith('.mp4') || url.endsWith('.mov') || url.endsWith('.webm') || url.endsWith('.ogg');
+export const isVideoExt = (url) =>
+ url.endsWith('.mp4') ||
+ url.endsWith('.mov') ||
+ url.endsWith('.webm') ||
+ url.endsWith('.ogg')
-export const isVideoMime = (type) => type == 'video/mp4' || type == 'video/webm' || type == 'video/ogg';
+export const isVideoMime = (type) =>
+ type == 'video/mp4' || type == 'video/webm' || type == 'video/ogg'
-export const isImageMime = (type) => type == 'image/jpeg' || type == 'image/png' || type == 'image/webp' || type == 'image/svg+xml';
+export const isImageMime = (type) =>
+ type == 'image/jpeg' ||
+ type == 'image/png' ||
+ type == 'image/webp' ||
+ type == 'image/svg+xml'
diff --git a/web/src/utils/request.js b/web/src/utils/request.js
index 20c041e2ba..342ce8fee6 100644
--- a/web/src/utils/request.js
+++ b/web/src/utils/request.js
@@ -11,9 +11,11 @@ const service = axios.create({
let activeAxios = 0
let timer
let loadingInstance
-const showLoading = (option = {
- target: null,
-}) => {
+const showLoading = (
+ option = {
+ target: null
+ }
+) => {
const loadDom = document.getElementById('gva-base-load-dom')
activeAxios++
if (timer) {
@@ -36,7 +38,7 @@ const closeLoading = () => {
}
// http request 拦截器
service.interceptors.request.use(
- config => {
+ (config) => {
if (!config.donNotShowLoading) {
showLoading(config.loadingOption)
}
@@ -49,7 +51,7 @@ service.interceptors.request.use(
}
return config
},
- error => {
+ (error) => {
if (!error.config.donNotShowLoading) {
closeLoading()
}
@@ -64,7 +66,7 @@ service.interceptors.request.use(
// http response 拦截器
service.interceptors.response.use(
- response => {
+ (response) => {
const userStore = useUserStore()
if (!response.config.donNotShowLoading) {
closeLoading()
@@ -86,67 +88,81 @@ service.interceptors.response.use(
return response.data.msg ? response.data : response
}
},
- error => {
+ (error) => {
if (!error.config.donNotShowLoading) {
closeLoading()
}
if (!error.response) {
- ElMessageBox.confirm(`
+ ElMessageBox.confirm(
+ `
检测到请求错误
${error}
- `, '请求报错', { - dangerouslyUseHTMLString: true, - distinguishCancelAndClose: true, - confirmButtonText: '稍后重试', - cancelButtonText: '取消' - }) + `, + '请求报错', + { + dangerouslyUseHTMLString: true, + distinguishCancelAndClose: true, + confirmButtonText: '稍后重试', + cancelButtonText: '取消' + } + ) return } switch (error.response.status) { case 500: - ElMessageBox.confirm(` + ElMessageBox.confirm( + `检测到接口错误${error}
错误码 500 ：此类错误内容常见于后台panic，请先查看后台日志，如果影响您正常使用可强制登出清理缓存
- `, '接口报错', { - dangerouslyUseHTMLString: true, - distinguishCancelAndClose: true, - confirmButtonText: '清理缓存', - cancelButtonText: '取消' + `, + '接口报错', + { + dangerouslyUseHTMLString: true, + distinguishCancelAndClose: true, + confirmButtonText: '清理缓存', + cancelButtonText: '取消' + } + ).then(() => { + const userStore = useUserStore() + userStore.ClearStorage() + router.push({ name: 'Login', replace: true }) }) - .then(() => { - const userStore = useUserStore() - userStore.ClearStorage() - router.push({ name: 'Login', replace: true }) - }) break case 404: - ElMessageBox.confirm(` + ElMessageBox.confirm( + `检测到接口错误${error}
错误码 404 ：此类错误多为接口未注册（或未重启）或者请求路径（方法）与api路径（方法）不符--如果为自动化代码请检查是否存在空格
- `, '接口报错', { - dangerouslyUseHTMLString: true, - distinguishCancelAndClose: true, - confirmButtonText: '我知道了', - cancelButtonText: '取消' - }) + `, + '接口报错', + { + dangerouslyUseHTMLString: true, + distinguishCancelAndClose: true, + confirmButtonText: '我知道了', + cancelButtonText: '取消' + } + ) break case 401: - ElMessageBox.confirm(` + ElMessageBox.confirm( + `无效的令牌
错误码: 401 错误信息:${error}
- `, '身份信息', { - dangerouslyUseHTMLString: true, - distinguishCancelAndClose: true, - confirmButtonText: '重新登录', - cancelButtonText: '取消' + `, + '身份信息', + { + dangerouslyUseHTMLString: true, + distinguishCancelAndClose: true, + confirmButtonText: '重新登录', + cancelButtonText: '取消' + } + ).then(() => { + const userStore = useUserStore() + userStore.ClearStorage() + router.push({ name: 'Login', replace: true }) }) - .then(() => { - const userStore = useUserStore() - userStore.ClearStorage() - router.push({ name: 'Login', replace: true }) - }) break } diff --git a/web/src/utils/stringFun.js b/web/src/utils/stringFun.js index eac417911e..baec83db15 100644 --- a/web/src/utils/stringFun.js +++ b/web/src/utils/stringFun.js @@ -1,29 +1,29 @@ /* eslint-disable */ export const toUpperCase = (str) => { - if (str[0]) { - return str.replace(str[0], str[0].toUpperCase()) - } else { - return '' - } + if (str[0]) { + return str.replace(str[0], str[0].toUpperCase()) + } else { + return '' + } } export const toLowerCase = (str) => { - if (str[0]) { - return str.replace(str[0], str[0].toLowerCase()) - } else { - return '' - } + if (str[0]) { + return str.replace(str[0], str[0].toLowerCase()) + } else { + return '' + } } // 驼峰转换下划线 export const toSQLLine = (str) => { - if (str === 'ID') return 'ID' - return str.replace(/([A-Z])/g, "_$1").toLowerCase(); + if (str === 'ID') return 'ID' + return str.replace(/([A-Z])/g, '_$1').toLowerCase() } // 下划线转换驼峰 export const toHump = (name) => { - return name.replace(/\_(\w)/g, function(all, letter) { - return letter.toUpperCase(); - }); -} \ No newline at end of file + return name.replace(/\_(\w)/g, function (all, letter) { + return letter.toUpperCase() + }) +} diff --git a/web/src/view/about/index.vue b/web/src/view/about/index.vue index e9bb066bcc..1ac60e1a6b 100644 --- a/web/src/view/about/index.vue +++ b/web/src/view/about/index.vue @@ -8,16 +8,13 @@
+ />
+ />
-
+
@@ -100,7 +90,7 @@
-
+
Load more
@@ -127,72 +112,70 @@
diff --git a/web/src/view/dashboard/components/banner.vue b/web/src/view/dashboard/components/banner.vue
index 0141f5c5fb..226dda9970 100644
--- a/web/src/view/dashboard/components/banner.vue
+++ b/web/src/view/dashboard/components/banner.vue
@@ -5,36 +5,39 @@
-
+
-
+
diff --git a/web/src/view/dashboard/components/card.vue b/web/src/view/dashboard/components/card.vue
index 3b399bfb05..2a50b289f9 100644
--- a/web/src/view/dashboard/components/card.vue
+++ b/web/src/view/dashboard/components/card.vue
@@ -5,10 +5,8 @@
@@ -25,27 +23,24 @@
-
+
diff --git a/web/src/view/dashboard/components/charts-content-numbers.vue b/web/src/view/dashboard/components/charts-content-numbers.vue
index b11564f7c8..950b3b4164 100644
--- a/web/src/view/dashboard/components/charts-content-numbers.vue
+++ b/web/src/view/dashboard/components/charts-content-numbers.vue
@@ -10,174 +10,181 @@
-
+
diff --git a/web/src/view/dashboard/components/charts-people-numbers.vue b/web/src/view/dashboard/components/charts-people-numbers.vue
index a7013f20e8..3d10b3fabe 100644
--- a/web/src/view/dashboard/components/charts-people-numbers.vue
+++ b/web/src/view/dashboard/components/charts-people-numbers.vue
@@ -11,131 +11,128 @@
-
+
diff --git a/web/src/view/dashboard/components/charts.vue b/web/src/view/dashboard/components/charts.vue
index 3bcf5a9ed2..650b5f13f7 100644
--- a/web/src/view/dashboard/components/charts.vue
+++ b/web/src/view/dashboard/components/charts.vue
@@ -11,7 +11,7 @@
+
+
-
+
{{ item.typeTitle }}
@@ -21,58 +25,56 @@
-
+
diff --git a/web/src/view/dashboard/components/pluginTable.vue b/web/src/view/dashboard/components/pluginTable.vue
index 8b02502d32..e131cb919e 100644
--- a/web/src/view/dashboard/components/pluginTable.vue
+++ b/web/src/view/dashboard/components/pluginTable.vue
@@ -9,7 +9,9 @@
- {{ row.title }}
+ {{
+ row.title
+ }}
-
-
+
+
+
{{ item.title }}
-
-
+
-
+
diff --git a/web/src/view/dashboard/components/wiki.vue b/web/src/view/dashboard/components/wiki.vue
index 0266045514..eea7240774 100644
--- a/web/src/view/dashboard/components/wiki.vue
+++ b/web/src/view/dashboard/components/wiki.vue
@@ -5,38 +5,41 @@
-
+
diff --git a/web/src/view/dashboard/index.vue b/web/src/view/dashboard/index.vue
index b5de35eeda..ac58ee523d 100644
--- a/web/src/view/dashboard/index.vue
+++ b/web/src/view/dashboard/index.vue
@@ -1,5 +1,7 @@
-
+
-
+
diff --git a/web/src/view/dashboard/components/table.vue b/web/src/view/dashboard/components/table.vue
index 5b4e60d54b..47c8dde848 100644
--- a/web/src/view/dashboard/components/table.vue
+++ b/web/src/view/dashboard/components/table.vue
@@ -9,46 +9,44 @@
+
@@ -27,65 +41,71 @@
{{ item.title }}
+
@@ -9,20 +11,37 @@
-
+
-
+
-
+
-
+
-
+
@@ -30,18 +49,29 @@
-
+
-
+
diff --git a/web/src/view/error/index.vue b/web/src/view/error/index.vue
index 1665acaeb4..1f0079fa46 100644
--- a/web/src/view/error/index.vue
+++ b/web/src/view/error/index.vue
@@ -2,10 +2,19 @@
@@ -13,16 +22,16 @@
diff --git a/web/src/view/error/reload.vue b/web/src/view/error/reload.vue
index 2504c55f00..1fd027e667 100644
--- a/web/src/view/error/reload.vue
+++ b/web/src/view/error/reload.vue
@@ -3,12 +3,12 @@
diff --git a/web/src/view/example/breakpoint/breakpoint.vue b/web/src/view/example/breakpoint/breakpoint.vue
index 0751a471bb..ea9490e303 100644
--- a/web/src/view/example/breakpoint/breakpoint.vue
+++ b/web/src/view/example/breakpoint/breakpoint.vue
@@ -2,14 +2,8 @@
大文件上传
-
- 
+
返回首页
+
页面被神秘力量吸走了
-常见问题为当前此角色无当前路由，如果确定要使用本路由，请到角色管理进行分配
-项目地址：https://github.com/flipped-aurora/gin-vue-admin
++ 常见问题为当前此角色无当前路由，如果确定要使用本路由，请到角色管理进行分配 +
++ 项目地址：https://github.com/flipped-aurora/gin-vue-admin +