From 1eb6b386487c6f945b74e7e9c8453ede1797f662 Mon Sep 17 00:00:00 2001 From: dhj Date: Tue, 23 Jun 2020 13:25:21 +0800 Subject: [PATCH] [Version] V.3.8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [Adds] 1.工作链背景色#f6f6f6 2.文件夹底部文字处理； 3.app不显示下载按钮，半透明下载，及下载按钮调整 --- src/views/main_web/workspace.vue | 192 +++++++++++++++++-------------- static/css/main.css | 6 +- static/img/download.svg | 13 +++ 3 files changed, 124 insertions(+), 87 deletions(-) create mode 100644 static/img/download.svg diff --git a/src/views/main_web/workspace.vue b/src/views/main_web/workspace.vue index 807c981a..27fb4781 100644 --- a/src/views/main_web/workspace.vue +++ b/src/views/main_web/workspace.vue @@ -265,7 +265,8 @@ + @click="breadNodeClickEvent(currentPageType,true)" + > 工作文件 @@ -273,7 +274,8 @@ class="list-group" :list="folderGroupBreads" group="group" - id="bread2"> + id="bread2" + >
- 公共文件 + 公共文件 - + + id="bread3" + > - +
@@ -366,7 +373,7 @@ file.extension != 'png' && file.extension != 'bmp' && file.extension != 'gif' && - file.extension != 'jpeg'" + file.extension != 'jpeg' + (isClient && !file.isDownload && (file.status == 0 || file.status == 2))?'toumin':''" @contextmenu.prevent="rightShowMenu($event, file, 1)" >
-
+
@@ -414,13 +421,13 @@ @click="setFileStatus(file, 0, '已开启文件协同',2)" >
- +
- +
在线查看 - + 打开 取消协同 - + 保存历史文件 - + 选择历史文件 @@ -598,7 +603,7 @@ class="yiyunwenjian_name" :title="foldergroup.folderGroupName" >{{ foldergroup.folderGroupName}} - {{foldergroup.childCount}}个项目 + {{foldergroup.childCount}}个项目
@@ -768,10 +773,10 @@
工作中
- +
工作中
- +
工作中
- +
在线查看 -
  • 打开
    • -
  • 打开方式
    • +
  • 打开
    • +
  • 打开方式
  • 取消协同
    • -
  • 保存历史文件
    • -
  • 选择历史文件
    • +
  • 保存历史文件
    • +
  • 选择历史文件
  • 建立副本
    • @@ -1257,7 +1268,10 @@ BtnRightFile.extension == 'txt') " >在线查看 -
  • 打开
    • +
  • 打开
  • 在线查看
    • -
  • 打开
    • +
  • 打开
  • {thisApp.listFiles()}, 3 * 1000); + if ( + thisApp.dbClickSelectedFolderGroupData == null || + JSON.stringify(thisApp.dbClickSelectedFolderGroupData) == "{}" + ) { + thisApp.timer = setInterval(() => { + thisApp.listFiles(); + }, 3 * 1000); } } }) @@ -2796,7 +2817,7 @@ export default { // 加载我的文件夹 zxm+ thisApp.myListFolderGroups = thisApp.folderFileList.listFolderGroups; - thisApp.loadCommitedComFiles(); + thisApp.loadCommitedComFiles(); }) .catch(error => { console.log(error); @@ -3078,9 +3099,8 @@ export default { * 点击文件事件：直接打开文件 */ fileClick: function(file) { - if(file.downloadStatus == 1) - { - return; + if (file.downloadStatus == 1) { + return; } if (this.isClient) { if (file.extension == "map") { @@ -3220,9 +3240,8 @@ export default { * 点击文件事件：打开文件并选择打开方式 */ fileClickSelect: function(file) { - if(file.downloadStatus == 1) - { - return; + if (file.downloadStatus == 1) { + return; } if (this.isClient) { if (file.extension == "map") { @@ -3336,9 +3355,8 @@ export default { * 协作文件点击文件事件：直接打开文件 */ fileClickColl: function(file) { - if(file.downloadStatus == 1) - { - return; + if (file.downloadStatus == 1) { + return; } if (this.isClient) { if (file.status == 1 || file.status == 0) { @@ -3414,9 +3432,8 @@ export default { * 协作文件点击文件事件：打开文件并选择打开方式 */ fileClickSelectColl: function(file) { - if(file.downloadStatus == 1) - { - return; + if (file.downloadStatus == 1) { + return; } if (this.isClient) { if (file.status == 1 || file.status == 0) { @@ -3609,33 +3626,26 @@ export default { duration: 2000 }); file.downloadStatus = 1; - file.isDownload=true; + file.isDownload = true; var archid = file.archID; var filename = file.archName + "." + file.extension; var folderID = file.folderID; var folderName = thisApp.listUserFolders[thisApp.nowFolderIndex].folderName; var projID = file.projID; - if(type == 1 ) - { - back.downloadFile( - archid, - filename, - folderID - ); - } - else{ + if (type == 1) { + back.downloadFile(archid, filename, folderID); + } else { var folderName = thisApp.listUserFolders[thisApp.nowFolderIndex].folderName; - back.downloadFile( - archid, - filename, - folderID, - sessionStorage.projName, - folderName - ); + back.downloadFile( + archid, + filename, + folderID, + sessionStorage.projName, + folderName + ); } - } else { this.$notify({ title: "温馨提示", @@ -3662,7 +3672,7 @@ export default { */ clientUpload() { if (this.isClient) { - this.isShowNewFiledialog=false; + this.isShowNewFiledialog = false; back.uploadFile(this.listUserFolders[this.nowFolderIndex].folderID); } }, @@ -4678,9 +4688,11 @@ export default { this.folderGroupBreads = []; //zxm+ 点击工作链节点时 清空面包屑 this.isShowWorkt = true; //zxm+ 点击工作链节点时 显示我的文件和工作文件 this.isShowBread = false; //zxm+ 点击工作链节点时 隐藏面包屑 - clearInterval(this.timer) - this.listFiles(); - this.timer=setInterval(()=>{this.listFiles()}, 3 * 1000); + clearInterval(this.timer); + this.listFiles(); + this.timer = setInterval(() => { + this.listFiles(); + }, 3 * 1000); // this.loadMyAppInstanceList();//zxm }, /** @@ -4696,9 +4708,11 @@ export default { this.folderGroupBreads = []; //zxm+ 点击工作链节点时 清空面包屑 this.isShowWorkt = true; //zxm+ 点击工作链节点时 显示我的文件和工作文件 this.isShowBread = false; //zxm+ 点击工作链节点时 隐藏面包屑 - clearInterval(this.timer) - this.listFiles(); - this.timer=setInterval(()=>{this.listFiles()}, 3 * 1000); + clearInterval(this.timer); + this.listFiles(); + this.timer = setInterval(() => { + this.listFiles(); + }, 3 * 1000); } else { this.$notify({ title: "温馨提示", @@ -5378,7 +5392,7 @@ export default { /** * 双击文件夹组名称 进入文件夹 */ - intoFoldergroup: function(foldergroup) { + intoFoldergroup: function(foldergroup) { this.dbClickSelectedFolderGroupData = foldergroup; this.isShowWorkt = false; this.isShowBread = true; @@ -5411,9 +5425,11 @@ export default { this.myListFolderGroups = response.data.data.listOtherFolderGroups; //zxm+ 加载文件分组面包屑 this.folderGroupBreads = response.data.data.listBreadFolderGroups; - } - clearInterval(this.timer) - this.timer = setInterval(()=>{this.intoFoldergroup(foldergroup)}, 3 * 1000); + } + clearInterval(this.timer); + this.timer = setInterval(() => { + this.intoFoldergroup(foldergroup); + }, 3 * 1000); } }); }, @@ -5424,17 +5440,21 @@ export default { */ breadNodeClickEvent: function(obj, isBreadFirstNode) { var thisApp = this; - clearInterval(thisApp.timer) + clearInterval(thisApp.timer); thisApp.folderGroupBreads = []; if (isBreadFirstNode) { thisApp.isShowWorkt = true; thisApp.isShowBread = false; thisApp.dbClickSelectedFolderGroupData = {}; - this.listFiles() - thisApp.timer = setInterval(()=>{this.listFiles()}, 3 * 1000); + this.listFiles(); + thisApp.timer = setInterval(() => { + this.listFiles(); + }, 3 * 1000); } else { thisApp.intoFoldergroup(obj); - thisApp.timer = setInterval(()=>{thisApp.intoFoldergroup(obj)}, 3 * 1000); + thisApp.timer = setInterval(() => { + thisApp.intoFoldergroup(obj); + }, 3 * 1000); } }, /** @@ -5759,11 +5779,11 @@ export default { }, outWorkSpace(data) { this.hideWorklinkPage(); - }, + } }, destroyed: function() { window.removeEventListener("scroll", this.onscroll); - clearInterval(this.timer) + clearInterval(this.timer); }, components: { Forgeview: forgeview, diff --git a/static/css/main.css b/static/css/main.css index 7149c302..d4d2d2ee 100644 --- a/static/css/main.css +++ b/static/css/main.css @@ -4574,7 +4574,7 @@ button:focus { height: calc(100vh - 406px); overflow-y: auto; transition: ease all 0.5s; - background-color: rgb(246, 246, 246,0.8); + background-color: #f6f6f6; } .layerout_H3{ min-height: 150px; @@ -7458,6 +7458,7 @@ li.secondMenu ul li:hover { display: inline-block; margin-top: 20px; transition: ease all 0.5s; + font-weight: 400; } .yiyun_wenjian_list{ text-align: center; @@ -8720,4 +8721,7 @@ h5.dulilabel{ .titlebar_head{ display: flex; justify-content: space-between; +} +.toumin{ + opacity: 0.5; } \ No newline at end of file diff --git a/static/img/download.svg b/static/img/download.svg new file mode 100644 index 00000000..0dcd032d --- /dev/null +++ b/static/img/download.svg @@ -0,0 +1,13 @@ + + + 符号/操作/下载 + + + + + + + + + + \ No newline at end of file