feat: folder

Author: wangdan-fit2cloud

ui/src/api/folder.ts

@@ -40,7 +40,7 @@ const postFolder: (
   data?: any,
   loading?: Ref<boolean>,
 ) => Promise<Result<Array<any>>> = (source, data, loading) => {
-  return post(`${prefix.value}/${source}/folder`, data, loading)
+  return post(`${prefix.value}/${source}/folder`, data, null, loading)
 }
 
 /**

ui/src/api/workspace/role.ts

@@ -3,12 +3,9 @@ import type { Ref } from 'vue'
 import { Result } from '@/request/Result'
 import type {
   RoleItem,
-  RolePermissionItem,
-  CreateOrUpdateParams,
   RoleMemberItem,
   CreateMemberParamsItem,
 } from '@/api/type/role'
-import { RoleTypeEnum } from '@/enums/system'
 import type { pageRequest, PageList } from '@/api/type/common'
 
 const prefix = '/workspace/role'

ui/src/api/workspace/workspace.ts

@@ -56,10 +56,10 @@ const getWorkspaceMemberList: (
 /**
  * 获取工作空间全部成员列表
  */
-const getAllMemberList: (workspace_id: string, loading?: Ref<boolean>) => Promise<Result<any[]>> = (
-  workspace_id,
-  loading,
-) => {
+const getAllMemberList: (
+  workspace_id: string | null,
+  loading?: Ref<boolean>,
+) => Promise<Result<any[]>> = (workspace_id, loading) => {
   return get(`${prefix}/${workspace_id}/user_list`, undefined, loading)
 }
 

ui/src/components/folder-tree/CreateFolderDialog.vue

@@ -54,7 +54,7 @@ import folderApi from '@/api/folder'
 import { MsgSuccess, MsgAlert } from '@/utils/message'
 import { t } from '@/locales'
 import useStore from '@/stores'
-const { tool, knowledge } = useStore()
+const { tool, knowledge, folder } = useStore()
 const emit = defineEmits(['refresh'])
 
 const props = defineProps({
@@ -124,15 +124,17 @@ const submitHandle = async () => {
           .putFolder(editId.value, sourceType.value, folderForm.value, loading)
           .then((res) => {
             MsgSuccess(t('common.editSuccess'))
-            emit('refresh')
             clearData()
+            emit('refresh')
             dialogVisible.value = false
           })
       } else {
         folderApi.postFolder(sourceType.value, folderForm.value, loading).then((res) => {
           MsgSuccess(t('common.createSuccess'))
-          emit('refresh')
+          folder.setCurrentFolder(res.data)
+          folder.asyncGetFolder(sourceType.value, {}, loading)
           clearData()
+          emit('refresh')
           dialogVisible.value = false
         })
       }

ui/src/components/folder-tree/index.vue

@@ -51,7 +51,7 @@
               >
                 <el-dropdown trigger="click" :teleported="false">
                   <el-button text class="w-full">
-                    <el-icon class="rotate-90"><MoreFilled /></el-icon>
+                    <el-icon><MoreFilled /></el-icon>
                   </el-button>
                   <template #dropdown>
                     <el-dropdown-menu>
@@ -97,6 +97,8 @@ import folderApi from '@/api/folder'
 import { EditionConst } from '@/utils/permission/data'
 import { hasPermission } from '@/utils/permission/index'
 import useStore from '@/stores'
+import { TreeToFlatten } from '@/utils/array'
+import { MsgConfirm } from '@/utils/message'
 
 defineOptions({ name: 'FolderTree' })
 const props = defineProps({
@@ -106,7 +108,7 @@ const props = defineProps({
   },
   currentNodeKey: {
     type: String,
-    default: 'root',
+    default: 'default',
   },
   source: {
     type: String,
@@ -140,6 +142,7 @@ interface Tree {
   children?: Tree[]
   id?: string
   show?: boolean
+  parent_id?: string
 }
 
 const defaultProps = {
@@ -185,9 +188,23 @@ const handleSharedNodeClick = () => {
 }
 
 function deleteFolder(row: Tree) {
-  folderApi.delFolder(row.id as string, props.source, loading).then(() => {
-    emit('refreshTree')
-  })
+  MsgConfirm(
+    `${t('common.deleteConfirm')}：${row.name}`,
+    t('components.folder.deleteConfirmMessage'),
+    {
+      confirmButtonText: t('common.delete'),
+      confirmButtonClass: 'danger',
+    },
+  )
+    .then(() => {
+      folderApi.delFolder(row.id as string, props.source, loading).then(() => {
+        treeRef.value?.setCurrentKey(row.parent_id || 'default')
+        const prevFolder = TreeToFlatten(props.data).find((item: any) => item.id === row.parent_id)
+        folder.setCurrentFolder(prevFolder)
+        emit('refreshTree')
+      })
+    })
+    .catch(() => {})
 }
 
 const CreateFolderDialogRef = ref()

ui/src/locales/lang/en-US/common.ts

@@ -97,4 +97,5 @@ export default {
   },
   custom: 'Custom',
   moveTo: 'Move To',
+  deleteConfirm: 'Confirm delete',
 }

ui/src/locales/lang/en-US/components.ts

@@ -16,5 +16,7 @@ export default {
     folderNamePlaceholder: 'Please enter a name',
     description: 'Description',
     descriptionPlaceholder: 'Please enter a description',
+    requiredMessage: 'Please select a folder',
+    deleteConfirmMessage: 'Folders with resources will be deleted, please be cautious.',
   },
 }

ui/src/locales/lang/zh-CN/common.ts

@@ -101,4 +101,5 @@ export default {
   },
   custom: '自定义',
   moveTo: '转移到',
+  deleteConfirm: '是否删除',
 }

ui/src/locales/lang/zh-CN/components.ts

@@ -17,5 +17,6 @@ export default {
     description: '描述',
     descriptionPlaceholder: '请输入描述',
     requiredMessage: '请选择文件夹',
+    deleteConfirmMessage: '文件夹下的资源会被删除，请谨慎操作。'
   },
 }

ui/src/locales/lang/zh-Hant/common.ts

@@ -97,4 +97,5 @@ export default {
   },
   custom: '自定義',
   moveTo: '移動到',
+  deleteConfirm: '是否刪除',
 }