Merge branch 'liuqiang' into v3

index.html

@@ -9,8 +9,8 @@
 		<link rel="icon" href="/favicon.ico">
 		<title>聚合智慧文档管理系统</title>
 		<!--引入onlyoffice组件-->
-		<script type="text/javascript" src="http://192.168.1.28:19531/web-apps/apps/api/documents/api.js" charset="utf-8" async></script>
-		<!-- <script type="text/javascript" src="http://8.142.173.95:19531/web-apps/apps/api/documents/api.js" charset="utf-8" async></script> -->
+		<!-- <script type="text/javascript" src="http://192.168.1.28:19531/web-apps/apps/api/documents/api.js" charset="utf-8" async></script> -->
+		<script type="text/javascript" src="http://8.142.173.95:19531/web-apps/apps/api/documents/api.js" charset="utf-8" async></script>
 		<!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
 		<style>
 			html,

src/layout/indexCommon.vue

@@ -511,20 +511,21 @@ const clickPath = (index, items) => {
 };
 const clickTab = (item) => {
   let url = toRaw(item)
-  console.log("item", url);
+  // console.log("item", url);
   setTimeout(() => {
     console.log("toFileData.value", toFileData.value);
     if (toFileData.value) {
-      localStorage.setItem("inChat", 0)
-      console.log(
-        "tofolder",
-        JSON.stringify(toRaw(toFileData.value.clickRowId))
-      );
+      localStorage.setItem("inChat",0)
+      // console.log(
+      //   "tofolder",
+      //   JSON.stringify(toRaw(toFileData.value.clickRowId))
+      // );
       editableTabsValue.value = toFileData.value.path
       router.push({
         path: toFileData.value.path,
         query: {
-          //   row: JSON.stringify(toRaw(toFileData.value.clickRowId)),
+          // row: JSON.stringify(toRaw(toFileData.value.clickRowId)),
+          clickRowId: toRaw(toFileData.value.clickRowId).dirId,
         },
       });
       return;
@@ -556,7 +557,7 @@ const paneClick = (item) => {
   console.log(item, 'pane');
   isAlive.value = true;
   isSwitchFileIframe.value = false
-  console.log("paneItem", item);
+  // console.log("paneItem", item);
   if (item.clickRowId) {
     // 判断是菜单还是目录
     toFileData.value = item;
@@ -581,7 +582,7 @@ const filePaneClick = (item) => {
       const inIframe =
         outIframe.contentDocument.getElementsByTagName("iframe")[0];
       setTimeout(() => {
-        console.log('outIframe', outIframe.parentElement);
+        // console.log('outIframe',outIframe.parentElement);
         console.error(outIframe.parentElement);
         inIframe.style.height = outIframe.style.height =
           outIframe.parentElement.offsetHeight + "px";
@@ -602,7 +603,7 @@ const filePaneClick = (item) => {
 };
 // 创建文件的标签
 const addFileTab = (data,bool) => {
-  console.log("fileTabdata", data);
+  // console.log("fileTabdata", data);
   console.log();
   const thisData = JSON.parse(JSON.stringify(toRaw(data)));
   const oldIFrameData = iFrameData.value;
@@ -651,11 +652,11 @@ const addFileTab = (data,bool) => {
   });
   iFrameData.value = arr;
   isAlive.value = false;
-  console.log("addFileTab", arr);
+  // console.log("addFileTab", arr);
 };
 //创建tab标签事件
 const addTab = (data) => {
-  console.log("addTab", data);
+  // console.log("addTab", data);
   const arr = toRaw(editableTabs.value);
   if (!arr.some((item) => item.label == data.fileName)) {
     // editableTabs.value.push({
@@ -672,13 +673,13 @@ const addTab = (data) => {
   }
 };
 const addFolderAdd = (data) => {
-  console.log("data", data);
+  // console.log("data", data);
   const arr = toRaw(editableTabs.value);
-  if (!arr.some((item) => item.label == data.row.dirName)) {
+  if (!arr.some((item) => item.label == data.clickRowId.dirName)) {
     editableTabs.value.push({
       label: data.name,
       path: data.path,
-      clickRowId: data.row,
+      clickRowId: data.clickRowId,
     });
     //需要jSON去转 否则页面无变化 离谱得很
     editableTabs.value = JSON.parse(JSON.stringify(editableTabs.value));
@@ -686,7 +687,7 @@ const addFolderAdd = (data) => {
   editableTabsValue.value = data.path
   toFileData.value = data
   clickTab(data)
-  console.log("editableTabs", toRaw(editableTabs.value));
+  // console.log("editableTabs", toRaw(editableTabs.value));
 };
 provide("addTab", addTab);
 provide("addFolderAdd", addFolderAdd);

src/views/biz/recent/index.vue

@@ -431,22 +431,22 @@ function handleRowClick(row, col, e) {
 //mouse弹框
 async function chooseSet(row, index, num) {
   // 权限控制
-  if (thisFolderRole.value && thisFolderRole.value.roles) {
-    if (thisFolderRole.value.roles.l0600) {
-      const passArr = localStorage.getItem("passArr");
-      const passArrObj = JSON.parse(passArr);
-      if (
-        !passArrObj ||
-        !passArrObj.some((item) => item === clickRow.value.docId)
-      ) {
-        chooseRow.value = row;
-        chooseNum.value = num;
-        showInputPassword.value = true;
-        return;
-      }
-      // console.log('needc');
-    }
-  }
+  // if (thisFolderRole.value && thisFolderRole.value.roles) {
+  //   if (thisFolderRole.value.roles.l0600) {
+  //     const passArr = localStorage.getItem("passArr");
+  //     const passArrObj = JSON.parse(passArr);
+  //     if (
+  //       !passArrObj ||
+  //       !passArrObj.some((item) => item === clickRow.value.docId)
+  //     ) {
+  //       chooseRow.value = row;
+  //       chooseNum.value = num;
+  //       showInputPassword.value = true;
+  //       return;
+  //     }
+  //     // console.log('needc');
+  //   }
+  // }
   console.log("chooseSetrow", row);
   console.log("chooseSetnum", num);
   if (row.name === "打开文件所在位置") {
@@ -464,7 +464,7 @@ async function chooseSet(row, index, num) {
     const addData = {
       path: spacePath.value + dirData.data.dirId,
       name: dirData.data.dirName,
-      row: toRaw(dirData.data),
+      clickRowId: toRaw(dirData.data),
     };
     console.log("addData", addData);
     addFolderAdd(addData);

src/views/department/MyFile.vue

@@ -1504,11 +1504,14 @@ export default {
             // console.log('onActivated.query',route.query);
             loadingPreview.value = true
             setTimeout(()=>{
-                if(route.query.row){
-                    const newRow = JSON.parse(route.query.row)
+                if(route.query.clickRowId){
+                    const newRow = JSON.parse(route.query.clickRowId)
                     console.log('newRow',newRow);
-                    thisFolder.value = newRow
-                    refreshFile()
+                     myfile.getDir(newRow).then(res=>{
+                        console.log('tores',res);
+                        thisFolder.value = res.data
+                        refreshFile()
+                    })
                 }
                     loadingPreview.value = false
             },500)

src/views/myfile/MyFile.vue

@@ -1582,7 +1582,7 @@ export default {
                     let data = JSON.parse(event.target.result)
                 }catch(err){
                     const time = Date.now()
-                    console.log('time',time);
+                    // console.log('time',time);
                     const link = document.createElement('a');  // 创建a标签
                     let blob = new Blob([res]);     
                     link.style.display = 'none';
@@ -1607,18 +1607,30 @@ export default {
             // 添加监听，点击其他地方关闭文件夹右键菜单
             window.addEventListener("click", closeRMenu, true);
             window.addEventListener("click", mouseClick, true);
-            console.log('onMounted');
+            // console.log('onMounted');
         })
         // 组件显示
         onActivated(()=>{
-            console.log('onActivated.query',route.query);
+            // console.log('onActivated.query',route.query);
             loadingPreview.value = true
-            setTimeout(()=>{
-                if(route.query.row){
-                    const newRow = JSON.parse(route.query.row)
+            // setTimeout(()=>{
+            //     if(route.query.row){
+            //         const newRow = JSON.parse(route.query.row)
+            //         console.log('newRow',newRow);
+            //         thisFolder.value = newRow
+            //         refreshFile()
+            //     }
+            //         loadingPreview.value = false
+            // },500)
+             setTimeout(()=>{
+                if(route.query.clickRowId){
+                    const newRow = JSON.parse(route.query.clickRowId)
                     console.log('newRow',newRow);
-                    thisFolder.value = newRow
-                    refreshFile()
+                     myfile.getDir(newRow).then(res=>{
+                        console.log('tores',res);
+                        thisFolder.value = res.data
+                        refreshFile()
+                    })
                 }
                     loadingPreview.value = false
             },500)
@@ -1626,8 +1638,8 @@ export default {
         })
         // 监听路由变化
         onBeforeRouteUpdate((to,from)=>{
-        console.log('to',to);
-        console.log('from',from);
+        // console.log('to',to);
+        // console.log('from',from);
         if(to.name == 'myfile'){
             loadingPreview.value = true
             const thisdirId = to.params.dirId

src/views/myjoin/MyJoin.vue

@@ -108,7 +108,7 @@ export default {
             thisLClickRow.value = row
             clickRowId.value = row.docId
             copyRow.value = toRaw(row)
-            addFileTab(copyRow.value);
+            addFileTab(copyRow.value,1);
             // showEdit.value = true
         }
         function getCountPeople() {

src/views/publicment/MyFile.vue

@@ -1505,11 +1505,14 @@ export default {
             console.log('onActivated.query',route.query);
             loadingPreview.value = true
             setTimeout(()=>{
-                if(route.query.row){
-                    const newRow = JSON.parse(route.query.row)
+               if(route.query.clickRowId){
+                    const newRow = JSON.parse(route.query.clickRowId)
                     console.log('newRow',newRow);
-                    thisFolder.value = newRow
-                    refreshFile()
+                     myfile.getDir(newRow).then(res=>{
+                        console.log('tores',res);
+                        thisFolder.value = res.data
+                        refreshFile()
+                    })
                 }
                     loadingPreview.value = false
             },500)