From 7c2f40a25ccfbd8ff555369a56f6654d9e402260 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Fri, 14 Oct 2022 13:01:59 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):?=
 =?UTF-8?q?=20=E7=94=A8=E6=88=B7=E5=85=A8=E9=80=89=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E5=BC=B9=E5=87=BA=E5=A4=9A=E4=B8=AA=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1017754 --user=李玉号 【系统设置】用户全选弹出多个指引，QA没有这个问题
https://www.tapd.cn/55049933/s/1261685
---
 .../menu/file/list/FileMetadataList.vue       |  1 +
 .../src/business/system/user/User.vue         | 36 ++++++++-----------
 2 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/project-management/frontend/src/business/menu/file/list/FileMetadataList.vue b/project-management/frontend/src/business/menu/file/list/FileMetadataList.vue
index ce850dfb7c..fbf541a7e4 100644
--- a/project-management/frontend/src/business/menu/file/list/FileMetadataList.vue
+++ b/project-management/frontend/src/business/menu/file/list/FileMetadataList.vue
@@ -28,6 +28,7 @@
     <div v-if="showView === 'list'">
       <ms-table v-loading="data.loading"
                 class="basic-config"
+                :total="total"
                 :screen-height="height"
                 :batch-operators="buttons"
                 :data="metadataArr"
diff --git a/system-setting/frontend/src/business/system/user/User.vue b/system-setting/frontend/src/business/system/user/User.vue
index 8859141698..4cdecf2a29 100644
--- a/system-setting/frontend/src/business/system/user/User.vue
+++ b/system-setting/frontend/src/business/system/user/User.vue
@@ -10,27 +10,17 @@
                          :create-tip="$t('user.create')" :title="$t('commons.user')"/>
       </template>
 
-      <el-table border class="adjust-table ms-select-all-fixed" :data="tableData" style="width: 100%"
-                @select-all="handleSelectAll"
-                @select="handleSelect"
-                @sort-change="sort"
-                :header-cell-class-name="handleHeadAddClass"
+      <ms-table border
+                class="adjust-table"
+                :condition="condition"
+                :total="total"
+                :data="tableData"
+                style="width: 100%"
+                :batch-operators="buttons"
                 :height="screenHeight"
+                enableSelection
+                @refresh="search"
                 ref="userTable">
-        <el-table-column type="selection" width="50"/>
-        <ms-table-header-select-popover v-show="total>0"
-                                        :page-size="pageSize>total?total:pageSize"
-                                        :total="total"
-                                        :select-data-counts="selectDataCounts"
-                                        :table-data-count-in-page="tableData.length"
-                                        @selectPageAll="isSelectDataAll(false)"
-                                        @selectAll="isSelectDataAll(true)"/>
-        <el-table-column v-if="!referenced" width="30" :resizable="false" align="center">
-          <template v-slot:default="scope">
-            <show-more-btn :is-show="scope.row.showMore" :buttons="buttons" :size="selectDataCounts"/>
-          </template>
-        </el-table-column>
-
         <el-table-column prop="id" label="ID"/>
         <el-table-column prop="name" :label="$t('commons.name')" max-width="200"/>
 
@@ -72,7 +62,7 @@
             </div>
           </template>
         </el-table-column>
-      </el-table>
+      </ms-table>
 
       <ms-table-pagination :change="search" :current-page.sync="currentPage" :page-size.sync="pageSize"
                            :total="total"/>
@@ -114,6 +104,7 @@
 <script>
 import MsTablePagination from "metersphere-frontend/src/components/pagination/TablePagination";
 import MsTableHeader from "metersphere-frontend/src/components/MsTableHeader";
+import MsTable from "metersphere-frontend/src/components/table/MsTable";
 import MsTableOperator from "metersphere-frontend/src/components/MsTableOperator";
 import MsDialogFooter from "metersphere-frontend/src/components/MsDialogFooter";
 import MsTableOperatorButton from "metersphere-frontend/src/components/MsTableOperatorButton";
