From ef78e4c7a7a7696254e51fb10b75aa28f4e7efb4 Mon Sep 17 00:00:00 2001
From: ulleo <ulleo.wang@gmail.com>
Date: Fri, 8 Sep 2023 12:03:43 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20[AntV=E7=BB=84=E5=90=88=E5=9B=BE]=20?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=E8=AE=BE=E7=BD=AE=E4=B8=8D=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=A4=B1=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/antv/chartmix/data.vue          |  8 ++---
 .../src/views/antv/chartmix/index.vue         | 32 +++++++++++--------
 .../src/views/antv/chartmix/style.vue         |  8 ++---
 .../src/views/antv/sankey/data.vue            |  6 ++--
 .../src/views/antv/sankey/index.vue           | 10 +++---
 .../src/views/antv/sankey/style.vue           |  8 ++---
 6 files changed, 38 insertions(+), 34 deletions(-)

diff --git a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/views/antv/chartmix/data.vue b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/views/antv/chartmix/data.vue
index aa2edfdbdc..25f736a7d7 100644
--- a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/views/antv/chartmix/data.vue
+++ b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/views/antv/chartmix/data.vue
@@ -98,10 +98,10 @@
 </template>
 
 <script>
-import DimensionItem from '@/components/views/DimensionItem'
-import QuotaItem from '@/components/views/QuotaItem'
-import QuotaExtItem from '@/components/views/QuotaExtItem'
-import FilterItem from '@/components/views/FilterItem'
+import DimensionItem from '../../../components/views/DimensionItem'
+import QuotaItem from '../../../components/views/QuotaItem'
+import QuotaExtItem from '../../../components/views/QuotaExtItem'
+import FilterItem from '../../../components/views/FilterItem'
 import messages from '@/de-base/lang/messages'
 
 export default {
diff --git a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/views/antv/chartmix/index.vue b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/views/antv/chartmix/index.vue
index 3a01dbacc2..927f4b7de3 100644
--- a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/views/antv/chartmix/index.vue
+++ b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/views/antv/chartmix/index.vue
@@ -33,20 +33,20 @@
 
 <script>
 import {Mix} from '@antv/g2plot'
-import {uuid, hexColorToRGBA} from '@/utils/chartmix'
-import ViewTrackBar from '@/components/views/ViewTrackBar'
-import {getRemark} from "@/components/views/utils";
+import {uuid, hexColorToRGBA} from '../../../utils/chartmix'
+import ViewTrackBar from '../../../components/views/ViewTrackBar'
+import {getRemark} from "../../../components/views/utils";
 import {
   DEFAULT_TITLE_STYLE,
   DEFAULT_XAXIS_STYLE,
   DEFAULT_YAXIS_STYLE,
   transAxisPosition,
   getLineDash
-} from '@/utils/map';
-import ChartTitleUpdate from '@/components/views/ChartTitleUpdate';
+} from '../../../utils/map';
+import ChartTitleUpdate from '../../../components/views/ChartTitleUpdate';
 import _ from 'lodash';
 import {clear} from 'size-sensor'
