From ba517d00737a9f356d79bf0aa0073d992e991caa Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 22 Jan 2024 17:34:18 +0800
Subject: [PATCH 01/22] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E5=A4=A7?=
 =?UTF-8?q?=E5=B1=8F=E6=B0=B4=E5=8D=B0=E5=B1=95=E7=A4=BA=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/data-visualization/canvas/CanvasCore.vue   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue b/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue
index 552dab01d3..8eb8245b97 100644
--- a/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue
+++ b/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue
@@ -206,7 +206,9 @@ watch(
 watch(
   () => canvasStyleData.value,
   () => {
-    initWatermark()
+    nextTick(() => {
+      initWatermark()
+    })
   },
   { deep: true }
 )

From 9bc751ffda3481a6e16c8d9b174a5a1994531b70 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 22 Jan 2024 17:56:13 +0800
Subject: [PATCH 02/22] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E5=A4=A7?=
 =?UTF-8?q?=E5=B1=8F=E6=B0=B4=E5=8D=B0=E5=B1=95=E7=A4=BA=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-backend/pom.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/core/core-backend/pom.xml b/core/core-backend/pom.xml
index 72a5f97b9e..13032ace70 100644
--- a/core/core-backend/pom.xml
+++ b/core/core-backend/pom.xml
@@ -101,6 +101,16 @@
                     <groupId>com.h2database</groupId>
                     <artifactId>h2</artifactId>
                 </dependency>
+                <dependency>
+                    <groupId>io.dataease</groupId>
+                    <artifactId>xpack-permissions</artifactId>
+                    <version>${project.version}</version>
+                </dependency>
+                <dependency>
+                    <groupId>io.dataease</groupId>
+                    <artifactId>xpack-base</artifactId>
+                    <version>${project.version}</version>
+                </dependency>
             </dependencies>
 
             <build>

From e9c713150a9a1900e5861ef55480f5fb753c6ad0 Mon Sep 17 00:00:00 2001
From: xuwei-fit2cloud <wei@fit2cloud.com>
Date: Mon, 22 Jan 2024 18:23:07 +0800
Subject: [PATCH 03/22] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96dectl?=
 =?UTF-8?q?=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 installer/dectl | 51 +++++++++++++++++++++----------------------------
 1 file changed, 22 insertions(+), 29 deletions(-)

diff --git a/installer/dectl b/installer/dectl
index 162a380605..6e3a85ee3a 100644
--- a/installer/dectl
+++ b/installer/dectl
@@ -7,7 +7,7 @@ DE_RUNNING_BASE=${DE_BASE}/dataease2.0
 need_init_apisix=false
 compose_files="-f docker-compose.yml"
 compose_cmd="docker-compose"
-server_url="github.com"
+server_url=""
 current_version=""
 latest_version=""
 
@@ -28,12 +28,6 @@ if [[ ! ${DE_EXTERNAL_MYSQL} ]] || [ "${DE_EXTERNAL_MYSQL}" = "false" ]; then
   compose_files="${compose_files} -f docker-compose-mysql.yml"
 fi
 
-if [[ -x "$(command -v python)" ]]; then
-   py_cmd='python'
-elif [[ -x "$(command -v python3)" ]]; then
-   py_cmd='python3'
-fi
-
 function usage() {
    echo "DATAEASE 控制脚本"
    echo
@@ -125,34 +119,33 @@ function _get_current_version() {
 function _get_available_server() {
    git_urls=('github.com')
 
-   for git_url in ${git_urls[*]}; do
-      success="true"
-      
+   for git_url in ${git_urls[*]}; do      
       echo -ne "检测 ${git_url} ... "
       curl -m 5 -kIs https://${git_url} >/dev/null
       if [ $? != 0 ]; then
          echo "failed"
-         success="false"
       else
          echo "ok"
-      fi
-      
-      if [[ ${success} == "true" ]]; then
          server_url=${git_url}
          break
-      else
-         unset server_url
       fi
    done
-
-   if [[ "x${server_url}" == "x" ]]; then
-      echo "没有找到稳定的下载服务器，请访问 https://community.fit2cloud.com/#/products/dataease/downloads 下载离线安装包"
-      exit 1
-   fi
 }
 function _get_latest_version() {
    rm -f /tmp/de_latest_release
 
+   _get_available_server
+   if [[ "x${server_url}" == "x" ]];then
+      echo "无法连接版本服务器，请稍候重试"
+      exit 1
+   fi
+
+   if [[ -x "$(command -v python)" ]]; then
+      py_cmd='python'
+   elif [[ -x "$(command -v python3)" ]]; then
+      py_cmd='python3'
+   fi
+
    $py_cmd - <<EOF
 # -*- coding: UTF-8 -*-
 import os
@@ -185,8 +178,6 @@ while (page <= 3):
 if latest_release == None or latest_release == "":
    print("Failed to obtain latest version, please try again.")
    exit(1)
-else:
-   print("latest version is %s" % (latest_release))
 
 # 记录最新版本号
 os.popen("echo "+latest_release+" > /tmp/de_latest_release")
@@ -255,13 +246,10 @@ function version() {
    _get_current_version
    _get_latest_version
    echo "current version is $current_version"
+   echo "latest version is $latest_version"
 }
 function upgrade() {
-   echo
-   _get_current_version
-   echo "检测当前版本为${current_version}"
-   _get_available_server
-   _get_latest_version
+   version
 
    if [ "${latest_version}" = "" ]; then
       echo "未获取到最新版本"
@@ -270,7 +258,12 @@ function upgrade() {
       echo "最新版本与当前版本一致,退出升级过程"
       exit 0
    else
-      echo "检测到 ${server_url} 上最新版本为 ${latest_version} 即将执行在线升级..."
+      if [[ ! "$latest_version" =~ ^v2.* ]];then
+         echo "获取到的最新版本与当前版本不匹配，请访问 https://community.fit2cloud.com/#/products/dataease/downloads 下载离线安装包"
+         exit 1
+      else
+         echo "检测到 ${server_url} 上最新版本为 ${latest_version} 即将执行在线升级..."
+      fi
    fi
    sleep 2
 

From 4b6f21c6be168343bdd41b3cbb9ee62aac2a23e6 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 22 Jan 2024 18:51:18 +0800
Subject: [PATCH 04/22] =?UTF-8?q?style:=20=E4=BC=98=E5=8C=96=E5=A4=A7?=
 =?UTF-8?q?=E5=B1=8F=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/watermark/watermark.ts          | 14 +++++++-------
 core/core-frontend/src/utils/attr.ts               |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/core/core-frontend/src/components/watermark/watermark.ts b/core/core-frontend/src/components/watermark/watermark.ts
index 125e92ae10..9cf773c60d 100644
--- a/core/core-frontend/src/components/watermark/watermark.ts
+++ b/core/core-frontend/src/components/watermark/watermark.ts
@@ -41,17 +41,17 @@ export function watermark(settings, domId) {
   // 如果将水印列数设置为0，或水印列数设置过大，超过页面最大宽度，则重新计算水印列数和水印x轴间隔
   if (
     defaultSettings.watermark_cols === 0 ||
-    parseInt(
+    Math.round(
       defaultSettings.watermark_x +
         defaultSettings.watermark_width * defaultSettings.watermark_cols +
         defaultSettings.watermark_x_space * (defaultSettings.watermark_cols - 1)
     ) > page_width
   ) {
-    defaultSettings.watermark_cols = parseInt(
+    defaultSettings.watermark_cols = Math.round(
       (page_width - defaultSettings.watermark_x + defaultSettings.watermark_x_space) /
         (defaultSettings.watermark_width + defaultSettings.watermark_x_space)
     )
-    defaultSettings.watermark_x_space = parseInt(
+    defaultSettings.watermark_x_space = Math.round(
       (page_width -
         defaultSettings.watermark_x -
         defaultSettings.watermark_width * defaultSettings.watermark_cols) /
@@ -61,17 +61,17 @@ export function watermark(settings, domId) {
   // 如果将水印行数设置为0，或水印行数设置过大，超过页面最大长度，则重新计算水印行数和水印y轴间隔
   if (
     defaultSettings.watermark_rows === 0 ||
-    parseInt(
+    Math.round(
       defaultSettings.watermark_y +
         defaultSettings.watermark_height * defaultSettings.watermark_rows +
         defaultSettings.watermark_y_space * (defaultSettings.watermark_rows - 1)
     ) > page_height
   ) {
-    defaultSettings.watermark_rows = parseInt(
+    defaultSettings.watermark_rows = Math.round(
       (defaultSettings.watermark_y_space + page_height - defaultSettings.watermark_y) /
         (defaultSettings.watermark_height + defaultSettings.watermark_y_space)
     )
-    defaultSettings.watermark_y_space = parseInt(
+    defaultSettings.watermark_y_space = Math.round(
       (page_height -
         defaultSettings.watermark_y -
         defaultSettings.watermark_height * defaultSettings.watermark_rows) /
@@ -110,7 +110,7 @@ export function watermark(settings, domId) {
       mask_div.style.zIndex = '10'
       // 让水印不遮挡页面的点击事件
       mask_div.style.pointerEvents = 'none'
-      mask_div.style.opacity = defaultSettings.watermark_alpha
+      mask_div.style.opacity = defaultSettings.watermark_alpha + ''
       mask_div.style.fontSize = defaultSettings.watermark_fontsize
       mask_div.style.fontFamily = defaultSettings.watermark_font
       mask_div.style.color = defaultSettings.watermark_color
diff --git a/core/core-frontend/src/utils/attr.ts b/core/core-frontend/src/utils/attr.ts
index d5bbc5251d..341020af27 100644
--- a/core/core-frontend/src/utils/attr.ts
+++ b/core/core-frontend/src/utils/attr.ts
@@ -1,7 +1,7 @@
 export const positionData = [
   { key: 'left', label: 'X', min: -1000, max: 20000, step: 10 },
-  { key: 'top', label: 'Y', min: -1000, max: 20000, step: 10 },
   { key: 'width', label: 'W', min: 10, max: 20000, step: 10 },
+  { key: 'top', label: 'Y', min: -1000, max: 20000, step: 10 },
   { key: 'height', label: 'H', min: 10, max: 20000, step: 10 }
 ]
 

From fb7b9c602cd65abcd00a122709e0773d475ac7b0 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 23 Jan 2024 09:58:30 +0800
Subject: [PATCH 05/22] =?UTF-8?q?revert:=20=E5=9B=9E=E9=80=80=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

---
 .../src/components/watermark/watermark.ts          | 14 +++++++-------
 de-xpack                                           |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/core/core-frontend/src/components/watermark/watermark.ts b/core/core-frontend/src/components/watermark/watermark.ts
index 9cf773c60d..7e185e84ee 100644
--- a/core/core-frontend/src/components/watermark/watermark.ts
+++ b/core/core-frontend/src/components/watermark/watermark.ts
@@ -41,17 +41,17 @@ export function watermark(settings, domId) {
   // 如果将水印列数设置为0，或水印列数设置过大，超过页面最大宽度，则重新计算水印列数和水印x轴间隔
   if (
     defaultSettings.watermark_cols === 0 ||
-    Math.round(
+    Math.floor(
       defaultSettings.watermark_x +
         defaultSettings.watermark_width * defaultSettings.watermark_cols +
         defaultSettings.watermark_x_space * (defaultSettings.watermark_cols - 1)
     ) > page_width
   ) {
-    defaultSettings.watermark_cols = Math.round(
+    defaultSettings.watermark_cols = Math.floor(
       (page_width - defaultSettings.watermark_x + defaultSettings.watermark_x_space) /
         (defaultSettings.watermark_width + defaultSettings.watermark_x_space)
     )
-    defaultSettings.watermark_x_space = Math.round(
+    defaultSettings.watermark_x_space = Math.floor(
       (page_width -
         defaultSettings.watermark_x -
         defaultSettings.watermark_width * defaultSettings.watermark_cols) /
@@ -61,17 +61,17 @@ export function watermark(settings, domId) {
   // 如果将水印行数设置为0，或水印行数设置过大，超过页面最大长度，则重新计算水印行数和水印y轴间隔
   if (
     defaultSettings.watermark_rows === 0 ||
-    Math.round(
+    Math.floor(
       defaultSettings.watermark_y +
         defaultSettings.watermark_height * defaultSettings.watermark_rows +
         defaultSettings.watermark_y_space * (defaultSettings.watermark_rows - 1)
     ) > page_height
   ) {
-    defaultSettings.watermark_rows = Math.round(
+    defaultSettings.watermark_rows = Math.floor(
       (defaultSettings.watermark_y_space + page_height - defaultSettings.watermark_y) /
         (defaultSettings.watermark_height + defaultSettings.watermark_y_space)
     )
-    defaultSettings.watermark_y_space = Math.round(
+    defaultSettings.watermark_y_space = Math.floor(
       (page_height -
         defaultSettings.watermark_y -
         defaultSettings.watermark_height * defaultSettings.watermark_rows) /
@@ -110,7 +110,7 @@ export function watermark(settings, domId) {
       mask_div.style.zIndex = '10'
       // 让水印不遮挡页面的点击事件
       mask_div.style.pointerEvents = 'none'
-      mask_div.style.opacity = defaultSettings.watermark_alpha + ''
+      mask_div.style.opacity = defaultSettings.watermark_alpha
       mask_div.style.fontSize = defaultSettings.watermark_fontsize
       mask_div.style.fontFamily = defaultSettings.watermark_font
       mask_div.style.color = defaultSettings.watermark_color
diff --git a/de-xpack b/de-xpack
index 19d1cc14aa..a30164b304 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit 19d1cc14aaa7ff5297ebe8f3b8ea3c706f164cc3
+Subproject commit a30164b304688249585d2d9af53502a3a67211d2

From 10e5f5d1e5073e0979f2fada36f0843a121ee7b7 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 23 Jan 2024 10:05:20 +0800
Subject: [PATCH 06/22] =?UTF-8?q?revert:=20=E5=9B=9E=E9=80=80=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-backend/pom.xml | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/core/core-backend/pom.xml b/core/core-backend/pom.xml
index 13032ace70..72a5f97b9e 100644
--- a/core/core-backend/pom.xml
+++ b/core/core-backend/pom.xml
@@ -101,16 +101,6 @@
                     <groupId>com.h2database</groupId>
                     <artifactId>h2</artifactId>
                 </dependency>
-                <dependency>
-                    <groupId>io.dataease</groupId>
-                    <artifactId>xpack-permissions</artifactId>
-                    <version>${project.version}</version>
-                </dependency>
-                <dependency>
-                    <groupId>io.dataease</groupId>
-                    <artifactId>xpack-base</artifactId>
-                    <version>${project.version}</version>
-                </dependency>
             </dependencies>
 
             <build>

From 383eb775132b1bc4f8799a6c65201b106620e3a1 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 23 Jan 2024 10:17:25 +0800
Subject: [PATCH 07/22] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E6=B0=B4?=
 =?UTF-8?q?=E5=8D=B0=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/data-visualization/canvas/CanvasCore.vue  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue b/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue
index 8eb8245b97..86245c8ca3 100644
--- a/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue
+++ b/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue
@@ -1385,7 +1385,7 @@ defineExpose({
     :id="mainDomId"
     ref="container"
     class="editor"
-    :class="{ edit: isEdit }"
+    :class="{ edit: isEdit, 'dashboard-editor': dashboardActive }"
     :style="editStyle"
     @contextmenu="handleContextMenu"
   >
@@ -1482,6 +1482,9 @@ defineExpose({
 </template>
 
 <style lang="less" scoped>
+.dashboard-editor {
+  min-height: 100%;
+}
 .editor {
   position: relative;
   margin: auto;

From 783594e1abe91463a921badc27d659673c10d167 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 23 Jan 2024 10:25:35 +0800
Subject: [PATCH 08/22] =?UTF-8?q?perf:=20=E5=8D=87=E7=BA=A7json-path?=
 =?UTF-8?q?=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/core/core-backend/pom.xml b/core/core-backend/pom.xml
index 72a5f97b9e..431f4be49c 100644
--- a/core/core-backend/pom.xml
+++ b/core/core-backend/pom.xml
@@ -59,7 +59,7 @@
         <dependency>
             <groupId>com.jayway.jsonpath</groupId>
             <artifactId>json-path</artifactId>
-            <version>2.4.0</version>
+            <version>[2.9.0, )</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.slf4j</groupId>

From dfb53889e6fbe52fd0718788c2f977ed353ed4e9 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 23 Jan 2024 10:43:33 +0800
Subject: [PATCH 09/22] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E6=89=B9?=
 =?UTF-8?q?=E9=87=8F=E8=AE=BE=E7=BD=AE=E6=97=B6=E5=A4=9A=E9=80=89=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E6=A0=87=E7=AD=BE=E6=98=BE=E7=A4=BA=EF=BC=8C=E4=BD=86?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E4=B8=BA=E7=A9=BA=E7=9A=84=E5=9C=BA=E6=99=AF?=
 =?UTF-8?q?=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/editor/editor-style/components/LabelSelector.vue  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/components/LabelSelector.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/components/LabelSelector.vue
index 8406c6e0cc..12d063fc9e 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/LabelSelector.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/LabelSelector.vue
@@ -210,6 +210,7 @@ onMounted(() => {
     :model="state.labelForm"
     label-position="top"
   >
+    <el-row v-if="batchOptStatus" style="margin-bottom: 12px"> 无其他公共属性 </el-row>
     <el-space>
       <el-form-item
         class="form-item"

From 6e79d600328b8633a30a67926009c57a29e36c50 Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Tue, 23 Jan 2024 11:26:39 +0800
Subject: [PATCH 10/22] =?UTF-8?q?refactor:=20=E5=A2=9E=E5=8A=A0SQL?=
 =?UTF-8?q?=E7=89=87=E6=AE=B5=E9=A2=84=E8=A7=88=E6=89=A7=E8=A1=8CSQL?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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 20b92d03e0..828fee3ef8 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
@@ -311,6 +311,7 @@ public class DatasetDataManage {
         Map<String, Object> previewData = buildPreviewData(data, fields, new HashMap<>());
         Map<String, Object> map = new LinkedHashMap<>();
         map.put("data", previewData);
+        map.put("sql", Base64.getEncoder().encodeToString(sql.getBytes()));
         return map;
     }
 

From 02d31c6dca345874a305fa157b1131c3ce5c80d4 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Tue, 23 Jan 2024 12:31:16 +0800
Subject: [PATCH 11/22] =?UTF-8?q?=20fix:=20=E5=8D=87=E7=BA=A7json-path?=
 =?UTF-8?q?=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/io/dataease/datasource/provider/ApiUtils.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/core-backend/src/main/java/io/dataease/datasource/provider/ApiUtils.java b/core/core-backend/src/main/java/io/dataease/datasource/provider/ApiUtils.java
index 3dbc242a17..381b53db65 100644
--- a/core/core-backend/src/main/java/io/dataease/datasource/provider/ApiUtils.java
+++ b/core/core-backend/src/main/java/io/dataease/datasource/provider/ApiUtils.java
@@ -16,8 +16,8 @@ import io.dataease.utils.CommonBeanFactory;
 import io.dataease.utils.HttpClientConfig;
 import io.dataease.utils.HttpClientUtil;
 import io.dataease.utils.JsonUtil;
-import net.minidev.json.JSONArray;
 import org.apache.commons.lang3.StringUtils;
+import org.json.simple.JSONArray;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 

From 90f5671544e01f8c3187eafbfc961c6334b931b0 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 23 Jan 2024 12:37:54 +0800
Subject: [PATCH 12/22] =?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=E7=BB=84=E5=90=88=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/store/modules/data-visualization/copy.ts       |  4 ++++
 .../src/store/modules/data-visualization/dvMain.ts     | 10 ++++++++++
 2 files changed, 14 insertions(+)

diff --git a/core/core-frontend/src/store/modules/data-visualization/copy.ts b/core/core-frontend/src/store/modules/data-visualization/copy.ts
index e61afca528..d3da8c80fe 100644
--- a/core/core-frontend/src/store/modules/data-visualization/copy.ts
+++ b/core/core-frontend/src/store/modules/data-visualization/copy.ts
@@ -108,6 +108,9 @@ export const copyStore = defineStore('copy', {
           // 旧-新ID映射关系
           const idMap = {}
           const newComponent = deepCopyHelper(data, idMap)
+          if (newComponent.canvasId.includes('Group')) {
+            newComponent.canvasId = 'canvas-main'
+          }
           dvMainStore.addCopyComponent(newComponent, idMap, copyDataTemp.copyCanvasViewInfo)
           if (dvInfo.value.type === 'dashboard') {
             if (dvMainStore.multiplexingStyleAdapt && copyDataTemp.copyFrom === 'multiplexing') {
@@ -115,6 +118,7 @@ export const copyStore = defineStore('copy', {
             }
             eventBus.emit('addDashboardItem-' + newComponent.canvasId, newComponent)
           }
+
           i++
         }
       }, moveTime)
diff --git a/core/core-frontend/src/store/modules/data-visualization/dvMain.ts b/core/core-frontend/src/store/modules/data-visualization/dvMain.ts
index 4c3f21cba4..37cad0c879 100644
--- a/core/core-frontend/src/store/modules/data-visualization/dvMain.ts
+++ b/core/core-frontend/src/store/modules/data-visualization/dvMain.ts
@@ -221,7 +221,17 @@ export const dvMainStore = defineStore('dataVisualization', {
           })
         }
       }
+      if (!this.curComponent) {
+        this.componentData.forEach(componentItem => {
+          componentItem['canvasActive'] = false
+        })
+      }
       if (component) {
+        this.componentData.forEach(componentItem => {
+          if (!component.canvasId.includes(componentItem.id)) {
+            componentItem['canvasActive'] = false
+          }
+        })
         // Is the current component in editing status
         if (!this.curComponent) {
           component['editing'] = false

From 9c0fc7a5fe5ad9606dbd3f4fd096e8e955e3a562 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 23 Jan 2024 13:33:04 +0800
Subject: [PATCH 13/22] =?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=BB=84=E5=90=88=E4=BB=A5=E5=90=8E?=
 =?UTF-8?q?=EF=BC=8C=E6=89=8B=E5=8A=A8=E7=BC=96=E8=BE=91=E7=BB=84=E5=90=88?=
 =?UTF-8?q?W/H=EF=BC=8C=E6=94=B9=E5=8F=98=E7=9A=84=E5=8F=AA=E6=9C=89?=
 =?UTF-8?q?=E7=BB=84=E5=90=88=E6=A1=86=EF=BC=8C=E7=BB=84=E5=90=88=E5=86=85?=
 =?UTF-8?q?=E7=9A=84=E7=BB=84=E4=BB=B6=E6=97=A0=E5=A4=A7=E5=B0=8F=E5=8F=98?=
 =?UTF-8?q?=E5=8C=96=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/visualization/common/ComponentPosition.vue | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/core/core-frontend/src/components/visualization/common/ComponentPosition.vue b/core/core-frontend/src/components/visualization/common/ComponentPosition.vue
index 9422d12811..1216dc57ea 100644
--- a/core/core-frontend/src/components/visualization/common/ComponentPosition.vue
+++ b/core/core-frontend/src/components/visualization/common/ComponentPosition.vue
@@ -27,6 +27,7 @@ import { storeToRefs } from 'pinia'
 import { dvMainStoreWithOut } from '@/store/modules/data-visualization/dvMain'
 import _ from 'lodash'
 import { snapshotStoreWithOut } from '@/store/modules/data-visualization/snapshot'
+import { groupSizeStyleAdaptor } from '@/utils/style'
 const snapshotStore = snapshotStoreWithOut()
 
 const dvMainStore = dvMainStoreWithOut()
@@ -73,6 +74,13 @@ const onPositionChange = key => {
   curComponent.value.style[key] = Math.round(
     (positionMounted.value[key] * canvasStyleData.value.scale) / 100
   )
+
+  if (curComponent.value.component === 'Group') {
+    //如果当前组件是Group分组 则要进行内部组件深度计算
+    const parentNode = document.querySelector('#editor-canvas-main')
+    groupSizeStyleAdaptor(curComponent.value)
+  }
+
   snapshotStore.recordSnapshotCache()
 }
 

From 88e033ad7d9cc88b57adf8b529aec92d6ac92ac4 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 23 Jan 2024 13:47:37 +0800
Subject: [PATCH 14/22] =?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=E5=B1=95=E5=BC=80=E5=9B=BE=E8=A1=A8?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86=E6=BB=9A=E5=8A=A8=E6=BB=9A=E8=BD=AE?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E7=94=BB=E6=9D=BF=E7=BC=A9=E6=94=BE=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data-visualization/ComponentToolBar.vue   | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/core/core-frontend/src/components/data-visualization/ComponentToolBar.vue b/core/core-frontend/src/components/data-visualization/ComponentToolBar.vue
index c5466c4d22..43fcd4434f 100644
--- a/core/core-frontend/src/components/data-visualization/ComponentToolBar.vue
+++ b/core/core-frontend/src/components/data-visualization/ComponentToolBar.vue
@@ -41,8 +41,29 @@ const reposition = () => {
 // 记录瞬时wheel值 防止放大操作和滚动操作冲突
 let lastWheelNum = 0
 
+// 检查当前页面是否有弹框
+const checkDialog = () => {
+  let haveDialog = false
+  document.querySelectorAll('.ed-overlay').forEach(element => {
+    if (window.getComputedStyle(element).getPropertyValue('display') != 'none') {
+      haveDialog = true
+    }
+  })
+  document.querySelectorAll('.ed-popover').forEach(element => {
+    if (window.getComputedStyle(element).getPropertyValue('display') != 'none') {
+      haveDialog = true
+    }
+  })
+  // 富文本单框
+  if (document.querySelector('.tox-dialog-wrap')) {
+    haveDialog = true
+  }
+
+  return haveDialog
+}
+
 const handleMouseWheel = e => {
-  if (editMode.value === 'preview') {
+  if (editMode.value === 'preview' || checkDialog()) {
     return
   }
   let dvMain = document.getElementById('dv-main-center')

From 4c6446b6472bfceb097d87391ada5220bbb004e5 Mon Sep 17 00:00:00 2001
From: xuwei-fit2cloud <wei@fit2cloud.com>
Date: Tue, 23 Jan 2024 14:57:36 +0800
Subject: [PATCH 15/22] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Ddectl=E8=84=9A?=
 =?UTF-8?q?=E6=9C=AC=E6=89=A7=E8=A1=8C=E6=9D=A1=E4=BB=B6=E7=9A=84=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 installer/dectl      | 2 +-
 installer/install.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/installer/dectl b/installer/dectl
index 6e3a85ee3a..4490f559f1 100644
--- a/installer/dectl
+++ b/installer/dectl
@@ -244,8 +244,8 @@ function reload() {
 function version() {
    echo
    _get_current_version
-   _get_latest_version
    echo "current version is $current_version"
+   _get_latest_version
    echo "latest version is $latest_version"
 }
 function upgrade() {
diff --git a/installer/install.sh b/installer/install.sh
index 883691c886..9b3f33e441 100644
--- a/installer/install.sh
+++ b/installer/install.sh
@@ -20,7 +20,7 @@ if [ -f /usr/bin/dectl ]; then
    dectl stop
    INSTALL_TYPE='upgrade'
 
-   v2_version=$(dectl version |grep "^v2.")
+   v2_version=$(dectl version | head -n 2 | grep "v2.")
    if [[ -z $v2_version ]];then
       echo "系统当前版本不是 DataEase v2 版本系列，不支持升级到 v2，请检查离线包版本。"
       exit 1;

From dc12026faf2b95f34639b195f433b8019685b8a1 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 23 Jan 2024 15:36:46 +0800
Subject: [PATCH 16/22] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E6=8C=87?=
 =?UTF-8?q?=E6=A0=87=E5=8D=A1=E6=89=B9=E9=87=8F=E6=93=8D=E4=BD=9C=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/editor/editor-style/ChartStyle.vue      |  2 +-
 .../editor/editor-style/ChartStyleBatchSet.vue         | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/ChartStyle.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/ChartStyle.vue
index 05a6a4d7df..fd70f29ec7 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/ChartStyle.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/ChartStyle.vue
@@ -276,7 +276,7 @@ watch(
             title="大小"
           >
             <misc-selector
-              :property-inner="propertyInnerAll['size-selector']"
+              :property-inner="propertyInnerAll['misc-selector']"
               :themes="themes"
               class="attr-selector"
               :chart="chart"
diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/ChartStyleBatchSet.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/ChartStyleBatchSet.vue
index e3a0337eb2..aff9c85345 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/ChartStyleBatchSet.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/ChartStyleBatchSet.vue
@@ -25,6 +25,8 @@
       @onTableCellChange="onTableCellChange"
       @onTableTotalChange="onTableTotalChange"
       @onChangeMiscStyleForm="onChangeMiscStyleForm"
+      @onIndicatorChange="onIndicatorChange"
+      @onIndicatorNameChange="onIndicatorNameChange"
     />
     <common-attr
       v-else-if="mixProperties && batchOptComponentInfo && batchOptComponentType !== 'UserView'"
@@ -77,6 +79,14 @@ const onChangeYAxisForm = (val, prop) => {
   batchOptChange('customStyle', 'yAxis', val, prop)
 }
 
+const onIndicatorChange = (val, prop) => {
+  batchOptChange('customAttr', 'indicator', val, prop)
+}
+
+const onIndicatorNameChange = (val, prop) => {
+  batchOptChange('customAttr', 'indicatorName', val, prop)
+}
+
 const onChangeMiscStyleForm = (val, prop) => {
   batchOptChange('customStyle', 'misc', val, prop)
 }

From 18cfe958ff31934819e58386d5552304d1177cc6 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 23 Jan 2024 15:58:51 +0800
Subject: [PATCH 17/22] =?UTF-8?q?refactor:=20=E6=89=B9=E9=87=8F=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/store/modules/data-visualization/dvMain.ts           | 5 ++++-
 .../chart/components/editor/editor-style/ChartStyle.vue      | 2 +-
 .../editor/editor-style/components/LabelSelector.vue         | 1 -
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/core/core-frontend/src/store/modules/data-visualization/dvMain.ts b/core/core-frontend/src/store/modules/data-visualization/dvMain.ts
index 37cad0c879..23479f03d1 100644
--- a/core/core-frontend/src/store/modules/data-visualization/dvMain.ts
+++ b/core/core-frontend/src/store/modules/data-visualization/dvMain.ts
@@ -569,7 +569,10 @@ export const dvMainStore = defineStore('dataVisualization', {
           mixPropertiesTemp = deepCopy(componentInfo.properties)
           mixPropertyInnerTemp = deepCopy(componentInfo.propertyInner)
         }
-        batchAttachInfo.type = componentInfo.value
+        batchAttachInfo.type =
+          batchAttachInfo.type === null || batchAttachInfo.type === componentInfo.value
+            ? componentInfo.value
+            : 'mix'
       }
       mixPropertiesTemp.forEach(property => {
         if (mixPropertyInnerTemp[property]) {
diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/ChartStyle.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/ChartStyle.vue
index fd70f29ec7..54707fee91 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/ChartStyle.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/ChartStyle.vue
@@ -271,7 +271,7 @@ watch(
           </collapse-switch-item>
           <el-collapse-item
             :effect="themes"
-            v-if="showProperties('misc-selector')"
+            v-if="showProperties('misc-selector') && !chart.type.includes('mix')"
             name="size"
             title="大小"
           >
diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/components/LabelSelector.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/components/LabelSelector.vue
index 12d063fc9e..8406c6e0cc 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/LabelSelector.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/LabelSelector.vue
@@ -210,7 +210,6 @@ onMounted(() => {
     :model="state.labelForm"
     label-position="top"
   >
-    <el-row v-if="batchOptStatus" style="margin-bottom: 12px"> 无其他公共属性 </el-row>
     <el-space>
       <el-form-item
         class="form-item"

From 3169c7997182cb1994bec258aa9e05a88c656932 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 23 Jan 2024 17:43:41 +0800
Subject: [PATCH 18/22] =?UTF-8?q?perf:=20=E6=97=A5=E5=BF=97=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E8=BF=87=E6=BB=A4=E5=8F=8A=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../drawer-filter/src/DrawerFilter.vue        |  2 +-
 .../src/components/filter-text/index.ts       |  9 ++++++++
 de-xpack                                      |  2 +-
 .../dataease/api/log/dto/LogGridRequest.java  |  8 ++++---
 .../api/permissions/user/api/UserApi.java     |  4 ++++
 .../java/io/dataease/utils/DateUtils.java     | 22 +++++++++++++++++++
 6 files changed, 42 insertions(+), 5 deletions(-)
 create mode 100644 sdk/common/src/main/java/io/dataease/utils/DateUtils.java

diff --git a/core/core-frontend/src/components/drawer-filter/src/DrawerFilter.vue b/core/core-frontend/src/components/drawer-filter/src/DrawerFilter.vue
index 7fff929a74..06de4f472f 100644
--- a/core/core-frontend/src/components/drawer-filter/src/DrawerFilter.vue
+++ b/core/core-frontend/src/components/drawer-filter/src/DrawerFilter.vue
@@ -21,7 +21,7 @@ const emits = defineEmits(['filter-change'])
 const selectStatus = ids => {
   emits(
     'filter-change',
-    ids.map(item => item.label)
+    ids.map(item => item.id || item.value)
   )
 }
 
diff --git a/core/core-frontend/src/components/filter-text/index.ts b/core/core-frontend/src/components/filter-text/index.ts
index 02122436cb..bcc75da1f9 100644
--- a/core/core-frontend/src/components/filter-text/index.ts
+++ b/core/core-frontend/src/components/filter-text/index.ts
@@ -25,6 +25,12 @@ const valueTextFormTree = (val, options) => {
   }
   return result || val
 }
+const timestampFormatDate = value => {
+  if (!value) {
+    return '-'
+  }
+  return new Date(value)['format']()
+}
 const valueText = (field, val, options) => {
   for (let index = 0; index < options.length; index++) {
     const element = options[index]
@@ -41,6 +47,9 @@ const valueText = (field, val, options) => {
           return item.name || item.label
         }
       }
+      if (element.type === 'time') {
+        return timestampFormatDate(val)
+      }
       if (isTree) {
         return valueTextFormTree(val, selectOption)
       }
diff --git a/de-xpack b/de-xpack
index a30164b304..217f54b5a7 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit a30164b304688249585d2d9af53502a3a67211d2
+Subproject commit 217f54b5a74178cb1de0b9daed983ea78bf48578
diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/log/dto/LogGridRequest.java b/sdk/api/api-base/src/main/java/io/dataease/api/log/dto/LogGridRequest.java
index 9035722cb5..6c62ec7d50 100644
--- a/sdk/api/api-base/src/main/java/io/dataease/api/log/dto/LogGridRequest.java
+++ b/sdk/api/api-base/src/main/java/io/dataease/api/log/dto/LogGridRequest.java
@@ -11,11 +11,13 @@ import java.util.List;
 @Data
 public class LogGridRequest extends KeywordRequest implements Serializable {
 
-    private String op;
+    private List<String> op;
 
-    private Long uid;
+    private List<Long> uid;
 
-    private Long oid;
+    private List<Long> oid;
 
     private List<Long> time;
+
+    private Boolean timeDesc = true;
 }
diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/api/UserApi.java b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/api/UserApi.java
index f20610d75d..41b0dde891 100644
--- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/api/UserApi.java
+++ b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/api/UserApi.java
@@ -156,4 +156,8 @@ public interface UserApi {
     @Hidden
     @GetMapping("/queryByAccount")
     CurUserVO queryByAccount(String account);
+
+    @Hidden
+    @PostMapping("/all")
+    List<UserItem> allUser(@RequestBody KeywordRequest request);
 }
diff --git a/sdk/common/src/main/java/io/dataease/utils/DateUtils.java b/sdk/common/src/main/java/io/dataease/utils/DateUtils.java
new file mode 100644
index 0000000000..34da49d7d1
--- /dev/null
+++ b/sdk/common/src/main/java/io/dataease/utils/DateUtils.java
@@ -0,0 +1,22 @@
+package io.dataease.utils;
+
+import org.apache.commons.lang3.StringUtils;
+
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+
+public class DateUtils {
+
+    public static String time2String(Long time, String pattern) {
+        if (StringUtils.isBlank(pattern)) pattern = "yyyy-MM-dd HH:mm:ss";
+        DateTimeFormatter format = DateTimeFormatter.ofPattern(pattern);
+        LocalDateTime timeByMilli = Instant.ofEpochMilli(time).atZone(ZoneId.of("Asia/Shanghai")).toLocalDateTime();
+        return format.format(timeByMilli);
+    }
+    public static String time2String(Long time) {
+        String pattern = "yyyy-MM-dd HH:mm:ss";
+        return time2String(time, pattern);
+    }
+}

From 067b8bc383109856453be6d9278658e836c1ae33 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 23 Jan 2024 17:44:35 +0800
Subject: [PATCH 19/22] =?UTF-8?q?refactor:=20=E6=A8=A1=E7=89=88=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E9=A2=84=E8=A7=88=E5=88=97=E8=A1=A8=E5=B8=A6=E5=85=A5?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4=E6=9D=A1=E4=BB=B6=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/views/template-market/index.vue | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/core/core-frontend/src/views/template-market/index.vue b/core/core-frontend/src/views/template-market/index.vue
index 312b74a06e..e7f3711777 100644
--- a/core/core-frontend/src/views/template-market/index.vue
+++ b/core/core-frontend/src/views/template-market/index.vue
@@ -17,7 +17,7 @@
         <el-icon class="custom-back-icon hover-icon" @click="previewModel = 'full'"
           ><ArrowLeft
         /></el-icon>
-        <span>{{ state.curTemplate.title }} </span>
+        <span>{{ state.curTemplate.title }}1 </span>
         <el-row class="head-right">
           <el-button :disabled="state.curTemplateIndex === 0" style="float: right" @click="preOne"
             >上一个</el-button
@@ -480,8 +480,10 @@ const templatePreview = previewId => {
   } else {
     state.curTemplateShowFilter =
       state.marketActiveTab === '推荐'
-        ? state.currentMarketTemplateShowList
-        : state.currentMarketTemplateShowList.filter(ele => ele.showFlag)
+        ? state.currentMarketTemplateShowList.filter(ele => ele.showFlag)
+        : state.currentMarketTemplateShowList.filter(
+            ele => ele.showFlag && ele.categoryNames?.includes(state.marketActiveTab)
+          )
     state.curTemplateIndex = state.curTemplateShowFilter.findIndex(temp => temp.id === previewId)
     state.curTemplate = state.curTemplateShowFilter[state.curTemplateIndex]
     previewModel.value = 'createPreview'

From 22522c8a5c20829981d32b2bcf43257a9ab850bb Mon Sep 17 00:00:00 2001
From: xuwei-fit2cloud <wei@fit2cloud.com>
Date: Tue, 23 Jan 2024 19:08:24 +0800
Subject: [PATCH 20/22] =?UTF-8?q?refactor:=20=E9=95=9C=E5=83=8F=E6=9C=AA?=
 =?UTF-8?q?=E5=8F=98=E5=8C=96=E6=97=B6=EF=BC=8C=E5=8D=87=E7=BA=A7=E5=AE=89?=
 =?UTF-8?q?=E8=A3=85=E4=B8=8D=E9=87=8D=E5=A4=8D=E5=8A=A0=E8=BD=BD=E9=95=9C?=
 =?UTF-8?q?=E5=83=8F=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 installer/install.sh | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/installer/install.sh b/installer/install.sh
index 9b3f33e441..7111eff777 100644
--- a/installer/install.sh
+++ b/installer/install.sh
@@ -48,6 +48,14 @@ DE_RUN_BASE=$DE_BASE/dataease2.0
 conf_folder=${DE_RUN_BASE}/conf
 templates_folder=${DE_RUN_BASE}/templates
 
+if [[ $DE_RUN_BASE ]];then
+   for image in $(grep  "image: " $DE_RUN_BASE/docker*.yml | awk -F 'image:' '{print $2}'); do
+      image_path=$(eval echo $image)
+      image_name=$(echo $image_path | awk -F "[/]" '{print $3}')
+      current_images[${#current_images[@]}]=$image_name
+   done
+fi
+
 function prop {
    [ -f "$1" ] | grep -P "^\s*[^#]?${2}=.*$" $1 | cut -d'=' -f2
 }
@@ -183,7 +191,11 @@ cd ${CURRENT_DIR}
 if [[ -d images ]]; then
    log "加载镜像"
    for i in $(ls images); do
-      docker load -i images/$i 2>&1 | tee -a ${CURRENT_DIR}/install.log
+      if [[ "${current_images[@]}"  =~ "${i%.tar.gz}" ]]; then
+         echo "ignore image $i"
+      else
+         docker load -i images/$i 2>&1 | tee -a ${CURRENT_DIR}/install.log
+      fi
    done
 else
    DEVERSION=$(cat ${CURRENT_DIR}/dataease/templates/version)

From 8efe8b0ce52f52f7a1fc43ef1a0f955d6136e6b5 Mon Sep 17 00:00:00 2001
From: jianneng-fit2cloud <jianneng.pan@fit2cloud.com>
Date: Tue, 23 Jan 2024 23:09:08 +0800
Subject: [PATCH 21/22] =?UTF-8?q?fix(=E5=90=8C=E6=AD=A5=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=BF=9E=E6=8E=A5=E7=AE=A1=E7=90=86):=20?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9C=80=E8=BF=91=E5=88=9B=E5=BB=BA=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E6=A0=B9=E6=8D=AE=E6=BA=90=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E8=BF=87=E6=BB=A4=EF=BC=8C=E6=BA=90=E6=88=96=E8=80=85?=
 =?UTF-8?q?=E7=9B=AE=E6=A0=87=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/api/sync/syncDatasource.ts             | 4 ++--
 .../dataease/api/sync/datasource/api/SyncDatasourceApi.java   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/core-frontend/src/api/sync/syncDatasource.ts b/core/core-frontend/src/api/sync/syncDatasource.ts
index 5a9686c8fd..6de7e8eebb 100644
--- a/core/core-frontend/src/api/sync/syncDatasource.ts
+++ b/core/core-frontend/src/api/sync/syncDatasource.ts
@@ -7,8 +7,8 @@ export const sourceDsPageApi = (page: number, limit: number, data) => {
 export const targetDsPageApi = (page: number, limit: number, data) => {
   return request.post({ url: `/sync/datasource/target/pager/${page}/${limit}`, data })
 }
-export const latestUseApi = () => {
-  return request.post({ url: '/sync/datasource/latestUse', data: {} })
+export const latestUseApi = (sourceType: string) => {
+  return request.post({ url: `/sync/datasource/latestUse/${sourceType}`, data: {} })
 }
 
 export const validateApi = data => {
diff --git a/sdk/api/api-sync/src/main/java/io/dataease/api/sync/datasource/api/SyncDatasourceApi.java b/sdk/api/api-sync/src/main/java/io/dataease/api/sync/datasource/api/SyncDatasourceApi.java
index 4e5d7c6cd5..4b10ea7f75 100644
--- a/sdk/api/api-sync/src/main/java/io/dataease/api/sync/datasource/api/SyncDatasourceApi.java
+++ b/sdk/api/api-sync/src/main/java/io/dataease/api/sync/datasource/api/SyncDatasourceApi.java
@@ -56,8 +56,8 @@ public interface SyncDatasourceApi {
     @GetMapping("/validate/{datasourceId}")
     SyncDatasourceDTO validate(@PathVariable("datasourceId") String datasourceId) throws DEException;
 
-    @PostMapping("/latestUse")
-    List<String> latestUse();
+    @PostMapping("/latestUse/{sourceType}")
+    List<String> latestUse(@PathVariable("sourceType") String sourceType);
 
     @GetMapping("/get/{datasourceId}")
     SyncDatasourceDTO get(@PathVariable("datasourceId") String datasourceId) throws DEException;

From bd3ff54eac73e01e212050ed2600a37f58349ec5 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Wed, 24 Jan 2024 10:05:01 +0800
Subject: [PATCH 22/22] =?UTF-8?q?perf:=20=E6=97=A5=E5=BF=97=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E8=BF=87=E6=BB=A4=E6=9D=A1=E4=BB=B6=E6=96=87=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../drawer-filter/src/DrawerFilter.vue        | 12 +++++--
 .../drawer-filter/src/DrawerTreeFilter.vue    | 35 +++++++++++++++----
 .../components/drawer-main/src/DrawerMain.vue |  2 ++
 de-xpack                                      |  2 +-
 4 files changed, 42 insertions(+), 9 deletions(-)

diff --git a/core/core-frontend/src/components/drawer-filter/src/DrawerFilter.vue b/core/core-frontend/src/components/drawer-filter/src/DrawerFilter.vue
index 06de4f472f..07d807af03 100644
--- a/core/core-frontend/src/components/drawer-filter/src/DrawerFilter.vue
+++ b/core/core-frontend/src/components/drawer-filter/src/DrawerFilter.vue
@@ -2,7 +2,8 @@
 import { propTypes } from '@/utils/propTypes'
 import { ElSelect, ElOption } from 'element-plus-secondary'
 import { computed, reactive } from 'vue'
-
+import { useI18n } from '@/hooks/web/useI18n'
+const { t } = useI18n()
 const props = defineProps({
   optionList: propTypes.arrayOf(
     propTypes.shape({
@@ -10,7 +11,13 @@ const props = defineProps({
       name: propTypes.string
     })
   ),
-  title: propTypes.string
+  title: propTypes.string,
+  property: {
+    type: Object,
+    default: () => {
+      placeholder: ''
+    }
+  }
 })
 
 const state = reactive({
@@ -46,6 +53,7 @@ defineExpose({
         v-model="state.activeStatus"
         value-key="id"
         filterable
+        :placeholder="t('common.please_select') + props.property.placeholder"
         multiple
         @change="selectStatus"
       >
diff --git a/core/core-frontend/src/components/drawer-filter/src/DrawerTreeFilter.vue b/core/core-frontend/src/components/drawer-filter/src/DrawerTreeFilter.vue
index aa06ae72d4..2eb1a307f9 100644
--- a/core/core-frontend/src/components/drawer-filter/src/DrawerTreeFilter.vue
+++ b/core/core-frontend/src/components/drawer-filter/src/DrawerTreeFilter.vue
@@ -1,8 +1,15 @@
 <script setup lang="ts">
 import { propTypes } from '@/utils/propTypes'
 import { ElTreeSelect } from 'element-plus-secondary'
-import { computed, reactive, ref } from 'vue'
-
+import { computed, reactive, ref, PropType, toRefs } from 'vue'
+import { useI18n } from '@/hooks/web/useI18n'
+const { t } = useI18n()
+interface TreeConfig {
+  checkStrictly: boolean
+  showCheckbox: boolean
+  checkOnClickNode: boolean
+  placeholder: string
+}
 const props = defineProps({
   optionList: propTypes.arrayOf(
     propTypes.shape({
@@ -12,7 +19,22 @@ const props = defineProps({
       disabled: Boolean
     })
   ),
-  title: propTypes.string
+  title: propTypes.string,
+  property: Object as PropType<TreeConfig>
+})
+
+const { property } = toRefs(props)
+const treeConfig = computed(() => {
+  let obj = Object.assign(
+    {
+      checkStrictly: false,
+      showCheckbox: true,
+      checkOnClickNode: true,
+      placeholder: t('user.role')
+    },
+    property.value
+  )
+  return obj
 })
 
 const state = reactive({
@@ -58,9 +80,10 @@ defineExpose({
         :highlight-current="true"
         multiple
         :render-after-expand="false"
-        :placeholder="$t('common.please_select') + $t('user.role')"
-        show-checkbox
-        check-on-click-node
+        :placeholder="$t('common.please_select') + treeConfig.placeholder"
+        :show-checkbox="treeConfig.showCheckbox"
+        :check-strictly="treeConfig.checkStrictly"
+        :check-on-click-node="treeConfig.checkOnClickNode"
       />
     </div>
   </div>
diff --git a/core/core-frontend/src/components/drawer-main/src/DrawerMain.vue b/core/core-frontend/src/components/drawer-main/src/DrawerMain.vue
index 13853900ea..f00042c752 100644
--- a/core/core-frontend/src/components/drawer-main/src/DrawerMain.vue
+++ b/core/core-frontend/src/components/drawer-main/src/DrawerMain.vue
@@ -107,6 +107,7 @@ defineExpose({
         v-if="component.type === 'tree-select'"
         :option-list="component.option"
         :title="component.title"
+        :property="component.property"
         @filter-change="v => filterChange(v, component.field, 'in')"
       />
       <drawer-filter
@@ -114,6 +115,7 @@ defineExpose({
         v-if="component.type === 'select'"
         :option-list="component.option"
         :title="component.title"
+        :property="component.property"
         @filter-change="v => filterChange(v, component.field, 'in')"
       />
       <drawer-enum-filter
diff --git a/de-xpack b/de-xpack
index 217f54b5a7..62f9e14297 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit 217f54b5a74178cb1de0b9daed983ea78bf48578
+Subproject commit 62f9e14297af537ce48f32571d97e3e90ba60796