From 8699bd544645fafb4e0d094cdc9d8ce6841a29b4 Mon Sep 17 00:00:00 2001
From: jingna <1264204245@qq.com>
Date: Wed, 30 Jul 2025 09:09:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=A0=E6=AF=94=E5=9B=BE=E9=97=B4=E8=B7=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../visualization/DePreviewPopDialog.vue         |  1 -
 .../src/custom-component/de-tree/Component.vue   | 14 +++++++++++++-
 .../src/views/chart/components/editor/index.vue  |  3 +--
 .../components/js/panel/charts/others/DeTree.ts  | 11 ++---------
 .../components/js/panel/charts/pie/proportion.ts | 16 ++++------------
 .../src/views/chart/components/views/index.vue   |  3 +++
 6 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/core/core-frontend/src/components/visualization/DePreviewPopDialog.vue b/core/core-frontend/src/components/visualization/DePreviewPopDialog.vue
index 41b9ac5..17ef9b7 100644
--- a/core/core-frontend/src/components/visualization/DePreviewPopDialog.vue
+++ b/core/core-frontend/src/components/visualization/DePreviewPopDialog.vue
@@ -88,7 +88,6 @@ defineExpose({
   previewInit
 })
 onMounted(()=>{
-  console.log(state,999,'DePreviewPopDialog mounted')
   
 })
 </script>
diff --git a/core/core-frontend/src/custom-component/de-tree/Component.vue b/core/core-frontend/src/custom-component/de-tree/Component.vue
index e7f64dd..da4869c 100644
--- a/core/core-frontend/src/custom-component/de-tree/Component.vue
+++ b/core/core-frontend/src/custom-component/de-tree/Component.vue
@@ -41,6 +41,7 @@
   import { imgUrlTrans } from '@/utils/imgUtils'
   import Board from '@/components/de-board/Board.vue'
   import ChartCarouselTooltip from '@/views/chart/components/js/g2plot_tooltip_carousel'
+  import { getData } from '@/api/chart'
   const dvMainStore = dvMainStoreWithOut()
   const snapshotStore = snapshotStoreWithOut()
   const { tabMoveInActiveId, bashMatrixInfo, editMode, mobileInPc } = storeToRefs(dvMainStore)
@@ -57,6 +58,9 @@
   element: {
     type: Object
   },
+  view: {
+    type: Object,
+  },
   editMode: {
     type: String,
     require: false,
@@ -594,6 +598,8 @@
 //   }
   
   onMounted(() => {
+    console.log(props.view)
+    initview()
     // if (element.value.propValue.length > 0) {
     //   editableTabsValue.value = element.value.propValue[0].name
     // }
@@ -612,7 +618,12 @@
     //   viewToolTipsChange()
     // }, 1000)
   })
-  
+  function initview(){
+    debugger
+    getData(props.view).then(res => {
+      console.log(res,378923749234)
+    })
+  }
   // onBeforeUnmount(() => {
   //   if (['canvas', 'canvasDataV', 'edit'].includes(showPosition.value) && !mobileInPc.value) {
   //     eventBus.off('onTabMoveIn-' + element.value.id, componentMoveIn)
@@ -626,6 +637,7 @@
   //     carouselTimer = null
   //   }
   // })
+
   </script>
   <style lang="less" scoped>
   .title-hidde-tab {
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 e335abb..9bd270c 100644
--- a/core/core-frontend/src/views/chart/components/editor/index.vue
+++ b/core/core-frontend/src/views/chart/components/editor/index.vue
@@ -954,6 +954,7 @@ const onAxisChange = (e, axis: AxisType) => {
 }
 
 const calcData = (view, resetDrill = false, updateQuery = '') => {
+  debugger
   if (
     view.refreshTime === '' ||
     parseFloat(view.refreshTime).toString() === 'NaN' ||
@@ -999,8 +1000,6 @@ const changestatus = () => {
       item.status = false
     }
   })
-  console.log(mapServer.value)
-  console.log(mapSelect.value)
   // mapSelect.value = mapServer.value.find(server => server.status === true);
 }
 const updatamap = () => {
diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/others/DeTree.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/others/DeTree.ts
index 29e84ae..450aae2 100644
--- a/core/core-frontend/src/views/chart/components/js/panel/charts/others/DeTree.ts
+++ b/core/core-frontend/src/views/chart/components/js/panel/charts/others/DeTree.ts
@@ -18,17 +18,10 @@ export class RichTextChartView extends AbstractChartView {
     threshold: ['tableThreshold'],
     'function-cfg': ['emptyDataStrategy']
   }
-  axis: AxisType[] = ['xAxis', 'yAxis', 'filter']
+  axis: AxisType[] = ['xAxis', 'filter']
   axisConfig: AxisConfig = {
     xAxis: {
-      name: `${t('chart.dimension')}`,
-      type: 'd',
-      allowEmpty: true
-    },
-    yAxis: {
-      name: `${t('chart.quota')}`,
-      type: 'q',
-      allowEmpty: true
+      name: `${t('chart.drag_block_table_data_column')} / ${t('chart.dimension_or_quota')}`
     }
   }
   constructor() {
diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/pie/proportion.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/pie/proportion.ts
index e5152d1..5ca3c63 100644
--- a/core/core-frontend/src/views/chart/components/js/panel/charts/pie/proportion.ts
+++ b/core/core-frontend/src/views/chart/components/js/panel/charts/pie/proportion.ts
@@ -93,7 +93,9 @@ export class G2Pie extends G2ChartView {
     }
     const g2 = new Chart({
       container,
-      autoFit: true
+      autoFit: true,
+      padding:0,
+      appendPadding:0
     })
     g2.coordinate('theta', {
       radius: customAttr.basicStyle.radius / 100,
@@ -122,20 +124,10 @@ export class G2Pie extends G2ChartView {
     }
     g2.facet('rect', {
       fields: ['name'],
-      padding: 20,
+      padding: 0,
       showTitle: false,
       eachView: (view, facet) => {
         const data:any = facet.data
-        // let color
-        // if(customAttr.basicStyle.seriesColor.length>0){
-        //   customAttr.basicStyle.seriesColor.forEach((item) => {
-        //     if(data.name == item.name){
-        //       color = item.color
-        //     }
-        //   })
-        // }else{
-        //   color = colorList[0]
-        // }
         data.push({ name: '其他', value: 100 - data[0].value })
         view.data(data)
         view.coordinate('theta', {
diff --git a/core/core-frontend/src/views/chart/components/views/index.vue b/core/core-frontend/src/views/chart/components/views/index.vue
index c934de1..261540b 100644
--- a/core/core-frontend/src/views/chart/components/views/index.vue
+++ b/core/core-frontend/src/views/chart/components/views/index.vue
@@ -577,6 +577,7 @@ const queryData = (firstLoad = false) => {
 }
 
 const calcData = params => {
+  debugger
   dvMainStore.setLastViewRequestInfo(params.id, params.chartExtRequest)
   if (chartComponent?.value) {
     if (['DeTree'].includes(view.value.type)) {
@@ -595,6 +596,7 @@ const calcData = params => {
         ]
       })
     } else {
+      console.log(chartComponent,'23213')
       chartComponent?.value?.calcData?.(params, () => {
         loading.value = false
       })
@@ -1210,6 +1212,7 @@ const clearG2Tooltip = () => {
       />
       <de-tree-view
         v-else-if="showChartView(ChartLibraryType.DETREE)"
+        :view="view"
         :scale="scale"
         :themes="canvasStyleData.dashboard.themeColor"
         ref="chartComponent"