fix bugs

Author: 张晨曦

web/package-lock.json

@@ -60,7 +60,7 @@
         "svgo": "1.3.0",
         "vue": "2.6.12",
         "vue-i18n": "8.22.1",
-        "vue-luban-menu": "^1.4.0",
+        "vue-luban-menu": "file:vue-luban-menu-1.3.2.tgz",
         "vue-router": "3.4.8",
         "vuedraggable": "2.24.3",
         "vuescroll": "4.16.1",

web/package.json

@@ -56,13 +56,6 @@
             height: 100%;
         }
     }
-    .process-tab {
-      display: none;
-      @include bg-color($light-base-color, $dark-base-color);
-    }
-    .process-container {
-      height: 100%;
-    }
   }
   .process-tab {
     display: flex;

web/src/apps/workflows/assets/styles/process.scss

@@ -166,6 +166,7 @@ export default {
       this.onAddClick(this.model);
     },
     handleItemClick(e) {
+      this.handleItemToggle()
       this.onItemClick(this.model);
     },
     handleItemToggle(e) {

web/src/apps/workflows/module/common/workflowTree/tree-item.vue

@@ -1,12 +1,11 @@
 <template>
   <div class="workflow-wrap">
     <div class="workflow-nav-tree" :class="{ 'tree-fold': treeFold }">
-      <div class="workflow-nav-tree-switch">
+      <div class="workflow-nav-tree-switch" @click="handleTreeToggle">
         <span class="project-nav-tree-top-t-icon">
           <SvgIcon
             icon-class="dev_center_flod"
             style="opacity: 0.65"
-            @click="handleTreeToggle"
           />
         </span>
       </div>

web/src/apps/workflows/view/workflow/index.vue

@@ -57,6 +57,9 @@ const GetAreaMap = () =>  api.fetch(`${API_PATH.PROJECT_PATH}listApplicationArea
 // 获取常用功能列表
 const GetFavorites = (workspaceId) => api.fetch(`${API_PATH.WORKSPACE_PATH}workspaces/${workspaceId}/favorites`, workspaceId, 'get')
 
+// 获奖 钉一钉 功能列表
+const GetCollections = (workspaceId) => api.fetch(`${API_PATH.WORKSPACE_PATH}workspaces/${workspaceId}/components`, {workspaceId, type: 'dingyiding'}, 'get')
+
 // 添加常用应用
 const AddFavorite = (workspaceId, data) => api.fetch(`${API_PATH.WORKSPACE_PATH}workspaces/${workspaceId}/favorites`, data, 'post')
 
@@ -79,5 +82,6 @@ export {
   GetWorkspaceBaseInfo,
   GetFavorites,
   AddFavorite,
-  RemoveFavorite
+  RemoveFavorite,
+  GetCollections
 }

web/src/common/service/apiCommonMethod.js

@@ -122,7 +122,7 @@
           v-for="app in collections"
           :key="app.id"
           class="menu-item"
-          @click="goCollectedUrl"
+          @click="goCollectedUrl(app)"
         >
           {{ app.title }}
         </li>
@@ -163,6 +163,7 @@ import {
   GetFavorites,
   AddFavorite,
   RemoveFavorite,
+  GetCollections
 } from "@/common/service/apiCommonMethod.js";
 export default {
   directives: {
@@ -203,6 +204,7 @@ export default {
           this.getApplications();
           this.getWorkspaces();
           this.getWorkspaceFavorites();
+          this.getWorkspaceCollections()
         }
       })
       .catch((err) => {
@@ -258,6 +260,7 @@ export default {
               this.getApplications();
               this.getWorkspaces();
               this.getWorkspaceFavorites();
+              this.getWorkspaceCollections();
             }
           })
           .catch((err) => {
@@ -348,6 +351,17 @@ export default {
         });
       }
     },
+    getWorkspaceCollections() {
+      if (this.$route.query.workspaceId) {
+        GetCollections(this.$route.query.workspaceId).then(data => {
+          let collections = data.favorites || [];
+          collections.forEach(item => {
+            item['collectedId'] = item.menuApplicationId
+          })
+          this.collections = collections || [];
+        })
+      }
+    },
     addFavorite(app) {
       if (this.$route.query.workspaceId) {
         AddFavorite(this.$route.query.workspaceId, {
@@ -362,7 +376,6 @@ export default {
       }
     },
     removeFavorite(app) {
-
       if (this.$route.query.workspaceId) {
         RemoveFavorite({
           workspaceId: this.$route.query.workspaceId,
@@ -374,27 +387,37 @@ export default {
         });
 
         this.collections = this.collections.filter(
-          (i) => i.id !== app.id
+          (i) => i.menuApplicationId !== app.menuApplicationId
         );
       }
     },
     addCollection(app) {
-      let _this = this;
-      if (_this.$route.query.workspaceId) {
-        if ( _this.collections.length < 5 ) {
-          _this.collections = this.collections.concat(app);
+      if (this.$route.query.workspaceId) {
+        if ( this.collections.length < 5 ) {
+          AddFavorite(this.$route.query.workspaceId, {
+            menuApplicationId: app.menuApplicationId,
+            type: 'dingyiding'
+          }).then((data) => {
+            app.collectedId = app.menuApplicationId
+            this.collections = this.collections.concat(app);
+          })
         } else {
-          _this.$Message.warning('目前只支持钉五个快捷入口')
+          this.$Message.warning('目前只支持钉五个快捷入口')
         }
-
       }
     },
     removeCollection(app) {
-      let _this = this;
-      if (_this.$route.query.workspaceId) {
-        _this.collections = _this.collections.filter(
-          (i) => i.collectedId !== app.collectedId
-        );
+      app.collectedId = app.menuApplicationId
+      if (this.$route.query.workspaceId) {
+        RemoveFavorite({
+          workspaceId: this.$route.query.workspaceId,
+          applicationId: app.menuApplicationId,
+          type: 'dingyiding'
+        }).then(() => {
+          this.collections = this.collections.filter(
+            (i) => i.collectedId !== app.collectedId
+          );
+        })
       }
     },
     handleMenuClick(item) {