From fdb5c4961497ebcca811aaed53a18b3a1720b991 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Fri, 31 Oct 2025 15:33:02 +0800
Subject: [PATCH 01/13] =?UTF-8?q?fix(=E6=9F=A5=E8=AF=A2=E7=BB=84=E4=BB=B6)?=
 =?UTF-8?q?:=20=E6=95=B0=E6=8D=AE=E8=BF=87=E6=BB=A4=E5=AD=98=E5=9C=A8?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/custom-component/v-query/Select.vue | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/core/core-frontend/src/custom-component/v-query/Select.vue b/core/core-frontend/src/custom-component/v-query/Select.vue
index fc91c77c5a..58c9d7b825 100644
--- a/core/core-frontend/src/custom-component/v-query/Select.vue
+++ b/core/core-frontend/src/custom-component/v-query/Select.vue
@@ -348,6 +348,11 @@ const handleFieldIdChange = (val: EnumValue) => {
         }
       })
       customSort()
+      if (!res?.length) {
+        options.value = []
+        selectValue.value = config.value.multiple ? [] : undefined
+        config.value.defaultValue = selectValue.value
+      }
     })
     .finally(() => {
       loading.value = false

From a9131423d75e813035de003ecf747ed69e71a328 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=98=89=E8=B1=AA?=
 <42510293+ziyujiahao@users.noreply.github.com>
Date: Fri, 31 Oct 2025 16:16:00 +0800
Subject: [PATCH 02/13] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F)?=
 =?UTF-8?q?:=20=E4=BF=AE=E5=A4=8D=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F?=
 =?UTF-8?q?=E9=93=BA=E6=BB=A1=E5=85=A8=E5=B1=8F=E6=A8=A1=E5=BC=8F=E7=9A=84?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E6=A8=A1=E6=9D=BF=E9=87=8D=E6=96=B0=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E5=8F=AF=E8=83=BD=E5=87=BA=E7=8E=B0=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E9=94=99=E4=BD=8D=E9=97=AE=E9=A2=98=20#17159=20(#17338)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/data-visualization/PreviewShow.vue           | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/core/core-frontend/src/views/data-visualization/PreviewShow.vue b/core/core-frontend/src/views/data-visualization/PreviewShow.vue
index f3718c8edb..bcaba8ffb5 100644
--- a/core/core-frontend/src/views/data-visualization/PreviewShow.vue
+++ b/core/core-frontend/src/views/data-visualization/PreviewShow.vue
@@ -26,6 +26,7 @@ import {
   exportLogPDF,
   exportLogTemplate
 } from '@/api/visualization/dataVisualization'
+import { deepCopy } from '@/utils/utils'
 const userStore = useUserStoreWithOut()
 
 const userName = computed(() => userStore.getName)
@@ -100,6 +101,12 @@ const loadCanvasData = (dvId, weight?, ext?) => {
       state.dvInfo = dvInfo
       state.curPreviewGap = curPreviewGap
       dataInitState.value = true
+      // 修复铺满全屏模版导出错位问题
+      if (props.showPosition !== 'multiplexing') {
+        dvMainStore.setCanvasStyle(deepCopy(canvasStyleResult))
+        dvMainStore.setComponentData(deepCopy(canvasDataResult))
+      }
+
       if (props.showPosition === 'preview') {
         dvMainStore.updateCurDvInfo(dvInfo)
         nextTick(() => {

From f7251dde08022ba2203eaaff33dd9a85c6f0560e Mon Sep 17 00:00:00 2001
From: Minamiyama <minamiyama@qq.com>
Date: Wed, 15 Oct 2025 11:16:48 +0800
Subject: [PATCH 03/13] =?UTF-8?q?feat(=E5=9B=BE=E8=A1=A8):=20=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=8C=87=E6=A0=87=E5=90=8D=E7=A7=B0=E4=BD=8D=E7=BD=AE?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在指标组件中新增名称位置(top/bottom)配置功能，并更新多语言支持
---
 .../indicator/DeIndicator.vue                 | 10 ++++++-
 core/core-frontend/src/locales/en.ts          |  3 +++
 core/core-frontend/src/locales/tw.ts          |  3 +++
 core/core-frontend/src/locales/zh-CN.ts       |  3 +++
 .../src/models/chart/chart-attr.d.ts          |  4 +++
 .../components/IndicatorNameSelector.vue      | 26 +++++++++++++++++++
 .../chart/components/editor/util/chart.ts     |  3 ++-
 7 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/core/core-frontend/src/custom-component/indicator/DeIndicator.vue b/core/core-frontend/src/custom-component/indicator/DeIndicator.vue
index 53e3fa9c30..bb8c53aa9a 100644
--- a/core/core-frontend/src/custom-component/indicator/DeIndicator.vue
+++ b/core/core-frontend/src/custom-component/indicator/DeIndicator.vue
@@ -255,6 +255,7 @@ const showSuffix = ref<boolean>(DEFAULT_INDICATOR_STYLE.suffixEnable)
 const suffixContent = ref('')
 
 const indicatorNameShow = ref(false)
+const indicatorNamePositionBottom = ref(true)
 
 const indicatorNameWrapperStyle = reactive<CSSProperties>({
   'margin-top': DEFAULT_INDICATOR_NAME_STYLE.nameValueSpacing + 'px'
@@ -369,8 +370,10 @@ const renderChart = async view => {
       }
       indicatorNameWrapperStyle['margin-top'] =
         (indicatorName.nameValueSpacing ?? DEFAULT_INDICATOR_NAME_STYLE.nameValueSpacing) + 'px'
+      indicatorNamePositionBottom.value = indicatorName.namePosition !== 'top'
     } else {
       indicatorNameShow.value = false
+      indicatorNamePositionBottom.value = false
     }
   }
 }
@@ -595,11 +598,16 @@ defineExpose({
       @trackClick="trackClick"
       :is-data-v-mobile="dataVMobile"
     />
+    <div v-if="indicatorNameShow && !indicatorNamePositionBottom">
+      <span :style="indicatorNameClass">{{ resultName }}</span>
+      <div :style="indicatorNameWrapperStyle"></div>
+    </div>
     <div>
       <span :style="indicatorClass">{{ formattedResult }}</span>
       <span :style="indicatorSuffixClass" v-if="showSuffix">{{ suffixContent }}</span>
     </div>
-    <div :style="indicatorNameWrapperStyle" v-if="indicatorNameShow">
+    <div v-if="indicatorNameShow && indicatorNamePositionBottom">
+      <div :style="indicatorNameWrapperStyle"></div>
       <span :style="indicatorNameClass">{{ resultName }}</span>
     </div>
   </div>
diff --git a/core/core-frontend/src/locales/en.ts b/core/core-frontend/src/locales/en.ts
index 62c7b2f92f..26760f9f72 100644
--- a/core/core-frontend/src/locales/en.ts
+++ b/core/core-frontend/src/locales/en.ts
@@ -1821,6 +1821,9 @@ export default {
     dimension_text_style: 'Name style',
     dimension_letter_space: 'Name letter spacing',
     name_value_spacing: 'Name/value spacing',
+    name_position: 'Position',
+    name_position_top: 'Top',
+    name_position_bottom: 'Bottom',
     font_family: 'Font',
     letter_space: 'Letter spacing',
     font_shadow: 'Font shadow',
diff --git a/core/core-frontend/src/locales/tw.ts b/core/core-frontend/src/locales/tw.ts
index 426959db27..0aab576065 100644
--- a/core/core-frontend/src/locales/tw.ts
+++ b/core/core-frontend/src/locales/tw.ts
@@ -1777,6 +1777,9 @@ export default {
     dimension_text_style: '名稱樣式',
     dimension_letter_space: '名稱字間距',
     name_value_spacing: '名稱/值間距',
+    name_position: '位置',
+    name_position_top: '上方',
+    name_position_bottom: '下方',
     font_family: '字體',
     letter_space: '字間距',
     font_shadow: '字體陰影',
diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts
index 752315cd5d..455901d995 100644
--- a/core/core-frontend/src/locales/zh-CN.ts
+++ b/core/core-frontend/src/locales/zh-CN.ts
@@ -1785,6 +1785,9 @@ export default {
     dimension_text_style: '名称样式',
     dimension_letter_space: '名称字间距',
     name_value_spacing: '名称/值间距',
+    name_position: '位置',
+    name_position_top: '上方',
+    name_position_bottom: '下方',
     font_family: '字体',
     letter_space: '字间距',
     font_shadow: '字体阴影',
diff --git a/core/core-frontend/src/models/chart/chart-attr.d.ts b/core/core-frontend/src/models/chart/chart-attr.d.ts
index 52d924d7ee..ed1380f494 100644
--- a/core/core-frontend/src/models/chart/chart-attr.d.ts
+++ b/core/core-frontend/src/models/chart/chart-attr.d.ts
@@ -1301,6 +1301,10 @@ declare interface ChartIndicatorNameStyle {
    * 指标/名称间距
    */
   nameValueSpacing: number
+  /**
+   * 指标名称位置
+   */
+  namePosition?: 'top' | 'bottom'
 }
 
 /**
diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/components/IndicatorNameSelector.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/components/IndicatorNameSelector.vue
index 4b84d16845..0d9d14df6c 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/IndicatorNameSelector.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/IndicatorNameSelector.vue
@@ -45,6 +45,11 @@ const fontFamily = CHART_FONT_FAMILY_ORIGIN.concat(
 )
 const fontLetterSpace = CHART_FONT_LETTER_SPACE
 
+const namePositionList = [
+  { name: t('chart.name_position_top'), value: 'top' },
+  { name: t('chart.name_position_bottom'), value: 'bottom' }
+]
+
 const state = reactive({
   indicatorNameForm: JSON.parse(JSON.stringify(DEFAULT_INDICATOR_NAME_STYLE)),
   basicStyleForm: {} as ChartBasicStyle
@@ -275,6 +280,27 @@ defineExpose({ getFormData })
           @change="changeTitleStyle('nameValueSpacing')"
         />
       </el-form-item>
+      <el-form-item
+        class="form-item name-value-spacing-input"
+        :class="'form-item-' + themes"
+        :label="t('chart.name_position')"
+      >
+        <el-select
+          :effect="themes"
+          v-model="state.indicatorNameForm.namePosition"
+          size="small"
+          style="width: 100%"
+          @change="changeTitleStyle('namePosition')"
+        >
+          <el-option
+            class="custom-style-option"
+            v-for="option in namePositionList"
+            :key="option.value"
+            :label="option.name"
+            :value="option.value"
+          />
+        </el-select>
+      </el-form-item>
     </el-form>
   </div>
 </template>
diff --git a/core/core-frontend/src/views/chart/components/editor/util/chart.ts b/core/core-frontend/src/views/chart/components/editor/util/chart.ts
index 0ec56b9219..f360749c69 100644
--- a/core/core-frontend/src/views/chart/components/editor/util/chart.ts
+++ b/core/core-frontend/src/views/chart/components/editor/util/chart.ts
@@ -548,7 +548,8 @@ export const DEFAULT_INDICATOR_NAME_STYLE: ChartIndicatorNameStyle = {
   fontFamily: 'Microsoft YaHei',
   letterSpace: 0,
   fontShadow: false,
-  nameValueSpacing: 0
+  nameValueSpacing: 0,
+  namePosition: 'bottom'
 }
 
 export const DEFAULT_TITLE_STYLE_BASE: ChartTextStyle = {

From 5ff22511457fa710d936993c2a28f4d3baeb7fed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=98=89=E8=B1=AA?=
 <42510293+ziyujiahao@users.noreply.github.com>
Date: Mon, 3 Nov 2025 16:09:58 +0800
Subject: [PATCH 04/13] =?UTF-8?q?fix(=E5=B7=A5=E4=BD=9C=E5=8F=B0):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8DSQLBot=E9=97=AE=E6=95=B0=E5=AD=98=E5=9C=A8url?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E7=9A=84=E6=95=B0=E6=8D=AE=E6=BA=90=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99=E9=97=AE=E9=A2=98=20(#17341)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/dataease/extensions/datasource/vo/Configuration.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/vo/Configuration.java b/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/vo/Configuration.java
index 75c720bd97..288f6db599 100644
--- a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/vo/Configuration.java
+++ b/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/vo/Configuration.java
@@ -4,6 +4,7 @@ import lombok.Data;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 
+import java.util.HashMap;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -68,7 +69,7 @@ public class Configuration {
     protected static final Pattern HOST_PORT_PATTERN = Pattern.compile("//([^:/]+)(?::(\\d+))?");
     protected static final Pattern PARAMETERS_PATTERN = Pattern.compile("([^&=]+)=([^&]*)");
     private static final Pattern DB_NAME_PATTERN = Pattern.compile("//[^/]+/([^?]+)");
-    private Map<String, String> parameters;
+    private Map<String, String> parameters = new HashMap<>();
     protected void parseHostAndPort(String jdbcUrl) {
         Matcher matcher = HOST_PORT_PATTERN.matcher(jdbcUrl);
         if (matcher.find()) {

From 594ccf07c9dcb99c1aab2f9217e69fc4c3a04b92 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Mon, 3 Nov 2025 16:58:44 +0800
Subject: [PATCH 05/13] =?UTF-8?q?feat:=20=E8=A1=8C=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E7=99=BD=E5=90=8D=E5=8D=95=E5=9C=A8=E5=A7=93=E5=90=8D=E5=90=8E?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B4=A6=E5=8F=B7=E7=94=A8=E6=9D=A5=E5=8C=BA?=
 =?UTF-8?q?=E5=88=AB=E5=90=8C=E5=90=8D=E7=94=A8=E6=88=B7=20#17298?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/io/dataease/api/permissions/user/vo/UserItem.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/vo/UserItem.java b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/vo/UserItem.java
index 060214c98e..70de494dd6 100644
--- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/vo/UserItem.java
+++ b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/vo/UserItem.java
@@ -19,4 +19,6 @@ public class UserItem implements Serializable {
     private Long id;
     @Schema(description = "用户名称")
     private String name;
+    @Schema(description = "账号")
+    private String account;
 }

From 7642b51800099dcb82151046a52358a79bf3e3f5 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Mon, 3 Nov 2025 17:00:04 +0800
Subject: [PATCH 06/13] =?UTF-8?q?fix:=20=E6=9B=B4=E6=96=B0xpack=E7=B4=A2?=
 =?UTF-8?q?=E5=BC=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 de-xpack | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/de-xpack b/de-xpack
index 0c887c7830..388e442484 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit 0c887c7830d7170d2a4a84459d27d03f317afcb8
+Subproject commit 388e442484b2f059a0c62c0e6a51a4c77efe547f

From c858c4ff64d7cb8baa984cce8b57720f92f6ed21 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Tue, 4 Nov 2025 14:36:59 +0800
Subject: [PATCH 07/13] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E6=BA=90):=20StarR?=
 =?UTF-8?q?ocks=E6=95=B0=E6=8D=AE=E6=BA=90=E4=BF=9D=E5=AD=98=E5=90=8E=20?=
 =?UTF-8?q?=E6=8E=A7=E5=88=B6=E5=8F=B0=E6=9C=89=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/share/share/ShareTicket.vue              | 10 ++--------
 .../views/visualized/data/datasource/form/index.vue    |  4 ++--
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/core/core-frontend/src/views/share/share/ShareTicket.vue b/core/core-frontend/src/views/share/share/ShareTicket.vue
index d3b7fb75f4..159cc5a7e2 100644
--- a/core/core-frontend/src/views/share/share/ShareTicket.vue
+++ b/core/core-frontend/src/views/share/share/ShareTicket.vue
@@ -301,8 +301,7 @@ onMounted(() => {
 
 <style lang="less" scoped>
 .ticket {
-  height: auto;
-  max-height: 560px;
+  height: 100%;
   .ticket-model {
     display: flex;
     height: 22px;
@@ -378,12 +377,7 @@ onMounted(() => {
     }
   }
   .ticket-table {
-    min-height: 156px;
-    padding: 0 0;
-    height: 50px;
-    overflow-y: overlay;
-    position: relative;
-    height: calc(100% - 124px);
+    height: 400px;
 
     :deep(.ticket-exp-head) {
       display: flex;
diff --git a/core/core-frontend/src/views/visualized/data/datasource/form/index.vue b/core/core-frontend/src/views/visualized/data/datasource/form/index.vue
index acfa234dd9..a95b969ade 100644
--- a/core/core-frontend/src/views/visualized/data/datasource/form/index.vue
+++ b/core/core-frontend/src/views/visualized/data/datasource/form/index.vue
@@ -295,7 +295,7 @@ const continueCreating = () => {
   init(null, pid.value)
 }
 
-const handleShowFinishPage = ({ id, name, pid }) => {
+const handleShowFinishPage = ({ id, name, pid: pidVal }) => {
   isShowFinishPage()
     .then(res => {
       if (editDs.value || !res.data) {
@@ -308,7 +308,7 @@ const handleShowFinishPage = ({ id, name, pid }) => {
       }
     })
     .finally(() => {
-      pid.value = pid
+      pid.value = pidVal
     })
 }
 

From d7925dd2f99edef2f7667b08371f9cbe59d1dc72 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Tue, 4 Nov 2025 16:02:18 +0800
Subject: [PATCH 08/13] =?UTF-8?q?fix(=E7=A7=BB=E5=8A=A8=E7=AB=AF):=20?=
 =?UTF-8?q?=E4=BB=AA=E8=A1=A8=E6=9D=BF=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/mobile/directory/index.vue      | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/core/core-frontend/src/views/mobile/directory/index.vue b/core/core-frontend/src/views/mobile/directory/index.vue
index 96b5631db8..5a15134eed 100644
--- a/core/core-frontend/src/views/mobile/directory/index.vue
+++ b/core/core-frontend/src/views/mobile/directory/index.vue
@@ -1,15 +1,15 @@
 <script lang="ts" setup>
 import dvFolder from '@/assets/svg/dv-folder.svg'
 import icon_dashboard from '@/assets/svg/icon_dashboard.svg'
-
+import { getDefaultSettings } from '@/api/common'
+import { useCache } from '@/hooks/web/useCache'
 import icon_right_outlined from '@/assets/svg/icon_right_outlined.svg'
 import icon_searchOutline_outlined from '@/assets/svg/icon_search-outline_outlined.svg'
 import dvSortAsc from '@/assets/svg/dv-sort-asc.svg'
 import dvSortDesc from '@/assets/svg/dv-sort-desc.svg'
-import { ref, computed, onMounted, watch, onUnmounted } from 'vue'
+import { ref, computed, onMounted, watch } from 'vue'
 import { storeToRefs } from 'pinia'
 import { dvMainStoreWithOut } from '@/store/modules/data-visualization/dvMain'
-import { useCache } from '@/hooks/web/useCache'
 import treeSort from '@/utils/treeSortUtils'
 import { BusiTreeRequest } from '@/models/tree/TreeNode'
 import { interactiveStoreWithOut } from '@/store/modules/interactive'
@@ -31,6 +31,7 @@ const interactiveStore = interactiveStoreWithOut()
 const dvMainStore = dvMainStoreWithOut()
 const { dvInfo } = storeToRefs(dvMainStore)
 const { wsCache } = useCache('sessionStorage')
+const { wsCache: wsCacheLocal } = useCache()
 const { t } = useI18n()
 
 const dfsTree = (ids, arr) => {
@@ -176,15 +177,19 @@ const getTree = async () => {
 }
 
 const setSortType = () => {
-  const type = wsCache.get('mobile-sort-type')
+  let sortType = sortList[Number(wsCacheLocal.get('TreeSort-backend')) ?? 1].value
+  const type = wsCacheLocal.get('mobile-sort-type') ?? sortType
   sortTypeChange(type || curSortType.value)
 }
 
-onUnmounted(() => {
-  wsCache.set('mobile-sort-type', curSortType.value)
-})
+const sortTypeChangeMobile = type => {
+  wsCacheLocal.set('mobile-sort-type', type)
+  sortTypeChange(type)
+}
 
-onMounted(() => {
+onMounted(async () => {
+  const defaultSort = await getDefaultSettings()
+  wsCacheLocal.set('TreeSort-backend', defaultSort['basic.defaultSort'] ?? '1')
   getTree()
   activeDirectName.value = wsCache.get('activeDirectName')
   if (wsCache.get('activeTabbar') !== 'direct' || !activeDirectName.value) return
@@ -239,7 +244,7 @@ onMounted(() => {
             </el-icon>
           </template>
         </el-input>
-        <el-dropdown @command="sortTypeChange" trigger="click">
+        <el-dropdown @command="sortTypeChangeMobile" trigger="click">
           <el-icon class="filter-icon-span">
             <Icon v-if="curSortType.includes('asc')" name="dv-sort-asc" class="opt-icon"
               ><dvSortAsc class="svg-icon opt-icon"

From 6a336fc296f6e28b07f684db9747b0f738aef9a3 Mon Sep 17 00:00:00 2001
From: wisonic <shaochuan.wu@fit2cloud.com>
Date: Tue, 4 Nov 2025 18:39:49 +0800
Subject: [PATCH 09/13] =?UTF-8?q?feat(=E5=9B=BE=E8=A1=A8):=20=E6=B1=87?=
 =?UTF-8?q?=E6=80=BB=E8=A1=A8=E6=94=AF=E6=8C=81=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E6=B1=87=E6=80=BB=20#16766=20#16890?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../charts/impl/table/TableNormalHandler.java | 58 +++++++++++-
 .../src/models/chart/chart-attr.d.ts          |  1 +
 .../core-frontend/src/models/chart/chart.d.ts |  1 +
 .../editor/editor-style/ChartStyle.vue        |  2 +-
 .../{ => table}/SummarySelector.vue           | 90 +++++++++++++++----
 .../js/panel/charts/table/table-normal.ts     |  7 +-
 .../js/panel/common/common_table.ts           |  5 +-
 .../view/dto/ChartViewFieldDTO.java           |  9 ++
 8 files changed, 152 insertions(+), 21 deletions(-)
 rename core/core-frontend/src/views/chart/components/editor/editor-style/components/{ => table}/SummarySelector.vue (65%)

diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/table/TableNormalHandler.java b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/table/TableNormalHandler.java
index 22bdc2fed3..59fa541b89 100644
--- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/table/TableNormalHandler.java
+++ b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/table/TableNormalHandler.java
@@ -4,11 +4,14 @@ import com.fasterxml.jackson.core.type.TypeReference;
 import io.dataease.api.chart.dto.PageInfo;
 import io.dataease.api.dataset.union.DatasetGroupInfoDTO;
 import io.dataease.chart.charts.impl.DefaultChartHandler;
+import io.dataease.constant.DeTypeConstants;
+import io.dataease.engine.constant.ExtFieldConstant;
 import io.dataease.engine.sql.SQLProvider;
 import io.dataease.engine.trans.Dimension2SQLObj;
 import io.dataease.engine.trans.ExtWhere2Str;
 import io.dataease.engine.trans.Quota2SQLObj;
 import io.dataease.engine.utils.Utils;
+import io.dataease.extensions.datasource.dto.DatasetTableFieldDTO;
 import io.dataease.extensions.datasource.dto.DatasourceRequest;
 import io.dataease.extensions.datasource.dto.DatasourceSchemaDTO;
 import io.dataease.extensions.datasource.model.SQLMeta;
@@ -16,9 +19,11 @@ import io.dataease.extensions.datasource.provider.Provider;
 import io.dataease.extensions.view.dto.*;
 import io.dataease.extensions.view.util.ChartDataUtil;
 import io.dataease.extensions.view.util.FieldUtil;
+import io.dataease.utils.IDUtils;
 import io.dataease.utils.JsonUtil;
 import lombok.Getter;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
@@ -110,7 +115,7 @@ public class TableNormalHandler extends DefaultChartHandler {
 
         var tablePageMode = (String) filterResult.getContext().get("tablePageMode");
         var totalPageSql = "SELECT COUNT(*) FROM (" + SQLProvider.createQuerySQLNoSort(sqlMeta, true, view) + ") COUNT_TEMP";
-        if (StringUtils.isNotEmpty(totalPageSql) && StringUtils.equalsIgnoreCase(tablePageMode, "page")) {
+        if (StringUtils.equalsIgnoreCase(tablePageMode, "page")) {
             totalPageSql = provider.rebuildSQL(totalPageSql, sqlMeta, crossDs, dsMap);
             datasourceRequest.setQuery(totalPageSql);
             datasourceRequest.setTotalPageFlag(true);
@@ -131,7 +136,6 @@ public class TableNormalHandler extends DefaultChartHandler {
         List<String[]> data = (List<String[]>) provider.fetchResultField(datasourceRequest).get("data");
         //自定义排序
         data = ChartDataUtil.resultCustomSort(xAxis, yAxis, view.getSortPriority(), data);
-
         var yoyFiltered = filterResult.getContext().get("yoyFiltered") != null;
         if (yoyFiltered) {
             // 这里没加分页，因为加了分页参数可能会把原始数据挤出去
@@ -208,6 +212,56 @@ public class TableNormalHandler extends DefaultChartHandler {
         } catch (Exception e) {
             e.printStackTrace();
         }
+        // 自定义汇总
+        var basicStyle = (Map<String, Object>) view.getCustomAttr().get("basicStyle");
+        var showSummary = BooleanUtils.isTrue((Boolean) basicStyle.get("showSummary"));
+        if (showSummary) {
+            var fieldList = (List) basicStyle.get("seriesSummary");
+            if (CollectionUtils.isNotEmpty(fieldList)) {
+                var customCalcFields = new ArrayList<ChartViewFieldDTO>();
+                var seriesList = JsonUtil.parseList(JsonUtil.toJSONString(fieldList).toString(), new TypeReference<List<ChartViewFieldDTO>>(){});
+                seriesList.forEach(field -> {
+                    if (!BooleanUtils.isTrue(field.getShow()) || !"custom".equalsIgnoreCase(field.getSummary())) {
+                        return;
+                    }
+                    if (StringUtils.isBlank(field.getOriginName())) {
+                        return;
+                    }
+                    field.setSummary("");
+                    field.setDeType(DeTypeConstants.DE_FLOAT);
+                    field.setId(IDUtils.snowID());
+                    field.setExtField(ExtFieldConstant.EXT_CALC);
+                    customCalcFields.add(field);
+                });
+                if (!customCalcFields.isEmpty()) {
+                    var xFields = sqlMeta.getXFields();
+                    // 清空维度值，获取完结果再设置回去
+                    sqlMeta.setXFields(Collections.emptyList());
+                    List<DatasetTableFieldDTO> tmpList = FieldUtil.transFields(allFields);
+                    tmpList.addAll(customCalcFields);
+                    Quota2SQLObj.quota2sqlObj(sqlMeta, customCalcFields, tmpList, crossDs, dsMap, Utils.getParams(FieldUtil.transFields(allFields)), view.getCalParams(), pluginManage);
+                    String customSumSql = SQLProvider.createQuerySQL(sqlMeta, false, !StringUtils.equalsIgnoreCase(dsMap.values().iterator().next().getType(), "es"), view);
+                    customSumSql = provider.rebuildSQL(customSumSql, sqlMeta, crossDs, dsMap);
+                    var customSumReq = new DatasourceRequest();
+                    customSumReq.setIsCross(crossDs);
+                    customSumReq.setDsList(dsMap);
+                    customSumReq.setQuery(customSumSql);
+                    var customSumData = (List<String[]>) provider.fetchResultField(customSumReq).get("data");
+                    if (CollectionUtils.isNotEmpty(customSumData)) {
+                        var customSumResult = new HashMap<String, Double>();
+                        // 只取第一行结果
+                        var customSumArr = customSumData.get(0);
+                        for (int i = 0; i < customSumArr.length; i++) {
+                            if (customCalcFields.get(i) != null) {
+                                customSumResult.put(customCalcFields.get(i).getField(), Double.valueOf(customSumArr[i]));
+                            }
+                        }
+                        result.put("customSumResult", customSumResult);
+                    }
+                    sqlMeta.setXFields(xFields);
+                }
+            }
+        }
         return calcResult;
     }
 }
diff --git a/core/core-frontend/src/models/chart/chart-attr.d.ts b/core/core-frontend/src/models/chart/chart-attr.d.ts
index ed1380f494..65cfa5e8d9 100644
--- a/core/core-frontend/src/models/chart/chart-attr.d.ts
+++ b/core/core-frontend/src/models/chart/chart-attr.d.ts
@@ -306,6 +306,7 @@ declare interface ChartBasicStyle {
     show: boolean
     field: string
     summary: string
+    originName?: string
   }>
   /**
    * 符号地图符号大小最小值
diff --git a/core/core-frontend/src/models/chart/chart.d.ts b/core/core-frontend/src/models/chart/chart.d.ts
index 544d413060..81f9aff462 100644
--- a/core/core-frontend/src/models/chart/chart.d.ts
+++ b/core/core-frontend/src/models/chart/chart.d.ts
@@ -33,6 +33,7 @@ declare interface Chart {
       tableRow: []
     }
     customCalc: any
+    customSumResult?: Record<string, any>
   }
   xAxis?: Axis[]
   xAxisExt?: Axis[]
diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/ChartStyle.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/ChartStyle.vue
index d0b2e5d59d..4b0d35df0e 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/ChartStyle.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/ChartStyle.vue
@@ -9,7 +9,6 @@ import YAxisSelector from '@/views/chart/components/editor/editor-style/componen
 import DualYAxisSelector from '@/views/chart/components/editor/editor-style/components/DualYAxisSelector.vue'
 import TitleSelector from '@/views/chart/components/editor/editor-style/components/TitleSelector.vue'
 import LegendSelector from '@/views/chart/components/editor/editor-style/components/LegendSelector.vue'
-import SummarySelector from '@/views/chart/components/editor/editor-style/components/SummarySelector.vue'
 import { dvMainStoreWithOut } from '@/store/modules/data-visualization/dvMain'
 import { storeToRefs } from 'pinia'
 import CollapseSwitchItem from '@/components/collapse-switch-item/src/CollapseSwitchItem.vue'
@@ -22,6 +21,7 @@ import BackgroundOverallCommon from '@/components/visualization/component-backgr
 import TableHeaderSelector from '@/views/chart/components/editor/editor-style/components/table/TableHeaderSelector.vue'
 import TableCellSelector from '@/views/chart/components/editor/editor-style/components/table/TableCellSelector.vue'
 import TableTotalSelector from '@/views/chart/components/editor/editor-style/components/table/TableTotalSelector.vue'
+import SummarySelector from '@/views/chart/components/editor/editor-style/components/table/SummarySelector.vue'
 import MiscStyleSelector from '@/views/chart/components/editor/editor-style/components/MiscStyleSelector.vue'
 import IndicatorValueSelector from '@/views/chart/components/editor/editor-style/components/IndicatorValueSelector.vue'
 import IndicatorNameSelector from '@/views/chart/components/editor/editor-style/components/IndicatorNameSelector.vue'
diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/components/SummarySelector.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/components/table/SummarySelector.vue
similarity index 65%
rename from core/core-frontend/src/views/chart/components/editor/editor-style/components/SummarySelector.vue
rename to core/core-frontend/src/views/chart/components/editor/editor-style/components/table/SummarySelector.vue
index 5a8878151c..61d87a3c71 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/SummarySelector.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/table/SummarySelector.vue
@@ -1,10 +1,12 @@
 <script setup lang="ts">
 import { useI18n } from '@/hooks/web/useI18n'
-import { computed, onMounted, PropType, reactive, watch } from 'vue'
+import { computed, onMounted, PropType, reactive, watch, ref, nextTick, inject } from 'vue'
 import { DEFAULT_BASIC_STYLE } from '@/views/chart/components/editor/util/chart'
 import { cloneDeep, defaultsDeep, filter, find } from 'lodash-es'
 import { dvMainStoreWithOut } from '@/store/modules/data-visualization/dvMain'
 import { storeToRefs } from 'pinia'
+import CustomAggrEdit from './CustomAggrEdit.vue'
+
 const dvMainStore = dvMainStoreWithOut()
 const { batchOptStatus } = storeToRefs(dvMainStore)
 const { t } = useI18n()
@@ -30,6 +32,7 @@ const state = reactive({
     show: boolean
     field: string
     summary: string
+    originName?: string
   }
 })
 
@@ -37,7 +40,12 @@ const emit = defineEmits(['onBasicStyleChange'])
 const changeBasicStyle = (prop?: string, requestData = false) => {
   emit('onBasicStyleChange', { data: state.basicStyleForm, requestData }, prop)
 }
-
+const changeSummaryType = () => {
+  if (state.currentAxisSummary.summary === 'custom' && !state.currentAxisSummary.originName) {
+    return
+  }
+  changeBasicStyle('seriesSummary')
+}
 watch(
   [
     () => props.chart.customAttr.basicStyle.showSummary,
@@ -65,15 +73,38 @@ const summaryTypes = [
   { key: 'sum', name: t('chart.sum') },
   { key: 'avg', name: t('chart.avg') },
   { key: 'max', name: t('chart.max') },
-  { key: 'min', name: t('chart.min') }
-  // { key: 'stddev_pop', name: t('chart.stddev_pop') },
-  // { key: 'var_pop', name: t('chart.var_pop') }
+  { key: 'min', name: t('chart.min') },
+  { key: 'custom', name: t('commons.custom') }
 ]
 
 function onSelectAxis(value) {
   state.currentAxisSummary = find(state.basicStyleForm.seriesSummary, s => s.field === value)
 }
 
+const calcEdit = ref()
+const editCalcField = ref(false)
+const dimension = inject('dimension', () => [])
+const quota = inject('quota', () => [])
+const editField = () => {
+  editCalcField.value = true
+  nextTick(() => {
+    calcEdit.value.initEdit(
+      state.currentAxisSummary,
+      quota().filter(ele => ele.id !== '-1')
+    )
+  })
+}
+const closeEditCalc = () => {
+  editCalcField.value = false
+}
+const confirmEditCalc = () => {
+  calcEdit.value.setFieldForm()
+  const obj = cloneDeep(calcEdit.value.fieldForm)
+  state.currentAxisSummary.originName = obj.originName
+  setFieldDefaultValue(state.currentAxisSummary)
+  closeEditCalc()
+  changeSummaryType()
+}
 const init = () => {
   const basicStyle = cloneDeep(props.chart.customAttr.basicStyle)
 
@@ -112,7 +143,14 @@ const init = () => {
     state.currentAxisSummary = undefined
   }
 }
-
+const setFieldDefaultValue = field => {
+  field.extField = 2
+  field.chartId = props.chart.id
+  field.datasetGroupId = props.chart.tableId
+  field.lastSyncTime = null
+  field.columnIndex = dimension().length + quota().length
+  field.deExtractType = field.deType
+}
 onMounted(() => {
   init()
 })
@@ -173,21 +211,41 @@ onMounted(() => {
 
         <div class="indented-container">
           <el-form-item class="form-item" :class="'form-item-' + themes">
-            <el-select
-              v-model="state.currentAxisSummary.summary"
-              :class="'form-item-' + themes"
-              class="form-item"
-              :effect="themes"
-              :disabled="!state.currentAxisSummary.show"
-              @change="changeBasicStyle('seriesSummary')"
-            >
-              <el-option v-for="c in summaryTypes" :key="c.key" :value="c.key" :label="c.name" />
-            </el-select>
+            <el-col :span="state.currentAxisSummary.summary === 'custom' ? 19 : 22" :offset="2">
+              <el-select
+                v-model="state.currentAxisSummary.summary"
+                :class="'form-item-' + themes"
+                class="form-item"
+                :effect="themes"
+                :disabled="!state.currentAxisSummary.show"
+                @change="changeSummaryType"
+              >
+                <el-option v-for="c in summaryTypes" :key="c.key" :value="c.key" :label="c.name" />
+              </el-select>
+            </el-col>
+            <el-col v-if="state.currentAxisSummary.summary === 'custom'" :span="2" :offset="1">
+              <el-icon style="cursor: pointer">
+                <Setting @click="editField()" />
+              </el-icon>
+            </el-col>
           </el-form-item>
         </div>
       </template>
     </el-form>
   </div>
+  <!--图表计算字段-->
+  <el-dialog
+    v-model="editCalcField"
+    width="1000px"
+    title="自定义总计"
+    :close-on-click-modal="false"
+  >
+    <custom-aggr-edit ref="calcEdit" />
+    <template #footer>
+      <el-button secondary @click="closeEditCalc()">{{ t('dataset.cancel') }} </el-button>
+      <el-button type="primary" @click="confirmEditCalc()">{{ t('dataset.confirm') }} </el-button>
+    </template>
+  </el-dialog>
 </template>
 
 <style scoped lang="less">
diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/table/table-normal.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/table/table-normal.ts
index d57da03bca..665655559a 100644
--- a/core/core-frontend/src/views/chart/components/js/panel/charts/table/table-normal.ts
+++ b/core/core-frontend/src/views/chart/components/js/panel/charts/table/table-normal.ts
@@ -354,7 +354,12 @@ export class TableNormal extends S2ChartView<TableSheet> {
       s2Options.style.rowCfg = { heightByField }
       // 计算汇总加入到数据里，冻结最后一行
       s2Options.frozenTrailingRowCount = 1
-      const summaryObj = getSummaryRow(data, yAxis, basicStyle.seriesSummary) as any
+      const summaryObj = getSummaryRow(
+        data,
+        yAxis,
+        basicStyle.seriesSummary,
+        chart.data.customSumResult
+      ) as any
       data.push(summaryObj)
     }
     s2Options.dataCell = viewMeta => {
diff --git a/core/core-frontend/src/views/chart/components/js/panel/common/common_table.ts b/core/core-frontend/src/views/chart/components/js/panel/common/common_table.ts
index 91e77f52a4..14a8534949 100644
--- a/core/core-frontend/src/views/chart/components/js/panel/common/common_table.ts
+++ b/core/core-frontend/src/views/chart/components/js/panel/common/common_table.ts
@@ -2389,7 +2389,7 @@ const getWrapTextHeight = (wrapText, textStyle, spreadsheet, maxLines) => {
 }
 
 // 导出获取汇总行的函数
-export function getSummaryRow(data, axis, sumCon = []) {
+export function getSummaryRow(data, axis, sumCon = [], customSumResult = {}) {
   const summaryObj = { SUMMARY: true }
   for (let i = 0; i < axis.length; i++) {
     const a = axis[i].dataeaseName
@@ -2473,6 +2473,9 @@ export function getSummaryRow(data, axis, sumCon = []) {
             .toNumber() // 计算总体标准差
         }
         break
+      case 'custom':
+        summaryObj[a] = customSumResult[a]
+        break
     }
   }
 
diff --git a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartViewFieldDTO.java b/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartViewFieldDTO.java
index c907c2280c..2096a8fc23 100644
--- a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartViewFieldDTO.java
+++ b/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartViewFieldDTO.java
@@ -1,6 +1,8 @@
 package io.dataease.extensions.view.dto;
 
+import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -34,4 +36,11 @@ public class ChartViewFieldDTO extends ChartViewFieldBaseDTO implements Serializ
      */
     @JsonIgnore
     private FieldSource source;
+
+    /**
+     * 显隐
+     */
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
+    private Boolean show;
+    private String field;
 }

From 06ce149ba4f9cfd01fadcf7d371086522e9dd885 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=98=89=E8=B1=AA?=
 <42510293+ziyujiahao@users.noreply.github.com>
Date: Wed, 5 Nov 2025 14:41:22 +0800
Subject: [PATCH 10/13] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=AA=E8=A1=A8=E6=9D=BF=E6=9C=AA=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E6=82=AC=E6=B5=AE=E6=8C=89=E9=92=AE=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=20(#17362)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/data-visualization/canvas/DePreview.vue  | 3 +--
 .../src/views/data-visualization/DvPreview.vue              | 6 ++++++
 .../src/views/data-visualization/PreviewCanvasMobile.vue    | 1 +
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/core/core-frontend/src/components/data-visualization/canvas/DePreview.vue b/core/core-frontend/src/components/data-visualization/canvas/DePreview.vue
index 265f59e1a3..bf75c5ddcd 100644
--- a/core/core-frontend/src/components/data-visualization/canvas/DePreview.vue
+++ b/core/core-frontend/src/components/data-visualization/canvas/DePreview.vue
@@ -511,8 +511,7 @@ const dataVPreview = computed(
 const linkOptBarShow = computed(() => {
   return Boolean(
     canvasStyleData.value.suspensionButtonAvailable &&
-      !inMobile.value &&
-      !mobileInPc.value &&
+      ((!inMobile.value && !mobileInPc.value) || !isDashboard()) &&
       showPopBar.value &&
       !isDesktopFlag
   )
diff --git a/core/core-frontend/src/views/data-visualization/DvPreview.vue b/core/core-frontend/src/views/data-visualization/DvPreview.vue
index ed1927466e..19c6349401 100644
--- a/core/core-frontend/src/views/data-visualization/DvPreview.vue
+++ b/core/core-frontend/src/views/data-visualization/DvPreview.vue
@@ -42,6 +42,11 @@ const props = defineProps({
     type: String,
     default: 'preview'
   },
+  // 显示悬浮按钮
+  showPopBar: {
+    type: Boolean,
+    default: false
+  },
   downloadStatus: {
     required: false,
     type: Boolean,
@@ -133,6 +138,7 @@ defineExpose({
         :show-position="showPosition"
         :download-status="downloadStatus"
         :outer-screen-adaptor="screenAdaptor"
+        :show-pop-bar="showPopBar"
         :show-linkage-button="showLinkageButton"
       ></de-preview>
     </div>
diff --git a/core/core-frontend/src/views/data-visualization/PreviewCanvasMobile.vue b/core/core-frontend/src/views/data-visualization/PreviewCanvasMobile.vue
index cf000a622f..addec42b8f 100644
--- a/core/core-frontend/src/views/data-visualization/PreviewCanvasMobile.vue
+++ b/core/core-frontend/src/views/data-visualization/PreviewCanvasMobile.vue
@@ -215,6 +215,7 @@ defineExpose({
       :canvas-view-info="state.canvasViewInfoPreview"
       :dv-info="state.dvInfo"
       :cur-gap="state.curPreviewGap"
+      :show-pop-bar="true"
       :show-linkage-button="false"
       :is-selector="props.isSelector"
     ></de-preview>

From 574b177bb9c7c6186a2e3b67ab0c56fa97c07615 Mon Sep 17 00:00:00 2001
From: wisonic <shaochuan.wu@fit2cloud.com>
Date: Wed, 5 Nov 2025 15:11:14 +0800
Subject: [PATCH 11/13] =?UTF-8?q?feat(=E5=9B=BE=E8=A1=A8):=20=E6=B0=B4?=
 =?UTF-8?q?=E6=B3=A2=E5=9B=BE=E6=94=AF=E6=8C=81=E8=BE=B9=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/locales/en.ts          |  5 +-
 core/core-frontend/src/locales/tw.ts          |  5 +-
 core/core-frontend/src/locales/zh-CN.ts       |  5 +-
 .../src/models/chart/chart-attr.d.ts          | 12 +++++
 .../editor-style/components/MiscSelector.vue  | 53 +++++++++++++++++++
 .../chart/components/editor/util/chart.ts     |  5 +-
 .../js/panel/charts/liquid/liquid.ts          | 20 ++++++-
 7 files changed, 100 insertions(+), 5 deletions(-)

diff --git a/core/core-frontend/src/locales/en.ts b/core/core-frontend/src/locales/en.ts
index 26760f9f72..07bc1f3b2a 100644
--- a/core/core-frontend/src/locales/en.ts
+++ b/core/core-frontend/src/locales/en.ts
@@ -2120,7 +2120,10 @@ export default {
     table_field_total_label: 'Field Alias',
     table_row_header_freeze: 'Row Header Freeze',
     value_formatter_total_out_percent: 'Show percentage',
-    enable_slider_tip: 'After enabling the slider, the carousel prompt will be disabled.'
+    enable_slider_tip: 'After enabling the slider, the carousel prompt will be disabled.',
+    liquid_show_border: 'Show Border',
+    liquid_border_width: 'Border Width',
+    liquid_border_distance: 'Border Distance'
   },
   dataset: {
     field_value: 'Field Value',
diff --git a/core/core-frontend/src/locales/tw.ts b/core/core-frontend/src/locales/tw.ts
index 0aab576065..19e2ac4ed0 100644
--- a/core/core-frontend/src/locales/tw.ts
+++ b/core/core-frontend/src/locales/tw.ts
@@ -2061,7 +2061,10 @@ export default {
     table_field_total_label: '字段別名',
     table_row_header_freeze: '行頭凍結',
     value_formatter_total_out_percent: '顯示佔比',
-    enable_slider_tip: '開啟縮略軸後，輪播提示將會失效'
+    enable_slider_tip: '開啟縮略軸後，輪播提示將會失效',
+    liquid_show_border: '顯示邊框',
+    liquid_border_width: '邊框寬度',
+    liquid_border_distance: '邊框間距'
   },
   dataset: {
     field_value: '欄位值',
diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts
index 455901d995..c2bb280be6 100644
--- a/core/core-frontend/src/locales/zh-CN.ts
+++ b/core/core-frontend/src/locales/zh-CN.ts
@@ -2070,7 +2070,10 @@ export default {
     table_field_total_label: '字段别名',
     table_row_header_freeze: '行头冻结',
     value_formatter_total_out_percent: '显示占比',
-    enable_slider_tip: '开启缩略轴后，轮播提示将会失效'
+    enable_slider_tip: '开启缩略轴后，轮播提示将会失效',
+    liquid_show_border: '显示边框',
+    liquid_border_width: '边框宽度',
+    liquid_border_distance: '边框间距'
   },
   dataset: {
     field_value: '字段值',
diff --git a/core/core-frontend/src/models/chart/chart-attr.d.ts b/core/core-frontend/src/models/chart/chart-attr.d.ts
index 65cfa5e8d9..eeb7916a68 100644
--- a/core/core-frontend/src/models/chart/chart-attr.d.ts
+++ b/core/core-frontend/src/models/chart/chart-attr.d.ts
@@ -730,6 +730,18 @@ declare interface ChartMiscAttr {
    * 水波图形状
    */
   liquidShape: string
+  /**
+   * 水波图边框显示
+   */
+  liquidShowBorder: boolean
+  /**
+   * 水波图边框宽度
+   */
+  liquidBorderWidth: number
+  /**
+   * 水波图边框距离
+   */
+  liquidBorderDistance: number
   /**
    * 地图倾角
    */
diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/components/MiscSelector.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/components/MiscSelector.vue
index ee6ef95496..d01d2d5afe 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/MiscSelector.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/MiscSelector.vue
@@ -553,6 +553,59 @@ onMounted(() => {
     <!--gauge-end-->
 
     <!--liquid-begin-->
+    <el-form-item
+      v-show="showProperty('liquidShowBorder')"
+      class="form-item"
+      :class="'form-item-' + themes"
+    >
+      <el-checkbox
+        :effect="themes"
+        v-model="state.miscForm.liquidShowBorder"
+        @change="changeMisc('liquidShowBorder')"
+      >
+        {{ t('chart.liquid_show_border') }}
+      </el-checkbox>
+    </el-form-item>
+    <el-row :guter="8">
+      <el-col :span="12">
+        <el-form-item
+          v-show="showProperty('liquidBorderWidth')"
+          class="form-item"
+          :label="t('chart.liquid_border_width')"
+          :class="'form-item-' + themes"
+        >
+          <el-input-number
+            v-model="state.miscForm.liquidBorderWidth"
+            :disabled="!state.miscForm.liquidShowBorder"
+            :effect="themes"
+            :min="1"
+            :max="100"
+            size="small"
+            controls-position="right"
+            @change="changeMisc('liquidBorderWidth')"
+          />
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item
+          v-show="showProperty('liquidBorderDistance')"
+          class="form-item"
+          :label="t('chart.liquid_border_distance')"
+          :class="'form-item-' + themes"
+        >
+          <el-input-number
+            v-model="state.miscForm.liquidBorderDistance"
+            :disabled="!state.miscForm.liquidShowBorder"
+            :effect="themes"
+            :min="1"
+            :max="100"
+            size="small"
+            controls-position="right"
+            @change="changeMisc('liquidBorderDistance')"
+          />
+        </el-form-item>
+      </el-col>
+    </el-row>
     <el-row :gutter="8">
       <el-col :span="12">
         <el-form-item
diff --git a/core/core-frontend/src/views/chart/components/editor/util/chart.ts b/core/core-frontend/src/views/chart/components/editor/util/chart.ts
index f360749c69..d9ec58e59c 100644
--- a/core/core-frontend/src/views/chart/components/editor/util/chart.ts
+++ b/core/core-frontend/src/views/chart/components/editor/util/chart.ts
@@ -344,7 +344,10 @@ export const DEFAULT_MISC: ChartMiscAttr = {
         symbolSize: 4
       }
     }
-  }
+  },
+  liquidShowBorder: false,
+  liquidBorderWidth: 4,
+  liquidBorderDistance: 8
 }
 
 export const DEFAULT_MARK = {
diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/liquid/liquid.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/liquid/liquid.ts
index f31692f012..aaa38f4edf 100644
--- a/core/core-frontend/src/views/chart/components/js/panel/charts/liquid/liquid.ts
+++ b/core/core-frontend/src/views/chart/components/js/panel/charts/liquid/liquid.ts
@@ -7,6 +7,7 @@ import { flow, hexColorToRGBA, parseJson } from '@/views/chart/components/js/uti
 import { DEFAULT_MISC } from '@/views/chart/components/editor/util/chart'
 import { valueFormatter } from '@/views/chart/components/js/formatter'
 import { useI18n } from '@/hooks/web/useI18n'
+import { defaultsDeep } from 'lodash-es'
 
 const { t } = useI18n()
 const DEFAULT_LIQUID_DATA = []
@@ -28,7 +29,15 @@ export class Liquid extends G2PlotChartView<LiquidOptions, G2Liquid> {
     'border-style': ['all'],
     'basic-style-selector': ['colors', 'alpha'],
     'label-selector': ['fontSize', 'color', 'labelFormatter'],
-    'misc-selector': ['liquidShape', 'liquidSize', 'liquidMaxType', 'liquidMaxField'],
+    'misc-selector': [
+      'liquidShape',
+      'liquidSize',
+      'liquidMaxType',
+      'liquidMaxField',
+      'liquidShowBorder',
+      'liquidBorderWidth',
+      'liquidBorderDistance'
+    ],
     'title-selector': [
       'title',
       'fontSize',
@@ -131,6 +140,15 @@ export class Liquid extends G2PlotChartView<LiquidOptions, G2Liquid> {
       radius: radius,
       shape: shape
     }
+    const { misc } = customAttr
+    if (misc?.liquidShowBorder) {
+      defaultsDeep(size, {
+        outline: {
+          border: misc.liquidBorderWidth ?? DEFAULT_MISC.liquidBorderWidth,
+          distance: misc.liquidBorderDistance ?? DEFAULT_MISC.liquidBorderDistance
+        }
+      })
+    }
     return { ...options, ...size }
   }
 

From 04b4a574d87fdaa8b21ebbc0e8fc196eb37da53a Mon Sep 17 00:00:00 2001
From: wisonic <shaochuan.wu@fit2cloud.com>
Date: Wed, 5 Nov 2025 17:45:18 +0800
Subject: [PATCH 12/13] =?UTF-8?q?fix(=E5=9B=BE=E8=A1=A8):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E6=B1=87=E6=80=BB=E8=A1=A8=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E6=B1=87=E6=80=BB=E7=A9=BA=E5=80=BC=E5=AF=BC=E8=87=B4=E5=9B=BE?=
 =?UTF-8?q?=E8=A1=A8=E6=B8=B2=E6=9F=93=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../charts/impl/table/TableNormalHandler.java    | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/table/TableNormalHandler.java b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/table/TableNormalHandler.java
index 59fa541b89..bcd7846dc4 100644
--- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/table/TableNormalHandler.java
+++ b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/table/TableNormalHandler.java
@@ -28,7 +28,9 @@ import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 
+import java.math.BigDecimal;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @author jianneng
@@ -220,6 +222,7 @@ public class TableNormalHandler extends DefaultChartHandler {
             if (CollectionUtils.isNotEmpty(fieldList)) {
                 var customCalcFields = new ArrayList<ChartViewFieldDTO>();
                 var seriesList = JsonUtil.parseList(JsonUtil.toJSONString(fieldList).toString(), new TypeReference<List<ChartViewFieldDTO>>(){});
+                var quotaIds = allFields.stream().map(DatasetTableFieldDTO::getDataeaseName).collect(Collectors.toSet());
                 seriesList.forEach(field -> {
                     if (!BooleanUtils.isTrue(field.getShow()) || !"custom".equalsIgnoreCase(field.getSummary())) {
                         return;
@@ -227,6 +230,9 @@ public class TableNormalHandler extends DefaultChartHandler {
                     if (StringUtils.isBlank(field.getOriginName())) {
                         return;
                     }
+                    if (!quotaIds.contains(field.getField())) {
+                        return;
+                    }
                     field.setSummary("");
                     field.setDeType(DeTypeConstants.DE_FLOAT);
                     field.setId(IDUtils.snowID());
@@ -248,12 +254,16 @@ public class TableNormalHandler extends DefaultChartHandler {
                     customSumReq.setQuery(customSumSql);
                     var customSumData = (List<String[]>) provider.fetchResultField(customSumReq).get("data");
                     if (CollectionUtils.isNotEmpty(customSumData)) {
-                        var customSumResult = new HashMap<String, Double>();
+                        var customSumResult = new HashMap<String, BigDecimal>();
                         // 只取第一行结果
                         var customSumArr = customSumData.get(0);
                         for (int i = 0; i < customSumArr.length; i++) {
-                            if (customCalcFields.get(i) != null) {
-                                customSumResult.put(customCalcFields.get(i).getField(), Double.valueOf(customSumArr[i]));
+                            if (customCalcFields.get(i) != null && customSumArr[i] != null) {
+                                try {
+                                    customSumResult.put(customCalcFields.get(i).getField(), new BigDecimal(customSumArr[i]));
+                                } catch (Exception e) {
+                                    customSumResult.put(customCalcFields.get(i).getField(), new BigDecimal(0));
+                                }
                             }
                         }
                         result.put("customSumResult", customSumResult);

From 4d248e9318ed6f49fed69c724d0cd2bd8bffe910 Mon Sep 17 00:00:00 2001
From: xuwei-fit2cloud <wei@fit2cloud.com>
Date: Wed, 5 Nov 2025 17:59:45 +0800
Subject: [PATCH 13/13] Update dataease.version to 2.10.16

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 5ab9e1e329..89d88d7eb4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
     </parent>
 
     <properties>
-        <dataease.version>2.10.15</dataease.version>
+        <dataease.version>2.10.16</dataease.version>
         <java.version>21</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <spring-cloud-alibaba.version>2023.0.1.0</spring-cloud-alibaba.version>