Merge branch 'liuqiang' into v3

index.html

@@ -9,7 +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="https://doc.jujutong.cloud:19443/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>

src/layout/indexCommon.vue

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

src/views/department/MyFile.vue

@@ -204,8 +204,8 @@
                                 <el-table-column prop="createTime" label="时间" width="180" />
                                 <el-table-column prop="dirType" label="类型">
                                     <template #default="scope">
-                                        <span v-if="scope.row.isEncrypt == 'N'">公开目录</span>
-                                        <span v-else>加密目录</span>
+                                        <span v-if="scope.row.dirType == '1'">普通目录</span>
+                                        <span v-else>组织目录</span>
                                     </template>
                                 </el-table-column>
                                 <el-table-column label="加密等级">
@@ -327,7 +327,7 @@
             <div>
                 <CreateFloder v-if="folderCase" :thisType="thisFolder" :thisRole="thisRole" :folderCase="folderCase" @getChildrenC="getChildrenC" :oneOrTwo="oneOrTwo"
                     :impDirId="impDirId" :impSpaceId="impSpaceId" :newDirId="newDirId" :newSpaceId="newSpaceId" :upFolderData="upFolderData" :thisFolderRole="thisFolderRole"
-                    :refreshFile="getAllTop">
+                    :refreshFile="refreshFile">
                 </CreateFloder>
             </div>
             <!-- 文件上传 -->
