Merge remote-tracking branch 'origin/dev' into dev

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/controller/param/DataSetParamValidationParam.java

@@ -12,7 +12,6 @@ import java.io.Serializable;
 public class DataSetParamValidationParam implements Serializable {
 
     /** 参数示例项 */
-    @NotBlank(message = "sampleItem not empty")
     private String sampleItem;
 
 

report-core/src/main/resources/bootstrap.yml

@@ -16,6 +16,7 @@ spring:
       max-file-size: 10MB #上传图片大小限制为10MB
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
+    time-zone: GMT+8
   messages:
     basename: i18n/messages
   datasource:

report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-text.js

@@ -96,7 +96,7 @@ export const widgetText = {
         name: 'whiteSpace',
         required: false,
         placeholder: '',
-        value: true,
+        value: false,
       }
     ],
     // 数据

report-ui/src/views/resultset/components/EditDataSet.vue

@@ -1,6 +1,6 @@
 <!--
- * @Descripttion: 
- * @version: 
+ * @Descripttion:
+ * @version:
  * @Author: yanzili
  * @Date: 2021-6-24 14:48:27
  * @LastEditors: qianlishi
@@ -13,6 +13,8 @@
       :visible.sync="visib"
       :close-on-click-modal="false"
       :before-close="closeDialog"
+      top="5vh"
+      center
       width="65%"
     >
       <el-form
@@ -763,7 +765,6 @@ export default {
     },
     // js 脚本编辑
     async filterScriptBtn(item) {
-      console.log(item);
       this.isItemFilterType = item;
       this.dialogSwitchVisible = true;
       this.jsScriptVisible = true
@@ -838,16 +839,14 @@ public class DemoGroovyHandler implements IGroovyHandler {
         }
       }
     },
-    // --查询参数-----------------///////////////////////////////////////////////////////////////////////
+    //查询参数
     permissionClick(row, index) {
       this.title = "自定义高级规则";
-      if (this.isRowData.sampleItem != "") {
-        this.isRowData = row;
-        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;
-      }
+      this.isRowData = row;
+      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;
       this.dialogPermissionVisible = true;
     },
     dialogValidationRules() {
@@ -874,13 +873,11 @@ public class DemoGroovyHandler implements IGroovyHandler {
       }
       rows.splice(index, 1);
     },
-    // -------------------------------------------------------------------------------
     // 数据源下拉切换
     changeSource() {},
     // 自定义高级规则
     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) {
@@ -911,7 +908,6 @@ public class DemoGroovyHandler implements IGroovyHandler {
     async submit(formName) {
       if (this.setType == "http") {
         //针对http数据源
-        console.log("http数据集" + this.httpForm);
         this.formData.dynSentence = JSON.stringify(this.httpForm);
       }
       this.formData.setType = this.setType;