From 7292d1ceacba7682f9f7a2ffc7c104e9b436c5a3 Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Wed, 10 May 2023 12:09:51 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E9=80=8F=E8=A7=86=E8=A1=A8=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E8=A1=8C=E7=BB=B4=E5=BA=A6=E5=AD=97=E6=AE=B5=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E5=90=8C=E7=8E=AF=E6=AF=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chart/components/compare/CompareEdit.vue      | 14 ++++++++++++++
 .../views/chart/components/dragItem/QuotaItem.vue | 15 +++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/frontend/src/views/chart/components/compare/CompareEdit.vue b/frontend/src/views/chart/components/compare/CompareEdit.vue
index 81966e5faf..c0e60093c4 100644
--- a/frontend/src/views/chart/components/compare/CompareEdit.vue
+++ b/frontend/src/views/chart/components/compare/CompareEdit.vue
@@ -56,6 +56,7 @@
 
 <script>
 import { compareDayList, compareMonthList, compareYearList } from '@/views/chart/chart/compare'
+import { SUPPORT_Y_M } from '@/views/chart/chart/chart'
 
 export default {
   name: 'CompareEdit',
@@ -95,6 +96,19 @@ export default {
         xAxis = JSON.parse(this.chart.xaxis)
       }
       const t1 = xAxis.filter(ele => { return ele.deType === 1 })
+
+      if (this.chart.type === 'table-pivot') {
+        let xAxisExt = null
+        if (Object.prototype.toString.call(this.chart.xaxisExt) === '[object Array]') {
+          xAxisExt = JSON.parse(JSON.stringify(this.chart.xaxisExt))
+        } else {
+          xAxisExt = JSON.parse(this.chart.xaxisExt)
+        }
+        const t2 = xAxisExt.filter(ele => { return ele.deType === 1 })
+
+        t1.push(...t2)
+      }
+
       this.fieldList = t1
       // 如果没有选中字段，则默认选中第一个
       if ((!this.compareItem.compareCalc.field || this.compareItem.compareCalc.field === '') && this.fieldList.length > 0) {
diff --git a/frontend/src/views/chart/components/dragItem/QuotaItem.vue b/frontend/src/views/chart/components/dragItem/QuotaItem.vue
index 3145bd92e3..3866646186 100644
--- a/frontend/src/views/chart/components/dragItem/QuotaItem.vue
+++ b/frontend/src/views/chart/components/dragItem/QuotaItem.vue
@@ -324,6 +324,21 @@ export default {
       const t1 = xAxis.filter(ele => {
         return ele.deType === 1 && SUPPORT_Y_M.includes(ele.dateStyle)
       })
+
+      if (this.chart.type === 'table-pivot') {
+        let xAxisExt = null
+        if (Object.prototype.toString.call(this.chart.xaxisExt) === '[object Array]') {
+          xAxisExt = JSON.parse(JSON.stringify(this.chart.xaxisExt))
+        } else {
+          xAxisExt = JSON.parse(this.chart.xaxisExt)
+        }
+        const t2 = xAxisExt.filter(ele => {
+          return ele.deType === 1 && SUPPORT_Y_M.includes(ele.dateStyle)
+        })
+
+        t1.push(...t2)
+      }
+
       // 暂时只支持类别轴/维度的时间类型字段
       if (t1.length > 0 && this.chart.type !== 'text' && this.chart.type !== 'label' && this.chart.type !== 'gauge' && this.chart.type !== 'liquid') {
         this.disableEditCompare = false