@@ -164,7 +155,8 @@ export default {
     UserImport,
     MsTableHeaderSelectPopover,
     UserCascader,
-    ShowMoreBtn
+    ShowMoreBtn,
+    MsTable
   },
   inject: [
     'reload'
@@ -482,7 +474,7 @@ export default {
       }
     },
     buildBatchParam(param) {
-      param.ids = Array.from(this.selectRows).map(row => row.id);
+      param.ids = this.$refs.userTable.selectIds;
       param.projectId = getCurrentProjectID();
       param.condition = this.condition;
       return param;

From 191dac350541526365d3f5bf1c6f7a82f84acfba Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Fri, 14 Oct 2022 13:42:28 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):?=
 =?UTF-8?q?=20=E8=8E=B7=E5=8F=96=E4=B8=8D=E5=88=B0=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 framework/sdk-parent/frontend/src/api/version.js   | 14 +++++++++++++-
 test-track/frontend/src/api/project.js             | 13 +++----------
 .../src/business/case/components/TestCaseList.vue  | 11 ++++-------
 .../case/components/TestCaseRelateApiList.vue      |  6 ++----
 .../case/components/TestCaseRelateLoadList.vue     |  6 ++----
 .../case/components/TestCaseRelateScenarioList.vue |  6 ++----
 .../view/comonents/api/RelevanceScenarioList.vue   |  6 ++----
 .../view/comonents/api/TestCaseApiRelevance.vue    |  6 ++----
 .../comonents/api/TestCaseScenarioRelevance.vue    | 10 +++-------
 .../view/comonents/api/TestPlanApiCaseList.vue     |  2 +-
 .../view/comonents/api/TestPlanApiScenarioList.vue | 10 +++-------
 .../comonents/functional/FunctionalRelevance.vue   |  6 ++----
 .../functional/FunctionalTestCaseList.vue          |  3 +--
 .../view/comonents/load/TestCaseLoadRelevance.vue  |  6 ++----
 .../view/comonents/load/TestPlanLoadCaseList.vue   |  3 +--
 .../view/comonents/ui/RelevanceUiScenarioList.vue  |  7 ++-----
 .../view/comonents/ui/TestPlanUiScenarioList.vue   |  6 ++----
 .../review/view/components/TestReviewRelevance.vue |  7 +++----
 .../view/components/TestReviewTestCaseList.vue     |  9 +++------
 .../frontend/src/business/utils/sdk-utils.js       |  2 +-
 20 files changed, 54 insertions(+), 85 deletions(-)

diff --git a/framework/sdk-parent/frontend/src/api/version.js b/framework/sdk-parent/frontend/src/api/version.js
index 55e8c774fb..d49f7e8f16 100644
--- a/framework/sdk-parent/frontend/src/api/version.js
+++ b/framework/sdk-parent/frontend/src/api/version.js
@@ -1,10 +1,10 @@
 import {get} from "../plugins/request"
+import {hasLicense} from "../utils/permission";
 
 export function getProjectVersions(projectId) {
   return get(`/project/version/get-project-versions/${projectId}`);
 }
 
-
 export function getProjectMembers() {
   return get('/user/project/member/list');
 }
