From 7bc127d1573a1e1c06d6387bd1c546811004f599 Mon Sep 17 00:00:00 2001 From: "hong.yang" Date: Thu, 12 Oct 2023 17:15:15 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix:=20=E5=B0=86=E8=B5=84=E6=BA=90=E5=BA=93?= =?UTF-8?q?=E5=85=81=E8=AE=B8=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E6=B7=BB=E5=8A=A0=E5=88=B0=E9=85=8D=E7=BD=AE=E4=B8=AD?= =?UTF-8?q?=EF=BC=8C=E5=85=81=E8=AE=B8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data-room-ui/packages/SourceList/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/data-room-ui/packages/SourceList/index.vue b/data-room-ui/packages/SourceList/index.vue index 20f70f0d..fbd1a45c 100644 --- a/data-room-ui/packages/SourceList/index.vue +++ b/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})) }, From db460bd511e99fbedaf52064b6802a13e2c43cfb Mon Sep 17 00:00:00 2001 From: "wu.jian2" Date: Thu, 12 Oct 2023 17:20:04 +0800 Subject: [PATCH 2/5] =?UTF-8?q?feat:=20JS=E6=95=B0=E6=8D=AE=E9=9B=86?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=A8=E6=80=81=E5=8F=82=E6=95=B0=E8=A1=A5?= =?UTF-8?q?=E5=85=85=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DataSetManagement/src/JsEditForm.vue | 33 ++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/data-room-ui/packages/DataSetManagement/src/JsEditForm.vue b/data-room-ui/packages/DataSetManagement/src/JsEditForm.vue index d34fead4..c0e9369b 100644 --- a/data-room-ui/packages/DataSetManagement/src/JsEditForm.vue +++ b/data-room-ui/packages/DataSetManagement/src/JsEditForm.vue @@ -652,7 +652,38 @@ export default { scriptMethod = new Function(scriptAfterReplacement) } catch (error) { this.passTest = false - this.$message.error(`脚本执行错误，请检查脚本，具体错误：${error}`) + 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 } // 调用方法生成随机数据 From d5d84ded01db6e2561021dd332850134040e1ecf Mon Sep 17 00:00:00 2001 From: "hong.yang" Date: Thu, 12 Oct 2023 17:24:35 +0800 Subject: [PATCH 3/5] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E6=95=B0?= =?UTF-8?q?=E5=AD=97=E7=BB=84=E4=BB=B6=E9=85=8D=E7=BD=AE=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chart/components/ScreenNumbersChart.java | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenNumbersChart.java diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenNumbersChart.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenNumbersChart.java new file mode 100644 index 00000000..03c26496 --- /dev/null +++ b/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; + + } +} From 57cf1de07b9af5223058d83f354b6d31703c3f7f Mon Sep 17 00:00:00 2001 From: "hong.yang" Date: Thu, 12 Oct 2023 17:24:57 +0800 Subject: [PATCH 4/5] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E6=95=B0?= =?UTF-8?q?=E5=AD=97=E7=BB=84=E4=BB=B6=E9=85=8D=E7=BD=AE=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gccloud/dataroom/core/constant/PageDesignConstant.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/constant/PageDesignConstant.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/constant/PageDesignConstant.java index aa970999..436dcf1b 100644 --- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/constant/PageDesignConstant.java +++ b/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"; + } } From 5e1f20503fec033693b741605ff888190482c54c Mon Sep 17 00:00:00 2001 From: "hong.yang" Date: Thu, 12 Oct 2023 17:28:26 +0800 Subject: [PATCH 5/5] =?UTF-8?q?feat:=20-=20=E5=8D=87=E7=BA=A7=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=9B=86=E6=8F=92=E4=BB=B6=E7=89=88=E6=9C=AC=E8=87=B3?= =?UTF-8?q?1.0.1.2023101201.Alpha?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DataRoom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DataRoom/pom.xml b/DataRoom/pom.xml index be55bda8..8ce3d234 100644 --- a/DataRoom/pom.xml +++ b/DataRoom/pom.xml @@ -44,7 +44,7 @@ 1.5.21 2.13.3 20220320 - 1.0.1.2023101101.Alpha + 1.0.1.2023101201.Alpha 2.22.2