Merge branch 'dev' of https://cloud.wodcloud.com/git/apaas/apaas-v3-ui into dev

src/components/apass-table.vue

@@ -338,7 +338,15 @@ export default {
 
       _self.moreActionList = [];
       _self.showMoreActionList = true;
-      _self.moreActionList = moreActionList.map((item) => ({
+      _self.moreActionList = moreActionList
+        .filter((item) => {
+          if (item.showRule) {
+            return item.showRule(row);
+          } else {
+            return true;
+          }
+        })
+        .map((item) => ({
           id: row.id,
           label: item.label,
           callback() {

src/pages/workbench/component-center/process-management/designer/index.vue

@@ -124,9 +124,18 @@ export default {
   methods: {
     init(filter) {
       let params = {
-        sectors: (filter.service_domains && filter.service_domains.map((item) => item.value).join(",")) || "",
-        workareas: (filter.workareas && filter.workareas.map((item) => item.value).join(",")) || "",
-        states: (filter.states && filter.states.map((item) => item.value).join(",")) || "",
+        sectors:
+          (filter.service_domains &&
+            filter.service_domains.map((item) => item.value).join(",")) ||
+          "",
+        workareas:
+          (filter.workareas &&
+            filter.workareas.map((item) => item.value).join(",")) ||
+          "",
+        states:
+          (filter.states &&
+            filter.states.map((item) => item.value).join(",")) ||
+          "",
         page: filter.page,
         page_size: filter.size,
       };
@@ -235,22 +244,37 @@ export default {
             {
               label: "取消发布",
               callback: this.cancelPublishItem,
+              showRule(item) {
+                return item.state === 2;
+              },
             },
             {
               label: "部署",
               callback: this.deployItem,
+              showRule(item) {
+                return item.state === 0;
+              },
             },
             {
               label: "取消部署",
               callback: this.cancelDeployItem,
+              showRule(item) {
+                return item.state === 1;
+              },
             },
             {
               label: "复制",
               callback: this.copyItem,
+              showRule(item) {
+                return true;
+              },
             },
             {
               label: "删除",
               callback: this.deleteItem,
+              showRule(item) {
+                return item.state !== 2;
+              },
             },
           ],
         },

src/pages/workbench/yygl/yyglList.vue

@@ -1341,7 +1341,7 @@ export default {
       this.showDialog();
     },
     editItem(item) {
-      this.$router.push(`/yygl/${this.level}/${this.type}/edit/${item.id}`);
+      this.$router.push(`/yygl/${this.level}/${this.type}/edit/${item.app_id}`);
     },
     onLine(item) {
       this.dialogInfo.title = "提示";