Merge branch 'dev' of http://47.104.91.134:3000/yiyun-fe/yiyunjianzhu-vue into dev

dist/static/css/chunk-18b7f164.1a9be3da.css

@@ -0,0 +1 @@
+.black[data-v-172a2ff0]{color:#fff}.white[data-v-172a2ff0]{background-color:#fcfcfc;box-shadow:0 1px 2px 0 rgba(0,0,0,.2)}.app-header[data-v-172a2ff0]{position:fixed;top:0;width:100%;z-index:1;height:50px;line-height:50px}.app-header-content[data-v-172a2ff0]{box-sizing:border-box;display:flex;justify-content:space-between;height:100%;width:100%;padding:0 64px;font-size:16px}.app-header-content-right>div[data-v-172a2ff0],.app-header-content-right>span[data-v-172a2ff0]{margin-left:24px}.app-header-center[data-v-172a2ff0]{position:absolute;top:0;left:50%;transform:translateX(-50%);font-size:18px;height:50px;line-height:50px}.app-header-back-btn[data-v-172a2ff0]{position:absolute;left:36px;top:0;bottom:0;margin:auto 0}.black-bg-color[data-v-172a2ff0]{background-color:#32323c}.lottie-svg[data-v-1f22bc7a]{display:inline-block}.lottie-svg[data-v-1f22bc7a] svg{position:static}.readytodownload-icon[data-v-8d837484]{position:relative;top:40px;margin:0 auto}.progress-circle[data-v-8d837484],.readytodownload-icon[data-v-8d837484]{width:45px;height:45px;background-color:#fff;border-radius:50%}.progress-circle .bg-pic[data-v-8d837484],.progress-circle[data-v-8d837484],.readytodownload-icon img[data-v-8d837484]{position:absolute;top:50%;left:50%;transform:translate(-50%,-50%)}.progress-circle svg[data-v-8d837484]{position:relative!important}.progress-circle svg .el-progress-circle__track[data-v-8d837484]{stroke:#fff!important}.have-modified-icon[data-v-8d837484]{background-color:#cccdd7}.fileRightMenu li[data-v-8d837484]{white-space:nowrap}.function-disabled[data-v-8d837484]{color:#d8d8d8}.function-disabled[data-v-8d837484]:hover{cursor:not-allowed;background-color:#ecf5ff;color:#a7a8b7}.section_item.section_item_aside_fl{overflow:hidden}.el-message-box--center .el-message-box__status.el-icon-warning{position:absolute;left:0}.youbian,.yywenjiantitle_text1{position:relative;top:2px}.youbian{color:#a7a8b7}.app-header-style[data-v-779f99ca]{background-color:#f0f0f0}.titlebar_head[data-v-779f99ca]{flex-direction:column}.yiyun_section_top[data-v-779f99ca]{overflow:visible}.folder_breadcrumb[data-v-779f99ca] .el-breadcrumb__item{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;font-size:18px}.folder_breadcrumb[data-v-779f99ca] .el-breadcrumb__item .el-breadcrumb__separator{color:#a7a8b7}.folder_breadcrumb[data-v-779f99ca] .el-breadcrumb__item:not(:last-child){cursor:pointer}[data-v-779f99ca] .readytodownload-icon{position:relative;top:40px;margin:0 auto}[data-v-779f99ca] .progress-circle,[data-v-779f99ca] .readytodownload-icon{width:45px;height:45px;background-color:#fff;border-radius:50%}[data-v-779f99ca] .progress-circle,[data-v-779f99ca] .progress-circle .bg-pic,[data-v-779f99ca] .readytodownload-icon img{position:absolute;top:50%;left:50%;transform:translate(-50%,-50%)}[data-v-779f99ca] .progress-circle svg{position:relative!important}[data-v-779f99ca] .progress-circle svg .el-progress-circle__track{stroke:#fff!important}

dist/static/css/chunk-611fce8e.f3e23850.css

@@ -1 +0,0 @@
-.black[data-v-172a2ff0]{color:#fff}.white[data-v-172a2ff0]{background-color:#fcfcfc;box-shadow:0 1px 2px 0 rgba(0,0,0,.2)}.app-header[data-v-172a2ff0]{position:fixed;top:0;width:100%;z-index:1;height:50px;line-height:50px}.app-header-content[data-v-172a2ff0]{box-sizing:border-box;display:flex;justify-content:space-between;height:100%;width:100%;padding:0 64px;font-size:16px}.app-header-content-right>div[data-v-172a2ff0],.app-header-content-right>span[data-v-172a2ff0]{margin-left:24px}.app-header-center[data-v-172a2ff0]{position:absolute;top:0;left:50%;transform:translateX(-50%);font-size:18px;height:50px;line-height:50px}.app-header-back-btn[data-v-172a2ff0]{position:absolute;left:36px;top:0;bottom:0;margin:auto 0}.black-bg-color[data-v-172a2ff0]{background-color:#32323c}.lottie-svg[data-v-1f22bc7a]{display:inline-block}.lottie-svg[data-v-1f22bc7a] svg{position:static}.readytodownload-icon[data-v-6b30266e]{position:relative;top:40px;margin:0 auto}.progress-circle[data-v-6b30266e],.readytodownload-icon[data-v-6b30266e]{width:45px;height:45px;background-color:#fff;border-radius:50%}.progress-circle .bg-pic[data-v-6b30266e],.progress-circle[data-v-6b30266e],.readytodownload-icon img[data-v-6b30266e]{position:absolute;top:50%;left:50%;transform:translate(-50%,-50%)}.progress-circle svg[data-v-6b30266e]{position:relative!important}.progress-circle svg .el-progress-circle__track[data-v-6b30266e]{stroke:#fff!important}.have-modified-icon[data-v-6b30266e]{background-color:#cccdd7}.fileRightMenu li[data-v-6b30266e]{white-space:nowrap}.function-disabled[data-v-6b30266e]{color:#d8d8d8}.function-disabled[data-v-6b30266e]:hover{cursor:not-allowed;background-color:#ecf5ff;color:#a7a8b7}.section_item.section_item_aside_fl{overflow:hidden}.el-message-box--center .el-message-box__status.el-icon-warning{position:absolute;left:0}.youbian,.yywenjiantitle_text1{position:relative;top:2px}.youbian{color:#a7a8b7}.app-header-style[data-v-68ddf1a1]{background-color:#f0f0f0}.titlebar_head[data-v-68ddf1a1]{flex-direction:column}.yiyun_section_top[data-v-68ddf1a1]{overflow:visible}.folder_breadcrumb[data-v-68ddf1a1] .el-breadcrumb__item{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;font-size:18px}.folder_breadcrumb[data-v-68ddf1a1] .el-breadcrumb__item .el-breadcrumb__separator{color:#a7a8b7}.folder_breadcrumb[data-v-68ddf1a1] .el-breadcrumb__item:not(:last-child){cursor:pointer}[data-v-68ddf1a1] .readytodownload-icon{position:relative;top:40px;margin:0 auto}[data-v-68ddf1a1] .progress-circle,[data-v-68ddf1a1] .readytodownload-icon{width:45px;height:45px;background-color:#fff;border-radius:50%}[data-v-68ddf1a1] .progress-circle,[data-v-68ddf1a1] .progress-circle .bg-pic,[data-v-68ddf1a1] .readytodownload-icon img{position:absolute;top:50%;left:50%;transform:translate(-50%,-50%)}[data-v-68ddf1a1] .progress-circle svg{position:relative!important}[data-v-68ddf1a1] .progress-circle svg .el-progress-circle__track{stroke:#fff!important}

src/views/main_web/workspace/workspace.new.vue

@@ -481,8 +481,26 @@ export default {
     onfileDragStart(file, e) {
       this.stopPropagation(e);
       if(!this.isClient) return;
+      const { nodeName, id: fileId } = file;
+      const isCooperationFile = !!nodeName;
       const fileStoreKey = getFileStoreKey(file, this.currentNodeFolder);
+      // 本地没文件，不能拖拽
       if(!this.localFileHashMap[fileStoreKey]) return;
+      
+      if(!isCooperationFile) { 
+        if(file.workStatus === WORKING && sessionStorage.userId !== file.modifyUserId) { // 同节点其他人正在操作的文件不能拖拽
+          return; 
+        }
+        services.changeFileWorkStatus(fileId, WORKING)
+          .then(flagRes => {
+            if(flagRes.Code !== 0) return;
+            file.workStatus = WORKING;
+            file.modifyUserId = sessionStorage.userId;
+            this.fetchFolderFiles();
+          });
+      }
+      // 协作文件可以打开
+
       const { ipcRenderer } = global.electron;
       ipcRenderer.invoke('project-file-dnd', `${this.localWorkspacePrefix}\\${fileStoreKey}`);
     },