From 4a25debcbb1e7e3648d9483f4cbfe0ab883e8441 Mon Sep 17 00:00:00 2001
From: wisonic-s <shaochuan.wu@fit2cloud.com>
Date: Wed, 24 May 2023 18:12:49 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E8=A7=86=E5=9B=BE-=E5=AF=B9=E7=A7=B0?=
 =?UTF-8?q?=E6=9D=A1=E5=BD=A2=E5=9B=BE):=20=E4=BF=AE=E5=A4=8D=E5=AF=B9?=
 =?UTF-8?q?=E7=A7=B0=E6=9D=A1=E5=BD=A2=E5=9B=BE=E7=B1=BB=E5=88=AB=E8=BD=B4?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B=E4=B8=BA=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E6=97=B6=E6=8E=92=E5=BA=8F=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://www.tapd.cn/55578866/bugtrace/bugs/view/1155578866001026505
---
 frontend/src/views/chart/chart/bar/bar_antv.js  |  8 +++++++-
 .../src/views/chart/chart/common/common_antv.js | 17 +++++++++++++++++
 frontend/src/views/chart/chart/util.js          |  1 -
 frontend/src/views/chart/view/ChartEdit.vue     | 14 ++++++++------
 4 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/frontend/src/views/chart/chart/bar/bar_antv.js b/frontend/src/views/chart/chart/bar/bar_antv.js
index e5fdeeddf6..3305a64e0e 100644
--- a/frontend/src/views/chart/chart/bar/bar_antv.js
+++ b/frontend/src/views/chart/chart/bar/bar_antv.js
@@ -9,7 +9,8 @@ import {
   getPadding,
   getSlider,
   getAnalyse,
-  setGradientColor
+  setGradientColor,
+  getMeta
 } from '@/views/chart/chart/common/common_antv'
 import { antVCustomColor, handleEmptyDataStrategy } from '@/views/chart/chart/util'
 import _ from 'lodash'
@@ -319,6 +320,11 @@ export function baseBidirectionalBarOptionAntV(plot, container, chart, action, i
     handleEmptyDataStrategy(emptyDataStrategy, chart, data, options)
   }
 
+  // meta，处理类别轴数据类型为时间时排序失效
+  const meta = getMeta(chart)
+  if (meta) {
+    options.meta = meta
+  }
   // 开始渲染
   if (plot) {
     plot.destroy()
diff --git a/frontend/src/views/chart/chart/common/common_antv.js b/frontend/src/views/chart/chart/common/common_antv.js
index b8f34903dc..243971e98c 100644
--- a/frontend/src/views/chart/chart/common/common_antv.js
+++ b/frontend/src/views/chart/chart/common/common_antv.js
@@ -966,3 +966,20 @@ export function setGradientColor(rawColor, show = false, angle = 0) {
   item.splice(3, 1, '0.3)')
   return show ? `l(${angle}) 0:${item.join(',')} 1:${rawColor}` : rawColor
 }
+
+export function getMeta(chart) {
+  let meta
+  if (chart.type === 'bidirectional-bar') {
+    const xAxis = JSON.parse(chart.xaxis)
+    if (xAxis?.length === 1 && xAxis[0].deType === 1) {
+      const values = chart.data.data.map(item => item.field)
+      meta = {
+        field: {
+          type: 'cat',
+          values: values.reverse()
+        }
+      }
+    }
+  }
+  return meta
+}
diff --git a/frontend/src/views/chart/chart/util.js b/frontend/src/views/chart/chart/util.js
index 08324858de..dfd14592a0 100644
--- a/frontend/src/views/chart/chart/util.js
+++ b/frontend/src/views/chart/chart/util.js
@@ -1582,7 +1582,6 @@ export const TYPE_CONFIGS = [
       'x-axis-selector-ant-v': [
         'show',
         'position',
-        'name',
         'nameTextStyle',
         'splitLine',
         'axisForm',
diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue
index 96ce9b2d6c..fcc9ba3828 100644
--- a/frontend/src/views/chart/view/ChartEdit.vue
+++ b/frontend/src/views/chart/view/ChartEdit.vue
@@ -983,12 +983,7 @@
                       </div>
                     </el-row>
                     <el-row
-                      v-if="view.type
-                        && !(view.type.includes('table') && view.render === 'echarts')
-                        && !view.type.includes('text') && !view.type.includes('gauge')
-                        && view.type !== 'liquid' && view.type !== 'word-cloud'
-                        && view.type !== 'table-pivot' && view.type !=='label'
-                        && view.type !=='richTextView' && view.type !== 'flow-map'"
+                      v-if="showDrill"
                       class="padding-lr"
                       style="margin-top: 6px;"
                     >
@@ -1990,6 +1985,13 @@ export default {
         equalsAny(this.view.type, 'text', 'label') ||
         (this.view.render === 'antv' && this.view.type.includes('table'))
     },
+    showDrill() {
+      return this.view.type &&
+        !(this.view.type.includes('table') && this.view.render === 'echarts') &&
+        !includesAny(this.view.type, 'text', 'gauge') &&
+        !equalsAny(this.view.type, 'liquid', 'bidirectional-bar',
+          'word-cloud', 'table-pivot', 'label', 'richTextView', 'flow-map')
+    },
     ...mapState([
       'curComponent',
       'panelViewEditInfo',