Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8

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

@@ -142,7 +142,7 @@ public class TestCaseDataListener extends EasyExcelListener<TestCaseExcelData> {
     public void saveData() {
 
         //excel中用例都有错误时就返回，只要有用例可用于更新或者插入就不返回
-        if (!errList.isEmpty() && list.size() == 0 && updateList.size() == 0) {
+        if (!errList.isEmpty()) {
             return;
         }
 
@@ -231,15 +231,23 @@ public class TestCaseDataListener extends EasyExcelListener<TestCaseExcelData> {
      */
     public String modifyTagPattern(TestCaseExcelData data){
         String tags = data.getTags();
-        if (tags != null) {
-            Stream<String> stringStream = Arrays.stream(tags.split("[,;，；]"));  //当标签值以中英文的逗号和分号分隔时才能正确解析
-            List<String> tagList = stringStream.map(tag -> tag = "\"" + tag + "\"")
-                    .collect(Collectors.toList());
-            String modifiedTags = StringUtils.join(tagList, ",");
-            modifiedTags = "[" + modifiedTags + "]";
-            return modifiedTags;
-        }else {
-            return null;
+        try {
+            if (StringUtils.isNotBlank(tags)) {
+                JSONArray.parse(tags);
+                return tags;
+            }
+            return "[]";
+        } catch (Exception e) {
+            if (tags != null) {
+                Stream<String> stringStream = Arrays.stream(tags.split("[,;，；]"));  //当标签值以中英文的逗号和分号分隔时才能正确解析
+                List<String> tagList = stringStream.map(tag -> tag = "\"" + tag + "\"")
+                        .collect(Collectors.toList());
+                String modifiedTags = StringUtils.join(tagList, ",");
+                modifiedTags = "[" + modifiedTags + "]";
+                return modifiedTags;
+            } else {
+                return "[]";
+            }
         }
     }
 

frontend/src/business/components/api/definition/components/module/ApiModule.vue

@@ -133,11 +133,16 @@
             this.data.forEach(node => {
               buildTree(node, {path: ''});
             });
-            this.$emit('setModuleOptions', this.data);
             this.$emit('setNodeTree', this.data);
             if (this.$refs.nodeTree) {
               this.$refs.nodeTree.filter(this.condition.filterText);
             }
+            let moduleOptions = [];
+            this.data.forEach(node => {
+              buildNodePath(node, {path: ''}, moduleOptions);
+            });
+            this.moduleOptions = moduleOptions;
+            this.$emit('setModuleOptions', moduleOptions);
           }
         });
       },