From 999fc9f5a207e62cc1a17b99622f04dcac98644d Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Wed, 3 Apr 2024 14:17:39 +0800
Subject: [PATCH 1/8] =?UTF-8?q?refactor(=E5=B7=A5=E4=BD=9C=E5=8F=B0):=20?=
 =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E8=B5=84=E6=BA=90=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=A7=BB=E5=8A=A8=E7=AB=AF=E6=A0=87=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataease/share/dao/ext/mapper/XpackShareExtMapper.java | 1 +
 .../java/io/dataease/share/dao/ext/po/XpackSharePO.java    | 2 ++
 .../java/io/dataease/share/manage/XpackShareManage.java    | 2 +-
 .../visualization/dao/ext/mapper/CoreStoreExtMapper.java   | 3 ++-
 .../java/io/dataease/visualization/dao/ext/po/StorePO.java | 2 ++
 .../visualization/dao/ext/po/VisualizationResourcePO.java  | 2 ++
 .../visualization/manage/CoreVisualizationManage.java      | 2 +-
 .../visualization/manage/VisualizationStoreManage.java     | 2 +-
 .../main/resources/mybatis/ExtDataVisualizationMapper.xml  | 5 +++++
 core/core-frontend/src/views/share/share/ShareGrid.vue     | 7 ++++++-
 core/core-frontend/src/views/workbranch/ShortcutTable.vue  | 7 ++++++-
 .../dataease/api/visualization/vo/DataVisualizationVO.java | 4 ++++
 .../api/visualization/vo/VisualizationResourceVO.java      | 2 ++
 .../api/visualization/vo/VisualizationStoreVO.java         | 2 ++
 .../io/dataease/api/xpack/share/vo/XpackShareGridVO.java   | 2 ++
 15 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/core/core-backend/src/main/java/io/dataease/share/dao/ext/mapper/XpackShareExtMapper.java b/core/core-backend/src/main/java/io/dataease/share/dao/ext/mapper/XpackShareExtMapper.java
