合并更多操作和更多信息

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

@@ -32,7 +32,7 @@
                 class="option_icon"
                 :class="{ option_active: infoPanelActive }"
               />
-              <div class="option_label">更多信息</div>
+              <div class="option_label">更多</div>
             </div>
             <div
               class="content_info_detail"
@@ -41,24 +41,9 @@
               <div class="content_info_detail_item"><span>提交人：</span><span style="color:#2869E6">{{showAccountName}}</span></div>
               <div class="content_info_detail_item"><span>基于版本：</span><span>{{commitInfo.creator}} 提交的版本{{commitInfo.version}}</span></div>
               <div class="content_info_detail_item"><span>协同于：</span><span>{{showTime}}</span></div>
-            </div>
-          </div>
-          <div class="content_action split">
-            <div
-              class="option"
-              @click.stop="actionPanelActive = !actionPanelActive"
-            >
-              <i
-                class="option_icon"
-                :class="{ option_active: actionPanelActive }"
-              />
-              <div class="option_label">更多操作</div>
-            </div>
-            <div
-              class="content_action_list"
-              :class="{ panel_inactive: !actionPanelActive }"
-            >
-              <!-- <div class="content_action_list_item milestone_set">
+
+              <div class="content_action_list">
+                <!-- <div class="content_action_list_item milestone_set">
                       <div class="icon_box">
                         <i class="iconfont icon-lichengbei-qizhi"></i>
                       </div>
@@ -73,37 +58,38 @@
                       </div>
                     </div> -->
 
-              <div class="content_action_list_item">
+                <div class="content_action_list_item">
+                  <div
+                    class="button"
+                    @click.stop="nowVersion ? editCurrentFile: openCommitFile"
+                    style="width: 211px"
+                  >
+                    {{ nowVersion ? '继续编辑' : '打开版本' }}
+                  </div>
+                  <div
+                    class="button"
+                    @click.stop="openCommitFileWith"
+                    style="width: 92px;marginLeft: 8px"
+                  >
+                    打开方式
+                  </div>
+                </div>
+
                 <div
-                  class="button"
-                  @click.stop="nowVersion ? editCurrentFile: openCommitFile"
-                  style="width: 211px"
+                  class="content_action_list_item button"
+                  v-if="!nowVersion"
+                  @click.stop="setShare"
                 >
-                  {{ nowVersion ? '继续编辑' : '打开版本' }}
+                  <i class="iconfont icon-zhiding" />设为协同版本
                 </div>
                 <div
-                  class="button"
-                  @click.stop="openCommitFileWith"
-                  style="width: 92px;marginLeft: 8px"
+                  class="content_action_list_item button"
+                  @click="onMakeCopy"
+                  v-if="!nowVersion"
                 >
-                  打开方式
+                  从该版本创建副本
                 </div>
               </div>
-
-              <div
-                class="content_action_list_item button"
-                v-if="!nowVersion"
-                @click.stop="setShare"
-              >
-                <i class="iconfont icon-zhiding" />设为协同版本
-              </div>
-              <div
-                class="content_action_list_item button"
-                @click="onMakeCopy"
-                v-if="!nowVersion"
-              >
-                从该版本创建副本
-              </div>
             </div>
           </div>
         </div>
@@ -225,7 +211,7 @@ export default {
             const { process, hash } = JSON.parse(resMessage.data);
             // this.updateFileLoadState(file, DOWNLOADING, process);
             if (process !== 100) return;
-            system.openFile(fullFilePath);
+            // system.openFile(fullFilePath);
             f && f(fullFilePath);
             // this.removeFileLoadingState(file.id);
             // this.$notify({