From c56ebe36ed4b1b5e7e9d80904633708423090eca Mon Sep 17 00:00:00 2001 From: "liu.shiyi" Date: Thu, 31 Aug 2023 10:03:20 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E9=A1=B6=E9=83=A8=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../packages/BigScreenDesign/PageDesignTop.vue | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/data-room-ui/packages/BigScreenDesign/PageDesignTop.vue b/data-room-ui/packages/BigScreenDesign/PageDesignTop.vue index 8e131c8e..9d9d9eb8 100644 --- a/data-room-ui/packages/BigScreenDesign/PageDesignTop.vue +++ b/data-room-ui/packages/BigScreenDesign/PageDesignTop.vue @@ -17,7 +17,7 @@ - 对齐 + 对齐方式 + {{ mode.label }} @@ -121,7 +122,6 @@ import { translateBlobToBase64 } from 'data-room-ui/js/utils/compressImg' import * as imageConversion from 'image-conversion' -import { themeToSetting } from 'data-room-ui/js/utils/themeFormatting' export default { name: 'PageTopSetting', components: { @@ -218,11 +218,6 @@ export default { undoTimeLine: 'bigScreen/undoTimeLine', saveTimeLine: 'bigScreen/saveTimeLine' }), - // 切换主题 - changeTheme (val) { - // 调取每个组件内部切换主题的方法 - this.$emit('updateTheme', val) - }, setAlign (command) { const pageInfo = cloneDeep(this.pageInfo) // 获取所有选中的组件 @@ -599,6 +594,7 @@ export default { } } .align-list-dropdown{ + width: 124px !important; color: #ffffff!important; } @@ -608,6 +604,7 @@ export default { background-color: var(--bs-background-2)!important; border: 1px solid var(--bs-border-1); /deep/ .el-dropdown-menu__item{ + padding: 7px 10px!important; background-color: var(--bs-background-2)!important; &:hover { color: var(--bs-el-color-primary) !important; From d4e3b24d5a37150daa0ffe85c43978efe989372e Mon Sep 17 00:00:00 2001 From: "liu.shiyi" Date: Thu, 31 Aug 2023 10:23:36 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E9=A1=B6=E9=83=A8=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data-room-ui/packages/BigScreenDesign/PageDesignTop.vue | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/data-room-ui/packages/BigScreenDesign/PageDesignTop.vue b/data-room-ui/packages/BigScreenDesign/PageDesignTop.vue index 9d9d9eb8..491f36ab 100644 --- a/data-room-ui/packages/BigScreenDesign/PageDesignTop.vue +++ b/data-room-ui/packages/BigScreenDesign/PageDesignTop.vue @@ -29,10 +29,10 @@ @click.native="setAlign(mode.value)" > - {{ mode.label }} + {{ mode.label }} @@ -594,7 +594,7 @@ export default { } } .align-list-dropdown{ - width: 124px !important; + width: 100px !important; color: #ffffff!important; } @@ -604,7 +604,6 @@ export default { background-color: var(--bs-background-2)!important; border: 1px solid var(--bs-border-1); /deep/ .el-dropdown-menu__item{ - padding: 7px 10px!important; background-color: var(--bs-background-2)!important; &:hover { color: var(--bs-el-color-primary) !important;