From ce2d39e3bf0483fff750874cdea014573ed3f3ba Mon Sep 17 00:00:00 2001 From: odjbin <1042039504@qq.com> Date: Sun, 18 Aug 2024 11:11:08 +0800 Subject: [PATCH] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=AE=A1=E7=90=86,=E8=A7=92=E8=89=B2=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=97=B6,=20=E4=B8=80=E7=9B=B4loading?= =?UTF-8?q?=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/role/add.vue | 5 +- src/views/system/user/add.vue | 5 +- vite.config.js | 165 +++++++++++++++++----------------- 3 files changed, 91 insertions(+), 84 deletions(-) diff --git a/src/views/system/role/add.vue b/src/views/system/role/add.vue index 432897f..f89dc1a 100644 --- a/src/views/system/role/add.vue +++ b/src/views/system/role/add.vue @@ -214,7 +214,10 @@ const checkBoxChange = (val) => { const handleSubmit = async () => { const loading = ElLoading.service({fullscreen: true}) const { isValidate } = await form.value.validate() - if(!isValidate) return Promise.reject() + if(!isValidate){ + loading.close() + return Promise.reject() + } const values = form.value.getValues() values.menuIds = checkChange() operate(values).then(res=>{ diff --git a/src/views/system/user/add.vue b/src/views/system/user/add.vue index 1c7249c..0c72554 100644 --- a/src/views/system/user/add.vue +++ b/src/views/system/user/add.vue @@ -268,7 +268,10 @@ const getInfo = async () => { const handleSubmit = async () => { const loading = ElLoading.service({fullscreen: true}) const {isValidate} = await form.value.validate() - if (!isValidate) return Promise.reject() + if (!isValidate) { + loading.close() + return Promise.reject() + } const values = form.value.getValues() operate(values, route.query.userType).then(res => { ElNotification({ diff --git a/vite.config.js b/vite.config.js index bd3e2fe..dae4b9a 100644 --- a/vite.config.js +++ b/vite.config.js @@ -12,89 +12,90 @@ import viteSvgIcons from 'vite-plugin-svg-icons' import path from 'path' // https://vitejs.dev/config/ export default defineConfig({ - plugins: [ - vue(), - vueJsx(), - AutoImport({ - //自动导入vue相关函数 - imports: ['vue', 'vue-router'], - resolvers: [ - ElementPlusResolver(), - //自动导入图标组件 - IconsResolver({ - prefix: 'Icon', - }), - ], + plugins: [ + vue(), + vueJsx(), + AutoImport({ + //自动导入vue相关函数 + imports: ['vue', 'vue-router'], + resolvers: [ + ElementPlusResolver(), + //自动导入图标组件 + IconsResolver({ + prefix: 'Icon', }), - Components({ - dirs: ['src/components', 'src/fvcomponents'], - resolvers: [ - // 自动注册图标组件 - IconsResolver({ - enabledRequirements: ['ep'], - }), - //自动导入组件 - ElementPlusResolver() - ], + ], + }), + Components({ + dirs: ['src/components', 'src/fvcomponents'], + resolvers: [ + // 自动注册图标组件 + IconsResolver({ + enabledRequirements: ['ep'], }), - Icons({ - autoInstall: true, - }), - viteSvgIcons({ - // 指定需要缓存的图标文件夹 - iconDirs: [path.resolve(__dirname, 'src/assets/svg')], - // 指定symbolId格式 - symbolId: 'icon-[dir]-[name]', - }), - Inspect(), - ], - resolve: { - alias: { - '@': fileURLToPath(new URL('./src', import.meta.url)) - } - }, - build: { - minify: 'esbuild', - terserOptions: { - compress: { - drop_console: false, // 生产环境移除log - drop_debugger: true // 生产环境禁用debugger - } - } - }, - server: { - host: '0.0.0.0', - port: 8888, - strictPort: false, - open: true, - proxy: { - // '/api/workflow': { - // // target: 'http://frp.feashow.cn:31800/', - // target: 'http://clay.frp.feashow.cn/', - // // target: 'http://192.168.31.175:8000', - // changeOrigin: true, - // rewrite: (path) => path.replace(/^\/api/, '') - // }, - // '/api/admin': { - // // target: 'http://frp.feashow.cn:31800/', - // target: 'http://clay.frp.feashow.cn/', - // // target: 'http://192.168.31.175:8000', - // changeOrigin: true, - // rewrite: (path) => path.replace(/^\/api/, '') - // }, - '/api': { - // target: 'http://mosr.feashow.cn', - // target: 'http://kyglweb.scgzjy.com:8080/', - target: 'http://clay.frp.feashow.cn/', - // target: 'http://10.7.127.57:8000', - changeOrigin: true, - rewrite: (path) => path.replace(/^\/api/, '') - }, - '/api/notice-ws': { - target: 'ws://mosr.feashow.cn/api/notice-ws', - ws: true, - changeOrigin: true, - } - } + //自动导入组件 + ElementPlusResolver() + ], + }), + Icons({ + autoInstall: true, + }), + viteSvgIcons({ + // 指定需要缓存的图标文件夹 + iconDirs: [path.resolve(__dirname, 'src/assets/svg')], + // 指定symbolId格式 + symbolId: 'icon-[dir]-[name]', + }), + Inspect(), + ], + resolve: { + alias: { + '@': fileURLToPath(new URL('./src', import.meta.url)) } + }, + build: { + minify: 'esbuild', + terserOptions: { + compress: { + drop_console: false, // 生产环境移除log + drop_debugger: true // 生产环境禁用debugger + } + } + }, + server: { + host: '0.0.0.0', + port: 8888, + strictPort: false, + open: true, + proxy: { + // '/api/workflow': { + // target: 'http://frp.feashow.cn:31800/', + // // target: 'http://clay.frp.feashow.cn/', + // // target: 'http://192.168.31.175:8000', + // changeOrigin: true, + // rewrite: (path) => path.replace(/^\/api/, '') + // }, + // '/api/admin': { + // target: 'http://frp.feashow.cn:31800/', + // // target: 'http://clay.frp.feashow.cn/', + // // target: 'http://192.168.31.175:8000', + // changeOrigin: true, + // rewrite: (path) => path.replace(/^\/api/, '') + // }, + '/api': { + // target: 'http://kyglweb.scgzjy.com:8080/', + target: 'http://mosr.feashow.cn', + changeOrigin: true, + // target: 'http://clay.frp.feashow.cn', + // target: 'http://frp.feashow.cn:31800/', + // changeOrigin: true, + // rewrite: (path) => path.replace(/^\/api/, '') + }, + // '/api/notice-ws': { + // target: 'ws://mosr.feashow.cn/summary/notice-ws', + // ws: true, + // changeOrigin: true, + // } + } + } })