From 13f2b2962f44ee17350b085cc0a689fa06d9b53c Mon Sep 17 00:00:00 2001 From: wisonic Date: Wed, 10 Jul 2024 19:29:34 +0800 Subject: [PATCH 1/3] =?UTF-8?q?refactor(=E5=9B=BE=E8=A1=A8):=20=E4=BB=AA?= =?UTF-8?q?=E8=A1=A8=E7=9B=98=E5=92=8C=E6=B0=B4=E6=B3=A2=E5=9B=BE=E6=9C=80?= =?UTF-8?q?=E5=A4=A7=E5=80=BC=E9=BB=98=E8=AE=A4=E4=B8=BA=201=20#10479?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/chart/components/editor/util/chart.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/core-frontend/src/views/chart/components/editor/util/chart.ts b/core/core-frontend/src/views/chart/components/editor/util/chart.ts index b48d6d62b7..33d3bbefbe 100644 --- a/core/core-frontend/src/views/chart/components/editor/util/chart.ts +++ b/core/core-frontend/src/views/chart/components/editor/util/chart.ts @@ -223,7 +223,7 @@ export const DEFAULT_MISC: ChartMiscAttr = { id: '', summary: '' }, - gaugeMax: 100, + gaugeMax: 1, gaugeStartAngle: 225, gaugeEndAngle: -45, nameFontSize: 18, @@ -244,7 +244,7 @@ export const DEFAULT_MISC: ChartMiscAttr = { nameFontShadow: false, treemapWidth: 80, treemapHeight: 80, - liquidMax: 100, + liquidMax: 1, liquidMaxType: 'fix', liquidMaxField: { id: '', From 95602b0e3728927770774768dd7541350cdb812c Mon Sep 17 00:00:00 2001 From: wisonic Date: Wed, 10 Jul 2024 19:32:04 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix(=E5=9B=BE=E8=A1=A8):=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E8=A1=A8=E6=A0=BC=E6=BB=9A=E5=8A=A8=E6=97=B6=E6=8B=96?= =?UTF-8?q?=E5=8A=A8=E5=8F=98=E5=BD=A2=EF=BC=8C=E4=BF=AE=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E6=BB=9A=E5=8A=A8=E6=97=B6=E6=8B=96=E5=8A=A8=E6=97=B6=E9=87=8D?= =?UTF-8?q?=E7=BB=98=E8=A1=A8=E6=A0=BC=20#10686?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chart/components/views/components/ChartComponentS2.vue | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/core/core-frontend/src/views/chart/components/views/components/ChartComponentS2.vue b/core/core-frontend/src/views/chart/components/views/components/ChartComponentS2.vue index 3917c5d975..0264cadedb 100644 --- a/core/core-frontend/src/views/chart/components/views/components/ChartComponentS2.vue +++ b/core/core-frontend/src/views/chart/components/views/components/ChartComponentS2.vue @@ -2,6 +2,7 @@ import { computed, inject, + nextTick, onBeforeUnmount, onMounted, PropType, @@ -393,6 +394,11 @@ const trackMenu = computed(() => { }) const resizeAction = resizeColumn => { + // 从头开始滚动 + if (myChart?.facet.timer) { + myChart?.facet.timer.stop() + nextTick(initScroll) + } if (showPosition.value !== 'canvas') { return } From a2ae5496f6687eed5af27ee2088009d773f8c6a9 Mon Sep 17 00:00:00 2001 From: wisonic Date: Wed, 10 Jul 2024 19:34:08 +0800 Subject: [PATCH 3/3] =?UTF-8?q?refactor(=E5=9B=BE=E8=A1=A8):=20=E6=8F=92?= =?UTF-8?q?=E4=BB=B6=E5=9B=BE=E8=A1=A8=E7=BC=96=E8=BE=91=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-visualization/canvas/Shape.vue | 2 +- .../components/plugin/src/PluginComponent.vue | 2 +- .../views/chart/components/editor/index.vue | 1396 +++++++++-------- .../views/chart/components/views/index.vue | 2 +- 4 files changed, 732 insertions(+), 670 deletions(-) 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 d39590b522..795cdd1e5e 100644 --- a/core/core-frontend/src/components/data-visualization/canvas/Shape.vue +++ b/core/core-frontend/src/components/data-visualization/canvas/Shape.vue @@ -304,7 +304,7 @@ const boardMoveActive = computed(() => { 'symbolic-map', 'heat-map' ] - return CHARTS.includes(element.value.innerType) + return element.value.isPlugin || CHARTS.includes(element.value.innerType) }) const dashboardActive = computed(() => { diff --git a/core/core-frontend/src/components/plugin/src/PluginComponent.vue b/core/core-frontend/src/components/plugin/src/PluginComponent.vue index 72433e52d3..1766d35417 100644 --- a/core/core-frontend/src/components/plugin/src/PluginComponent.vue +++ b/core/core-frontend/src/components/plugin/src/PluginComponent.vue @@ -94,7 +94,7 @@ const invokeMethod = param => { if (pluginProxy.value['invokeMethod']) { pluginProxy.value['invokeMethod'](param) } else { - pluginProxy.value[param.methodName](param.args) + pluginProxy.value[param.methodName]?.(param.args) } } diff --git a/core/core-frontend/src/views/chart/components/editor/index.vue b/core/core-frontend/src/views/chart/components/editor/index.vue index 975cd5058b..22daf42a6a 100644 --- a/core/core-frontend/src/views/chart/components/editor/index.vue +++ b/core/core-frontend/src/views/chart/components/editor/index.vue @@ -1533,7 +1533,14 @@ const singleDragStart = (e: DragEvent, ele, type) => { if (!activeChild.value.length) { activeChild.value = [ele] } - startToMove(e, unref(activeQuota.value)) + e.dataTransfer.setData( + 'quota', + JSON.stringify( + activeQuota.value + .filter(ele => ele.id) + .map(ele => ({ ...cloneDeep(unref(ele)), datasetId: view.value.tableId })) + ) + ) } const dragEnd = () => { @@ -1613,25 +1620,25 @@ const deleteChartFieldItem = id => { size="20px" @click="collapseChange('chartAreaCollapse')" > - - + + -
+
{{ view.title }}
{{ view.title }} -
+
{ />
- { >