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

src/views/main_web/workspace/components/folder-item.vue

@@ -6,7 +6,6 @@
   >
     <div
       class="defultImage-mid foldernew-mid"
-      
     />
     <strong
       class="yiyunwenjian_name"
@@ -16,12 +15,24 @@
     <strong class="visontext"
       >{{ folder.childCount + folder.fileCount }}个项目</strong>
 
+    <template v-if="isClient">
+      <!-- 绿色钩 -->
+      <div
+        class="yijianxietong isonselect"
+      >
+        <i
+          class="icon font_family icon-icon_status_wenjianbiaojiwancheng yijianIcon"
+          @click="commitFolder"
+        />
+      </div>
+    </template>
+
     <!-- 右键菜单 -->
     <div class="contextmenu" v-show="rightMenuVisible"
     :style="{ top: rightMenuTop + 'px', left: rightMenuLeft + 'px'}"
     >
       <ul class="rightMenu folderRightMenu">
-        <li v-if="isClient" @click.stop="downloadFolder">下载文件夹</li>
+        <li v-if="isClient" @click.stop="downloadFolder">从云端更新</li>
       </ul>
     </div>
   </div>
@@ -62,7 +73,12 @@ export default {
     },
     closeRightMenu() {
       this.rightMenuVisible = false;
-    }
+    },
+    commitFolder(e) {
+      e.stopPropagation();
+      e.preventDefault();
+      this.$emit('commitFolder', this.folder);
+    },
   },
   watch: {
     rightMenuVisible(value) {

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

@@ -114,6 +114,7 @@
                       @onDownloadAll="downloadFolder"
                       :activeRightMenuId="tempRightFileId"
                       @dblclick.native="intoSubFolder(folder)"
+                      @commitFolder="commitFolder"
                     />
                   </div>
                 </div>
@@ -927,6 +928,10 @@ export default {
         errorHandler,
       );
     },
+    commitFolder(folder) {
+      const path = `${this.localWorkspacePrefix}\\${this.currentNodeFolder.folderName}${folder.folderPath ? `\\${folder.folderPath}`:''}`.replace(/\//g, '\\');
+      this.clientUpload([path]);
+    },
     /**
      * 点击文件事件：直接打开文件
      */