From 65917d281bf7b0ad5b12185d48e19663b39e23e2 Mon Sep 17 00:00:00 2001
From: Charles7c <charles7c@126.com>
Date: Sun, 19 May 2024 22:59:14 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/dict/index.vue               |  2 +-
 src/views/system/dict/tree/index.vue          |  4 +--
 src/views/system/file/main/FileMain/index.vue | 30 +++++++++----------
 src/views/system/menu/index.vue               |  2 +-
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index 09e044a..a912cf3 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -94,7 +94,7 @@ const columns: TableInstanceColumns[] = [
   },
   { title: '标签', dataIndex: 'label', slotName: 'label', width: 100, align: 'center' },
   { title: '值', dataIndex: 'value', width: 100, align: 'center', ellipsis: true, tooltip: true },
-  { title: '状态', slotName: 'status', width: 90, align: 'center' },
+  { title: '状态', slotName: 'status', width: 80, align: 'center' },
   {
     title: '排序',
     dataIndex: 'sort',
diff --git a/src/views/system/dict/tree/index.vue b/src/views/system/dict/tree/index.vue
index 88775f0..e1d6aa5 100644
--- a/src/views/system/dict/tree/index.vue
+++ b/src/views/system/dict/tree/index.vue
@@ -13,9 +13,9 @@
             <a-trigger v-model:popup-visible="node.popupVisible" trigger="contextMenu" align-point
               animation-name="slide-dynamic-origin" auto-fit-transform-origin position="bl" scroll-to-close>
               <a-tooltip v-if="node.description" :content="node.description" background-color="rgb(var(--primary-6))" position="right">
-                <div @contextmenu="onContextmenu(node)">{{ node.name }}（{{ node.code }}）</div>
+                <div @contextmenu="onContextmenu(node)">{{ node.name }} ({{ node.code }})</div>
               </a-tooltip>
-              <div v-else @contextmenu="onContextmenu(node)">{{ node.name }}（{{ node.code }}）</div>
+              <div v-else @contextmenu="onContextmenu(node)">{{ node.name }} ({{ node.code }})</div>
               <template #content>
                 <RightMenu v-if="has.hasPermOr(['system:dict:update', 'system:dict:delete'])" :data="node"
                   @on-menu-item-click="onMenuItemClick" />
diff --git a/src/views/system/file/main/FileMain/index.vue b/src/views/system/file/main/FileMain/index.vue
index 9468838..0d2b38a 100644
--- a/src/views/system/file/main/FileMain/index.vue
+++ b/src/views/system/file/main/FileMain/index.vue
@@ -85,7 +85,7 @@ import {
 import FileGrid from './FileGrid.vue'
 import useFileManage from './useFileManage'
 import { useTable } from '@/hooks'
-import { type FileItem, type FilePageQuery, type FileQuery, deleteFile, listFile, uploadFile } from '@/apis'
+import { type FileItem, type FileQuery, deleteFile, listFile, uploadFile } from '@/apis'
 import { ImageTypes } from '@/constant/file'
 import 'viewerjs/dist/viewer.css'
 import { downloadByUrl } from '@/utils/downloadFile'
@@ -187,19 +187,19 @@ const handleMulDelete = () => {
 const handleUpload = (options: RequestOption) => {
   const controller = new AbortController()
     ; (async function requestWrap() {
-      const { onProgress, onError, onSuccess, fileItem, name = 'file' } = options
-      onProgress(20)
-      const formData = new FormData()
-      formData.append(name as string, fileItem.file as Blob)
-      try {
-        const res = await uploadFile(formData)
-        Message.success('上传成功')
-        onSuccess(res)
-        search()
-      } catch (error) {
-        onError(error)
-      }
-    })()
+    const { onProgress, onError, onSuccess, fileItem, name = 'file' } = options
+    onProgress(20)
+    const formData = new FormData()
+    formData.append(name as string, fileItem.file as Blob)
+    try {
+      const res = await uploadFile(formData)
+      Message.success('上传成功')
+      onSuccess(res)
+      search()
+    } catch (error) {
+      onError(error)
+    }
+  })()
   return {
     abort() {
       controller.abort()
@@ -243,7 +243,7 @@ onMounted(() => {
   }
 
   .pagination {
-    margin: 10px 0;
+    padding: 0 var(--padding) var(--padding);
 
     :deep(.arco-pagination) {
       justify-content: end;
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index f9fd3e0..c6d6aea 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -71,7 +71,7 @@
       <template #action="{ record }">
         <a-space>
           <a-link v-permission="['system:menu:update']" @click="onUpdate(record)">修改</a-link>
-          <a-link v-if="[1, 2].includes(record.type)" v-permission="['system:menu:add']" @click="onAdd(record.id)">
+          <a-link v-permission="['system:menu:add']" :disabled="![1, 2].includes(record.type)" @click="onAdd(record.id)">
             新增
           </a-link>
           <a-link v-permission="['system:menu:delete']" status="danger" @click="onDelete(record)">删除</a-link>