Merge branch 'space2'

src/views/doc/manage.vue

@@ -71,6 +71,9 @@ let spaceNodeUid="" //用来判断树组件的展开和关闭，如何只是展
 
 const modListOrGrild=ref(true)
 const modRecycling=ref(false)
+//进度条
+const percentage=ref(0)
+const onprogress=ref(false)
 
 const Departs = computed(() => {
     return `${'p0'+userStore.userInfoCont.userId},${userStore.userInfoCont.company},${userStore.userInfoCont.department},${userStore.userInfoCont.organization}`
@@ -326,6 +329,10 @@ function restoreMatter(row:matterInfo){
 
 //加载目录文件列表
 function onLoadMatterList(){
+  //重置进度条
+  percentage.value=0 
+  onprogress.value=false
+
   let _page: matterPage = {
     page: paginInfo.value.page,
     pageSize: 50,
@@ -542,9 +549,20 @@ async function onlyOfficeEdit(row:matterInfo){
 //自定义上传，目的是支持多文件上传, 使用html原生组件，是为了解决并发问题
 async function onCustomUpload(e:Event){
   const files = e.target!.files??[]
-  for(let ff of files){
-    await handleSingleFile(ff)
+  onprogress.value=true
+  const count=files.length
+  let result=""
+   for(let index = 0; index < count; index++){
+    onprogress.value=true
+    const ff = files[index]
+    await handleSingleFile(ff).catch((err)=>{
+      console.log(err)
+      result+=err
+    })
+    percentage.value = Number(((index + 1) / count).toPrecision(2)) * 100
   }
+  if(result!="") alert(result)
+
   onLoadMatterList() //刷新
 }
 
@@ -557,17 +575,28 @@ async function handleSingleFile(ff:File){
   const res = await doFileUpload(fields,'/hxpan/api/matter/upload')
   if(res.code!=200){
     console.log(ff.name+"上传失败! ")
-    alert(ff.name+"上传失败! ")
+    throw new Error(ff.name+"上传失败!\n ")
   }
 }
 
 //文件夹上传，原理：自定义的input组件，一次拿到所有需要上传的文件列表，然后依次上传
 //能减少并发问题
 async function uploadFolder(e:Event){
+  onprogress.value=true
   const files = e.target!.files??[]
-  for(let f of files){
-    await handleFolderFile(f)
+  const count=files.length
+  let result=""
+  for(let index = 0; index < count; index++){
+    onprogress.value=true
+    const f = files[index]
+    await handleFolderFile(f).catch((err)=>{
+      console.log(err)
+      result+= (f as File).name+"上传失败\n"
+    })
+    percentage.value =  Number(((index + 1) / count).toPrecision(2)) * 100
   }
+  if(result!="") alert(result)
+  
   onLoadMatterList() //刷新
 }
 
@@ -593,7 +622,7 @@ async function handleFolderFile(option:File){
       puuid=newnodes[0].uuid
     }else{
       console.log(_path+"上传失败! ")
-      alert(_path +" 上传失败! ")
+      throw new Error(_path +" 上传失败!\n ")
       return
     }
   }else{
@@ -607,7 +636,7 @@ async function handleFolderFile(option:File){
   const res = await doFileUpload(fields,'/hxpan/api/matter/upload')
   if(res.code!=200){
     console.log(_path+"上传失败! ")
-    alert(_path +" 上传失败! ")
+    throw new Error(_path +" 上传失败!\n ")
   }
 }
 
@@ -830,6 +859,10 @@ const handleSelectionChange = (val:matterInfo[]) => {
 </script>
 
 <template>
+  <el-dialog v-model="onprogress"  width="50%" title="上传进度">
+      请勿关闭页面。。。
+      <el-progress style="width: 90%;" :text-inside="true" :stroke-width="26" :percentage="percentage" />
+  </el-dialog>
   <div style="display:grid;grid-template-columns:1fr 4fr; width: 100%;height: 100%;">
   <div class="menus_tree">
     <div class="area_header">

src/views/doc/space.vue

@@ -20,7 +20,7 @@ import {
   Setting,
   Grid,List,
 } from '@element-plus/icons-vue'
-import {ElMessage,UploadFile,UploadFiles,ElPagination} from "element-plus";
+import {ElMessage,UploadFile,UploadFiles,ElPagination, ElProgress} from "element-plus";
 import aiagent from './agent.vue';
 import router from "@/router";
 import SvgIcon from "@/components/SvgIcon/index.vue";
@@ -43,6 +43,10 @@ const paginInfo = ref({ page: 0, total: 0 })
 
 const CutLevelPermit=ref(0)
 const modListOrGrild=ref(true) //列表显示还是栅格显示
+
+const percentage=ref(0)
+const onprogress=ref(true)
+
 enum PERMITS {
   FORBID, //0
   VIEW, //1
@@ -172,6 +176,9 @@ function onDownload(row:matterInfo){
 
 //加载目录文件列表
 function onLoadMatterList(name?:string){
+  percentage.value=0 
+  onprogress.value=false
+
   let _page: matterPage= {
     page: paginInfo.value.page,
     pageSize: 50,
@@ -373,9 +380,19 @@ function handleSigLoadErr(error: Error, uploadFile: UploadFile, uploadFiles:Uplo
 //自定义上传，目的是支持多文件上传, 使用原生组件，是为了解决并发问题
 async function onCustomUpload(e:Event){
   const files = e.target!.files??[]
-  for(let ff of files){
-    await handleSingleFile(ff)
+  const count=files.length
+  let result=""
+   for(let index = 0; index < count; index++){
+    onprogress.value=true
+    const ff = files[index]
+    await handleSingleFile(ff).catch((err)=>{
+      console.log(err)
+      result+=err
+    })
+    percentage.value =  Number(((index + 1) / count).toPrecision(2)) * 100
   }
+  if(result!="") alert(result)
+
   onLoadMatterList() //刷新
 }
 
@@ -388,7 +405,7 @@ async function handleSingleFile(ff:File){
   const res = await doFileUpload(fields,'/hxpan/api/space/upload')
   if(res.code!=200){
     console.log(ff.name+"上传失败! ")
-    alert(ff.name+"上传失败! ")
+    throw new Error(ff.name+"上传失败!\n ")
   }
 
   //上传后继续AI服务训练
@@ -398,13 +415,25 @@ async function handleSingleFile(ff:File){
 //文件夹上传，原理：自定义的input组件，一次拿到所有需要上传的文件列表，然后依次上传
 //能减少并发问题
 async function uploadFolder(e:Event){
+  onprogress.value=true
   const files = e.target!.files??[]
-  for(let f of files){
-    await handleFolderFile(f)
+  const count=files.length
+  let result=""
+  for(let index = 0; index < count; index++){
+    onprogress.value=true
+    const f = files[index]
+    await handleFolderFile(f).catch((err)=>{
+      console.log(err)
+      result+= (f as File).name+"上传失败\n"
+    })
+    percentage.value =  Number(((index + 1) / count).toPrecision(2)) * 100
   }
+  if(result!="") alert(result)
+  
   onLoadMatterList() //刷新
 }
 
+
 async function handleFolderFile(option:File){
   //根据路径，来判断需不需要重建目录
   const _path = option.webkitRelativePath
@@ -418,7 +447,6 @@ async function handleFolderFile(option:File){
   if(node.length==0){
     const subs= await doCreateMultyDir(_dir,currentNode.value.uuid)
     matterList.value.push(...subs) //这里如果子文件夹多的时候，可能会造成第一级路径多次创建，只是造成资源浪费，问题不大
-
     const newnodes=matterList.value.filter((item)=>{
       return item.dir && _dir.endsWith(item.name!)  //item.path?.endsWith(_dir)
     })
@@ -426,8 +454,7 @@ async function handleFolderFile(option:File){
       puuid=newnodes[0].uuid
     }else{
       console.log(_path+"上传失败! ")
-      alert(_path +" 上传失败! ")
-      return
+      throw new Error(_path +" 上传失败!\n ")
     }
   }else{
     puuid=node[0].uuid
@@ -440,10 +467,12 @@ async function handleFolderFile(option:File){
   const res = await doFileUpload(fields,'/hxpan/api/space/upload')
   if(res.code!=200){
     console.log(_path+"上传失败! ")
-    alert(_path +" 上传失败! ")
+    throw new Error(_path+"上传失败!\n ") 
   }
+
   //上传后继续AI服务训练，是不是需要上传，在handleAiUpload里面有检测
   handleAiUpload(res.data)
+
 }
 
 //创建多级目录，并返回matterinfos数组
@@ -623,7 +652,12 @@ function isOwner(){
         <el-button  :icon="Grid"  @click="updateListOrGrid(false)"></el-button>
       </el-button-group>
     </el-row>
-
+    
+    <el-dialog v-model="onprogress"  width="50%" title="上传进度">
+        请勿关闭页面。。。
+       <el-progress style="width: 90%;" :text-inside="true" :stroke-width="26" :percentage="percentage" />
+    </el-dialog>
+   
     <el-row :gutter="24" style="overflow-y: auto;height: 90%;">
       <el-table v-if="modListOrGrild"
         stripe

src/views/doc/spacePermission.vue

@@ -34,6 +34,7 @@ interface Tree {
   radio?:number[];
   child?: Tree[]
   ismanager?:boolean,
+  indeterminate2?:boolean,//for manager member
 }
 
 const dataSource = ref<Tree[]>([])
@@ -115,16 +116,21 @@ function collectNodePermits(node:Tree){
 
 //递归修改子级元素
 function onGroupValueChange(node:Tree, val:number[]){
+  //if(node.indeterminate) node.indeterminate=false;
+  updateChildNode(node, val)
+  if(node.superior){
+    updateParentNode(node)
+  }
+}
+
+function updateChildNode(node:Tree, val:number[]){
   if(node.indeterminate) node.indeterminate=false;
   node.child?.forEach(ele => {
     ele.radio=val
     if(ele.child){
-      onGroupValueChange(ele,val)
+      updateChildNode(ele,val)
     }
   });
-  if(node.superior){
-    updateParentNode(node)
-  }
 }
 
 //递归更新父级
@@ -177,7 +183,7 @@ function setParentIndeterminate(node:Tree){
     const pnode = treeRef.value?.getNode(node.superior);
     if(pnode){
       const tdata=pnode.data as Tree 
-      tdata.indeterminate=true
+      tdata.indeterminate2=true
 
       setParentIndeterminate(tdata)
     }
@@ -273,8 +279,8 @@ onMounted(()=>{
 <template>
   <el-dialog :model-value="true" :style="{'max-height': '750px'}" v-on:close="closeFunc()">
     <template #header>
-      <el-button link @click="managerMode=false;">文档权限管理</el-button>
-      <el-button v-if="spacePermit.matterUid==spaceid&&uid==suid" link @click="managerMode=true; onShowManagers()">管理员管理</el-button>
+      <el-button link :class="managerMode ? '' :'moveon'" @click="managerMode=false;" >文档权限管理</el-button>
+      <el-button v-if="spacePermit.matterUid==spaceid&&uid==suid" :class="managerMode ? 'moveon' :''" link @click="managerMode=true; onShowManagers()">管理员管理</el-button>
     </template>
    
     <div v-if="uuid==spacePermit.matterUid&&uuid!=spaceid" class="tips">当前文档存在定制权限，与空间权限不一致。<el-button size="small" @click="delMatterPermit(uuid)">恢复</el-button></div>
@@ -321,11 +327,11 @@ onMounted(()=>{
             <span>{{ data.name }}</span>
             
             <div v-if="managerMode" class="buttons">
-              <el-checkbox  v-model="data.ismanager" :indeterminate="data.indeterminate" />
+              <el-checkbox  v-model="data.ismanager" :indeterminate="data.indeterminate2" />
             </div>
             <div  v-else class="buttons"> 
               <el-checkbox-group :min="0" :max="1"  v-model="data.radio" @change="(val)=>onGroupValueChange(data,val)">
-                <el-checkbox key="forbid" :indeterminate="data.indeterminate" :value="0" />
+                <el-checkbox key="forbid"  :indeterminate="data.indeterminate" :value="0" />
                 <el-checkbox key="view" :indeterminate="data.indeterminate" :value="1" />
                 <el-checkbox key="download" :indeterminate="data.indeterminate" :value="2" />
                 <el-checkbox key="updown" :indeterminate="data.indeterminate" :value="3" />
@@ -375,7 +381,9 @@ onMounted(()=>{
   .el-checkbox{
     width: 26px;
   }
-
+  .moveon{
+    background-color: rgb(109, 187, 238);
+  }
   .el-tree{
     /* 让整个弹出窗口位置更高一些*/
     --el-tree-node-content-height:33px;