From fcbfd77bd19bf6a67540fa325d353148e2ba0d8f Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Fri, 31 May 2024 16:52:43 +0800
Subject: [PATCH 01/19] =?UTF-8?q?refactor(=E6=95=B0=E6=8D=AE=E5=A4=A7?=
 =?UTF-8?q?=E5=B1=8F):=20=E4=BC=98=E5=8C=96=E8=BF=87=E6=BB=A4=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data-visualization/canvas/ContextMenuDetails.vue      | 8 ++++++++
 .../components/editor/editor-style/VQueryChartStyle.vue   | 5 -----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/core/core-frontend/src/components/data-visualization/canvas/ContextMenuDetails.vue b/core/core-frontend/src/components/data-visualization/canvas/ContextMenuDetails.vue
index e824380a85..02f3516647 100644
--- a/core/core-frontend/src/components/data-visualization/canvas/ContextMenuDetails.vue
+++ b/core/core-frontend/src/components/data-visualization/canvas/ContextMenuDetails.vue
@@ -10,6 +10,7 @@ import { computed, toRefs } from 'vue'
 import { ElDivider } from 'element-plus-secondary'
 import eventBus from '@/utils/eventBus'
 import { getCurInfo } from '@/store/modules/data-visualization/common'
+import { useEmitt } from '@/hooks/web/useEmitt'
 const dvMainStore = dvMainStoreWithOut()
 const copyStore = copyStoreWithOut()
 const lockStore = lockStoreWithOut()
@@ -20,6 +21,7 @@ const composeStore = composeStoreWithOut()
 const { areaData } = storeToRefs(composeStore)
 const { curComponent } = storeToRefs(dvMainStore)
 const emit = defineEmits(['close', 'rename'])
