From 32303ce9e55051bf17f5e79d4e69efc3eb492be0 Mon Sep 17 00:00:00 2001
From: Jason <5340635+wen-jason@user.noreply.gitee.com>
Date: Tue, 16 Aug 2022 12:02:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BB=A3=E7=A0=81=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E5=99=A8=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/src/components/material/index.vue   | 14 ++++++++++++++
 admin/src/router/routes.ts                | 13 -------------
 admin/src/utils/request/cancel.ts         |  1 -
 admin/src/views/dev_tools/code/edit.vue   | 17 ++++++++++++-----
 admin/src/views/permission/admin/edit.vue |  2 ++
 admin/src/views/user/setting.vue          |  2 +-
 6 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/admin/src/components/material/index.vue b/admin/src/components/material/index.vue
index 394a2d15..5bded73c 100644
--- a/admin/src/components/material/index.vue
+++ b/admin/src/components/material/index.vue
@@ -66,6 +66,19 @@
             <div class="operate-btn flex">
                 <div class="flex-1 flex">
                     <upload
+                        v-if="type == 'image'"
+                        v-perms="['common:upload:image']"
+                        class="mr-3"
+                        :data="{ cid: cateId }"
+                        :type="type"
+                        :show-progress="true"
+                        @change="refresh"
+                    >
+                        <el-button type="primary">本地上传</el-button>
+                    </upload>
+                    <upload
+                        v-if="type == 'video'"
+                        v-perms="['common:upload:video']"
                         class="mr-3"
                         :data="{ cid: cateId }"
                         :type="type"
@@ -281,6 +294,7 @@
                             删除
                         </el-button>
                         <popup
+                            v-perms="['common:album:albumMove']"
                             class="ml-3 inline"
                             @confirm="batchFileMove"
                             :disabled="!select.length"
diff --git a/admin/src/router/routes.ts b/admin/src/router/routes.ts
index 44be5645..1c54e591 100644
--- a/admin/src/router/routes.ts
+++ b/admin/src/router/routes.ts
@@ -34,19 +34,6 @@ export const constantRoutes: Array<RouteRecordRaw> = [
         path: PageEnum.LOGIN,
         component: () => import('@/views/account/login.vue')
     },
-    {
-        path: '/permission',
-        component: LAYOUT,
-        children: [
-            {
-                path: 'menu',
-                component: () => import('@/views/permission/menu/index.vue'),
-                meta: {
-                    title: '个人设置'
-                }
-            }
-        ]
-    },
     {
         path: '/user',
         component: LAYOUT,
diff --git a/admin/src/utils/request/cancel.ts b/admin/src/utils/request/cancel.ts
index a2fa6e34..b092e1d4 100644
--- a/admin/src/utils/request/cancel.ts
+++ b/admin/src/utils/request/cancel.ts
@@ -22,7 +22,6 @@ export class AxiosCancel {
             const cancel = cancelerMap.get(url)
             cancel && cancel(url)
             cancelerMap.delete(url)
-            console.log(cancelerMap)
         }
     }
 }
diff --git a/admin/src/views/dev_tools/code/edit.vue b/admin/src/views/dev_tools/code/edit.vue
index a387b1f2..b09839fa 100644
--- a/admin/src/views/dev_tools/code/edit.vue
+++ b/admin/src/views/dev_tools/code/edit.vue
@@ -357,11 +357,18 @@ const { optionsData } = useDictOptions<{
 })
 
 const handleSave = async () => {
-    await formRef.value?.validate()
-    const { base, column, gen } = formData
-    await generateEdit({ ...base, ...gen, column })
-    feedback.msgSuccess('操作成功')
-    router.back()
+    try {
+        await formRef.value?.validate()
+        const { base, column, gen } = formData
+        await generateEdit({ ...base, ...gen, column })
+        feedback.msgSuccess('操作成功')
+        router.back()
+    } catch (error: any) {
+        for (const err in error) {
+            const isInRules = Object.keys(rules).includes(err)
+            isInRules && feedback.msgError(error[err][0]?.message)
+        }
+    }
 }
 
 getDetails()
diff --git a/admin/src/views/permission/admin/edit.vue b/admin/src/views/permission/admin/edit.vue
index dec66532..6feb94a6 100644
--- a/admin/src/views/permission/admin/edit.vue
+++ b/admin/src/views/permission/admin/edit.vue
@@ -231,6 +231,8 @@ const setFormData = async (row: any) => {
             //@ts-ignore
             formData[key] = data[key]
         }
+        Number(formData.deptId) == 0 && (formData.deptId = '')
+        Number(formData.postId) == 0 && (formData.postId = '')
     }
     formRules.password = []
     formRules.passwordConfirm = []
diff --git a/admin/src/views/user/setting.vue b/admin/src/views/user/setting.vue
index 38d928da..fdb09d51 100644
--- a/admin/src/views/user/setting.vue
+++ b/admin/src/views/user/setting.vue
@@ -59,7 +59,7 @@
                 </el-form-item>
             </el-form>
         </el-card>
-        <footer-btns v-perms="['setting.web.web_setting/setAgreement']">
+        <footer-btns>
             <el-button type="primary" @click="handleSubmit">保存</el-button>
         </footer-btns>
     </div>