From 378fbd502005a34015577e35adf7e32bae6202d7 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Thu, 15 Aug 2024 16:55:11 +0800
Subject: [PATCH] =?UTF-8?q?perf(X-Pack):=20=E9=98=88=E5=80=BC=E5=91=8A?=
 =?UTF-8?q?=E8=AD=A6=E9=A2=84=E8=A7=88=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../rich-text/TinymacEditorAlarm.vue           |  5 +++--
 de-xpack                                       |  2 +-
 .../dataease/api/threshold/ThresholdApi.java   |  3 +++
 .../threshold/dto/ThresholdPreviewRequest.java | 18 ++++++++++++++++++
 4 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 sdk/api/api-base/src/main/java/io/dataease/api/threshold/dto/ThresholdPreviewRequest.java

diff --git a/core/core-frontend/src/components/rich-text/TinymacEditorAlarm.vue b/core/core-frontend/src/components/rich-text/TinymacEditorAlarm.vue
index 553a632278..bc3aaddbd1 100644
--- a/core/core-frontend/src/components/rich-text/TinymacEditorAlarm.vue
+++ b/core/core-frontend/src/components/rich-text/TinymacEditorAlarm.vue
@@ -7,7 +7,6 @@
 import { ref, toRefs, watch, onMounted, onBeforeUnmount } from 'vue'
 import { useEmitt } from '@/hooks/web/useEmitt'
 import { formatDataEaseBi } from '@/utils/url'
-import { guid } from '@/views/visualized/data/dataset/form/util'
 import tinymce from 'tinymce/tinymce' // tinymce默认hidden，不引入不显示
 import Editor from '@tinymce/tinymce-vue' // 编辑器引入
 import 'tinymce/themes/silver/theme' // 编辑器主题
@@ -126,6 +125,7 @@ const init = ref({
       fetch: callback => {
         const items = props.fieldList.map(ele => {
           return {
+            id: ele.id,
             icon: iconMap[ele.deType],
             type: 'choiceitem',
             text: ele.name,
@@ -144,11 +144,12 @@ const fieldSelect = name => {
   const ed = tinymce.editors[tinymceId]
   const obj = props.fieldList.find(ele => ele.name === name)
   const field = {
+    id: obj.id,
     name: obj.name,
     backgroundColor: obj.groupType === 'd' ? '#3370FF33' : '#00D6B933',
     color: obj.groupType === 'd' ? '#2B5FD9' : '#04B49C'
   }
-  const fieldId = 'changeText-' + guid()
+  const fieldId = 'changeText-' + field.id || ''
   const value =
     `<span style="background: ${field.backgroundColor};color: ${field.color}" id="` +
     fieldId +
diff --git a/de-xpack b/de-xpack
index 813c95f110..a77c9297c2 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit 813c95f1106779434b2b5715034cde96da491ba0
+Subproject commit a77c9297c262ab15f600897c00e30abf02166fda
diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/threshold/ThresholdApi.java b/sdk/api/api-base/src/main/java/io/dataease/api/threshold/ThresholdApi.java
index e6b633b672..3c82520ca0 100644
--- a/sdk/api/api-base/src/main/java/io/dataease/api/threshold/ThresholdApi.java
+++ b/sdk/api/api-base/src/main/java/io/dataease/api/threshold/ThresholdApi.java
@@ -63,4 +63,7 @@ public interface ThresholdApi {
     @PostMapping("/instancePager/{goPage}/{pageSize}")
     IPage<ThresholdInstanceVO> instancePager(@PathVariable("goPage") int goPage, @PathVariable("pageSize") int pageSize, @RequestBody ThresholdInstanceRequest request);
 
+    @Operation(summary = "预览信息")
+    @PostMapping("/preview")
+    String preview(@RequestBody ThresholdPreviewRequest request);
 }
diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/threshold/dto/ThresholdPreviewRequest.java b/sdk/api/api-base/src/main/java/io/dataease/api/threshold/dto/ThresholdPreviewRequest.java
new file mode 100644
index 0000000000..9b516d801f
--- /dev/null
+++ b/sdk/api/api-base/src/main/java/io/dataease/api/threshold/dto/ThresholdPreviewRequest.java
@@ -0,0 +1,18 @@
+package io.dataease.api.threshold.dto;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+@Data
+public class ThresholdPreviewRequest implements Serializable {
+    @Serial
+    private static final long serialVersionUID = 3609209252630995739L;
+
+    private Long tableId;
+
+    private String thresholdRules;
+
+    private String msgContent;
+}