From 438f8cdf3b22118a14224301a2e05da032ebbc5b Mon Sep 17 00:00:00 2001
From: song-cc-rock <changchang.song@fit2cloud.com>
Date: Fri, 31 Mar 2023 16:28:12 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):=20?=
 =?UTF-8?q?=E7=94=A8=E4=BE=8B=E8=B4=A3=E4=BB=BB=E4=BA=BA=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1025006 --user=宋昌昌 【测试跟踪】功能用例-修改用例责任人-保存后右侧责任人处显示暂无 https://www.tapd.cn/55049933/s/1358080
---
 .../frontend/src/components/new-ui/MsTabButton.vue     |  2 +-
 .../business/case/components/BaseEditItemComponent.vue | 10 ++++++++--
 .../src/business/case/components/TestCaseEdit.vue      |  4 ++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/framework/sdk-parent/frontend/src/components/new-ui/MsTabButton.vue b/framework/sdk-parent/frontend/src/components/new-ui/MsTabButton.vue
index 30372ad5a0..01c09d0b1e 100644
--- a/framework/sdk-parent/frontend/src/components/new-ui/MsTabButton.vue
+++ b/framework/sdk-parent/frontend/src/components/new-ui/MsTabButton.vue
@@ -9,7 +9,7 @@
       </el-tooltip>
 
       <el-tooltip v-if="rightButtonEnable" class="item" effect="dark" :content="rightTip" placement="bottom">
-        <el-button plain :class="{active: rightActive}" style="margin: 3px 3px 3px 0" @click="changeTab('right')">
+        <el-button plain :class="{active: rightActive}" style="margin: 3px 0 3px -2px" @click="changeTab('right')">
           <svg-icon :icon-class="rightActive ? rightIconActiveClass : rightIconClass"/>
         </el-button>
       </el-tooltip>
diff --git a/test-track/frontend/src/business/case/components/BaseEditItemComponent.vue b/test-track/frontend/src/business/case/components/BaseEditItemComponent.vue
index 44e68c6cf6..01594b69cf 100644
--- a/test-track/frontend/src/business/case/components/BaseEditItemComponent.vue
+++ b/test-track/frontend/src/business/case/components/BaseEditItemComponent.vue
@@ -268,8 +268,14 @@ export default {
           ? this.contentObject.content.value
           : this.contentObject.content.defaultValue;
         if(!tempValue || Array.isArray(tempValue) && tempValue.length <= 0){
-          this.isCustomNone = true;
-          return this.$t("case.none");
+          let customVal = this.model[this.contentObject.content.name];
+          if (customVal) {
+            this.isCustomNone = false;
+            tempValue = customVal;
+          } else {
+            this.isCustomNone = true;
+            return this.$t("case.none");
+          }
         } else {
           this.isCustomNone = false;
         }
diff --git a/test-track/frontend/src/business/case/components/TestCaseEdit.vue b/test-track/frontend/src/business/case/components/TestCaseEdit.vue
index f9200dc2bd..c04a2b356f 100644
--- a/test-track/frontend/src/business/case/components/TestCaseEdit.vue
+++ b/test-track/frontend/src/business/case/components/TestCaseEdit.vue
@@ -182,9 +182,9 @@
                   <div class="split"></div>
                   <div class="copy-row sub-opt-row" @click="copyRow">
                     <div class="icon">
-                      <img :src="!hasDeletePermission ? '/assets/module/figma/icon_copy_outlined_disable.svg' : '/assets/module/figma/icon_copy_outlined.svg'" alt=""/>
+                      <img :src="!hasCopyPermission ? '/assets/module/figma/icon_copy_outlined_disable.svg' : '/assets/module/figma/icon_copy_outlined.svg'" alt=""/>
                     </div>
-                    <div class="title" :style="!hasDeletePermission ? 'color: rgb(187, 187, 187); cursor: not-allowed;' : 'cursor: pointer;'">{{ $t("commons.copy") }}</div>
+                    <div class="title" :style="!hasCopyPermission ? 'color: rgb(187, 187, 187); cursor: not-allowed;' : 'cursor: pointer;'">{{ $t("commons.copy") }}</div>
                   </div>
                   <div class="split"></div>
                   <div class="delete-row sub-opt-row" @click="deleteRow">