refactor(视图): 视图标题备注编辑时显示填充背景,主题色切换保留备注的显示设置

This commit is contained in:
wangjiahao 2022-10-31 15:26:16 +08:00
parent e81ae42b26
commit 533c485587
5 changed files with 16 additions and 17 deletions

View File

@ -361,7 +361,7 @@ export function adaptCurTheme(customStyle, customAttr, chartType) {
}
}
customAttr['color'] = { ...canvasStyle.chartInfo.chartColor }
customStyle['text'] = { ...canvasStyle.chartInfo.chartTitle, title: customStyle['text']['title'], show: customStyle['text']['show'] }
customStyle['text'] = { ...canvasStyle.chartInfo.chartTitle, title: customStyle['text']['title'], show: customStyle['text']['show'], remarkShow: customStyle['text']['remarkShow'], remark: customStyle['text']['remark'] }
if (customStyle.background) {
delete customStyle.background
}

View File

@ -211,7 +211,7 @@ export const DEFAULT_TITLE_STYLE_DARK = {
isBolder: true,
remarkShow: false,
remark: '',
remarkBackgroundColor: '#ffffffff',
remarkBackgroundColor: '#5A5C62',
fontFamily: 'Microsoft YaHei',
letterSpace: '0',
fontShadow: false

View File

@ -194,6 +194,7 @@
>
<remark-editor
:remark="titleForm.remark"
:background="titleForm.remarkBackgroundColor"
@onRemarkChange="onRemarkChange"
/>
<div

View File

@ -1,15 +1,13 @@
<template>
<div
style="max-height: 50vh;overflow-y: auto;"
:style="customStyle"
:style="commonStyle"
>
<div :style="commonStyle">
<Editor
v-model="content"
style="width: 100%;height: 100%"
:init="init"
/>
</div>
<Editor
v-model="content"
style="width: 100%;height: 100%"
:init="init"
/>
</div>
</template>
@ -30,6 +28,10 @@ export default {
type: String,
required: true
},
background: {
type: String,
required: false
},
showTable: {
type: Boolean,
default: true
@ -100,14 +102,9 @@ export default {
return style
},
commonStyle() {
const style = {
width: '100%',
height: '100%'
return {
background: this.background
}
if (this.curComponent.commonBackground && this.curComponent.commonBackground.backgroundColorSelect) {
style['background-color'] = hexColorToRGBA(this.curComponent.commonBackground.color, this.curComponent.commonBackground.alpha)
}
return style
},
...
mapState([

View File

@ -39,6 +39,7 @@ export default {
max-height: 200px;
overflow-y: auto;
padding: 10px;
color: #000000;
border-radius: 4px;
}
::-webkit-scrollbar {