fix: 存储管理及菜单管理功能优化 (#6)

菜单管理功能优化： 1、建议组件名称tag可点击快捷输入 2、目录类型外链无意义，隐藏
continew-org · Apr 24, 2024 · 62d4432 · 62d4432
1 parent 9d77732
commit 62d4432
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 17 deletions.
diff --git a/src/views/system/menu/MenuAddModal.vue b/src/views/system/menu/MenuAddModal.vue
@@ -50,7 +50,7 @@
         <template #extra>
           <div v-if="routeName">
             <span>建议组件名称：</span>
-            <a-tag>{{ routeName }}</a-tag>
+            <a-tag checkable @check="inputRouteName">{{ routeName }}</a-tag>
           </div>
         </template>
       </a-form-item>
@@ -66,9 +66,9 @@
       </a-form-item>
       <a-row :gutter="16" v-if="[1, 2].includes(form.type)">
         <a-col :xs="12" :sm="12" :md="8" :lg="8" :xl="8" :xxl="8">
-          <a-form-item label="是否外链" field="isExternalUrl" v-if="[1, 2].includes(form.type)">
+          <a-form-item label="是否隐藏" field="hidden">
             <a-switch
-              v-model="form.isExternal"
+              v-model="form.isHidden"
               :checked-value="true"
               :unchecked-value="false"
               checked-text="是"
@@ -78,9 +78,9 @@
           </a-form-item>
         </a-col>
         <a-col :xs="12" :sm="12" :md="8" :lg="8" :xl="8" :xxl="8">
-          <a-form-item label="是否隐藏" field="hidden">
+          <a-form-item label="是否缓存" field="keepAlive">
             <a-switch
-              v-model="form.isHidden"
+              v-model="form.isCache"
               :checked-value="true"
               :unchecked-value="false"
               checked-text="是"
@@ -90,9 +90,9 @@
           </a-form-item>
         </a-col>
         <a-col :xs="12" :sm="12" :md="8" :lg="8" :xl="8" :xxl="8">
-          <a-form-item label="是否缓存" field="keepAlive">
+          <a-form-item label="是否外链" field="isExternalUrl" v-if="form.type === 2">
             <a-switch
-              v-model="form.isCache"
+              v-model="form.isExternal"
               :checked-value="true"
               :unchecked-value="false"
               checked-text="是"
@@ -188,6 +188,10 @@ const formRules = computed(() => {
   }
 })
 
+const inputRouteName = () => {
+  form.name = routeName.value
+}
+
 // 切换类型清除校验
 const onChangeType = () => {
   formRef.value?.clearValidate()

diff --git a/src/views/system/storage/StorageAddModal.vue b/src/views/system/storage/StorageAddModal.vue
@@ -100,7 +100,6 @@ const { width } = useWindowSize()
 const { storage_type_enum } = useDict('storage_type_enum')
 
 const dataId = ref('')
-const updatedSecretKey = ref(false)
 const isUpdate = computed(() => !!dataId.value)
 const title = computed(() => (isUpdate.value ? '修改存储' : '新增存储'))
 const formRef = ref<FormInstance>()
@@ -120,7 +119,6 @@ const { form, resetForm } = useForm<StorageReq>({
   code: '',
   type: 2,
   accessKey: undefined,
-  secretKeyEncrypted: undefined,
   secretKey: undefined,
   endpoint: undefined,
   bucketName: undefined,
@@ -154,18 +152,14 @@ const onUpdate = async (id: string) => {
   visible.value = true
 }
 
-const updateSecretKey = () => {
-  updatedSecretKey.value = true
-}
-
 // 保存
 const save = async () => {
   try {
     const isInvalid = await formRef.value?.validate()
     if (isInvalid) return false
-    const data = Object.assign({}, form)
-    if (data.type === 1) {
-      data.secretKey = updatedSecretKey.value ? encryptByRsa(form.secretKey) : form.secretKeyEncrypted
+    const data = {
+      ...form,
+      secretKey: form.type === 1 && !form.secretKey.includes('*') ? encryptByRsa(form.secretKey) : null
     }
     if (isUpdate.value) {
       await updateStorage(data, dataId.value)

diff --git a/src/views/system/storage/type.ts b/src/views/system/storage/type.ts
@@ -4,7 +4,6 @@ export interface StorageReq {
   type: number
   accessKey: string
   secretKey: string
-  secretKeyEncrypted: string
   endpoint: string
   bucketName: string
   domain: string