云盘：支持个人和空间直接文件移动

src/api/doc/index.ts

@@ -189,3 +189,18 @@ export function postMatterRename(uid:string,data?: {uuid:string;name:string}){
     data: data
   });
 }
+
+/**
+ * 移动文件
+ */
+export function postMatterMove(uid:string,data?: {srcUuids:string;destUuid:string}){
+  return request({
+    url: '/hxpan/api/matter/move',
+    method: 'post',
+    headers: {
+      'Identifier':uid,
+      'Content-Type': 'application/x-www-form-urlencoded'
+    },
+    data: data
+  });
+}

src/api/doc/type.ts

@@ -15,6 +15,7 @@ export interface matterPage{
     deleted?:boolean;
     orderDir?:string;
     name?:string;
+    dir?:string;// ‘true’ or ‘false’ 字符串，表示是否只查询文件夹或文件 
     space?:string;
     orderCreateTime?:string;
 }
@@ -89,12 +90,13 @@ export interface respCreateShare{
 /**
  * 文件上传
  */
-export function doFileUpload(params:FormData,_url:string): AxiosPromise<matterInfo> {
+export function doFileUpload(uid:string,params:FormData,_url:string): AxiosPromise<matterInfo> {
 	return request({
 		url: _url,
     method: 'post',
     data: params,
     headers: {
+      'Identifier':uid,
       'Content-Type': 'multipart/form-data'
     }
   });

src/views/doc/manage.vue

@@ -7,7 +7,7 @@
 import { getExpirTime, getFileIcon, readableSize,fileType} from "./tools"
 import sharePermission from './sharePermission.vue';
 import { useUserStore } from "@/store/modules/user";
-import { getMatterList,postCreateDir,postDelMatter,postCreateShare,postMatterRename,
+import { getMatterList,postCreateDir,postDelMatter,postCreateShare,postMatterRename,postMatterMove,
   postDelMatBatch,getMySpaces,doCreateSpace,getRecyclingList} from "@/api/doc/index"
 import { matterPage,matterInfo,respCreateShare,matterTree, doFileUpload,matterPermit} from "@/api/doc/type"
 import { h } from 'vue'
@@ -28,6 +28,7 @@ import SvgIcon from "@/components/SvgIcon/index.vue";
 import {doDelSpace,doAccessManage,doCreateAiagent,setAgentQueryURL,getAgentQueryURL} from "@/api/doc/space"
 import Space from "./space.vue";
 import Logpanel from "./logpanel.vue";
+import Movepanel from "./movepanel.vue";
 
 //TODO: add file icons  done!
 //TODO: click on table-item， 1）preview on file .....................
@@ -279,6 +280,30 @@ function onMatterRename(row:matterInfo){
   })
 }
 
+//文件移动
+function onMoveFile(row:matterInfo){
+  const dstuuid=ref(row.puuid)
+  ElMessageBox({
+    customStyle: { '--el-messagebox-width':'800px',padding:'40px'},
+    message:() => h(Movepanel,{
+      style: { width:'100%' },
+      modelValue: dstuuid.value,
+      'onUpdate:modelValue': (val) => {
+        dstuuid.value = val
+      },
+    }),
+  }).then(() => {
+    if(dstuuid.value!=row.puuid){
+      postMatterMove(uid,{
+        srcUuids:row.uuid,
+        destUuid:dstuuid.value as string,
+      }).then(()=>onLoadMatterList())
+    }else{
+      alert("目录相同不需要移动")
+    }
+  })
+}
+
 //加载文件列表
 function onSearchFile(name?:string){
   let _page: matterPage = {
@@ -600,7 +625,7 @@ async function handleSingleFile(ff:File){
   fields.append("puuid",uploadFormData.value.puuid)
   fields.append("file",ff)
   
-  const res = await doFileUpload(fields,'/hxpan/api/matter/upload')
+  const res = await doFileUpload(uid,fields,'/hxpan/api/matter/upload')
   if(res.code!=200){
     console.log(ff.name+"上传失败! ")
     throw new Error(ff.name+"上传失败!<br> ")
@@ -665,7 +690,7 @@ async function handleFolderFile(option:File){
   fields.append('file', option)
   fields.append("space",uploadFormData.value.space)
   fields.append("puuid",puuid)
-  const res = await doFileUpload(fields,'/hxpan/api/matter/upload')
+  const res = await doFileUpload(uid,fields,'/hxpan/api/matter/upload')
   if(res.code!=200){
     console.log(_path+"上传失败! ")
     throw new Error(_path +" 上传失败!<br> ")
@@ -1099,6 +1124,7 @@ const handleSelectionChange = (val:matterInfo[]) => {
                 <el-button size="small" :icon="Share" circle @click="onShareMatter(scope.row)"></el-button>
                 <el-button size="small" :icon="Download" circle @click="onDownload(scope.row)"></el-button>
                 <el-button size="small" :icon="Edit" circle @click="onlyOfficeEdit(scope.row)"></el-button>
+                <el-button size="small" circle @click="onMoveFile(scope.row)">移</el-button>
                 <el-button size="small" :icon="Delete" circle @click="onDelMatter(scope.row)"></el-button> 
                 <el-button size="small" circle @click="onMatterRename(scope.row)">改</el-button>
               </span>
@@ -1137,6 +1163,7 @@ const handleSelectionChange = (val:matterInfo[]) => {
               <li @click="onShareMatter(row)">分享</li>
               <li @click="onDownload(row)">下载</li>
               <li @click="onlyOfficeEdit(row)">编辑</li>
+              <li @click="onMoveFile(row)">移动</li>
               <li @click="onDelMatter(row)">删除</li>
               <li @click="onMatterRename(row)">重命名</li>
             </span>
@@ -1255,6 +1282,7 @@ const handleSelectionChange = (val:matterInfo[]) => {
   display: flex;
   flex-wrap: wrap; /* 关键属性，允许子元素自动换行 */
   align-content: flex-start;
+  min-height: 500px;
   .grid-item{
     position: relative;
     width: 134px;

src/views/doc/movepanel.vue

@@ -0,0 +1,344 @@
+<!--
+@ 作者: han2015
+@ 时间: 2025-05-12 15:39:13
+@ 备注: 文档管理组件
+-->
+<script lang="ts" setup>
+import { useUserStore } from "@/store/modules/user";
+import { getMatterList,getMySpaces} from "@/api/doc/index"
+import { matterPage,matterInfo,matterTree,matterPermit} from "@/api/doc/type"
+import Space from "./space.vue";
+import {ElSelect,ElOption, ElText,ElInput,ElTree,TreeNode,ElDropdown,ElDropdownItem} from "element-plus";
+import { doAccessManage,getSpaceMatterList,doCreateSpaceDir,doDelSpaceMatter,
+  doAiTraining,doAiDocDels,spaceMatterRename} from "@/api/doc/space"
+
+//定义事件
+defineProps({
+  modelValue: String        // 接收父组件的值
+})
+const emit = defineEmits(['update:modelValue'])
+
+const userStore = useUserStore();
+const uid=btoa("p0"+userStore.userInfoCont.userId);
+const rawUid="p0"+userStore.userInfoCont.userId
+
+const matterList = ref<matterInfo[]>([])
+const treeData=ref<matterTree[]>([])//{name:'个人空间',uuid:'root',children:[]}
+const currentNode=ref<matterTree>({})  //打开的路径层次
+const paginInfo = ref({ page: 0, total: 0 })
+
+const SpaceID= ref<{name:string,uuid:string,userUuid:string,manager:boolean,permits:matterPermit}>({})  //当前space的id
+const spaceEleRef = ref() //space组件的引用,它与spaceTreeRef没有父子关系，反而是为了处理spaceTree的操作而创建的该变量
+const spaceTreeRef = ref(); //space的树组件的引用
+let spaceNodeUid="" //用来判断树组件的展开和关闭，如何只是展开和关闭的点击事件不在刷新，通currentNode的作用
+let isNewSpaceNode=true //用来减少父组件树的重置
+const spaceCutLevelPermit=ref(0)
+
+const Departs = computed(() => {
+    return `${'p0'+userStore.userInfoCont.userId},${userStore.userInfoCont.company},${userStore.userInfoCont.department},${userStore.userInfoCont.organization}`
+})
+
+enum PERMITS {
+  FORBID, //0
+  VIEW, //1
+  DOWNLOAD, //2
+  UPLOAD,  //3
+  UPANDDOWNLOAD, //4
+  EDIT, //5
+  MANAGER, //6
+}
+
+//加载目录文件列表
+function onLoadMatterList(){
+  emit('update:modelValue', currentNode.value.uuid)
+  let _page: matterPage = {
+    page: paginInfo.value.page,
+    pageSize: 50,
+    orderCreateTime: "DESC",
+    orderDir: "DESC",
+    dir:"true",
+    puuid:currentNode.value.uuid,
+    deleted:false
+  };
+
+  getMatterList(uid,_page).then((resp)=>{
+    //page+1 是由于分页的起始index是1，而后端api的分页index起始是0
+    paginInfo.value={total:resp.data.totalPages,page:resp.data.page}
+    matterList.value=resp.data.data
+  })
+}
+//树节点展开
+function onNodeExpand(node: TreeNode, resolve: (data: matterTree[]) => void, reject: () => void) {
+    let cuuid ="root"
+    if ((node.data as matterTree).uuid) {
+        cuuid= (node.data as matterTree).uuid
+        currentNode.value = node.data
+    }
+
+    let _page: matterPage = {
+        page: 0,
+        pageSize: 50,
+        orderCreateTime: "DESC",
+        orderDir: "DESC",
+        dir:"true",
+        puuid: cuuid,
+        deleted: false
+    };
+
+    getMatterList(uid, _page).then((resp) => {
+        let node_data = resp.data.data.filter((item) => {
+            return item.dir
+        }).map((val) => {
+          const copy = structuredClone(val)
+          copy.dir = !copy.dir
+          return copy
+        })
+
+        resolve(node_data)
+    }).catch(() => reject())
+    emit('update:modelValue', currentNode.value.uuid)
+}
+//树节点单击
+function onNodeClick(data:matterTree,node:TreeNode,self:any,env:any){
+  if (data){
+    if (currentNode.value.uuid === data.uuid) return;
+    currentNode.value = data
+  }else{
+    currentNode.value={uuid:"root",name:"个人空间"}
+  }
+  onLoadMatterList()
+}
+
+//-------------------space feature---------------------
+function onSpaceNodeClick(data:matterTree,node:TreeNode,self:any,env:any){
+  //如果在单个组件上重复点击，不在刷新请求
+  if(spaceNodeUid==data.uuid) return;
+  spaceNodeUid=data.uuid
+
+  if(data.uuid.startsWith("s0") && data.uuid!=SpaceID.value.uuid){ //切换空间
+    currentNode.value={uuid:"root",name:data.name}//切换空间就要重置currentNode
+    SpaceID.value={
+      name: data.name ?? "",
+      uuid: data.uuid ?? "",
+      userUuid: data.userUuid ?? "",
+      manager: data.manager ?? false,
+      permits:data.permits ?? { id: 0, MatterUuid: '', data: '{}' }
+    }; 
+    onSpaceMatterList()
+  }else{
+    let matter= {
+      uuid:data.uuid==SpaceID.value.uuid?"root":data.uuid,
+      puuid: data.puuid,
+      name:data.name,
+      agent:data.agent,
+      dir:true,
+      permits:data.permits,
+      path:data.path,
+      permitVal:data.permitVal
+    }
+    //打开具体的节点
+    handleSpaceDoubleClick(matter)
+  }
+}
+
+function flushSpaceTree(uuid:string,data:matterTree[]){
+  if(uuid==="root") uuid=SpaceID.value.uuid
+  spaceTreeRef.value.updateKeyChildren(uuid,data)
+}
+
+function handleSpaceDoubleClick(row:matterInfo,ind?:number){
+  if(row.dir){
+    //设置当前文件夹的权限等级
+    if(row.permitVal){
+      spaceCutLevelPermit.value=row.permitVal
+    }else{
+      if (SpaceID.value.manager) {
+        spaceCutLevelPermit.value=9
+      }else{
+        let _pert: Record<string, number>
+        _pert = JSON.parse(row.permits!.data)
+        let val=_pert[rawUid.replace("p0","")]
+        if(val){
+          spaceCutLevelPermit.value = val
+        }else{
+          spaceCutLevelPermit.value = PERMITS.FORBID //没有权限！！
+        }
+      }
+    }
+    
+   
+    isNewSpaceNode=true
+    //1：如果是当前目录的父组件没必要更新目录树
+    //2: 如果当前目录是当前空间根目录，没必要更新目录树
+    if(currentNode.value.puuid==row.uuid || row.uuid=="root") isNewSpaceNode=false
+    currentNode.value=row
+    onSpaceMatterList()
+  }
+}
+
+//加载目录文件列表
+function onSpaceMatterList(){
+  emit('update:modelValue', currentNode.value.uuid)
+  let _page: matterPage= {
+    page: paginInfo.value.page,
+    pageSize: 50,
+    orderCreateTime: "DESC",
+    orderDir: "DESC",
+    puuid:currentNode.value.uuid,
+    dir:"true",
+    deleted:false,
+    space:SpaceID.value.uuid,   
+  };
+
+  getSpaceMatterList(uid,_page).then((resp)=>{
+    if (SpaceID.value.manager) {
+      resp.data.data.forEach(item => {
+        item.permitVal=PERMITS.MANAGER
+      })
+      matterList.value=resp.data.data
+    }else{
+      matterList.value=resp.data.data.filter(item=>{ //具体的权限验证和过滤
+      
+        if(item.permits.ID==0){
+          item.permitVal=spaceCutLevelPermit.value
+        }else{
+          //如果该文档有设定权限，解析该文档的具体权限
+          let _pert: Record<string, number>
+          _pert = JSON.parse(item.permits!.data)
+          let val=_pert[rawUid.replace("p0","")]
+          if(val){
+            item.permitVal = val
+          }else{
+            item.permitVal = PERMITS.FORBID //没有权限！！
+          }
+        }
+
+        if(item.permitVal>0){
+          return true
+        }
+
+        return false
+      })
+    }
+
+    
+    //展开的时候暂时不做目录更新，看以后的使用情况
+    let node_data = matterList.value.filter(item=> {
+        return item.dir
+    }).map(val => {
+      const copy = structuredClone(toRaw(val))
+      copy.dir = !copy.dir
+      copy.manager=SpaceID.value.manager
+      return copy
+    })
+
+    if(isNewSpaceNode) {
+      //由于支持目录树的原因，所有的空间根目录uuid都是root，这样树组件就有问题，所以用了spaceid作为其uuid
+      //但是云盘的根目录是root，所以当uuid是spaceid时，自动替换为root
+      if(currentNode.value.uuid=="root") flushSpaceTree(SpaceID.value.uuid,node_data);
+      else flushSpaceTree(currentNode.value.uuid,node_data);
+    }
+  })
+}
+
+///////////////////////////////////////////////////////
+
+
+//渲染完页面再执行
+onMounted(async () => {
+  currentNode.value={uuid:"root",name:"个人空间"}
+  //加载我的空间列表
+  await getMySpaces(uid,{roles:Departs.value}).then((resp)=>{
+    resp.data.forEach((item)=>{
+      let ismanager=false
+      if(item.userUuid==rawUid || item.managers.includes(rawUid)) ismanager=true;
+      spaceTreeRef.value.append({name:item.name,uuid:item.uuid,dir:false,userUuid:item.userUuid,manager:ismanager,permits:item.permits})
+    })
+  })
+  emit('update:modelValue', currentNode.value.uuid)
+});
+
+</script>
+
+<template>
+  <p> <span style="font-size:20px;font-weight: bold;">请选择目标节点：</span> 当前节点 > {{ currentNode.name }}</p>
+  <div class="menus_tree">
+    <div class="area_header">
+      <el-icon :size="20"><House /></el-icon><span class="area_name" > 个人空间</span> 
+    </div>
+    <el-tree
+      ref="treeRef"
+      style="max-width: 600px"
+      :data="treeData"
+      node-key="uuid"
+      highlight-current
+      lazy
+      :load="onNodeExpand"
+      :props="{label: 'name',children:'children',isLeaf:'dir'}"
+      :default-expanded-keys="['root']"
+      @node-click="onNodeClick"
+    >
+    <template #default="{ node, data }">
+      <div class="tree-item">
+        <span>{{ node.label }}</span>
+      </div>
+    </template>
+    </el-tree>
+    <div class="area_header">
+      <el-icon :size="20"><Collection /></el-icon> <span class="area_name" > 共享空间</span> 
+    </div>
+    <el-tree
+      ref="spaceTreeRef"
+      style="max-width: 600px"
+      node-key="uuid"
+      accordion
+      highlight-current
+      lazy
+      :props="{label: 'name',children:'children',isLeaf:'dir'}"
+      @node-click="onSpaceNodeClick"
+    >
+    <template #default="{ node, data }">
+      <div class="tree-item">
+        <span>{{ node.label}}</span>
+      </div>
+    </template>
+    </el-tree>
+  </div>
+  
+</template>
+
+<style lang="scss" scoped>
+.menus_tree{
+  display: flex;
+  flex-direction: column;
+  height:550px;
+  overflow-y: scroll;
+  .el-tree{
+  --el-color-primary-light-9:#6eb3f8;
+  --el-tree-node-hover-bg-color:#a1c7ee;
+  --el-tree-node-content-height:43px;
+  --el-tree-expand-icon-color:#4c4c4e;
+  }   
+}
+
+.area_header{
+  display: flex;
+  margin-top: 9px;
+  padding: 5px 0;
+  background-color: white;
+  align-items: center;
+  .area_name{
+    align-content: center;
+    margin-left: 8px;
+    color: #686854;
+    font-weight: bold;
+  }
+}
+
+</style>
+
+<style lang="scss">
+  .el-message-box__message{
+  width: 100%;
+}
+</style>

src/views/doc/space.vue

@@ -413,7 +413,7 @@ async function handleSingleFile(ff:File){
   fields.append("puuid",uploadFormData.value.puuid)
   fields.append("file",ff)
   
-  const res = await doFileUpload(fields,'/hxpan/api/space/upload')
+  const res = await doFileUpload(props.uid,fields,'/hxpan/api/space/upload')
   if(res.code!=200){
     console.log(ff.name+"上传失败! ")
     throw new Error(ff.name+"上传失败!<br> ")
@@ -479,7 +479,7 @@ async function handleFolderFile(option:File){
   fields.append('file', option)
   fields.append("space",uploadFormData.value.space)
   fields.append("puuid",puuid)
-  const res = await doFileUpload(fields,'/hxpan/api/space/upload')
+  const res = await doFileUpload(props.uid,fields,'/hxpan/api/space/upload')
   if(res.code!=200){
     console.log(_path+"上传失败! ")
     throw new Error(_path+"上传失败!<br> ")