Merge branch 'liuqiang' into v3

src/components/historyList/index.vue

@@ -59,6 +59,7 @@ import { listVersion } from "@/api/biz/version";
 import eyes from "@/assets/images/eyes.png";
 import useUserStore from "@/store/modules/user";
 import { defineEmits } from "vue";
+import {getInfo} from "@/api/biz/info.js"
 
 const props = defineProps({
   openFile: {
@@ -136,9 +137,11 @@ const handleNodeClick = (data) => {
 const clickIndex = ref("");
 const emit = defineEmits(["changeMsgClose"]);
 //点击预览
-const previewFileClick = (item) => {
+const previewFileClick =async (item) => {
   console.log('preitem',item);
-  // addFileTab(item,0);
+  const res =await getInfo(item.docId)
+  console.log('res',res);
+  addFileTab(res.data,0,0,1);
   // emit("changeMsgClose", true, item);
   isOpen.value = false;
 };

src/layout/indexCommon.vue

@@ -643,8 +643,9 @@ const filePaneClick = (item) => {
   //   console.log("editableTabsValue", editableTabsValue.value);
 };
 // 创建文件的标签
-const addFileTab = (data, bool,copy) => {
+const addFileTab = (data, bool,copy,history) => {
   // console.log("addFileTab", data);
+  history = history?history:0
   const thisData = JSON.parse(JSON.stringify(toRaw(data)));
   const oldIFrameData = iFrameData.value;
   const canAdd = oldIFrameData.some((par) => par.src == ""); //是否达到上限
@@ -654,7 +655,7 @@ const addFileTab = (data, bool,copy) => {
     // 已存在打开当前的并且改变编辑状态
     const thisPane = toRaw(hasThis)
     // 如果编辑状态改变了 先删除旧的 再新建
-    if(thisPane.src != `${window.location.origin}/fileEdit?clickRowId=${thisData.docId}&canEdit=${bool}&canCopy=${copy}` ){
+    if(thisPane.src != `${window.location.origin}/fileEdit?clickRowId=${thisData.docId}&canEdit=${bool}&canCopy=${copy}&history=${history}&fileId=${thisData.fileId}` ){
       // console.log('buyiyang',`${window.location.origin}/fileEdit?clickRowId=${thisData.docId}&canEdit=${bool}`);
       const arr = oldIFrameData.map((par) => {
           if (par.id === thisPane.id) {
@@ -669,7 +670,7 @@ const addFileTab = (data, bool,copy) => {
         if (!par.src) {
           if (thisData.docId) {
             // par.src = `${window.location.origin}/fileEdit?clickRowId=${thisData.docId}`;
-            par.src = `${window.location.origin}/fileEdit?clickRowId=${thisData.docId}&canEdit=${bool}&canCopy=${copy}`;
+            par.src = `${window.location.origin}/fileEdit?clickRowId=${thisData.docId}&canEdit=${bool}&canCopy=${copy}&history=${history}&fileId=${thisData.fileId}`;
             par.name = data.fileName;
             par.docId = data.docId
             par.show = true
@@ -691,7 +692,7 @@ const addFileTab = (data, bool,copy) => {
     // console.log('hasThis',thisPane);
     const arr = oldIFrameData.map((par) => {
       if (par.id == thisPane.id) {
-        `${window.location.origin}/fileEdit?clickRowId=${thisData.docId}&canEdit=${bool}&canCopy=${copy}`
+        `${window.location.origin}/fileEdit?clickRowId=${thisData.docId}&canEdit=${bool}&canCopy=${copy}&history=${history}&fileId=${thisData.fileId}`
         par.show = true
         editableTabsValue.value = par.id// 标签跳转
         setTimeout(() => {
@@ -711,7 +712,7 @@ const addFileTab = (data, bool,copy) => {
     if (!par.src) {
       if (thisData.docId) {
         // par.src = `${window.location.origin}/fileEdit?clickRowId=${thisData.docId}`;
-        par.src = `${window.location.origin}/fileEdit?clickRowId=${thisData.docId}&canEdit=${bool}&canCopy=${copy}`;
+        par.src = `${window.location.origin}/fileEdit?clickRowId=${thisData.docId}&canEdit=${bool}&canCopy=${copy}&history=${history}&fileId=${thisData.fileId}`;
         par.name = data.fileName;
         par.docId = data.docId
         par.show = true

src/views/department/MyFile.vue

@@ -895,7 +895,7 @@ export default {
                 // const filePreview = canPreviewFile(copyFileType.value)
                 // if (filePreview) {
                      loadingPreview.value = false
-                    if(thisFolderRole.value && thisFolderRole.value.roles.l0800){
+                    if(thisFolderRole.value &&thisFolderRole.value.roles&& thisFolderRole.value.roles.l0800){
                         addFileTab(clickRow.value, 1,1);
                     }else{
                        addFileTab(clickRow.value, 1,0); 
@@ -926,7 +926,7 @@ export default {
                 if (filePreview) {
                     loadingPreview.value = false
                     // addTab(clickRow.value);
-                    if(thisFolderRole.value && thisFolderRole.value.roles.l0800){
+                    if(thisFolderRole.value &&thisFolderRole.value.roles&& thisFolderRole.value.roles.l0800){
                         addFileTab(clickRow.value, 0,1);
                     }else{
                        addFileTab(clickRow.value, 0,0); 

src/views/myfile/MyFile.vue

@@ -966,7 +966,7 @@ export default {
                 // const filePreview = canPreviewFile(copyFileType.value)
                 // if (filePreview) {
                 loadingPreview.value = false
-                if(thisFolderRole.value && thisFolderRole.value.roles.l0800){
+                if(thisFolderRole.value &&thisFolderRole.value.roles&& thisFolderRole.value.roles.l0800){
                         addFileTab(clickRow.value, 1,1);
                     }else{
                        addFileTab(clickRow.value, 1,0); 
@@ -1024,7 +1024,7 @@ export default {
                 const filePreview = canPreviewFile(copyFileType.value)
                 if (filePreview) {
                     loadingPreview.value = false
-                    if(thisFolderRole.value && thisFolderRole.value.roles.l0800){
+                    if(thisFolderRole.value &&thisFolderRole.value.roles&& thisFolderRole.value.roles.l0800){
 
                         addFileTab(clickRow.value, 0,1);
                     }else{

src/views/myfile/components/FileEdit.vue

@@ -47,6 +47,7 @@ export default {
   },
   setup(props) {
     let docId = props.docId || '';
+    let fileId = ''
     let copyRow = props.copyRow || '';
     const router = useRouter(); //注册路由
     const route = useRoute();
@@ -66,9 +67,9 @@ export default {
     });
     let show = ref(true);
     let newObj = ref({});
-    function oo(docId, isEdit,isCopy) {
+    function oo(docId, isEdit,isCopy,history,fileId) {
       console.log('uid',uid);
-      if (docId && !props.historyPrew) {     
+      if (docId && !history) {     
         getInfo(docId).then((response) => {
           const obj = response.data;
           obj.isEdit = isEdit == 1?true:false;
@@ -76,47 +77,73 @@ export default {
           newObj.value = obj;
           option.value.isEdit = obj.isEdit;
           option.value.isCopy = obj.isCopy;
-          option.value.url = `${window.location.origin}${
-            import.meta.env.VITE_APP_BASE_API
-          }/api/access/${obj.docId}?uid=${uid}`;
-          // option.value.url = `http://8.142.173.95:19527/api/access/${obj.docId}?uid=${uid}`;
-          //  console.log('option.value.url',option.value.url);
+          // option.value.url = `${window.location.origin}${
+          //   import.meta.env.VITE_APP_BASE_API
+          // }/api/access/${obj.docId}?uid=${uid}`;
+          option.value.url = `http://8.142.173.95:19527/api/access/${obj.docId}?uid=${uid}`;
+           console.log('option.value.url',option.value.url);
           option.value.title = obj.fileName;
           option.value.key = obj.fileId;
           option.value.fileType = obj.fileType.replace(".", "");
-          option.value.editUrl = `${window.location.origin}${
-            import.meta.env.VITE_APP_BASE_API
-          }/only-office/callback/${obj.docId}?name=${useUserStore().uname}`;
+          // option.value.editUrl = `${window.location.origin}${
+          //   import.meta.env.VITE_APP_BASE_API
+          // }/only-office/callback/${obj.docId}?name=${useUserStore().uname}`;
+          option.value.editUrl = `http://8.142.173.95:19527/only-office/callback/${obj.docId}?name=${useUserStore().uname}`;
           option.value.user = {
             id: useUserStore().uid, //用户ID
             name: useUserStore().uname, //用户姓名
           };
         });
-      } else if (docId && props.historyPrew) {
-        option.value.isEdit = false;
-        // option.value.url = `${window.location.origin}${
+      } else if (fileId && history) {
+            getInfo(docId).then((response) => {
+          const obj = response.data;
+          obj.isEdit = false;
+          obj.isCopy = false; 
+          newObj.value = obj;
+          option.value.isEdit = obj.isEdit;
+          option.value.isCopy = obj.isCopy;
+           // option.value.url = `${window.location.origin}${
+        //   import.meta.env.VITE_APP_BASE_API
+        // }/api/history/${obj.fileId}`;
+         option.value.url = `http://8.142.173.95:19527/api/history/${fileId}`;
+           console.log('option.value.url',option.value.url);
+          option.value.title = obj.fileName;
+          option.value.key = obj.fileId;
+          option.value.fileType = obj.fileType.replace(".", "");
+         // option.value.editUrl = `${window.location.origin}${
         //   import.meta.env.VITE_APP_BASE_API
-        // }/api/access/${props.historycopyRow.docId}?uid=${uid}`;
-         option.value.url = `http://8.142.173.95:19527/api/access/${props.historycopyRow.docId}?uid=${uid}`;
-         console.log('option.value.url2',option.value.url);
-        option.value.title = props.copyRow.fileName;
-        option.value.key = props.historycopyRow.fileId;
-        option.value.fileType = props.copyRow.fileType.replace(".", "");
-        option.value.editUrl = `${window.location.origin}${
-          import.meta.env.VITE_APP_BASE_API
-        }/only-office/callback/${props.docId}?name=${useUserStore().uname}`;
-        option.value.user = {
-          id: useUserStore().uid, //用户ID
-          name: useUserStore().uname, //用户姓名
-        };
-        // const emit = defineEmits(["cancleHistoryPrew"]);
-        // emit("cancleHistoryPrew",false);
-        // console.log(option.value,'option3===');
+        // }/only-office/callback/${props.docId}?name=${useUserStore().uname}`;
+        option.value.editUrl = `http://8.142.173.95:19527/only-office/callback/${docId}?name=${useUserStore().uname}`;
+          option.value.user = {
+            id: useUserStore().uid, //用户ID
+            name: useUserStore().uname, //用户姓名
+          };
+        });
+        // option.value.isEdit = false;
+        // // option.value.url = `${window.location.origin}${
+        // //   import.meta.env.VITE_APP_BASE_API
+        // // }/api/history/${obj.fileId}`;
+        //  option.value.url = `http://8.142.173.95:19527/api/history/${fileId}`;
+        //  console.log('option.value.url2',option.value.url);
+        // option.value.title = props.copyRow.fileName;
+        // option.value.key = props.historycopyRow.fileId;
+        // option.value.fileType = props.copyRow.fileType.replace(".", "");
+        // // option.value.editUrl = `${window.location.origin}${
+        // //   import.meta.env.VITE_APP_BASE_API
+        // // }/only-office/callback/${props.docId}?name=${useUserStore().uname}`;
+        // option.value.editUrl = `http://8.142.173.95:19527/only-office/callback/${docId}?name=${useUserStore().uname}`;
+        // option.value.user = {
+        //   id: useUserStore().uid, //用户ID
+        //   name: useUserStore().uname, //用户姓名
+        // };
+        // // const emit = defineEmits(["cancleHistoryPrew"]);
+        // // emit("cancleHistoryPrew",false);
+        // // console.log(option.value,'option3===');
       }
     }
     /** 修改按钮操作 */
-    function edit(docId,canEdit,canCopy) {
-      oo(docId,canEdit,canCopy);
+    function edit(docId,canEdit,canCopy,history,fileId) {
+      oo(docId,canEdit,canCopy,history,fileId);
     }
     onMounted(() => {
       let route = useRoute(); 
@@ -126,12 +153,17 @@ export default {
           docId = route.query.clickRowId
           // copyRow = JSON.parse(route.query.copyRow)
       }
+      if(route.query.fileId){
+          fileId = route.query.fileId
+          // copyRow = JSON.parse(route.query.copyRow)
+      }
         console.log('route.query.canEdit',route.query.canEdit);
         canEdit = route.query.canEdit
        let canCopy = route.query.canCopy
+       let history = route.query.history
       console.log(docId, "doc");
       console.log(copyRow, "row");
-      edit(docId,canEdit,canCopy);
+      edit(docId,canEdit,canCopy,history,fileId);
       // let row = JSON.parse(newObj.value)
       // console.log(row, '852');
     });

src/views/publicment/MyFile.vue

@@ -906,7 +906,7 @@ export default {
                 // const filePreview = canPreviewFile(copyFileType.value)
                 // if (filePreview) {
                      loadingPreview.value = false
-                     if(thisFolderRole.value && thisFolderRole.value.roles.l0800){
+                     if(thisFolderRole.value &&thisFolderRole.value.roles&& thisFolderRole.value.roles.l0800){
                         addFileTab(clickRow.value, 1,1);
                     }else{
                        addFileTab(clickRow.value, 1,0); 
@@ -936,7 +936,7 @@ export default {
                 const filePreview = canPreviewFile(copyFileType.value)
                 if (filePreview) {
                    loadingPreview.value = false
-                if(thisFolderRole.value && thisFolderRole.value.roles.l0800){
+                if(thisFolderRole.value &&thisFolderRole.value.roles&& thisFolderRole.value.roles.l0800){
                         addFileTab(clickRow.value, 0,1);
                     }else{
                        addFileTab(clickRow.value, 0,0);