From 4721c55dc0ba72f5231d48631907b3e1242da06f Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Sun, 9 Oct 2022 14:19:01 +0800
Subject: [PATCH 1/4] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E9=9B=86):=20sql=20?=
 =?UTF-8?q?=E8=A7=A3=E6=9E=90=E6=94=AF=E6=8C=81=20union?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/dataset/DataSetTableService.java  | 25 +++++++++++++++----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
index 457d498e67..5822c8631b 100644
--- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
@@ -1068,8 +1068,23 @@ public class DataSetTableService {
         CCJSqlParserUtil.parse(sql, parser -> parser.withSquareBracketQuotation(true));
         Statement statement = CCJSqlParserUtil.parse(sql);
         Select select = (Select) statement;
-        PlainSelect plainSelect = ((PlainSelect) select.getSelectBody());
-        // 访问from
+
+        if (select.getSelectBody() instanceof PlainSelect) {
+            return handlePlainSelect((PlainSelect) select.getSelectBody(), select, dsType);
+        }else {
+            String result = "";
+            SetOperationList setOperationList = (SetOperationList) select.getSelectBody();
+            for (int i = 0; i < setOperationList.getSelects().size(); i++) {
+                result = result + handlePlainSelect((PlainSelect) setOperationList.getSelects().get(i), null, dsType);
+                if (i < setOperationList.getSelects().size() - 1) {
+                    result = result + " " + setOperationList.getOperations().get(i).toString() + " ";
+                }
+            }
+            return result;
+        }
+    }
+
+    private String handlePlainSelect(PlainSelect plainSelect, Select statementSelect, String dsType) throws Exception {
         FromItem fromItem = plainSelect.getFromItem();
         if (fromItem instanceof SubSelect) {
             SelectBody selectBody = ((SubSelect) fromItem).getSelectBody();
@@ -1086,7 +1101,7 @@ public class DataSetTableService {
         }
         Expression expr = plainSelect.getWhere();
         if (expr == null) {
-            return handleWith(plainSelect, select, dsType);
+            return handleWith(plainSelect, statementSelect, dsType);
         }
         StringBuilder stringBuilder = new StringBuilder();
         BinaryExpression binaryExpression = null;
@@ -1100,12 +1115,12 @@ public class DataSetTableService {
             expr.accept(getExpressionDeParser(stringBuilder));
         }
         plainSelect.setWhere(CCJSqlParserUtil.parseCondExpression(stringBuilder.toString()));
-        return handleWith(plainSelect, select, dsType);
+        return handleWith(plainSelect, statementSelect, dsType);
     }
 
     private String handleWith(PlainSelect plainSelect, Select select, String dsType) throws Exception {
         StringBuilder builder = new StringBuilder();
-        if (CollectionUtils.isNotEmpty(select.getWithItemsList())) {
+        if (select != null && CollectionUtils.isNotEmpty(select.getWithItemsList())) {
             builder.append("WITH");
             builder.append(" ");
             for (Iterator<WithItem> iter = select.getWithItemsList().iterator(); iter.hasNext(); ) {

From 5510b1d732f47f0f81878115b1d707948be73a66 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Sun, 9 Oct 2022 17:43:07 +0800
Subject: [PATCH 2/4] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E5=AF=8C=E6=96=87=E6=9C=AC=E7=BB=84=E4=BB=B6=E5=92=8C=E5=AF=8C?=
 =?UTF-8?q?=E6=96=87=E6=9C=AC=E8=A7=86=E5=9B=BE=E6=94=AF=E6=8C=81=E8=87=AA?=
 =?UTF-8?q?=E9=80=82=E5=BA=94=E7=BC=A9=E6=94=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../canvas/custom-component/DeRichText.vue    |  29 +++-
 .../custom-component/DeRichTextView.vue       | 135 ++++++++++--------
 .../canvas/custom-component/UserView.vue      |   1 +
 3 files changed, 105 insertions(+), 60 deletions(-)

diff --git a/frontend/src/components/canvas/custom-component/DeRichText.vue b/frontend/src/components/canvas/custom-component/DeRichText.vue
index 97798dc30d..ed115ae0c9 100644
--- a/frontend/src/components/canvas/custom-component/DeRichText.vue
+++ b/frontend/src/components/canvas/custom-component/DeRichText.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="rich-main-class" @dblclick="setEdit">
+  <div class="rich-main-class" :style="autoStyle" @dblclick="setEdit">
     <Editor
       v-if="editShow"
       :id="tinymceId"
@@ -39,6 +39,10 @@ export default {
     Editor
   },
   props: {
+    terminal: {
+      type: String,
+      default: 'pc'
+    },
     propValue: {
       type: String,
       require: true
@@ -93,11 +97,31 @@ export default {
     }
   },
   computed: {
+    scale(){
+      return Math.min(this.previewCanvasScale.scalePointWidth, this.previewCanvasScale.scalePointHeight) * this.scaleCoefficient
+    },
     editStatus() {
       return this.editMode === 'edit' && !this.mobileLayoutStatus
     },
+    autoStyle() {
+      return {
+        height: (100 / this.scale) + '%!important',
+        width: (100 / this.scale) + '%!important',
+        left: 50 * (1 - 1 / this.scale) + '%', //放大余量 除以 2
+        top: 50 * (1 - 1 / this.scale) + '%',
+        transform: 'scale(' + this.scale + ')'
+      }
+    },
+    scaleCoefficient() {
+      if (this.terminal === 'pc' && !this.mobileLayoutStatus) {
+        return 1.1
+      } else {
+        return 4.5
+      }
+    },
     ...mapState([
-      'mobileLayoutStatus'
+      'mobileLayoutStatus',
+      'previewCanvasScale'
     ])
   },
   watch: {
@@ -146,6 +170,7 @@ export default {
     width: 100%;
     height: 100%;
     overflow-y: auto!important;
+    position: relative;
   }
   ::-webkit-scrollbar {
     width: 0px!important;
diff --git a/frontend/src/components/canvas/custom-component/DeRichTextView.vue b/frontend/src/components/canvas/custom-component/DeRichTextView.vue
index cdf84b1ad9..61de151790 100644
--- a/frontend/src/components/canvas/custom-component/DeRichTextView.vue
+++ b/frontend/src/components/canvas/custom-component/DeRichTextView.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="rich-main-class" @dblclick="setEdit">
+  <div class="rich-main-class" :style="autoStyle" @dblclick="setEdit">
     <Editor
       v-if="editShow"
       :id="tinymceId"
@@ -41,6 +41,11 @@ export default {
     Editor
   },
   props: {
+    scale: {
+      type: Number,
+      required: false,
+      default: 1
+    },
     element: {
       type: Object
     },
@@ -85,9 +90,9 @@ export default {
         plugins: 'advlist autolink link image lists charmap  media wordcount table contextmenu directionality pagebreak', // 插件
         // 工具栏
         toolbar: 'undo redo |fontselect fontsizeselect |forecolor backcolor bold italic |underline strikethrough link| formatselect |' +
-            'alignleft aligncenter alignright | bullist numlist |' +
-            ' blockquote subscript superscript removeformat | table image media | fullscreen ' +
-            '| bdmap indent2em lineheight formatpainter axupimgs',
+          'alignleft aligncenter alignright | bullist numlist |' +
+          ' blockquote subscript superscript removeformat | table image media | fullscreen ' +
+          '| bdmap indent2em lineheight formatpainter axupimgs',
         toolbar_location: '/',
         font_formats: '微软雅黑=Microsoft YaHei;宋体=SimSun;黑体=SimHei;仿宋=FangSong;华文黑体=STHeiti;华文楷体=STKaiti;华文宋体=STSong;华文仿宋=STFangsong;Andale Mono=andale mono,times;Arial=arial,helvetica,sans-serif;Arial Black=arial black,avant garde;Book Antiqua=book antiqua,palatino;Comic Sans MS=comic sans ms,sans-serif;Courier New=courier new,courier;Georgia=georgia,palatino;Helvetica=helvetica;Impact=impact,chicago;Symbol=symbol;Tahoma=tahoma,arial,helvetica,sans-serif;Terminal=terminal,monaco;Times New Roman=times new roman,times;Trebuchet MS=trebuchet ms,geneva;Verdana=verdana,geneva;Webdings=webdings;Wingdings=wingdings',
         fontsize_formats: '12px 14px 16px 18px 20px 22px 24px 28px 32px 36px 48px 56px 72px', // 字体大小
@@ -102,6 +107,15 @@ export default {
     editStatus() {
       return this.editMode === 'edit' && !this.mobileLayoutStatus
     },
+    autoStyle() {
+      return {
+        height: (100 / this.scale) + '%!important',
+        width: (100 / this.scale) + '%!important',
+        left: 50 * (1 - 1 / this.scale) + '%', //放大余量 除以 2
+        top: 50 * (1 - 1 / this.scale) + '%',
+        transform: 'scale(' + this.scale + ')'
+      }
+    },
     ...mapState([
       'mobileLayoutStatus'
     ])
@@ -121,23 +135,23 @@ export default {
       }
     },
     myValue(newValue) {
-      this.initReady&&this.$store.commit('canvasChange')
+      this.initReady && this.$store.commit('canvasChange')
     }
   },
   mounted() {
-   this.viewInit()
+    this.viewInit()
   },
   beforeDestroy() {
     bus.$off('fieldSelect-' + this.element.propValue.viewId)
   },
   methods: {
-    viewInit(){
+    viewInit() {
       bus.$on('fieldSelect-' + this.element.propValue.viewId, this.fieldSelect)
       tinymce.init({})
       this.myValue = this.assignment(this.element.propValue.textValue)
       bus.$on('initCurFields-' + this.element.id, this.initCurFieldsChange)
-      this.$nextTick(()=>{
-        this.initReady=true
+      this.$nextTick(() => {
+        this.initReady = true
       })
     },
     initCurFieldsChange() {
@@ -154,45 +168,45 @@ export default {
           content = content.replace(itm, _this.dataRowNameSelect[ele] !== undefined ? _this.dataRowNameSelect[ele] : '[无法获取字段值]')
         })
       }
-      content = content.replace('class="base-selected"','')
+      content = content.replace('class="base-selected"', '')
       this.resetSelect()
       return content
     },
     fieldSelect(field) {
       const ed = tinymce.editors[this.tinymceId]
-      const fieldId = 'changeText-'+uuid.v1()
-      const value = '<span id="'+fieldId+'"><span class="mceNonEditable" contenteditable="false" data-mce-content="['+field.name +']">[' + field.name + ']</span></span>'
+      const fieldId = 'changeText-' + uuid.v1()
+      const value = '<span id="' + fieldId + '"><span class="mceNonEditable" contenteditable="false" data-mce-content="[' + field.name + ']">[' + field.name + ']</span></span>'
       const attachValue = '<span id="attachValue">&nbsp;</span>'
       ed.insertContent(value)
       ed.insertContent(attachValue)
     },
     onClick(e) {
-      const edInner = tinymce.get(this.tinymceId);
+      const edInner = tinymce.get(this.tinymceId)
       const node = tinymce.activeEditor.selection.getNode()
       this.resetSelect(node)
     },
-    resetSelect(node){
-      const edInner = tinymce.get(this.tinymceId);
-      if(edInner.dom){
-        const nodeArray = edInner.dom.select(".base-selected")
-        if(nodeArray){
-          nodeArray.forEach(nodeInner=>{
+    resetSelect(node) {
+      const edInner = tinymce.get(this.tinymceId)
+      if (edInner.dom) {
+        const nodeArray = edInner.dom.select('.base-selected')
+        if (nodeArray) {
+          nodeArray.forEach(nodeInner => {
             nodeInner.removeAttribute('class')
           })
         }
-        if(node){
+        if (node) {
           const pNode = node.parentElement
-          if(pNode && pNode.id&& pNode.id.indexOf('changeText')>-1){
-            const innerId = '#'+pNode.id
+          if (pNode && pNode.id && pNode.id.indexOf('changeText') > -1) {
+            const innerId = '#' + pNode.id
             const domTest = edInner.dom.select(innerId)[0]
-            domTest.setAttribute("class",'base-selected')
+            domTest.setAttribute('class', 'base-selected')
             edInner.selection.select(domTest)
           }
         }
       }
     },
     setEdit() {
-      if (this.editStatus&&this.canEdit===false) {
+      if (this.editStatus && this.canEdit === false) {
         this.canEdit = true
         this.element['editing'] = true
         this.myValue = this.element.propValue.textValue
@@ -215,40 +229,45 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-  .rich-main-class {
-    width: 100%;
-    height: 100%;
-    overflow-y: auto!important;
-  }
-  ::-webkit-scrollbar {
-    width: 0px!important;
-    height: 0px!important;
-  }
-  ::v-deep ol {
-    display: block!important;
-    list-style-type: decimal;
-    margin-block-start: 1em!important;
-    margin-block-end: 1em!important;
-    margin-inline-start: 0px!important;
-    margin-inline-end: 0px!important;
-    padding-inline-start: 40px!important;
-  }
-  ::v-deep ul {
-    display: block!important;
-    list-style-type: disc;
-    margin-block-start: 1em!important;
-    margin-block-end: 1em!important;
-    margin-inline-start: 0px!important;
-    margin-inline-end: 0px!important;
-    padding-inline-start: 40px!important;
-  }
-  ::v-deep li {
-    display: list-item!important;
-    text-align: -webkit-match-parent!important;
-  }
+.rich-main-class {
+  width: 100%;
+  height: 100%;
+  overflow-y: auto !important;
+  position: relative;
+}
 
-  ::v-deep .base-selected{
-   background-color: #b4d7ff
-  }
+::-webkit-scrollbar {
+  width: 0px !important;
+  height: 0px !important;
+}
+
+::v-deep ol {
+  display: block !important;
+  list-style-type: decimal;
+  margin-block-start: 1em !important;
+  margin-block-end: 1em !important;
+  margin-inline-start: 0px !important;
+  margin-inline-end: 0px !important;
+  padding-inline-start: 40px !important;
+}
+
+::v-deep ul {
+  display: block !important;
+  list-style-type: disc;
+  margin-block-start: 1em !important;
+  margin-block-end: 1em !important;
+  margin-inline-start: 0px !important;
+  margin-inline-end: 0px !important;
+  padding-inline-start: 40px !important;
+}
+
+::v-deep li {
+  display: list-item !important;
+  text-align: -webkit-match-parent !important;
+}
+
+::v-deep .base-selected {
+  background-color: #b4d7ff
+}
 </style>
 
diff --git a/frontend/src/components/canvas/custom-component/UserView.vue b/frontend/src/components/canvas/custom-component/UserView.vue
index 6b19314033..1a1fe4287a 100644
--- a/frontend/src/components/canvas/custom-component/UserView.vue
+++ b/frontend/src/components/canvas/custom-component/UserView.vue
@@ -45,6 +45,7 @@
     <de-rich-text-view
       v-else-if="richTextViewShowFlag"
       :ref="element.propValue.id"
+      :scale="scale"
       :element="element"
       :prop-value="element.propValue.textValue"
       :active="active"

From c467e26e2a91d0dd794e8299133fef6424fae3d7 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Mon, 10 Oct 2022 16:02:48 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E9=9B=86):=20?=
 =?UTF-8?q?=E6=8A=BD=E5=8F=96=E6=95=B0=E6=8D=AE=E6=97=B6=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=B1=BB=E5=9E=8B=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/dataease/provider/query/mysql/MysqlQueryProvider.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java
index 9eb8a81cdd..a93217138c 100644
--- a/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java
+++ b/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java
@@ -781,7 +781,7 @@ public class MysqlQueryProvider extends QueryProvider {
             StringBuilder stringBuilder = new StringBuilder();
             if (f.getDeExtractType() == 4) { // 处理 tinyint
                 stringBuilder.append("concat(`").append(f.getOriginName()).append("`,'') AS ").append(f.getDataeaseName());
-            } if (f.getDeExtractType() == 1 && f.getType().equalsIgnoreCase("YEAR")) { // 处理 YEAR
+            } else if (f.getDeExtractType() == 1 && f.getType().equalsIgnoreCase("YEAR")) { // 处理 YEAR
                 stringBuilder.append("").append(String.format(MySQLConstants.DATE_FORMAT, "CONCAT(" + f.getOriginName() + ",'-01-01')", MySQLConstants.DEFAULT_DATE_FORMAT)).append(" AS ").append(f.getDataeaseName());
             } else {
                 stringBuilder.append("`").append(f.getOriginName()).append("` AS ").append(f.getDataeaseName());

From 62fbacf4e3069ece1dff6d35f1a6af07ccc2fc96 Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Tue, 11 Oct 2022 10:18:21 +0800
Subject: [PATCH 4/4] =?UTF-8?q?refactor(=E8=A7=86=E5=9B=BE):=20=E8=BE=85?=
 =?UTF-8?q?=E5=8A=A9=E7=BA=BF=E6=95=B0=E5=80=BC=E6=A0=BC=E5=BC=8F=E5=8C=96?=
 =?UTF-8?q?=E8=B7=9F=E9=9A=8Fy=E8=BD=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/chart/chart/common/common.js    | 15 +++++++++-----
 .../views/chart/chart/common/common_antv.js   | 20 +++++++++++++------
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/frontend/src/views/chart/chart/common/common.js b/frontend/src/views/chart/chart/common/common.js
index c5ce49d975..1d543e5167 100644
--- a/frontend/src/views/chart/chart/common/common.js
+++ b/frontend/src/views/chart/chart/common/common.js
@@ -1,5 +1,5 @@
 import { hexColorToRGBA } from '@/views/chart/chart/util'
-import { DEFAULT_YAXIS_EXT_STYLE } from '@/views/chart/chart/chart'
+import { DEFAULT_XAXIS_STYLE, DEFAULT_YAXIS_EXT_STYLE, DEFAULT_YAXIS_STYLE } from '@/views/chart/chart/chart'
 import { formatterItem, valueFormatter } from '@/views/chart/chart/formatter'
 
 let xAxisLabelFormatter = null
@@ -260,7 +260,6 @@ export function seniorCfg(chart_option, chart) {
           }
           const rgba = hexToRgba(senior.functionCfg.sliderFillBg, 0.2)
           chart_option.dataZoom[1].fillerColor = rgba
-          
         }
         if (senior.functionCfg.sliderTextClolor) {
           chart_option.dataZoom[1].textStyle = { color: senior.functionCfg.sliderTextClolor }
@@ -285,12 +284,18 @@ export function seniorCfg(chart_option, chart) {
     if (senior.assistLine && senior.assistLine.length > 0) {
       if (chart_option.series && chart_option.series.length > 0) {
         const customStyle = JSON.parse(chart.customStyle)
-        let xAxis, yAxis
+        let xAxis, yAxis, axisFormatterCfg
         if (customStyle.xAxis) {
           xAxis = JSON.parse(JSON.stringify(customStyle.xAxis))
+          if (chart.type.includes('horizontal')) {
+            axisFormatterCfg = xAxis.axisLabelFormatter ? xAxis.axisLabelFormatter : DEFAULT_XAXIS_STYLE.axisLabelFormatter
+          }
         }
         if (customStyle.yAxis) {
           yAxis = JSON.parse(JSON.stringify(customStyle.yAxis))
+          if (!chart.type.includes('horizontal')) {
+            axisFormatterCfg = yAxis.axisLabelFormatter ? yAxis.axisLabelFormatter : DEFAULT_YAXIS_STYLE.axisLabelFormatter
+          }
         }
 
         const fixedLines = senior.assistLine.filter(ele => ele.field === '0')
@@ -313,7 +318,7 @@ export function seniorCfg(chart_option, chart) {
                 fontSize: 10,
                 position: xAxis.position === 'bottom' ? 'insideStartTop' : 'insideEndTop',
                 formatter: function(param) {
-                  return ele.name + ' : ' + param.value
+                  return ele.name + ' : ' + valueFormatter(param.value, axisFormatterCfg)
                 }
               },
               tooltip: {
@@ -335,7 +340,7 @@ export function seniorCfg(chart_option, chart) {
                 fontSize: 10,
                 position: yAxis.position === 'left' ? 'insideStartTop' : 'insideEndTop',
                 formatter: function(param) {
-                  return ele.name + ' : ' + param.value
+                  return ele.name + ' : ' + valueFormatter(param.value, axisFormatterCfg)
                 }
               },
               tooltip: {
diff --git a/frontend/src/views/chart/chart/common/common_antv.js b/frontend/src/views/chart/chart/common/common_antv.js
index 33bf02c0fe..26e75469b0 100644
--- a/frontend/src/views/chart/chart/common/common_antv.js
+++ b/frontend/src/views/chart/chart/common/common_antv.js
@@ -1,5 +1,6 @@
 import { hexColorToRGBA } from '@/views/chart/chart/util'
 import { formatterItem, valueFormatter } from '@/views/chart/chart/formatter'
+import { DEFAULT_XAXIS_STYLE, DEFAULT_YAXIS_STYLE } from '@/views/chart/chart/chart'
 
 export function getPadding(chart) {
   if (chart.drill) {
@@ -703,14 +704,20 @@ export function getAnalyse(chart) {
     senior = JSON.parse(chart.senior)
     if (senior.assistLine && senior.assistLine.length > 0) {
       const customStyle = JSON.parse(chart.customStyle)
-      let xAxisPosition, yAxisPosition
+      let xAxisPosition, yAxisPosition, axisFormatterCfg
       if (customStyle.xAxis) {
         const a = JSON.parse(JSON.stringify(customStyle.xAxis))
         xAxisPosition = transAxisPosition(chart, a)
+        if (chart.type.includes('horizontal')) {
+          axisFormatterCfg = a.axisLabelFormatter ? a.axisLabelFormatter : DEFAULT_XAXIS_STYLE.axisLabelFormatter
+        }
       }
       if (customStyle.yAxis) {
         const a = JSON.parse(JSON.stringify(customStyle.yAxis))
         yAxisPosition = transAxisPosition(chart, a)
+        if (!chart.type.includes('horizontal')) {
+          axisFormatterCfg = a.axisLabelFormatter ? a.axisLabelFormatter : DEFAULT_YAXIS_STYLE.axisLabelFormatter
+        }
       }
 
       const fixedLines = senior.assistLine.filter(ele => ele.field === '0')
@@ -718,11 +725,12 @@ export function getAnalyse(chart) {
       const lines = fixedLines.concat(dynamicLines)
 
       lines.forEach(ele => {
-        const content = ele.name + ' : ' + parseFloat(ele.value)
+        const value = parseFloat(ele.value)
+        const content = ele.name + ' : ' + valueFormatter(value, axisFormatterCfg)
         assistLine.push({
           type: 'line',
-          start: ['start', parseFloat(ele.value)],
-          end: ['end', parseFloat(ele.value)],
+          start: ['start', value],
+          end: ['end', value],
           style: {
             stroke: ele.color,
             lineDash: getLineDash(ele.lineType)
@@ -731,7 +739,7 @@ export function getAnalyse(chart) {
         if (!chart.type.includes('horizontal')) {
           assistLine.push({
             type: 'text',
-            position: [yAxisPosition === 'left' ? 'start' : 'end', parseFloat(ele.value)],
+            position: [yAxisPosition === 'left' ? 'start' : 'end', value],
             content: content,
             offsetY: -2,
             offsetX: yAxisPosition === 'left' ? 2 : -10 * (content.length - 2),
@@ -744,7 +752,7 @@ export function getAnalyse(chart) {
         } else {
           assistLine.push({
             type: 'text',
-            position: [xAxisPosition === 'left' ? 'start' : 'end', parseFloat(ele.value)],
+            position: [xAxisPosition === 'left' ? 'start' : 'end', value],
             content: content,
             offsetY: xAxisPosition === 'left' ? -2 : -10 * (content.length - 2),
             offsetX: 2,