From cfcb53f3ee38f7046c90865e353eefe401fb120f Mon Sep 17 00:00:00 2001 From: "hong.yang" Date: Mon, 28 Aug 2023 14:40:20 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E9=A3=9E=E7=BA=BF?= =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E7=BB=84=E4=BB=B6=E9=85=8D=E7=BD=AE=EF=BC=9B?= =?UTF-8?q?=E4=BF=AE=E6=94=B9json=E6=B3=A8=E5=86=8C=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E7=B1=BB=EF=BC=8C=E8=A7=A3=E5=86=B3=E5=BD=93=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=90=8C=E6=97=B6=E4=BE=9D=E8=B5=96=E5=A4=A7=E5=B1=8F=E5=92=8C?= =?UTF-8?q?=E4=BB=AA=E8=A1=A8=E7=9B=98=E6=97=B6=E7=9A=84=E5=86=B2=E7=AA=81?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修改飞线地图组件配置；修改json注册配置类，解决当项目同时依赖大屏和仪表盘时的冲突问题 --- .../gccloud/dataroom/core/config/DataRoomConfig.java | 4 +--- ...ion.java => DataRoomObjectMapperConfiguration.java} | 10 ++++++++-- .../module/chart/components/ScreenFlyMapChart.java | 2 ++ .../src/main/resources/chart/mock/flyMap.json | 10 ---------- 4 files changed, 11 insertions(+), 15 deletions(-) rename DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/config/{ObjectMapperConfiguration.java => DataRoomObjectMapperConfiguration.java} (83%) diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/config/DataRoomConfig.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/config/DataRoomConfig.java index 14f90a2e..17436cac 100644 --- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/config/DataRoomConfig.java +++ b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/config/DataRoomConfig.java @@ -8,9 +8,7 @@ import org.springframework.boot.context.properties.NestedConfigurationProperty; import org.springframework.context.annotation.Configuration; /** - * 基础框架基础配置 - * - * @Author maoshufeng + * @Author qianxing * @Date 2020-06-16 * @Version 1.0.0 */ diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/config/ObjectMapperConfiguration.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/config/DataRoomObjectMapperConfiguration.java similarity index 83% rename from DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/config/ObjectMapperConfiguration.java rename to DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/config/DataRoomObjectMapperConfiguration.java index e11965c4..38e3d17a 100644 --- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/config/ObjectMapperConfiguration.java +++ b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/config/DataRoomObjectMapperConfiguration.java @@ -14,11 +14,17 @@ import org.springframework.context.annotation.Configuration; import javax.annotation.PostConstruct; import javax.annotation.Resource; +/** + * Jackson配置类 + * @Author hongyang + * @Date 2022/06/19 + * @Version 1.0.0 + */ @Slf4j @Configuration @ConditionalOnMissingClass(value = "com.gccloud.dashboard.core.config.ObjectMapperConfiguration") -//@ConditionalOnProperty(prefix = "gc.starter.dataroom.component", name = "ObjectMapperConfiguration", havingValue = "ObjectMapperConfiguration", matchIfMissing = true) -public class ObjectMapperConfiguration { +@ConditionalOnProperty(prefix = "gc.starter.dataroom.component", name = "ObjectMapperConfiguration", havingValue = "ObjectMapperConfiguration", matchIfMissing = true) +public class DataRoomObjectMapperConfiguration { @Resource private ObjectMapper objectMapper; diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenFlyMapChart.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenFlyMapChart.java index a19ce4bb..2ee1bfac 100644 --- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenFlyMapChart.java +++ b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenFlyMapChart.java @@ -101,6 +101,8 @@ public class ScreenFlyMapChart extends Chart{ @ApiModelProperty(notes = "名称") private String name; + @ApiModelProperty(notes = "图形") + private List graphic; } } diff --git a/DataRoom/dataroom-core/src/main/resources/chart/mock/flyMap.json b/DataRoom/dataroom-core/src/main/resources/chart/mock/flyMap.json index e24a0274..7af2032c 100644 --- a/DataRoom/dataroom-core/src/main/resources/chart/mock/flyMap.json +++ b/DataRoom/dataroom-core/src/main/resources/chart/mock/flyMap.json @@ -20,16 +20,6 @@ "to": "河北省", "type": "move_in", "value": 10 - }, - { - "from": "合肥", - "lat1": 32.0581, - "lat2": 25.9222, - "lng1": 117.29, - "lng2": 119.4543, - "to": "福州", - "type": "move_in", - "value": 50 } ], "columnData": { From 4c0e317f5248c1a3699a9f2aa90cafb02943e7b7 Mon Sep 17 00:00:00 2001 From: "hong.yang" Date: Mon, 28 Aug 2023 15:12:07 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E9=A3=9E=E7=BA=BF?= =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E7=BB=84=E4=BB=B6=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修改飞线地图组件配置 --- .../core/module/chart/components/ScreenFlyMapChart.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenFlyMapChart.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenFlyMapChart.java index 2ee1bfac..d02c293d 100644 --- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenFlyMapChart.java +++ b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenFlyMapChart.java @@ -103,6 +103,12 @@ public class ScreenFlyMapChart extends Chart{ @ApiModelProperty(notes = "图形") private List graphic; + + @ApiModelProperty(notes = "图形字体颜色") + private String fontGraphicColor; + + @ApiModelProperty(notes = "图形字体大小") + private String fontSize; } } From f86b00279d854b02a7ac27d01dceb63147939662 Mon Sep 17 00:00:00 2001 From: "wu.jian2" Date: Mon, 28 Aug 2023 15:43:11 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=E5=99=A8=E6=B7=BB=E5=8A=A0=E4=B8=9A=E5=8A=A1=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=87=BA=E7=8E=B0=E9=85=8D=E7=BD=AE=E9=9D=A2?= =?UTF-8?q?=E6=9D=BF=E6=95=B0=E6=8D=AE=E4=B8=8D=E5=AF=B9=E5=BA=94=E7=9A=84?= =?UTF-8?q?=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BigScreenDesign/ComponentDialog/index.vue | 40 ++++++++++++++++++- .../BigScreenDesign/OverallSetting/index.vue | 4 +- .../packages/js/utils/voiceBroadcast.js | 1 - 3 files changed, 41 insertions(+), 4 deletions(-) diff --git a/data-room-ui/packages/BigScreenDesign/ComponentDialog/index.vue b/data-room-ui/packages/BigScreenDesign/ComponentDialog/index.vue index 578855fc..f77d9231 100644 --- a/data-room-ui/packages/BigScreenDesign/ComponentDialog/index.vue +++ b/data-room-ui/packages/BigScreenDesign/ComponentDialog/index.vue @@ -431,7 +431,13 @@ export default { } config.code = this.focus.code config.name = this.focus.name - config = getRemoteComponentConfig(this.focus.code, this.focus.name) + + this.$nextTick(() => { + config = cloneDeep(getRemoteComponentConfig(this.focus.code, this.focus.name)) + config.setting = this.resolveStrSetting(this.focus.settingContent).setting + this.$emit('setRemoteComponent', config) + }) + // config = getRemoteComponentConfig(this.focus.code, this.focus.name) this.$emit('setRemoteComponent', config) } }, @@ -472,6 +478,38 @@ export default { }) } }, + /** + * 处理当前组件的字符串配置 + */ + resolveStrSetting (settingContent) { + // eslint-disable-next-line prefer-const + let option = {} + // eslint-disable-next-line prefer-const + let setting = [] + // eslint-disable-next-line prefer-const, no-unused-vars + let title = [] + // eslint-disable-next-line prefer-const, no-unused-vars + let data = [] + // eslint-disable-next-line prefer-const + settingContent = settingContent.replaceAll('const ', '') + // 去掉 export default及后面代码 + settingContent = settingContent.replace(/export default[\s\S]*/, '') + eval(settingContent) + if (this.config?.option) { + this.config.option = { + ...this.config.option, + ...option + } + } + if (this.config?.setting) { + this.config.setting = setting + } + console.log('resolveStrSetting', option, setting) + return { + option, + setting + } + }, // 获取目录的列表 getCatalogList () { const url = this.activeName === 'combination' ? '/bigScreen/type/list/componentCatalog' : '/bigScreen/type/list/bizComponentCatalog' diff --git a/data-room-ui/packages/BigScreenDesign/OverallSetting/index.vue b/data-room-ui/packages/BigScreenDesign/OverallSetting/index.vue index 1276af85..f78b28b3 100644 --- a/data-room-ui/packages/BigScreenDesign/OverallSetting/index.vue +++ b/data-room-ui/packages/BigScreenDesign/OverallSetting/index.vue @@ -373,7 +373,7 @@ export default { this.form.refreshConfig = [] } else { this.pageInfo.chartList.forEach(chart => { - if (chart.dataSource.businessKey) { + if (chart.dataSource?.businessKey) { this.chartOptions.push({ code: chart.code, title: chart.title, @@ -470,7 +470,7 @@ export default { this.$emit('close') }, timerEmptyState () { - return this.pageInfo.chartList.every(chart => chart.dataSource.businessKey === '') + return this.pageInfo.chartList.every(chart => chart.dataSource?.businessKey === '') } } } diff --git a/data-room-ui/packages/js/utils/voiceBroadcast.js b/data-room-ui/packages/js/utils/voiceBroadcast.js index ec1430e4..67a85ffa 100644 --- a/data-room-ui/packages/js/utils/voiceBroadcast.js +++ b/data-room-ui/packages/js/utils/voiceBroadcast.js @@ -32,5 +32,4 @@ export default function speak ({ text, speechRate, lang, volume, pitch }, endEve startEvent && startEvent() } speechSynthesis.speak(speechUtterance) - console.log(2) } From c9383c13936b06f799ca49baecda13f6e52d3a0b Mon Sep 17 00:00:00 2001 From: "wu.jian2" Date: Mon, 28 Aug 2023 17:13:15 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=E5=99=A8=E6=B7=BB=E5=8A=A0=E4=B8=9A=E5=8A=A1=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E9=85=8D=E7=BD=AE=E9=9D=A2=E6=9D=BF=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=B7=B2=E4=BF=AE=E6=94=B9=E7=9A=84=E6=83=85=E5=86=B5?= =?UTF-8?q?=E4=B8=8B=EF=BC=8C=E7=82=B9=E5=87=BB=E5=AF=B9=E5=BA=94=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E9=85=8D=E7=BD=AE=E9=9D=A2=E6=9D=BF=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E8=A2=AB=E9=87=8D=E7=BD=AE=E7=9A=84=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BigScreenDesign/ComponentDialog/index.vue | 32 +++++++++---------- .../packages/js/mixins/commonMixins.js | 8 ++--- data-room-ui/vue.config.example.js | 2 +- 3 files changed, 20 insertions(+), 22 deletions(-) diff --git a/data-room-ui/packages/BigScreenDesign/ComponentDialog/index.vue b/data-room-ui/packages/BigScreenDesign/ComponentDialog/index.vue index f77d9231..001ca89b 100644 --- a/data-room-ui/packages/BigScreenDesign/ComponentDialog/index.vue +++ b/data-room-ui/packages/BigScreenDesign/ComponentDialog/index.vue @@ -345,6 +345,7 @@