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) {