From 608f0a97528e9ad48069f0599d0388fb01c7e5eb Mon Sep 17 00:00:00 2001 From: "liu.shiyi" Date: Mon, 28 Aug 2023 10:22:22 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E8=B7=91=E9=A9=AC?= =?UTF-8?q?=E7=81=AF=E7=BB=84=E4=BB=B6=E7=9A=84=E4=B8=BB=E9=A2=98=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data-room-ui/packages/BasicComponents/Marquee/index.vue | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/data-room-ui/packages/BasicComponents/Marquee/index.vue b/data-room-ui/packages/BasicComponents/Marquee/index.vue index e6d35038..2e9ae3d1 100644 --- a/data-room-ui/packages/BasicComponents/Marquee/index.vue +++ b/data-room-ui/packages/BasicComponents/Marquee/index.vue @@ -87,6 +87,8 @@ import Speech from 'speak-tts' import { EventBus } from 'data-room-ui/js/utils/eventBus' import commonMixins from 'data-room-ui/js/mixins/commonMixins' import paramsMixins from 'data-room-ui/js/mixins/paramsMixins' +import {settingToTheme} from "data-room-ui/js/utils/themeFormatting"; +import _ from "lodash"; export default { props: { // 卡片的属性 @@ -233,7 +235,14 @@ export default { } }, changeStyle (config) { + config = { ...this.config, ...config } this.voiceBroadcast(config) + // 样式改变时更新主题配置 + config.theme = settingToTheme(_.cloneDeep(config), this.customTheme) + this.changeChartConfig(config) + if (config.code === this.activeCode) { + this.changeActiveItemConfig(config) + } }, // 监听页面是否可见 handleVisibilityChange () {