From 0ee5c593ed58632bce1cef70d2073dd94255e9bf Mon Sep 17 00:00:00 2001
From: song-cc-rock <changchang.song@fit2cloud.com>
Date: Wed, 15 Mar 2023 16:50:56 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):=20?=
 =?UTF-8?q?=E5=85=AC=E5=85=B1=E7=94=A8=E4=BE=8B=E5=BA=93=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E5=AD=97=E6=AE=B5=E8=B4=A3=E4=BB=BB=E4=BA=BA=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E6=9C=89=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1024436 --user=宋昌昌 【测试跟踪】公共用例库-查看，责任人为空 https://www.tapd.cn/55049933/s/1350590
---
 .../new-ui/MsCustomFiledComponent.vue         | 20 ++++++++---
 .../case/components/BaseEditItemComponent.vue | 35 +++++++++++++------
 .../case/components/case/CaseBaseInfo.vue     |  1 +
 .../case/CaseCustomFiledFormRow.vue           |  7 ++--
 4 files changed, 45 insertions(+), 18 deletions(-)

diff --git a/framework/sdk-parent/frontend/src/components/new-ui/MsCustomFiledComponent.vue b/framework/sdk-parent/frontend/src/components/new-ui/MsCustomFiledComponent.vue
index 034bd8aaae..066cf345ea 100644
--- a/framework/sdk-parent/frontend/src/components/new-ui/MsCustomFiledComponent.vue
+++ b/framework/sdk-parent/frontend/src/components/new-ui/MsCustomFiledComponent.vue
@@ -152,7 +152,7 @@
 <script>
 import MsTableColumn from "../table/MsTableColumn";
 import MsInputTag from "../MsInputTag";
-import {getProjectMemberOption} from "../../api/user";
+import {getProjectMemberById, getProjectMemberOption} from "../../api/user";
 import MsMarkDownText from "metersphere-frontend/src/components/MsMarkDownText";
 
 export default {
@@ -164,7 +164,8 @@ export default {
     'form',
     'disabled',
     'defaultOpen',
-    'isTemplateEdit'
+    'isTemplateEdit',
+    'projectId'
   ],
   data() {
     return {
@@ -199,13 +200,22 @@ export default {
     if (['member', 'multipleMember'].indexOf(this.data.type) < 0) {
       return;
     }
-    getProjectMemberOption()
-      .then((r) => {
+    if (this.projectId) {
+      getProjectMemberById(this.projectId).then((r) => {
         this.memberOptions = r.data;
         if (this.data.name === '责任人' && this.data.system && this.isTemplateEdit) {
           this.memberOptions.unshift({id: 'CURRENT_USER', name: '创建人', email: ''});
         }
-      });
+      })
+    } else {
+      getProjectMemberOption()
+        .then((r) => {
+          this.memberOptions = r.data;
+          if (this.data.name === '责任人' && this.data.system && this.isTemplateEdit) {
+            this.memberOptions.unshift({id: 'CURRENT_USER', name: '创建人', email: ''});
+          }
+        });
+    }
   },
   watch: {
     form() {
diff --git a/test-track/frontend/src/business/case/components/BaseEditItemComponent.vue b/test-track/frontend/src/business/case/components/BaseEditItemComponent.vue
index a556c9a47c..0cd7363554 100644
--- a/test-track/frontend/src/business/case/components/BaseEditItemComponent.vue
+++ b/test-track/frontend/src/business/case/components/BaseEditItemComponent.vue
@@ -171,7 +171,8 @@ export default {
     contentClickEvent: {
       type: Boolean,
       default: true,
-    }
+    },
+    projectId: String
   },
   computed: {
     edit() {
@@ -218,17 +219,31 @@ export default {
   },
   methods: {
     getMemberOptions() {
-      getProjectMemberOption().then((r) => {
-        let tempMemberOptions = r.data || [];
-        let tempArr = [];
-        tempMemberOptions.forEach((e) => {
-          tempArr.push({
-            value: e.id,
-            text: e.name,
+      if (this.projectId) {
+        getProjectMemberById(this.projectId).then((r) => {
+          let tempMemberOptions = r.data || [];
+          let tempArr = [];
+          tempMemberOptions.forEach((e) => {
+            tempArr.push({
+              value: e.id,
+              text: e.name,
+            });
           });
+          this.memberOptions = tempArr;
         });
-        this.memberOptions = tempArr;
-      });
+      } else {
+        getProjectMemberOption().then((r) => {
+          let tempMemberOptions = r.data || [];
+          let tempArr = [];
+          tempMemberOptions.forEach((e) => {
+            tempArr.push({
+              value: e.id,
+              text: e.name,
+            });
+          });
+          this.memberOptions = tempArr;
+        });
+      }
     },
     getTranslateOption(item) {
       if (!item) {
diff --git a/test-track/frontend/src/business/case/components/case/CaseBaseInfo.vue b/test-track/frontend/src/business/case/components/case/CaseBaseInfo.vue
index 076da54ce3..95e18e7d76 100644
--- a/test-track/frontend/src/business/case/components/case/CaseBaseInfo.vue
+++ b/test-track/frontend/src/business/case/components/case/CaseBaseInfo.vue
@@ -148,6 +148,7 @@
         :default-open="defaultOpen"
         :issue-template="testCaseTemplate"
         :editable="editable"
+        :project-id="form.projectId"
       />
     </el-form>
     <el-form ref="baseCaseFrom" :rules="rules" :model="form" class="case-padding">
diff --git a/test-track/frontend/src/business/case/components/case/CaseCustomFiledFormRow.vue b/test-track/frontend/src/business/case/components/case/CaseCustomFiledFormRow.vue
index a7a3330855..afba526fc0 100644
--- a/test-track/frontend/src/business/case/components/case/CaseCustomFiledFormRow.vue
+++ b/test-track/frontend/src/business/case/components/case/CaseCustomFiledFormRow.vue
@@ -23,6 +23,7 @@
                 :content-click-event="!disabled"
                 :model="form"
                 :rules="rules"
+                :project-id="projectId"
               >
                 <template v-slot:content="{ onClick, hoverEditable }">
                   <div :class="hoverEditable ? 'selectHover' : ''">
@@ -31,10 +32,9 @@
                         :data="item"
                         :form="form"
                         prop="defaultValue"
-                        :disabled="
-                          (item.type !== 'richText' && isPublic) || disabled
-                        "
+                        :disabled="(item.type !== 'richText' && isPublic) || disabled"
                         :default-open="defaultOpen"
+                        :project-id="projectId"
                         @onClick="onClick"
                       />
                     </el-form-item>
@@ -87,6 +87,7 @@ export default {
         return "preview";
       },
     },
+    projectId: String
   },
   computed: {
     customFieldRowNums() {