From 05f4580609a63d9e2cb40812fd1c49d7c7745ad4 Mon Sep 17 00:00:00 2001
From: Charles7c <charles7c@126.com>
Date: Mon, 15 Apr 2024 22:47:50 +0800
Subject: [PATCH] =?UTF-8?q?chore(system/storage):=20=E5=AE=8C=E5=96=84?=
 =?UTF-8?q?=E5=AD=98=E5=82=A8=E7=AE=A1=E7=90=86=E6=9D=83=E9=99=90=E6=8C=87?=
 =?UTF-8?q?=E4=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/directives/index.ts                       |  4 +--
 src/directives/permission/hasPerm.ts          |  4 +--
 ...ddStorageModal.vue => StorageAddModal.vue} |  7 +++++
 src/views/system/storage/index.vue            | 29 +++++++++++--------
 4 files changed, 28 insertions(+), 16 deletions(-)
 rename src/views/system/storage/{AddStorageModal.vue => StorageAddModal.vue} (96%)

diff --git a/src/directives/index.ts b/src/directives/index.ts
index 0ec1400..36e7983 100644
--- a/src/directives/index.ts
+++ b/src/directives/index.ts
@@ -4,7 +4,7 @@ import hasRole from './permission/hasRole'
 
 export default {
   install(Vue: App) {
-    Vue.directive('hasPerm', hasPerm)
-    Vue.directive('hasRole', hasRole)
+    Vue.directive('permission', hasPerm)
+    Vue.directive('role', hasRole)
   }
 }
diff --git a/src/directives/permission/hasPerm.ts b/src/directives/permission/hasPerm.ts
index 80f4582..3e39b90 100644
--- a/src/directives/permission/hasPerm.ts
+++ b/src/directives/permission/hasPerm.ts
@@ -2,8 +2,8 @@ import type { DirectiveBinding, Directive } from 'vue'
 import { useUserStore } from '@/stores'
 
 /**
- * @desc v-hasPerm 操作权限处理
- * @desc 使用 v-hasPerm="['home:btn:add']"
+ * @desc v-permission 操作权限处理
+ * @desc 使用 v-permission="['system:user:add']"
  */
 function checkPermission(el: HTMLElement, binding: DirectiveBinding) {
   const userStore = useUserStore()
diff --git a/src/views/system/storage/AddStorageModal.vue b/src/views/system/storage/StorageAddModal.vue
similarity index 96%
rename from src/views/system/storage/AddStorageModal.vue
rename to src/views/system/storage/StorageAddModal.vue
index ccb2315..97170d3 100644
--- a/src/views/system/storage/AddStorageModal.vue
+++ b/src/views/system/storage/StorageAddModal.vue
@@ -112,6 +112,13 @@ const { form, resetForm } = useForm<StorageReq>({
   name: '',
   code: '',
   type: 2,
+  accessKey: undefined,
+  secretKey: undefined,
+  endpoint: undefined,
+  bucketName: undefined,
+  domain: undefined,
+  description: undefined,
+  isDefault: false,
   sort: 999,
   status: 1
 })
diff --git a/src/views/system/storage/index.vue b/src/views/system/storage/index.vue
index 29ea166..e135647 100644
--- a/src/views/system/storage/index.vue
+++ b/src/views/system/storage/index.vue
@@ -2,7 +2,6 @@
   <div class="gi_page">
     <a-card title="存储管理" class="general-card">
       <GiTable
-        ref="tableRef"
         row-key="id"
         :data="dataList"
         :columns="columns"
@@ -27,7 +26,7 @@
           <a-button @click="reset">重置</a-button>
         </template>
         <template #custom-right>
-          <a-button type="primary" @click="onAdd">
+          <a-button v-has-perm="['system:storage:add']" type="primary" @click="onAdd">
             <template #icon><icon-plus /></template>
             <span>新增</span>
           </a-button>
@@ -48,11 +47,9 @@
         </template>
         <template #action="{ record }">
           <a-space>
-            <template #split>
-              <a-divider direction="vertical" :margin="0" />
-            </template>
-            <a-link @click="onUpdate(record)">修改</a-link>
+            <a-link v-permission="['system:storage:update']" @click="onUpdate(record)">修改</a-link>
             <a-link
+              v-permission="['system:storage:delete']"
               status="danger"
               :title="record.isDefault ? '默认存储库不能删除' : undefined"
               :disabled="record.disabled"
@@ -65,17 +62,18 @@
       </GiTable>
     </a-card>
 
-    <AddStorageModal ref="AddStorageModalRef" @save-success="search" />
+    <StorageAddModal ref="StorageAddModalRef" @save-success="search" />
   </div>
 </template>
 
 <script setup lang="ts">
 import { listStorage, deleteStorage, type StorageResp } from '@/apis'
+import StorageAddModal from './StorageAddModal.vue'
 import type { TableInstance } from '@arco-design/web-vue'
-import AddStorageModal from './AddStorageModal.vue'
 import { useTable } from '@/hooks'
 import { useDict } from '@/hooks/app'
 import { isMobile } from '@/utils'
+import has from '@/utils/has'
 import { DisEnableStatusList } from '@/constant/common'
 
 defineOptions({ name: 'Storage' })
@@ -102,7 +100,14 @@ const columns: TableInstance['columns'] = [
   { title: '创建时间', dataIndex: 'createTime', width: 180 },
   { title: '修改人', dataIndex: 'updateUserString', show: false, ellipsis: true, tooltip: true },
   { title: '修改时间', dataIndex: 'updateTime', width: 180, show: false },
-  { title: '操作', slotName: 'action', width: 130, align: 'center', fixed: !isMobile() ? 'right' : undefined }
+  {
+    title: '操作',
+    slotName: 'action',
+    width: 130,
+    show: has.hasPermOr(['system:storage:update', 'system:storage:delete']),
+    align: 'center',
+    fixed: !isMobile() ? 'right' : undefined
+  }
 ]
 
 const queryForm = reactive({
@@ -131,15 +136,15 @@ const onDelete = (item: StorageResp) => {
   return handleDelete(() => deleteStorage(item.id), { content: `是否确定删除存储 [${item.name}]？`, showModal: true })
 }
 
-const AddStorageModalRef = ref<InstanceType<typeof AddStorageModal>>()
+const StorageAddModalRef = ref<InstanceType<typeof StorageAddModal>>()
 // 新增
 const onAdd = () => {
-  AddStorageModalRef.value?.onAdd()
+  StorageAddModalRef.value?.onAdd()
 }
 
 // 修改
 const onUpdate = (item: StorageResp) => {
-  AddStorageModalRef.value?.onUpdate(item.id)
+  StorageAddModalRef.value?.onUpdate(item.id)
 }
 </script>