-import {valueFormatter} from '@/utils/formatter'
+import {valueFormatter} from '../../../utils/formatter'
 
 export default {
   name: 'ChartComponent',
@@ -325,10 +325,12 @@ export default {
 
         const _chartType = this.getChartType(yaxisList[_index].chartType);
 
-        if (_chartType === "column") {
-          _labelSetting.position = labelPosition;
-        } else {
-          _labelSetting.position = undefined;
+        if (_labelSetting) {
+          if (_chartType === "column") {
+            _labelSetting.position = labelPosition;
+          } else {
+            _labelSetting.position = undefined;
+          }
         }
 
         return {
@@ -378,10 +380,12 @@ export default {
 
         const _chartType = this.getChartType(yaxisExtList[_index].chartType);
 
-        if (_chartType === "column") {
-          _labelSetting.position = labelPosition;
-        } else {
-          _labelSetting.position = undefined;
+        if (_labelSetting) {
+          if (_chartType === "column") {
+            _labelSetting.position = labelPosition;
+          } else {
+            _labelSetting.position = undefined;
+          }
         }
 
         return {
diff --git a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/views/antv/chartmix/style.vue b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/views/antv/chartmix/style.vue
index 34a13fcf87..db2e372f99 100644
--- a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/views/antv/chartmix/style.vue
+++ b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/views/antv/chartmix/style.vue
@@ -59,10 +59,10 @@
 </template>
 
 <script>
-  import ColorSelector from '@/components/selector/ColorSelector'
-  import TitleSelector from '@/components/selector/TitleSelector'
-  import TooltipSelectorAntV from '@/components/selector/TooltipSelectorAntV'
-  import LabelSelector from '@/components/selector/LabelSelector.vue'
+  import ColorSelector from '../../../components/selector/ColorSelector'
+  import TitleSelector from '../../../components/selector/TitleSelector'
+  import TooltipSelectorAntV from '../../../components/selector/TooltipSelectorAntV'
+  import LabelSelector from '../../../components/selector/LabelSelector.vue'
   import messages from '@/de-base/lang/messages'
   export default {
     components: {
diff --git a/extensions/dataease-extensions-view/view-sankey/view-sankey-frontend/src/views/antv/sankey/data.vue b/extensions/dataease-extensions-view/view-sankey/view-sankey-frontend/src/views/antv/sankey/data.vue
index 8c91a0b4ab..a4ef5dcca1 100644
--- a/extensions/dataease-extensions-view/view-sankey/view-sankey-frontend/src/views/antv/sankey/data.vue
+++ b/extensions/dataease-extensions-view/view-sankey/view-sankey-frontend/src/views/antv/sankey/data.vue
@@ -105,9 +105,9 @@
 </template>
 
 <script>
-import SankeyDimensionItem from '@/components/views/SankeyDimensionItem'
-import SankeyQuotaItem from '@/components/views/SankeyQuotaItem'
-import FilterItem from '@/components/views/FilterItem'
+import SankeyDimensionItem from '../../../components/views/SankeyDimensionItem'
+import SankeyQuotaItem from '../../../components/views/SankeyQuotaItem'
+import FilterItem from '../../../components/views/FilterItem'
 import messages from '@/de-base/lang/messages'
 
 export default {
diff --git a/extensions/dataease-extensions-view/view-sankey/view-sankey-frontend/src/views/antv/sankey/index.vue b/extensions/dataease-extensions-view/view-sankey/view-sankey-frontend/src/views/antv/sankey/index.vue
index e3d6aa98db..3a51f98150 100644
--- a/extensions/dataease-extensions-view/view-sankey/view-sankey-frontend/src/views/antv/sankey/index.vue
+++ b/extensions/dataease-extensions-view/view-sankey/view-sankey-frontend/src/views/antv/sankey/index.vue
@@ -33,11 +33,11 @@
 
 <script>
 import {Sankey} from '@antv/g2plot'
-import {uuid, hexColorToRGBA} from '@/utils/sankey'
-import ViewTrackBar from '@/components/views/ViewTrackBar'
-import {getRemark} from "@/components/views/utils";
-import {DEFAULT_TITLE_STYLE} from '@/utils/map';
-import ChartTitleUpdate from '@/components/views/ChartTitleUpdate';
+import {uuid, hexColorToRGBA} from '../../../utils/sankey'
+import ViewTrackBar from '../../../components/views/ViewTrackBar'
+import {getRemark} from "../../../components/views/utils";
+import {DEFAULT_TITLE_STYLE} from '../../../utils/map';
+import ChartTitleUpdate from '../../../components/views/ChartTitleUpdate';
 import _ from 'lodash';
 import {clear} from 'size-sensor'
 
diff --git a/extensions/dataease-extensions-view/view-sankey/view-sankey-frontend/src/views/antv/sankey/style.vue b/extensions/dataease-extensions-view/view-sankey/view-sankey-frontend/src/views/antv/sankey/style.vue
index 34a13fcf87..db2e372f99 100644
--- a/extensions/dataease-extensions-view/view-sankey/view-sankey-frontend/src/views/antv/sankey/style.vue
+++ b/extensions/dataease-extensions-view/view-sankey/view-sankey-frontend/src/views/antv/sankey/style.vue
@@ -59,10 +59,10 @@
 </template>
 
 <script>
-  import ColorSelector from '@/components/selector/ColorSelector'
-  import TitleSelector from '@/components/selector/TitleSelector'
-  import TooltipSelectorAntV from '@/components/selector/TooltipSelectorAntV'
-  import LabelSelector from '@/components/selector/LabelSelector.vue'
+  import ColorSelector from '../../../components/selector/ColorSelector'
+  import TitleSelector from '../../../components/selector/TitleSelector'
+  import TooltipSelectorAntV from '../../../components/selector/TooltipSelectorAntV'
+  import LabelSelector from '../../../components/selector/LabelSelector.vue'
   import messages from '@/de-base/lang/messages'
   export default {
     components: {