From 5f5c5c339a8148ecbd727bfe55d9e7004c448151 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 30 Oct 2023 19:38:20 +0800
Subject: [PATCH 1/5] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A2=84=E8=A7=88=E6=A8=A1=E5=9D=97=E8=87=AA?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E7=BB=84=E4=BB=B6Picture=E7=9A=84=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87src?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/canvas/customComponent/Picture.vue    | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/core/frontend/src/components/canvas/customComponent/Picture.vue b/core/frontend/src/components/canvas/customComponent/Picture.vue
index 44e3ceac8e..e1c7255777 100644
--- a/core/frontend/src/components/canvas/customComponent/Picture.vue
+++ b/core/frontend/src/components/canvas/customComponent/Picture.vue
@@ -3,7 +3,7 @@
     <img
       v-if="!showLink"
       :style="imageAdapter"
-      :src="element.propValue"
+      :src="imgUrl"
     >
     <a
       v-if="showLink"
@@ -13,13 +13,15 @@
     >
       <img
         :style="imageAdapter"
-        :src="element.propValue"
+        :src="imgUrl"
       >
     </a>
   </div>
 </template>
 
 <script>
+import { imgUrlTrans } from '@/components/canvas/utils/utils'
+
 export default {
   props: {
     element: {
@@ -33,6 +35,9 @@ export default {
     }
   },
   computed: {
+    imgUrl() {
+      return imgUrlTrans(this.element.propValue)
+    },
     showLink() {
       return this.editMode === 'preview' && this.element && this.element.hyperlinks && this.element.hyperlinks.enable
     },

From 77e66e84619e957ffe86b1d612c19d53d45e7c48 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Wed, 1 Nov 2023 17:00:49 +0800
Subject: [PATCH 2/5] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=AA=E8=A1=A8=E6=9D=BF=E5=BF=AB=E6=8D=B7?=
 =?UTF-8?q?=E9=94=AE=E7=9B=B8=E5=BA=94=E5=8C=BA=E5=9F=9F=EF=BC=8C=E9=81=BF?=
 =?UTF-8?q?=E5=85=8D=E5=BC=B9=E6=A1=86=E4=B8=AD=E7=9A=84=E5=BF=AB=E6=8D=B7?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E5=BD=B1=E5=93=8D=E4=BB=AA=E8=A1=A8=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/canvas/utils/shortcutKey.js    | 24 ++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/core/frontend/src/components/canvas/utils/shortcutKey.js b/core/frontend/src/components/canvas/utils/shortcutKey.js
index 232d802851..3434a446df 100644
--- a/core/frontend/src/components/canvas/utils/shortcutKey.js
+++ b/core/frontend/src/components/canvas/utils/shortcutKey.js
@@ -50,10 +50,32 @@ const unlockMap = {
 
 let isCtrlOrCommandDown = false
 
+
+// 检查当前页面是否有弹框
+const checkDialog = () => {
+  let haveDialog = false
+  document.querySelectorAll('.el-dialog__wrapper').forEach(element => {
+    if (window.getComputedStyle(element).getPropertyValue('display') !== 'none') {
+      haveDialog = true
+    }
+  })
+  document.querySelectorAll('.el-popover').forEach(element => {
+    if (window.getComputedStyle(element).getPropertyValue('display') !== 'none') {
+      haveDialog = true
+    }
+  })
+  // 富文本单框
+  if (document.querySelector('.tox-dialog-wrap')) {
+    haveDialog = true
+  }
+
+  return haveDialog
+}
+
 // Monitor key operations globally and execute corresponding commands
 export function listenGlobalKeyDown() {
   window.onkeydown = (e) => {
-    if (!store.state.isInEditor) return
+    if (!store.state.isInEditor || checkDialog()) return
     const { keyCode } = e
     if (keyCode === ctrlKey || keyCode === commandKey) {
       isCtrlOrCommandDown = true

From 74962385e12e7ee1d7707bf49eec7f61f90399fe Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Wed, 1 Nov 2023 17:36:55 +0800
Subject: [PATCH 3/5] =?UTF-8?q?perf:=20=E5=85=AC=E5=85=B1=E9=93=BE?=
 =?UTF-8?q?=E6=8E=A5=E8=B7=B3=E8=BD=AC=E8=BF=94=E5=9B=9E=E4=B8=8A=E4=B8=80?=
 =?UTF-8?q?=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataease/controller/IndexController.java  |  4 ++
 core/frontend/public/link.html                |  4 ++
 .../canvas/components/editor/CanvasOptBar.vue |  6 +--
 .../canvas/components/editor/Preview.vue      | 39 +++++++++----------
 .../canvas/customComponent/UserView.vue       |  2 +-
 core/frontend/src/views/link/view/index.vue   |  2 +-
 6 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/core/backend/src/main/java/io/dataease/controller/IndexController.java b/core/backend/src/main/java/io/dataease/controller/IndexController.java
index baae2b4468..4c867e4779 100644
--- a/core/backend/src/main/java/io/dataease/controller/IndexController.java
+++ b/core/backend/src/main/java/io/dataease/controller/IndexController.java
@@ -67,6 +67,10 @@ public class IndexController {
             if (StringUtils.isNotEmpty(attachParams)) {
                 url = url + "&attachParams=" + attachParams;
             }
+            String fromLink = request.getParameter("fromLink");
+            if (StringUtils.isNotEmpty(fromLink)) {
+                url = url + "&fromLink=" + fromLink;
+            }
             response.sendRedirect(url);
         } catch (IOException e) {
             LogUtil.error(e.getMessage());
diff --git a/core/frontend/public/link.html b/core/frontend/public/link.html
index 38887b0b69..2bdb7b338c 100644
--- a/core/frontend/public/link.html
+++ b/core/frontend/public/link.html
@@ -33,6 +33,7 @@
   const user = getQueryVariable('user')
   const terminal = getQueryVariable('terminal')
   const attachParams = getQueryVariable('attachParams')
+  const fromLink = getQueryVariable('fromLink')
   const baseUrl = window.location.pathname.replace('link.html', '')
   let url = baseUrl + "#/delink?link=" + encodeURIComponent(link)
   if (terminal) {
@@ -44,6 +45,9 @@
   if (attachParams) {
     url += '&attachParams=' + encodeURIComponent(attachParams)
   }
+  if (fromLink) {
+    url += '&fromLink=' + fromLink
+  }
   window.location.href = url
 </script>
 
diff --git a/core/frontend/src/components/canvas/components/editor/CanvasOptBar.vue b/core/frontend/src/components/canvas/components/editor/CanvasOptBar.vue
index 6f305174fb..2b991acc10 100644
--- a/core/frontend/src/components/canvas/components/editor/CanvasOptBar.vue
+++ b/core/frontend/src/components/canvas/components/editor/CanvasOptBar.vue
@@ -12,7 +12,7 @@
     >
       <el-button-group size="mini">
         <el-button
-          v-if="!isNewBlank"
+          v-if="fromLink"
           size="mini"
           type="button"
           @click="back2Last"
@@ -89,8 +89,8 @@ export default {
     isPublicLink() {
       return this.$router.currentRoute.path === '/delink'
     },
-    isNewBlank() {
-      return window.history.length === 1
+    fromLink() {
+      return this.$route.query.fromLink === 'true'
     },
     containerClass() {
       return this.isPublicLink ? 'trans-pc' : 'bar-main'
diff --git a/core/frontend/src/components/canvas/components/editor/Preview.vue b/core/frontend/src/components/canvas/components/editor/Preview.vue
index b9cb8c81d1..b8aec04784 100644
--- a/core/frontend/src/components/canvas/components/editor/Preview.vue
+++ b/core/frontend/src/components/canvas/components/editor/Preview.vue
@@ -145,32 +145,31 @@
 </template>
 
 <script>
-import {getStyle} from '@/components/canvas/utils/style'
-import {mapState} from 'vuex'
+import { getStyle } from '@/components/canvas/utils/style'
+import { mapState } from 'vuex'
 import ComponentWrapper from './ComponentWrapper'
-import {changeStyleWithScale} from '@/components/canvas/utils/translate'
-import {uuid} from 'vue-uuid'
-import {deepCopy, imgUrlTrans} from '@/components/canvas/utils/utils'
+import { changeStyleWithScale } from '@/components/canvas/utils/translate'
+import { uuid } from 'vue-uuid'
+import { deepCopy, imgUrlTrans } from '@/components/canvas/utils/utils'
 import eventBus from '@/components/canvas/utils/eventBus'
 import elementResizeDetectorMaker from 'element-resize-detector'
 import CanvasOptBar from '@/components/canvas/components/editor/CanvasOptBar'
 import bus from '@/utils/bus'
-import {buildFilterMap, buildViewKeyMap, formatCondition, valueValid, viewIdMatch} from '@/utils/conditionUtil'
-import {hasDataPermission} from '@/utils/permission'
-import {activeWatermark} from '@/components/canvas/tools/watermark'
-import {proxyUserLoginInfo, userLoginInfo} from '@/api/systemInfo/userLogin'
+import { buildFilterMap, buildViewKeyMap, formatCondition, valueValid, viewIdMatch } from '@/utils/conditionUtil'
+import { hasDataPermission } from '@/utils/permission'
+import { activeWatermark } from '@/components/canvas/tools/watermark'
+import { proxyUserLoginInfo, userLoginInfo } from '@/api/systemInfo/userLogin'
 import html2canvas from 'html2canvasde'
-import {queryAll} from '@/api/panel/pdfTemplate'
+import { queryAll } from '@/api/panel/pdfTemplate'
 import PDFPreExport from '@/views/panel/export/PDFPreExport'
-import {listenGlobalKeyDownPreview} from '@/components/canvas/utils/shortcutKey'
+import { listenGlobalKeyDownPreview } from '@/components/canvas/utils/shortcutKey'
 import UserViewDialog from '@/components/canvas/customComponent/UserViewDialog'
-import {hexColorToRGBA} from "@/views/chart/chart/util";
-import {isMobile} from '@/utils/index'
-
+import { hexColorToRGBA } from '@/views/chart/chart/util'
+import { isMobile } from '@/utils/index'
 
 const erd = elementResizeDetectorMaker()
 export default {
-  components: {UserViewDialog, ComponentWrapper, CanvasOptBar, PDFPreExport},
+  components: { UserViewDialog, ComponentWrapper, CanvasOptBar, PDFPreExport },
   model: {
     prop: 'show',
     event: 'change'
@@ -207,14 +206,14 @@ export default {
     componentData: {
       type: Array,
       required: false,
-      default: function () {
+      default: function() {
         return []
       }
     },
     canvasStyleData: {
       type: Object,
       required: false,
-      default: function () {
+      default: function() {
         return {}
       }
     },
@@ -463,7 +462,7 @@ export default {
       return this.$refs['viewWrapperChild']
     },
     getAllWrapperChildRefs() {
-      let allChildRefs = []
+      const allChildRefs = []
       const currentChildRefs = this.getWrapperChildRefs()
       if (currentChildRefs && currentChildRefs.length > 0) {
         allChildRefs.push.apply(allChildRefs, currentChildRefs)
@@ -649,7 +648,7 @@ export default {
     },
     clearAllLinkage() {
       this.$store.commit('clearPanelLinkageInfo')
-      bus.$emit('clear_panel_linkage', {viewId: 'all'})
+      bus.$emit('clear_panel_linkage', { viewId: 'all' })
     },
     changeStyleWithScale,
     getStyle,
@@ -714,7 +713,7 @@ export default {
     },
     deselectCurComponent(e) {
       if (!this.isClickComponent) {
-        this.$store.commit('setCurComponent', {component: null, index: null})
+        this.$store.commit('setCurComponent', { component: null, index: null })
         if (this.$refs?.['canvas-opt-bar']) {
           this.$refs['canvas-opt-bar'].setWidgetStatus()
         }
diff --git a/core/frontend/src/components/canvas/customComponent/UserView.vue b/core/frontend/src/components/canvas/customComponent/UserView.vue
index 6f91a6c50a..28b88e8b10 100644
--- a/core/frontend/src/components/canvas/customComponent/UserView.vue
+++ b/core/frontend/src/components/canvas/customComponent/UserView.vue
@@ -1038,7 +1038,7 @@ export default {
             if (this.publicLinkStatus) {
               // 判断是否有公共链接ID
               if (jumpInfo.publicJumpId) {
-                const url = '/link/' + jumpInfo.publicJumpId
+                const url = '/link/' + jumpInfo.publicJumpId + '?fromLink=true'
                 const currentUrl = window.location.href
                 localStorage.setItem('beforeJumpUrl', currentUrl)
                 this.windowsJump(url, jumpInfo.jumpType)
diff --git a/core/frontend/src/views/link/view/index.vue b/core/frontend/src/views/link/view/index.vue
index fa18d5e76e..a3213d33f7 100644
--- a/core/frontend/src/views/link/view/index.vue
+++ b/core/frontend/src/views/link/view/index.vue
@@ -77,7 +77,7 @@ export default {
       })
     },
     setPanelInfo() {
-      loadResource(this.resourceId,this.user).then(res => {
+      loadResource(this.resourceId, this.user).then(res => {
         this.show = false
         let loadingCount = 0
         const watermarkInfo = {

From 469389f4eb384ad80d284ab9de335b6c4cf0be66 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Wed, 1 Nov 2023 17:51:44 +0800
Subject: [PATCH 4/5] =?UTF-8?q?perf:=20echarts=E5=9C=B0=E5=9B=BE=E5=9B=BE?=
 =?UTF-8?q?=E5=B1=82=E6=8E=A7=E5=88=B6=E5=BC=B9=E7=AA=97=E6=94=BE=E5=88=B0?=
 =?UTF-8?q?=E5=B7=A6=E4=BE=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/chart/components/map/MapLayerController.vue       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/frontend/src/views/chart/components/map/MapLayerController.vue b/core/frontend/src/views/chart/components/map/MapLayerController.vue
index 04478ec4c3..bec2f6781d 100644
--- a/core/frontend/src/views/chart/components/map/MapLayerController.vue
+++ b/core/frontend/src/views/chart/components/map/MapLayerController.vue
@@ -1,7 +1,7 @@
 <template>
 
   <el-popover
-    placement="right"
+    placement="left"
     title=""
     width="150"
     :append-to-body="false"

From 2500dc6f35c146c5b66b55f5a74b12caad13b763 Mon Sep 17 00:00:00 2001
From: ulleo <ulleo.wang@gmail.com>
Date: Wed, 1 Nov 2023 18:07:01 +0800
Subject: [PATCH 5/5] =?UTF-8?q?fix:=20antv=E6=95=A3=E7=82=B9=E5=9B=BE?=
 =?UTF-8?q?=E9=92=BB=E5=8F=96=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../engine/doris/DorisQueryProvider.java      |  2 +-
 .../engine/mysql/MysqlQueryProvider.java      |  2 +-
 .../provider/query/ck/CKQueryProvider.java    |  2 +-
 .../provider/query/db2/Db2QueryProvider.java  |  2 +-
 .../provider/query/es/EsQueryProvider.java    |  2 +-
 .../query/hive/HiveQueryProvider.java         |  2 +-
 .../query/impala/ImpalaQueryProvider.java     |  2 +-
 .../query/mongodb/MongoQueryProvider.java     |  2 +-
 .../query/mysql/MysqlQueryProvider.java       |  2 +-
 .../query/oracle/OracleQueryProvider.java     |  2 +-
 .../provider/query/pg/PgQueryProvider.java    |  2 +-
 .../query/redshift/RedshiftQueryProvider.java |  2 +-
 .../sqlserver/SqlserverQueryProvider.java     |  2 +-
 .../service/chart/ChartViewService.java       | 36 ++++++++++++++++---
 .../service/chart/util/ChartDataBuild.java    | 31 +++++++++++-----
 .../datasource/dm/query/DmQueryProvider.java  |  2 +-
 .../kingbase/query/KingbaseQueryProvider.java |  2 +-
 .../kylin/query/KylinQueryProvider.java       |  2 +-
 .../dm/query/MaxcomputeQueryProvider.java     |  2 +-
 .../mongo/query/MongobiQueryProvider.java     |  2 +-
 .../dm/query/PrestoQueryProvider.java         |  2 +-
 21 files changed, 72 insertions(+), 33 deletions(-)

diff --git a/core/backend/src/main/java/io/dataease/provider/engine/doris/DorisQueryProvider.java b/core/backend/src/main/java/io/dataease/provider/engine/doris/DorisQueryProvider.java
index 929f45ff42..91d1229f9f 100644
--- a/core/backend/src/main/java/io/dataease/provider/engine/doris/DorisQueryProvider.java
+++ b/core/backend/src/main/java/io/dataease/provider/engine/doris/DorisQueryProvider.java
@@ -653,7 +653,7 @@ public class DorisQueryProvider extends QueryProvider {
 
         //然后是数值格式的情况还需要传extGroup
         if (xIsNumber && CollectionUtils.isNotEmpty(extGroup)) {
-            xAxisList.add(extGroup.get(0));
+            xAxisList.addAll(extGroup);
         }
 
         if (CollectionUtils.isNotEmpty(xAxisList)) {
diff --git a/core/backend/src/main/java/io/dataease/provider/engine/mysql/MysqlQueryProvider.java b/core/backend/src/main/java/io/dataease/provider/engine/mysql/MysqlQueryProvider.java
index bc425a04f8..d25126ecbf 100644
--- a/core/backend/src/main/java/io/dataease/provider/engine/mysql/MysqlQueryProvider.java
+++ b/core/backend/src/main/java/io/dataease/provider/engine/mysql/MysqlQueryProvider.java
@@ -602,7 +602,7 @@ public class MysqlQueryProvider extends QueryProvider {
 
         //然后是数值格式的情况还需要传extGroup
         if (xIsNumber && CollectionUtils.isNotEmpty(extGroup)) {
-            xAxisList.add(extGroup.get(0));
+            xAxisList.addAll(extGroup);
         }
 
         if (CollectionUtils.isNotEmpty(xAxisList)) {
diff --git a/core/backend/src/main/java/io/dataease/provider/query/ck/CKQueryProvider.java b/core/backend/src/main/java/io/dataease/provider/query/ck/CKQueryProvider.java
index 653bc2b089..414539684c 100644
--- a/core/backend/src/main/java/io/dataease/provider/query/ck/CKQueryProvider.java
+++ b/core/backend/src/main/java/io/dataease/provider/query/ck/CKQueryProvider.java
@@ -633,7 +633,7 @@ public class CKQueryProvider extends QueryProvider {
 
         //然后是数值格式的情况还需要传extGroup
         if (xIsNumber && CollectionUtils.isNotEmpty(extGroup)) {
-            xAxisList.add(extGroup.get(0));
+            xAxisList.addAll(extGroup);
         }
 
         if (CollectionUtils.isNotEmpty(xAxisList)) {
diff --git a/core/backend/src/main/java/io/dataease/provider/query/db2/Db2QueryProvider.java b/core/backend/src/main/java/io/dataease/provider/query/db2/Db2QueryProvider.java
index 7750f94709..6394299e21 100644
--- a/core/backend/src/main/java/io/dataease/provider/query/db2/Db2QueryProvider.java
+++ b/core/backend/src/main/java/io/dataease/provider/query/db2/Db2QueryProvider.java
@@ -621,7 +621,7 @@ public class Db2QueryProvider extends QueryProvider {
 
         //然后是数值格式的情况还需要传extGroup
         if (xIsNumber && CollectionUtils.isNotEmpty(extGroup)) {
-            xAxisList.add(extGroup.get(0));
+            xAxisList.addAll(extGroup);
         }
 
         if (CollectionUtils.isNotEmpty(xAxisList)) {
diff --git a/core/backend/src/main/java/io/dataease/provider/query/es/EsQueryProvider.java b/core/backend/src/main/java/io/dataease/provider/query/es/EsQueryProvider.java
index be5c96eed9..db09106e94 100644
--- a/core/backend/src/main/java/io/dataease/provider/query/es/EsQueryProvider.java
+++ b/core/backend/src/main/java/io/dataease/provider/query/es/EsQueryProvider.java
@@ -627,7 +627,7 @@ public class EsQueryProvider extends QueryProvider {
 
         //然后是数值格式的情况还需要传extGroup
         if (xIsNumber && CollectionUtils.isNotEmpty(extGroup)) {
-            xAxisList.add(extGroup.get(0));
+            xAxisList.addAll(extGroup);
         }
 
         if (CollectionUtils.isNotEmpty(xAxisList)) {
diff --git a/core/backend/src/main/java/io/dataease/provider/query/hive/HiveQueryProvider.java b/core/backend/src/main/java/io/dataease/provider/query/hive/HiveQueryProvider.java
index b677c0a701..efec86062f 100644
--- a/core/backend/src/main/java/io/dataease/provider/query/hive/HiveQueryProvider.java
+++ b/core/backend/src/main/java/io/dataease/provider/query/hive/HiveQueryProvider.java
@@ -586,7 +586,7 @@ public class HiveQueryProvider extends QueryProvider {
 
         //然后是数值格式的情况还需要传extGroup
         if (xIsNumber && CollectionUtils.isNotEmpty(extGroup)) {
-            xAxisList.add(extGroup.get(0));
+            xAxisList.addAll(extGroup);
         }
 
         if (CollectionUtils.isNotEmpty(xAxisList)) {
diff --git a/core/backend/src/main/java/io/dataease/provider/query/impala/ImpalaQueryProvider.java b/core/backend/src/main/java/io/dataease/provider/query/impala/ImpalaQueryProvider.java
index afb4867912..be73be8d1c 100644
--- a/core/backend/src/main/java/io/dataease/provider/query/impala/ImpalaQueryProvider.java
+++ b/core/backend/src/main/java/io/dataease/provider/query/impala/ImpalaQueryProvider.java
@@ -573,7 +573,7 @@ public class ImpalaQueryProvider extends QueryProvider {
 
         //然后是数值格式的情况还需要传extGroup
         if (xIsNumber && CollectionUtils.isNotEmpty(extGroup)) {
-            xAxisList.add(extGroup.get(0));
+            xAxisList.addAll(extGroup);
         }
 
         if (CollectionUtils.isNotEmpty(xAxisList)) {
diff --git a/core/backend/src/main/java/io/dataease/provider/query/mongodb/MongoQueryProvider.java b/core/backend/src/main/java/io/dataease/provider/query/mongodb/MongoQueryProvider.java
index d8ad59fc31..8e4bac9bb8 100644
--- a/core/backend/src/main/java/io/dataease/provider/query/mongodb/MongoQueryProvider.java
+++ b/core/backend/src/main/java/io/dataease/provider/query/mongodb/MongoQueryProvider.java
@@ -557,7 +557,7 @@ public class MongoQueryProvider extends QueryProvider {
 
         //然后是数值格式的情况还需要传extGroup
         if (xIsNumber && CollectionUtils.isNotEmpty(extGroup)) {
-            xAxisList.add(extGroup.get(0));
+            xAxisList.addAll(extGroup);
         }
 
         if (CollectionUtils.isNotEmpty(xAxisList)) {
diff --git a/core/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java b/core/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java
index f32a2ad515..7296b1a164 100644
--- a/core/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java
+++ b/core/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java
@@ -611,7 +611,7 @@ public class MysqlQueryProvider extends QueryProvider {
 
         //然后是数值格式的情况还需要传extGroup
         if (xIsNumber && CollectionUtils.isNotEmpty(extGroup)) {
-            xAxisList.add(extGroup.get(0));
+            xAxisList.addAll(extGroup);
         }
 
         if (CollectionUtils.isNotEmpty(xAxisList)) {
diff --git a/core/backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java b/core/backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java
index 201dd395a3..b384b29fe9 100644
--- a/core/backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java
+++ b/core/backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java
@@ -676,7 +676,7 @@ public class OracleQueryProvider extends QueryProvider {
 
         //然后是数值格式的情况还需要传extGroup
         if (xIsNumber && CollectionUtils.isNotEmpty(extGroup)) {
-            xAxisList.add(extGroup.get(0));
+            xAxisList.addAll(extGroup);
         }
 
         if (CollectionUtils.isNotEmpty(xAxisList)) {
diff --git a/core/backend/src/main/java/io/dataease/provider/query/pg/PgQueryProvider.java b/core/backend/src/main/java/io/dataease/provider/query/pg/PgQueryProvider.java
index 4682f88323..3e1fd0a9f7 100644
--- a/core/backend/src/main/java/io/dataease/provider/query/pg/PgQueryProvider.java
+++ b/core/backend/src/main/java/io/dataease/provider/query/pg/PgQueryProvider.java
@@ -614,7 +614,7 @@ public class PgQueryProvider extends QueryProvider {
 
         //然后是数值格式的情况还需要传extGroup
         if (xIsNumber && CollectionUtils.isNotEmpty(extGroup)) {
-            xAxisList.add(extGroup.get(0));
+            xAxisList.addAll(extGroup);
         }
 
         if (CollectionUtils.isNotEmpty(xAxisList)) {
diff --git a/core/backend/src/main/java/io/dataease/provider/query/redshift/RedshiftQueryProvider.java b/core/backend/src/main/java/io/dataease/provider/query/redshift/RedshiftQueryProvider.java
index b550a81485..564e2c40f0 100644
--- a/core/backend/src/main/java/io/dataease/provider/query/redshift/RedshiftQueryProvider.java
+++ b/core/backend/src/main/java/io/dataease/provider/query/redshift/RedshiftQueryProvider.java
@@ -621,7 +621,7 @@ public class RedshiftQueryProvider extends QueryProvider {
 
         //然后是数值格式的情况还需要传extGroup
         if (xIsNumber && CollectionUtils.isNotEmpty(extGroup)) {
-            xAxisList.add(extGroup.get(0));
+            xAxisList.addAll(extGroup);
         }
 
         if (CollectionUtils.isNotEmpty(xAxisList)) {
diff --git a/core/backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java b/core/backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java
index ced343ad33..b3a24f8744 100644
--- a/core/backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java
+++ b/core/backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java
@@ -623,7 +623,7 @@ public class SqlserverQueryProvider extends QueryProvider {
 
         //然后是数值格式的情况还需要传extGroup
         if (xIsNumber && CollectionUtils.isNotEmpty(extGroup)) {
-            xAxisList.add(extGroup.get(0));
+            xAxisList.addAll(extGroup);
         }
 
         if (CollectionUtils.isNotEmpty(xAxisList)) {
diff --git a/core/backend/src/main/java/io/dataease/service/chart/ChartViewService.java b/core/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
index 8d5dd245c2..45dafde4cb 100644
--- a/core/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
+++ b/core/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
@@ -913,6 +913,9 @@ public class ChartViewService {
             ChartDrillRequest head = drillRequestList.get(0);
             Map<String, String> dimValMap = new HashMap<>();
             head.getDimensionList().forEach(item -> dimValMap.put(item.getId(), item.getValue()));
+
+            boolean isAntVScatterNumberXAxis = CollectionUtils.isNotEmpty(xAxis) && StringUtils.equals(xAxis.get(0).getGroupType(), "q") && StringUtils.equalsIgnoreCase(view.getRender(), "antv");
+
             for (int i = 0; i < drillRequestList.size(); i++) {
                 ChartDrillRequest request = drillRequestList.get(i);
                 ChartViewFieldDTO chartViewFieldDTO = drill.get(i);
@@ -924,14 +927,23 @@ public class ChartViewService {
                         dimValMap.put(requestDimension.getId(), requestDimension.getValue());
                         if (!checkDrillExist(xAxis, extStack, requestDimension.getId(), view)) {
                             chartFieldMap.put(chartViewFieldDTO.getId(), chartViewFieldDTO);
-                            xAxis.add(chartViewFieldDTO);
+
+                            if (isAntVScatterNumberXAxis) {
+                                extStack.add(chartViewFieldDTO);
+                            } else {
+                                xAxis.add(chartViewFieldDTO);
+                            }
                         }
                         if (i == drillRequestList.size() - 1) {
                             ChartViewFieldDTO nextDrillField = drill.get(i + 1);
                             if (!checkDrillExist(xAxis, extStack, nextDrillField.getId(), view)) {
                                 // get drill list first element's sort,then assign to nextDrillField
                                 nextDrillField.setSort(getDrillSort(xAxis, drill.get(0)));
-                                xAxis.add(nextDrillField);
+                                if (isAntVScatterNumberXAxis) {
+                                    extStack.add(nextDrillField);
+                                } else {
+                                    xAxis.add(nextDrillField);
+                                }
                             }
                         }
                     }
@@ -1656,6 +1668,20 @@ public class ChartViewService {
     }
 
     private boolean checkDrillExist(List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> extStack, String fieldId, ChartViewWithBLOBs view) {
+
+        if (CollectionUtils.isNotEmpty(xAxis)) {
+            //针对判断 antv 散点图
+            if (StringUtils.equals(xAxis.get(0).getGroupType(), "q") && StringUtils.equalsIgnoreCase(view.getRender(), "antv")) {
+                if (CollectionUtils.isNotEmpty(extStack)) {
+                    for (ChartViewFieldDTO x : extStack) {
+                        if (StringUtils.equalsIgnoreCase(x.getId(), fieldId)) {
+                            return true;
+                        }
+                    }
+                }
+            }
+        }
+
         if (CollectionUtils.isNotEmpty(xAxis)) {
             for (ChartViewFieldDTO x : xAxis) {
                 if (StringUtils.equalsIgnoreCase(x.getId(), fieldId)) {
@@ -2129,7 +2155,7 @@ public class ChartViewService {
         JSONObject jsonObject = JSONObject.parseObject(senior);
         List<ChartSeniorAssistDTO> list = new ArrayList<>();
         JSONObject threshold = jsonObject.getJSONObject("threshold");
-        if (ObjectUtils.isEmpty(threshold) || StringUtils.isBlank(threshold.toJSONString())){
+        if (ObjectUtils.isEmpty(threshold) || StringUtils.isBlank(threshold.toJSONString())) {
             return list;
         }
         JSONArray tableThreshold = threshold.getJSONArray("tableThreshold");
@@ -2161,7 +2187,7 @@ public class ChartViewService {
         return list;
     }
 
-    private boolean solveThresholdCondition(ChartSeniorAssistDTO fieldDTO, String tableId){
+    private boolean solveThresholdCondition(ChartSeniorAssistDTO fieldDTO, String tableId) {
         String fieldId = fieldDTO.getFieldId();
         String summary = fieldDTO.getSummary();
         if (StringUtils.isEmpty(fieldId) || StringUtils.isEmpty(summary)) {
@@ -2177,7 +2203,7 @@ public class ChartViewService {
         return true;
     }
 
-    private List<ChartSeniorAssistDTO> getConditionFields(ChartSeniorThresholdDTO condition){
+    private List<ChartSeniorAssistDTO> getConditionFields(ChartSeniorThresholdDTO condition) {
         List<ChartSeniorAssistDTO> list = new ArrayList<>();
         if (StringUtils.equalsIgnoreCase(condition.getField(), "0")) {
             return list;
diff --git a/core/backend/src/main/java/io/dataease/service/chart/util/ChartDataBuild.java b/core/backend/src/main/java/io/dataease/service/chart/util/ChartDataBuild.java
index 8733d39aed..906ee1e517 100644
--- a/core/backend/src/main/java/io/dataease/service/chart/util/ChartDataBuild.java
+++ b/core/backend/src/main/java/io/dataease/service/chart/util/ChartDataBuild.java
@@ -313,7 +313,7 @@ public class ChartDataBuild {
             String[] row = data.get(i1);
 
             StringBuilder a = new StringBuilder();
-            if (isDrill) {
+            if (isDrill && !xIsNumber) {
                 a.append(row[extGroupList.size() + xAxis.size() - 1]);
             } else {
                 for (int i = extGroupList.size(); i < extGroupList.size() + xAxis.size(); i++) {
@@ -329,7 +329,7 @@ public class ChartDataBuild {
                 AxisChartDataAntVDTO axisChartDataDTO = new AxisChartDataAntVDTO();
 
                 if (xIsNumber) {
-                    BigDecimal v = null;
+                    Object v = a.toString();
                     try {
                         v = new BigDecimal(a.toString());
                     } catch (Exception ignore) {
@@ -345,11 +345,20 @@ public class ChartDataBuild {
                 List<ChartDimensionDTO> dimensionList = new ArrayList<>();
                 List<ChartQuotaDTO> quotaList = new ArrayList<>();
 
-                for (int j = 0; j < xAxis.size(); j++) {
-                    ChartDimensionDTO chartDimensionDTO = new ChartDimensionDTO();
-                    chartDimensionDTO.setId(xAxis.get(j).getId());
-                    chartDimensionDTO.setValue(row[j]);
-                    dimensionList.add(chartDimensionDTO);
+                if (xIsNumber && CollectionUtils.isNotEmpty(extGroupList)) {
+                    for (int j = 0; j < extGroupList.size(); j++) {
+                        ChartDimensionDTO chartDimensionDTO = new ChartDimensionDTO();
+                        chartDimensionDTO.setId(extGroupList.get(j).getId());
+                        chartDimensionDTO.setValue(row[j]);
+                        dimensionList.add(chartDimensionDTO);
+                    }
+                } else {
+                    for (int j = 0; j < xAxis.size(); j++) {
+                        ChartDimensionDTO chartDimensionDTO = new ChartDimensionDTO();
+                        chartDimensionDTO.setId(xAxis.get(j).getId());
+                        chartDimensionDTO.setValue(row[j]);
+                        dimensionList.add(chartDimensionDTO);
+                    }
                 }
                 axisChartDataDTO.setDimensionList(dimensionList);
 
@@ -365,7 +374,11 @@ public class ChartDataBuild {
                 }
 
                 if (CollectionUtils.isNotEmpty(extGroup) && xIsNumber) { //有分组时其实就是第一个
-                    axisChartDataDTO.setCategory(row[0]);
+                    if (isDrill) {
+                        axisChartDataDTO.setCategory(row[extGroupList.size() - 1]);
+                    } else {
+                        axisChartDataDTO.setCategory(row[0]);
+                    }
                 } else {
                     axisChartDataDTO.setCategory(yAxis.get(j).getName());
                 }
@@ -988,7 +1001,7 @@ public class ChartDataBuild {
                 }
             }
             if (xIsNumber && CollectionUtils.isNotEmpty(extStack)) {
-                fields.add(extStack.get(0));
+                fields.addAll(extStack);
             }
 
             if (xIsNumber) {
diff --git a/extensions/dataease-extensions-datasource/dm/dm-backend/src/main/java/io/dataease/plugins/datasource/dm/query/DmQueryProvider.java b/extensions/dataease-extensions-datasource/dm/dm-backend/src/main/java/io/dataease/plugins/datasource/dm/query/DmQueryProvider.java
index f8bdad6754..4c23f4491d 100644
--- a/extensions/dataease-extensions-datasource/dm/dm-backend/src/main/java/io/dataease/plugins/datasource/dm/query/DmQueryProvider.java
+++ b/extensions/dataease-extensions-datasource/dm/dm-backend/src/main/java/io/dataease/plugins/datasource/dm/query/DmQueryProvider.java
@@ -725,7 +725,7 @@ public class DmQueryProvider extends QueryProvider {
 
         //然后是数值格式的情况还需要传extGroup
         if (xIsNumber && CollectionUtils.isNotEmpty(extGroup)) {
-            xAxisList.add(extGroup.get(0));
+            xAxisList.addAll(extGroup);
         }
 
         if (CollectionUtils.isNotEmpty(xAxisList)) {
diff --git a/extensions/dataease-extensions-datasource/kingbase/kingbase-backend/src/main/java/io/dataease/plugins/datasource/kingbase/query/KingbaseQueryProvider.java b/extensions/dataease-extensions-datasource/kingbase/kingbase-backend/src/main/java/io/dataease/plugins/datasource/kingbase/query/KingbaseQueryProvider.java
index 5fed752ae8..95513e6017 100644
--- a/extensions/dataease-extensions-datasource/kingbase/kingbase-backend/src/main/java/io/dataease/plugins/datasource/kingbase/query/KingbaseQueryProvider.java
+++ b/extensions/dataease-extensions-datasource/kingbase/kingbase-backend/src/main/java/io/dataease/plugins/datasource/kingbase/query/KingbaseQueryProvider.java
@@ -747,7 +747,7 @@ public class KingbaseQueryProvider extends QueryProvider {
 
         //然后是数值格式的情况还需要传extGroup
         if (xIsNumber && CollectionUtils.isNotEmpty(extGroup)) {
-            xAxisList.add(extGroup.get(0));
+            xAxisList.addAll(extGroup);
         }
 
         if (CollectionUtils.isNotEmpty(xAxisList)) {
diff --git a/extensions/dataease-extensions-datasource/kylin/kylin-backend/src/main/java/io/dataease/plugins/datasource/kylin/query/KylinQueryProvider.java b/extensions/dataease-extensions-datasource/kylin/kylin-backend/src/main/java/io/dataease/plugins/datasource/kylin/query/KylinQueryProvider.java
index 7ad5ae0488..44d78aaa42 100644
--- a/extensions/dataease-extensions-datasource/kylin/kylin-backend/src/main/java/io/dataease/plugins/datasource/kylin/query/KylinQueryProvider.java
+++ b/extensions/dataease-extensions-datasource/kylin/kylin-backend/src/main/java/io/dataease/plugins/datasource/kylin/query/KylinQueryProvider.java
@@ -577,7 +577,7 @@ public class KylinQueryProvider extends QueryProvider {
 
         //然后是数值格式的情况还需要传extGroup
         if (xIsNumber && CollectionUtils.isNotEmpty(extGroup)) {
-            xAxisList.add(extGroup.get(0));
+            xAxisList.addAll(extGroup);
         }
 
         if (CollectionUtils.isNotEmpty(xAxisList)) {
diff --git a/extensions/dataease-extensions-datasource/maxcompute/maxcompute-backend/src/main/java/io/dataease/plugins/datasource/dm/query/MaxcomputeQueryProvider.java b/extensions/dataease-extensions-datasource/maxcompute/maxcompute-backend/src/main/java/io/dataease/plugins/datasource/dm/query/MaxcomputeQueryProvider.java
index 60d60390d0..6aa592ef0e 100644
--- a/extensions/dataease-extensions-datasource/maxcompute/maxcompute-backend/src/main/java/io/dataease/plugins/datasource/dm/query/MaxcomputeQueryProvider.java
+++ b/extensions/dataease-extensions-datasource/maxcompute/maxcompute-backend/src/main/java/io/dataease/plugins/datasource/dm/query/MaxcomputeQueryProvider.java
@@ -592,7 +592,7 @@ public class MaxcomputeQueryProvider extends QueryProvider {
 
         //然后是数值格式的情况还需要传extGroup
         if (xIsNumber && CollectionUtils.isNotEmpty(extGroup)) {
-            xAxisList.add(extGroup.get(0));
+            xAxisList.addAll(extGroup);
         }
 
         if (CollectionUtils.isNotEmpty(xAxisList)) {
diff --git a/extensions/dataease-extensions-datasource/mongo/mongo-backend/src/main/java/io/dataease/plugins/datasource/mongo/query/MongobiQueryProvider.java b/extensions/dataease-extensions-datasource/mongo/mongo-backend/src/main/java/io/dataease/plugins/datasource/mongo/query/MongobiQueryProvider.java
index eca34019e8..72f509d231 100644
--- a/extensions/dataease-extensions-datasource/mongo/mongo-backend/src/main/java/io/dataease/plugins/datasource/mongo/query/MongobiQueryProvider.java
+++ b/extensions/dataease-extensions-datasource/mongo/mongo-backend/src/main/java/io/dataease/plugins/datasource/mongo/query/MongobiQueryProvider.java
@@ -592,7 +592,7 @@ public class MongobiQueryProvider extends QueryProvider {
 
         //然后是数值格式的情况还需要传extGroup
         if (xIsNumber && CollectionUtils.isNotEmpty(extGroup)) {
-            xAxisList.add(extGroup.get(0));
+            xAxisList.addAll(extGroup);
         }
 
         if (CollectionUtils.isNotEmpty(xAxisList)) {
diff --git a/extensions/dataease-extensions-datasource/presto/presto-backend/src/main/java/io/dataease/plugins/datasource/dm/query/PrestoQueryProvider.java b/extensions/dataease-extensions-datasource/presto/presto-backend/src/main/java/io/dataease/plugins/datasource/dm/query/PrestoQueryProvider.java
index ab7f0421c9..0707691b2b 100644
--- a/extensions/dataease-extensions-datasource/presto/presto-backend/src/main/java/io/dataease/plugins/datasource/dm/query/PrestoQueryProvider.java
+++ b/extensions/dataease-extensions-datasource/presto/presto-backend/src/main/java/io/dataease/plugins/datasource/dm/query/PrestoQueryProvider.java
@@ -582,7 +582,7 @@ public class PrestoQueryProvider extends QueryProvider {
 
         //然后是数值格式的情况还需要传extGroup
         if (xIsNumber && CollectionUtils.isNotEmpty(extGroup)) {
-            xAxisList.add(extGroup.get(0));
+            xAxisList.addAll(extGroup);
         }
 
         if (CollectionUtils.isNotEmpty(xAxisList)) {