Merge pull request 'fix : 修复用户管理,角色管理提交时, 一直loading的bug' (#724) from dd into master

Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/724

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=>{

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({

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: [
+  plugins: [
-        vue(),
+    vue(),
-        vueJsx(),
+    vueJsx(),
-        AutoImport({
+    AutoImport({
-            //自动导入vue相关函数
+      //自动导入vue相关函数
-            imports: ['vue', 'vue-router'],
+      imports: ['vue', 'vue-router'],
-            resolvers: [
+      resolvers: [
-                ElementPlusResolver(),
+        ElementPlusResolver(),
-                //自动导入图标组件
+        //自动导入图标组件
-                IconsResolver({
+        IconsResolver({
-                    prefix: 'Icon',
+          prefix: 'Icon',
-                }),
-            ],
         }),
-        Components({
+      ],
-            dirs: ['src/components', 'src/fvcomponents'],
+    }),
-            resolvers: [
+    Components({
-                // 自动注册图标组件
+      dirs: ['src/components', 'src/fvcomponents'],
-                IconsResolver({
+      resolvers: [
-                    enabledRequirements: ['ep'],
+        // 自动注册图标组件
-                }),
+        IconsResolver({
-                //自动导入组件
+          enabledRequirements: ['ep'],
-                ElementPlusResolver()
-            ],
         }),
-        Icons({
+        //自动导入组件
-            autoInstall: true,
+        ElementPlusResolver()
-        }),
+      ],
-        viteSvgIcons({
+    }),
-            // 指定需要缓存的图标文件夹
+    Icons({
-            iconDirs: [path.resolve(__dirname, 'src/assets/svg')],
+      autoInstall: true,
-            // 指定symbolId格式
+    }),
-            symbolId: 'icon-[dir]-[name]',
+    viteSvgIcons({
-        }),
+      // 指定需要缓存的图标文件夹
-        Inspect(),
+      iconDirs: [path.resolve(__dirname, 'src/assets/svg')],
-    ],
+      // 指定symbolId格式
-    resolve: {
+      symbolId: 'icon-[dir]-[name]',
-        alias: {
+    }),
-            '@': fileURLToPath(new URL('./src', import.meta.url))
+    Inspect(),
-        }
+  ],
-    },
+  resolve: {
-    build: {
+    alias: {
-        minify: 'esbuild',
+      '@': fileURLToPath(new URL('./src', import.meta.url))
-        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,
-            }
-        }
     }
+  },
+  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,
+      // }
+    }
+  }
 })