From 40ce299ddb8f3d5fd1cf5b4cc6caa54455989cb1 Mon Sep 17 00:00:00 2001
From: wisonic-s <shaochuan.wu@fit2cloud.com>
Date: Wed, 6 Sep 2023 15:14:21 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=86=E7=BB=84=E5=A0=86=E5=8F=A0?=
 =?UTF-8?q?=E6=9F=B1=E7=8A=B6=E5=9B=BE=E6=97=A5=E6=9C=9F=E5=A0=86=E5=8F=A0?=
 =?UTF-8?q?=E9=A1=B9=E6=94=AF=E6=8C=81=E5=B9=B4=E5=AD=A3=E5=BA=A6=E5=92=8C?=
 =?UTF-8?q?=E5=B9=B4=E5=91=A8#5290?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/dragItem/ChartDragItem.vue     | 20 +++++++++++++++++++
 .../components/dragItem/DimensionExtItem.vue  |  2 +-
 .../src/views/chart/view/ChartEdit.vue        |  1 +
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/core/frontend/src/views/chart/components/dragItem/ChartDragItem.vue b/core/frontend/src/views/chart/components/dragItem/ChartDragItem.vue
index 5d1c960a7f..340012a466 100644
--- a/core/frontend/src/views/chart/components/dragItem/ChartDragItem.vue
+++ b/core/frontend/src/views/chart/components/dragItem/ChartDragItem.vue
@@ -134,7 +134,15 @@
               </span>
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item :command="beforeDateStyle('y')">{{ $t('chart.y') }}</el-dropdown-item>
+                <el-dropdown-item
+                  v-if="showDateExt"
+                  :command="beforeDateStyle('y_Q')"
+                >{{ $t('chart.y_Q') }}</el-dropdown-item>
                 <el-dropdown-item :command="beforeDateStyle('y_M')">{{ $t('chart.y_M') }}</el-dropdown-item>
+                <el-dropdown-item
+                  v-if="showDateExt"
+                  :command="beforeDateStyle('y_W')"
+                >{{ $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 :command="beforeDateStyle('H_m_s')">{{ $t('chart.H_m_s') }}</el-dropdown-item>
                 <el-dropdown-item :command="beforeDateStyle('y_M_d_H_m')">{{ $t('chart.y_M_d_H_m') }}</el-dropdown-item>
@@ -223,6 +231,10 @@ export default {
       type: Object,
       required: true
     },
+    chart: {
+      type: Object,
+      required: true
+    },
     index: {
       type: Number,
       required: true
@@ -245,6 +257,14 @@ export default {
       tagType: 'success'
     }
   },
+  computed: {
+    showDateExt() {
+      return this.chart.datasourceType === 'mysql' ||
+        this.chart.datasourceType === 'ds_doris' ||
+        this.chart.datasourceType === 'StarRocks' ||
+        this.chart.datasetMode === 1
+    }
+  },
   watch: {
     dimensionData: function() {
       this.getItemTagType()
diff --git a/core/frontend/src/views/chart/components/dragItem/DimensionExtItem.vue b/core/frontend/src/views/chart/components/dragItem/DimensionExtItem.vue
index 725fc20731..fca25c18d9 100644
--- a/core/frontend/src/views/chart/components/dragItem/DimensionExtItem.vue
+++ b/core/frontend/src/views/chart/components/dragItem/DimensionExtItem.vue
@@ -298,7 +298,7 @@ export default {
     },
     getDateExtStatus() {
       if (this.chart) {
-        this.showDateExt = this.showDateExt = this.chart.datasourceType === 'mysql' ||
+        this.showDateExt = this.chart.datasourceType === 'mysql' ||
           this.chart.datasourceType === 'ds_doris' ||
           this.chart.datasourceType === 'StarRocks' ||
           this.chart.datasetMode === 1
diff --git a/core/frontend/src/views/chart/view/ChartEdit.vue b/core/frontend/src/views/chart/view/ChartEdit.vue
index 82290a5b1c..de2445b799 100644
--- a/core/frontend/src/views/chart/view/ChartEdit.vue
+++ b/core/frontend/src/views/chart/view/ChartEdit.vue
@@ -863,6 +863,7 @@
                             :param="param"
                             :index="index"
                             :item="item"
+                            :chart="chart"
                             :dimension-data="dimension"
                             :quota-data="quota"
                             @onItemChange="stackItemChange"