diff --git a/frontend/src/components/canvas/custom-component/UserView.vue b/frontend/src/components/canvas/custom-component/UserView.vue index e0643d2f80..01935289c4 100644 --- a/frontend/src/components/canvas/custom-component/UserView.vue +++ b/frontend/src/components/canvas/custom-component/UserView.vue @@ -501,13 +501,17 @@ export default { const customStyleChart = JSON.parse(this.chart.customStyle) const customAttrPanel = JSON.parse(this.canvasStyleData.chart.customAttr) const customStylePanel = JSON.parse(this.canvasStyleData.chart.customStyle) - // 组件样式-背景设置 - customStyleChart.background = customStylePanel.background + if (customStyleChart.background) { + // 组件样式-背景设置 + customStyleChart.background = customStylePanel.background + } // 图形属性-颜色设置 if (this.chart.type.includes('table')) { customAttrChart.color = customAttrPanel.tableColor } 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, diff --git a/frontend/src/components/canvas/utils/utils.js b/frontend/src/components/canvas/utils/utils.js index fcf325d86f..5872783eed 100644 --- a/frontend/src/components/canvas/utils/utils.js +++ b/frontend/src/components/canvas/utils/utils.js @@ -148,7 +148,7 @@ export function checkViewTitle(opt, id, tile) { const curPanelViewsData = store.state.componentViewsData const curComponentViewNames = [] 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不加入比较 if ((opt === 'update' && id !== item.propValue.viewId) || opt === 'new') { curComponentViewNames.push(curPanelViewsData[item.propValue.viewId].title) diff --git a/frontend/src/views/panel/SubjectSetting/PanelStyle/PanelColorSelector.vue b/frontend/src/views/panel/SubjectSetting/PanelStyle/PanelColorSelector.vue index 79c710b340..b14dfee476 100644 --- a/frontend/src/views/panel/SubjectSetting/PanelStyle/PanelColorSelector.vue +++ b/frontend/src/views/panel/SubjectSetting/PanelStyle/PanelColorSelector.vue @@ -6,7 +6,7 @@ width="400" trigger="click" > - + {{ $t('chart.color') }} @@ -29,6 +29,14 @@ export default { required: false } }, + data() { + return { + propertyInner: [ + 'value', + 'alpha' + ] + } + }, methods: { onColorChange(colorForm) { this.$emit('onColorChange', colorForm)