diff --git a/src/views/main_web/workspace.vue b/src/views/main_web/workspace.vue index b40d65a2..a6acaaf7 100644 --- a/src/views/main_web/workspace.vue +++ b/src/views/main_web/workspace.vue @@ -198,7 +198,7 @@ @hideWorklinkPage="hideWorklinkPage" >
-
+
@@ -319,11 +319,11 @@
- 新建文件夹 + >新建文件夹 --> +
    +
  • 新建文件夹
  • 打开
  • 转移至其他工作
  • 复制至其它工作
    • @@ -2061,9 +2059,9 @@ export default { mapAddress: "北京天安门", isClient: false, // 是否是客户端 - /**新建文件夹 start*/ - dialogNewFolderGroup: false, //新建文件夹组弹窗 - //文件夹组数据 + /**新建文件分组 start*/ + dialogNewFolderGroup: false, //新建文件分组组弹窗 + //文件分组数据 folderGroupData: { folderGroupID: "", folderID: "", @@ -2076,8 +2074,8 @@ export default { modifyUserID: "", modifyTime: "" }, - myListFolderGroups: [], // 我的文件夹组数据 - dbClickSelectedFolderGroupData: {}, //双击选中的当前文件夹组对象 + myListFolderGroups: [], // 我的文件分组数据 + dbClickSelectedFolderGroupData: {}, //双击选中的当前文件夹分组对象 isShowWorkt: true, //是否显示我的文件和工作文件 isShowBread: false, //是否显示面包屑 folderGroupBreads: [], //文件分组面包屑集合 @@ -2085,8 +2083,8 @@ export default { strFoldergroupCopyOrMove: "", //右键菜单 文件分组 是复制还是移动标记 strFileOrFoldergroup: "", //右键菜单 移动/复制到其他工作 是文件还是文件分组标记 draggableData: {}, //记录要移动的数据 - timer: {} //文件计时器对象 - /**新建文件夹 end*/ + timer: {}, //文件计时器对象 + /**新建文件分组 end*/ }; }, mounted: function() { @@ -5227,7 +5225,7 @@ export default { } else { this.top = e.clientY; // fix 位置bug } - + if (type == 2 || type == 3) { if (file.status == 2) { if (this.isClient) { @@ -5236,6 +5234,7 @@ export default { this.top = this.top - 50; } } else if (type == 4) { + //显示分组菜单的位置 if (this.isClient) { this.top = this.top - 100; } else { @@ -5252,7 +5251,12 @@ export default { this.rightMenuvisible = true; this.showType = type; this.BtnRightFile = file; //鼠标右击的文件 - this.btnRightFoldergoup = file; //zxm+ 鼠标右击的文件分组 + //this.btnRightFoldergoup = file; //zxm+ 鼠标右击的文件分组 + if(file=="新建文件夹"){ + this.btnRightFoldergoup={} + }else{ + this.btnRightFoldergoup = file; //zxm+ 鼠标右击的文件分组 + } }, /** * 关闭 @@ -5406,6 +5410,16 @@ export default { * 双击文件夹组名称 进入文件夹 */ intoFoldergroup: function(foldergroup) { + if(foldergroup==null || JSON.stringify(foldergroup)=='{}'){ + this.$notify({ + title: "温馨提示", + message: "请选中文件或新建文件夹", + type: "info", + offset: 100, + duration: 2500 + }); + return + } this.dbClickSelectedFolderGroupData = foldergroup; this.isShowWorkt = false; this.isShowBread = true; @@ -5475,6 +5489,16 @@ export default { */ renameFoldergroup: function(btnRightFoldergoup) { var thisApp = this; + if(thisApp.btnRightFoldergoup==null || JSON.stringify(thisApp.btnRightFoldergoup)=='{}'){ + thisApp.$notify({ + title: "温馨提示", + message: "请选中文件或新建文件夹", + type: "info", + offset: 100, + duration: 2500 + }); + return + } this.$prompt( "当前文件夹名称: " + btnRightFoldergoup.folderGroupName, "重命名", @@ -5525,6 +5549,16 @@ export default { */ copyAndMoveFoldergroup: function(btnRightFoldergoup, strCopyOrMove) { var thisApp = this; + if(thisApp.btnRightFoldergoup==null || JSON.stringify(thisApp.btnRightFoldergoup)=='{}'){ + thisApp.$notify({ + title: "温馨提示", + message: "请选中文件或新建文件夹", + type: "info", + offset: 100, + duration: 2500 + }); + return + } if (strCopyOrMove == "move") { thisApp.dialogTtile = "移动到其它文件夹"; } @@ -5613,6 +5647,16 @@ export default { */ removeRecycle: function(btnRightFoldergoup) { var thisApp = this; + if(thisApp.btnRightFoldergoup==null || JSON.stringify(thisApp.btnRightFoldergoup)=='{}'){ + thisApp.$notify({ + title: "温馨提示", + message: "请选中文件或新建文件夹", + type: "info", + offset: 100, + duration: 2500 + }); + return + } thisApp .$axios({ method: "get", diff --git a/static/css/main.css b/static/css/main.css index d4d2d2ee..e3bb4755 100644 --- a/static/css/main.css +++ b/static/css/main.css @@ -1881,7 +1881,7 @@ span.yiyun_tishibtn { width: 136px; float: left; height: 200px; - margin: 0px 16px 30px 16px; + margin: 0px 16px 0px 16px; } .yiyun_wenjian_list:hover { background-color: #d8d8d8; @@ -4266,12 +4266,13 @@ button:focus { margin: 0 auto; } .fifleBox{ - min-height: 259px; + min-height: 215px; max-height: 275px; - overflow-y: auto; + overflow-y: auto; } .neibianju1 .fifleBox{ height: calc(100vh - 210px); + max-height: calc(100vh - 210px); overflow-y: auto; } .yiyun_title_label{ @@ -4571,7 +4572,7 @@ button:focus { left: -30px; } .layerout_H2{ - height: calc(100vh - 406px); + height: calc(100vh - 350px); overflow-y: auto; transition: ease all 0.5s; background-color: #f6f6f6; @@ -7503,6 +7504,10 @@ li.secondMenu ul li:hover { border-radius: 16px 16px 0 0; box-shadow: 0 -3px 11px 1px rgba(0,0,0,0.06); overflow-y: auto; + position: absolute; + bottom: 0; + width: 100%; + box-sizing: border-box; } .neibianju1 { background-color: #fff;