From 8dd7f3929210e1eb0a02c580dc1b890ed1312235 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Tue, 26 Jul 2022 21:47:15 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E9=AB=98=E7=BA=A7=E6=90=9C=E7=B4=A2):=20?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E9=9C=80=E6=B1=82=E6=90=9C=E7=B4=A2=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/components/search/MsTableSearchMix.vue     |  7 +++++++
 .../components/search/MsTableSearchNodeTree.vue       |  2 ++
 .../common/components/search/search-components.js     | 11 +++++------
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/frontend/src/business/components/common/components/search/MsTableSearchMix.vue b/frontend/src/business/components/common/components/search/MsTableSearchMix.vue
index 25591e80a1..b112fb1e4a 100644
--- a/frontend/src/business/components/common/components/search/MsTableSearchMix.vue
+++ b/frontend/src/business/components/common/components/search/MsTableSearchMix.vue
@@ -14,6 +14,7 @@
 
 <script>
 import MsTableSearchComponent from "./MsTableSearchComponet";
+import {getCurrentProjectID, getCurrentUser} from "@/common/js/utils";
 
 export default {
   name: "MsTableSearchMix",
@@ -30,6 +31,12 @@ export default {
   },
   created() {
     if (!(this.component.options instanceof Array) && this.component.options.url) {
+      // is need to add project properties
+      let projectId = getCurrentProjectID();
+      if (!projectId) {
+        projectId = getCurrentUser().lastProjectId;
+      }
+      this.component.options.url += '/' + projectId;
       this.result = this.$get(this.component.options.url, response => {
         if (response.data) {
           response.data.forEach(item => {
diff --git a/frontend/src/business/components/common/components/search/MsTableSearchNodeTree.vue b/frontend/src/business/components/common/components/search/MsTableSearchNodeTree.vue
index eb8daf75e4..2d927b646e 100644
--- a/frontend/src/business/components/common/components/search/MsTableSearchNodeTree.vue
+++ b/frontend/src/business/components/common/components/search/MsTableSearchNodeTree.vue
@@ -51,6 +51,7 @@
 import MsTableSearchComponent from "@/business/components/common/components/search/MsTableSearchComponet";
 import MsNodeTree from "@/business/components/track/common/NodeTree";
 import {cloneDeep} from "lodash";
+import {getCurrentProjectID} from "@/common/js/utils";
 
 
 export default {
@@ -84,6 +85,7 @@ export default {
       let options = cloneDeep(this.component.options);
       let {url, params, type} = options;
       if (!url) return;
+      url += '/' + getCurrentProjectID();
       if (type === "POST") {
         this.result = this.$post(url, params || {}, response => {
           this.handleTreeNodes(response.data);
diff --git a/frontend/src/business/components/common/components/search/search-components.js b/frontend/src/business/components/common/components/search/search-components.js
index f689968ff8..d2fac347a9 100644
--- a/frontend/src/business/components/common/components/search/search-components.js
+++ b/frontend/src/business/components/common/components/search/search-components.js
@@ -3,7 +3,6 @@ import MsTableSearchDateTimePicker from "./MsTableSearchDateTimePicker";
 import MsTableSearchDatePicker from "./MsTableSearchDatePicker";
 import MsTableSearchSelect from "./MsTableSearchSelect";
 import MsTableSearchInputNumber from "@/business/components/common/components/search/MsTableSearchInputNumber";
-import {getCurrentProjectID} from "@/common/js/utils";
 import MsTableSearchMix from "@/business/components/common/components/search/MsTableSearchMix";
 import MsTableSearchNodeTree from "@/business/components/common/components/search/MsTableSearchNodeTree";
 
@@ -714,7 +713,7 @@ export const CASE_DEMAND = {
     this.showInput = false;
   },
   options: {
-    url: "/issues/demand/list/" + getCurrentProjectID(),
+    url: "/issues/demand/list",
     labelKey: "name",
     valueKey: "id",
     showLabel: option => {
@@ -751,25 +750,25 @@ function _getModuleTree(options) {
 }
 
 export const TEST_CASE_MODULE_TREE = _getModuleTree({
-  url: "/case/node/list/" + getCurrentProjectID(),
+  url: "/case/node/list",
   type: "POST",
   params: {} // 赋值时注意顺序
 })
 
 export const API_MODULE_TREE = _getModuleTree({
-  url: "/api/module/list/" + getCurrentProjectID(),
+  url: "/api/module/list",
   type: "GET",
   params: {}
 })
 
 export const SCENARIO_MODULE_TREE = _getModuleTree({
-  url: "/api/automation/module/list/" + getCurrentProjectID(),
+  url: "/api/automation/module/list",
   type: "GET",
   params: {}
 })
 
 export const UI_MODULE_TREE = _getModuleTree({
-  url: "/ui/scenario/module/list/" + getCurrentProjectID(),
+  url: "/ui/scenario/module/list",
   type: "GET",
   params: {}
 })