@@ -881,7 +881,11 @@ export default {
                 // const filePreview = canPreviewFile(copyFileType.value)
                 // if (filePreview) {
                      loadingPreview.value = false
-                    addFileTab(clickRow.value,1);
+                    if(thisFolderRole.value.roles && thisFolderRole.value.roles.l0800){
+                        addFileTab(clickRow.value, 0,1);
+                    }else{
+                       addFileTab(clickRow.value, 0,0); 
+                    }
                     onlyView.value = false
                     // editOnline.value = false
                     cliCC.value = false
@@ -908,7 +912,11 @@ export default {
                 if (filePreview) {
                     loadingPreview.value = false
                     // addTab(clickRow.value);
-                    addFileTab(clickRow.value,0)
+                    if(thisFolderRole.value.roles && thisFolderRole.value.roles.l0800){
+                        addFileTab(clickRow.value, 0,1);
+                    }else{
+                       addFileTab(clickRow.value, 0,0); 
+                    }
                     onlyView.value = true
                     // editOnline.value = false
                     cliCC.value = false

src/views/myfile/MyFile.vue

@@ -230,10 +230,10 @@
                                         </el-table-column>
                                         <el-table-column prop="createTime" label="时间" width="180" />
                                         <el-table-column prop="dirType" label="类型">
-                                            <template #default="scope">
+                                            <!-- <template #default="scope">
                                                 <span v-if="scope.row.isEncrypt == 'N'">公开目录</span>
                                                 <span v-else>加密目录</span>
-                                            </template>
+                                            </template> -->
                                         </el-table-column>
                                         <el-table-column label="加密等级">
                                             <template #default="scope">
@@ -961,7 +961,11 @@ export default {
                 // const filePreview = canPreviewFile(copyFileType.value)
                 // if (filePreview) {
                 loadingPreview.value = false
-                addFileTab(clickRow.value, 1);
+                if(thisFolderRole.value.roles && thisFolderRole.value.roles.l0800){
+                        addFileTab(clickRow.value, 0,1);
+                    }else{
+                       addFileTab(clickRow.value, 0,0); 
+                    }
                 onlyView.value = false
                 // editOnline.value = false
                 cliCC.value = false
@@ -1009,11 +1013,18 @@ export default {
                     addFolderAdd(itemData)
             }
             if (row.name === '预览') {
+                // console.log('yulanData',thisFolder.value);
+                // console.log('thisFolderRole',thisFolderRole.value);
                 loadingPreview.value = true
                 const filePreview = canPreviewFile(copyFileType.value)
                 if (filePreview) {
                     loadingPreview.value = false
-                    addFileTab(clickRow.value, 0);
+                    if(thisFolderRole.value.roles && thisFolderRole.value.roles.l0800){
+
+                        addFileTab(clickRow.value, 0,1);
+                    }else{
+                       addFileTab(clickRow.value, 0,0); 
+                    }
                     //    const addData = {
                     //     path:"/fileEdit" + clickRow.value.docId,
                     //     name:clickRow.value.fileName,

src/views/myfile/components/FileEdit.vue

@@ -66,19 +66,21 @@ export default {
     });
     let show = ref(true);
     let newObj = ref({});
-    function oo(docId, isEdit) {
+    function oo(docId, isEdit,isCopy) {
       console.log('uid',uid);
       if (docId && !props.historyPrew) {     
         getInfo(docId).then((response) => {
           const obj = response.data;
           obj.isEdit = isEdit == 1?true:false;
+          obj.isCopy = isCopy == 0?true:false; 
           newObj.value = obj;
           option.value.isEdit = obj.isEdit;
-          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.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.title = obj.fileName;
           option.value.key = obj.fileId;
           option.value.fileType = obj.fileType.replace(".", "");
@@ -92,11 +94,11 @@ export default {
         });
       } else if (docId && props.historyPrew) {
         option.value.isEdit = false;
-        option.value.url = `${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.url = `${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(".", "");
@@ -113,8 +115,8 @@ export default {
       }
     }
     /** 修改按钮操作 */
-    function edit(docId,canEdit) {
-      oo(docId,canEdit);
+    function edit(docId,canEdit,canCopy) {
+      oo(docId,canEdit,canCopy);
     }
     onMounted(() => {
       let route = useRoute(); 
@@ -126,9 +128,10 @@ export default {
       }
         console.log('route.query.canEdit',route.query.canEdit);
         canEdit = route.query.canEdit
+       let canCopy = route.query.canCopy
       console.log(docId, "doc");
       console.log(copyRow, "row");
-      edit(docId,canEdit);
+      edit(docId,canEdit,canCopy);
       // let row = JSON.parse(newObj.value)
       // console.log(row, '852');
     });

src/views/publicment/MyFile.vue

@@ -201,9 +201,9 @@
                                 </el-table-column>
                                 <el-table-column prop="createTime" label="时间" width="180" />
                                 <el-table-column prop="dirType" label="类型">
-                                    <template #default="scope">
-                                        <span v-if="scope.row.isEncrypt == 'N'">公开目录</span>
-                                        <span v-else>加密目录</span>
+                                     <template #default="scope">
+                                        <span v-if="scope.row.dirType == '1'">普通目录</span>
+                                        <span v-else>组织目录</span>
                                     </template>
                                 </el-table-column>
                                 <el-table-column label="加密等级">
@@ -324,7 +324,7 @@
             <div>
                 <CreateFloder v-if="folderCase" :thisType="thisFolder" :thisRole="thisRole" :folderCase="folderCase" @getChildrenC="getChildrenC" :oneOrTwo="oneOrTwo"
                     :impDirId="impDirId" :impSpaceId="impSpaceId" :newDirId="newDirId" :newSpaceId="newSpaceId" :upFolderData="upFolderData" :thisFolderRole="thisFolderRole"
-                    :refreshFile="getAllTop">
+                    :refreshFile="refreshFile">
                 </CreateFloder>
             </div>
             <!-- 文件上传 -->
@@ -893,7 +893,11 @@ export default {
                 // const filePreview = canPreviewFile(copyFileType.value)
                 // if (filePreview) {
                      loadingPreview.value = false
-                    addFileTab(clickRow.value,1);
+                     if(thisFolderRole.value.roles && thisFolderRole.value.roles.l0800){
+                        addFileTab(clickRow.value, 0,1);
+                    }else{
+                       addFileTab(clickRow.value, 0,0); 
+                    }
                     onlyView.value = false
                     // editOnline.value = false
                     cliCC.value = false
@@ -919,7 +923,11 @@ export default {
                 const filePreview = canPreviewFile(copyFileType.value)
                 if (filePreview) {
                    loadingPreview.value = false
-                    addFileTab(clickRow.value,0);
+                if(thisFolderRole.value.roles && thisFolderRole.value.roles.l0800){
+                        addFileTab(clickRow.value, 0,1);
+                    }else{
+                       addFileTab(clickRow.value, 0,0); 
+                    }
                     onlyView.value = true
                     cliCC.value = false
                 } else {

vite.config.js

@@ -50,7 +50,8 @@ export default defineConfig(({
 				//websocket代理
 				'/websocket': {
 					// target:'ws://localhost:8080/websocket',
-					target:'ws://192.168.1.28:8080/websocket',
+					// target:'ws://192.168.1.28:8080/websocket',
+					target:'ws://8.142.173.95:19527/websocket',
 					// target:'ws://192.168.1.11:8080/websocket',
 					changeOrigin: true,
 					rewrite: (p) => p.replace(/^\/websocket/, '')