From c6d31241a628b61122cc57c99899e9c2a8c4e4a1 Mon Sep 17 00:00:00 2001
From: ulleo <ulleo.wang@gmail.com>
Date: Thu, 14 Dec 2023 12:04:11 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20AntV=E6=97=B6=E9=97=B4=E6=9D=A1?=
 =?UTF-8?q?=E5=BD=A2=E5=9B=BE=20=E6=97=B6=E9=97=B4=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/dragItem/DimensionExtItem.vue     | 16 ++++++++++++++--
 core/frontend/src/views/chart/view/ChartEdit.vue | 12 +++++++++++-
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/core/frontend/src/views/chart/components/dragItem/DimensionExtItem.vue b/core/frontend/src/views/chart/components/dragItem/DimensionExtItem.vue
index 1a00946fe6..5cd9903258 100644
--- a/core/frontend/src/views/chart/components/dragItem/DimensionExtItem.vue
+++ b/core/frontend/src/views/chart/components/dragItem/DimensionExtItem.vue
@@ -119,11 +119,18 @@
                 >{{ $t('chart.y_W') }}</el-dropdown-item>
                 <el-dropdown-item :command="beforeDateStyle('y_M_d')">{{ $t('chart.y_M_d') }}</el-dropdown-item>
                 <el-dropdown-item
+                  v-if="!hideSpecial"
                   :command="beforeDateStyle('H_m_s')"
                   divided
                 >{{ $t('chart.H_m_s') }}</el-dropdown-item>
-                <el-dropdown-item :command="beforeDateStyle('y_M_d_H')">{{ $t('chart.y_M_d_H') }}</el-dropdown-item>
-                <el-dropdown-item :command="beforeDateStyle('y_M_d_H_m')">{{ $t('chart.y_M_d_H_m') }}</el-dropdown-item>
+                <el-dropdown-item
+                  v-if="!hideSpecial"
+                  :command="beforeDateStyle('y_M_d_H')"
+                >{{ $t('chart.y_M_d_H') }}</el-dropdown-item>
+                <el-dropdown-item
+                  :command="beforeDateStyle('y_M_d_H_m')"
+                  :divided="hideSpecial"
+                >{{ $t('chart.y_M_d_H_m') }}</el-dropdown-item>
                 <el-dropdown-item :command="beforeDateStyle('y_M_d_H_m_s')">{{ $t('chart.y_M_d_H_m_s') }}</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
@@ -210,6 +217,11 @@ export default {
       showDateExt: false
     }
   },
+  computed: {
+    hideSpecial() {
+      return this.chart.type === 'bar-time-range'
+    }
+  },
   watch: {
     dimensionData: function() {
       this.getItemTagType()
diff --git a/core/frontend/src/views/chart/view/ChartEdit.vue b/core/frontend/src/views/chart/view/ChartEdit.vue
index 6189126090..8e219fff94 100644
--- a/core/frontend/src/views/chart/view/ChartEdit.vue
+++ b/core/frontend/src/views/chart/view/ChartEdit.vue
@@ -746,7 +746,7 @@
                             :dimension-data="dimension"
                             :quota-data="quota"
                             :chart="chart"
-                            @onDimensionItemChange="dimensionItemChange"
+                            @onDimensionItemChange="dimensionExtItemChange"
                             @onDimensionItemRemove="dimensionItemRemove"
                             @editItemFilter="showDimensionEditFilter"
                             @onNameEdit="showRename"
@@ -2853,6 +2853,16 @@ export default {
       this.calcData(true)
     },
 
+    dimensionExtItemChange(item) {
+      if (this.view.type === 'bar-time-range') {
+        this.view.xaxisExt.forEach(ext => {
+          ext.dateStyle = item.dateStyle
+          ext.datePattern = item.datePattern
+        })
+      }
+      this.calcData(true)
+    },
+
     dimensionItemRemove(item) {
       if (item.removeType === 'dimension') {
         this.view.xaxis.splice(item.index, 1)