From 7dd6df1abdc30916409955ec030551945ef7414c Mon Sep 17 00:00:00 2001 From: "liu.shiyi" Date: Fri, 1 Sep 2023 10:42:15 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E6=98=8E=E4=BA=AE?= =?UTF-8?q?=E4=B8=BB=E9=A2=98=E8=83=8C=E6=99=AF=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../packages/BigScreenDesign/OverallSetting/index.vue | 6 ++++-- data-room-ui/packages/BigScreenList/EditForm.vue | 2 +- data-room-ui/packages/BigScreenManagement/addDialog.vue | 2 +- data-room-ui/packages/ComponentList/EditForm.vue | 2 +- data-room-ui/packages/SourceList/EditForm.vue | 2 +- data-room-ui/packages/js/store/actions.js | 4 ++-- data-room-ui/packages/js/store/state.js | 2 +- 7 files changed, 11 insertions(+), 9 deletions(-) diff --git a/data-room-ui/packages/BigScreenDesign/OverallSetting/index.vue b/data-room-ui/packages/BigScreenDesign/OverallSetting/index.vue index c94db75d..6c8c4035 100644 --- a/data-room-ui/packages/BigScreenDesign/OverallSetting/index.vue +++ b/data-room-ui/packages/BigScreenDesign/OverallSetting/index.vue @@ -284,7 +284,7 @@ export default { bg: '', bgColor: '#151a26', // 背景色 lightBg: '', - lightBgColor: '#151a26', + lightBgColor: '#f5f7fa', opacity: 100, customTheme: 'dark', themeJson: {}, @@ -375,7 +375,9 @@ export default { pageInfo.chartList = themeToSetting(pageInfo.chartList, theme) this.changePageInfo(pageInfo) pageInfo.chartList.forEach(chart => { - // if (chart.type === 'remoteComponent') + if (chart.type === 'remoteComponent') { + // this.$refs['remoteComponent' + chart.code]?.changeStyle(chart) + } }) }, init () { diff --git a/data-room-ui/packages/BigScreenList/EditForm.vue b/data-room-ui/packages/BigScreenList/EditForm.vue index 52075ad6..fa9fc75a 100644 --- a/data-room-ui/packages/BigScreenList/EditForm.vue +++ b/data-room-ui/packages/BigScreenList/EditForm.vue @@ -262,7 +262,7 @@ export default { w: this.type === 'component' ? 1024 : 1920, h: this.type === 'component' ? 768 : 1080, bgColor: '#151a26', - lightBgColor: '#151a26', + lightBgColor: '#f5f7fa', opacity: 100, customTheme: 'dark', bg: null, diff --git a/data-room-ui/packages/BigScreenManagement/addDialog.vue b/data-room-ui/packages/BigScreenManagement/addDialog.vue index c7727d90..9c5149e0 100644 --- a/data-room-ui/packages/BigScreenManagement/addDialog.vue +++ b/data-room-ui/packages/BigScreenManagement/addDialog.vue @@ -365,7 +365,7 @@ export default { w: this.resolutionRatio.w || '1920', h: this.resolutionRatio.h || '1080', bgColor: '#151a26', - lightBgColor: '#151a26', + lightBgColor: '#f5f7fa', opacity: 100, customTheme: 'dark' }, diff --git a/data-room-ui/packages/ComponentList/EditForm.vue b/data-room-ui/packages/ComponentList/EditForm.vue index 1ddda72b..09e582da 100644 --- a/data-room-ui/packages/ComponentList/EditForm.vue +++ b/data-room-ui/packages/ComponentList/EditForm.vue @@ -298,7 +298,7 @@ export default { opacity: 100, customTheme: 'dark', bg: null, - lightBgColor: '#151a26', + lightBgColor: '#f5f7fa', lightBg: null, fitMode: 'auto' }) diff --git a/data-room-ui/packages/SourceList/EditForm.vue b/data-room-ui/packages/SourceList/EditForm.vue index 3c561f6b..b729f8f9 100644 --- a/data-room-ui/packages/SourceList/EditForm.vue +++ b/data-room-ui/packages/SourceList/EditForm.vue @@ -249,7 +249,7 @@ export default { opacity: 100, customTheme: 'auto', bg: null, - lightBgColor: '#151a26', + lightBgColor: '#f5f7fa', lightBg: null }) if (this.dataForm.type === 'bigScreen') { diff --git a/data-room-ui/packages/js/store/actions.js b/data-room-ui/packages/js/store/actions.js index 8bd975d7..f9d57791 100644 --- a/data-room-ui/packages/js/store/actions.js +++ b/data-room-ui/packages/js/store/actions.js @@ -55,7 +55,7 @@ export function handleResData (data) { ...data, pageConfig: { ...data.pageConfig, - lightBgColor: data.pageConfig.lightBgColor || '#151a26' + lightBgColor: data.pageConfig.lightBgColor || '#f5f7fa' } } } else { @@ -65,7 +65,7 @@ export function handleResData (data) { w: 1920, h: 1080, bgColor: '#151a26', // 背景色 - lightBgColor: '#151a26', + lightBgColor: '#f5f7fa', lightBg: '', bg: '', // 背景图 customTheme: 'dark', diff --git a/data-room-ui/packages/js/store/state.js b/data-room-ui/packages/js/store/state.js index 8250cf45..14197334 100644 --- a/data-room-ui/packages/js/store/state.js +++ b/data-room-ui/packages/js/store/state.js @@ -22,7 +22,7 @@ export const defaultData = { h: 1080, bgColor: '#151a26', // 背景色 bg: '', // 背景图 - lightBgColor: '#151a26', + lightBgColor: '#f5f7fa', lightBg: '', opacity: 100, customTheme: 'dark',