From c4d8f43da3a9ead5eb74de4c3f3fe6ae7cae01ae Mon Sep 17 00:00:00 2001
From: ulleo <ulleo.wang@gmail.com>
Date: Fri, 15 Dec 2023 18:13:20 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20AntV=E7=BB=84=E5=90=88=E5=9B=BE?=
 =?UTF-8?q?=E6=A8=AA=E8=BD=B4=E7=BD=91=E6=A0=BC=E7=BA=BF=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E8=99=9A=E7=BA=BF=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/selector/XAxisSelectorAntV.vue | 45 +++++++++++++++++++
 .../view-chartmix-frontend/src/utils/map.js   |  5 +++
 .../src/views/antv/chartmix/index.vue         |  7 ++-
 3 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/selector/XAxisSelectorAntV.vue b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/selector/XAxisSelectorAntV.vue
index 56b459462a..fae55b8ac6 100644
--- a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/selector/XAxisSelectorAntV.vue
+++ b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/selector/XAxisSelectorAntV.vue
@@ -122,6 +122,48 @@
                 @change="changeXAxisStyle('splitLine')"
               />
             </el-form-item>
+
+
+            <el-form-item
+              :label="$t('chart.dash_show')"
+              class="form-item"
+            >
+              <el-checkbox
+                v-model="axisForm.splitLine.enableDash"
+                @change="changeXAxisStyle('splitLine')"
+              >{{ $t('chart.dash_show') }}</el-checkbox>
+            </el-form-item>
+            <template v-if="axisForm.splitLine.enableDash">
+              <el-form-item
+                :label="$t('chart.dash_width')"
+                class="form-item form-item-slider"
+              >
+                <el-slider
+                  v-model="axisForm.splitLine.dashStyle.width"
+                  :min="1"
+                  :max="10"
+                  show-input
+                  :show-input-controls="false"
+                  input-size="mini"
+                  @change="changeXAxisStyle('splitLine')"
+                />
+              </el-form-item>
+              <el-form-item
+                :label="$t('chart.dash_offset')"
+                class="form-item form-item-slider"
+              >
+                <el-slider
+                  v-model="axisForm.splitLine.dashStyle.offset"
+                  :min="1"
+                  :max="10"
+                  show-input
+                  :show-input-controls="false"
+                  input-size="mini"
+                  @change="changeXAxisStyle('splitLine')"
+                />
+              </el-form-item>
+            </template>
+
           </span>
           <el-divider/>
           <el-form-item
@@ -325,6 +367,9 @@ export default {
           if (!this.axisForm.axisLine) {
             this.axisForm.axisLine = JSON.parse(JSON.stringify(DEFAULT_XAXIS_STYLE.axisLine))
           }
+          if (!this.axisForm.splitLine.dashStyle) {
+            this.axisForm.splitLine.dashStyle = JSON.parse(JSON.stringify(DEFAULT_XAXIS_STYLE.splitLine.dashStyle))
+          }
         }
       }
     },
diff --git a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/utils/map.js b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/utils/map.js
index 631be54f0a..bc7880cc59 100644
--- a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/utils/map.js
+++ b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/utils/map.js
@@ -549,6 +549,11 @@ export const DEFAULT_XAXIS_STYLE = {
       color: '#cccccc',
       width: 1,
       style: 'solid'
+    },
+    enableDash: false,
+    dashStyle: {
+      width: 4,
+      offset: 5
     }
   },
   axisValue: {
diff --git a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/views/antv/chartmix/index.vue b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/views/antv/chartmix/index.vue
index 859c8a445b..50bd0d7885 100644
--- a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/views/antv/chartmix/index.vue
+++ b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/views/antv/chartmix/index.vue
@@ -441,11 +441,16 @@ export default {
               },
               spacing: 8
             } : null
+            const gridCfg = a.splitLine ? a.splitLine : DEFAULT_XAXIS_STYLE.splitLine
+            if (!gridCfg.dashStyle) {
+              gridCfg.dashStyle = DEFAULT_XAXIS_STYLE.splitLine.dashStyle
+            }
             const grid = a.splitLine.show ? {
               line: {
                 style: {
                   stroke: a.splitLine.lineStyle.color,
-                  lineWidth: parseInt(a.splitLine.lineStyle.width)
+                  lineWidth: parseInt(a.splitLine.lineStyle.width),
+                  lineDash: gridCfg.enableDash ? [gridCfg.dashStyle.width, gridCfg.dashStyle.offset] : undefined
                 }
               }
             } : null