From 1beafd32eb0143daa786f4595a2297ae9bfef205 Mon Sep 17 00:00:00 2001 From: zxm Date: Mon, 20 Jul 2020 21:10:41 +0800 Subject: [PATCH 1/4] [VersionBeta] V.1.0.0.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [Adds] 1.修改回收站显示按windows逻辑显示 --- src/views/main_web/recycle.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/main_web/recycle.vue b/src/views/main_web/recycle.vue index 6269b919..3307c8cd 100644 --- a/src/views/main_web/recycle.vue +++ b/src/views/main_web/recycle.vue @@ -85,7 +85,7 @@ {{foldergroup.folderGroupName}} - {{foldergroup.childCount}}个项目 + From e806c74352249578943d11ab653300c87455859c Mon Sep 17 00:00:00 2001 From: xzx Date: Tue, 21 Jul 2020 15:43:52 +0800 Subject: [PATCH 2/4] [VersionBeta] V.1.0.0.0 [Adds] 1.NO --- config/prod.env.js | 6 +++--- src/views/main_web/workspace.vue | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/config/prod.env.js b/config/prod.env.js index 6d43fda8..46954e6f 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -6,9 +6,9 @@ module.exports = { // OFFICE_WEB:'"https://office.tszcloud.com"', // API_HOST: '"https://bapi.tszcloud.com/api/"', - IS_CLIENT: false, - - // OFFICE_WEB: '"https://office.tszcloud.com"' + IS_CLIENT: true, + OFFICE_WEB: '"http://192.168.5.25"', API_HOST:'"http://192.168.5.32:9003/api/"', + // API_HOST:'"http://10.240.5.189:9003/api/"', // 王静内网 } diff --git a/src/views/main_web/workspace.vue b/src/views/main_web/workspace.vue index 5818fc9e..95cd6652 100644 --- a/src/views/main_web/workspace.vue +++ b/src/views/main_web/workspace.vue @@ -2835,6 +2835,7 @@ export default { */ setFileStatusSure(){ var thisApp=this; + // null 判断 if(thisApp.setFile.alias == "") { this.$notify({ From f97e020c3e73515e3da0e33145597148b085545e Mon Sep 17 00:00:00 2001 From: zxm Date: Wed, 22 Jul 2020 09:34:10 +0800 Subject: [PATCH 3/4] [VersionBeta] V.1.0.0.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [Adds] 1.修改拖拽bug：解决思路重新router了一下workspace页面 --- src/views/main_web/workspace.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/views/main_web/workspace.vue b/src/views/main_web/workspace.vue index 8204d3ac..a56a9251 100644 --- a/src/views/main_web/workspace.vue +++ b/src/views/main_web/workspace.vue @@ -6100,6 +6100,9 @@ export default { }); } thisApp.refreshPages(); + thisApp.$router.push({ + name: "workspace" + }); }) .catch(error => { console.log(error); From 7b39ff1547eb30af4b4c02783d6cca981610d61d Mon Sep 17 00:00:00 2001 From: zxm Date: Wed, 22 Jul 2020 10:37:51 +0800 Subject: [PATCH 4/4] [VersionBeta] V.1.0.0.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [Adds] 1.修改鼠标移入齿轮“我的文件”和“工作文件” 显示菜单事件 --- src/views/main_web/workspace.vue | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/views/main_web/workspace.vue b/src/views/main_web/workspace.vue index 4d2e70fb..33a6d244 100644 --- a/src/views/main_web/workspace.vue +++ b/src/views/main_web/workspace.vue @@ -2277,6 +2277,8 @@ export default { this.listFolders(); this.updateProjUser(); window.addEventListener("resize", this.listenBottomHeight, true); + //添加鼠标移入齿轮事件 + window.addEventListener("mouseenter", this.setIconMouseEnter, true); }, computed: { /** @@ -2319,6 +2321,17 @@ export default { this.showadow = false } }, + /** + * 鼠标移上齿轮设置事件 + */ + setIconMouseEnter:function(){ + //工作文件下 指定显示某些菜单项 + if (this.currentPageType == 1) { + this.isShowMenuFile = true; + } else { + this.isShowMenuFile = false; + } + }, /** * 刷新页面 */ @@ -6159,6 +6172,7 @@ export default { destroyed: function() { window.removeEventListener("scroll", this.onscroll); window.removeEventListener("resize", this.listenBottomHeight); + window.removeEventListener("mouseenter", this.setIconMouseEnter); clearInterval(this.timer); }, components: {