center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

fix: 仪表板样式优化，修复仪表板公共颜色不显示问题

Browse Source
This commit is contained in:
wangjiahao 2022-05-30 13:12:52 +08:00
parent bd11d84240
commit c12dcb79bb
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
frontend/src/components/canvas/custom-component/UserView.vue
View File

@ -501,13 +501,17 @@ export default {
const customStyleChart = JSON.parse(this.chart.customStyle) const customStyleChart = JSON.parse(this.chart.customStyle)
const customAttrPanel = JSON.parse(this.canvasStyleData.chart.customAttr) const customAttrPanel = JSON.parse(this.canvasStyleData.chart.customAttr)
const customStylePanel = JSON.parse(this.canvasStyleData.chart.customStyle) const customStylePanel = JSON.parse(this.canvasStyleData.chart.customStyle)
// 组件样式-背景设置 if (customStyleChart.background) {
customStyleChart.background = customStylePanel.background // 组件样式-背景设置
customStyleChart.background = customStylePanel.background
}
// 图形属性-颜色设置 // 图形属性-颜色设置
if (this.chart.type.includes('table')) { if (this.chart.type.includes('table')) {
customAttrChart.color = customAttrPanel.tableColor customAttrChart.color = customAttrPanel.tableColor
} else { } else {
customAttrChart.color = customAttrPanel.color customAttrChart.color['value'] = customAttrPanel.color['value']
customAttrChart.color['colors'] = customAttrPanel.color['colors']
customAttrChart.color['alpha'] = customAttrPanel.color['alpha']
} }
this.chart = { this.chart = {
...this.chart, ...this.chart,

2
frontend/src/components/canvas/utils/utils.js
View File

@ -148,7 +148,7 @@ export function checkViewTitle(opt, id, tile) {
const curPanelViewsData = store.state.componentViewsData const curPanelViewsData = store.state.componentViewsData
const curComponentViewNames = [] const curComponentViewNames = []
store.state.componentData.forEach(item => { store.state.componentData.forEach(item => {
if (item.type === 'view' && item.propValue && item.propValue.viewId) { if (item.type === 'view' && item.propValue && item.propValue.viewId && curPanelViewsData[item.propValue.viewId]) {
// 更新时自己的title不加入比较 // 更新时自己的title不加入比较
if ((opt === 'update' && id !== item.propValue.viewId) || opt === 'new') { if ((opt === 'update' && id !== item.propValue.viewId) || opt === 'new') {
curComponentViewNames.push(curPanelViewsData[item.propValue.viewId].title) curComponentViewNames.push(curPanelViewsData[item.propValue.viewId].title)

10
frontend/src/views/panel/SubjectSetting/PanelStyle/PanelColorSelector.vue
View File

@ -6,7 +6,7 @@
width="400" width="400"
trigger="click" trigger="click"
> >
<color-selector :source-type="sourceType" :chart="chart" @onColorChange="onColorChange" /> <color-selector :chart="chart" :property-inner="propertyInner" @onColorChange="onColorChange" />
<el-button slot="reference" size="mini" class="shape-item">{{ $t('chart.color') }}<i class="el-icon-setting el-icon--right" /></el-button> <el-button slot="reference" size="mini" class="shape-item">{{ $t('chart.color') }}<i class="el-icon-setting el-icon--right" /></el-button>
</el-popover> </el-popover>
</div> </div>
@ -29,6 +29,14 @@ export default {
required: false required: false
} }
}, },
data() {
return {
propertyInner: [
'value',
'alpha'
]
}
},
methods: { methods: {
onColorChange(colorForm) { onColorChange(colorForm) {
this.$emit('onColorChange', colorForm) this.$emit('onColorChange', colorForm)