From 8b3a9ae1b919b7262f28053242f411eeabf7d093 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Tue, 25 May 2021 22:17:27 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E9=80=89=E9=A1=B9=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/metersphere/track/issue/AbstractIssuePlatform.java   | 1 +
 .../main/java/io/metersphere/track/issue/JiraPlatform.java  | 1 -
 .../components/common/components/MsSingleHandleDrag.vue     | 4 +++-
 .../settings/workspace/template/CustomFieldEdit.vue         | 6 ++++++
 .../components/track/case/components/TestCaseEdit.vue       | 1 +
 5 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/track/issue/AbstractIssuePlatform.java b/backend/src/main/java/io/metersphere/track/issue/AbstractIssuePlatform.java
index 43959a4865..0d556992d0 100644
--- a/backend/src/main/java/io/metersphere/track/issue/AbstractIssuePlatform.java
+++ b/backend/src/main/java/io/metersphere/track/issue/AbstractIssuePlatform.java
@@ -170,6 +170,7 @@ public abstract class AbstractIssuePlatform implements IssuesPlatform {
         issues.setCreateTime(System.currentTimeMillis());
         issues.setUpdateTime(System.currentTimeMillis());
         issues.setNum(getNextNum(issuesRequest.getProjectId()));
+        issues.setResourceId(issuesRequest.getResourceId());
         issuesMapper.insert(issues);
     }
 
diff --git a/backend/src/main/java/io/metersphere/track/issue/JiraPlatform.java b/backend/src/main/java/io/metersphere/track/issue/JiraPlatform.java
index bea53cc54a..9afb85ac3b 100644
--- a/backend/src/main/java/io/metersphere/track/issue/JiraPlatform.java
+++ b/backend/src/main/java/io/metersphere/track/issue/JiraPlatform.java
@@ -64,7 +64,6 @@ public class JiraPlatform extends AbstractIssuePlatform {
         }
         JiraConfig config = getConfig();
         JiraClient.setConfig(config);
-        List<String> issuesIds = issues.stream().map(Issues::getId).collect(Collectors.toList());
         issues.forEach(item -> {
             String issuesId = item.getId();
             parseIssue(item, JiraClient.getIssues(issuesId));
diff --git a/frontend/src/business/components/common/components/MsSingleHandleDrag.vue b/frontend/src/business/components/common/components/MsSingleHandleDrag.vue
index 1fa4658c7d..17287ae116 100644
--- a/frontend/src/business/components/common/components/MsSingleHandleDrag.vue
+++ b/frontend/src/business/components/common/components/MsSingleHandleDrag.vue
@@ -126,10 +126,12 @@ export default {
       }
     },
     handleValueEdit(element) {
-      this.editIndex = -1;
       if (!this.isKv) {
         element.text = element.value;
       }
+      if (element.value && element.text) {
+        this.editIndex = -1;
+      }
     },
     isSystem(element) {
       if (element.system) {
diff --git a/frontend/src/business/components/settings/workspace/template/CustomFieldEdit.vue b/frontend/src/business/components/settings/workspace/template/CustomFieldEdit.vue
index e62b6f72aa..d7331c4391 100644
--- a/frontend/src/business/components/settings/workspace/template/CustomFieldEdit.vue
+++ b/frontend/src/business/components/settings/workspace/template/CustomFieldEdit.vue
@@ -143,6 +143,12 @@ export default {
           let param = {};
           Object.assign(param, this.form);
           param.workspaceId = getCurrentWorkspaceId();
+          for (const item of this.form.options) {
+            if (!item.text || !item.value) {
+              this.$warning('请填写完整选项值');
+              return;
+            }
+          }
           param.options = JSON.stringify(this.form.options);
           this.result = this.$post(this.url, param, (response) => {
             this.visible = false;
diff --git a/frontend/src/business/components/track/case/components/TestCaseEdit.vue b/frontend/src/business/components/track/case/components/TestCaseEdit.vue
index bb9bd729a8..4065dc113d 100644
--- a/frontend/src/business/components/track/case/components/TestCaseEdit.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseEdit.vue
@@ -361,6 +361,7 @@
           this.form.stepDescription = this.testCaseTemplate.stepDescription;
           this.form.expectedResult = this.testCaseTemplate.expectedResult;
           this.form.prerequisite = this.testCaseTemplate.prerequisite;
+          this.form.stepModel = this.testCaseTemplate.stepModel;
           if (this.testCaseTemplate.steps) {
             this.form.steps = JSON.parse(this.testCaseTemplate.steps);
           }