feat: 添加提交前验证

yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm

@@ -50,6 +50,10 @@
 
   // 提交按钮
   const submitForm = async () => {
+    const elForm = unref(formRef)?.getElFormRef()
+    if (!elForm) return
+    elForm.validate(async (valid) => {
+      if (valid) {
         actionLoading.value = true
         // 提交请求
         try {
@@ -68,6 +72,8 @@
           actionLoading.value = false
         }
       }
+    })
+  }
 
   // ========== 详情相关 ==========
   const detailRef = ref() // 详情 Ref

yudao-ui-admin-vue3/src/config/axios/index.ts

@@ -128,12 +128,18 @@ service.interceptors.response.use(
           const refreshTokenRes = await refreshToken()
           // 2.1 刷新成功，则回放队列的请求 + 当前请求
           setToken(refreshTokenRes.data)
-          requestList.forEach((cb: any) => cb())
+          ;(config as Recordable).headers.Authorization = 'Bearer ' + getAccessToken()
+          requestList.forEach((cb: any) => {
+            cb()
+          })
+          requestList = []
           return service(response.config)
         } catch (e) {
           // 为什么需要 catch 异常呢？刷新失败时，请求因为 Promise.reject 触发异常。
           // 2.2 刷新失败，只回放队列的请求
-          requestList.forEach((cb: any) => cb())
+          requestList.forEach((cb: any) => {
+            cb()
+          })
           // 提示是否要登出。即不回放当前请求！不然会形成递归
           return handleAuthorized()
         } finally {
@@ -194,10 +200,7 @@ service.interceptors.response.use(
 )
 
 const refreshToken = async () => {
-  return await service({
+  return await axios.post(base_url + '/system/auth/refresh-token?refreshToken=' + getRefreshToken())
-    url: '/system/auth/refresh-token?refreshToken=' + getRefreshToken(),
-    method: 'post'
-  })
 }
 const handleAuthorized = () => {
   const { t } = useI18n()

yudao-ui-admin-vue3/src/views/Login/components/LoginForm.vue

@@ -111,6 +111,10 @@ const handleLogin = async (params) => {
   }
   loginData.loginForm.captchaVerification = params.captchaVerification
   const res = await LoginApi.loginApi(loginData.loginForm)
+  if (!res) {
+    loginLoading.value = false
+    return
+  }
   setToken(res)
   if (!redirect.value) {
     redirect.value = '/'

yudao-ui-admin-vue3/src/views/bpm/form/index.vue

@@ -49,6 +49,10 @@ const handleUpdate = async (row: FormVO) => {
 
 // 提交按钮
 const submitForm = async () => {
+  const elForm = unref(formRef)?.getElFormRef()
+  if (!elForm) return
+  elForm.validate(async (valid) => {
+    if (valid) {
       actionLoading.value = true
       // 提交请求
       try {
@@ -66,6 +70,8 @@ const submitForm = async () => {
       } finally {
         actionLoading.value = false
       }
+    }
+  })
 }
 
 // ========== 详情相关 ==========

yudao-ui-admin-vue3/src/views/bpm/group/index.vue

@@ -62,6 +62,10 @@ const handleUpdate = async (row: UserGroupVO) => {
 
 // 提交按钮
 const submitForm = async () => {
+  const elForm = unref(formRef)?.getElFormRef()
+  if (!elForm) return
+  elForm.validate(async (valid) => {
+    if (valid) {
       actionLoading.value = true
       // 提交请求
       try {
@@ -80,6 +84,8 @@ const submitForm = async () => {
       } finally {
         actionLoading.value = false
       }
+    }
+  })
 }
 
 // 根据用户名获取用户真实名

yudao-ui-admin-vue3/src/views/bpm/model/index.vue

@@ -51,6 +51,10 @@ const handleUpdate = async (row: ModelVO) => {
 
 // 提交按钮
 const submitForm = async () => {
+  const elForm = unref(formRef)?.getElFormRef()
+  if (!elForm) return
+  elForm.validate(async (valid) => {
+    if (valid) {
       actionLoading.value = true
       // 提交请求
       try {
@@ -68,6 +72,8 @@ const submitForm = async () => {
       } finally {
         actionLoading.value = false
       }
+    }
+  })
 }
 
 /** 流程表单的详情按钮操作 */

yudao-ui-admin-vue3/src/views/infra/config/index.vue

@@ -50,6 +50,10 @@ const handleUpdate = async (row: ConfigVO) => {
 
 // 提交按钮
 const submitForm = async () => {
+  const elForm = unref(formRef)?.getElFormRef()
+  if (!elForm) return
+  elForm.validate(async (valid) => {
+    if (valid) {
       actionLoading.value = true
       // 提交请求
       try {
@@ -67,6 +71,8 @@ const submitForm = async () => {
       } finally {
         actionLoading.value = false
       }
+    }
+  })
 }
 
 // ========== 详情相关 ==========

yudao-ui-admin-vue3/src/views/infra/dataSourceConfig/index.vue

@@ -44,6 +44,10 @@ const handleUpdate = async (row: DataSourceConfigVO) => {
 
 // 提交按钮
 const submitForm = async () => {
+  const elForm = unref(formRef)?.getElFormRef()
+  if (!elForm) return
+  elForm.validate(async (valid) => {
+    if (valid) {
       loading.value = true
       // 提交请求
       try {
@@ -61,6 +65,8 @@ const submitForm = async () => {
       } finally {
         loading.value = false
       }
+    }
+  })
 }
 
 // 删除操作

yudao-ui-admin-vue3/src/views/infra/fileConfig/index.vue

@@ -60,6 +60,10 @@ const handleMaster = (row: FileConfigVO) => {
 
 // 提交按钮
 const submitForm = async () => {
+  const elForm = unref(formRef)?.getElFormRef()
+  if (!elForm) return
+  elForm.validate(async (valid) => {
+    if (valid) {
       actionLoading.value = true
       // 提交请求
       try {
@@ -77,6 +81,8 @@ const submitForm = async () => {
       } finally {
         actionLoading.value = false
       }
+    }
+  })
 }
 
 // ========== 详情相关 ==========

yudao-ui-admin-vue3/src/views/infra/job/index.vue

@@ -98,6 +98,10 @@ const handleRun = (row: JobVO) => {
 }
 // 提交按钮
 const submitForm = async () => {
+  const elForm = unref(formRef)?.getElFormRef()
+  if (!elForm) return
+  elForm.validate(async (valid) => {
+    if (valid) {
       actionLoading.value = true
       // 提交请求
       try {
@@ -116,6 +120,8 @@ const submitForm = async () => {
       } finally {
         actionLoading.value = false
       }
+    }
+  })
 }
 
 // ========== 详情相关 ==========

yudao-ui-admin-vue3/src/views/pay/app/index.vue

@@ -50,6 +50,10 @@ const handleUpdate = async (row: AppVO) => {
 
 // 提交按钮
 const submitForm = async () => {
+  const elForm = unref(formRef)?.getElFormRef()
+  if (!elForm) return
+  elForm.validate(async (valid) => {
+    if (valid) {
       actionLoading.value = true
       // 提交请求
       try {
@@ -67,6 +71,8 @@ const submitForm = async () => {
       } finally {
         actionLoading.value = false
       }
+    }
+  })
 }
 
 // ========== 详情相关 ==========

yudao-ui-admin-vue3/src/views/pay/merchant/index.vue

@@ -50,6 +50,10 @@ const handleUpdate = async (row: MerchantVO) => {
 
 // 提交按钮
 const submitForm = async () => {
+  const elForm = unref(formRef)?.getElFormRef()
+  if (!elForm) return
+  elForm.validate(async (valid) => {
+    if (valid) {
       actionLoading.value = true
       // 提交请求
       try {
@@ -67,6 +71,8 @@ const submitForm = async () => {
       } finally {
         actionLoading.value = false
       }
+    }
+  })
 }
 
 // ========== 详情相关 ==========

yudao-ui-admin-vue3/src/views/pay/order/index.vue

@@ -48,6 +48,10 @@ const handleUpdate = async (row: OrderVO) => {
 
 // 提交按钮
 const submitForm = async () => {
+  const elForm = unref(formRef)?.getElFormRef()
+  if (!elForm) return
+  elForm.validate(async (valid) => {
+    if (valid) {
       actionLoading.value = true
       // 提交请求
       try {
@@ -65,6 +69,8 @@ const submitForm = async () => {
       } finally {
         actionLoading.value = false
       }
+    }
+  })
 }
 
 // ========== 详情相关 ==========

yudao-ui-admin-vue3/src/views/system/dept/index.vue

@@ -82,6 +82,10 @@ const handleDelete = async (data: { id: number }) => {
 }
 // 提交按钮
 const submitForm = async () => {
+  const elForm = unref(formRef)?.getElFormRef()
+  if (!elForm) return
+  elForm.validate(async (valid) => {
+    if (valid) {
       loading.value = true
       // 提交请求
       try {
@@ -98,6 +102,8 @@ const submitForm = async () => {
       } finally {
         loading.value = false
       }
+    }
+  })
 }
 onMounted(async () => {
   await getTree()

yudao-ui-admin-vue3/src/views/system/dict/index.vue

@@ -92,6 +92,10 @@ const setDialogTile = (type: string) => {
 }
 // 提交按钮
 const submitTypeForm = async () => {
+  const elForm = unref(typeFormRef)?.getElFormRef()
+  if (!elForm) return
+  elForm.validate(async (valid) => {
+    if (valid) {
       actionLoading.value = true
       // 提交请求
       try {
@@ -109,8 +113,14 @@ const submitTypeForm = async () => {
       } finally {
         actionLoading.value = false
       }
+    }
+  })
 }
 const submitDataForm = async () => {
+  const elForm = unref(dataFormRef)?.getElFormRef()
+  if (!elForm) return
+  elForm.validate(async (valid) => {
+    if (valid) {
       actionLoading.value = true
       // 提交请求
       try {
@@ -129,6 +139,8 @@ const submitDataForm = async () => {
       } finally {
         actionLoading.value = false
       }
+    }
+  })
 }
 // 初始化查询
 onMounted(async () => {

yudao-ui-admin-vue3/src/views/system/errorCode/index.vue

@@ -49,6 +49,10 @@ const handleUpdate = async (row: ErrorCodeVO) => {
 
 // 提交按钮
 const submitForm = async () => {
+  const elForm = unref(formRef)?.getElFormRef()
+  if (!elForm) return
+  elForm.validate(async (valid) => {
+    if (valid) {
       loading.value = true
       // 提交请求
       try {
@@ -66,6 +70,8 @@ const submitForm = async () => {
       } finally {
         loading.value = false
       }
+    }
+  })
 }
 
 // ========== 详情相关 ==========

yudao-ui-admin-vue3/src/views/system/menu/index.vue

@@ -127,7 +127,7 @@ const handleDelete = async (row: MenuVO) => {
   await getList()
 }
 // 保存操作
-function isExternal(path: string) {
+const isExternal = (path: string) => {
   return /^(https?:|mailto:|tel:)/.test(path)
 }
 const submitForm = async () => {

yudao-ui-admin-vue3/src/views/system/notice/index.vue

@@ -48,6 +48,10 @@ const handleUpdate = async (row: NoticeVO) => {
 
 // 提交按钮
 const submitForm = async () => {
+  const elForm = unref(formRef)?.getElFormRef()
+  if (!elForm) return
+  elForm.validate(async (valid) => {
+    if (valid) {
       actionLoading.value = true
       // 提交请求
       try {
@@ -65,6 +69,8 @@ const submitForm = async () => {
       } finally {
         actionLoading.value = false
       }
+    }
+  })
 }
 
 // ========== 详情相关 ==========

yudao-ui-admin-vue3/src/views/system/oauth2/client/index.vue

@@ -49,6 +49,10 @@ const handleUpdate = async (row: OAuth2ClientVo) => {
 
 // 提交按钮
 const submitForm = async () => {
+  const elForm = unref(formRef)?.getElFormRef()
+  if (!elForm) return
+  elForm.validate(async (valid) => {
+    if (valid) {
       actionLoading.value = true
       // 提交请求
       try {
@@ -66,6 +70,8 @@ const submitForm = async () => {
       } finally {
         actionLoading.value = false
       }
+    }
+  })
 }
 
 // ========== 详情相关 ==========

yudao-ui-admin-vue3/src/views/system/post/index.vue

@@ -50,6 +50,10 @@ const handleUpdate = async (row: PostVO) => {
 
 // 提交按钮
 const submitForm = async () => {
+  const elForm = unref(formRef)?.getElFormRef()
+  if (!elForm) return
+  elForm.validate(async (valid) => {
+    if (valid) {
       actionLoading.value = true
       // 提交请求
       try {
@@ -67,6 +71,8 @@ const submitForm = async () => {
       } finally {
         actionLoading.value = false
       }
+    }
+  })
 }
 
 // ========== 详情相关 ==========

yudao-ui-admin-vue3/src/views/system/role/index.vue

@@ -68,6 +68,10 @@ const handleUpdate = async (row: RoleVO) => {
 
 // 提交按钮
 const submitForm = async () => {
+  const elForm = unref(formRef)?.getElFormRef()
+  if (!elForm) return
+  elForm.validate(async (valid) => {
+    if (valid) {
       loading.value = true
       // 提交请求
       try {
@@ -85,6 +89,8 @@ const submitForm = async () => {
       } finally {
         loading.value = false
       }
+    }
+  })
 }
 
 // ========== 详情相关 ==========

yudao-ui-admin-vue3/src/views/system/sensitiveWord/index.vue

@@ -56,6 +56,10 @@ const handleUpdate = async (row: SensitiveWordVO) => {
 
 // 提交按钮
 const submitForm = async () => {
+  const elForm = unref(formRef)?.getElFormRef()
+  if (!elForm) return
+  elForm.validate(async (valid) => {
+    if (valid) {
       actionLoading.value = true
       // 提交请求
       try {
@@ -73,6 +77,8 @@ const submitForm = async () => {
       } finally {
         actionLoading.value = false
       }
+    }
+  })
 }
 
 // ========== 详情相关 ==========

yudao-ui-admin-vue3/src/views/system/sms/smsChannel/index.vue

@@ -49,6 +49,10 @@ const handleUpdate = async (row: SmsChannelVO) => {
 
 // 提交按钮
 const submitForm = async () => {
+  const elForm = unref(formRef)?.getElFormRef()
+  if (!elForm) return
+  elForm.validate(async (valid) => {
+    if (valid) {
       loading.value = true
       // 提交请求
       try {
@@ -66,6 +70,8 @@ const submitForm = async () => {
       } finally {
         loading.value = false
       }
+    }
+  })
 }
 
 // ========== 详情相关 ==========

yudao-ui-admin-vue3/src/views/system/sms/smsTemplate/index.vue

@@ -49,6 +49,10 @@ const handleUpdate = async (row: SmsTemplateVO) => {
 
 // 提交按钮
 const submitForm = async () => {
+  const elForm = unref(formRef)?.getElFormRef()
+  if (!elForm) return
+  elForm.validate(async (valid) => {
+    if (valid) {
       loading.value = true
       // 提交请求
       try {
@@ -66,6 +70,8 @@ const submitForm = async () => {
       } finally {
         loading.value = false
       }
+    }
+  })
 }
 
 // ========== 详情相关 ==========

yudao-ui-admin-vue3/src/views/system/tenant/index.vue

@@ -71,8 +71,12 @@ const handleUpdate = async (row: any) => {
 
 // 提交按钮
 const submitForm = async () => {
+  const elForm = unref(formRef)?.getElFormRef()
+  if (!elForm) return
+  elForm.validate(async (valid) => {
+    if (valid) {
       actionLoading.value = true
-  // 提交请求 unix()
+      // 提交请求
       try {
         const data = unref(formRef)?.formModel as TenantVO
         data.packageId = tenantPackageId.value
@@ -91,6 +95,8 @@ const submitForm = async () => {
       } finally {
         actionLoading.value = false
       }
+    }
+  })
 }
 
 // ========== 详情相关 ==========

yudao-ui-admin-vue3/src/views/system/tenantPackage/index.vue

@@ -76,6 +76,10 @@ const handleUpdate = async (row: any) => {
 }
 // 提交按钮
 const submitForm = async () => {
+  const elForm = unref(formRef)?.getElFormRef()
+  if (!elForm) return
+  elForm.validate(async (valid) => {
+    if (valid) {
       loading.value = true
       // 提交请求
       try {
@@ -94,6 +98,8 @@ const submitForm = async () => {
       } finally {
         loading.value = false
       }
+    }
+  })
 }
 
 // ========== 初始化 ==========