From 9d23f958b9548055cdd78fe7f7938ea0c32624f5 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Mon, 15 Jun 2026 14:13:03 +0800
Subject: [PATCH 1/6] =?UTF-8?q?feat(X-Pack):=20=E4=B8=9A=E5=8A=A1=E8=B5=84?=
 =?UTF-8?q?=E6=BA=90=E6=A0=91=E5=B1=95=E7=A4=BA=E5=AE=8C=E6=95=B4=E8=B7=AF?=
 =?UTF-8?q?=E5=BE=84=EF=BC=8C=E9=81=BF=E5=85=8D=E6=96=AD=E5=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/locales/en.ts          |  1 +
 core/core-frontend/src/locales/tw.ts          |  1 +
 core/core-frontend/src/locales/zh-CN.ts       |  1 +
 .../src/views/common/DeResourceTree.vue       | 15 ++++++++---
 .../views/visualized/data/dataset/index.vue   | 21 +++++++++++++---
 .../visualized/data/datasource/index.vue      | 25 ++++++++++++++-----
 6 files changed, 50 insertions(+), 14 deletions(-)

diff --git a/core/core-frontend/src/locales/en.ts b/core/core-frontend/src/locales/en.ts
index 40d144f766..55db08725b 100644
--- a/core/core-frontend/src/locales/en.ts
+++ b/core/core-frontend/src/locales/en.ts
@@ -3017,6 +3017,7 @@ export default {
     to_top: 'Pin to Top',
     publish_recover: 'Revert Publish',
     publish_tips1: 'Visible after publication',
+    no_permission_tips: 'No permission',
     publish_tips2: 'Available after publication {0}',
     cancel_publish_tips: 'Successfully unpublished',
     resource_not_published: 'Resource not published',
diff --git a/core/core-frontend/src/locales/tw.ts b/core/core-frontend/src/locales/tw.ts
index d5085e8dcf..f53c5def72 100644
--- a/core/core-frontend/src/locales/tw.ts
+++ b/core/core-frontend/src/locales/tw.ts
@@ -2934,6 +2934,7 @@ export default {
     to_top: '置頂',
     publish_recover: '恢復到發佈版本',
     publish_tips1: '發佈後可查看',
+    no_permission_tips: '當前資源無權限',
     publish_tips2: '發佈後可{0}',
     cancel_publish_tips: '取消發佈成功',
     resource_not_published: '该資源未發佈',
diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts
index 987a4a53a4..8492244e5a 100644
--- a/core/core-frontend/src/locales/zh-CN.ts
+++ b/core/core-frontend/src/locales/zh-CN.ts
@@ -2940,6 +2940,7 @@ export default {
     to_top: '置顶',
     publish_recover: '恢复到发布版本',
     publish_tips1: '发布后可查看',
+    no_permission_tips: '当前资源无权限',
     publish_tips2: '发布后可{0}',
     cancel_publish_tips: '取消发布成功',
     resource_not_published: '该资源未发布',
diff --git a/core/core-frontend/src/views/common/DeResourceTree.vue b/core/core-frontend/src/views/common/DeResourceTree.vue
index a88b89be7a..3c60952952 100644
--- a/core/core-frontend/src/views/common/DeResourceTree.vue
+++ b/core/core-frontend/src/views/common/DeResourceTree.vue
@@ -81,7 +81,7 @@ const props = defineProps({
 const defaultProps = {
   children: 'children',
   label: 'name',
-  disabled: (data: any) => data.extraFlag1 === 0
+  disabled: (data: any) => data.extraFlag1 === 0 || data.weight === 0
 }
 const mounted = ref(false)
 const rootManage = ref(false)
@@ -785,7 +785,10 @@ defineExpose({
         draggable
       >
         <template #default="{ node, data }">
-          <span class="custom-tree-node" :class="{ 'node-disabled-custom': data.extraFlag1 === 0 }">
+          <span
+            class="custom-tree-node"
+            :class="{ 'node-disabled-custom': data.extraFlag1 === 0 || data.weight === 0 }"
+          >
             <el-icon style="font-size: 18px" v-if="!data.leaf">
               <Icon name="dv-folder"><dvFolder class="svg-icon" /></Icon>
             </el-icon>
@@ -815,8 +818,12 @@ defineExpose({
               <el-tooltip
                 class="box-item"
                 effect="dark"
-                :content="t('visualization.publish_tips1')"
-                :disabled="data.extraFlag1"
+                :content="
+                  data.weight === 0
+                    ? t('visualization.no_permission_tips')
+                    : t('visualization.publish_tips1')
+                "
+                :disabled="data.extraFlag1 && data.weight > 0"
                 placement="top-start"
               >
                 {{ node.label }}
diff --git a/core/core-frontend/src/views/visualized/data/dataset/index.vue b/core/core-frontend/src/views/visualized/data/dataset/index.vue
index fa431fec58..70aa904190 100644
--- a/core/core-frontend/src/views/visualized/data/dataset/index.vue
+++ b/core/core-frontend/src/views/visualized/data/dataset/index.vue
@@ -361,7 +361,7 @@ const tableData = shallowRef([])
 const total = ref(null)
 
 const handleNodeClick = (data: BusiTreeNode) => {
-  if (!data.leaf) {
+  if (!data.leaf || data.weight === 0) {
     datasetListTree.value.setCurrentKey(null)
     return
   }
@@ -700,7 +700,8 @@ const datasetTypeList = computed(() => {
 
 const defaultProps = {
   children: 'children',
-  label: 'name'
+  label: 'name',
+  disabled: (data: any) => data.weight === 0
 }
 
 const defaultTab = [
@@ -947,14 +948,21 @@ const proxyAllowDrop = throttle((arg1, arg2) => {
             @node-click="handleNodeClick"
           >
             <template #default="{ node, data }">
-              <span class="custom-tree-node">
+              <span class="custom-tree-node" :class="{ 'node-disabled-custom': data.weight === 0 }">
                 <el-icon v-if="!data.leaf" style="font-size: 18px">
                   <Icon name="dv-folder"><dvFolder class="svg-icon" /></Icon>
                 </el-icon>
                 <el-icon v-if="data.leaf" style="font-size: 18px">
                   <Icon name="icon_dataset"><icon_dataset class="svg-icon" /></Icon>
                 </el-icon>
-                <span :title="node.label" class="label-tooltip ellipsis">{{ node.label }}</span>
+                <el-tooltip
+                  effect="dark"
+                  :content="t('visualization.no_permission_tips')"
+                  :disabled="data.weight > 0"
+                  placement="top-start"
+                >
+                  <span :title="node.label" class="label-tooltip ellipsis">{{ node.label }}</span>
+                </el-tooltip>
                 <div class="icon-more" v-if="data.weight >= 7">
                   <handle-more
                     icon-size="24px"
@@ -1470,4 +1478,9 @@ const proxyAllowDrop = throttle((arg1, arg2) => {
     }
   }
 }
+
+.node-disabled-custom {
+  color: rgba(187, 191, 196, 1);
+  cursor: not-allowed;
+}
 </style>
diff --git a/core/core-frontend/src/views/visualized/data/datasource/index.vue b/core/core-frontend/src/views/visualized/data/datasource/index.vue
index 1afe9a6e7a..56b316b24b 100644
--- a/core/core-frontend/src/views/visualized/data/datasource/index.vue
+++ b/core/core-frontend/src/views/visualized/data/datasource/index.vue
@@ -583,7 +583,7 @@ const sortTypeTip = computed(() => {
 const tableData = shallowRef([])
 const tabData = shallowRef([])
 const handleNodeClick = data => {
-  if (!data.leaf) {
+  if (!data.leaf || data.weight === 0) {
     dsListTree.value.setCurrentKey(null)
     return
   }
@@ -1054,7 +1054,8 @@ const uploadExcel = editType => {
 const activeName = ref('table')
 const defaultProps = {
   children: 'children',
-  label: 'name'
+  label: 'name',
+  disabled: (data: any) => data.weight === 0
 }
 
 const loadInit = () => {
@@ -1231,7 +1232,7 @@ const getMenuList = (val: boolean) => {
             @node-click="handleNodeClick"
           >
             <template #default="{ node, data }">
-              <span class="custom-tree-node" style="position: relative">
+              <span class="custom-tree-node" style="position: relative" :class="{ 'node-disabled-custom': data.weight === 0 }">
                 <el-icon :class="data.leaf && 'icon-border'" style="font-size: 18px">
                   <Icon :static-content="getDsIcon(data)"
                     ><component class="svg-icon" :is="getDsIconName(data)"></component
@@ -1243,18 +1244,25 @@ const getMenuList = (val: boolean) => {
                 >
                   <Icon><icon_warning_colorful_red class="svg-icon" /></Icon>
                 </el-icon>
-                <span
+                <el-tooltip
+                  effect="dark"
+                  :content="t('visualization.no_permission_tips')"
+                  :disabled="data.weight > 0"
+                  placement="top-start"
+                >
+                  <span
                   :title="node.label"
                   class="label-tooltip ellipsis"
                   :class="data.type === 'Excel' && 'excel'"
                   v-if="data.extraFlag > -1"
                   >{{ node.label }}</span
                 >
+                </el-tooltip>
                 <el-tooltip
                   effect="dark"
                   v-else
-                  :content="`${t('data_set.invalid_data_source')}: ${node.label}`"
-                  placement="top"
+                  :content="data.weight === 0 ? t('visualization.no_permission_tips') : `${t('data_set.invalid_data_source')}: ${node.label}`"
+                  placement="top-start"
                 >
                   <span
                     :title="node.label"
@@ -2428,6 +2436,11 @@ const getMenuList = (val: boolean) => {
     }
   }
 }
+
+.node-disabled-custom {
+  color: rgba(187, 191, 196, 1);
+  cursor: not-allowed;
+}
 </style>
 <style lang="less">
 .record-drawer {

From 576d5eaa9a226737eb153779fd673c6e5a87b5e9 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Mon, 15 Jun 2026 14:48:37 +0800
Subject: [PATCH 2/6] =?UTF-8?q?perf(=E6=95=B0=E6=8D=AE=E6=BA=90):=20?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90=E6=A0=91=E5=B1=95=E7=A4=BA=E5=AE=8C?=
 =?UTF-8?q?=E6=95=B4=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../visualized/data/datasource/index.vue      | 27 ++++++++++++-------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/core/core-frontend/src/views/visualized/data/datasource/index.vue b/core/core-frontend/src/views/visualized/data/datasource/index.vue
index 56b316b24b..2ab96a0d87 100644
--- a/core/core-frontend/src/views/visualized/data/datasource/index.vue
+++ b/core/core-frontend/src/views/visualized/data/datasource/index.vue
@@ -1232,7 +1232,11 @@ const getMenuList = (val: boolean) => {
             @node-click="handleNodeClick"
           >
             <template #default="{ node, data }">
-              <span class="custom-tree-node" style="position: relative" :class="{ 'node-disabled-custom': data.weight === 0 }">
+              <span
+                class="custom-tree-node"
+                style="position: relative"
+                :class="{ 'node-disabled-custom': data.weight === 0 }"
+              >
                 <el-icon :class="data.leaf && 'icon-border'" style="font-size: 18px">
                   <Icon :static-content="getDsIcon(data)"
                     ><component class="svg-icon" :is="getDsIconName(data)"></component
@@ -1245,23 +1249,28 @@ const getMenuList = (val: boolean) => {
                   <Icon><icon_warning_colorful_red class="svg-icon" /></Icon>
                 </el-icon>
                 <el-tooltip
+                  v-if="data.extraFlag > -1"
                   effect="dark"
                   :content="t('visualization.no_permission_tips')"
                   :disabled="data.weight > 0"
                   placement="top-start"
                 >
                   <span
-                  :title="node.label"
-                  class="label-tooltip ellipsis"
-                  :class="data.type === 'Excel' && 'excel'"
-                  v-if="data.extraFlag > -1"
-                  >{{ node.label }}</span
-                >
+                    :title="node.label"
+                    class="label-tooltip ellipsis"
+                    :class="data.type === 'Excel' && 'excel'"
+                    v-if="data.extraFlag > -1"
+                    >{{ node.label }}</span
+                  >
                 </el-tooltip>
                 <el-tooltip
-                  effect="dark"
                   v-else
-                  :content="data.weight === 0 ? t('visualization.no_permission_tips') : `${t('data_set.invalid_data_source')}: ${node.label}`"
+                  effect="dark"
+                  :content="
+                    data.weight === 0
+                      ? t('visualization.no_permission_tips')
+                      : `${t('data_set.invalid_data_source')}: ${node.label}`
+                  "
                   placement="top-start"
                 >
                   <span

From b666924fb6a00c0816ae553ffbc5b6cd8d5b9868 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Mon, 15 Jun 2026 18:21:17 +0800
Subject: [PATCH 3/6] =?UTF-8?q?feat(X-Pack):=20Webhook=20=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E8=87=AA=E5=AE=9A=E4=B9=89=20body=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=20#18445?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../form => components/CodeEdit}/CodeEdit.vue |  0
 .../CodeEdit}/ace-config.ts                   |  0
 .../CodeEdit}/format-utils.js                 |  0
 core/core-frontend/src/locales/en.ts          |  2 ++
 core/core-frontend/src/locales/tw.ts          |  2 ++
 core/core-frontend/src/locales/zh-CN.ts       |  2 ++
 .../data/datasource/form/ApiBody.vue          |  2 +-
 .../io/dataease/api/webhook/WebhookApi.java   |  7 +++-
 .../api/webhook/vo/WebhookGridVO.java         |  5 ---
 .../io/dataease/api/webhook/vo/WebhookVO.java | 34 +++++++++++++++++++
 .../io/dataease/utils/HttpClientUtil.java     | 33 ++++++++++++++++++
 11 files changed, 80 insertions(+), 7 deletions(-)
 rename core/core-frontend/src/{views/visualized/data/datasource/form => components/CodeEdit}/CodeEdit.vue (100%)
 rename core/core-frontend/src/{views/visualized/data/datasource/form => components/CodeEdit}/ace-config.ts (100%)
 rename core/core-frontend/src/{views/visualized/data/datasource/form => components/CodeEdit}/format-utils.js (100%)
 create mode 100644 sdk/api/api-base/src/main/java/io/dataease/api/webhook/vo/WebhookVO.java

diff --git a/core/core-frontend/src/views/visualized/data/datasource/form/CodeEdit.vue b/core/core-frontend/src/components/CodeEdit/CodeEdit.vue
similarity index 100%
rename from core/core-frontend/src/views/visualized/data/datasource/form/CodeEdit.vue
rename to core/core-frontend/src/components/CodeEdit/CodeEdit.vue
diff --git a/core/core-frontend/src/views/visualized/data/datasource/form/ace-config.ts b/core/core-frontend/src/components/CodeEdit/ace-config.ts
similarity index 100%
rename from core/core-frontend/src/views/visualized/data/datasource/form/ace-config.ts
rename to core/core-frontend/src/components/CodeEdit/ace-config.ts
diff --git a/core/core-frontend/src/views/visualized/data/datasource/form/format-utils.js b/core/core-frontend/src/components/CodeEdit/format-utils.js
similarity index 100%
rename from core/core-frontend/src/views/visualized/data/datasource/form/format-utils.js
rename to core/core-frontend/src/components/CodeEdit/format-utils.js
diff --git a/core/core-frontend/src/locales/en.ts b/core/core-frontend/src/locales/en.ts
index 55db08725b..2754b47563 100644
--- a/core/core-frontend/src/locales/en.ts
+++ b/core/core-frontend/src/locales/en.ts
@@ -4895,6 +4895,8 @@ export default {
     add: 'Add Webhook',
     search_placeholder: 'Search by name',
     content_type: 'Content Type',
+    msg_template: 'Message Template',
+    msg_template_tips: 'Available placeholders: {t0}, {t1}, {t2}',
     del_confirm: 'Are you sure you want to delete this Webhook?',
     batch_del_confirm: 'Are you sure you want to delete {0} Webhooks?'
   },
diff --git a/core/core-frontend/src/locales/tw.ts b/core/core-frontend/src/locales/tw.ts
index f53c5def72..e0adb5050e 100644
--- a/core/core-frontend/src/locales/tw.ts
+++ b/core/core-frontend/src/locales/tw.ts
@@ -4745,6 +4745,8 @@ export default {
     add: '添加 Webhook',
     search_placeholder: '通過名稱搜索',
     content_type: '內容類型',
+    msg_template: '消息模板',
+    msg_template_tips: '可用占位符：{t0}、{t1}、{t2}',
     del_confirm: '確定刪除該 Webhook嗎？',
     batch_del_confirm: '確定刪除 {0} 個 Webhook嗎'
   }
diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts
index 8492244e5a..5bf70d6e99 100644
--- a/core/core-frontend/src/locales/zh-CN.ts
+++ b/core/core-frontend/src/locales/zh-CN.ts
@@ -4755,6 +4755,8 @@ export default {
     add: '添加 Webhook',
     search_placeholder: '通过名称搜索',
     content_type: '内容类型',
+    msg_template: '消息模板',
+    msg_template_tips: '可用占位符：{t0}、{t1}、{t2}',
     del_confirm: '确定删除该 Webhook吗？',
     batch_del_confirm: '确定删除 {0} 个 Webhook吗'
   },
diff --git a/core/core-frontend/src/views/visualized/data/datasource/form/ApiBody.vue b/core/core-frontend/src/views/visualized/data/datasource/form/ApiBody.vue
index 9a058e650d..ec10627fc7 100644
--- a/core/core-frontend/src/views/visualized/data/datasource/form/ApiBody.vue
+++ b/core/core-frontend/src/views/visualized/data/datasource/form/ApiBody.vue
@@ -3,7 +3,7 @@ import { propTypes } from '@/utils/propTypes'
 import { onBeforeMount, watch, toRefs, PropType } from 'vue'
 import { useI18n } from '@/hooks/web/useI18n'
 import ApiVariable from './ApiVariable.vue'
-import CodeEdit from './CodeEdit.vue'
+import CodeEdit from '@/components/CodeEdit/CodeEdit.vue'
 import Convert from './convert.js'
 import { KeyValue, BODY_TYPE } from './ApiTestModel.js'
 export interface ApiBodyItem {
diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/webhook/WebhookApi.java b/sdk/api/api-base/src/main/java/io/dataease/api/webhook/WebhookApi.java
index 8eb3d88c08..8df03663d1 100644
--- a/sdk/api/api-base/src/main/java/io/dataease/api/webhook/WebhookApi.java
+++ b/sdk/api/api-base/src/main/java/io/dataease/api/webhook/WebhookApi.java
@@ -5,6 +5,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import io.dataease.api.webhook.request.WebhookSwitchRequest;
 import io.dataease.api.webhook.vo.WebhookGridVO;
 import io.dataease.api.webhook.vo.WebhookOption;
+import io.dataease.api.webhook.vo.WebhookVO;
 import io.dataease.model.KeywordRequest;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -33,7 +34,7 @@ public interface WebhookApi {
 
     @Operation(summary = "保存")
     @PostMapping("/save")
-    void save(@RequestBody WebhookGridVO creator);
+    void save(@RequestBody WebhookVO creator);
 
     @Operation(summary = "切换SSL")
     @PostMapping("/switchSsl")
@@ -43,6 +44,10 @@ public interface WebhookApi {
     @PostMapping("/delete")
     void delete(@RequestBody List<Long> ids);
 
+    @Operation(summary = "查询详情")
+    @GetMapping("/get/{id}")
+    WebhookVO get(@PathVariable("id") Long id);
+
     @Operation(summary = "查询选项")
     @GetMapping("/options")
     List<WebhookOption> options();
diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/webhook/vo/WebhookGridVO.java b/sdk/api/api-base/src/main/java/io/dataease/api/webhook/vo/WebhookGridVO.java
index 186016af92..b657e631b3 100644
--- a/sdk/api/api-base/src/main/java/io/dataease/api/webhook/vo/WebhookGridVO.java
+++ b/sdk/api/api-base/src/main/java/io/dataease/api/webhook/vo/WebhookGridVO.java
@@ -24,9 +24,4 @@ public class WebhookGridVO implements Serializable {
     private String contentType;
 
     private Boolean ssl;
-
-    @JsonSerialize(using= ToStringSerializer.class)
-    private Long oid;
-
-    private Long createTime;
 }
diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/webhook/vo/WebhookVO.java b/sdk/api/api-base/src/main/java/io/dataease/api/webhook/vo/WebhookVO.java
new file mode 100644
index 0000000000..74e4db6c77
--- /dev/null
+++ b/sdk/api/api-base/src/main/java/io/dataease/api/webhook/vo/WebhookVO.java
@@ -0,0 +1,34 @@
+package io.dataease.api.webhook.vo;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+@Data
+public class WebhookVO implements Serializable {
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+
+    private String name;
+
+    private String url;
+
+    private String secret;
+
+    private String contentType;
+
+    private Boolean ssl;
+
+    private String msgTemplate;
+
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long oid;
+
+    private Long createTime;
+}
diff --git a/sdk/common/src/main/java/io/dataease/utils/HttpClientUtil.java b/sdk/common/src/main/java/io/dataease/utils/HttpClientUtil.java
index d2f962a6d5..990db0d663 100755
--- a/sdk/common/src/main/java/io/dataease/utils/HttpClientUtil.java
+++ b/sdk/common/src/main/java/io/dataease/utils/HttpClientUtil.java
@@ -717,6 +717,39 @@ public class HttpClientUtil {
         }
     }
 
+    public static String postRawBody(String url, String contentType, String body, boolean ssl, HttpClientConfig config) {
+        CloseableHttpClient httpClient = null;
+        try {
+            httpClient = buildHttpClient(ssl);
+            HttpPost httpPost = new HttpPost(url);
+            if (ObjectUtils.isEmpty(config)) {
+                config = new HttpClientConfig();
+            }
+            httpPost.setConfig(config.buildRequestConfig());
+            Map<String, String> header = config.getHeader();
+            for (String key : header.keySet()) {
+                httpPost.addHeader(key, header.get(key));
+            }
+            EntityBuilder entityBuilder = EntityBuilder.create();
+            entityBuilder.setText(body);
+            entityBuilder.setContentType(ContentType.create(contentType, java.nio.charset.StandardCharsets.UTF_8));
+            httpPost.setEntity(entityBuilder.build());
+            HttpResponse response = httpClient.execute(httpPost);
+            return getResponseStr(response, config);
+        } catch (Exception e) {
+            logger.error("HttpClient POST raw body failed", e);
+            throw new DEException(SYSTEM_INNER_ERROR.code(), "HttpClient POST raw body failed: " + e.getMessage());
+        } finally {
+            try {
+                if (httpClient != null) {
+                    httpClient.close();
+                }
+            } catch (Exception e) {
+                logger.error("HttpClient关闭连接失败", e);
+            }
+        }
+    }
+
     public static MultipartResponse postForScreenshot(
             String url, Map<String,String> body, HttpClientConfig config) throws IOException {
         CloseableHttpClient httpClient = null;

From ea0f6d6b95f06a3bcd0ae9b2231ee7ab9ada80ba Mon Sep 17 00:00:00 2001
From: jianneng-fit2cloud <jianneng.pan@fit2cloud.com>
Date: Tue, 16 Jun 2026 10:40:49 +0800
Subject: [PATCH 4/6] =?UTF-8?q?fix(=E5=9B=BE=E8=A1=A8):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E6=95=B0=E5=80=BC=E6=A0=BC=E5=BC=8F=E5=8C=96=E9=81=87?=
 =?UTF-8?q?=E5=88=B0=E7=A7=91=E5=AD=A6=E8=AE=A1=E6=95=B0=E6=B3=95=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E6=95=B0=E5=80=BC=E6=97=A0=E6=B3=95=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E6=98=BE=E7=A4=BA=E7=A9=BA=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/views/chart/components/js/formatter.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/core-frontend/src/views/chart/components/js/formatter.ts b/core/core-frontend/src/views/chart/components/js/formatter.ts
index 03e67b00a4..46bd3b7510 100644
--- a/core/core-frontend/src/views/chart/components/js/formatter.ts
+++ b/core/core-frontend/src/views/chart/components/js/formatter.ts
@@ -111,6 +111,10 @@ function retain(value, n) {
   const tran = Math.round(value * Math.pow(10, n)) / Math.pow(10, n)
   let tranV = tran.toString()
   const newVal = tranV.indexOf('.')
+  // 遇到科学计数法时用 toFixed(n) 转成普通小数字符串
+  if (/e/i.test(tranV)) {
+    tranV = tran.toFixed(n)
+  }
   if (newVal < 0) {
     tranV += '.'
   }

From 436a90307ab273e9fa8178b5551d070cfa65a967 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 16 Jun 2026 11:06:32 +0800
Subject: [PATCH 5/6] =?UTF-8?q?perf(X-Pack):=20Webhook=20=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E8=A1=A8=E5=8D=95=E5=9B=9E=E6=98=BE=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/components/CodeEdit/CodeEdit.vue | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/core/core-frontend/src/components/CodeEdit/CodeEdit.vue b/core/core-frontend/src/components/CodeEdit/CodeEdit.vue
index 555f2744db..9503c14280 100644
--- a/core/core-frontend/src/components/CodeEdit/CodeEdit.vue
+++ b/core/core-frontend/src/components/CodeEdit/CodeEdit.vue
@@ -27,6 +27,12 @@ watch(formatData, () => {
 watch([props.theme], () => {
   format()
 })
+watch(
+  () => props.data,
+  () => {
+    format()
+  }
+)
 onMounted(() => {
   format()
 })

From e160b6c42e8a2d80f11bd6191eee8b2d672fe0a9 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 16 Jun 2026 11:53:13 +0800
Subject: [PATCH 6/6] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=2020260616083022?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E5=AE=89=E5=85=A8=E6=BC=8F=E6=B4=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/dataease/share/interceptor/LinkInterceptor.java   | 2 +-
 sdk/common/src/main/java/io/dataease/utils/FileUtils.java     | 4 ++--
 .../src/main/java/io/dataease/utils/WhitelistUtils.java       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/core-backend/src/main/java/io/dataease/share/interceptor/LinkInterceptor.java b/core/core-backend/src/main/java/io/dataease/share/interceptor/LinkInterceptor.java
index 8e72a8c014..299342e5a2 100644
--- a/core/core-backend/src/main/java/io/dataease/share/interceptor/LinkInterceptor.java
+++ b/core/core-backend/src/main/java/io/dataease/share/interceptor/LinkInterceptor.java
@@ -42,7 +42,7 @@ public class LinkInterceptor implements HandlerInterceptor {
 
                 String requestURI = ServletUtils.request().getRequestURI();
                 if (StringUtils.startsWith(requestURI, WhitelistUtils.getContextPath())) {
-                    requestURI = requestURI.replaceFirst(WhitelistUtils.getContextPath(), "");
+                    requestURI = StringUtils.replaceOnce(requestURI, WhitelistUtils.getContextPath(), "");
                 }
                 if (StringUtils.startsWith(requestURI, AuthConstant.DE_API_PREFIX)) {
                     requestURI = requestURI.replaceFirst(AuthConstant.DE_API_PREFIX, "");
diff --git a/sdk/common/src/main/java/io/dataease/utils/FileUtils.java b/sdk/common/src/main/java/io/dataease/utils/FileUtils.java
index 8a1fbd4268..dbe63582bb 100644
--- a/sdk/common/src/main/java/io/dataease/utils/FileUtils.java
+++ b/sdk/common/src/main/java/io/dataease/utils/FileUtils.java
@@ -74,8 +74,8 @@ public class FileUtils {
         return filename;
     }
 
-    public static void validateExist(String path) {
-        File dir = new File(path);
+    public static void validateExist(String path) throws IOException {
+        File dir = new File(path).getCanonicalFile();
         if (dir.exists()) return;
         dir.mkdirs();
     }
diff --git a/sdk/common/src/main/java/io/dataease/utils/WhitelistUtils.java b/sdk/common/src/main/java/io/dataease/utils/WhitelistUtils.java
index 388529ce39..d4b0ee15a7 100644
--- a/sdk/common/src/main/java/io/dataease/utils/WhitelistUtils.java
+++ b/sdk/common/src/main/java/io/dataease/utils/WhitelistUtils.java
@@ -55,7 +55,7 @@ public class WhitelistUtils {
     public static boolean match(String requestURI) {
         invalidUrl(requestURI);
         if (StringUtils.startsWith(requestURI, getContextPath())) {
-            requestURI = requestURI.replaceFirst(getContextPath(), "");
+            requestURI = StringUtils.replaceOnce(requestURI, getContextPath(), "");
         }
         if (StringUtils.startsWith(requestURI, AuthConstant.DE_API_PREFIX)) {
             requestURI = requestURI.replaceFirst(AuthConstant.DE_API_PREFIX, "");