From 313ed13ef21464e67da05bd70c7f0e73b242c4a8 Mon Sep 17 00:00:00 2001
From: zhangdahai112 <dahai.zhang@fit2cloud.com>
Date: Wed, 27 Jul 2022 10:40:52 +0800
Subject: [PATCH] =?UTF-8?q?fix(UI=20=E8=87=AA=E5=8A=A8=E5=8C=96):=20?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92ui=E5=85=B3=E8=81=94?=
 =?UTF-8?q?=E7=94=A8=E4=BE=8B=E6=A8=A1=E5=9D=97=E6=95=B0=E9=87=8F=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1015020 --user=张大海 【测试跟踪】测试计划中关联UI测试用例后左侧模块数量统计错误 https://www.tapd.cn/55049933/s/1213090

--bug=1015042 --user=张大海 【测试跟踪】测试计划详情-UI测试用例列表，左侧的模块树统计不对 https://www.tapd.cn/55049933/s/1213091
---
 .../api/TestCaseUiScenarioRelevance.vue       |   6 +-
 .../plan/view/comonents/api/TestPlanUi.vue    | 215 +++++++++---------
 2 files changed, 113 insertions(+), 108 deletions(-)

diff --git a/frontend/src/business/components/track/plan/view/comonents/api/TestCaseUiScenarioRelevance.vue b/frontend/src/business/components/track/plan/view/comonents/api/TestCaseUiScenarioRelevance.vue
index c871a23f35..65ea486313 100644
--- a/frontend/src/business/components/track/plan/view/comonents/api/TestCaseUiScenarioRelevance.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/api/TestCaseUiScenarioRelevance.vue
@@ -13,6 +13,7 @@
         @setModuleOptions="setModuleOptions"
         :relevance-project-id="projectId"
         :is-read-only="true"
+        :show-case-num="false"
         ref="nodeTree"/>
     </template>
 
@@ -35,9 +36,10 @@ import TestCaseRelevanceBase from "../base/TestCaseRelevanceBase";
 import {strMapToObj} from "../../../../../../../common/js/utils";
 import ApiCaseSimpleList from "../../../../../api/definition/components/list/ApiCaseSimpleList";
 import MsApiScenarioList from "../../../../../api/automation/scenario/ApiScenarioList";
-import UiScenarioModule from "@/business/components/xpack/ui/automation/scenario/UiScenarioModule";
 import RelevanceUiScenarioList from "@/business/components/track/plan/view/comonents/api/RelevanceUiScenarioList";
 import {ENV_TYPE} from "@/common/js/constants";
