From 2018cf0eade0e906532d08fe4344950dd297e97e Mon Sep 17 00:00:00 2001
From: Charles7c <charles7c@126.com>
Date: Sat, 17 May 2025 20:23:43 +0800
Subject: [PATCH] =?UTF-8?q?fix(system/file):=20=E4=BF=AE=E5=A4=8D=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E7=A0=81=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FileRenameModal/ModalContent.vue          |  6 ++---
 .../system/file/main/FileMain/FileGrid.vue    |  3 ++-
 .../system/file/main/FileMain/FileList.vue    |  6 +++--
 .../file/main/FileMain/FileRightMenu.vue      |  2 +-
 src/views/system/file/main/FileMain/index.vue | 22 +++++++++----------
 5 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/src/views/system/file/components/FileRenameModal/ModalContent.vue b/src/views/system/file/components/FileRenameModal/ModalContent.vue
index 462250d..7467415 100644
--- a/src/views/system/file/components/FileRenameModal/ModalContent.vue
+++ b/src/views/system/file/components/FileRenameModal/ModalContent.vue
@@ -2,12 +2,12 @@
   <a-row justify="center" align="center" style="padding: 0 5%">
     <a-form ref="formRef" :model="form" auto-label-width class="w-full">
       <a-form-item
-        label="文件名称"
+        label="名称"
         field="originalName"
-        :rules="[{ required: true, message: '请输入文件名称' }]"
+        :rules="[{ required: true, message: '请输入名称' }]"
         style="margin-bottom: 0"
       >
-        <a-input v-model="form.originalName" placeholder="请输入文件名称" allow-clear />
+        <a-input v-model="form.originalName" placeholder="请输入名称" allow-clear />
       </a-form-item>
     </a-form>
   </a-row>
diff --git a/src/views/system/file/main/FileMain/FileGrid.vue b/src/views/system/file/main/FileMain/FileGrid.vue
index 0371dd6..baf53d5 100644
--- a/src/views/system/file/main/FileMain/FileGrid.vue
+++ b/src/views/system/file/main/FileMain/FileGrid.vue
@@ -31,7 +31,7 @@
             </section>
           </div>
         </a-grid-item>
-        <template #content>
+        <template v-if="has.hasPermOr(['system:file:update', 'system:file:get', 'system:file:download', 'system:file:delete'])" #content>
           <FileRightMenu :data="item" @click="handleRightMenuClick($event, item)"></FileRightMenu>
         </template>
       </a-trigger>
@@ -42,6 +42,7 @@
 <script setup lang="ts">
 import FileRightMenu from './FileRightMenu.vue'
 import type { FileItem } from '@/apis/system'
+import has from '@/utils/has'
 
 const props = withDefaults(defineProps<Props>(), {
   data: () => [], // 文件数据
diff --git a/src/views/system/file/main/FileMain/FileList.vue b/src/views/system/file/main/FileMain/FileList.vue
index 336115c..5992cc0 100644
--- a/src/views/system/file/main/FileMain/FileList.vue
+++ b/src/views/system/file/main/FileMain/FileList.vue
@@ -32,7 +32,7 @@
                   {{ record.originalName }}
                 </a-typography-paragraph>
               </section>
-              <template #content>
+              <template v-if="has.hasPermOr(['system:file:update', 'system:file:get', 'system:file:download', 'system:file:delete'])" #content>
                 <FileRightMenu :data="record" @click="handleRightMenuClick($event, record)"></FileRightMenu>
               </template>
             </a-trigger>
@@ -51,12 +51,13 @@
         </a-table-column>
         <a-table-column title="存储名称" data-index="storageName" :width="200" />
         <a-table-column title="修改时间" data-index="updateTime" :width="200" />
-        <a-table-column title="操作" :width="120" align="center">
+        <a-table-column v-if="has.hasPermOr(['system:file:update', 'system:file:get', 'system:file:download', 'system:file:delete'])" title="操作" :width="120" align="center">
           <template #cell="{ record }">
             <a-popover trigger="click" position="bottom" :content-style="{ 'padding': 0, 'margin-top': 0 }">
               <a-button type="text" @click.stop><icon-more :size="16" /></a-button>
               <template #content>
                 <FileRightMenu
+                  :data="record"
                   :file-info="record"
                   :shadow="false"
                   @click="handleRightMenuClick($event, record)"
@@ -75,6 +76,7 @@ import { Message, type TableInstance, type TableRowSelection } from '@arco-desig
 import FileRightMenu from './FileRightMenu.vue'
 import { type FileItem, calcDirSize } from '@/apis/system'
 import { formatFileSize } from '@/utils'
+import has from '@/utils/has'
 
 const props = withDefaults(defineProps<Props>(), {
   data: () => [], // 文件数据
diff --git a/src/views/system/file/main/FileMain/FileRightMenu.vue b/src/views/system/file/main/FileMain/FileRightMenu.vue
index 2c350b6..86c159e 100644
--- a/src/views/system/file/main/FileMain/FileRightMenu.vue
+++ b/src/views/system/file/main/FileMain/FileRightMenu.vue
@@ -2,7 +2,7 @@
   <GiOption :class="{ shadow: props.shadow }">
     <GiOptionItem v-permission="['system:file:update']" label="重命名" @click="onClickItem('rename')"> </GiOptionItem>
     <GiOptionItem v-permission="['system:file:get']" label="详情" @click="onClickItem('detail')"> </GiOptionItem>
-    <GiOptionItem v-permission="['system:file:download']" label="下载" @click="onClickItem('download')"></GiOptionItem>
+    <GiOptionItem v-if="data?.type !== 0" v-permission="['system:file:download']" label="下载" @click="onClickItem('download')"></GiOptionItem>
     <GiOptionItem v-permission="['system:file:delete']" label="删除" @click="onClickItem('delete')"> </GiOptionItem>
   </GiOption>
 </template>
diff --git a/src/views/system/file/main/FileMain/index.vue b/src/views/system/file/main/FileMain/index.vue
index 1e780e0..98d4553 100644
--- a/src/views/system/file/main/FileMain/index.vue
+++ b/src/views/system/file/main/FileMain/index.vue
@@ -12,18 +12,16 @@
     <a-row justify="space-between" class="file-main__search">
       <!-- 左侧区域 -->
       <a-space wrap>
-        <a-dropdown v-permission="['system:file:upload']">
-          <a-upload :show-file-list="false" :custom-request="handleUpload">
-            <template #upload-button>
-              <a-button type="primary" shape="round">
-                <template #icon>
-                  <icon-upload />
-                </template>
-                <template #default>上传</template>
-              </a-button>
-            </template>
-          </a-upload>
-        </a-dropdown>
+        <a-upload v-permission="['system:file:upload']" :show-file-list="false" :custom-request="handleUpload">
+          <template #upload-button>
+            <a-button type="primary" shape="round">
+              <template #icon>
+                <icon-upload />
+              </template>
+              <template #default>上传</template>
+            </a-button>
+          </template>
+        </a-upload>
 
         <a-input-group>
           <a-input v-model="queryForm.originalName" :placeholder="queryForm.type && queryForm.type !== '0' ? '请输入名称' : '在当前目录下搜索名称'" allow-clear style="width: 200px" />