From a281060b1e7d6e1ddce9f5a2d4008f4d744c0f40 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Wed, 17 Apr 2024 08:56:51 +0800 Subject: [PATCH 1/2] =?UTF-8?q?refactor(=E5=9B=BE=E8=A1=A8):=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E8=A1=A8=E6=A0=BC=E6=8B=96=E6=8B=BD=E5=8C=BA=E5=9F=9F?= =?UTF-8?q?=EF=BC=8C=E9=98=B2=E6=AD=A2=E4=BA=8E=E8=A1=A8=E6=A0=BC=E6=BB=9A?= =?UTF-8?q?=E5=8A=A8=E6=9D=A1=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/data-visualization/canvas/Shape.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/core-frontend/src/components/data-visualization/canvas/Shape.vue b/core/core-frontend/src/components/data-visualization/canvas/Shape.vue index b6f959c181..0f8e108d05 100644 --- a/core/core-frontend/src/components/data-visualization/canvas/Shape.vue +++ b/core/core-frontend/src/components/data-visualization/canvas/Shape.vue @@ -1082,7 +1082,7 @@ onMounted(() => { .de-drag-right { right: 1px; top: 70px; - width: 16px; + width: 12px; height: calc(100% - 110px); } From 65b411cd7dfb494986d8f9e5399a60fef74db33a Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Wed, 17 Apr 2024 09:32:51 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AD=98=E9=87=8F=E6=8C=87=E6=A0=87=E5=8D=A1?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E8=AE=BE=E7=BD=AE=E5=B1=9E=E6=80=A7=E6=97=B6?= =?UTF-8?q?=E5=8F=AF=E8=83=BD=E5=9B=A0=E4=B8=BA=E7=BC=BA=E5=B0=91=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=E5=AF=BC=E8=87=B4=E7=BC=96=E8=BE=91=E5=8C=BA=E7=A9=BA?= =?UTF-8?q?=E7=99=BD=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/store/modules/data-visualization/dvMain.ts | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/core/core-frontend/src/store/modules/data-visualization/dvMain.ts b/core/core-frontend/src/store/modules/data-visualization/dvMain.ts index 80a0214186..4342fcd17e 100644 --- a/core/core-frontend/src/store/modules/data-visualization/dvMain.ts +++ b/core/core-frontend/src/store/modules/data-visualization/dvMain.ts @@ -1,7 +1,11 @@ import { defineStore } from 'pinia' import { store } from '../../index' import { deepCopy } from '@/utils/utils' -import { BASE_VIEW_CONFIG } from '@/views/chart/components/editor/util/chart' +import { + BASE_VIEW_CONFIG, + DEFAULT_INDICATOR_NAME_STYLE, + DEFAULT_INDICATOR_STYLE +} from '@/views/chart/components/editor/util/chart' import { DEFAULT_CANVAS_STYLE_DATA_DARK, DEFAULT_CANVAS_STYLE_DATA_LIGHT, @@ -508,6 +512,12 @@ export const dvMainStore = defineStore('dataVisualization', { if (this.curBatchOptComponents.length === 1) { this.changeProperties.customAttr = viewBaseInfo.customAttr this.changeProperties.customStyle = viewBaseInfo.customStyle + // 补充历史指标卡缺失属性 + this.changeProperties.customAttr['indicator'] = + this.changeProperties.customAttr.indicator || deepCopy(DEFAULT_INDICATOR_STYLE) + this.changeProperties.customAttr['indicatorName'] = + this.changeProperties.customAttr.indicatorName || + deepCopy(DEFAULT_INDICATOR_NAME_STYLE) } this.batchOptComponents[id] = { properties: chartViewInstance.properties,