+const requireComponent = require.context('@/business/components/xpack/', true, /\.vue$/);
+const UiScenarioModule = requireComponent.keys().length > 0 ? requireComponent("./ui/automation/scenario/UiScenarioModule.vue") : {};
 
 export default {
   name: "TestCaseUiScenarioRelevance",
@@ -45,7 +47,7 @@ export default {
     RelevanceUiScenarioList,
     MsApiScenarioList,
     ApiCaseSimpleList,
-    UiScenarioModule,
+    "UiScenarioModule" : UiScenarioModule.default,
     TestCaseRelevanceBase,
   },
   data() {
diff --git a/frontend/src/business/components/track/plan/view/comonents/api/TestPlanUi.vue b/frontend/src/business/components/track/plan/view/comonents/api/TestPlanUi.vue
index c53808d854..a327605071 100644
--- a/frontend/src/business/components/track/plan/view/comonents/api/TestPlanUi.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/api/TestPlanUi.vue
@@ -10,6 +10,7 @@
         :is-read-only="true"
         :plan-id="planId"
         :plan-status="planStatus"
+        :show-case-num="false"
         ref="scenarioNodeTree">
       </ui-scenario-module>
     </template>
@@ -41,120 +42,122 @@
 </template>
 
 <script>
-    import NodeTree from "../../../../common/NodeTree";
-    import MsTestPlanCommonComponent from "../base/TestPlanCommonComponent";
-    import TestPlanApiCaseList from "./TestPlanApiCaseList";
-    import TestCaseApiRelevance from "./TestCaseApiRelevance";
-    import ApiCaseSimpleList from "../../../../../api/definition/components/list/ApiCaseSimpleList";
-    import MsApiModule from "../../../../../api/definition/components/module/ApiModule";
-    import MsTestPlanUiScenarioList from "./TestPlanUiScenarioList";
-    import UiScenarioModule from "@/business/components/xpack/ui/automation/scenario/UiScenarioModule";
-    import TestCaseUiScenarioRelevance
-      from "@/business/components/track/plan/view/comonents/api/TestCaseUiScenarioRelevance";
+import NodeTree from "../../../../common/NodeTree";
+import MsTestPlanCommonComponent from "../base/TestPlanCommonComponent";
+import TestPlanApiCaseList from "./TestPlanApiCaseList";
+import TestCaseApiRelevance from "./TestCaseApiRelevance";
+import ApiCaseSimpleList from "../../../../../api/definition/components/list/ApiCaseSimpleList";
+import MsApiModule from "../../../../../api/definition/components/module/ApiModule";
+import MsTestPlanUiScenarioList from "./TestPlanUiScenarioList";
+import TestCaseUiScenarioRelevance
+  from "@/business/components/track/plan/view/comonents/api/TestCaseUiScenarioRelevance";
 
-    export default {
-      name: "TestPlanUi",
-      components: {
-        TestCaseUiScenarioRelevance,
-        MsTestPlanUiScenarioList,
-        UiScenarioModule,
-        MsApiModule,
-        ApiCaseSimpleList,
-        TestCaseApiRelevance,
-        TestPlanApiCaseList,
-        MsTestPlanCommonComponent,
-        NodeTree,
-      },
-      data() {
-        return {
-          result: {},
-          treeNodes: [],
-          currentRow: "",
-          trashEnable: false,
-          currentProtocol: null,
-          currentModule: null,
-          selectNodeIds: [],
-          moduleOptions: {},
-          model: 'scenario'
-        }
-      },
-      props: [
-        'planId',
-        'redirectCharType',
-        'clickType',
-        'versionEnable',
-        'planStatus'
-      ],
-      mounted() {
-        this.checkRedirectCharType();
-      },
-      watch: {
-        model() {
-          this.selectNodeIds = [];
-          this.moduleOptions = {};
-        },
-        redirectCharType(){
-          if(this.redirectCharType=='scenario'){
-            this.model = 'scenario';
-          }else{
-            this.model = 'api';
-          }
-        }
-      },
-      methods: {
-        checkRedirectCharType(){
-          if(this.redirectCharType=='scenario'){
-            this.model = 'scenario';
-          }else{
-            this.model = 'api';
-          }
-        },
-        refresh() {
-          this.refreshTree();
-          this.refreshTable();
-        },
-        refreshTable() {
-          if (this.$refs.apiCaseList) {
-            this.$refs.apiCaseList.initTable();
-          }
-          if (this.$refs.apiScenarioList) {
-            this.$refs.apiScenarioList.search();
-          }
-        },
-        refreshTree() {
-          if (this.$refs.scenarioNodeTree) {
-            this.$refs.scenarioNodeTree.list();
-          }
-        },
+const requireComponent = require.context('@/business/components/xpack/', true, /\.vue$/);
+const UiScenarioModule = requireComponent.keys().length > 0 ? requireComponent("./ui/automation/scenario/UiScenarioModule.vue") : {};
 
-        nodeChange(node, nodeIds, pNodes) {
-          this.selectNodeIds = nodeIds;
-        },
-        handleProtocolChange(protocol) {
-          this.currentProtocol = protocol;
-        },
-        setModuleOptions(data) {
-          this.moduleOptions = data;
-        },
-
-        openTestCaseRelevanceDialog(model) {
-          if (model === 'scenario') {
-            this.$refs.scenarioCaseRelevance.open();
-          } else {
-            this.$refs.apiCaseRelevance.open();
-          }
-        },
+export default {
+  name: "TestPlanUi",
+  components: {
+    TestCaseUiScenarioRelevance,
+    MsTestPlanUiScenarioList,
+    "UiScenarioModule": UiScenarioModule.default,
+    MsApiModule,
+    ApiCaseSimpleList,
+    TestCaseApiRelevance,
+    TestPlanApiCaseList,
+    MsTestPlanCommonComponent,
+    NodeTree,
+  },
+  data() {
+    return {
+      result: {},
+      treeNodes: [],
+      currentRow: "",
+      trashEnable: false,
+      currentProtocol: null,
+      currentModule: null,
+      selectNodeIds: [],
+      moduleOptions: {},
+      model: 'scenario'
+    }
+  },
+  props: [
+    'planId',
+    'redirectCharType',
+    'clickType',
+    'versionEnable',
+    'planStatus'
+  ],
+  mounted() {
+    this.checkRedirectCharType();
+  },
+  watch: {
+    model() {
+      this.selectNodeIds = [];
+      this.moduleOptions = {};
+    },
+    redirectCharType() {
+      if (this.redirectCharType == 'scenario') {
+        this.model = 'scenario';
+      } else {
+        this.model = 'api';
       }
     }
+  },
+  methods: {
+    checkRedirectCharType() {
+      if (this.redirectCharType == 'scenario') {
+        this.model = 'scenario';
+      } else {
+        this.model = 'api';
+      }
+    },
+    refresh() {
+      this.refreshTree();
+      this.refreshTable();
+    },
+    refreshTable() {
+      if (this.$refs.apiCaseList) {
+        this.$refs.apiCaseList.initTable();
+      }
+      if (this.$refs.apiScenarioList) {
+        this.$refs.apiScenarioList.search();
+      }
+    },
+    refreshTree() {
+      if (this.$refs.scenarioNodeTree) {
+        this.$refs.scenarioNodeTree.list();
+      }
+    },
+
+    nodeChange(node, nodeIds, pNodes) {
+      this.selectNodeIds = nodeIds;
+    },
+    handleProtocolChange(protocol) {
+      this.currentProtocol = protocol;
+    },
+    setModuleOptions(data) {
+      this.moduleOptions = data;
+    },
+
+    openTestCaseRelevanceDialog(model) {
+      if (model === 'scenario') {
+        this.$refs.scenarioCaseRelevance.open();
+      } else {
+        this.$refs.apiCaseRelevance.open();
+      }
+    },
+  }
+}
 
 </script>
 
 <style scoped>
 
-  .model-change-radio {
-    height: 25px;
-    line-height: 25px;
-    margin: 5px 10px;
-  }
+.model-change-radio {
+  height: 25px;
+  line-height: 25px;
+  margin: 5px 10px;
+}
 
 </style>