+
-
+
-
+
-
+
-
-
-
-
-
-
-
+
@@ -277,13 +281,21 @@ export default {
nowFolderIndex: Number,
nowFolderName: String,
isShowlink: Boolean,
+ isHideWorkFolders: {//额外控制是否不显示工作节点
+ type: Boolean,
+ defualt: false
+ },
+ isCalcuteExchangeNode: {
+ type: Boolean,
+ default: true,
+ }
},
data() {
return {
acceptIdList:[],//接收方
sendIdList:[],//发送方
isShowRightManager: false,
- isShowworklink: false,
+ isShowworklink: false,//是否显示工作链图表
workheight: "", //工作链高度
projId:sessionStorage.projId,
groupLength:5,
@@ -314,6 +326,14 @@ export default {
this.isShowworklink = false;
this.workheight = "workheightinit";
},
+ /**
+ * 查看工作链页面
+ */
+ showWorklinkPage() {
+ this.$emit("showWorklinkPage", true);
+ this.isShowworklink = true;
+ this.workheight = "workheight";
+ },
/**
* 工作链中新申请
*/
@@ -344,14 +364,7 @@ export default {
showAllAppManagement() {
this.$emit("showAllAppManagement", true);
},
- /**
- * 查看工作链页面
- */
- showWorklinkPage() {
- this.$emit("showWorklinkPage", true);
- this.isShowworklink = true;
- this.workheight = "workheight";
- },
+
/**
* 工作链页面点击
*/
@@ -391,7 +404,7 @@ export default {
var len=this.listUserFolders.length;
/**获取嵌套节点与其父节点 */
const data2=await this.$fetchApi('template/queryTemplateNodeByTemplateId',{templateId:templateId});
- var nodeLists=data2.Data.children;
+ var nodeLists = data2.Data ? data2.Data.children : [];
var nestNodeIdLists=[];
var parentNodeId;
this.getNestItem(nodeLists,nestNodeIdLists,parentNodeId);
@@ -403,9 +416,19 @@ export default {
this.listUserFolders.forEach(item=>{
Res.Data.forEach(item2=>{
if(item.nodeId==item2.PermCode&&item2.Permission==1&&item.nodeId!=item2.SysCode){
- item.listsShareFrom[1].push(temp[item2.SysCode]);
+ // const isExists1 = item.listsShareFrom[1].find(i => i.nodeId == item2.SysCode);
+
+ // console.log('isExists1', isExists1)
+ // if(!isExists1) {
+ item.listsShareFrom[1].push(temp[item2.SysCode]);
+ // }
}else if(item.nodeId==item2.SysCode&&item2.Permission==1&&item.nodeId!=item2.PermCode){
- item.listsShareFrom[0].push(temp[item2.PermCode]);
+ // const isExists2 = item.listsShareFrom[0].find(i => i.nodeId == item2.PermCode);
+ // console.log('isExists2', isExists2)
+ // if(!isExists2) {
+ item.listsShareFrom[0].push(temp[item2.PermCode]);
+ // }
+
}
}
)
@@ -446,6 +469,10 @@ export default {
return {
transform: `translate(${-this.moveX}px, 0)`
}
+ },
+ // 总共的工作节点数目 即listUserFolders的长度
+ totalNodeNum() {
+ return this.listUserFolders ? this.listUserFolders.length : 0;
}
},
watch: {
@@ -465,8 +492,10 @@ export default {
this.hideWorklinkPage();
}
},
- listUserFolders() {
- this.getFileExchange();
+ totalNodeNum() {
+ if(this.isCalcuteExchangeNode) {
+ this.getFileExchange();
+ }
},
nowFolderShareNodesLen() {
this.$emit('finishGetExchangeNodes');
@@ -519,13 +548,13 @@ export default {
.workline-wrap {
background-color: #F0F0F0;
}
- // .has-next-node, .has-prev-node {
- // width: 16px;
- // height: 16px;
- // border-radius: 4px;
- // background-color: rgba(250, 250, 250, 1);
- // margin: 0 8px;
- // }
+ .has-next-node, .has-prev-node {
+ width: 16px;
+ height: 16px;
+ border-radius: 4px;
+ background-color: rgba(250, 250, 250, 1);
+ margin: 0 8px;
+ }
// 最多显示7个字符 多余的用省略号表示
.now-folder-text {
max-width: 157px;
@@ -541,6 +570,15 @@ export default {
}
.hide-folder {
- visibility: hidden;
+ display: none;
+ }
+
+ .adjust-btn-pos {
+ text-align: left;
+ padding: 0 31px;
+ }
+
+ .height-0 {
+ height: 0;
}
\ No newline at end of file
diff --git a/src/views/main_web/workspace/workspace.new.vue b/src/views/main_web/workspace/workspace.new.vue
index 3b43f265..c9231ad7 100644
--- a/src/views/main_web/workspace/workspace.new.vue
+++ b/src/views/main_web/workspace/workspace.new.vue
@@ -8,20 +8,6 @@
class="app-header-style workspace-header"
v-if="!showWorkline"
>
-
+
+
+
+
+
+
-
+
+
+
-
-
-
-->
-
-
-
-
+
+
-
-
-
-
-
+
+
-
+
@@ -500,7 +504,7 @@ import { firstCharToLowerCase, firstCharToUpperCase, notify } from '@/utils/tool
import FileItem from './components/file-item';
import FolderItem from './components/folder-item';
import { FileWorkStatus, getFileStoreKey, injectionFileLocalStatus, LoadingEnum, VirtualFolder, analyzeRelativePath, imgExtensionList, RecExtensionList, VideoExtensionList, office, filePreviewList } from './helper';
-import { propertyOf, uniqBy, throttle, flatten, debounce } from 'lodash';
+import { propertyOf, uniqBy, throttle, flatten, debounce, cloneDeep } from 'lodash';
import { fetchApi } from '@/utils/request';
const $ = window.jQuery;
const Velocity = window.Velocity;
@@ -638,9 +642,11 @@ export default {
searchCoopFileList: [],//搜索得到的协作文件列表
isAllFileLoaded: false,//当前工作节点下的文件状态是否都加载完毕
+ hackWorkLine: null,
};
},
mounted: function () {
+ this.hackWorkLine = this.$refs.hackworkline;
window.addEventListener("scroll", this.onscroll, true);
window.addEventListener("resize", this.listenBottomHeight, true);
if(this.isClient) {
@@ -651,7 +657,7 @@ export default {
this.fetchNodeFolders();
this.socketIns = system.entryProject(
- sessionStorage.projName, sessionStorage.userId,
+ sessionStorage.projName, sessionStorage.accountName,
this.onSocketFileChangeDetected.bind(this),
(localWorkspacePrefix) => { this.localWorkspacePrefix = localWorkspacePrefix;},
errorEvent => {
@@ -1141,6 +1147,11 @@ export default {
*/
showWorklinkPage: function () {
// this.$emit("isShowOutWorkSpace", true);
+ if(this.hackWorkLine) {
+ // this.hackWorkLine.showWorklinkPage();
+ this.hackWorkLine.isShowworklink = true;
+ this.hackWorkLine.workheight = "workheight";
+ }
this.showWorkline = true;
// this.workheight = "workheight";
},
@@ -1149,6 +1160,10 @@ export default {
* @return:
*/
hideWorklinkPage: function () {
+ if(this.hackWorkLine) {
+ this.hackWorkLineisShowworklink = false;
+ this.hackWorkLine.workheight = "workheightinit";
+ }
this.showWorkline = false;
// this.workheight = " workheightinit";
},
@@ -1220,6 +1235,7 @@ export default {
const folderList = workList.filter(folder => folder.nodeId !== folder.templateId && folder.folderName !== '公共文件夹');
this.nodeFolders = folderList;
+ this.copyNodeFolders = cloneDeep(folderList);
this.folderMap = folderList.reduce((h, f) => (h[f.id] = f, h), {});
if(!folderList.length) return;
const paramsFolderId = this.$route.params.folderId;
@@ -1323,7 +1339,7 @@ export default {
? this.currentNodeFolder
: this.breadcrumbFolderList[breadFolderIdx];
this.currentFolder = targetFolder;
- this.fetchFolderFiles();
+ // this.fetchFolderFiles();
// 重置面包屑导航数组
this.breadcrumbFolderList = this.breadcrumbFolderList.slice(0, breadFolderIdx + 1);
} else if(flag == 1) {
@@ -1994,13 +2010,16 @@ export default {
.adjust-workline-pos-client {
position: relative;
- top: -16px;
+ top: -12px;
}
.adjust-workline-pos-web {
position: relative;
- top: -10px;
+ top: -2.5px;
}
.ml-4-mt-20 {
margin: 20px 0 0 4px;
}
+ .height-0 {
+ height: 0;
+ }
\ No newline at end of file
diff --git a/src/views/platform_center/index.vue b/src/views/platform_center/index.vue
index 40f04abd..8cff394e 100644
--- a/src/views/platform_center/index.vue
+++ b/src/views/platform_center/index.vue
@@ -120,10 +120,10 @@ export default {
return;
}
// 如果是客户端的话 要判断一下当前的窗口是否是最大化状态
- // if(system.isClient) {
- // const isMaxWindowNow = await system.isMaxWindowNow();
- // this.$cookie.set('isMaxWindowNow', isMaxWindowNow);
- // }
+ if(system.isClient) {
+ const isMaxWindowNow = await system.isMaxWindowNow();
+ this.$cookie.set('isMaxWindowNow', isMaxWindowNow);
+ }
}
this.$store.setCurrentPlatform(platformInfo);