From 616e553554c963dae573a7e10e3d15f57cae160e Mon Sep 17 00:00:00 2001
From: Raod <1130305001@qq.com>
Date: Sun, 26 Sep 2021 14:51:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=AB=98=E7=BA=A7=E8=A7=84=E5=88=99=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E8=BF=94=E5=9B=9E=E8=87=AA=E5=AE=9A=E4=B9=89=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DataSetServiceImpl.java      |  2 ++
 .../service/DataSetParamService.java          |  2 +-
 .../service/impl/DataSetParamServiceImpl.java | 24 +++++++++++++++----
 .../resultset/components/EditDataSet.vue      | 11 +++++----
 4 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/service/impl/DataSetServiceImpl.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/service/impl/DataSetServiceImpl.java
index 47e4e2ec..ed529a5f 100644
--- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/service/impl/DataSetServiceImpl.java
+++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/service/impl/DataSetServiceImpl.java
@@ -226,11 +226,13 @@ public class DataSetServiceImpl implements DataSetService {
         DataSource dataSource = dataSourceService.selectOne("source_code", dataSetDto.getSourceCode());
         //3.参数替换
         //3.1参数校验
+        log.debug("参数校验替换前：{}", dto.getContextData());
         boolean verification = dataSetParamService.verification(dataSetDto.getDataSetParamDtoList(), dto.getContextData());
         if (!verification) {
             throw BusinessExceptionBuilder.build(ResponseCode.RULE_FIELDS_CHECK_ERROR);
         }
         String dynSentence = dataSetParamService.transform(dto.getContextData(), dataSetDto.getDynSentence());
+        log.debug("参数校验替换后：{}", dto.getContextData());
         //4.获取数据
         DataSourceDto dataSourceDto = new DataSourceDto();
         BeanUtils.copyProperties(dataSource, dataSourceDto);
diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/service/DataSetParamService.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/service/DataSetParamService.java
index 71c2286e..b8afe47c 100644
--- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/service/DataSetParamService.java
+++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/service/DataSetParamService.java
@@ -39,7 +39,7 @@ public interface DataSetParamService extends GaeaBaseService<DataSetParamParam,
      * @param dataSetParamDto
      * @return
      */
-    boolean verification(DataSetParamDto dataSetParamDto);
+    Object verification(DataSetParamDto dataSetParamDto);
 
     /**
      * 参数校验  js脚本
diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/service/impl/DataSetParamServiceImpl.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/service/impl/DataSetParamServiceImpl.java
index 79a367ac..e4679b87 100644
--- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/service/impl/DataSetParamServiceImpl.java
+++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/service/impl/DataSetParamServiceImpl.java
@@ -93,7 +93,7 @@ public class DataSetParamServiceImpl implements DataSetParamService {
      * @return
      */
     @Override
-    public boolean verification(DataSetParamDto dataSetParamDto) {
+    public Object verification(DataSetParamDto dataSetParamDto) {
 
         String validationRules = dataSetParamDto.getValidationRules();
         if (StringUtils.isNotBlank(validationRules)) {
@@ -103,7 +103,12 @@ public class DataSetParamServiceImpl implements DataSetParamService {
                     Invocable invocable = (Invocable) engine;
                     Object exec = invocable.invokeFunction("verification", dataSetParamDto);
                     ObjectMapper objectMapper = new ObjectMapper();
-                    return objectMapper.convertValue(exec, Boolean.class);
+                    if (exec instanceof Boolean) {
+                        return objectMapper.convertValue(exec, Boolean.class);
+                    }else {
+                        return objectMapper.convertValue(exec, String.class);
+                    }
+
                 }
 
             } catch (Exception ex) {
@@ -131,9 +136,20 @@ public class DataSetParamServiceImpl implements DataSetParamService {
                 String value = contextData.getOrDefault(dataSetParamDto.getParamName(), "").toString();
                 dataSetParamDto.setSampleItem(value);
             }
-            if (!verification(dataSetParamDto)) {
-                return false;
+
+            Object verification = verification(dataSetParamDto);
+            if (verification instanceof Boolean) {
+                if (!(Boolean) verification) {
+                    return false;
+                }
+            }else {
+                //将得到的值重新赋值给contextData
+                if (null != contextData) {
+                    contextData.put(dataSetParamDto.getParamName(), verification);
+                }
+                dataSetParamDto.setSampleItem(verification.toString());
             }
+
         }
         return true;
     }
diff --git a/report-ui/src/views/report/resultset/components/EditDataSet.vue b/report-ui/src/views/report/resultset/components/EditDataSet.vue
index 89b9a26d..85349644 100644
--- a/report-ui/src/views/report/resultset/components/EditDataSet.vue
+++ b/report-ui/src/views/report/resultset/components/EditDataSet.vue
@@ -450,7 +450,7 @@ export default {
       itemFilterList: [
         {
           transformType: "js",
-          transformScript: `function dataTransform(data){\n\t//自定义脚本内容\n\treturn data;\n}`
+          transformScript: ``
         }
       ],
       transformScript: `function dataTransform(data){\n\t//自定义脚本内容\n\treturn data;\n}`,
@@ -491,7 +491,7 @@ export default {
           sampleItem: "",
           mandatory: true,
           requiredFlag: 1,
-          validationRules: `function verification(data){\n\t//自定义脚本内容\n\treturn true;\n}`
+          validationRules: `function verification(data){\n\t//自定义脚本内容\n\t//可返回true/false单纯校验键入的data正确性\n\t//可返回文本，实时替换,比如当前时间等\n\t//return "2099-01-01 00:00:00";\n\treturn true;\n}`
         }
       ],
       isRowData: {},
@@ -764,7 +764,7 @@ export default {
       this.title = "自定义高级规则";
       if (this.isRowData.sampleItem != "") {
         this.isRowData = row;
-        const fnCont = `function verification(data){\n\t//自定义脚本内容\n\treturn true;\n}`;
+        const fnCont = `function verification(data){\n\t//自定义脚本内容\n\t//可返回true/false单纯校验键入的data正确性\n\t//可返回文本，实时替换,比如当前时间等\n\t//return "2099-01-01 00:00:00";\n\treturn true;\n}`;
         this.validationRules = row.validationRules
           ? row.validationRules
           : fnCont;
@@ -801,10 +801,11 @@ export default {
     // 自定义高级规则
     async testResultset() {
       this.isRowData.validationRules = this.validationRules;
+      console.log(this.isRowData,"12345678")
       const { code, message, data } = await verificationSet(this.isRowData);
       if (code == "200") {
         if (data) {
-          this.$message.success("校验通过");
+          this.$message.success("返回结果："+ data);
         } else {
           this.$message.warning("当前示例值校验不通过");
         }
@@ -825,7 +826,7 @@ export default {
         sampleItem: "",
         mandatory: true,
         requiredFlag: 1,
-        validationRules: `function verification(data){\n\t//自定义脚本内容\n\treturn true;\n}`
+        validationRules: `function verification(data){\n\t//自定义脚本内容\n\t//可返回true/false单纯校验键入的data正确性\n\t//可返回文本，实时替换,比如当前时间等\n\t//return "2099-01-01 00:00:00";\n\treturn true;\n}`
       });
     },
     async submit(formName) {