fix bug

backend/src/main/java/io/metersphere/excel/listener/TestCaseDataListener.java

@@ -23,15 +23,15 @@ public class TestCaseDataListener extends EasyExcelListener<TestCaseExcelData> {
 
     Set<String> testCaseNames;
 
-    Set<String> userNames;
+    Set<String> userIds;
 
     public TestCaseDataListener(TestCaseService testCaseService, String projectId,
-                                Set<String> testCaseNames, Set<String> userNames, Class<TestCaseExcelData> clazz) {
+                                Set<String> testCaseNames, Set<String> userIds, Class<TestCaseExcelData> clazz) {
         super(clazz);
         this.testCaseService = testCaseService;
         this.projectId = projectId;
         this.testCaseNames = testCaseNames;
-        this.userNames = userNames;
+        this.userIds = userIds;
     }
 
     @Override
@@ -44,7 +44,7 @@ public class TestCaseDataListener extends EasyExcelListener<TestCaseExcelData> {
         if ( nodePath.trim().contains(" ")) {
             stringBuilder.append("所属模块不能包含空格");
         }
-        if (!userNames.contains(data.getMaintainer())) {
+        if (!userIds.contains(data.getMaintainer())) {
             stringBuilder.append("该工作空间下无该用户：" + data.getMaintainer() + ";");
         }
         if (testCaseNames.contains(data.getName())) {

backend/src/main/java/io/metersphere/service/TestCaseService.java

@@ -16,6 +16,7 @@ import io.metersphere.excel.domain.TestCaseExcelData;
 import io.metersphere.excel.listener.EasyExcelListener;
 import io.metersphere.excel.listener.TestCaseDataListener;
 import io.metersphere.excel.utils.EasyExcelUtil;
+import io.metersphere.user.SessionUser;
 import io.metersphere.user.SessionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.session.ExecutorType;
@@ -181,10 +182,10 @@ public class TestCaseService {
             UserExample userExample =  new UserExample();
             userExample.createCriteria().andLastWorkspaceIdEqualTo(currentWorkspaceId);
             List<User> users = userMapper.selectByExample(userExample);
-            Set<String> userNames = users.stream().map(User::getName).collect(Collectors.toSet());
+            Set<String> userIds = users.stream().map(User::getId).collect(Collectors.toSet());
 
             EasyExcelListener easyExcelListener = new TestCaseDataListener(this, projectId,
-                    testCaseNames, userNames, TestCaseExcelData.class);
+                    testCaseNames, userIds, TestCaseExcelData.class);
             EasyExcelFactory.read(file.getInputStream(), TestCaseExcelData.class, easyExcelListener).sheet().doRead();
 
             List<ExcelErrData<TestCaseExcelData>> errList = easyExcelListener.getErrList();
@@ -228,6 +229,7 @@ public class TestCaseService {
         StringBuilder path = new StringBuilder("");
         List<String> types = Arrays.asList("functional", "performance", "api");
         List<String> methods = Arrays.asList("manual", "auto");
+        SessionUser user = SessionUtils.getUser();
         for (int i = 1; i <= 5; i++) {
             TestCaseExcelData data = new TestCaseExcelData();
             data.setName("测试用例" + i);
@@ -239,7 +241,7 @@ public class TestCaseService {
             data.setPrerequisite("前置条件选填");
             data.setStepDesc("1. 每个步骤以换行分隔\n2. 步骤前可标序号\n3. 测试步骤和结果选填");
             data.setStepResult("1. 每条结果以换行分隔\n2. 结果前可标序号\n3. 测试步骤和结果选填");
-            data.setMaintainer("admin");
+            data.setMaintainer(user.getId());
             data.setRemark("备注选填");
             list.add(data);
         }

frontend/src/business/components/common/components/MsTableOperator.vue

@@ -1,9 +1,9 @@
 <template>
   <span>
     <ms-table-operator-button icon="el-icon-edit"
-                              @click="editClick" @click.stop="editClickStop"/>
+                              :exec="editClick" @click.stop="editClickStop"/>
     <ms-table-operator-button icon="el-icon-delete" type="danger"
-                              @click="deletClick" @click.stop="deleteClickStop"/>
+                              :exec="deleteClick" @click.stop="deleteClickStop"/>
   </span>
 
 </template>
@@ -20,7 +20,7 @@
         editClickStop() {
           this.$emit('editClickStop');
         },
-        deletClick() {
+        deleteClick() {
           this.$emit('deleteClick');
         },
         deleteClickStop() {

frontend/src/business/components/common/components/MsTableOperatorButton.vue

@@ -1,7 +1,7 @@
 <template>
-  <el-button @click="click"
+  <el-button @click="exec"
              @click.stop="clickStop" :type="type"
-             :icon="icon" size="mini" circle/>
+             :icon="icon" size="mini" circle></el-button>
 </template>
 
 <script>
@@ -17,12 +17,12 @@
       type: {
         type: String,
         default: 'primary'
+      },
+      exec: {
+        type: Function
       }
     },
     methods: {
-      click() {
-        this.$emit('click');
-      },
       clickStop() {
         this.$emit('clickStop');
       }

frontend/src/business/components/track/case/components/TestCaseEdit.vue

@@ -319,22 +319,27 @@
         }
       },
       resetForm() {
+
+        //防止点击修改后，点击新建触发校验
         if (this.$refs['caseFrom']) {
-          this.$refs['caseFrom'].resetFields();
+          this.$refs['caseFrom'].validate((valid) => {
+            this.$refs['caseFrom'].resetFields();
+            this.form.name = '';
+            this.form.module = '';
+            this.form.type = '';
+            this.form.method = '';
+            this.form.maintainer = '';
+            this.form.priority = '';
+            this.form.prerequisite = '';
+            this.form.remark = '';
+            this.form.steps = [{
+              num: 1 ,
+              desc: '',
+              result: ''
+            }];
+            return true;
+          });
         }
-        this.form.name = '';
-        this.form.module = '';
-        this.form.type = '';
-        this.form.method = '';
-        this.form.maintainer = '';
-        this.form.priority = '';
-        this.form.prerequisite = '';
-        this.form.remark = '';
-        this.form.steps = [{
-          num: 1 ,
-          desc: '',
-          result: ''
-        }];
       }
     }
   }