fix(测试用例): 拆分单元格&合并单元格&自定义字段解析格式处理

--bug=1045153 --user=王旭 【测试用例】ms系统语言为中文-用例导出为excel-默认格式/单元格拆分格式-导出数据模块、用例等级、步骤描述和预期结果为空 https://www.tapd.cn/55049933/s/1563756

backend/services/case-management/src/main/java/io/metersphere/functional/excel/validate/CustomFieldMultipleTextValidator.java

@@ -57,8 +57,7 @@ public class CustomFieldMultipleTextValidator extends AbstractCustomFieldValidat
         if (StringUtils.isBlank(keyOrValuesStr) || StringUtils.equals(keyOrValuesStr, "[]")) {
             return JSON.toJSONString(new ArrayList<>());
         }
-        List<String> keyOrValues = parse2Array(keyOrValuesStr);
+        String keyOrValues = String.join(",", JSON.parseArray(keyOrValuesStr));
-
+        return keyOrValues;
-        return JSON.toJSONString(keyOrValues);
     }
 }

backend/services/case-management/src/main/java/io/metersphere/functional/service/FunctionalCaseFileService.java

@@ -606,10 +606,12 @@ public class FunctionalCaseFileService {
             //构建其他字段
             buildExportOtherField(functionalCase, data, caseCommentMap, executeCommentMap, reviewCommentMap, request);
             validateExportTextField(data);
-            if (CollectionUtils.isNotEmpty(textDescriptionList) && !request.getIsMerge()) {
+            if (CollectionUtils.isNotEmpty(textDescriptionList) && request.getIsMerge()) {
                 // 如果有多条步骤则添加多条数据，之后合并单元格
                 buildExportMergeData(rowMergeInfo, list, textDescriptionList, expectedResultList, data);
             } else {
+                data.setTextDescription(parseData(textDescriptionList));
+                data.setExpectedResult(parseData(expectedResultList));
                 list.add(data);
             }
         });
@@ -617,6 +619,20 @@ public class FunctionalCaseFileService {
         return list;
     }
 
+    /**
+     * 处理单行格式
+     *
+     * @param list
+     * @return
+     */
+    private String parseData(List<String> list) {
+        String result = "";
+        for (int i = 0; i < list.size(); i++) {
+            result += "[" + (i + 1) + "]" + list.get(i) + "\n";
+        }
+        return result;
+    }
+
     /**
      * 构建基本参数
      *