From b6d1cba30eeaf07d332a4141f4b6ad247a4b6799 Mon Sep 17 00:00:00 2001 From: zxm Date: Mon, 29 Jun 2020 20:16:27 +0800 Subject: [PATCH 1/5] [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 | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/views/main_web/workspace.vue b/src/views/main_web/workspace.vue index 8fc0573d..d96e7bfb 100644 --- a/src/views/main_web/workspace.vue +++ b/src/views/main_web/workspace.vue @@ -5361,14 +5361,12 @@ export default { /** * 右键菜单 */ - rightShowMenu: function(e, file, type) { + rightShowMenu: function(e, file, type) { const menuMinWidth = 10; const offsetLeft = this.$el.getBoundingClientRect().left; // container margin left const offsetWidth = this.$el.offsetWidth; // container width const maxLeft = offsetWidth - menuMinWidth; // left boundary - const left = e.clientX - offsetLeft; // 15: margin right - console.log(e.clientX); - console.log(offsetLeft); + const left = e.clientX - offsetLeft; // 15: margin right if (left > maxLeft) { this.left = maxLeft; } else { @@ -5380,6 +5378,7 @@ export default { } else { this.top = e.clientY; // fix 位置bug } + if (type == 2 || type == 3) { //工作文件下 指定显示某些菜单项 if (this.currentPageType == 1) { @@ -5410,6 +5409,12 @@ export default { //点击空白处只显示“新建文件夹” if (file == "新建文件夹") { this.isShowMenuItemCreateFoldergroup = true; + //"新建文件夹"的位置 + if (e.clientY < document.body.clientHeight / 2) { + this.top = e.clientY - 120; // fix 位置bug + } else { + this.top = e.clientY-80; // fix 位置bug + } } else { this.isShowMenuItemCreateFoldergroup = false; } From b35f0481816afbf8224e3abbc4ef22f6070ec4ab Mon Sep 17 00:00:00 2001 From: zxm Date: Tue, 30 Jun 2020 10:11:29 +0800 Subject: [PATCH 2/5] [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 | 53 +++++++++++++++++++++++--------- 1 file changed, 39 insertions(+), 14 deletions(-) diff --git a/src/views/main_web/workspace.vue b/src/views/main_web/workspace.vue index d96e7bfb..edadc359 100644 --- a/src/views/main_web/workspace.vue +++ b/src/views/main_web/workspace.vue @@ -221,6 +221,7 @@ >{{item.title}} + + + id="bread1"> 工作文件 + + @click="breadNodeClickEvent(currentPageType,true)"> 工作文件 + + id="bread2"> + id="bread3"> + @end="draggableEnd">
+ @end="draggableEnd">
Date: Tue, 30 Jun 2020 10:56:36 +0800 Subject: [PATCH 3/5] [Version] V.3.8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [Adds] 1.面包屑 --- config/index.js | 6 +- config/prod.env.js | 10 +-- src/views/main_web/workspace.vue | 121 +++++++++++++++++-------------- 3 files changed, 76 insertions(+), 61 deletions(-) diff --git a/config/index.js b/config/index.js index d010d1f8..ff9a73de 100644 --- a/config/index.js +++ b/config/index.js @@ -20,7 +20,7 @@ module.exports = { assetsPublicPath: '/', proxyTable: { '/api/**': { - target: 'http://192.168.5.32:9003', + target: 'http://192.168.5.25:9003', changeOrigin: true, secure: false, } @@ -48,7 +48,7 @@ module.exports = { // https://webpack.js.org/configuration/devtool/#development // devtool: 'cheap-module-eval-source-map', - devtool: 'none', + devtool: 'none', // If you have problems debugging vue-files in devtools, // set this to false - it *may* help @@ -74,7 +74,7 @@ module.exports = { productionSourceMap: false, // https://webpack.js.org/configuration/devtool/#production // devtool: '#source-map', - devtool:'none', + devtool: 'none', // Gzip off by default as many popular static hosts such as // Surge or Netlify already gzip all static assets for you. diff --git a/config/prod.env.js b/config/prod.env.js index 33b4e358..dc11a135 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -5,9 +5,9 @@ module.exports = { // API_WEB:'"https://tszcloud.com/"', // OFFICE_WEB:'"https://office.tszcloud.com"' - API_HOST:'"https://bapi.tszcloud.com/api/"', - API_WEB:'"https://beta.tszcloud.com/"', - OFFICE_WEB:'"https://office.tszcloud.com"' - //API_HOST:'"http://192.168.5.32:9003/api/"', - // API_WEB:'"http://192.168.5.32:9099/"', + API_HOST: '"https://bapi.tszcloud.com/api/"', + API_WEB: '"https://beta.tszcloud.com/"', + OFFICE_WEB: '"https://office.tszcloud.com"' + //API_HOST:'"http://192.168.5.25:9003/api/"', + // API_WEB:'"http://192.168.5.25:9099/"', } diff --git a/src/views/main_web/workspace.vue b/src/views/main_web/workspace.vue index edadc359..b051bb37 100644 --- a/src/views/main_web/workspace.vue +++ b/src/views/main_web/workspace.vue @@ -222,30 +222,29 @@ - - 我的文件 - - - - 工作文件 - - + 我的文件 + + + 工作文件 + + + id="bread1" + > - - 工作文件 - - + + 工作文件 + + + id="bread2" + > + id="bread3" + > + @end="draggableEnd" + >
+ @end="draggableEnd" + >
maxLeft) { this.left = maxLeft; } else { @@ -5425,7 +5431,7 @@ export default { if (e.clientY < document.body.clientHeight / 2) { this.top = e.clientY - 120; // fix 位置bug } else { - this.top = e.clientY-80; // fix 位置bug + this.top = e.clientY - 80; // fix 位置bug } } else { this.isShowMenuItemCreateFoldergroup = false; @@ -5929,8 +5935,8 @@ export default { var thisApp = this; var sourceData = evt.draggedContext.element; var targetData = evt.relatedContext.element; - if(targetData.folderGroupID=="myFile"){ - targetData.folderID=this.nowFolder.folderID + if (targetData.folderGroupID == "myFile") { + targetData.folderID = this.nowFolder.folderID; } var draggableData = {}; if (sourceData.archID != null) { @@ -5955,9 +5961,9 @@ export default { * 拖拽完成发送请求 */ draggableEnd: function(evt) { - var thisApp = this; - if(thisApp.currentPageType==1){ - thisApp.$notify({ + var thisApp = this; + if (thisApp.currentPageType == 1) { + thisApp.$notify({ title: "温馨提示", message: "工作文件下不能进行拖拽！", type: "info", @@ -6085,4 +6091,13 @@ export default { position: absolute; left: 0; } +.yywenjiantitle_text1 { + position: relative; + top: 2px; +} +.youbian { + color: #a7a8b7; + position: relative; + top: 2px; +} \ No newline at end of file From cc39e820867890a1d91ba86b306f622a253291cf Mon Sep 17 00:00:00 2001 From: zxm Date: Tue, 30 Jun 2020 15:20:19 +0800 Subject: [PATCH 4/5] [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 | 30 ++++++------------------------ 1 file changed, 6 insertions(+), 24 deletions(-) diff --git a/src/views/main_web/workspace.vue b/src/views/main_web/workspace.vue index b051bb37..e9b225d9 100644 --- a/src/views/main_web/workspace.vue +++ b/src/views/main_web/workspace.vue @@ -2921,8 +2921,6 @@ export default { console.log(error); }); } else { - this.fileindex = 0; - this.curactive = 0; this.$axios({ method: "get", url: encodeURI( @@ -2936,26 +2934,6 @@ export default { }) .then(response => { thisApp.folderFileList = response.data; - // if (folderPerm == 0) { - // thisApp.myFilesList = thisApp.folderFileList.listAllFiles; - // // 加载我的文件夹 zxm+ - // thisApp.myListFolderGroups = - // thisApp.folderFileList.listFolderGroups; - // } else { - // if (this.currentPageType == 0) { - // // 加载我的文件 - // thisApp.myFilesList = thisApp.folderFileList.listMyFiles; - // // 加载我的文件夹 zxm+ - // thisApp.myListFolderGroups = - // thisApp.folderFileList.listFolderGroups; - // } else { - // // 加载工作文件 - // thisApp.myFilesList = thisApp.folderFileList.listOtherFiles; - // // 加载工作文件分组 zxm+ - // thisApp.myListFolderGroups = - // thisApp.folderFileList.listOtherFolderGroups; - // } - // } if (this.currentPageType == 0) { // 加载我的文件 thisApp.myFilesList = thisApp.folderFileList.listMyFiles; @@ -2968,8 +2946,12 @@ export default { // 加载工作文件分组 zxm+ thisApp.myListFolderGroups = thisApp.folderFileList.listOtherFolderGroups; + } + if(thisApp.curactive==0){ + thisApp.listCollaborationFiles(); + }else if(thisApp.curactive==1){ + thisApp.loadListCommonFiles(); } - thisApp.listCollaborationFiles(); }) .catch(error => { console.log(error); @@ -3028,7 +3010,7 @@ export default { */ loadListCommonFiles: function() { var thisApp = this; - thisApp.myPublicFilesList = []; + //thisApp.myPublicFilesList = []; this.$axios({ method: "get", url: encodeURI( From 215f30b28d4a387a4f9e47fa6f4c39f34e00f6ed Mon Sep 17 00:00:00 2001 From: zxm Date: Tue, 30 Jun 2020 21:56:15 +0800 Subject: [PATCH 5/5] [VersionBeta] V.1.0.0.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [Adds] 1.修改文件分组下 删除文件闪跳bug --- src/views/main_web/workspace.vue | 47 +++++++++++++++++++++++++------- 1 file changed, 37 insertions(+), 10 deletions(-) diff --git a/src/views/main_web/workspace.vue b/src/views/main_web/workspace.vue index e9b225d9..e4567b05 100644 --- a/src/views/main_web/workspace.vue +++ b/src/views/main_web/workspace.vue @@ -3863,7 +3863,13 @@ export default { offset: 100, duration: 2500 }); - thisApp.listFolders(); + if(thisApp.dbClickSelectedFolderGroupData==null + || JSON.stringify(thisApp.dbClickSelectedFolderGroupData)=='{}'){ + //thisApp.listFolders(); + thisApp.listFiles() + }else{ + thisApp.intoFoldergroup(thisApp.dbClickSelectedFolderGroupData) + } }) .catch(function(error) { console.log(error); @@ -4388,12 +4394,25 @@ export default { "archives/milestone/" + file.archID + "/" + - sessionStorage.userId - ) + sessionStorage.userId + + "/" + + this.dbClickSelectedFolderGroupData.folderGroupID + ), + data:{ + archid: file.archID, + userid: sessionStorage.userId, + foldergroupid: this.dbClickSelectedFolderGroupData.folderGroupID + } }) .then(response => { if (response.data.state == 1) { - thisApp.listFiles(); + //thisApp.listFiles(); + if(this.dbClickSelectedFolderGroupData!=null + && JSON.stringify(this.dbClickSelectedFolderGroupData)!='{}'){ + this.intoFoldergroup(this.dbClickSelectedFolderGroupData); + }else{ + this.listFiles(); + } this.$notify({ title: "恭喜您", message: response.data.message, @@ -4508,18 +4527,21 @@ export default { */ copyFile: function(file) { var thisApp = this; - this.$axios({ + thisApp.$axios({ method: "get", url: encodeURI( process.env.API_HOST + - "archives/copy/" + + "archives/copydup/" + file.archID + "/" + - sessionStorage.userId + sessionStorage.userId + + "/" + + thisApp.dbClickSelectedFolderGroupData.folderGroupID ), data: { archid: file.archID, - userid: sessionStorage.userId + userid: sessionStorage.userId, + foldergroupid: thisApp.dbClickSelectedFolderGroupData.folderGroupID } }) .then(response => { @@ -4889,7 +4911,12 @@ export default { goFolder: function(index) { this.nowFolderIndex = index; this.nowFolder = this.listUserFolders[this.nowFolderIndex]; - this.listFiles(); + if(this.dbClickSelectedFolderGroupData!=null + && JSON.stringify(this.dbClickSelectedFolderGroupData)!='{}'){ + this.intoFoldergroup(this.dbClickSelectedFolderGroupData); + }else{ + this.listFiles(); + } this.closeAppManagePain(); sessionStorage.nowFolderIndex = index; }, @@ -5603,7 +5630,7 @@ export default { if (foldergroup == null || JSON.stringify(foldergroup) == "{}") { this.$notify({ title: "温馨提示", - message: "请选中文件夹或新建文件夹", + message: "请选中文件或新建文件夹", type: "info", offset: 100, duration: 2500