From ccd49bd345d4cfb83a3d66f9c5512a8b7894da87 Mon Sep 17 00:00:00 2001 From: "liu.shiyi" Date: Wed, 30 Aug 2023 09:32:48 +0800 Subject: [PATCH 01/10] =?UTF-8?q?feat:=E4=BF=AE=E5=A4=8D=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E7=BB=84=E4=BB=B6=E8=AE=BE=E7=BD=AE=E4=B8=BB=E9=A2=98?= =?UTF-8?q?=E5=90=8E=E5=AF=BC=E5=85=A5=E5=88=B0=E5=A4=A7=E5=B1=8F=E4=B8=AD?= =?UTF-8?q?=E4=B8=BB=E9=A2=98=E5=88=87=E6=8D=A2=E5=A4=B1=E6=95=88=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data-room-ui/packages/BigScreenDesign/index.vue | 4 +++- data-room-ui/packages/Render/index.vue | 13 ++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/data-room-ui/packages/BigScreenDesign/index.vue b/data-room-ui/packages/BigScreenDesign/index.vue index e0ffa30c..2041576f 100644 --- a/data-room-ui/packages/BigScreenDesign/index.vue +++ b/data-room-ui/packages/BigScreenDesign/index.vue @@ -319,7 +319,9 @@ export default { group: randomStr, code: randomStr + chart.code } - this.$refs.Render.addChart(newChart, { x: chart.x, y: chart.y }, true) + // 如果是从组件库中添加的自定义组件，则不需要初始化theme + const isComponent = true + this.$refs.Render.addChart(newChart, { x: chart.x, y: chart.y }, isComponent) this.updateRightVisiable(false) }) }) diff --git a/data-room-ui/packages/Render/index.vue b/data-room-ui/packages/Render/index.vue index 0bf4665f..2b86eb6a 100644 --- a/data-room-ui/packages/Render/index.vue +++ b/data-room-ui/packages/Render/index.vue @@ -306,7 +306,7 @@ export default { this.hLine = hLine }, // 新增元素 - addChart (chart, position) { + addChart (chart, position, isComponent) { const { left, top } = this.$el.getBoundingClientRect() const _chart = !chart.code ? JSON.parse(chart) : chart let option = _chart.option @@ -330,12 +330,11 @@ export default { option } config.key = config.code - // TODO:新添加一个组件时应该有默认的两套主题 - // 先暂时只考虑g2组件 - // if (['customComponent'].includes(_chart.type)) { - config.theme = settingToTheme(config, 'dark') - config.theme = settingToTheme(config, 'light') - // } + // 1、从左侧新增时会初始化theme的内容 2、从组件库添加自定义组件时不用初始化 + if (!isComponent) { + config.theme = settingToTheme(config, 'dark') + config.theme = settingToTheme(config, 'light') + } this.addItem(config) }, addSourceChart (chart, position) { From 1907da2cf28ec1fb4ae71417aab8ecd2696bc133 Mon Sep 17 00:00:00 2001 From: "liu.shiyi" Date: Wed, 30 Aug 2023 09:34:18 +0800 Subject: [PATCH 02/10] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data-room-ui/packages/Render/index.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data-room-ui/packages/Render/index.vue b/data-room-ui/packages/Render/index.vue index 2b86eb6a..1605a56f 100644 --- a/data-room-ui/packages/Render/index.vue +++ b/data-room-ui/packages/Render/index.vue @@ -330,7 +330,8 @@ export default { option } config.key = config.code - // 1、从左侧新增时会初始化theme的内容 2、从组件库添加自定义组件时不用初始化 + // isComponent = false 从左侧新增时需要初始化theme的内容 + // isComponent = true从组件库添加自定义组件时不用初始化 if (!isComponent) { config.theme = settingToTheme(config, 'dark') config.theme = settingToTheme(config, 'light') From f3b16b08bce2f93605ac126b663952fbec3d96ab Mon Sep 17 00:00:00 2001 From: "wu.jian2" Date: Wed, 30 Aug 2023 10:16:11 +0800 Subject: [PATCH 03/10] =?UTF-8?q?feat:=20=E8=B7=91=E9=A9=AC=E7=81=AF?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=8F=96=E6=B6=88=E7=BB=84=E4=BB=B6=E8=81=94?= =?UTF-8?q?=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../packages/BigScreenDesign/RightSetting/DataSetting.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue b/data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue index 92ac141b..aadd0dd1 100644 --- a/data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue +++ b/data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue @@ -564,8 +564,9 @@ :config="config" :source-field-list="sourceFieldList" /> + {{ config.type }} From a437f171aedc4e5c4080d39098d9d38ced62210a Mon Sep 17 00:00:00 2001 From: "wu.jian2" Date: Wed, 30 Aug 2023 10:17:24 +0800 Subject: [PATCH 04/10] =?UTF-8?q?feat:=20=E8=B7=91=E9=A9=AC=E7=81=AF?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=8F=96=E6=B6=88=E7=BB=84=E4=BB=B6=E8=81=94?= =?UTF-8?q?=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../packages/BigScreenDesign/RightSetting/DataSetting.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue b/data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue index 92ac141b..c664c9de 100644 --- a/data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue +++ b/data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue @@ -565,7 +565,7 @@ :source-field-list="sourceFieldList" /> From 1c906ac7bfc3ee28abfbcad5eb1965f4c078ab37 Mon Sep 17 00:00:00 2001 From: "wu.jian2" Date: Wed, 30 Aug 2023 10:25:06 +0800 Subject: [PATCH 05/10] =?UTF-8?q?feat:=20=E8=B7=91=E9=A9=AC=E7=81=AF?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=8F=96=E6=B6=88=E7=BB=84=E4=BB=B6=E8=81=94?= =?UTF-8?q?=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../packages/BigScreenDesign/RightSetting/DataSetting.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue b/data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue index aadd0dd1..c664c9de 100644 --- a/data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue +++ b/data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue @@ -564,7 +564,6 @@ :config="config" :source-field-list="sourceFieldList" /> - {{ config.type }} Date: Wed, 30 Aug 2023 10:33:41 +0800 Subject: [PATCH 06/10] =?UTF-8?q?feat:=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.2023083001.Alpha?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 升级数据集插件版本至1.0.1.2023083001.Alpha --- DataRoom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DataRoom/pom.xml b/DataRoom/pom.xml index 6de50d6c..c14599b5 100644 --- a/DataRoom/pom.xml +++ b/DataRoom/pom.xml @@ -60,7 +60,7 @@ 0.3.2 2.2 4.9.1 - 1.0.1.2023082801.Alpha + 1.0.1.2023083001.Alpha From af21d981f43de86a4eeb764bd3609c5244df4c53 Mon Sep 17 00:00:00 2001 From: "hong.yang" Date: Wed, 30 Aug 2023 10:45:24 +0800 Subject: [PATCH 07/10] =?UTF-8?q?feat:=20=E5=8F=91=E5=B8=83=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E7=89=88=E6=9C=AC1.0.1.2023083001.Alpha=EF=BC=8C?= =?UTF-8?q?=E6=96=B0=E5=A2=9Emssql=E6=95=B0=E6=8D=AE=E6=BA=90=E6=94=AF?= =?UTF-8?q?=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 发布测试版本1.0.1.2023083001.Alpha，新增mssql数据源支持 --- DataRoom/dataroom-core/pom.xml | 2 +- DataRoom/dataroom-server/pom.xml | 4 ++-- DataRoom/pom.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/DataRoom/dataroom-core/pom.xml b/DataRoom/dataroom-core/pom.xml index 1d27e360..f00689d3 100644 --- a/DataRoom/dataroom-core/pom.xml +++ b/DataRoom/dataroom-core/pom.xml @@ -6,7 +6,7 @@ com.gccloud dataroom - 1.0.1.2023081101.Alpha + 1.0.1.2023083001.Alpha dataroom-core diff --git a/DataRoom/dataroom-server/pom.xml b/DataRoom/dataroom-server/pom.xml index 1c2e9079..662b7142 100644 --- a/DataRoom/dataroom-server/pom.xml +++ b/DataRoom/dataroom-server/pom.xml @@ -6,7 +6,7 @@ com.gccloud dataroom - 1.0.1.2023081101.Alpha + 1.0.1.2023083001.Alpha dataroom-server @@ -29,7 +29,7 @@ com.gccloud dataroom-core - 1.0.1.2023081101.Alpha + 1.0.1.2023083001.Alpha diff --git a/DataRoom/pom.xml b/DataRoom/pom.xml index c14599b5..2d543599 100644 --- a/DataRoom/pom.xml +++ b/DataRoom/pom.xml @@ -12,7 +12,7 @@ com.gccloud dataroom - 1.0.1.2023081101.Alpha + 1.0.1.2023083001.Alpha pom 基于G2Plot、Echarts的大屏设计服务端，具备设计、预览能力，支持MySQL、Oracle、PostgreSQL、Groovy等数据集接入 From 544583c474f8ae12a7f9327fec0edb9a457a2113 Mon Sep 17 00:00:00 2001 From: "wu.jian2" Date: Wed, 30 Aug 2023 11:00:10 +0800 Subject: [PATCH 08/10] =?UTF-8?q?refactor:=20=E4=BF=AE=E6=94=B9=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8F=B7:1.0.1-2023083002-Alpha?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data-room-ui/packages/BasicComponents/Marquee/index.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/data-room-ui/packages/BasicComponents/Marquee/index.vue b/data-room-ui/packages/BasicComponents/Marquee/index.vue index 21dde5d4..08c3f8cc 100644 --- a/data-room-ui/packages/BasicComponents/Marquee/index.vue +++ b/data-room-ui/packages/BasicComponents/Marquee/index.vue @@ -224,7 +224,6 @@ export default { speechBroadcast (text) { if (this.speech.hasBrowserSupport()) { this.speech.setLanguage('zh-CN') - this.speech.pitch = 1 this.speech.init() this.speech.speak({ text: text }) } else { From 0a489f167885a09fd3250bf8137200b67f3ee2c3 Mon Sep 17 00:00:00 2001 From: "wu.jian2" Date: Wed, 30 Aug 2023 11:00:31 +0800 Subject: [PATCH 09/10] =?UTF-8?q?refactor:=20=E4=BF=AE=E6=94=B9=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8F=B7:1.0.1-2023083002-Alpha?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data-room-ui/package.json | 2 +- data-room-ui/packages/BasicComponents/Marquee/index.vue | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/data-room-ui/package.json b/data-room-ui/package.json index dc625b22..a5dc9a74 100644 --- a/data-room-ui/package.json +++ b/data-room-ui/package.json @@ -1,6 +1,6 @@ { "name": "@gcpaas/data-room-ui", - "version": "1.0.1-2023082902-Alpha", + "version": "1.0.1-2023083002-Alpha", "description": "自定义大屏", "author": "gcpaas", "license": "MIT", diff --git a/data-room-ui/packages/BasicComponents/Marquee/index.vue b/data-room-ui/packages/BasicComponents/Marquee/index.vue index 21dde5d4..08c3f8cc 100644 --- a/data-room-ui/packages/BasicComponents/Marquee/index.vue +++ b/data-room-ui/packages/BasicComponents/Marquee/index.vue @@ -224,7 +224,6 @@ export default { speechBroadcast (text) { if (this.speech.hasBrowserSupport()) { this.speech.setLanguage('zh-CN') - this.speech.pitch = 1 this.speech.init() this.speech.speak({ text: text }) } else { From b057e703147e05f8ba2e9d65721756bdbdadec9e Mon Sep 17 00:00:00 2001 From: "hong.yang" Date: Wed, 30 Aug 2023 11:04:04 +0800 Subject: [PATCH 10/10] =?UTF-8?q?docs:=20=E4=BF=AE=E6=94=B9readme=EF=BC=8C?= =?UTF-8?q?=E6=94=AF=E6=8C=81MSSQL?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修改readme，支持MSSQL --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ba3e81a6..a473d801 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Company

-🔥DataRoom是一款基于SpringBoot、MyBatisPlus、ElementUI、G2Plot、Echarts等技术栈的大屏设计器，具备大屏设计、预览能力，支持MySQL、Oracle、PostgreSQL、JSON、JS、HTTP、Groovy等数据集接入，使用简单，完全免费，代码开源。 +🔥DataRoom是一款基于SpringBoot、MyBatisPlus、ElementUI、G2Plot、Echarts等技术栈的大屏设计器，具备大屏设计、预览能力，支持MySQL、Oracle、PostgreSQL、MSSQL、JSON、JS、HTTP、Groovy等数据集接入，使用简单，完全免费，代码开源。 ## 效果图