@@ -12,3 +12,15 @@ export function getProjectMembers() {
 export function isProjectVersionEnable(projectId) {
   return get(`/project/version/enable/${projectId}`)
 }
+
+export function getVersionFilters(projectId) {
+  return hasLicense() && projectId ? new Promise((resolve) => {
+    getProjectVersions(projectId)
+      .then((r) => {
+        let versionFilters = r.data.map(u => {
+          return {text: u.name, value: u.id};
+        });
+        resolve({data: versionFilters});
+      });
+  }) : new Promise(resolve => resolve({}));
+}
diff --git a/test-track/frontend/src/api/project.js b/test-track/frontend/src/api/project.js
index c0780168d5..34089014d2 100644
--- a/test-track/frontend/src/api/project.js
+++ b/test-track/frontend/src/api/project.js
@@ -14,13 +14,6 @@ export function getCurrentProject(callback) {
   return getProject(getCurrentProjectID(), callback);
 }
 
-export function getVersionFilters(projectId) {
-  if (projectId) {
-    return get('/project/version/get-project-versions/' + projectId);
-  }
-  return {};
-}
-
 
 export function getOwnerProjectIds() {
   let url = '/api/project/get/owner/ids';
@@ -32,9 +25,9 @@ export function getMaintainer() {
   return get(url);
 }
 
-export function getProjectVersions(projectId) {
-  return get('/project/version/get-project-versions/' + projectId);
-}
+// export function getProjectVersions(projectId) {
+//   return get('/project/version/get-project-versions/' + projectId);
+// }
 
 export function versionEnableByProjectId(projectId) {
   return get('/project/version/enable/' + projectId);
diff --git a/test-track/frontend/src/business/case/components/TestCaseList.vue b/test-track/frontend/src/business/case/components/TestCaseList.vue
index b8ef2497cb..bcc6810c2c 100644
--- a/test-track/frontend/src/business/case/components/TestCaseList.vue
+++ b/test-track/frontend/src/business/case/components/TestCaseList.vue
@@ -257,7 +257,8 @@ import RelationshipGraphDrawer from "metersphere-frontend/src/components/graph/M
 import MsSearch from "metersphere-frontend/src/components/search/MsSearch";
 import {mapState} from "pinia";
 import {useStore} from "@/store"
-import {getProject, getProjectVersions} from "@/api/project";
+import {getProject} from "@/api/project";
+import {getVersionFilters} from "@/business/utils/sdk-utils";
 import {getProjectApplicationConfig} from "@/api/project-application";
 import MsUpdateTimeColumn from "metersphere-frontend/src/components/table/MsUpdateTimeColumn";
 import MsCreateTimeColumn from "metersphere-frontend/src/components/table/MsCreateTimeColumn";
@@ -1062,12 +1063,8 @@ export default {
     },
     getVersionOptions() {
       if (hasLicense()) {
-        getProjectVersions(getCurrentProjectID())
-          .then(response => {
-            this.versionFilters = response.data.map(u => {
-              return {text: u.name, value: u.id};
-            });
-          });
+        getVersionFilters(getCurrentProjectID())
+          .then(r =>  this.versionFilters = r.data);
       }
     },
     generateColumnKey
diff --git a/test-track/frontend/src/business/case/components/TestCaseRelateApiList.vue b/test-track/frontend/src/business/case/components/TestCaseRelateApiList.vue
index 5ad91c7516..73f70c69e9 100644
--- a/test-track/frontend/src/business/case/components/TestCaseRelateApiList.vue
+++ b/test-track/frontend/src/business/case/components/TestCaseRelateApiList.vue
@@ -75,7 +75,7 @@ import {TEST_CASE_RELEVANCE_API_CASE_CONFIGS} from "metersphere-frontend/src/com
 import MsTableAdvSearchBar from "metersphere-frontend/src/components/search/MsTableAdvSearchBar";
 import MsTag from "metersphere-frontend/src/components/MsTag";
 import {getCurrentProjectID} from "metersphere-frontend/src/utils/token";
-import {getVersionFilters} from "@/api/project";
+import {getVersionFilters} from "@/business/utils/sdk-utils";
 import MxVersionSelect from "metersphere-frontend/src/components/version/MxVersionSelect";
 import {getTestCaseRelevanceApiList} from "@/api/testCase";
 
@@ -199,9 +199,7 @@ export default {
     },
     getVersionOptions() {
       getVersionFilters(this.projectId)
-        .then((data) => {
-          this.versionFilters = data;
-        });
+        .then(r => this.versionFilters = r.data);
     },
     changeVersion(currentVersion) {
       this.condition.versionId = currentVersion || null;
diff --git a/test-track/frontend/src/business/case/components/TestCaseRelateLoadList.vue b/test-track/frontend/src/business/case/components/TestCaseRelateLoadList.vue
index dbeabca14c..5900bc036f 100644
--- a/test-track/frontend/src/business/case/components/TestCaseRelateLoadList.vue
+++ b/test-track/frontend/src/business/case/components/TestCaseRelateLoadList.vue
@@ -81,7 +81,7 @@ import MsTablePagination from "metersphere-frontend/src/components/pagination/Ta
 import MsTableAdvSearchBar from "metersphere-frontend/src/components/search/MsTableAdvSearchBar";
 import {TEST_CASE_RELEVANCE_LOAD_CASE} from "metersphere-frontend/src/components/search/search-components";
 import MxVersionSelect from "metersphere-frontend/src/components/version/MxVersionSelect";
-import {getVersionFilters} from "@/api/project";
+import {getVersionFilters} from "@/business/utils/sdk-utils";
 import {getTestCaseRelevanceLoadList} from "@/api/testCase";
 
 export default {
@@ -172,9 +172,7 @@ export default {
     },
     getVersionOptions() {
       getVersionFilters(this.projectId)
-        .then((data) => {
-          this.versionFilters = data;
-        });
+        .then(r => this.versionFilters = r.data);
     },
     changeVersion(currentVersion) {
       this.condition.versionId = currentVersion || null;
diff --git a/test-track/frontend/src/business/case/components/TestCaseRelateScenarioList.vue b/test-track/frontend/src/business/case/components/TestCaseRelateScenarioList.vue
index d356ec0e75..5f6eb736ad 100644
--- a/test-track/frontend/src/business/case/components/TestCaseRelateScenarioList.vue
+++ b/test-track/frontend/src/business/case/components/TestCaseRelateScenarioList.vue
@@ -86,7 +86,7 @@ import PlanStatusTableItem from "@/business/common/tableItems/plan/PlanStatusTab
 import MsTableAdvSearchBar from "metersphere-frontend/src/components/search/MsTableAdvSearchBar";
 import MsTag from "metersphere-frontend/src/components/MsTag";
 import {TEST_CASE_RELEVANCE_API_CASE_CONFIGS} from "metersphere-frontend/src/components/search/search-components";
-import {getVersionFilters} from "@/api/project";
+import {getVersionFilters} from "@/business/utils/sdk-utils";
 import MxVersionSelect from "metersphere-frontend/src/components/version/MxVersionSelect";
 import {getTestCaseRelevanceScenarioList} from "@/api/testCase";
 
@@ -195,9 +195,7 @@ export default {
     },
     getVersionOptions() {
       getVersionFilters(this.projectId)
-        .then((data) => {
-          this.versionFilters = data;
-        });
+        .then(r => this.versionFilters = r.data);
     },
     changeVersion(currentVersion) {
       this.condition.versionId = currentVersion || null;
diff --git a/test-track/frontend/src/business/plan/view/comonents/api/RelevanceScenarioList.vue b/test-track/frontend/src/business/plan/view/comonents/api/RelevanceScenarioList.vue
index 0a8789a5fb..da1e6e02ef 100644
--- a/test-track/frontend/src/business/plan/view/comonents/api/RelevanceScenarioList.vue
+++ b/test-track/frontend/src/business/plan/view/comonents/api/RelevanceScenarioList.vue
@@ -103,7 +103,7 @@ import MsTableAdvSearchBar from "metersphere-frontend/src/components/search/MsTa
 import TEST_PLAN_RELEVANCE_API_SCENARIO_CONFIGS from "metersphere-frontend/src/components/search/search-components";
 import {ENV_TYPE} from "metersphere-frontend/src/utils/constants";
 import MsTable from "metersphere-frontend/src/components/table/MsTable";
-import {getVersionFilters} from "@/api/project";
+import {getVersionFilters} from "@/business/utils/sdk-utils";
 import MxVersionSelect from "metersphere-frontend/src/components/version/MxVersionSelect";
 import {getOwnerProjects} from "@/business/utils/sdk-utils";
 import {getProjectApplicationConfig} from "@/api/project-application";
@@ -273,9 +273,7 @@ export default {
     },
     getVersionOptions() {
       getVersionFilters(this.projectId)
-        .then((data) => {
-          this.versionFilters = data;
-        });
+        .then(r => this.versionFilters = r.data);
     },
     filter(field) {
       this.condition.filters = field || null;
diff --git a/test-track/frontend/src/business/plan/view/comonents/api/TestCaseApiRelevance.vue b/test-track/frontend/src/business/plan/view/comonents/api/TestCaseApiRelevance.vue
index b9737f9db5..b1e71dd555 100644
--- a/test-track/frontend/src/business/plan/view/comonents/api/TestCaseApiRelevance.vue
+++ b/test-track/frontend/src/business/plan/view/comonents/api/TestCaseApiRelevance.vue
@@ -64,13 +64,13 @@
 <script>
 
 import TestCaseRelevanceBase from "../base/TestCaseRelevanceBase";
-import {getVersionFilters} from "@/api/project";
 import MxVersionSelect from "metersphere-frontend/src/components/version/MxVersionSelect";
 import {apiDefinitionListBatch, apiDefinitionRelevance} from "@/api/remote/api/api-definition";
 import {apiTestCaseListBlobs, apiTestCaseRelevance} from "@/api/remote/api/api-case";
 import RelevanceApiList from "@/business/plan/view/comonents/api/RelevanceApiList";
 import RelevanceCaseList from "@/business/plan/view/comonents/api/RelevanceCaseList";
 import MsApiModule from "@/business/plan/view/comonents/api/module/ApiModule";
+import {getVersionFilters} from "@/business/utils/sdk-utils";
 
 export default {
   name: "TestCaseApiRelevance",
@@ -227,9 +227,7 @@ export default {
     },
     getVersionOptions() {
       getVersionFilters(this.projectId)
-        .then((data) => {
-          this.versionFilters = data;
-        });
+        .then(r => this.versionFilters = r.data);
     },
     changeVersion(currentVersion, type) {
       if (type == 'api') {
diff --git a/test-track/frontend/src/business/plan/view/comonents/api/TestCaseScenarioRelevance.vue b/test-track/frontend/src/business/plan/view/comonents/api/TestCaseScenarioRelevance.vue
index 4f92fc33d7..1926507545 100644
--- a/test-track/frontend/src/business/plan/view/comonents/api/TestCaseScenarioRelevance.vue
+++ b/test-track/frontend/src/business/plan/view/comonents/api/TestCaseScenarioRelevance.vue
@@ -36,7 +36,7 @@ import TestCaseRelevanceBase from "../base/TestCaseRelevanceBase";
 import RelevanceScenarioList from "./RelevanceScenarioList";
 import {ENV_TYPE} from "metersphere-frontend/src/utils/constants";
 import {getCurrentProjectID, hasLicense, strMapToObj} from "@/business/utils/sdk-utils";
-import {getProjectVersions} from "@/api/project";
+import {getVersionFilters} from "@/business/utils/sdk-utils";
 import {testPlanAutoCheck} from "@/api/remote/plan/test-plan";
 import {scenarioRelevance} from "@/api/remote/plan/test-plan-scenario";
 import MsApiScenarioModule from "@/business/plan/view/comonents/api/module/ApiScenarioModule";
@@ -175,12 +175,8 @@ export default {
     },
     getVersionOptions() {
       if (hasLicense()) {
-        getProjectVersions(getCurrentProjectID())
-          .then(response => {
-            this.versionFilters = response.data.map(u => {
-              return {text: u.name, value: u.id};
-            });
-          });
+        getVersionFilters(getCurrentProjectID())
+          .then(r => this.versionFilters = r.data);
       }
     },
   }
diff --git a/test-track/frontend/src/business/plan/view/comonents/api/TestPlanApiCaseList.vue b/test-track/frontend/src/business/plan/view/comonents/api/TestPlanApiCaseList.vue
index 19ff319b49..87fe08a7f1 100644
--- a/test-track/frontend/src/business/plan/view/comonents/api/TestPlanApiCaseList.vue
+++ b/test-track/frontend/src/business/plan/view/comonents/api/TestPlanApiCaseList.vue
@@ -205,7 +205,6 @@ import MsPlanRunMode from "@/business/plan/common/PlanRunModeWithEnv";
 import MsUpdateTimeColumn from "metersphere-frontend/src/components/table/MsUpdateTimeColumn";
 import MsCreateTimeColumn from "metersphere-frontend/src/components/table/MsCreateTimeColumn";
 import {editTestPlanApiCaseOrder, testPlanAutoCheck} from "@/api/remote/plan/test-plan";
-import {getProjectVersions} from "@/api/project";
 import {getProjectMemberUserFilter} from "@/api/user";
 import {apiTestCaseGet, apiTestCaseReduction} from "@/api/remote/api/api-case";
 import {
@@ -217,6 +216,7 @@ import {
 import {apiDefinitionPlanReportGetByCaseId} from "@/api/remote/api/api-definition-report";
 import {reportSocket, run} from "@/api/remote/plan/test-plan";
 import MsTestPlanApiStatus from "@/business/plan/view/comonents/api/TestPlanApiStatus";
+import {getProjectVersions} from "@/business/utils/sdk-utils";
 
 export default {
   name: "TestPlanApiCaseList",
diff --git a/test-track/frontend/src/business/plan/view/comonents/api/TestPlanApiScenarioList.vue b/test-track/frontend/src/business/plan/view/comonents/api/TestPlanApiScenarioList.vue
index d20ce2d4a5..6e14e21fae 100644
--- a/test-track/frontend/src/business/plan/view/comonents/api/TestPlanApiScenarioList.vue
+++ b/test-track/frontend/src/business/plan/view/comonents/api/TestPlanApiScenarioList.vue
@@ -232,10 +232,10 @@ import {
   testPlanScenarioList
 } from "@/api/remote/plan/test-plan-scenario";
 import {environmentGroupGetProjectMapName} from "@/api/environment-group";
-import {getProjectVersions} from "@/api/project";
 import {apiAutomationReduction} from "@/api/remote/api/api-automation";
 import MicroApp from "metersphere-frontend/src/components/MicroApp";
 import MsTestPlanApiStatus from "@/business/plan/view/comonents/api/TestPlanApiStatus";
+import {getVersionFilters} from "@/business/utils/sdk-utils";
 
 export default {
   name: "MsTestPlanApiScenarioList",
@@ -566,12 +566,8 @@ export default {
     },
     getVersionOptions() {
       if (hasLicense()) {
-        getProjectVersions(getCurrentProjectID())
-          .then(response => {
-            this.versionFilters = response.data.map(u => {
-              return {text: u.name, value: u.id};
-            });
-          });
+        getVersionFilters(getCurrentProjectID())
+          .then(r => this.versionFilters = r.data);
       }
     },
     openById(item) {
diff --git a/test-track/frontend/src/business/plan/view/comonents/functional/FunctionalRelevance.vue b/test-track/frontend/src/business/plan/view/comonents/functional/FunctionalRelevance.vue
index 772eb2515c..3574a6a7dc 100644
--- a/test-track/frontend/src/business/plan/view/comonents/functional/FunctionalRelevance.vue
+++ b/test-track/frontend/src/business/plan/view/comonents/functional/FunctionalRelevance.vue
@@ -114,7 +114,6 @@ import MsTablePagination from "metersphere-frontend/src/components/pagination/Ta
 import MsTag from "metersphere-frontend/src/components/MsTag";
 import MsCreateTimeColumn from "metersphere-frontend/src/components/table/MsCreateTimeColumn";
 import MsUpdateTimeColumn from "metersphere-frontend/src/components/table/MsUpdateTimeColumn";
-import {getVersionFilters} from "@/api/project";
 import StatusTableItem from "@/business/common/tableItems/planview/StatusTableItem";
 import ReviewStatus from "@/business/case/components/ReviewStatus";
 import TestCaseReviewStatusTableItem from "@/business/common/tableItems/TestCaseReviewStatusTableItem";
@@ -122,6 +121,7 @@ import TestPlanCaseStatusTableItem from "@/business/common/tableItems/TestPlanCa
 import {TEST_CASE_CONFIGS} from "metersphere-frontend/src/components/search/search-components";
 import MxVersionSelect from "metersphere-frontend/src/components/version/MxVersionSelect";
 import {getProjectApplicationConfig} from "@/api/project-application";
+import {getVersionFilters} from "@/business/utils/sdk-utils";
 
 export default {
   name: "FunctionalRelevance",
@@ -281,9 +281,7 @@ export default {
     },
     getVersionOptions() {
       getVersionFilters(this.projectId)
-        .then((data) => {
-          this.versionFilters = data;
-        });
+        .then(r => this.versionFilters = r.data);
     },
     changeVersion(currentVersion) {
       this.page.condition.versionId = currentVersion || null;
diff --git a/test-track/frontend/src/business/plan/view/comonents/functional/FunctionalTestCaseList.vue b/test-track/frontend/src/business/plan/view/comonents/functional/FunctionalTestCaseList.vue
index 80c548ecf8..73a3511f8e 100644
--- a/test-track/frontend/src/business/plan/view/comonents/functional/FunctionalTestCaseList.vue
+++ b/test-track/frontend/src/business/plan/view/comonents/functional/FunctionalTestCaseList.vue
@@ -305,8 +305,7 @@ import {
 import {SYSTEM_FIELD_NAME_MAP} from "metersphere-frontend/src/utils/table-constants";
 import {getTestPlanTestCase} from "@/api/testCase";
 import TestPlanCaseIssueItem from "@/business/plan/view/comonents/functional/TestPlanCaseIssueItem";
-import {getProjectVersions} from "@/api/project";
-import {getCustomFieldValueForTrack, getProjectMemberOption} from "@/business/utils/sdk-utils";
+import {getCustomFieldValueForTrack, getProjectMemberOption, getProjectVersions} from "@/business/utils/sdk-utils";
 import {
   testPlanTestCaseBatchDelete,
   testPlanTestCaseBatchEdit,
diff --git a/test-track/frontend/src/business/plan/view/comonents/load/TestCaseLoadRelevance.vue b/test-track/frontend/src/business/plan/view/comonents/load/TestCaseLoadRelevance.vue
index e2413d47c9..aa5f6d09d0 100644
--- a/test-track/frontend/src/business/plan/view/comonents/load/TestCaseLoadRelevance.vue
+++ b/test-track/frontend/src/business/plan/view/comonents/load/TestCaseLoadRelevance.vue
@@ -109,7 +109,7 @@ import MsTablePagination from "metersphere-frontend/src/components/pagination/Ta
 import {_filter, buildBatchParam} from "metersphere-frontend/src/utils/tableUtils";
 import {TEST_PLAN_RELEVANCE_LOAD_CASE} from "metersphere-frontend/src/components/search/search-components";
 import MsTable from "metersphere-frontend/src/components/table/MsTable";
-import {getVersionFilters} from "@/api/project";
+import {getVersionFilters} from "@/business/utils/sdk-utils";
 import MxVersionSelect from "metersphere-frontend/src/components/version/MxVersionSelect";
 import MsPerformanceTestStatus from "@/business/performance/PerformanceTestStatus";
 import {testPlanLoadRelevance, testPlanLoadRelevanceList} from "@/api/remote/plan/test-plan-load-case";
@@ -288,9 +288,7 @@ export default {
     },
     getVersionOptions() {
       getVersionFilters(this.projectId)
-        .then((data) => {
-          this.versionFilters = data;
-        });
+        .then(r => this.versionFilters = r.data);
     },
     changeVersion(currentVersion) {
       this.condition.versionId = currentVersion || null;
diff --git a/test-track/frontend/src/business/plan/view/comonents/load/TestPlanLoadCaseList.vue b/test-track/frontend/src/business/plan/view/comonents/load/TestPlanLoadCaseList.vue
index bdc1ad0eed..bac023bc92 100644
--- a/test-track/frontend/src/business/plan/view/comonents/load/TestPlanLoadCaseList.vue
+++ b/test-track/frontend/src/business/plan/view/comonents/load/TestPlanLoadCaseList.vue
@@ -165,14 +165,13 @@ import MsUpdateTimeColumn from "metersphere-frontend/src/components/table/MsUpda
 import LoadCaseConfig from "@/business/plan/view/comonents/load/LoadCaseConfig";
 import MsTaskCenter from "metersphere-frontend/src/components/task/TaskCenter";
 import {editTestPlanLoadCaseOrder, testPlanAutoCheck, testPlanLoadCaseEditStatus} from "@/api/remote/plan/test-plan";
-import {hasLicense} from "@/business/utils/sdk-utils";
+import {getProjectVersions, hasLicense} from "@/business/utils/sdk-utils";
 import {
   testPlanLoadCaseBatchDelete,
   testPlanLoadCaseDelete, testPlanLoadCaseReportExist, testPlanLoadCaseRun,
   testPlanLoadCaseRunBatch,
   testPlanLoadCaseSelectAllTableRows, testPlanLoadCaseUpdate, testPlanLoadList
 } from "@/api/remote/plan/test-plan-load-case";
-import {getProjectVersions} from "@/api/project";
 import MicroApp from "metersphere-frontend/src/components/MicroApp";
 
 
diff --git a/test-track/frontend/src/business/plan/view/comonents/ui/RelevanceUiScenarioList.vue b/test-track/frontend/src/business/plan/view/comonents/ui/RelevanceUiScenarioList.vue
index 7f3039c0da..facd793020 100644
--- a/test-track/frontend/src/business/plan/view/comonents/ui/RelevanceUiScenarioList.vue
+++ b/test-track/frontend/src/business/plan/view/comonents/ui/RelevanceUiScenarioList.vue
@@ -81,8 +81,7 @@ import MsTableAdvSearchBar from "metersphere-frontend/src/components/search/MsTa
 import TEST_PLAN_RELEVANCE_API_SCENARIO_CONFIGS from "metersphere-frontend/src/components/search/search-components";
 import {ENV_TYPE} from "metersphere-frontend/src/utils/constants";
 import MsTable from "metersphere-frontend/src/components/table/MsTable";
-import {getVersionFilters} from "@/api/project";
-import {getApiScenarioEnvByProjectId} from "@/api/remote/api/api-automation";
+import {getVersionFilters} from "@/business/utils/sdk-utils";
 import {getOwnerProjects} from "@/business/utils/sdk-utils";
 import {getProjectApplicationConfig} from "@/api/project-application";
 import {testPlanUiScenarioRelevanceList} from "@/api/remote/ui/test-plan-ui-scenario-case";
@@ -232,9 +231,7 @@ export default {
     },
     getVersionOptions() {
       getVersionFilters(this.projectId)
-        .then((data) => {
-          this.versionFilters = data;
-        });
+        .then(r => this.versionFilters = r.data);
     },
     filter(field) {
       this.condition.filters = field || null;
diff --git a/test-track/frontend/src/business/plan/view/comonents/ui/TestPlanUiScenarioList.vue b/test-track/frontend/src/business/plan/view/comonents/ui/TestPlanUiScenarioList.vue
index a55bbbb9a1..c3298b5927 100644
--- a/test-track/frontend/src/business/plan/view/comonents/ui/TestPlanUiScenarioList.vue
+++ b/test-track/frontend/src/business/plan/view/comonents/ui/TestPlanUiScenarioList.vue
@@ -212,7 +212,7 @@ import {
   testPlanUiScenarioCaseRun, testPlanUiScenarioCaseSelectAllTableRows, testPlanUiScenarioEnv,
   testPlanUiScenarioList
 } from "@/api/remote/ui/test-plan-ui-scenario-case";
-import {getVersionFilters} from "@/api/project";
+import {getVersionFilters} from "@/business/utils/sdk-utils";
 import {uiAutomationReduction, uiAutomationVerifySeleniumServer} from "@/api/remote/ui/api-scenario";
 import {environmentGroupGetProjectMapName} from "@/api/environment-group";
 import i18n from "@/i18n";
@@ -646,9 +646,7 @@ export default {
     getVersionOptions() {
       if (hasLicense()) {
         getVersionFilters(getCurrentProjectID())
-          .then((data) => {
-            this.versionFilters = data;
-          });
+          .then(r => this.versionFilters = r.data);
       }
     },
   }
diff --git a/test-track/frontend/src/business/review/view/components/TestReviewRelevance.vue b/test-track/frontend/src/business/review/view/components/TestReviewRelevance.vue
index 9a8e931af9..634db27cf2 100644
--- a/test-track/frontend/src/business/review/view/components/TestReviewRelevance.vue
+++ b/test-track/frontend/src/business/review/view/components/TestReviewRelevance.vue
@@ -130,10 +130,10 @@ import MsTablePagination from "metersphere-frontend/src/components/pagination/Ta
 import MsDialogHeader from "metersphere-frontend/src/components/MsDialogHeader";
 import MsTable from "metersphere-frontend/src/components/table/MsTable";
 import TableSelectCountBar from "metersphere-frontend/src/components/table/TableSelectCountBar";
-import {getVersionFilters, projectRelated} from "@/api/project";
 import VersionSelect from "metersphere-frontend/src/components/version/MxVersionSelect";
 import {getTestCaseReviewRelevance, getTestCaseReviewsCasePage} from "@/api/test-review";
 import {testCaseNodeListReviewRelate} from "@/api/test-case-node";
+import {getVersionFilters} from "@/business/utils/sdk-utils";
 
 export default {
   name: "TestReviewRelevance",
@@ -360,9 +360,8 @@ export default {
       this.selectNodeIds = [];
     },
     getVersionOptions() {
-      getVersionFilters(this.projectId, (data) => {
-        this.versionFilters = data;
-      });
+      getVersionFilters(this.projectId)
+        .then(r => this.versionFilters = r.data);
     },
     changeVersion(version) {
       this.condition.versionId = version || null;
diff --git a/test-track/frontend/src/business/review/view/components/TestReviewTestCaseList.vue b/test-track/frontend/src/business/review/view/components/TestReviewTestCaseList.vue
index 3ccd73d5df..d1003172a2 100644
--- a/test-track/frontend/src/business/review/view/components/TestReviewTestCaseList.vue
+++ b/test-track/frontend/src/business/review/view/components/TestReviewTestCaseList.vue
@@ -204,13 +204,14 @@ import {editTestReviewTestCaseOrder, getTestReviewTestCase} from "@/api/testCase
 import {getCurrentProjectID} from "metersphere-frontend/src/utils/token";
 import {hasLicense} from "metersphere-frontend/src/utils/permission";
 import TestCaseReviewStatusTableItem from "@/business/common/tableItems/TestCaseReviewStatusTableItem";
-import {getProjectConfig, getVersionFilters} from "@/api/project";
+import {getProjectConfig} from "@/api/project";
 import {
   batchDeleteTestReviewCase,
   batchEditTestReviewCaseStatus,
   deleteTestReviewCase, getTesReviewById
 } from "@/api/test-review";
 import {useStore} from "@/store";
+import {getVersionFilters} from "@/business/utils/sdk-utils";
 
 export default {
   name: "TestReviewTestCaseList",
@@ -563,11 +564,7 @@ export default {
     getVersionOptions() {
       if (hasLicense()) {
         getVersionFilters(getCurrentProjectID())
-          .then((response) => {
-            this.versionFilters = response.data.map(u => {
-              return {text: u.name, value: u.id};
-            });
-          })
+          .then(r => this.versionFilters = r.data);
       }
     },
   }
diff --git a/test-track/frontend/src/business/utils/sdk-utils.js b/test-track/frontend/src/business/utils/sdk-utils.js
index 9f74097a9d..982b3293eb 100644
--- a/test-track/frontend/src/business/utils/sdk-utils.js
+++ b/test-track/frontend/src/business/utils/sdk-utils.js
@@ -15,7 +15,7 @@ export {deleteMarkDownImgByName} from "metersphere-frontend/src/api/img";
 export {getApiDefinitionById, getApiTestCasePages} from "metersphere-frontend/src/api/environment";
 export {getOwnerProjects, getProjectListAll} from "metersphere-frontend/src/api/project";
 export {deleteRelationshipEdge} from "metersphere-frontend/src/api/relationship-edge";
-export {isProjectVersionEnable} from "metersphere-frontend/src/api/version";
+export {isProjectVersionEnable, getProjectVersions, getVersionFilters} from "metersphere-frontend/src/api/version";
 
 
 import {

From 5f89e8aaeff12927314f3eeacdb81a34c25ca966 Mon Sep 17 00:00:00 2001
From: song-cc-rock <changchang.song@fit2cloud.com>
Date: Fri, 14 Oct 2022 11:24:10 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):?=
 =?UTF-8?q?=20=E5=88=9B=E5=BB=BA=E5=90=8C=E5=90=8D=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1017969 --user=宋昌昌 【测试跟踪】创建相同名称测试计划提示异常后就一直在转圈儿 https://www.tapd.cn/55049933/s/1261567
---
 .../frontend/src/business/plan/components/TestPlanEdit.vue      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test-track/frontend/src/business/plan/components/TestPlanEdit.vue b/test-track/frontend/src/business/plan/components/TestPlanEdit.vue
index e4a136d7e8..c24ed9d566 100644
--- a/test-track/frontend/src/business/plan/components/TestPlanEdit.vue
+++ b/test-track/frontend/src/business/plan/components/TestPlanEdit.vue
@@ -303,6 +303,8 @@ export default {
                 this.$success(this.$t('commons.save_success'));
                 this.dialogFormVisible = false;
                 this.$emit("refresh");
+              }).catch(() => {
+                this.loading = false;
               });
         } else {
           return false;