index 4b122e87b7..140f0b0a1a 100644
--- a/core/core-backend/src/main/java/io/dataease/share/dao/ext/mapper/XpackShareExtMapper.java
+++ b/core/core-backend/src/main/java/io/dataease/share/dao/ext/mapper/XpackShareExtMapper.java
@@ -14,6 +14,7 @@ public interface XpackShareExtMapper {
             select
             s.id as share_id,
             v.id as resource_id,
+            v.mobile_layout as ext_flag,
             v.type,
             s.creator,
             s.time,
diff --git a/core/core-backend/src/main/java/io/dataease/share/dao/ext/po/XpackSharePO.java b/core/core-backend/src/main/java/io/dataease/share/dao/ext/po/XpackSharePO.java
index 9b89fb7b03..26a3a3afe4 100644
--- a/core/core-backend/src/main/java/io/dataease/share/dao/ext/po/XpackSharePO.java
+++ b/core/core-backend/src/main/java/io/dataease/share/dao/ext/po/XpackSharePO.java
@@ -28,4 +28,6 @@ public class XpackSharePO implements Serializable {
 
     private Long exp;
 
+    private Integer extFlag;
+
 }
diff --git a/core/core-backend/src/main/java/io/dataease/share/manage/XpackShareManage.java b/core/core-backend/src/main/java/io/dataease/share/manage/XpackShareManage.java
index c325161e67..ee5fababab 100644
--- a/core/core-backend/src/main/java/io/dataease/share/manage/XpackShareManage.java
+++ b/core/core-backend/src/main/java/io/dataease/share/manage/XpackShareManage.java
@@ -139,7 +139,7 @@ public class XpackShareManage {
         return pos.stream().map(po ->
                 new XpackShareGridVO(
                         po.getShareId(), po.getResourceId(), po.getName(), po.getCreator().toString(),
-                        po.getTime(), po.getExp(), 9)).toList();
+                        po.getTime(), po.getExp(), 9,po.getExtFlag())).toList();
     }
 
     private XpackShareManage proxy() {
diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/ext/mapper/CoreStoreExtMapper.java b/core/core-backend/src/main/java/io/dataease/visualization/dao/ext/mapper/CoreStoreExtMapper.java
index b80422a81a..8401dfc450 100644
--- a/core/core-backend/src/main/java/io/dataease/visualization/dao/ext/mapper/CoreStoreExtMapper.java
+++ b/core/core-backend/src/main/java/io/dataease/visualization/dao/ext/mapper/CoreStoreExtMapper.java
@@ -18,7 +18,8 @@ public interface CoreStoreExtMapper {
             v.create_by as creator,
             v.update_by as editor,
             v.update_time as edit_time,
-            v.name
+            v.name,
+            v.mobile_layout as ext_flag
             from core_store s
             left join data_visualization_info v on s.resource_id = v.id
             ${ew.customSqlSegment}
diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/ext/po/StorePO.java b/core/core-backend/src/main/java/io/dataease/visualization/dao/ext/po/StorePO.java
index 6e3d07f422..2127dd42c3 100644
--- a/core/core-backend/src/main/java/io/dataease/visualization/dao/ext/po/StorePO.java
+++ b/core/core-backend/src/main/java/io/dataease/visualization/dao/ext/po/StorePO.java
@@ -24,4 +24,6 @@ public class StorePO implements Serializable {
 
     private String name;
 
+    private Integer extFlag;
+
 }
diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/ext/po/VisualizationResourcePO.java b/core/core-backend/src/main/java/io/dataease/visualization/dao/ext/po/VisualizationResourcePO.java
index 8d2fee81f5..6101c7b27f 100644
--- a/core/core-backend/src/main/java/io/dataease/visualization/dao/ext/po/VisualizationResourcePO.java
+++ b/core/core-backend/src/main/java/io/dataease/visualization/dao/ext/po/VisualizationResourcePO.java
@@ -35,4 +35,6 @@ public class VisualizationResourcePO implements Serializable {
     private Boolean favorite;
 
     private int weight;
+
+    private Integer extFlag;
 }
diff --git a/core/core-backend/src/main/java/io/dataease/visualization/manage/CoreVisualizationManage.java b/core/core-backend/src/main/java/io/dataease/visualization/manage/CoreVisualizationManage.java
index ee57ce584b..8ecd8f045a 100644
--- a/core/core-backend/src/main/java/io/dataease/visualization/manage/CoreVisualizationManage.java
+++ b/core/core-backend/src/main/java/io/dataease/visualization/manage/CoreVisualizationManage.java
@@ -176,7 +176,7 @@ public class CoreVisualizationManage {
                 new VisualizationResourceVO(
                         po.getId(), po.getResourceId(), po.getName(),
                         po.getType(), String.valueOf(po.getCreator()), String.valueOf(po.getLastEditor()), po.getLastEditTime(),
-                        po.getFavorite(), 9)).toList();
+                        po.getFavorite(), 9,po.getExtFlag())).toList();
     }
 
     public IPage<VisualizationResourcePO> queryVisualizationPage(int goPage, int pageSize, VisualizationWorkbranchQueryRequest request) {
diff --git a/core/core-backend/src/main/java/io/dataease/visualization/manage/VisualizationStoreManage.java b/core/core-backend/src/main/java/io/dataease/visualization/manage/VisualizationStoreManage.java
index 31fd4340ba..23993efc0e 100644
--- a/core/core-backend/src/main/java/io/dataease/visualization/manage/VisualizationStoreManage.java
+++ b/core/core-backend/src/main/java/io/dataease/visualization/manage/VisualizationStoreManage.java
@@ -89,7 +89,7 @@ public class VisualizationStoreManage {
                 new VisualizationStoreVO(
                         po.getStoreId(), po.getResourceId(), po.getName(),
                         po.getType(), String.valueOf(po.getCreator()), ObjectUtils.isEmpty(po.getEditor()) ? null : String.valueOf(po.getEditor()),
-                        po.getEditTime(), 9)).toList();
+                        po.getEditTime(), 9,po.getExtFlag())).toList();
     }
 
     public IPage<StorePO> queryStorePage(int goPage, int pageSize, VisualizationWorkbranchQueryRequest request) {
diff --git a/core/core-backend/src/main/resources/mybatis/ExtDataVisualizationMapper.xml b/core/core-backend/src/main/resources/mybatis/ExtDataVisualizationMapper.xml
index 299595e611..dffa15698b 100644
--- a/core/core-backend/src/main/resources/mybatis/ExtDataVisualizationMapper.xml
+++ b/core/core-backend/src/main/resources/mybatis/ExtDataVisualizationMapper.xml
@@ -143,6 +143,7 @@
                `canvas_style_data`,
                `component_data`,
                `mobile_layout`,
+               `mobile_layout` as ext_flag,
                `status`,
                `self_watermark_status`,
                `sort`,
@@ -165,6 +166,7 @@
         SELECT dvResource.id,
                dvResource.resource_id,
                dvResource.name,
+               dvResource.ext_flag,
                dvResource.type,
                dvResource.creator,
                core_opt_recent.uid  AS last_editor,
@@ -180,6 +182,7 @@
         FROM (SELECT core_dataset_group.id,
                      core_dataset_group.id        AS resource_id,
                      core_dataset_group.NAME,
+                     0 as ext_flag,
                      'dataset'                    AS type,
                      core_dataset_group.create_by AS creator
               FROM core_dataset_group
@@ -188,6 +191,7 @@
               SELECT core_datasource.id,
                      core_datasource.id        AS resource_id,
                      core_datasource.NAME,
+                     0 as ext_flag,
                      'datasource'              AS type,
                      core_datasource.create_by AS creator
               FROM core_datasource
@@ -197,6 +201,7 @@
                   data_visualization_info.id,
                   data_visualization_info.id AS resource_id,
                   data_visualization_info.NAME,
+                  data_visualization_info.`mobile_layout` as ext_flag,
                   (
                   CASE
                   data_visualization_info.type
diff --git a/core/core-frontend/src/views/share/share/ShareGrid.vue b/core/core-frontend/src/views/share/share/ShareGrid.vue
index b01fd82c8f..f690c810c9 100644
--- a/core/core-frontend/src/views/share/share/ShareGrid.vue
+++ b/core/core-frontend/src/views/share/share/ShareGrid.vue
@@ -164,7 +164,12 @@ watch(
       <el-table-column key="name" width="280" prop="name" :label="t('common.name')">
         <template v-slot:default="scope">
           <div class="name-content">
-            <el-icon class="main-color"> <Icon name="icon_dashboard_outlined" /> </el-icon>
+            <el-icon style="margin-right: 12px; font-size: 18px" v-if="scope.row.extFlag">
+              <Icon name="dv-dashboard-spine-mobile"></Icon>
+            </el-icon>
+            <el-icon class="main-color" v-else>
+              <Icon name="icon_dashboard_outlined" />
+            </el-icon>
             <el-tooltip placement="top">
               <template #content>{{ scope.row.name }}</template>
               <span class="ellipsis" style="max-width: 250px">{{ scope.row.name }}</span>
diff --git a/core/core-frontend/src/views/workbranch/ShortcutTable.vue b/core/core-frontend/src/views/workbranch/ShortcutTable.vue
index e459f8b840..20afb45742 100644
--- a/core/core-frontend/src/views/workbranch/ShortcutTable.vue
+++ b/core/core-frontend/src/views/workbranch/ShortcutTable.vue
@@ -36,7 +36,9 @@ const state = reactive({
 const busiDataMap = computed(() => interactiveStore.getData)
 const iconMap = {
   panel: 'icon_dashboard_outlined',
+  panelMobile: 'dv-dashboard-spine-mobile',
   dashboard: 'icon_dashboard_outlined',
+  dashboardMobile: 'dv-dashboard-spine-mobile',
   screen: 'icon_operation-analysis_outlined',
   dataV: 'icon_operation-analysis_outlined',
   dataset: 'icon_app_outlined',
@@ -281,7 +283,10 @@ const getEmptyDesc = (): string => {
         <el-table-column key="name" width="280" prop="name" :label="t('common.name')">
           <template v-slot:default="scope">
             <div class="name-content" :class="{ 'jump-active': jumpActiveCheck(scope.row) }">
-              <el-icon :class="`main-color color-${scope.row.type}`">
+              <el-icon v-if="scope.row.extFlag" style="margin-right: 12px; font-size: 18px">
+                <Icon :name="iconMap[scope.row.type + 'Mobile']" />
+              </el-icon>
+              <el-icon v-else :class="`main-color color-${scope.row.type}`">
                 <Icon :name="iconMap[scope.row.type]" />
               </el-icon>
               <el-tooltip placement="top">
diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/DataVisualizationVO.java b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/DataVisualizationVO.java
index 08a222ea66..36fc3c6879 100644
--- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/DataVisualizationVO.java
+++ b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/DataVisualizationVO.java
@@ -65,6 +65,10 @@ public class DataVisualizationVO implements Serializable {
      * 移动端布局
      */
     private Boolean mobileLayout;
+    /**
+     * 移动端布局
+     */
+    private Integer extFlag;
 
     /**
      * 状态 0-未发布 1-已发布
diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationResourceVO.java b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationResourceVO.java
index 0f1c2f0c9e..f54eaf0509 100644
--- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationResourceVO.java
+++ b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationResourceVO.java
@@ -35,4 +35,6 @@ public class VisualizationResourceVO implements Serializable {
     private Boolean favorite;
 
     private int weight;
+
+    private Integer extFlag;
 }
diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationStoreVO.java b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationStoreVO.java
index 00fb6f21fa..148717a4cf 100644
--- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationStoreVO.java
+++ b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationStoreVO.java
@@ -33,4 +33,6 @@ public class VisualizationStoreVO implements Serializable {
     private Long lastEditTime;
 
     private int weight;
+
+    private Integer extFlag;
 }
diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/vo/XpackShareGridVO.java b/sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/vo/XpackShareGridVO.java
index 37e9ca93a0..55b37a69b1 100644
--- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/vo/XpackShareGridVO.java
+++ b/sdk/api/api-base/src/main/java/io/dataease/api/xpack/share/vo/XpackShareGridVO.java
@@ -36,4 +36,6 @@ public class XpackShareGridVO implements Serializable {
     @Schema(description = "权重")
     private Integer weight;
 
+    private Integer extFlag;
+
 }

From 32c06988c77f8b3e561cfd35b9c37cdbcf4f0427 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Wed, 3 Apr 2024 14:18:57 +0800
Subject: [PATCH 2/8] =?UTF-8?q?fix(=E6=9F=A5=E8=AF=A2=E7=BB=84=E4=BB=B6):?=
 =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=E6=97=B6=E9=97=B4=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E7=9A=84=E8=AE=BE=E7=BD=AE=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89=E8=8C=83=E5=9B=B4=E4=BC=9A=E7=95=99=E5=9C=A8?=
 =?UTF-8?q?=E4=BB=AA=E8=A1=A8=E6=9D=BF=E7=95=8C=E9=9D=A2=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../custom-component/v-query/QueryConditionConfiguration.vue    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
index 6d69d15509..03cdbf268f 100644
--- a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
+++ b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
@@ -220,6 +220,7 @@ const setTypeChange = () => {
 }
 
 const cancelClick = () => {
+  visiblePopover.value = false
   dialogVisible.value = false
 }
 
@@ -510,6 +511,7 @@ const handleBeforeClose = () => {
 const confirmClick = () => {
   if (validate()) return
   inputCom.value?.mult?.handleClickOutside?.()
+  visiblePopover.value = false
   dialogVisible.value = false
   conditions.value.forEach(ele => {
     curComponent.value = ele

From 889cd1580126a059aa8cc0ee767453c5be610cde Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Wed, 3 Apr 2024 14:22:33 +0800
Subject: [PATCH 3/8] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0flyway?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-backend/pom.xml                              | 10 ++++++++++
 .../src/main/resources/db/desktop/V2.5__ddl.sql        |  2 +-
 .../src/main/resources/db/migration/V2.5__ddl.sql      |  2 +-
 de-xpack                                               |  2 +-
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/core/core-backend/pom.xml b/core/core-backend/pom.xml
index 431f4be49c..5fc3da2993 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>
diff --git a/core/core-backend/src/main/resources/db/desktop/V2.5__ddl.sql b/core/core-backend/src/main/resources/db/desktop/V2.5__ddl.sql
index 6b832f81f1..13c00a3d73 100644
--- a/core/core-backend/src/main/resources/db/desktop/V2.5__ddl.sql
+++ b/core/core-backend/src/main/resources/db/desktop/V2.5__ddl.sql
@@ -36,5 +36,5 @@ CREATE TABLE `visualization_outer_params_target_view_info` (
 
 ALTER TABLE `data_visualization_info`
     MODIFY COLUMN `mobile_layout` tinyint NULL DEFAULT 0 COMMENT '移动端布局0-关闭 1-开启';
-
+update data_visualization_info set mobile_layout = 0;
 INSERT INTO `core_sys_setting` (`id`, `pkey`, `pval`, `type`, `sort`) VALUES (3, 'ai.baseUrl', 'https://maxkb.fit2cloud.com/ui/chat/2ddd8b594ce09dbb', 'text', 0);
\ No newline at end of file
diff --git a/core/core-backend/src/main/resources/db/migration/V2.5__ddl.sql b/core/core-backend/src/main/resources/db/migration/V2.5__ddl.sql
index 3737bc09b8..6062e35f69 100644
--- a/core/core-backend/src/main/resources/db/migration/V2.5__ddl.sql
+++ b/core/core-backend/src/main/resources/db/migration/V2.5__ddl.sql
@@ -37,5 +37,5 @@ CREATE TABLE `visualization_outer_params_target_view_info` (
 
 ALTER TABLE `data_visualization_info`
     MODIFY COLUMN `mobile_layout` tinyint NULL DEFAULT 0 COMMENT '移动端布局0-关闭 1-开启';
-
+update data_visualization_info set mobile_layout = 0;
 INSERT INTO `core_sys_setting` (`id`, `pkey`, `pval`, `type`, `sort`) VALUES (3, 'ai.baseUrl', 'https://maxkb.fit2cloud.com/ui/chat/2ddd8b594ce09dbb', 'text', 0);
diff --git a/de-xpack b/de-xpack
index 021b310648..13cb0779fc 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit 021b310648ed5bf3700799b1ac09e7e5714650f9
+Subproject commit 13cb0779fc6771025613fdd992ec155710417e2a

From 0ee2bd5477edf6672d01dcfc6cc46cf07a47ad51 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Wed, 3 Apr 2024 14:27:51 +0800
Subject: [PATCH 4/8] =?UTF-8?q?revert:=20=E5=9B=9E=E9=80=80=E6=8F=90?=
 =?UTF-8?q?=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 5fc3da2993..431f4be49c 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 65670e00a482f72fcd449769fd8ea35120631322 Mon Sep 17 00:00:00 2001
From: jianneng-fit2cloud <jianneng.pan@fit2cloud.com>
Date: Wed, 3 Apr 2024 14:45:56 +0800
Subject: [PATCH 5/8] =?UTF-8?q?fix(=E5=90=8C=E6=AD=A5=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=AE=A1=E7=90=86):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=95=B0=E6=8D=AE=E5=88=B0=E6=9C=89=E5=88=86?=
 =?UTF-8?q?=E5=8C=BA=E7=9A=84=E8=A1=A8=E4=B8=AD=E6=97=B6=E5=A4=B1=E8=B4=A5?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
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 13cb0779fc..2151cb3807 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit 13cb0779fc6771025613fdd992ec155710417e2a
+Subproject commit 2151cb380739f315e3c55586630d70249edde67c

From 3b3fc3113d968610de0fa22f095b8b3d439ab4b5 Mon Sep 17 00:00:00 2001
From: jianneng-fit2cloud <jianneng.pan@fit2cloud.com>
Date: Wed, 3 Apr 2024 14:49:20 +0800
Subject: [PATCH 6/8] =?UTF-8?q?fix(=E5=90=8C=E6=AD=A5=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=AE=A1=E7=90=86):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=95=B0=E6=8D=AE=E5=88=B0=E6=9C=89=E5=88=86?=
 =?UTF-8?q?=E5=8C=BA=E7=9A=84=E8=A1=A8=E4=B8=AD=E6=97=B6=E5=A4=B1=E8=B4=A5?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/io/dataease/api/sync/task/dto/Target.java      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sdk/api/api-sync/src/main/java/io/dataease/api/sync/task/dto/Target.java b/sdk/api/api-sync/src/main/java/io/dataease/api/sync/task/dto/Target.java
index c7c597a349..4ca2ba2c79 100644
--- a/sdk/api/api-sync/src/main/java/io/dataease/api/sync/task/dto/Target.java
+++ b/sdk/api/api-sync/src/main/java/io/dataease/api/sync/task/dto/Target.java
@@ -21,4 +21,5 @@ public class Target {
     private String incrementSync;
     private String incrementField;
     private String datasourceVersion;
+    private double faultToleranceRate;
 }

From e391bd456ebb316e0cec7e9cb51887406c2efc17 Mon Sep 17 00:00:00 2001
From: wisonic-s <shaochuan.wu@fit2cloud.com>
Date: Wed, 3 Apr 2024 15:50:02 +0800
Subject: [PATCH 7/8] =?UTF-8?q?fix(=E5=9B=BE=E8=A1=A8):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E8=A1=A8=E6=A0=BC=E8=A1=A8=E5=A4=B4=E6=8E=92=E5=BA=8F?=
 =?UTF-8?q?=E5=90=8E=E7=82=B9=E5=87=BB=E8=8E=B7=E5=8F=96=E7=9A=84=E5=8D=95?=
 =?UTF-8?q?=E5=85=83=E6=A0=BC=E6=95=B0=E6=8D=AE=E9=94=99=E8=AF=AF=20#8888?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../editor-style/components/table/TableHeaderSelector.vue   | 1 -
 .../chart/components/js/panel/charts/table/table-info.ts    | 6 +++---
 .../chart/components/js/panel/charts/table/table-normal.ts  | 6 +++---
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/components/table/TableHeaderSelector.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/components/table/TableHeaderSelector.vue
index 3e36bd1a51..a1ee4a3d4e 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/table/TableHeaderSelector.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/table/TableHeaderSelector.vue
@@ -237,7 +237,6 @@ onMounted(() => {
       />
     </el-form-item>
     <el-form-item
-      :label="t('chart.table_show_index')"
       class="form-item"
       :class="'form-item-' + themes"
       v-if="showProperty('tableHeaderSort')"
diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/table/table-info.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/table/table-info.ts
index 1db0b12ea3..2db4ca5bed 100644
--- a/core/core-frontend/src/views/chart/components/js/panel/charts/table/table-info.ts
+++ b/core/core-frontend/src/views/chart/components/js/panel/charts/table/table-info.ts
@@ -1,4 +1,4 @@
-import { S2Event, S2Options, TableColCell, TableDataCell, TableSheet } from '@antv/s2'
+import { S2Event, S2Options, TableColCell, TableDataCell, TableSheet, ViewMeta } from '@antv/s2'
 import { formatterItem, valueFormatter } from '../../../formatter'
 import { parseJson } from '../../../util'
 import { S2ChartView, S2DrawOptions } from '../../types/impl/s2'
@@ -143,13 +143,13 @@ export class TableInfo extends S2ChartView<TableSheet> {
     // click
     newChart.on(S2Event.DATA_CELL_CLICK, ev => {
       const cell = newChart.getCell(ev.target)
-      const meta = cell.getMeta()
+      const meta = cell.getMeta() as ViewMeta
       const nameIdMap = fields.reduce((pre, next) => {
         pre[next['dataeaseName']] = next['id']
         return pre
       }, {})
 
-      const rowData = chart.data.tableRow[meta.rowIndex] as any
+      const rowData = newChart.dataSet.getRowData(meta)
       const dimensionList = []
       for (const key in rowData) {
         if (nameIdMap[key]) {
diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/table/table-normal.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/table/table-normal.ts
index deb547c9c9..cd93307715 100644
--- a/core/core-frontend/src/views/chart/components/js/panel/charts/table/table-normal.ts
+++ b/core/core-frontend/src/views/chart/components/js/panel/charts/table/table-normal.ts
@@ -1,5 +1,5 @@
 import { S2ChartView, S2DrawOptions } from '@/views/chart/components/js/panel/types/impl/s2'
-import { S2Event, S2Options, TableSheet, TableColCell } from '@antv/s2'
+import { S2Event, S2Options, TableSheet, TableColCell, ViewMeta } from '@antv/s2'
 import { parseJson } from '@/views/chart/components/js/util'
 import { formatterItem, valueFormatter } from '@/views/chart/components/js/formatter'
 import { copyContent, getCurrentField } from '@/views/chart/components/js/panel/common/common_table'
@@ -139,13 +139,13 @@ export class TableNormal extends S2ChartView<TableSheet> {
     // click
     newChart.on(S2Event.DATA_CELL_CLICK, ev => {
       const cell = newChart.getCell(ev.target)
-      const meta = cell.getMeta()
+      const meta = cell.getMeta() as ViewMeta
       const nameIdMap = fields.reduce((pre, next) => {
         pre[next['dataeaseName']] = next['id']
         return pre
       }, {})
 
-      const rowData = chart.data.tableRow[meta.rowIndex] as any
+      const rowData = newChart.dataSet.getRowData(meta)
       const dimensionList = []
       for (const key in rowData) {
         if (nameIdMap[key]) {

From 47e5ff98708ad241ca16e817138d21759eb0ba6d Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Wed, 3 Apr 2024 16:33:03 +0800
Subject: [PATCH 8/8] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F=E9=A2=84?=
 =?UTF-8?q?=E8=A7=88=E6=A8=A1=E5=BC=8F=E4=B8=8B=E8=B7=B3=E8=BD=AC=E5=BD=93?=
 =?UTF-8?q?=E5=89=8D=E9=A1=B5=E9=9D=A2=E5=A4=B1=E8=B4=A5=20#8840?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/views/chart/components/views/index.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/core-frontend/src/views/chart/components/views/index.vue b/core/core-frontend/src/views/chart/components/views/index.vue
index 79c8473331..25eeae0e30 100644
--- a/core/core-frontend/src/views/chart/components/views/index.vue
+++ b/core/core-frontend/src/views/chart/components/views/index.vue
@@ -316,6 +316,9 @@ const onDrillFilters = param => {
 const windowsJump = (url, jumpType) => {
   try {
     window.open(url, jumpType)
+    if (jumpType === '_self') {
+      location.reload()
+    }
   } catch (e) {
     ElMessage.error(t('visualization.url_check_error') + ':' + url)
   }