Merge remote-tracking branch 'origin/v3' into v3

src/views/department/components/createTasnsfer.vue

@@ -4,7 +4,7 @@
       <el-input style="width: calc(100% - 30px); margin-left: 18px; margin-top: 5px" v-model="allBag" placeholder="搜索"></el-input>
       <div class="allLog">
         <el-tree ref="treeRef" :filter-node-method="filterNode" :data="allTreeData" :props="allTreeProps" show-checkbox
-          node-key="id" :default-expanded-keys="openTree" @check-change="allTreeChange" :default-checked-keys="backScreen"
+          node-key="id" :default-expanded-keys="openTree" @check="allTreeChange" :default-checked-keys="backScreen"
           :check-strictly="false" />
       </div>
     </div>
@@ -84,12 +84,15 @@ function antherClean() {
 }
 function handleClose(tag) {
   chooseTagData.value.splice(chooseTagData.value.indexOf(tag), 1);
-  let result = chooseTagData.value.map((item) => {
+  let result = toRaw(chooseTagData.value).map((item) => {
     return item.userId
   })
+  // console.log('result',result);
+  // console.log('chooseTagData',chooseTagData.value);
   treeRef.value.setCheckedKeys(result);
+  emit("setUsers", toRaw(chooseTagData.value));
   setTimeout(() => {
-    antherClose(tag)
+    // antherClose(tag)
   }, 10)
 }
 function antherClose(tag) {

src/views/department/modalComponebts/CreateFloder.vue

@@ -219,12 +219,6 @@ export default {
                             "dirRole":thisRole.length?thisRole.join(','):''
                         }
                     }
-                    if(thisRole.length){
-                        query.dirRole = thisRole.join(',')
-                    }else{
-                          query.dirRole = boserForm.value.memberRoles.join(',')
-                          query.users = boserForm.value.users
-                    }
                     console.log('free0query',query);
                     documents.addDocument(
                       query
@@ -301,7 +295,7 @@ export default {
         onMounted(() => {
             inital()
             getLevelList()
-            if(thisRole.length){
+            if(thisType.dirType === "2"){
                 getUser()
             }
         })

src/views/department/modalComponebts/Transfer.vue

@@ -46,7 +46,7 @@
 </template>
 
 <script>
-import { ref, onMounted, toRef, watch } from 'vue';
+import { ref, onMounted, toRef, watch, toRaw } from 'vue';
 import userTree from '../../../api/user/userTree';
 import fileShare from '../../../api/fileShare/fileShare';
 import fileCount from '../../../api/fileCount/fileCount'
@@ -251,6 +251,8 @@ export default {
             emit("getCback", transferModals.value)
         }
         function handleClose(tag) {
+            const arr = toRaw(chooseTagData.value)
+            console.log('arr',arr);
             chooseTagData.value.splice(chooseTagData.value.indexOf(tag), 1);
             let result = chooseTagData.value.map((item) => {
                 return item.userId

src/views/publicment/MyFile.vue

@@ -1232,7 +1232,7 @@ export default {
                 thisFolderRole.value = {}
             }
             thisRole.value = row.dirRole?row.dirRole.split(','):[]
-            // console.log('row1', toRaw(row));
+            console.log('row1', toRaw(row));
             // topPath.value = row.dirPath
             // console.log('topPath',toRaw(topPath.value));
             newDirId.value = row.dirId

src/views/publicment/components/createTasnsfer.vue

@@ -4,7 +4,7 @@
       <el-input style="width: 220px; margin-left: 18px; margin-top: 5px" v-model="allBag" placeholder="搜索"></el-input>
       <div class="allLog">
         <el-tree ref="treeRef" :filter-node-method="filterNode" :data="allTreeData" :props="allTreeProps" show-checkbox
-          node-key="id" :default-expanded-keys="openTree" @check-change="allTreeChange" :default-checked-keys="backScreen"
+          node-key="id" :default-expanded-keys="openTree" @check="allTreeChange" :default-checked-keys="backScreen"
           :check-strictly="false" />
       </div>
     </div>
@@ -88,8 +88,9 @@ function handleClose(tag) {
     return item.userId
   })
   treeRef.value.setCheckedKeys(result);
+  emit("setUsers", toRaw(chooseTagData.value));
   setTimeout(() => {
-    antherClose(tag)
+    // antherClose(tag)
   }, 10)
 }
 function antherClose(tag) {

src/views/publicment/modalComponebts/CreateFloder.vue

@@ -218,12 +218,6 @@ export default {
                             "dirRole":thisRole.length?thisRole.join(','):''
                         }
                     }
-                    if(thisRole.length){
-                        query.dirRole = thisRole.join(',')
-                    }else{
-                          query.dirRole = boserForm.value.memberRoles.join(',')
-                          query.users = boserForm.value.users
-                    }
                     console.log('free0query',query);
                     documents.addDocument(
                       query
@@ -301,7 +295,7 @@ export default {
         onMounted(() => {
             inital()
             getLevelList()
-            if(thisRole.length){
+            if(thisType.dirType === "2"){
                 getUser()
             }
         })