فهرست منبع

feat: 完善接口报错提示流程

lanjianrong 4 سال پیش
والد
کامیت
49ec0417c8
3فایلهای تغییر یافته به همراه22 افزوده شده و 17 حذف شده
  1. 14 9
      src/views/manager/permission/index.vue
  2. 1 1
      src/views/manager/user/list/index.vue
  3. 7 7
      src/views/manager/user/list/tableColumns.tsx

+ 14 - 9
src/views/manager/permission/index.vue

@@ -62,17 +62,22 @@
         formElRef.value?.resetFields()
       }
 
+      async function onSubmit(values) {
+        try {
+          if (modalType.value === 'create') {
+            await addPermGroup(toRaw(values))
+          } else {
+            await updatePermGroup(toRaw(values))
+          }
+        } catch (error) {
+          return false
+        }
+        return true
+      }
       function modalConfirm() {
         formElRef.value?.validate().then(async values => {
-          try {
-            if (modalType.value === 'create') {
-              await addPermGroup(toRaw(values))
-            } else {
-              await updatePermGroup(toRaw(values))
-            }
-          } catch (error) {
-            return
-          } finally {
+          const result = await onSubmit(values)
+          if (result) {
             await reload()
             openModal(false)
           }

+ 1 - 1
src/views/manager/user/list/index.vue

@@ -111,7 +111,7 @@
         formRef.value?.setFieldsValue(item)
       }
       const [registerTable, { reload }] = useTable({
-        columns: getTableColumns((item: ManagerItem) => handleOnEdit(item)),
+        columns: getTableColumns((item: ManagerItem) => handleOnEdit(item), permGroupList),
         canResize: true,
         api: getManagerList
       })

+ 7 - 7
src/views/manager/user/list/tableColumns.tsx

@@ -1,13 +1,13 @@
-import { ManagerItem } from '/@/api/sys/model/managerModel'
+import { ComputedRef } from 'vue'
+import { ManagerItem, PermGroupItem } from '/@/api/sys/model/managerModel'
 import Icon from '/@/components/Icon'
 import { BasicColumn } from '/@/components/Table/src/types/table'
 import { formatToDateTime } from '/@/utils/dateUtil'
-export function getTableColumns(fn: (item: ManagerItem) => void): BasicColumn[] {
+export function getTableColumns(
+  fn: (item: ManagerItem) => void,
+  permGroupList: ComputedRef<PermGroupItem[]>
+): BasicColumn[] {
   return [
-    // {
-    //   dataIndex: 'id',
-    //   title: 'Id'
-    // },
     {
       dataIndex: 'username',
       title: '用户名 (CLD)'
@@ -29,7 +29,7 @@ export function getTableColumns(fn: (item: ManagerItem) => void): BasicColumn[]
     {
       dataIndex: 'groupId',
       title: '用户组',
-      customRender: ({ text }) => <span>{text === 1 ? '超级管理员' : '管理员改'}</span>
+      customRender: ({ text }) => <span>{permGroupList.value.find(item => item.id === text)?.name}</span>
     },
     {
       dataIndex: 'opreate',