@@ -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 ddd49f81..d4d2d2ee 100644
--- a/static/css/main.css
+++ b/static/css/main.css
@@ -4266,7 +4266,8 @@ button:focus {
margin: 0 auto;
}
.fifleBox{
- height: 275px;
+ min-height: 259px;
+ max-height: 275px;
overflow-y: auto;
}
.neibianju1 .fifleBox{
@@ -4570,10 +4571,10 @@ button:focus {
left: -30px;
}
.layerout_H2{
- height: calc(100vh - 422px);
+ 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;
@@ -7313,7 +7314,7 @@ h3.defualth3:hover{
border: 0;
font-weight: 500;
font-family: PingFang SC;
- max-width: 112px;
+ max-width: 76px;
padding: 0 14px;
height: 28px;
border-radius: 4px;
@@ -7457,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;
@@ -7495,8 +7497,9 @@ li.secondMenu ul li:hover {
}
.neibianju {
background-color: #fff;
- padding-top: 2px;
- height: 316px;
+ padding-top: 2px;
+ min-height: 259px;
+ max-height: 300px;
border-radius: 16px 16px 0 0;
box-shadow: 0 -3px 11px 1px rgba(0,0,0,0.06);
overflow-y: auto;
@@ -7651,7 +7654,7 @@ li.secondMenu ul li:hover {
height: 54px;
overflow: hidden;
float: left;
- max-width: 347px;
+ max-width: 368px;
}
.worklinkBtngroup button{
margin: 0 8px;
@@ -8718,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