Merge remote-tracking branch 'origin/master'

DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/constant/PageDesignConstant.java

@@ -187,6 +187,11 @@ public interface PageDesignConstant {
              */
             String INDICATOR_CARD = "indicatorCard";
 
+            /**
+             * 数字
+             */
+            String NUMBER = "number";
+
         }
     }
 

DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenNumbersChart.java

@@ -0,0 +1,42 @@
+package com.gccloud.dataroom.core.module.chart.components;
+
+import com.gccloud.dataroom.core.constant.PageDesignConstant;
+import com.gccloud.dataroom.core.module.chart.bean.Chart;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 数字
+ * @author hongyang
+ * @version 1.0
+ * @date 2023/10/12 17:23
+ */
+@Data
+public class ScreenNumbersChart extends Chart {
+    
+    @ApiModelProperty(notes = "组件类型")
+    private String type = PageDesignConstant.BigScreen.Type.NUMBER;
+
+    @ApiModelProperty(notes = "个性化")
+    private Customize customize = new Customize();
+
+    @Data
+    public static class Customize {
+
+        @ApiModelProperty(notes = "字体大小")
+        private Integer fontSize;
+
+        @ApiModelProperty(notes = "字体粗细")
+        private Integer fontWeight;
+
+        @ApiModelProperty(notes = "字体")
+        private String fontFamily;
+
+        @ApiModelProperty(notes = "字体颜色")
+        private String color;
+
+        @ApiModelProperty(notes = "标题")
+        private String title;
+
+    }
+}

DataRoom/pom.xml

@@ -44,7 +44,7 @@
         <swagger-models.version>1.5.21</swagger-models.version>
         <jackson.version.core>2.13.3</jackson.version.core>
         <json.version>20220320</json.version>
-        <dataset.core.version>1.0.1.2023101101.Alpha</dataset.core.version>
+        <dataset.core.version>1.0.1.2023101201.Alpha</dataset.core.version>
         <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
     </properties>
 

data-room-ui/packages/DataSetManagement/src/JsEditForm.vue

@@ -652,7 +652,38 @@ export default {
           scriptMethod = new Function(scriptAfterReplacement)
         } catch (error) {
           this.passTest = false
+          const javascriptParams = javascript.match(/\${(.*?)}/g)
+          // 取出${}中的参数名
+          if (javascriptParams) {
+            const paramList = []
+            javascriptParams.forEach(item => {
+              const name = item.replace(/\${(.*?)}/g, '$1')
+              const param = this.dataForm.config.paramsList.find(param => param.name === name)
+              if (!param) {
+                // 添加确认框，是否填充参数
+                paramList.push(name)
+              }
+            })
+            this.$confirm(`脚本中的参数${paramList.join(',')}不存在，是否添加？`, '提示', {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              customClass: 'bs-el-message-box',
+              type: 'warning'
+            }).then(() => {
+              paramList.forEach(name => {
+                this.dataForm.config.paramsList.push({
+                  name,
+                  type: '',
+                  value: '',
+                  status: 1,
+                  require: 0,
+                  remark: ''
+                })
+              })
+            }).catch(() => {})
+          } else {
             this.$message.error(`脚本执行错误，请检查脚本，具体错误：${error}`)
+          }
           return
         }
         // 调用方法生成随机数据

data-room-ui/packages/SourceList/index.vue

@@ -295,6 +295,7 @@ export default {
       }
     },
     getOptions() {
+      this.options = []
       this.options.push({label: '全部', value: ''})
       this.sourceExtends.forEach((ext) => this.options.push({label: ext, value: ext}))
     },