+const { emitter } = useEmitt()
 const props = defineProps({
   activePosition: {
     type: String,
@@ -157,6 +159,10 @@ const composeDivider = computed(() => {
 const isGroupArea = computed(() => {
   return curComponent.value?.component === 'GroupArea'
 })
+
+const editQueryCriteria = () => {
+  emitter.emit(`editQueryCriteria${curComponent.value.id}`)
+}
 </script>
 
 <template>
@@ -207,6 +213,8 @@ const isGroupArea = computed(() => {
       <el-divider class="custom-divider" v-show="composeDivider" />
       <template v-if="curComponent && !isGroupArea">
         <template v-if="!curComponent['isLock']">
+          <li v-if="curComponent.component === 'VQuery'" @click="editQueryCriteria">编辑</li>
+          <li @click="upComponent">上移一层</li>
           <li @click="upComponent">上移一层</li>
           <li @click="downComponent">下移一层</li>
           <li @click="topComponent">置于顶层</li>
diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/VQueryChartStyle.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/VQueryChartStyle.vue
index 5934c734f3..8a01d41f42 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/VQueryChartStyle.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/VQueryChartStyle.vue
@@ -37,11 +37,6 @@ const { element, chart, commonBackgroundPop } = toRefs(props)
       <el-collapse v-model="state.styleActiveNames" class="style-collapse">
         <el-collapse-item :effect="themes" name="component" :title="t('visualization.module')">
           <el-form label-position="top">
-            <el-form-item class="form-item margin-bottom-8" :class="'form-item-' + themes">
-              <el-checkbox :effect="themes" v-model="element.isHang" size="small">
-                隐藏组件
-              </el-checkbox>
-            </el-form-item>
             <el-form-item class="form-item margin-bottom-8" :class="'form-item-' + themes">
               <el-checkbox
                 :effect="themes"

From 77c9dfa6f27aa62d71309545d2cf0018382b23a6 Mon Sep 17 00:00:00 2001
From: jianneng-fit2cloud <jianneng.pan@fit2cloud.com>
Date: Fri, 31 May 2024 17:13:31 +0800
Subject: [PATCH 02/19] =?UTF-8?q?style(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E5=9B=BE=E8=A1=A8=E9=85=8D=E7=BD=AE=E9=A1=B9=E4=B8=8E=E6=BB=9A?=
 =?UTF-8?q?=E5=8A=A8=E6=9D=A1=E9=97=B4=E8=B7=9D=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/CollapseSwitchItem.vue                |  2 +-
 .../components/QuadrantSelector.vue           | 54 +------------------
 .../views/chart/components/editor/index.vue   |  4 +-
 3 files changed, 5 insertions(+), 55 deletions(-)

diff --git a/core/core-frontend/src/components/collapse-switch-item/src/CollapseSwitchItem.vue b/core/core-frontend/src/components/collapse-switch-item/src/CollapseSwitchItem.vue
index e46fd207b6..046ce69e8d 100644
--- a/core/core-frontend/src/components/collapse-switch-item/src/CollapseSwitchItem.vue
+++ b/core/core-frontend/src/components/collapse-switch-item/src/CollapseSwitchItem.vue
@@ -69,7 +69,7 @@ const switchValue = computed({
   display: flex;
   justify-content: space-between;
   align-items: center;
-  padding-right: 8px;
+  padding-right: 10px;
   flex-grow: 1;
   :deep(.ed-switch.is-checked .ed-switch__core > .ed-switch__action) {
     left: calc(100% - 12px);
diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/components/QuadrantSelector.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/components/QuadrantSelector.vue
index 2c839f1ea4..d50ab591f0 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/QuadrantSelector.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/QuadrantSelector.vue
@@ -142,7 +142,6 @@ onMounted(() => {
           :label="t('chart.split_line')"
           class="form-item"
           :class="'form-item-' + themes"
-          style="padding-right: 4px"
         >
           <el-color-picker
             v-model="state.quadrantForm.lineStyle.stroke"
@@ -189,12 +188,7 @@ onMounted(() => {
         </el-form-item>
       </div>
       <div style="display: flex">
-        <el-form-item
-          class="form-item"
-          label="X 轴恒线"
-          :class="'form-item-' + themes"
-          style="padding-left: 4px"
-        >
+        <el-form-item class="form-item" label="X 轴恒线" :class="'form-item-' + themes">
           <el-input-number
             controls-position="right"
             style="width: 100%"
@@ -225,7 +219,7 @@ onMounted(() => {
         </el-form-item>
       </div>
     </template>
-    <el-tabs v-model="tabActive" class="quadrant-tab-header" :class="{ dark: themes === 'dark' }">
+    <el-tabs v-model="tabActive" class="tab-header" :class="{ dark: themes === 'dark' }">
       <el-tab-pane
         :name="index + 1"
         v-for="(l, index) in state.quadrantForm.labels"
@@ -239,7 +233,6 @@ onMounted(() => {
               <el-form-item
                 class="form-item"
                 :class="'form-item-' + themes"
-                style="padding-right: 4px"
                 :label="t('chart.backgroundColor')"
               >
                 <el-color-picker
@@ -290,7 +283,6 @@ onMounted(() => {
               <el-form-item
                 class="form-item"
                 :class="'form-item-' + themes"
-                style="padding-right: 4px"
                 :label="t('chart.chart_style')"
               >
                 <el-color-picker
@@ -384,48 +376,6 @@ onMounted(() => {
       border-color: rgba(235, 235, 235, 0.15);
     }
   }
-  .quadrant-tab-header {
-    --ed-tabs-header-height: 34px;
-    --custom-tab-color: #646a73;
-
-    :deep(.ed-tabs__nav-wrap::after) {
-      background-color: unset;
-    }
-
-    &.dark {
-      --custom-tab-color: #a6a6a6;
-    }
-
-    height: 100%;
-    :deep(.ed-tabs__header) {
-      border-top: solid 1px @side-outline-border-color;
-    }
-    :deep(.ed-tabs__item) {
-      font-weight: 400;
-      font-size: 12px;
-      padding: 0 12px !important;
-      margin-right: 0 !important;
-      color: var(--custom-tab-color);
-    }
-    :deep(.is-active) {
-      font-weight: 500;
-      color: var(--ed-color-primary, #3370ff);
-    }
-
-    :deep(.ed-tabs__nav-scroll) {
-      padding-left: 0 !important;
-    }
-
-    :deep(.ed-tabs__header) {
-      margin: 0 !important;
-    }
-
-    :deep(.ed-tabs__content) {
-      height: calc(100% - 33px);
-      overflow-y: auto;
-      overflow-x: hidden;
-    }
-  }
   .padding-tab {
     padding: 0;
     height: 100%;
diff --git a/core/core-frontend/src/views/chart/components/editor/index.vue b/core/core-frontend/src/views/chart/components/editor/index.vue
index b2138a309e..41746af7ff 100644
--- a/core/core-frontend/src/views/chart/components/editor/index.vue
+++ b/core/core-frontend/src/views/chart/components/editor/index.vue
@@ -3166,7 +3166,7 @@ span {
   display: flex;
   transition: 0.5s;
   .padding-lr {
-    padding: 0 8px;
+    padding: 0 10px;
 
     &.no-top-border {
       border-top: none !important;
@@ -3217,7 +3217,7 @@ span {
     }
 
     :deep(.ed-collapse-item__content) {
-      padding: 16px 8px 0;
+      padding: 16px 10px 0;
       border: none;
       :deep(.ed-checkbox) {
         height: 20px;

From c3e3b32a2fdaecaf3fa204c30d4439a50e897fe6 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Fri, 31 May 2024 17:19:48 +0800
Subject: [PATCH 03/19] =?UTF-8?q?revert:=20=E5=9B=9E=E9=80=80=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application-standalone.yml             | 4 ----
 core/core-frontend/src/views/dashboard/index.vue              | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/core/core-backend/src/main/resources/application-standalone.yml b/core/core-backend/src/main/resources/application-standalone.yml
index e6102c02c8..b521aa59d0 100644
--- a/core/core-backend/src/main/resources/application-standalone.yml
+++ b/core/core-backend/src/main/resources/application-standalone.yml
@@ -3,10 +3,6 @@ spring:
     url: jdbc:mysql://localhost:3306/dataease?autoReconnect=false&useUnicode=true&characterEncoding=UTF-8&characterSetResults=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
     password: 123456
-#  datasource:
-#    url: jdbc:mysql://39.98.78.97:13306/dataease?autoReconnect=false&useUnicode=true&characterEncoding=UTF-8&characterSetResults=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
-#    username: root
-#    password: Password123@mysql
   messages:
     basename: i18n/lic,i18n/core,i18n/permissions,i18n/xpack
   flyway:
diff --git a/core/core-frontend/src/views/dashboard/index.vue b/core/core-frontend/src/views/dashboard/index.vue
index 8d115c330d..a24593758e 100644
--- a/core/core-frontend/src/views/dashboard/index.vue
+++ b/core/core-frontend/src/views/dashboard/index.vue
@@ -190,7 +190,7 @@ onMounted(async () => {
     }
     let deTemplateData
     if (createType === 'template') {
-      const templateParamsApply = JSON.parse(decodeURIComponent(Base64.decode(templateParams + '')))
+      const templateParamsApply = JSON.parse(Base64.decode(decodeURIComponent(templateParams + '')))
       await decompressionPre(templateParamsApply, result => {
         deTemplateData = result
       })

From c76d2eded65ab811612a3c846c9efbf723bb2700 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Fri, 31 May 2024 17:21:45 +0800
Subject: [PATCH 04/19] =?UTF-8?q?refactor(=E6=95=B0=E6=8D=AE=E5=A4=A7?=
 =?UTF-8?q?=E5=B1=8F):=20=E4=BC=98=E5=8C=96=E8=B7=91=E9=A9=AC=E7=81=AF?=
 =?UTF-8?q?=E5=88=9D=E5=A7=8B=E6=BB=9A=E5=8A=A8=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/custom-component/scroll-text/Component.vue            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/core-frontend/src/custom-component/scroll-text/Component.vue b/core/core-frontend/src/custom-component/scroll-text/Component.vue
index b510ce476b..3e7dd1b6ee 100644
--- a/core/core-frontend/src/custom-component/scroll-text/Component.vue
+++ b/core/core-frontend/src/custom-component/scroll-text/Component.vue
@@ -187,10 +187,10 @@ const textStyle = computed(() => {
 }
 @keyframes marqueeAnimation {
   0% {
-    transform: translate(0, 0);
+    transform: translate(100%, 0);
   }
   100% {
-    transform: translate(-100%, 0);
+    transform: translate(-50%, 0);
   }
 }
 </style>

From 714dd2f9c80961d0832ab67321065913b11c3ff2 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Fri, 31 May 2024 18:07:14 +0800
Subject: [PATCH 05/19] =?UTF-8?q?fix:=20=E7=B3=BB=E7=BB=9F=E5=8F=98?=
 =?UTF-8?q?=E9=87=8F=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/dataease/exportCenter/manage/ExportCenterManage.java | 2 +-
 .../src/views/visualized/data/dataset/ExportExcel.vue       | 2 +-
 .../api/permissions/dataset/api/ColumnPermissionsApi.java   | 4 +---
 .../api/permissions/dataset/api/RowPermissionsApi.java      | 4 ++--
 .../api/permissions/variable/api/SysVariablesApi.java       | 6 +++---
 5 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java b/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java
index 2d435bc732..744f79da9e 100644
--- a/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java
+++ b/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java
@@ -160,7 +160,7 @@ public class ExportCenterManage {
         exportTaskMapper.updateById(exportTask);
         FileUtils.deleteDirectoryRecursively(exportData_path + id);
         if (exportTask.getExportFromType().equalsIgnoreCase("chart")) {
-            ChartExcelRequest request = JsonUtil.parse(exportTask.getParams(), ChartExcelRequest.class);
+            ChartExcelRequest request = JsonUtil.parseObject(exportTask.getParams(), ChartExcelRequest.class);
             startViewTask(exportTask, request);
         }
     }
diff --git a/core/core-frontend/src/views/visualized/data/dataset/ExportExcel.vue b/core/core-frontend/src/views/visualized/data/dataset/ExportExcel.vue
index f2a393432f..cf28672629 100644
--- a/core/core-frontend/src/views/visualized/data/dataset/ExportExcel.vue
+++ b/core/core-frontend/src/views/visualized/data/dataset/ExportExcel.vue
@@ -426,7 +426,7 @@ defineExpose({
               </div>
             </el-button>
             <el-tooltip effect="dark" content="重新导出" placement="top">
-              <el-button text @click="retry(scope.row)">
+              <el-button v-if="scope.row.exportStatus === 'FAILED'" text @click="retry(scope.row)">
                 <template #icon>
                   <Icon name="icon_refresh_outlined"></Icon>
                 </template>
diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/dataset/api/ColumnPermissionsApi.java b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/dataset/api/ColumnPermissionsApi.java
index c8db52666b..2c0b4e9c31 100644
--- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/dataset/api/ColumnPermissionsApi.java
+++ b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/dataset/api/ColumnPermissionsApi.java
@@ -2,8 +2,6 @@ package io.dataease.api.permissions.dataset.api;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.dataease.api.permissions.dataset.dto.DataSetColumnPermissionsDTO;
-import io.dataease.api.permissions.dataset.dto.DataSetRowPermissionsTreeDTO;
-import io.dataease.api.permissions.dataset.dto.Item;
 import io.dataease.auth.DeApiPath;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -19,7 +17,7 @@ import static io.dataease.constant.AuthResourceEnum.DATASET;
 public interface ColumnPermissionsApi {
 
     @GetMapping("/pager/{datasetId}/{goPage}/{pageSize}")
-    public IPage<DataSetColumnPermissionsDTO> columnPermissions(@PathVariable Long datasetId, @PathVariable int goPage, @PathVariable int pageSize);
+    public IPage<DataSetColumnPermissionsDTO> columnPermissions(@PathVariable("datasetId") Long datasetId, @PathVariable("goPage") int goPage, @PathVariable("pageSize") int pageSize);
 
     @PostMapping("save")
     public void save(@RequestBody DataSetColumnPermissionsDTO dataSetColumnPermissionsDTO);
diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/dataset/api/RowPermissionsApi.java b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/dataset/api/RowPermissionsApi.java
index 11c4108f41..da2d1b0cf2 100644
--- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/dataset/api/RowPermissionsApi.java
+++ b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/dataset/api/RowPermissionsApi.java
@@ -18,7 +18,7 @@ import static io.dataease.constant.AuthResourceEnum.DATASET;
 public interface RowPermissionsApi {
 
     @GetMapping("/pager/{datasetId}/{goPage}/{pageSize}")
-    public IPage<DataSetRowPermissionsTreeDTO> rowPermissions(@PathVariable Long datasetId, @PathVariable int goPage, @PathVariable int pageSize);
+    public IPage<DataSetRowPermissionsTreeDTO> rowPermissions(@PathVariable("datasetId") Long datasetId, @PathVariable("goPage") int goPage, @PathVariable("pageSize") int pageSize);
 
 
     @PostMapping("save")
@@ -30,7 +30,7 @@ public interface RowPermissionsApi {
 
 
     @GetMapping("/authObjs/{datasetId}/{type}")
-    public List<Item> authObjs(@PathVariable Long datasetId, @PathVariable String type);
+    public List<Item> authObjs(@PathVariable("datasetId") Long datasetId, @PathVariable("type") String type);
 
     @PostMapping("/dataSetRowPermissionInfo")
     public DataSetRowPermissionsTreeDTO dataSetRowPermissionInfo(@RequestBody DataSetRowPermissionsTreeDTO request);
diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/variable/api/SysVariablesApi.java b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/variable/api/SysVariablesApi.java
index 11be8eae9c..0c094f74b1 100644
--- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/variable/api/SysVariablesApi.java
+++ b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/variable/api/SysVariablesApi.java
@@ -32,11 +32,11 @@ public interface SysVariablesApi {
 
     @Operation(summary = "删除")
     @GetMapping("/delete/{id}")
-    void delete(@PathVariable Long id);
+    void delete(@PathVariable("id") Long id);
 
     @Operation(summary = "详细信息")
     @GetMapping("/detail/{id}")
-    SysVariableDto detail(@PathVariable Long id);
+    SysVariableDto detail(@PathVariable("id") Long id);
 
     @Operation(summary = "查询")
     @PostMapping("/query")
@@ -52,7 +52,7 @@ public interface SysVariablesApi {
 
     @Operation(summary = "删除")
     @GetMapping("/value/delete/{id}")
-    void deleteValue(@PathVariable String id);
+    void deleteValue(@PathVariable("id") String id);
 
     @GetMapping("/value/selected/{id}")
     List<SysVariableValueDto> selectVariableValue(@PathVariable("id") Long id);

From 4dbfa687c2c4bafdcba7519286c5975976e35d33 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 3 Jun 2024 10:46:33 +0800
Subject: [PATCH 06/19] =?UTF-8?q?style(=E6=95=B0=E6=8D=AE=E5=A4=A7?=
 =?UTF-8?q?=E5=B1=8F):=20=E6=9B=B4=E6=8D=A2=E5=9B=BE=E6=A0=87=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/assets/svg/db-more-web.svg | 2 +-
 core/core-frontend/src/assets/svg/icon-stream.svg | 2 +-
 core/core-frontend/src/assets/svg/icon-video.svg  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/core-frontend/src/assets/svg/db-more-web.svg b/core/core-frontend/src/assets/svg/db-more-web.svg
index d0c9a5abcd..9bc701c656 100644
--- a/core/core-frontend/src/assets/svg/db-more-web.svg
+++ b/core/core-frontend/src/assets/svg/db-more-web.svg
@@ -1 +1 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg fill="#3370FF" t="1712630540622" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4351" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M885.333333 177.066667C838.4 104.533333 697.6 136.533333 652.8 149.333333c-8.533333 2.133333-19.2 4.266667-32 8.533334-40.533333-17.066667-87.466667-25.6-134.4-25.6-200.533333 0-362.666667 162.133333-362.666667 362.666666 0 51.2 10.666667 98.133333 27.733334 140.8-36.266667 117.333333-29.866667 194.133333 21.333333 234.666667 23.466667 19.2 51.2 25.6 81.066667 25.6 59.733333 0 123.733333-27.733333 157.866666-46.933333 23.466667 4.266667 49.066667 8.533333 74.666667 8.533333 130.133333 0 245.333333-68.266667 309.333333-172.8h-106.666666c-51.2 53.333333-121.6 87.466667-202.666667 87.466667-104.533333 0-194.133333-57.6-241.066667-142.933334 85.333333-241.066667 281.6-343.466667 373.333334-379.733333 68.266667 36.266667 119.466667 100.266667 136.533333 179.2H467.2v85.333333h381.866667v-19.2c0-40.533333-6.4-78.933333-19.2-115.2 49.066667-68.266667 93.866667-147.2 55.466666-202.666666z m-70.4 44.8s4.266667 17.066667-27.733333 66.133333c-17.066667-25.6-38.4-49.066667-61.866667-70.4 44.8-4.266667 81.066667-4.266667 89.6 4.266667zM298.666667 802.133333c-29.866667 8.533333-57.6 10.666667-70.4 0-4.266667-2.133333-17.066667-17.066667-10.666667-68.266666 23.466667 27.733333 51.2 49.066667 81.066667 68.266666zM209.066667 497.066667v-4.266667c0-153.6 123.733333-277.333333 277.333333-277.333333h2.133333c-93.866667 53.333333-202.666667 142.933333-279.466666 281.6z" p-id="4352"></path></svg>
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1712630540622" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4351" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M885.333333 177.066667C838.4 104.533333 697.6 136.533333 652.8 149.333333c-8.533333 2.133333-19.2 4.266667-32 8.533334-40.533333-17.066667-87.466667-25.6-134.4-25.6-200.533333 0-362.666667 162.133333-362.666667 362.666666 0 51.2 10.666667 98.133333 27.733334 140.8-36.266667 117.333333-29.866667 194.133333 21.333333 234.666667 23.466667 19.2 51.2 25.6 81.066667 25.6 59.733333 0 123.733333-27.733333 157.866666-46.933333 23.466667 4.266667 49.066667 8.533333 74.666667 8.533333 130.133333 0 245.333333-68.266667 309.333333-172.8h-106.666666c-51.2 53.333333-121.6 87.466667-202.666667 87.466667-104.533333 0-194.133333-57.6-241.066667-142.933334 85.333333-241.066667 281.6-343.466667 373.333334-379.733333 68.266667 36.266667 119.466667 100.266667 136.533333 179.2H467.2v85.333333h381.866667v-19.2c0-40.533333-6.4-78.933333-19.2-115.2 49.066667-68.266667 93.866667-147.2 55.466666-202.666666z m-70.4 44.8s4.266667 17.066667-27.733333 66.133333c-17.066667-25.6-38.4-49.066667-61.866667-70.4 44.8-4.266667 81.066667-4.266667 89.6 4.266667zM298.666667 802.133333c-29.866667 8.533333-57.6 10.666667-70.4 0-4.266667-2.133333-17.066667-17.066667-10.666667-68.266666 23.466667 27.733333 51.2 49.066667 81.066667 68.266666zM209.066667 497.066667v-4.266667c0-153.6 123.733333-277.333333 277.333333-277.333333h2.133333c-93.866667 53.333333-202.666667 142.933333-279.466666 281.6z" p-id="4352"></path></svg>
diff --git a/core/core-frontend/src/assets/svg/icon-stream.svg b/core/core-frontend/src/assets/svg/icon-stream.svg
index 45b0fdc914..3f2aaa3d5c 100644
--- a/core/core-frontend/src/assets/svg/icon-stream.svg
+++ b/core/core-frontend/src/assets/svg/icon-stream.svg
@@ -1 +1 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1715769658859" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4704" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M1023.853735 948.673618v75.25325H596.248536V948.673618zM511.926868 0.073132a511.926868 511.926868 0 0 1 511.926867 511.926868h-75.253249a436.600486 436.600486 0 1 0-436.600486 436.600486h5.119269v75.253249h-5.119269a511.926868 511.926868 0 1 1 0-1023.853735z m511.926867 803.505785v75.25325H596.248536v-75.180117zM362.590487 290.116269l192.11884 110.941866 192.11884 110.941865-192.11884 110.941865-192.11884 110.941866V290.189402zM1023.853735 658.484217v75.399514H596.248536V658.630481zM437.843737 420.438223v182.831024l79.202399-45.780888 79.2024-45.707756-79.2024-45.707756z" p-id="4705" fill="#3370FF"></path></svg>
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1715769658859" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4704" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M1023.853735 948.673618v75.25325H596.248536V948.673618zM511.926868 0.073132a511.926868 511.926868 0 0 1 511.926867 511.926868h-75.253249a436.600486 436.600486 0 1 0-436.600486 436.600486h5.119269v75.253249h-5.119269a511.926868 511.926868 0 1 1 0-1023.853735z m511.926867 803.505785v75.25325H596.248536v-75.180117zM362.590487 290.116269l192.11884 110.941866 192.11884 110.941865-192.11884 110.941865-192.11884 110.941866V290.189402zM1023.853735 658.484217v75.399514H596.248536V658.630481zM437.843737 420.438223v182.831024l79.202399-45.780888 79.2024-45.707756-79.2024-45.707756z" p-id="4705"></path></svg>
diff --git a/core/core-frontend/src/assets/svg/icon-video.svg b/core/core-frontend/src/assets/svg/icon-video.svg
index 1e0c4ede65..1d7e84e93f 100644
--- a/core/core-frontend/src/assets/svg/icon-video.svg
+++ b/core/core-frontend/src/assets/svg/icon-video.svg
@@ -1 +1 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1715588004536" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4704" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200" fill="#3370FF"><path d="M221.63911147 385.93422187c103.88669653 0 188.38565973-84.48379307 188.38565866-188.3553184S325.52580693 9.20841493 221.63911147 9.20841493c-103.8563552 0-188.3553184 84.4989632-188.3553184 188.37048854 0 103.8715264 84.48379307 188.3553184 188.3553184 188.3553184z m0-316.04432534c70.42085973 0 127.70417813 57.2833184 127.70417706 127.68900694s-57.2833184 127.6738368-127.70417706 127.6738368c-70.40568853 0-127.6738368-57.26814827-127.67383787-127.6738368 0-70.42085973 57.26814827-127.68900693 127.67383787-127.68900694z" p-id="4705"></path><path d="M153.29659307 197.5940736l-0.0758528-4.05048853c-0.0606816-1.72942187-0.0606816-1.72942187 0.31857813-3.71674027a15.20071147 15.20071147 0 0 0-12.0452736-17.76450453 15.26139307 15.26139307 0 0 0-17.76450453 12.04527466 39.4429632 39.4429632 0 0 0-0.84954027 10.43721494l0.0606816 3.0340736a15.18554027 15.18554027 0 0 0 30.35591147 0.01517013zM152.2043264 166.28242987a15.14002987 15.14002987 0 0 0 12.6217472-6.7356448 68.2818368 68.2818368 0 0 1 56.81303787-30.34074027 15.17037013 15.17037013 0 1 0 0-30.34074133 98.5922368 98.5922368 0 0 0-82.02619307 43.79685973 15.18554027 15.18554027 0 0 0 12.591408 23.62026667zM646.39431147 385.93422187c103.90186667 0 188.38565973-84.48379307 188.38565866-188.3553184S750.29617813 9.20841493 646.39431147 9.20841493c-103.8563552 0-188.3553184 84.4989632-188.3553184 188.37048854 0.01517013 103.8715264 84.51413333 188.3553184 188.3553184 188.3553184z m0-316.04432534c70.43602987 0 127.70417813 57.2833184 127.70417706 127.68900694s-57.26814827 127.6738368-127.70417706 127.6738368c-70.40568853 0-127.6738368-57.26814827-127.67383787-127.6738368 0.01517013-70.42085973 57.2833184-127.68900693 127.67383787-127.68900694z"  p-id="4706"></path><path d="M576.97469653 166.28242987a15.14002987 15.14002987 0 0 0 12.62174827-6.7356448 68.26666667 68.26666667 0 0 1 56.79786667-30.34074027c8.40438507 0 15.17037013-6.7811552 15.17037013-15.1703712 0-8.38921493-6.76598507-15.17037013-15.17037013-15.17037013a98.56189653 98.56189653 0 0 0-82.01102294 43.79685973 15.17037013 15.17037013 0 0 0 12.591408 23.62026667zM1010.40734827 453.16930347c-9.93659307-10.16414827-22.33078507-15.61031147-37.42530347-15.6103104-12.27282987 0-25.50139307 3.29197013-41.56681493 11.0592a19245.43525973 19245.43525973 0 0 1-160.53285974 84.6051552l0.74334827-11.37777814c0.0606816-0.74334827 0.09102187-2.97339307 0.09102187-3.7319104 0-59.02791147-47.17985173-110.13688853-105.16100694-110.1368896H103.1585184c-57.01025173 0-106.9662816 56.06968853-106.9662816 115.12794134V919.62785173c0 56.8130368 47.99905173 95.1485632 106.9662816 95.1485632h563.39721493c58.49694827 0 104.35697813-41.67300693 105.1003264-98.8956448-0.01517013 0.0606816-0.01517013 0.13653333-0.03034133 0.03034134l-1.5777184-25.24349654c40.3076736 20.20693333 102.9309632 52.6715264 161.00314027 83.254992 1.65357013 0.8798816 3.17060693 1.6384 4.9758816 2.21487467 15.7923552 4.8545184 28.36859307 8.192 40.4897184 8.26785173 21.61777813-0.1668736 34.74014827-10.74062187 41.11170453-19.55460693 7.5548448-10.4220448 10.16414827-23.90850347 10.16414827-42.15845973V512.91022187c0-12.09078507 1.54737813-40.53522987-17.3852448-59.7409184z m-41.4909632 468.8706368c-4.23253333-1.0012448-8.75330347-2.41208853-11.90874027-3.382992-204.07182187-107.4365632-211.1715552-107.61860693-220.18275627-107.618608-8.3588736 0-16.35365973 3.06441493-22.1032288 9.16290453-5.71922987 6.06814827-8.67745173 13.48645973-8.17682986 21.83016213l4.47525866 73.36391147c-0.43994027 23.49890347-19.8276736 38.69961493-44.47952533 38.69961493H103.1585184c-25.75928853 0-46.2848-10.92266667-46.2848-34.4670816V523.10471147c0-25.69860693 22.5886816-54.44645973 46.2848-54.44645974v-0.01517013h563.39721493c23.80231147 0 43.9485632 23.78714027 44.4643552 48.4996736l-4.4449184 65.52082987c-0.5916448 8.38921493 2.32106667 16.68740693 8.04029654 22.84657813 5.74957013 6.15917013 13.8050368 9.6635264 22.22459306 9.66352533 9.8910816 0 12.5307264-0.03034027 222.0487104-112.09386666 4.14151147-2.00248853 7.28177813-3.1554368 9.55733334-3.82293334 0.36408853 2.71549653 0.60681493 6.70530347 0.51579306 12.66725974l-0.04551146 410.115792z"  p-id="4707"></path><path d="M771.64088853 915.89594027l0.04551147-0.925392c0 0.31857813-0.04551147 0.62198507-0.04551147 0.925392zM976.97185173 984.4508448l-0.45511146-0.03034133-0.47028054 0.03034133h0.925392zM771.6864 914.97054827l0.01517013-0.3489184-0.01517013 0.3489184zM271.06417813 498.98382187h-128.8571264c-30.44693333 0-54.99259307 37.54666667-54.992592 65.61185173v77.09582293a15.17037013 15.17037013 0 1 0 30.34074027-0.01517013v-77.09582293c0-14.12361493 13.56231147-35.24077013 24.65185173-35.24077014h128.8571264a15.17037013 15.17037013 0 1 0 0-30.35591146zM346.91602987 498.99899307h-15.17037014a15.17037013 15.17037013 0 1 0 0 30.34074026h15.17037014a15.17037013 15.17037013 0 1 0 0-30.34074026z"  p-id="4708"></path></svg>
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1715588004536" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4704" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M221.63911147 385.93422187c103.88669653 0 188.38565973-84.48379307 188.38565866-188.3553184S325.52580693 9.20841493 221.63911147 9.20841493c-103.8563552 0-188.3553184 84.4989632-188.3553184 188.37048854 0 103.8715264 84.48379307 188.3553184 188.3553184 188.3553184z m0-316.04432534c70.42085973 0 127.70417813 57.2833184 127.70417706 127.68900694s-57.2833184 127.6738368-127.70417706 127.6738368c-70.40568853 0-127.6738368-57.26814827-127.67383787-127.6738368 0-70.42085973 57.26814827-127.68900693 127.67383787-127.68900694z" p-id="4705"></path><path d="M153.29659307 197.5940736l-0.0758528-4.05048853c-0.0606816-1.72942187-0.0606816-1.72942187 0.31857813-3.71674027a15.20071147 15.20071147 0 0 0-12.0452736-17.76450453 15.26139307 15.26139307 0 0 0-17.76450453 12.04527466 39.4429632 39.4429632 0 0 0-0.84954027 10.43721494l0.0606816 3.0340736a15.18554027 15.18554027 0 0 0 30.35591147 0.01517013zM152.2043264 166.28242987a15.14002987 15.14002987 0 0 0 12.6217472-6.7356448 68.2818368 68.2818368 0 0 1 56.81303787-30.34074027 15.17037013 15.17037013 0 1 0 0-30.34074133 98.5922368 98.5922368 0 0 0-82.02619307 43.79685973 15.18554027 15.18554027 0 0 0 12.591408 23.62026667zM646.39431147 385.93422187c103.90186667 0 188.38565973-84.48379307 188.38565866-188.3553184S750.29617813 9.20841493 646.39431147 9.20841493c-103.8563552 0-188.3553184 84.4989632-188.3553184 188.37048854 0.01517013 103.8715264 84.51413333 188.3553184 188.3553184 188.3553184z m0-316.04432534c70.43602987 0 127.70417813 57.2833184 127.70417706 127.68900694s-57.26814827 127.6738368-127.70417706 127.6738368c-70.40568853 0-127.6738368-57.26814827-127.67383787-127.6738368 0.01517013-70.42085973 57.2833184-127.68900693 127.67383787-127.68900694z"  p-id="4706"></path><path d="M576.97469653 166.28242987a15.14002987 15.14002987 0 0 0 12.62174827-6.7356448 68.26666667 68.26666667 0 0 1 56.79786667-30.34074027c8.40438507 0 15.17037013-6.7811552 15.17037013-15.1703712 0-8.38921493-6.76598507-15.17037013-15.17037013-15.17037013a98.56189653 98.56189653 0 0 0-82.01102294 43.79685973 15.17037013 15.17037013 0 0 0 12.591408 23.62026667zM1010.40734827 453.16930347c-9.93659307-10.16414827-22.33078507-15.61031147-37.42530347-15.6103104-12.27282987 0-25.50139307 3.29197013-41.56681493 11.0592a19245.43525973 19245.43525973 0 0 1-160.53285974 84.6051552l0.74334827-11.37777814c0.0606816-0.74334827 0.09102187-2.97339307 0.09102187-3.7319104 0-59.02791147-47.17985173-110.13688853-105.16100694-110.1368896H103.1585184c-57.01025173 0-106.9662816 56.06968853-106.9662816 115.12794134V919.62785173c0 56.8130368 47.99905173 95.1485632 106.9662816 95.1485632h563.39721493c58.49694827 0 104.35697813-41.67300693 105.1003264-98.8956448-0.01517013 0.0606816-0.01517013 0.13653333-0.03034133 0.03034134l-1.5777184-25.24349654c40.3076736 20.20693333 102.9309632 52.6715264 161.00314027 83.254992 1.65357013 0.8798816 3.17060693 1.6384 4.9758816 2.21487467 15.7923552 4.8545184 28.36859307 8.192 40.4897184 8.26785173 21.61777813-0.1668736 34.74014827-10.74062187 41.11170453-19.55460693 7.5548448-10.4220448 10.16414827-23.90850347 10.16414827-42.15845973V512.91022187c0-12.09078507 1.54737813-40.53522987-17.3852448-59.7409184z m-41.4909632 468.8706368c-4.23253333-1.0012448-8.75330347-2.41208853-11.90874027-3.382992-204.07182187-107.4365632-211.1715552-107.61860693-220.18275627-107.618608-8.3588736 0-16.35365973 3.06441493-22.1032288 9.16290453-5.71922987 6.06814827-8.67745173 13.48645973-8.17682986 21.83016213l4.47525866 73.36391147c-0.43994027 23.49890347-19.8276736 38.69961493-44.47952533 38.69961493H103.1585184c-25.75928853 0-46.2848-10.92266667-46.2848-34.4670816V523.10471147c0-25.69860693 22.5886816-54.44645973 46.2848-54.44645974v-0.01517013h563.39721493c23.80231147 0 43.9485632 23.78714027 44.4643552 48.4996736l-4.4449184 65.52082987c-0.5916448 8.38921493 2.32106667 16.68740693 8.04029654 22.84657813 5.74957013 6.15917013 13.8050368 9.6635264 22.22459306 9.66352533 9.8910816 0 12.5307264-0.03034027 222.0487104-112.09386666 4.14151147-2.00248853 7.28177813-3.1554368 9.55733334-3.82293334 0.36408853 2.71549653 0.60681493 6.70530347 0.51579306 12.66725974l-0.04551146 410.115792z"  p-id="4707"></path><path d="M771.64088853 915.89594027l0.04551147-0.925392c0 0.31857813-0.04551147 0.62198507-0.04551147 0.925392zM976.97185173 984.4508448l-0.45511146-0.03034133-0.47028054 0.03034133h0.925392zM771.6864 914.97054827l0.01517013-0.3489184-0.01517013 0.3489184zM271.06417813 498.98382187h-128.8571264c-30.44693333 0-54.99259307 37.54666667-54.992592 65.61185173v77.09582293a15.17037013 15.17037013 0 1 0 30.34074027-0.01517013v-77.09582293c0-14.12361493 13.56231147-35.24077013 24.65185173-35.24077014h128.8571264a15.17037013 15.17037013 0 1 0 0-30.35591146zM346.91602987 498.99899307h-15.17037014a15.17037013 15.17037013 0 1 0 0 30.34074026h15.17037014a15.17037013 15.17037013 0 1 0 0-30.34074026z"  p-id="4708"></path></svg>

From a63e757f6171ca39034bb6c1ac536a276eb29c24 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Mon, 3 Jun 2024 10:58:42 +0800
Subject: [PATCH 07/19] =?UTF-8?q?perf(X-Pack):=20=E7=AC=AC=E4=B8=89?=
 =?UTF-8?q?=E6=96=B9=E5=B9=B3=E5=8F=B0=E7=A7=BB=E5=8A=A8=E7=AB=AF=E5=85=8D?=
 =?UTF-8?q?=E7=99=BB?=
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 dac9215350..e22c8ef0d9 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit dac92153509c5e1f4b7eb3b8418bd4ce320726c5
+Subproject commit e22c8ef0d999bdf902fd8b5f537c0830d5261b7a

From 087123c1319328a1154e1e980955047c5e580d94 Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Mon, 3 Jun 2024 11:11:13 +0800
Subject: [PATCH 08/19] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=BF=87=E6=BB=A4=E7=BB=84=E4=BB=B6=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/io/dataease/dataset/manage/DatasetDataManage.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetDataManage.java b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetDataManage.java
index 8259c8727e..69a6d971c8 100644
--- a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetDataManage.java
+++ b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetDataManage.java
@@ -689,7 +689,7 @@ public class DatasetDataManage {
         ExtWhere2Str.extWhere2sqlOjb(sqlMeta, extFilterList, datasetGroupInfoDTO.getAllFields(), crossDs, dsMap);
         WhereTree2Str.transFilterTrees(sqlMeta, rowPermissionsTree, fields, crossDs, dsMap);
         Order2SQLObj.getOrders(sqlMeta, fields, datasetGroupInfoDTO.getSortFields(), crossDs, dsMap);
-        String querySQL = SQLProvider.createQuerySQLWithLimit(sqlMeta, false, needOrder, ids.size() == 1, 0, 1000);
+        String querySQL = SQLProvider.createQuerySQLWithLimit(sqlMeta, ids.size() == 1, needOrder, ids.size() == 1, 0, 1000);
         querySQL = SqlUtils.rebuildSQL(querySQL, sqlMeta, crossDs, dsMap);
         logger.info("calcite data enum sql: " + querySQL);
 

From 80a223daf73cf216ba55dfd1003e0ea112a8acbd Mon Sep 17 00:00:00 2001
From: xuwei-fit2cloud <wei@fit2cloud.com>
Date: Mon, 3 Jun 2024 11:24:40 +0800
Subject: [PATCH 09/19] =?UTF-8?q?refactor:=20selenium=E9=95=9C=E5=83=8F?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0cpu=E5=92=8C=E5=86=85=E5=AD=98=E9=99=90?=
 =?UTF-8?q?=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 installer/dataease/docker-compose-selenium.yml | 5 +++++
 installer/install.conf                         | 6 ++++++
 2 files changed, 11 insertions(+)

diff --git a/installer/dataease/docker-compose-selenium.yml b/installer/dataease/docker-compose-selenium.yml
index bfa26ea3d8..2b99dd502a 100644
--- a/installer/dataease/docker-compose-selenium.yml
+++ b/installer/dataease/docker-compose-selenium.yml
@@ -5,6 +5,11 @@ services:
     container_name: de-selenium
     shm_size: 2gb
     privileged: true
+    deploy:
+      resources:
+        limits:
+          cpus: ${DE_SELENIUM_CPU_LIMIT}
+          memory: ${DE_SELENIUM_MEM_LIMIT}
     environment:
       - SE_START_XVFB=false
       - SE_ENABLE_BROWSER_LEFTOVERS_CLEANUP=true
diff --git a/installer/install.conf b/installer/install.conf
index 5048bc44b4..73f7bf6927 100644
--- a/installer/install.conf
+++ b/installer/install.conf
@@ -23,3 +23,9 @@ DE_MYSQL_USER=root
 DE_MYSQL_PASSWORD=Password123@mysql
 ## 数据库参数
 DE_MYSQL_PARAMS="autoReconnect=false&useUnicode=true&characterEncoding=UTF-8&characterSetResults=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true"
+
+# 定时报告镜像配置
+## selenium 镜像 CPU 限制
+DE_SELENIUM_CPU_LIMIT='1'
+## selenium 镜像 内存 限制
+DE_SELENIUM_MEM_LIMIT=2g

From 06ce7d6d1eaca03f572e81894aeb21165e177330 Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Mon, 3 Jun 2024 11:25:58 +0800
Subject: [PATCH 10/19] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=BF=87=E6=BB=A4=E7=BB=84=E4=BB=B6=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/dataease/dataset/manage/DatasetDataManage.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetDataManage.java b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetDataManage.java
index 69a6d971c8..d70a50a101 100644
--- a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetDataManage.java
+++ b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetDataManage.java
@@ -674,6 +674,7 @@ public class DatasetDataManage {
         }
 
         // 排序
+        boolean sortDistinct = true;
         if (ObjectUtils.isNotEmpty(request.getSortId())) {
             DatasetTableFieldDTO field = datasetTableFieldManage.selectById(request.getSortId());
             if (field == null) {
@@ -683,13 +684,14 @@ public class DatasetDataManage {
             BeanUtils.copyBean(deSortField, field);
             deSortField.setOrderDirection(request.getSort());
             datasetGroupInfoDTO.setSortFields(Collections.singletonList(deSortField));
+            sortDistinct = false;
         }
 
         Field2SQLObj.field2sqlObj(sqlMeta, fields, datasetGroupInfoDTO.getAllFields(), crossDs, dsMap);
         ExtWhere2Str.extWhere2sqlOjb(sqlMeta, extFilterList, datasetGroupInfoDTO.getAllFields(), crossDs, dsMap);
         WhereTree2Str.transFilterTrees(sqlMeta, rowPermissionsTree, fields, crossDs, dsMap);
         Order2SQLObj.getOrders(sqlMeta, fields, datasetGroupInfoDTO.getSortFields(), crossDs, dsMap);
-        String querySQL = SQLProvider.createQuerySQLWithLimit(sqlMeta, ids.size() == 1, needOrder, ids.size() == 1, 0, 1000);
+        String querySQL = SQLProvider.createQuerySQLWithLimit(sqlMeta, false, needOrder, sortDistinct && ids.size() == 1, 0, 1000);
         querySQL = SqlUtils.rebuildSQL(querySQL, sqlMeta, crossDs, dsMap);
         logger.info("calcite data enum sql: " + querySQL);
 

From 843722009f079d92694955bf53c0a876255d1f06 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 3 Jun 2024 11:33:44 +0800
Subject: [PATCH 11/19] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A0=E6=B3=95=E6=89=B9=E9=87=8F=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E9=80=8F=E6=98=8E=E5=BA=A6=E7=AD=89=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../custom-component/common/CommonAttr.vue    |  8 +++--
 .../common/CommonStyleSet.vue                 | 35 +++++++++++--------
 .../component-group/DragComponent.vue         |  1 +
 3 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/core/core-frontend/src/custom-component/common/CommonAttr.vue b/core/core-frontend/src/custom-component/common/CommonAttr.vue
index c12579e11e..5ab4fd0063 100644
--- a/core/core-frontend/src/custom-component/common/CommonAttr.vue
+++ b/core/core-frontend/src/custom-component/common/CommonAttr.vue
@@ -61,7 +61,7 @@ const onBackgroundChange = val => {
   emits('onAttrChange', { custom: 'commonBackground' })
 }
 
-const onStyleAttrChange = (value, key) => {
+const onStyleAttrChange = ({ key, value }) => {
   snapshotStore.recordSnapshotCache()
   emits('onAttrChange', { custom: 'style', property: key, value: value })
 }
@@ -143,7 +143,11 @@ const stopEvent = e => {
         name="style"
         class="common-style-area"
       >
-        <common-style-set :themes="themes" :element="element"></common-style-set>
+        <common-style-set
+          @onStyleAttrChange="onStyleAttrChange"
+          :themes="themes"
+          :element="element"
+        ></common-style-set>
       </el-collapse-item>
     </el-collapse>
   </div>
diff --git a/core/core-frontend/src/custom-component/common/CommonStyleSet.vue b/core/core-frontend/src/custom-component/common/CommonStyleSet.vue
index 0958e58229..b54855e0cf 100644
--- a/core/core-frontend/src/custom-component/common/CommonStyleSet.vue
+++ b/core/core-frontend/src/custom-component/common/CommonStyleSet.vue
@@ -114,7 +114,7 @@
                 :effect="themes"
                 v-model="styleForm[styleOptionKey.value]"
                 size="small"
-                @change="changeStyle"
+                @change="changeStylePre(styleOptionKey.value)"
               >
                 <template #prefix>
                   <el-icon :class="{ 'dark-icon': themes === 'dark' }">
@@ -279,7 +279,7 @@ const { t } = useI18n()
 const dvMainStore = dvMainStoreWithOut()
 const snapshotStore = snapshotStoreWithOut()
 
-const { curComponent, canvasStyleData } = storeToRefs(dvMainStore)
+const { canvasStyleData } = storeToRefs(dvMainStore)
 
 const props = withDefaults(
   defineProps<{
@@ -294,7 +294,7 @@ const expandIcon = (name: string) => {
   return h(Icon, { className: '', name })
 }
 const { themes, element } = toRefs(props)
-const emits = defineEmits(['onTextChange'])
+const emits = defineEmits(['onStyleAttrChange'])
 const styleMounted = ref({
   opacity: 1,
   fontSize: 22,
@@ -491,24 +491,29 @@ const styleOptionKeyArray = [
 ]
 
 const styleInit = () => {
-  if (curComponent.value) {
+  if (element.value) {
     Object.keys(styleMounted.value).forEach(key => {
       styleMounted.value[key] = Math.round(
-        (curComponent.value.style[key] * 100) / canvasStyleData.value.scale
+        (element.value.style[key] * 100) / canvasStyleData.value.scale
       )
     })
   }
 }
 
-const sizeChange = key => {
-  curComponent.value.style[key] = Math.round(
-    (styleMounted.value[key] * canvasStyleData.value.scale) / 100
-  )
-  changeStyle()
+const changeStylePre = key => {
+  changeStyle({ key: key, value: element.value.style[key] })
 }
 
-const changeStyle = () => {
+const sizeChange = key => {
+  element.value.style[key] = Math.round(
+    (styleMounted.value[key] * canvasStyleData.value.scale) / 100
+  )
+  changeStyle({ key: key, value: element.value.style[key] })
+}
+
+const changeStyle = params => {
   snapshotStore.recordSnapshotCache()
+  emits('onStyleAttrChange', params)
 }
 
 const checkBold = () => {
@@ -517,7 +522,7 @@ const checkBold = () => {
   } else {
     styleForm.value.fontWeight = 'normal'
   }
-  changeStyle()
+  changeStyle({ key: 'fontWeight', value: styleForm.value.fontWeight })
 }
 
 const checkItalic = () => {
@@ -526,16 +531,16 @@ const checkItalic = () => {
   } else {
     styleForm.value.fontStyle = 'normal'
   }
-  changeStyle()
+  changeStyle({ key: 'fontStyle', value: styleForm.value.fontStyle })
 }
 
 function setPosition(key, p: 'left' | 'center' | 'right') {
   styleForm.value[key] = p
-  changeStyle()
+  changeStyle({ key: key, p })
 }
 
 watch(
-  () => curComponent.value,
+  () => element.value,
   () => {
     styleInit()
   },
diff --git a/core/core-frontend/src/custom-component/component-group/DragComponent.vue b/core/core-frontend/src/custom-component/component-group/DragComponent.vue
index c5830720a6..5dba4c2cf9 100644
--- a/core/core-frontend/src/custom-component/component-group/DragComponent.vue
+++ b/core/core-frontend/src/custom-component/component-group/DragComponent.vue
@@ -73,6 +73,7 @@ const { icon, name, label, dragInfo, themes } = toRefs(props)
     .drag-icon {
       height: 40px;
       width: 40px;
+      color: #3370ff;
     }
   }
   .label-content {

From 88d6543dec16b318da0f105addfad655819e9b43 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 3 Jun 2024 12:14:02 +0800
Subject: [PATCH 12/19] =?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=E4=B8=AD=E5=A4=9A?=
 =?UTF-8?q?=E4=B8=AA=E8=A7=86=E9=A2=91=E7=BB=84=E4=BB=B6=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=8F=AF=E8=83=BD=E7=9B=B8=E4=BA=92=E5=BD=B1?=
 =?UTF-8?q?=E5=93=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core-frontend/src/custom-component/de-frame/FrameLinks.vue | 2 +-
 .../src/custom-component/de-stream-media/StreamMediaLinks.vue  | 2 +-
 .../core-frontend/src/custom-component/de-video/VideoLinks.vue | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/core/core-frontend/src/custom-component/de-frame/FrameLinks.vue b/core/core-frontend/src/custom-component/de-frame/FrameLinks.vue
index d473c86251..9b997dfdcb 100644
--- a/core/core-frontend/src/custom-component/de-frame/FrameLinks.vue
+++ b/core/core-frontend/src/custom-component/de-frame/FrameLinks.vue
@@ -80,7 +80,7 @@ const onBlur = () => {
 }
 init()
 watch(
-  frameLinks.value,
+  () => frameLinks.value,
   () => {
     init()
   },
diff --git a/core/core-frontend/src/custom-component/de-stream-media/StreamMediaLinks.vue b/core/core-frontend/src/custom-component/de-stream-media/StreamMediaLinks.vue
index 366b9fb7f6..9f893fb5b1 100644
--- a/core/core-frontend/src/custom-component/de-stream-media/StreamMediaLinks.vue
+++ b/core/core-frontend/src/custom-component/de-stream-media/StreamMediaLinks.vue
@@ -112,7 +112,7 @@ const onChange = () => {
 init()
 
 watch(
-  linkInfo.value,
+  () => linkInfo.value,
   () => {
     init()
   },
diff --git a/core/core-frontend/src/custom-component/de-video/VideoLinks.vue b/core/core-frontend/src/custom-component/de-video/VideoLinks.vue
index 8c662e1157..d0df1d2593 100644
--- a/core/core-frontend/src/custom-component/de-video/VideoLinks.vue
+++ b/core/core-frontend/src/custom-component/de-video/VideoLinks.vue
@@ -1,5 +1,6 @@
 <template>
   <el-row>
+    --{{ linkInfo }}
     <el-form @submit.prevent ref="form" size="small" style="width: 100%">
       <el-form-item :effect="themes" :label="t('visualization.auto_play')">
         <el-switch
@@ -105,7 +106,7 @@ const onBlur = () => {
 init()
 
 watch(
-  linkInfo.value,
+  () => linkInfo.value,
   () => {
     init()
   },

From 8ef998b03b56ff36e84658509112a4599270f8fc Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Mon, 3 Jun 2024 12:14:27 +0800
Subject: [PATCH 13/19] =?UTF-8?q?fix(X-Pack):=20=E5=AE=9A=E6=97=B6?=
 =?UTF-8?q?=E6=8A=A5=E5=91=8A=E5=AF=BC=E5=87=BA=E8=A7=86=E5=9B=BE=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E7=9B=B8=E5=90=8C=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manage/CoreVisualizationExportManage.java          | 10 +++++++---
 de-xpack                                               |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/core/core-backend/src/main/java/io/dataease/visualization/manage/CoreVisualizationExportManage.java b/core/core-backend/src/main/java/io/dataease/visualization/manage/CoreVisualizationExportManage.java
index 4f53fb57a0..6a263eabc5 100644
--- a/core/core-backend/src/main/java/io/dataease/visualization/manage/CoreVisualizationExportManage.java
+++ b/core/core-backend/src/main/java/io/dataease/visualization/manage/CoreVisualizationExportManage.java
@@ -54,14 +54,18 @@ public class CoreVisualizationExportManage {
         }
         if (CollectionUtils.isEmpty(chartViewDTOS)) return null;
         Map<String, ChartExtRequest> chartExtRequestMap = buildViewRequest(visualization, onlyDisplay);
-        List<ExcelSheetModel> sheets = chartViewDTOS.stream().map(view -> {
+        List<ExcelSheetModel> sheets = new ArrayList<>();
+        for (int i = 0; i < chartViewDTOS.size(); i++) {
+            ChartViewDTO view = chartViewDTOS.get(i);
             ChartExtRequest extRequest = chartExtRequestMap.get(view.getId().toString());
             if (ObjectUtils.isNotEmpty(extRequest)) {
                 view.setChartExtRequest(extRequest);
             }
             view.getChartExtRequest().setUser(AuthUtils.getUser().getUserId());
-            return exportViewData(view);
-        }).toList();
+            view.setTitle((i + 1) + "-" + view.getTitle());
+            sheets.add(exportViewData(view));
+        }
+
         return VisualizationExcelUtils.exportExcel(sheets, visualization.getName(), visualization.getId().toString());
     }
 
diff --git a/de-xpack b/de-xpack
index e22c8ef0d9..0cf469c20f 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit e22c8ef0d999bdf902fd8b5f537c0830d5261b7a
+Subproject commit 0cf469c20f184e57c2e7e88e99896b2f6baed265

From 536380e1902dc3d2b6fe186dc981f8b586b59d34 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 3 Jun 2024 12:24:11 +0800
Subject: [PATCH 14/19] =?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=E7=BC=96=E8=BE=91=E6=97=B6=E5=85=A8?=
 =?UTF-8?q?=E5=B1=8F=E9=A2=84=E8=A7=88=E5=8F=AF=E4=BB=A5=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=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/utils/DeShortcutKey.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/core-frontend/src/utils/DeShortcutKey.ts b/core/core-frontend/src/utils/DeShortcutKey.ts
index a3465ded97..fae894ba77 100644
--- a/core/core-frontend/src/utils/DeShortcutKey.ts
+++ b/core/core-frontend/src/utils/DeShortcutKey.ts
@@ -11,7 +11,7 @@ const composeStore = composeStoreWithOut()
 const snapshotStore = snapshotStoreWithOut()
 const copyStore = copyStoreWithOut()
 const lockStore = lockStoreWithOut()
-const { curComponent, isInEditor } = storeToRefs(dvMainStore)
+const { curComponent, isInEditor, editMode } = storeToRefs(dvMainStore)
 const { areaData } = storeToRefs(composeStore)
 
 const ctrlKey = 17,
@@ -101,7 +101,7 @@ let isShiftDown = false
 // 全局监听按键操作并执行相应命令
 export function listenGlobalKeyDown() {
   window.onkeydown = e => {
-    if (!isInEditor || checkDialog()) return
+    if (!isInEditor.value || editMode.value === 'preview' || checkDialog()) return
     const { keyCode } = e
     if (positionMoveKey[keyCode] && curComponent.value) {
       positionMoveKey[keyCode](keyCode)

From 678563c91f3a6c3368da9bb7b4e56ae036b5abca Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Mon, 3 Jun 2024 12:39:09 +0800
Subject: [PATCH 15/19] =?UTF-8?q?fix:=20=E8=A1=8C=E5=88=97=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E6=8A=A5=E9=94=99?=
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 e22c8ef0d9..141bb393aa 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit e22c8ef0d999bdf902fd8b5f537c0830d5261b7a
+Subproject commit 141bb393aaf0e4cc519295f00d6900529af93b68

From f00f85c30937e318857ce934efbbd58b3297aee0 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Mon, 3 Jun 2024 12:44:32 +0800
Subject: [PATCH 16/19] =?UTF-8?q?fix(X-Pack):=20=E5=AE=9A=E6=97=B6?=
 =?UTF-8?q?=E6=8A=A5=E5=91=8A=E5=AF=BC=E5=87=BA=E8=A7=86=E5=9B=BE=E7=A6=81?=
 =?UTF-8?q?=E6=AD=A2=E9=80=89=E6=8B=A9=E5=AF=8C=E6=96=87=E6=9C=AC=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data-visualization/canvas/ComponentWrapper.vue          | 6 +++++-
 de-xpack                                                    | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/core/core-frontend/src/components/data-visualization/canvas/ComponentWrapper.vue b/core/core-frontend/src/components/data-visualization/canvas/ComponentWrapper.vue
index 28addd5895..66077baac5 100644
--- a/core/core-frontend/src/components/data-visualization/canvas/ComponentWrapper.vue
+++ b/core/core-frontend/src/components/data-visualization/canvas/ComponentWrapper.vue
@@ -207,7 +207,11 @@ const deepScale = computed(() => scale.value / 100)
       @userViewEnlargeOpen="opt => emits('userViewEnlargeOpen', opt)"
     ></component-edit-bar>
     <component-selector
-      v-if="props.isSelector && config.component === 'UserView'"
+      v-if="
+        props.isSelector &&
+        config.component === 'UserView' &&
+        config.propValue?.innerType !== 'rich-text'
+      "
       :resource-id="config.id"
     />
     <div class="wrapper-inner" ref="componentWrapperInnerRef" :style="componentBackgroundStyle">
diff --git a/de-xpack b/de-xpack
index 0cf469c20f..b84ca43009 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit 0cf469c20f184e57c2e7e88e99896b2f6baed265
+Subproject commit b84ca43009687a1fb1d4b1ae3b9bbedb0def8618

From eadd8d11f126fe19b8cb0e5baf920a4a4a8fba21 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Mon, 3 Jun 2024 13:36:23 +0800
Subject: [PATCH 17/19] =?UTF-8?q?fix:=20=E8=A1=8C=E5=88=97=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E6=8A=A5=E9=94=99?=
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 b84ca43009..448c319f8e 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit b84ca43009687a1fb1d4b1ae3b9bbedb0def8618
+Subproject commit 448c319f8e519be5f4b47663258136bcb6fc3faa

From 4b40ccc521c174c2f1b8ac7236cdecb8eb533de4 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 3 Jun 2024 13:36:49 +0800
Subject: [PATCH 18/19] =?UTF-8?q?revert:=20=E5=8E=BB=E6=8E=89=E5=A4=9A?=
 =?UTF-8?q?=E4=BD=99=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/custom-component/de-video/VideoLinks.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/core-frontend/src/custom-component/de-video/VideoLinks.vue b/core/core-frontend/src/custom-component/de-video/VideoLinks.vue
index d0df1d2593..bf8e805aa3 100644
--- a/core/core-frontend/src/custom-component/de-video/VideoLinks.vue
+++ b/core/core-frontend/src/custom-component/de-video/VideoLinks.vue
@@ -1,6 +1,5 @@
 <template>
   <el-row>
-    --{{ linkInfo }}
     <el-form @submit.prevent ref="form" size="small" style="width: 100%">
       <el-form-item :effect="themes" :label="t('visualization.auto_play')">
         <el-switch

From b427f4ccd9885af97373809637c61076b17b0122 Mon Sep 17 00:00:00 2001
From: ulleo <ulleo.wang@gmail.com>
Date: Mon, 3 Jun 2024 14:11:59 +0800
Subject: [PATCH 19/19] =?UTF-8?q?feat(=E5=9B=BE=E8=A1=A8):=20=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E7=BD=91=E6=A0=BC=E7=BA=BF=E8=AE=BE=E7=BD=AE=E4=B8=BA?=
 =?UTF-8?q?=E8=99=9A=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

#9904
---
 .../components/DualYAxisSelectorInner.vue     | 24 ++++++++++++-
 .../editor-style/components/XAxisSelector.vue | 34 +++++++++----------
 .../editor-style/components/YAxisSelector.vue | 34 +++++++++----------
 .../components/js/panel/common/common_antv.ts |  5 +--
 4 files changed, 60 insertions(+), 37 deletions(-)

diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/components/DualYAxisSelectorInner.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/components/DualYAxisSelectorInner.vue
index 58eb11adc0..e3508f9d1a 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/DualYAxisSelectorInner.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/DualYAxisSelectorInner.vue
@@ -33,6 +33,12 @@ const state = reactive({
 
 const emit = defineEmits(['onChangeYAxisForm'])
 
+const splitLineStyle = [
+  { label: t('chart.line_type_solid'), value: 'solid' },
+  { label: t('chart.line_type_dashed'), value: 'dashed' },
+  { label: t('chart.line_type_dotted'), value: 'dotted' }
+]
+
 watch(
   () => props.form,
   () => {
@@ -284,10 +290,26 @@ onMounted(() => {
             is-custom
           />
         </el-form-item>
+        <el-form-item class="form-item" :class="'form-item-' + themes" style="padding: 0 4px">
+          <el-select
+            :disabled="!state.axisForm.splitLine.show"
+            style="width: 62px"
+            :effect="props.themes"
+            v-model="state.axisForm.splitLine.lineStyle.style"
+            @change="changeAxisStyle('splitLine.lineStyle.style')"
+          >
+            <el-option
+              v-for="option in splitLineStyle"
+              :key="option.value"
+              :value="option.value"
+              :label="option.label"
+            ></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item class="form-item" :class="'form-item-' + themes" style="padding-left: 4px">
           <el-input-number
             :disabled="!state.axisForm.splitLine.show"
-            style="width: 108px"
+            style="width: 74px"
             :effect="props.themes"
             v-model="state.axisForm.splitLine.lineStyle.width"
             :min="1"
diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/components/XAxisSelector.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/components/XAxisSelector.vue
index 68bb9b3687..c6b361e35f 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/XAxisSelector.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/XAxisSelector.vue
@@ -316,10 +316,26 @@ onMounted(() => {
             is-custom
           />
         </el-form-item>
+        <el-form-item class="form-item" :class="'form-item-' + themes" style="padding: 0 4px">
+          <el-select
+            :disabled="!state.axisForm.splitLine.show"
+            style="width: 62px"
+            :effect="props.themes"
+            v-model="state.axisForm.splitLine.lineStyle.style"
+            @change="changeAxisStyle('splitLine.lineStyle.style')"
+          >
+            <el-option
+              v-for="option in splitLineStyle"
+              :key="option.value"
+              :value="option.value"
+              :label="option.label"
+            ></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item class="form-item" :class="'form-item-' + themes" style="padding-left: 4px">
           <el-input-number
             :disabled="!state.axisForm.splitLine.show"
-            style="width: 108px"
+            style="width: 74px"
             :effect="props.themes"
             v-model="state.axisForm.splitLine.lineStyle.width"
             :min="1"
@@ -330,22 +346,6 @@ onMounted(() => {
           />
         </el-form-item>
       </div>
-      <el-form-item class="form-item" :class="'form-item-' + themes">
-        <el-select
-          :disabled="!state.axisForm.splitLine.show"
-          style="width: 108px"
-          :effect="props.themes"
-          v-model="state.axisForm.splitLine.lineStyle.style"
-          @change="changeAxisStyle('splitLine.lineStyle')"
-        >
-          <el-option
-            v-for="option in splitLineStyle"
-            :key="option.value"
-            :value="option.value"
-            :label="option.label"
-          ></el-option>
-        </el-select>
-      </el-form-item>
     </div>
     <el-divider class="m-divider" :class="'m-divider--' + themes" />
     <el-form-item
diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/components/YAxisSelector.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/components/YAxisSelector.vue
index 8869e05f89..62c7fdfe0e 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/YAxisSelector.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/YAxisSelector.vue
@@ -298,10 +298,26 @@ onMounted(() => {
             is-custom
           />
         </el-form-item>
+        <el-form-item class="form-item" :class="'form-item-' + themes" style="padding: 0 4px">
+          <el-select
+            :disabled="!state.axisForm.splitLine.show"
+            style="width: 62px"
+            :effect="props.themes"
+            v-model="state.axisForm.splitLine.lineStyle.style"
+            @change="changeAxisStyle('splitLine.lineStyle.style')"
+          >
+            <el-option
+              v-for="option in splitLineStyle"
+              :key="option.value"
+              :value="option.value"
+              :label="option.label"
+            ></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item class="form-item" :class="'form-item-' + themes" style="padding-left: 4px">
           <el-input-number
             :disabled="!state.axisForm.splitLine.show"
-            style="width: 108px"
+            style="width: 74px"
             :effect="props.themes"
             v-model="state.axisForm.splitLine.lineStyle.width"
             :min="1"
@@ -312,22 +328,6 @@ onMounted(() => {
           />
         </el-form-item>
       </div>
-      <el-form-item class="form-item" :class="'form-item-' + themes">
-        <el-select
-          :disabled="!state.axisForm.splitLine.show"
-          style="width: 108px"
-          :effect="props.themes"
-          v-model="state.axisForm.splitLine.lineStyle.style"
-          @change="changeAxisStyle('splitLine.lineStyle')"
-        >
-          <el-option
-            v-for="option in splitLineStyle"
-            :key="option.value"
-            :value="option.value"
-            :label="option.label"
-          ></el-option>
-        </el-select>
-      </el-form-item>
     </div>
     <el-divider
       v-if="showProperty('axisLabel')"
diff --git a/core/core-frontend/src/views/chart/components/js/panel/common/common_antv.ts b/core/core-frontend/src/views/chart/components/js/panel/common/common_antv.ts
index a2e3f53e06..510086322b 100644
--- a/core/core-frontend/src/views/chart/components/js/panel/common/common_antv.ts
+++ b/core/core-frontend/src/views/chart/components/js/panel/common/common_antv.ts
@@ -530,7 +530,8 @@ export function getYAxisExt(chart: Chart) {
         line: {
           style: {
             stroke: yAxis.splitLine.lineStyle.color,
-            lineWidth: yAxis.splitLine.lineStyle.width
+            lineWidth: yAxis.splitLine.lineStyle.width,
+            lineDash: getLineDash(yAxis.splitLine.lineStyle.style)
           }
         }
       }
@@ -780,7 +781,7 @@ export function getAnalyseHorizontal(chart: Chart) {
   return assistLine
 }
 
-function getLineDash(type) {
+export function getLineDash(type) {
   switch (type) {
     case 'solid':
       return [0, 0]