diff --git a/src/views/doc/manage.vue b/src/views/doc/manage.vue index c3aefa4..13590d3 100644 --- a/src/views/doc/manage.vue +++ b/src/views/doc/manage.vue @@ -595,7 +595,7 @@ async function uploadFolder(e:Event){ const f = files[index] await handleFolderFile(f).catch((err)=>{ console.log(err) - result+=err + result+= (f as File).name+"上传失败\n" }) percentage.value = Number(((index + 1) / count).toPrecision(2)) * 100 } diff --git a/src/views/doc/space.vue b/src/views/doc/space.vue index 2e5c32a..5e0e4ed 100644 --- a/src/views/doc/space.vue +++ b/src/views/doc/space.vue @@ -424,7 +424,7 @@ async function uploadFolder(e:Event){ const f = files[index] await handleFolderFile(f).catch((err)=>{ console.log(err) - result+=err + result+= (f as File).name+"上传失败\n" }) percentage.value = Number(((index + 1) / count).toPrecision(2)) * 100 } diff --git a/src/views/doc/spacePermission.vue b/src/views/doc/spacePermission.vue index 8f61fd6..972e00e 100644 --- a/src/views/doc/spacePermission.vue +++ b/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([]) @@ -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(()=>{