From ec01b80fd09bcafe4da228c8df2a9a0e34c82791 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Thu, 31 Oct 2024 13:46:23 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=9B=BE=E8=A1=A8):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E8=AE=BE=E8=AE=A1,=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E5=9B=BE=E8=A1=A8=E6=A0=B7=E5=BC=8F=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E6=8C=87=E6=A0=87=E5=80=BC=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../editor/editor-style/ChartStyleCommon.vue  | 141 ------------------
 .../views/chart/components/editor/index.vue   |  28 ++--
 2 files changed, 15 insertions(+), 154 deletions(-)
 delete mode 100644 core/core-frontend/src/views/chart/components/editor/editor-style/ChartStyleCommon.vue

diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/ChartStyleCommon.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/ChartStyleCommon.vue
deleted file mode 100644
index 13850514ad..0000000000
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/ChartStyleCommon.vue
+++ /dev/null
@@ -1,141 +0,0 @@
-<script setup lang="ts">
-import { PluginComponent } from '@/components/plugin'
-import ChartStyle from '@/views/chart/components/editor/editor-style/ChartStyle.vue'
-import { PropType } from 'vue'
-const emit = defineEmits([
-  'onColorChange',
-  'onMiscChange',
-  'onLabelChange',
-  'onTooltipChange',
-  'onChangeXAxisForm',
-  'onChangeYAxisForm',
-  'onChangeYAxisExtForm',
-  'onTextChange',
-  'onLegendChange',
-  'onBasicStyleChange',
-  'onBackgroundChange',
-  'onStyleAttrChange',
-  'onTableHeaderChange',
-  'onTableCellChange',
-  'onTableTotalChange',
-  'onChangeMiscStyleForm',
-  'onExtTooltipChange',
-  'onIndicatorChange',
-  'onIndicatorNameChange',
-  'onChangeQuadrantForm',
-  'onChangeFlowMapLineForm',
-  'onChangeFlowMapPointForm'
-])
-const props = defineProps({
-  commonBackgroundPop: {
-    type: Object,
-    required: false
-  },
-  commonBorderPop: {
-    type: Object,
-    required: false
-  },
-  eventInfo: {
-    type: Object,
-    required: false
-  },
-  view: {
-    type: Object as PropType<ChartObj>,
-    required: true
-  },
-  themes: {
-    type: String as PropType<EditorTheme>,
-    default: 'dark'
-  },
-  dimension: {
-    type: Array,
-    required: true
-  },
-  quota: {
-    type: Array,
-    required: true
-  },
-  properties: {
-    type: Array as PropType<EditorProperty[]>,
-    required: false,
-    default: () => {
-      return []
-    }
-  },
-  propertyInnerAll: {
-    type: Object as PropType<EditorPropertyInner>,
-    required: false,
-    default: () => {
-      return {}
-    }
-  },
-  selectorSpec: {
-    type: Object as PropType<EditorSelectorSpec>,
-    required: false,
-    default: () => {
-      return {}
-    }
-  },
-  allFields: {
-    type: Array,
-    required: true
-  }
-})
-</script>
-
-<template>
-  <el-container direction="vertical" id="main-style-p">
-    <el-scrollbar class="drag_main_area">
-      <template v-if="view.plugin?.isPlugin">
-        <plugin-component
-          :jsname="view.plugin.staticMap['editor-style']"
-          :view="view"
-          :dimension="dimension"
-          :quota="quota"
-          :themes="themes"
-          :emitter="emitter"
-        />
-      </template>
-      <template v-else>
-        <chart-style
-          v-if="chartStyleShow"
-          :properties="chartViewInstance.properties"
-          :property-inner-all="chartViewInstance.propertyInner"
-          :selector-spec="chartViewInstance.selectorSpec"
-          :common-background-pop="curComponent?.commonBackground"
-          :common-border-pop="curComponent?.style"
-          :event-info="curComponent?.events"
-          :chart="view"
-          :themes="themes"
-          :dimension-data="dimension"
-          :quota-data="quota"
-          :all-fields="allFields"
-          @onColorChange="(val, prop) => emit('onColorChange', val, prop)"
-          @onMiscChange="(val, prop) => emit('onMiscChange', val, prop)"
-          @onLabelChange="(val, prop) => emit('onLabelChange', val, prop)"
-          @onTooltipChange="(val, prop) => emit('onTooltipChange', val, prop)"
-          @onChangeXAxisForm="(val, prop) => emit('onChangeXAxisForm', val, prop)"
-          @onChangeYAxisForm="(val, prop) => emit('onChangeYAxisForm', val, prop)"
-          @onChangeYAxisExtForm="(val, prop) => emit('onChangeYAxisExtForm', val, prop)"
-          @onTextChange="(val, prop) => emit('onTextChange', val, prop)"
-          @onIndicatorChange="(val, prop) => emit('onIndicatorChange', val, prop)"
-          @onIndicatorNameChange="(val, prop) => emit('onIndicatorNameChange', val, prop)"
-          @onLegendChange="(val, prop) => emit('onLegendChange', val, prop)"
-          @onBackgroundChange="(val, prop) => emit('onBackgroundChange', val, prop)"
-          @onStyleAttrChange="(val, prop) => emit('onStyleAttrChange', val, prop)"
-          @onBasicStyleChange="(val, prop) => emit('onBasicStyleChange', val, prop)"
-          @onTableHeaderChange="(val, prop) => emit('onTableHeaderChange', val, prop)"
-          @onTableCellChange="(val, prop) => emit('onTableCellChange', val, prop)"
-          @onTableTotalChange="(val, prop) => emit('onTableTotalChange', val, prop)"
-          @onChangeMiscStyleForm="(val, prop) => emit('onChangeMiscStyleForm', val, prop)"
-          @onExtTooltipChange="(val, prop) => emit('onExtTooltipChange', val, prop)"
-          @onChangeQuadrantForm="(val, prop) => emit('onChangeQuadrantForm', val, prop)"
-          @onChangeFlowMapLineForm="(val, prop) => emit('onChangeFlowMapLineForm', val, prop)"
-          @onChangeFlowMapPointForm="(val, prop) => emit('onChangeFlowMapPointForm', val, prop)"
-        />
-      </template>
-    </el-scrollbar>
-  </el-container>
-</template>
-
-<style scoped lang="less"></style>
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 197f4bcf55..7472ca678b 100644
--- a/core/core-frontend/src/views/chart/components/editor/index.vue
+++ b/core/core-frontend/src/views/chart/components/editor/index.vue
@@ -223,20 +223,22 @@ provide('quota', () => state.quota)
 watch(
   [() => view.value['tableId']],
   () => {
-    if ('picture-group' === props.view.type) {
-      return
-    }
-    getFields(props.view.tableId, props.view.id, props.view.type)
-    const nodeId = view.value['tableId']
-    if (!!nodeId) {
-      cacheId = nodeId as unknown as string
-    }
-    const node = datasetSelector?.value?.getNode(nodeId)
-    if (node?.data) {
-      curDatasetWeight.value = node.data.weight
-    }
+    nextTick(() => {
+      if ('picture-group' === props.view.type) {
+        return
+      }
+      getFields(props.view.tableId, props.view.id, props.view.type)
+      const nodeId = view.value['tableId']
+      if (!!nodeId) {
+        cacheId = nodeId as unknown as string
+      }
+      const node = datasetSelector?.value?.getNode(nodeId)
+      if (node?.data) {
+        curDatasetWeight.value = node.data.weight
+      }
+    })
   },
-  { deep: true }
+  { deep: true, immediate: true }
 )
 const getFields = (id, chartId, type) => {
   if (id && chartId) {