From 4b7c60c552693301e59dc7cdcc64767e396bbe5b Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Fri, 8 Mar 2024 09:39:03 +0800
Subject: [PATCH 01/12] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E5=B8=83=E5=B1=80=E5=A4=8D=E5=88=B6?=
 =?UTF-8?q?=E5=B7=B2=E6=B7=BB=E5=8A=A0=E8=87=B3=E5=B8=83=E5=B1=80=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84=E5=9B=BE=E8=A1=A8=E4=BC=9A=E7=9B=B4=E6=8E=A5=E8=BF=9B?=
 =?UTF-8?q?=E5=85=A5=E5=B7=A6=E4=BE=A7=E6=97=A0=E9=9C=80=E5=86=8D=E5=B8=83?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/store/modules/data-visualization/copy.ts | 1 +
 1 file changed, 1 insertion(+)

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 d3da8c80fe..8eefad469e 100644
--- a/core/core-frontend/src/store/modules/data-visualization/copy.ts
+++ b/core/core-frontend/src/store/modules/data-visualization/copy.ts
@@ -178,6 +178,7 @@ function deepCopyHelper(data, idMap) {
   const newComponentId = generateID()
   idMap[data.id] = newComponentId
   result.id = newComponentId
+  result.inMobile = false
   if (result.component === 'Group') {
     result.propValue.forEach((component, i) => {
       result.propValue[i] = deepCopyHelper(component, idMap)

From a0110835cfd60385e2d9a5d11e8f5b05a14f5e29 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Fri, 8 Mar 2024 10:05:05 +0800
Subject: [PATCH 02/12] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E4=BB=AA=E8=A1=A8=E6=9D=BF=E5=86=85=E9=80=9A=E8=BF=87=E5=A4=8D?=
 =?UTF-8?q?=E5=88=B6=E7=BB=84=E4=BB=B6=E5=90=91=E7=94=BB=E5=B8=83=E5=86=85?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=96=B0=E7=BB=84=E4=BB=B6=EF=BC=8C=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E9=80=89=E4=B8=AD=E6=96=B0=E6=B7=BB=E5=8A=A0=E7=9A=84?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/store/modules/data-visualization/copy.ts           | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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 8eefad469e..0609115f42 100644
--- a/core/core-frontend/src/store/modules/data-visualization/copy.ts
+++ b/core/core-frontend/src/store/modules/data-visualization/copy.ts
@@ -118,7 +118,12 @@ export const copyStore = defineStore('copy', {
             }
             eventBus.emit('addDashboardItem-' + newComponent.canvasId, newComponent)
           }
-
+          if (i === dataArray.length - 1) {
+            dvMainStore.setCurComponent({
+              component: newComponent,
+              index: componentData.value.length - 1
+            })
+          }
           i++
         }
       }, moveTime)

From 18b5ac9e14e6e7ebff91ca86170ac0cf02541adf Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Fri, 8 Mar 2024 10:23:23 +0800
Subject: [PATCH 03/12] =?UTF-8?q?feat(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E5=85=AC=E5=85=B1=E9=93=BE=E6=8E=A5=E6=89=93=E5=BC=80=E5=90=8E?=
 =?UTF-8?q?=EF=BC=8C=E6=B5=8F=E8=A7=88=E5=99=A8=E7=BD=91=E9=A1=B5=E6=A0=87?=
 =?UTF-8?q?=E9=A2=98=E6=8F=90=E7=A4=BA=E4=B8=BA=E4=BB=AA=E8=A1=A8=E6=9D=BF?=
 =?UTF-8?q?=E5=92=8C=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F=E7=9A=84=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/data-visualization/PreviewCanvas.vue            | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/core-frontend/src/views/data-visualization/PreviewCanvas.vue b/core/core-frontend/src/views/data-visualization/PreviewCanvas.vue
index bce39d6e76..2853fc978a 100644
--- a/core/core-frontend/src/views/data-visualization/PreviewCanvas.vue
+++ b/core/core-frontend/src/views/data-visualization/PreviewCanvas.vue
@@ -63,6 +63,10 @@ const loadCanvasDataAsync = async (dvId, dvType) => {
       if (jumpParam) {
         dvMainStore.addViewTrackFilter(jumpParam)
       }
+      if (props.publicLinkStatus) {
+        // 设置浏览器title为当前仪表板名称
+        document.title = dvInfo.name
+      }
     }
   )
 }

From 4696666ceee261a63ddc7f8c1b8af7afba185385 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Fri, 8 Mar 2024 10:56:05 +0800
Subject: [PATCH 04/12] =?UTF-8?q?refactor(=E5=B7=A5=E4=BD=9C=E5=8F=B0):=20?=
 =?UTF-8?q?=E5=BD=93=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86=E6=96=B0=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=88=86=E7=B1=BB=E6=88=90=E5=8A=9F=E5=90=8E=EF=BC=8C?=
 =?UTF-8?q?=E5=88=86=E7=B1=BB=E5=88=97=E8=A1=A8=E4=B8=AD=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E9=80=89=E4=B8=AD=E6=96=B0=E6=B7=BB=E5=8A=A0=E7=9A=84=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/views/template/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/core-frontend/src/views/template/index.vue b/core/core-frontend/src/views/template/index.vue
index 8b0cf1a500..d2643c48ab 100644
--- a/core/core-frontend/src/views/template/index.vue
+++ b/core/core-frontend/src/views/template/index.vue
@@ -479,12 +479,12 @@ const saveTemplateEdit = templateEditForm => {
   templateEditFormRef.value.validate(valid => {
     if (valid) {
       save({ ...templateEditForm }).then(response => {
-        state.currentTemplateLabel = templateEditForm.name
         ElMessage({
           message: '添加成功',
           type: 'success',
           showClose: true
         })
+        state.currentTemplateId = null
         getTree()
         close()
       })

From bf2f541f07366f21f2d0dad5e59748532f75d4d9 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Fri, 8 Mar 2024 11:35:34 +0800
Subject: [PATCH 05/12] =?UTF-8?q?style(X-Pack):=20=E5=A4=96=E8=A7=82?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE-=E5=8D=A1=E7=89=87=E4=BB=A5=E5=8F=8A?=
 =?UTF-8?q?=E5=BA=95=E9=83=A8=E6=8C=89=E9=92=AE=E6=A0=B7=E5=BC=8F?=
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 b5ec1c2a30..62920fd79c 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit b5ec1c2a30ee6bc452627420232d539cd72f3a42
+Subproject commit 62920fd79c962635398ee96c60f26bd7e902423f

From 9502b993e938fc1990e0d212a63699757f9648b9 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Fri, 8 Mar 2024 13:25:15 +0800
Subject: [PATCH 06/12] =?UTF-8?q?style:=20=E4=BE=A7=E8=BE=B9=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E6=82=AC=E6=B5=AE=E4=BB=A5=E5=8F=8A=E9=80=89=E4=B8=AD?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/layout/components/Menu.vue            | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/core/core-frontend/src/layout/components/Menu.vue b/core/core-frontend/src/layout/components/Menu.vue
index c3875e0f82..31f9faa6e0 100644
--- a/core/core-frontend/src/layout/components/Menu.vue
+++ b/core/core-frontend/src/layout/components/Menu.vue
@@ -4,6 +4,14 @@ import { ElMenu } from 'element-plus-secondary'
 import { useRoute, useRouter } from 'vue-router'
 import { isExternal } from '@/utils/validate'
 import MenuItem from './MenuItem.vue'
+import { useAppearanceStoreWithOut } from '@/store/modules/appearance'
+const appearanceStore = useAppearanceStoreWithOut()
+const tempColor = computed(() => {
+  return {
+    '--temp-color':
+      (appearanceStore.themeColor === 'custom' ? appearanceStore.customColor : '#3370FF') + '1A'
+  }
+})
 const isCollapse = ref(false)
 const route = useRoute()
 const { push } = useRouter()
@@ -26,6 +34,7 @@ const menuSelect = (index: string, indexPath: string[]) => {
 
 <template>
   <el-menu
+    :style="tempColor"
     @select="menuSelect"
     :default-active="activeIndex"
     class="el-menu-vertical"
@@ -40,7 +49,37 @@ const menuSelect = (index: string, indexPath: string[]) => {
   width: 100%;
   min-height: 400px;
 }
+
 .ed-menu {
   border: none;
+  .ed-menu-item:not(.is-active) {
+    &:hover {
+      background-color: #1f23291a !important;
+    }
+  }
+  .is-active:not(.ed-sub-menu) {
+    background-color: var(--temp-color);
+  }
+  :deep(.ed-sub-menu) {
+    margin: 0;
+    .ed-sub-menu__title {
+      &:hover {
+        background-color: #1f23291a;
+      }
+    }
+    .ed-menu-item:not(.is-active) {
+      &:hover {
+        background-color: #1f23291a !important;
+      }
+    }
+  }
+  :deep(.ed-sub-menu.is-active) {
+    .ed-sub-menu__title {
+      color: var(--ed-color-primary);
+    }
+    .is-active {
+      background-color: var(--temp-color);
+    }
+  }
 }
 </style>

From cdd62c29320f88bf87941d6f3c8badb8064796e9 Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Fri, 8 Mar 2024 15:06:17 +0800
Subject: [PATCH 07/12] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../engine/trans/CustomWhere2Str.java         | 37 ++++++-----
 .../dataease/engine/trans/ExtWhere2Str.java   | 11 +---
 .../dataease/engine/trans/WhereTree2Str.java  | 36 +++++-----
 .../java/io/dataease/engine/utils/Utils.java  | 65 +++++++++++++++++++
 4 files changed, 108 insertions(+), 41 deletions(-)

diff --git a/core/core-backend/src/main/java/io/dataease/engine/trans/CustomWhere2Str.java b/core/core-backend/src/main/java/io/dataease/engine/trans/CustomWhere2Str.java
index 7b4bbb1929..599dc2c81f 100644
--- a/core/core-backend/src/main/java/io/dataease/engine/trans/CustomWhere2Str.java
+++ b/core/core-backend/src/main/java/io/dataease/engine/trans/CustomWhere2Str.java
@@ -6,13 +6,13 @@ import io.dataease.api.dataset.union.model.SQLMeta;
 import io.dataease.api.dataset.union.model.SQLObj;
 import io.dataease.dto.dataset.DatasetTableFieldDTO;
 import io.dataease.engine.constant.SQLConstants;
-import io.dataease.engine.utils.DateUtils;
 import io.dataease.engine.utils.Utils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Author Junjun
@@ -47,18 +47,15 @@ public class CustomWhere2Str {
                     if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) {
                         // 此处获取标准格式的日期
                         whereName = String.format(SQLConstants.DE_STR_TO_DATE, originName, StringUtils.isNotEmpty(field.getDateFormat()) ? field.getDateFormat() : SQLConstants.DEFAULT_DATE_FORMAT);
-                        whereName = String.format(SQLConstants.DATE_FORMAT, whereName, StringUtils.isNotEmpty(field.getDateFormat()) ? field.getDateFormat() : SQLConstants.DEFAULT_DATE_FORMAT);
                     }
                     if (field.getDeExtractType() == 2 || field.getDeExtractType() == 3 || field.getDeExtractType() == 4) {
                         String cast = String.format(SQLConstants.CAST, originName, SQLConstants.DEFAULT_INT_FORMAT);
                         // 此处获取标准格式的日期
-                        whereName = String.format(SQLConstants.FROM_UNIXTIME, cast, StringUtils.isNotEmpty(field.getDateFormat()) ? field.getDateFormat() : SQLConstants.DEFAULT_DATE_FORMAT);
-                        whereName = String.format(SQLConstants.DATE_FORMAT, whereName, StringUtils.isNotEmpty(field.getDateFormat()) ? field.getDateFormat() : SQLConstants.DEFAULT_DATE_FORMAT);
+                        whereName = String.format(SQLConstants.FROM_UNIXTIME, cast, SQLConstants.DEFAULT_DATE_FORMAT);
                     }
                     if (field.getDeExtractType() == 1) {
                         // 此处获取标准格式的日期
-                        String f = DateUtils.get_date_format(originName);
-                        whereName = String.format(SQLConstants.DATE_FORMAT, originName, f);
+                        whereName = originName;
                     }
                 } else if (field.getDeType() == 2 || field.getDeType() == 3) {
                     if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) {
@@ -88,14 +85,10 @@ public class CustomWhere2Str {
                         String whereTerm = Utils.transFilterTerm(filterItemDTO.getTerm());
                         String whereValue = "";
 
-                        String whereNameReal;
+//                        String whereNameReal;
                         if (field.getDeType() == 1) {
                             // 规定几种日期格式，一一匹配，匹配到就是该格式
-                            String f = DateUtils.get_date_format(filterItemDTO.getValue());
-                            String n = String.format(SQLConstants.DE_STR_TO_DATE, whereName, f);
-                            whereNameReal = String.format(SQLConstants.UNIX_TIMESTAMP, n);
-                        } else {
-                            whereNameReal = whereName;
+                            whereName = String.format(SQLConstants.UNIX_TIMESTAMP, whereName);
                         }
 
                         if (StringUtils.equalsIgnoreCase(filterItemDTO.getTerm(), "null")) {
@@ -111,13 +104,27 @@ public class CustomWhere2Str {
                         } else if (StringUtils.containsIgnoreCase(filterItemDTO.getTerm(), "like")) {
                             whereValue = "'%" + value + "%'";
                         } else {
+                            // 如果是时间字段过滤，当条件是等于和不等于的时候转换成between和not between
                             if (field.getDeType() == 1) {
-                                value = Utils.allDateFormat2Long(value) + "";
+                                if (StringUtils.containsIgnoreCase(whereTerm, "=")) {
+                                    whereTerm = " BETWEEN ";
+                                    // 把value类似过滤组件处理，获得start time和end time
+                                    Map<String, Long> stringLongMap = Utils.parseDateTimeValue(value);
+                                    whereValue = String.format(SQLConstants.WHERE_VALUE_BETWEEN, stringLongMap.get("startTime"), stringLongMap.get("endTime"));
+                                } else if (StringUtils.containsIgnoreCase(whereTerm, "<>")) {
+                                    whereTerm = " NOT BETWEEN ";
+                                    Map<String, Long> stringLongMap = Utils.parseDateTimeValue(value);
+                                    whereValue = String.format(SQLConstants.WHERE_VALUE_BETWEEN, stringLongMap.get("startTime"), stringLongMap.get("endTime"));
+                                } else {
+                                    value = Utils.allDateFormat2Long(value) + "";
+                                    whereValue = String.format(SQLConstants.WHERE_VALUE_VALUE, value);
+                                }
+                            } else {
+                                whereValue = String.format(SQLConstants.WHERE_VALUE_VALUE, value);
                             }
-                            whereValue = String.format(SQLConstants.WHERE_VALUE_VALUE, value);
                         }
                         list.add(SQLObj.builder()
-                                .whereField(whereNameReal)
+                                .whereField(whereName)
                                 .whereTermAndValue(whereTerm + whereValue)
                                 .build());
                     }
diff --git a/core/core-backend/src/main/java/io/dataease/engine/trans/ExtWhere2Str.java b/core/core-backend/src/main/java/io/dataease/engine/trans/ExtWhere2Str.java
index 6f8cb4b996..7382489ad2 100644
--- a/core/core-backend/src/main/java/io/dataease/engine/trans/ExtWhere2Str.java
+++ b/core/core-backend/src/main/java/io/dataease/engine/trans/ExtWhere2Str.java
@@ -5,7 +5,6 @@ import io.dataease.api.dataset.union.model.SQLMeta;
 import io.dataease.api.dataset.union.model.SQLObj;
 import io.dataease.dto.dataset.DatasetTableFieldDTO;
 import io.dataease.engine.constant.SQLConstants;
-import io.dataease.engine.utils.DateUtils;
 import io.dataease.engine.utils.Utils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -53,12 +52,6 @@ public class ExtWhere2Str {
                     }
 
                     if (field.getDeType() == 1) {
-                        String date_format;
-                        if (StringUtils.containsIgnoreCase(request.getOperator(), "between")) {
-                            date_format = "yyyy-MM-dd HH:mm:ss";
-                        } else {
-                            date_format = DateUtils.get_date_format(value.get(0));
-                        }
                         if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) {
                             // 此处获取标准格式的日期
                             whereName = String.format(SQLConstants.DE_STR_TO_DATE, originName, StringUtils.isEmpty(field.getDateFormat()) ? SQLConstants.DEFAULT_DATE_FORMAT : field.getDateFormat());
@@ -66,12 +59,12 @@ public class ExtWhere2Str {
                         if (field.getDeExtractType() == 2 || field.getDeExtractType() == 3 || field.getDeExtractType() == 4) {
                             String cast = String.format(SQLConstants.CAST, originName, SQLConstants.DEFAULT_INT_FORMAT);
                             // 此处获取标准格式的日期
-                            whereName = String.format(SQLConstants.FROM_UNIXTIME, cast, date_format);
+                            whereName = String.format(SQLConstants.FROM_UNIXTIME, cast, SQLConstants.DEFAULT_DATE_FORMAT);
                             whereName = String.format(SQLConstants.UNIX_TIMESTAMP, whereName);
                         }
                         if (field.getDeExtractType() == 1) {
                             // 此处获取标准格式的日期
-                            whereName = String.format(SQLConstants.DE_STR_TO_DATE, originName, StringUtils.isEmpty(field.getDateFormat()) ? SQLConstants.DEFAULT_DATE_FORMAT : field.getDateFormat());
+                            whereName = originName;
                         }
                     } else if (field.getDeType() == 2 || field.getDeType() == 3) {
                         if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) {
diff --git a/core/core-backend/src/main/java/io/dataease/engine/trans/WhereTree2Str.java b/core/core-backend/src/main/java/io/dataease/engine/trans/WhereTree2Str.java
index 5ae06c268c..3f29d4b060 100644
--- a/core/core-backend/src/main/java/io/dataease/engine/trans/WhereTree2Str.java
+++ b/core/core-backend/src/main/java/io/dataease/engine/trans/WhereTree2Str.java
@@ -8,7 +8,6 @@ import io.dataease.api.permissions.dataset.dto.DatasetRowPermissionsTreeObj;
 import io.dataease.dto.dataset.DatasetTableFieldDTO;
 import io.dataease.engine.constant.ExtFieldConstant;
 import io.dataease.engine.constant.SQLConstants;
-import io.dataease.engine.utils.DateUtils;
 import io.dataease.engine.utils.Utils;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
@@ -16,6 +15,7 @@ import org.apache.commons.lang3.StringUtils;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 
 /**
@@ -92,16 +92,13 @@ public class WhereTree2Str {
         if (field.getDeType() == 1) {
             if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) {
                 whereName = String.format(SQLConstants.DE_STR_TO_DATE, originName, StringUtils.isNotEmpty(field.getDateFormat()) ? field.getDateFormat() : SQLConstants.DEFAULT_DATE_FORMAT);
-                whereName = String.format(SQLConstants.DATE_FORMAT, whereName, StringUtils.isNotEmpty(field.getDateFormat()) ? field.getDateFormat() : SQLConstants.DEFAULT_DATE_FORMAT);
             }
             if (field.getDeExtractType() == 2 || field.getDeExtractType() == 3 || field.getDeExtractType() == 4) {
                 String cast = String.format(SQLConstants.CAST, originName, SQLConstants.DEFAULT_INT_FORMAT);
                 whereName = String.format(SQLConstants.FROM_UNIXTIME, cast, SQLConstants.DEFAULT_DATE_FORMAT);
-                whereName = String.format(SQLConstants.DATE_FORMAT, whereName, SQLConstants.DEFAULT_DATE_FORMAT);
             }
             if (field.getDeExtractType() == 1) {
-                String f = DateUtils.get_date_format(originName);
-                whereName = String.format(SQLConstants.DATE_FORMAT, originName, f);
+                whereName = originName;
             }
         } else if (field.getDeType() == 2 || field.getDeType() == 3) {
             if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) {
@@ -130,16 +127,7 @@ public class WhereTree2Str {
             String whereValue = "";
 
             if (field.getDeType() == 1) {
-                // 规定几种日期格式，一一匹配，匹配到就是该格式
-                if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) {
-                    String f = DateUtils.get_date_format(item.getValue());
-                    whereName = String.format(SQLConstants.DE_STR_TO_DATE, whereName, f);
-                    whereName = String.format(SQLConstants.UNIX_TIMESTAMP, whereName);
-                } else {
-                    String f = DateUtils.get_date_format(item.getValue());
-                    whereName = String.format(SQLConstants.DE_STR_TO_DATE, whereName, f);
-                    whereName = String.format(SQLConstants.UNIX_TIMESTAMP, whereName);
-                }
+                whereName = String.format(SQLConstants.UNIX_TIMESTAMP, whereName);
             }
 
             if (StringUtils.equalsIgnoreCase(item.getTerm(), "null")) {
@@ -155,10 +143,24 @@ public class WhereTree2Str {
             } else if (StringUtils.containsIgnoreCase(item.getTerm(), "like")) {
                 whereValue = "'%" + value + "%'";
             } else {
+                // 如果是时间字段过滤，当条件是等于和不等于的时候转换成between和not between
                 if (field.getDeType() == 1) {
-                    value = Utils.allDateFormat2Long(value) + "";
+                    if (StringUtils.containsIgnoreCase(whereTerm, "=")) {
+                        whereTerm = " BETWEEN ";
+                        // 把value类似过滤组件处理，获得start time和end time
+                        Map<String, Long> stringLongMap = Utils.parseDateTimeValue(value);
+                        whereValue = String.format(SQLConstants.WHERE_VALUE_BETWEEN, stringLongMap.get("startTime"), stringLongMap.get("endTime"));
+                    } else if (StringUtils.containsIgnoreCase(whereTerm, "<>")) {
+                        whereTerm = " NOT BETWEEN ";
+                        Map<String, Long> stringLongMap = Utils.parseDateTimeValue(value);
+                        whereValue = String.format(SQLConstants.WHERE_VALUE_BETWEEN, stringLongMap.get("startTime"), stringLongMap.get("endTime"));
+                    } else {
+                        value = Utils.allDateFormat2Long(value) + "";
+                        whereValue = String.format(SQLConstants.WHERE_VALUE_VALUE, value);
+                    }
+                } else {
+                    whereValue = String.format(SQLConstants.WHERE_VALUE_VALUE, value);
                 }
-                whereValue = String.format(SQLConstants.WHERE_VALUE_VALUE, value);
             }
             SQLObj build = SQLObj.builder()
                     .whereField(whereName)
diff --git a/core/core-backend/src/main/java/io/dataease/engine/utils/Utils.java b/core/core-backend/src/main/java/io/dataease/engine/utils/Utils.java
index a41b3589a0..5bad3f1e9d 100644
--- a/core/core-backend/src/main/java/io/dataease/engine/utils/Utils.java
+++ b/core/core-backend/src/main/java/io/dataease/engine/utils/Utils.java
@@ -273,4 +273,69 @@ public class Utils {
         }
         return time;
     }
+
+    public static Map<String, Long> parseDateTimeValue(String value) {
+        Map<String, Long> map = new LinkedHashMap<>();
+        long startTime = 0;
+        long endTime = 0;
+
+        String split = "-";
+        if (value != null && value.contains("/")) {
+            split = "/";
+        }
+        try {
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy" + split + "MM" + split + "dd HH:mm:ss");
+            startTime = simpleDateFormat.parse(value).getTime();
+            endTime = startTime + 999;
+        } catch (Exception e) {
+        }
+        try {
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy" + split + "MM" + split + "dd HH:mm");
+            startTime = simpleDateFormat.parse(value).getTime();
+            endTime = startTime + (60 * 1000 - 1);
+        } catch (Exception e) {
+        }
+        try {
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy" + split + "MM" + split + "dd HH");
+            startTime = simpleDateFormat.parse(value).getTime();
+            endTime = startTime + (60 * 60 * 1000 - 1);
+        } catch (Exception e) {
+        }
+        try {
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("HH:mm:ss");
+            startTime = simpleDateFormat.parse(value).getTime();
+            endTime = startTime + 999;
+        } catch (Exception e) {
+        }
+        try {
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy" + split + "MM" + split + "dd");
+            startTime = simpleDateFormat.parse(value).getTime();
+            endTime = startTime + (24 * 60 * 60 * 1000 - 1);
+        } catch (Exception e) {
+        }
+        try {
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy" + split + "MM");
+            Date parse = simpleDateFormat.parse(value);
+            startTime = parse.getTime();
+            Calendar calendar = Calendar.getInstance();
+            calendar.setTime(parse);
+            calendar.add(Calendar.MONTH, 1);
+            endTime = calendar.getTime().getTime() - 1;
+        } catch (Exception e) {
+        }
+        try {
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy");
+            Date parse = simpleDateFormat.parse(value);
+            startTime = parse.getTime();
+            Calendar calendar = Calendar.getInstance();
+            calendar.setTime(parse);
+            calendar.add(Calendar.YEAR, 1);
+            endTime = calendar.getTime().getTime() - 1;
+        } catch (Exception e) {
+        }
+
+        map.put("startTime", startTime);
+        map.put("endTime", endTime);
+        return map;
+    }
 }

From 9b90f24a206926ab55e6c075ec895561caf26321 Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Fri, 8 Mar 2024 15:56:32 +0800
Subject: [PATCH 08/12] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/dataease/engine/utils/Utils.java  | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/core/core-backend/src/main/java/io/dataease/engine/utils/Utils.java b/core/core-backend/src/main/java/io/dataease/engine/utils/Utils.java
index 5bad3f1e9d..02afda803a 100644
--- a/core/core-backend/src/main/java/io/dataease/engine/utils/Utils.java
+++ b/core/core-backend/src/main/java/io/dataease/engine/utils/Utils.java
@@ -287,30 +287,50 @@ public class Utils {
             SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy" + split + "MM" + split + "dd HH:mm:ss");
             startTime = simpleDateFormat.parse(value).getTime();
             endTime = startTime + 999;
+
+            map.put("startTime", startTime);
+            map.put("endTime", endTime);
+            return map;
         } catch (Exception e) {
         }
         try {
             SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy" + split + "MM" + split + "dd HH:mm");
             startTime = simpleDateFormat.parse(value).getTime();
             endTime = startTime + (60 * 1000 - 1);
+
+            map.put("startTime", startTime);
+            map.put("endTime", endTime);
+            return map;
         } catch (Exception e) {
         }
         try {
             SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy" + split + "MM" + split + "dd HH");
             startTime = simpleDateFormat.parse(value).getTime();
             endTime = startTime + (60 * 60 * 1000 - 1);
+
+            map.put("startTime", startTime);
+            map.put("endTime", endTime);
+            return map;
         } catch (Exception e) {
         }
         try {
             SimpleDateFormat simpleDateFormat = new SimpleDateFormat("HH:mm:ss");
             startTime = simpleDateFormat.parse(value).getTime();
             endTime = startTime + 999;
+
+            map.put("startTime", startTime);
+            map.put("endTime", endTime);
+            return map;
         } catch (Exception e) {
         }
         try {
             SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy" + split + "MM" + split + "dd");
             startTime = simpleDateFormat.parse(value).getTime();
             endTime = startTime + (24 * 60 * 60 * 1000 - 1);
+
+            map.put("startTime", startTime);
+            map.put("endTime", endTime);
+            return map;
         } catch (Exception e) {
         }
         try {
@@ -321,6 +341,10 @@ public class Utils {
             calendar.setTime(parse);
             calendar.add(Calendar.MONTH, 1);
             endTime = calendar.getTime().getTime() - 1;
+
+            map.put("startTime", startTime);
+            map.put("endTime", endTime);
+            return map;
         } catch (Exception e) {
         }
         try {
@@ -331,6 +355,10 @@ public class Utils {
             calendar.setTime(parse);
             calendar.add(Calendar.YEAR, 1);
             endTime = calendar.getTime().getTime() - 1;
+
+            map.put("startTime", startTime);
+            map.put("endTime", endTime);
+            return map;
         } catch (Exception e) {
         }
 

From 15a83c882ccc891b44f6cbb1e0966d5ea1253f1c Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Fri, 8 Mar 2024 17:00:26 +0800
Subject: [PATCH 09/12] =?UTF-8?q?feat(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E5=8F=AF=E8=A7=86=E5=8C=96=E8=B5=84=E6=BA=90=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E5=A4=96=E9=83=A8=E5=8F=82=E6=95=B0=E5=8A=9F=E8=83=BD=20#8257?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/dataease/MybatisPlusGenerator.java     |   4 +-
 .../auto/entity/VisualizationOuterParams.java | 108 ++++
 .../entity/VisualizationOuterParamsInfo.java  | 108 ++++
 ...isualizationOuterParamsTargetViewInfo.java | 108 ++++
 .../VisualizationOuterParamsInfoMapper.java   |  18 +
 .../VisualizationOuterParamsMapper.java       |  18 +
 ...zationOuterParamsTargetViewInfoMapper.java |  18 +
 .../api/visualization/dataVisualization.ts    |  15 +
 .../src/api/visualization/outerParams.ts      |  11 +-
 .../visualization/outer-params-set/index.vue  | 567 ++++++++++++++++++
 core/core-frontend/src/utils/check.ts         |  10 +
 .../VisualizationOuterParamsApi.java          |  20 +
 .../dto/VisualizationOuterParamsDTO.java      |   9 +
 .../dto/VisualizationOuterParamsInfoDTO.java  |   8 +
 ...alizationOuterParamsTargetViewInfoDTO.java |   9 +
 .../VisualizationOuterParamsBaseResponse.java |  24 +
 .../vo/VisualizationOuterParamsInfoVO.java    | 108 ++++
 ...ualizationOuterParamsTargetViewInfoVO.java | 108 ++++
 .../vo/VisualizationOuterParamsVO.java        | 108 ++++
 19 files changed, 1372 insertions(+), 7 deletions(-)
 create mode 100644 core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationOuterParams.java
 create mode 100644 core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationOuterParamsInfo.java
 create mode 100644 core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationOuterParamsTargetViewInfo.java
 create mode 100644 core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/VisualizationOuterParamsInfoMapper.java
 create mode 100644 core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/VisualizationOuterParamsMapper.java
 create mode 100644 core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/VisualizationOuterParamsTargetViewInfoMapper.java
 create mode 100644 core/core-frontend/src/components/visualization/outer-params-set/index.vue
 create mode 100644 core/core-frontend/src/utils/check.ts
 create mode 100644 sdk/api/api-base/src/main/java/io/dataease/api/visualization/VisualizationOuterParamsApi.java
 create mode 100644 sdk/api/api-base/src/main/java/io/dataease/api/visualization/dto/VisualizationOuterParamsDTO.java
 create mode 100644 sdk/api/api-base/src/main/java/io/dataease/api/visualization/dto/VisualizationOuterParamsInfoDTO.java
 create mode 100644 sdk/api/api-base/src/main/java/io/dataease/api/visualization/dto/VisualizationOuterParamsTargetViewInfoDTO.java
 create mode 100644 sdk/api/api-base/src/main/java/io/dataease/api/visualization/response/VisualizationOuterParamsBaseResponse.java
 create mode 100644 sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationOuterParamsInfoVO.java
 create mode 100644 sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationOuterParamsTargetViewInfoVO.java
 create mode 100644 sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationOuterParamsVO.java

diff --git a/core/core-backend/src/main/java/io/dataease/MybatisPlusGenerator.java b/core/core-backend/src/main/java/io/dataease/MybatisPlusGenerator.java
index 12bd3304f8..0f1a1971a2 100644
--- a/core/core-backend/src/main/java/io/dataease/MybatisPlusGenerator.java
+++ b/core/core-backend/src/main/java/io/dataease/MybatisPlusGenerator.java
@@ -21,11 +21,11 @@ public class MybatisPlusGenerator {
     /**
      * 业务模块例如datasource,dataset,panel等
      */
-    private static final String busi = "template";
+    private static final String busi = "visualization";
     /**
      * 这是要生成代码的表名称
      */
-    private static final String TABLE_NAME = "visualization_template";
+    private static final String TABLE_NAME = "visualization_outer_params_target_view_info";
 
     /**
      * 下面两个配置基本上不用动
diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationOuterParams.java b/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationOuterParams.java
new file mode 100644
index 0000000000..79f61e6c1e
--- /dev/null
+++ b/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationOuterParams.java
@@ -0,0 +1,108 @@
+package io.dataease.visualization.dao.auto.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 外部参数关联关系表
+ * </p>
+ *
+ * @author fit2cloud
+ * @since 2024-03-08
+ */
+@TableName("visualization_outer_params")
+public class VisualizationOuterParams implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    private String paramsId;
+
+    /**
+     * 可视化资源ID
+     */
+    private String visualizationId;
+
+    /**
+     * 是否启用外部参数标识（1-是，0-否）
+     */
+    private Boolean checked;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 复制来源
+     */
+    private String copyFrom;
+
+    /**
+     * 复制来源ID
+     */
+    private String copyId;
+
+    public String getParamsId() {
+        return paramsId;
+    }
+
+    public void setParamsId(String paramsId) {
+        this.paramsId = paramsId;
+    }
+
+    public String getVisualizationId() {
+        return visualizationId;
+    }
+
+    public void setVisualizationId(String visualizationId) {
+        this.visualizationId = visualizationId;
+    }
+
+    public Boolean getChecked() {
+        return checked;
+    }
+
+    public void setChecked(Boolean checked) {
+        this.checked = checked;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getCopyFrom() {
+        return copyFrom;
+    }
+
+    public void setCopyFrom(String copyFrom) {
+        this.copyFrom = copyFrom;
+    }
+
+    public String getCopyId() {
+        return copyId;
+    }
+
+    public void setCopyId(String copyId) {
+        this.copyId = copyId;
+    }
+
+    @Override
+    public String toString() {
+        return "VisualizationOuterParams{" +
+        "paramsId = " + paramsId +
+        ", visualizationId = " + visualizationId +
+        ", checked = " + checked +
+        ", remark = " + remark +
+        ", copyFrom = " + copyFrom +
+        ", copyId = " + copyId +
+        "}";
+    }
+}
diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationOuterParamsInfo.java b/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationOuterParamsInfo.java
new file mode 100644
index 0000000000..f6ea29e0d9
--- /dev/null
+++ b/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationOuterParamsInfo.java
@@ -0,0 +1,108 @@
+package io.dataease.visualization.dao.auto.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 外部参数配置表
+ * </p>
+ *
+ * @author fit2cloud
+ * @since 2024-03-08
+ */
+@TableName("visualization_outer_params_info")
+public class VisualizationOuterParamsInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    private String paramsInfoId;
+
+    /**
+     * visualization_outer_params 表的 ID
+     */
+    private String paramsId;
+
+    /**
+     * 参数名
+     */
+    private String paramName;
+
+    /**
+     * 是否启用
+     */
+    private Boolean checked;
+
+    /**
+     * 复制来源
+     */
+    private String copyFrom;
+
+    /**
+     * 复制来源ID
+     */
+    private String copyId;
+
+    public String getParamsInfoId() {
+        return paramsInfoId;
+    }
+
+    public void setParamsInfoId(String paramsInfoId) {
+        this.paramsInfoId = paramsInfoId;
+    }
+
+    public String getParamsId() {
+        return paramsId;
+    }
+
+    public void setParamsId(String paramsId) {
+        this.paramsId = paramsId;
+    }
+
+    public String getParamName() {
+        return paramName;
+    }
+
+    public void setParamName(String paramName) {
+        this.paramName = paramName;
+    }
+
+    public Boolean getChecked() {
+        return checked;
+    }
+
+    public void setChecked(Boolean checked) {
+        this.checked = checked;
+    }
+
+    public String getCopyFrom() {
+        return copyFrom;
+    }
+
+    public void setCopyFrom(String copyFrom) {
+        this.copyFrom = copyFrom;
+    }
+
+    public String getCopyId() {
+        return copyId;
+    }
+
+    public void setCopyId(String copyId) {
+        this.copyId = copyId;
+    }
+
+    @Override
+    public String toString() {
+        return "VisualizationOuterParamsInfo{" +
+        "paramsInfoId = " + paramsInfoId +
+        ", paramsId = " + paramsId +
+        ", paramName = " + paramName +
+        ", checked = " + checked +
+        ", copyFrom = " + copyFrom +
+        ", copyId = " + copyId +
+        "}";
+    }
+}
diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationOuterParamsTargetViewInfo.java b/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationOuterParamsTargetViewInfo.java
new file mode 100644
index 0000000000..393127f6f2
--- /dev/null
+++ b/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationOuterParamsTargetViewInfo.java
@@ -0,0 +1,108 @@
+package io.dataease.visualization.dao.auto.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 外部参数联动视图字段信息表
+ * </p>
+ *
+ * @author fit2cloud
+ * @since 2024-03-08
+ */
+@TableName("visualization_outer_params_target_view_info")
+public class VisualizationOuterParamsTargetViewInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    private String targetId;
+
+    /**
+     * visualization_outer_params_info 表的 ID
+     */
+    private String paramsInfoId;
+
+    /**
+     * 联动视图ID
+     */
+    private String targetViewId;
+
+    /**
+     * 联动字段ID
+     */
+    private String targetFieldId;
+
+    /**
+     * 复制来源
+     */
+    private String copyFrom;
+
+    /**
+     * 复制来源ID
+     */
+    private String copyId;
+
+    public String getTargetId() {
+        return targetId;
+    }
+
+    public void setTargetId(String targetId) {
+        this.targetId = targetId;
+    }
+
+    public String getParamsInfoId() {
+        return paramsInfoId;
+    }
+
+    public void setParamsInfoId(String paramsInfoId) {
+        this.paramsInfoId = paramsInfoId;
+    }
+
+    public String getTargetViewId() {
+        return targetViewId;
+    }
+
+    public void setTargetViewId(String targetViewId) {
+        this.targetViewId = targetViewId;
+    }
+
+    public String getTargetFieldId() {
+        return targetFieldId;
+    }
+
+    public void setTargetFieldId(String targetFieldId) {
+        this.targetFieldId = targetFieldId;
+    }
+
+    public String getCopyFrom() {
+        return copyFrom;
+    }
+
+    public void setCopyFrom(String copyFrom) {
+        this.copyFrom = copyFrom;
+    }
+
+    public String getCopyId() {
+        return copyId;
+    }
+
+    public void setCopyId(String copyId) {
+        this.copyId = copyId;
+    }
+
+    @Override
+    public String toString() {
+        return "VisualizationOuterParamsTargetViewInfo{" +
+        "targetId = " + targetId +
+        ", paramsInfoId = " + paramsInfoId +
+        ", targetViewId = " + targetViewId +
+        ", targetFieldId = " + targetFieldId +
+        ", copyFrom = " + copyFrom +
+        ", copyId = " + copyId +
+        "}";
+    }
+}
diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/VisualizationOuterParamsInfoMapper.java b/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/VisualizationOuterParamsInfoMapper.java
new file mode 100644
index 0000000000..5553c7325b
--- /dev/null
+++ b/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/VisualizationOuterParamsInfoMapper.java
@@ -0,0 +1,18 @@
+package io.dataease.visualization.dao.auto.mapper;
+
+import io.dataease.visualization.dao.auto.entity.VisualizationOuterParamsInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 外部参数配置表 Mapper 接口
+ * </p>
+ *
+ * @author fit2cloud
+ * @since 2024-03-08
+ */
+@Mapper
+public interface VisualizationOuterParamsInfoMapper extends BaseMapper<VisualizationOuterParamsInfo> {
+
+}
diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/VisualizationOuterParamsMapper.java b/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/VisualizationOuterParamsMapper.java
new file mode 100644
index 0000000000..1b87b7e077
--- /dev/null
+++ b/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/VisualizationOuterParamsMapper.java
@@ -0,0 +1,18 @@
+package io.dataease.visualization.dao.auto.mapper;
+
+import io.dataease.visualization.dao.auto.entity.VisualizationOuterParams;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 外部参数关联关系表 Mapper 接口
+ * </p>
+ *
+ * @author fit2cloud
+ * @since 2024-03-08
+ */
+@Mapper
+public interface VisualizationOuterParamsMapper extends BaseMapper<VisualizationOuterParams> {
+
+}
diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/VisualizationOuterParamsTargetViewInfoMapper.java b/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/VisualizationOuterParamsTargetViewInfoMapper.java
new file mode 100644
index 0000000000..1d4f56197a
--- /dev/null
+++ b/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/VisualizationOuterParamsTargetViewInfoMapper.java
@@ -0,0 +1,18 @@
+package io.dataease.visualization.dao.auto.mapper;
+
+import io.dataease.visualization.dao.auto.entity.VisualizationOuterParamsTargetViewInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 外部参数联动视图字段信息表 Mapper 接口
+ * </p>
+ *
+ * @author fit2cloud
+ * @since 2024-03-08
+ */
+@Mapper
+public interface VisualizationOuterParamsTargetViewInfoMapper extends BaseMapper<VisualizationOuterParamsTargetViewInfo> {
+
+}
diff --git a/core/core-frontend/src/api/visualization/dataVisualization.ts b/core/core-frontend/src/api/visualization/dataVisualization.ts
index 4cc7e31538..73f5143273 100644
--- a/core/core-frontend/src/api/visualization/dataVisualization.ts
+++ b/core/core-frontend/src/api/visualization/dataVisualization.ts
@@ -73,3 +73,18 @@ export const storeStatusApi = (id: string): Promise<IResponse> => {
 }
 
 export const decompression = data => request.post({ url: '/dataVisualization/decompression', data })
+
+export const detailList = dvId => {
+  return request.get({
+    url: '/dataVisualization/view/detailList/' + dvId,
+    method: 'get',
+    loading: false
+  })
+}
+
+export const getComponentInfo = dvId => {
+  return request.get({
+    url: '/panel/view/getComponentInfo/' + dvId,
+    loading: false
+  })
+}
diff --git a/core/core-frontend/src/api/visualization/outerParams.ts b/core/core-frontend/src/api/visualization/outerParams.ts
index c42924cd74..faa57deea5 100644
--- a/core/core-frontend/src/api/visualization/outerParams.ts
+++ b/core/core-frontend/src/api/visualization/outerParams.ts
@@ -1,8 +1,8 @@
 import request from '@/config/axios'
 
-export function queryWithPanelId(panelId) {
+export function queryWithDvId(dvId) {
   return request.get({
-    url: '/outerParams/queryWithPanelId/' + panelId
+    url: '/outerParams/queryWithDvId/' + dvId
   })
 }
 
@@ -14,9 +14,10 @@ export function updateOuterParamsSet(requestInfo) {
   })
 }
 
-export function getOuterParamsInfo(panelId) {
+export function getOuterParamsInfo(dvId) {
   return request.get({
-    url: '/outerParams/getOuterParamsInfo/' + panelId,
-    loading: true
+    url: '/outerParams/getOuterParamsInfo/' + dvId,
+    method: 'get',
+    loading: false
   })
 }
diff --git a/core/core-frontend/src/components/visualization/outer-params-set/index.vue b/core/core-frontend/src/components/visualization/outer-params-set/index.vue
new file mode 100644
index 0000000000..fc22af9a25
--- /dev/null
+++ b/core/core-frontend/src/components/visualization/outer-params-set/index.vue
@@ -0,0 +1,567 @@
+<template>
+  <el-row style="height: 430px">
+    <el-row>
+      <span style="font-weight: 600; margin-right: 20px">{{
+        t('visualization.outer_param_set')
+      }}</span>
+      <el-checkbox v-model="state.outerParams?.checked">{{
+        t('visualization.enable_outer_param_set')
+      }}</el-checkbox>
+    </el-row>
+    <el-row v-loading="state.loading">
+      <el-row class="preview">
+        <el-col :span="8" style="height: 100%; overflow-y: hidden">
+          <el-row class="tree-head">
+            <span style="float: left; margin-left: 30px">{{ t('visualization.param_name') }}</span>
+            <span style="float: right; margin-right: 10px">{{
+              t('visualization.enable_param')
+            }}</span>
+          </el-row>
+          <el-row class="tree-content">
+            <el-tree
+              ref="outerParamsInfoTree"
+              :data="state.outerParamsInfoArray"
+              node-key="id"
+              highlight-current
+              :props="state.treeProp"
+              @node-click="nodeClick"
+            >
+              <template v-slot="{ node, data }">
+                <span class="custom-tree-node">
+                  <span>
+                    <span style="margin-left: 6px"
+                      ><el-input
+                        v-model="data.paramName"
+                        size="mini"
+                        :placeholder="t('visualization.input_param_name')"
+                    /></span>
+                  </span>
+                  <span @click.stop>
+                    <div>
+                      <span class="auth-span">
+                        <el-checkbox
+                          v-model="data.checked"
+                          style="margin-right: 10px"
+                          @change="sourceFieldCheckedChange(data)"
+                        />
+                        <el-button
+                          icon="el-icon-delete"
+                          type="text"
+                          size="small"
+                          @click="removeOuterParamsInfo(node, data)"
+                        />
+                      </span>
+                    </div>
+                  </span>
+                </span>
+              </template>
+            </el-tree>
+          </el-row>
+          <el-row class="tree-bottom">
+            <el-button
+              size="mini"
+              type="success"
+              icon="el-icon-plus"
+              round
+              @click="addOuterParamsInfo"
+              >{{ t('visualization.add_param') }}
+            </el-button>
+          </el-row>
+        </el-col>
+        <el-col :span="16" class="preview-show">
+          <el-row v-if="state.outerParamsInfo">
+            <el-row class="top_border">
+              <el-row style="margin-top: 10px">
+                <el-col :span="11">
+                  <div class="ellip">{{ t('visualization.link_component') }}</div>
+                </el-col>
+                <el-col :span="11">
+                  <div class="ellip">{{ t('visualization.link_component_field') }}</div>
+                </el-col>
+              </el-row>
+              <el-row style="height: 266px; overflow-y: auto">
+                <el-row
+                  v-for="(targetViewInfo, index) in state.outerParamsInfo.targetViewInfoList"
+                  :key="index"
+                >
+                  <el-col :span="11">
+                    <div class="select-filed">
+                      <el-select
+                        v-model="targetViewInfo.targetViewId"
+                        filterable
+                        style="width: 100%"
+                        size="mini"
+                        :placeholder="t('fu.search_bar.please_select')"
+                        @change="viewInfoOnChange(targetViewInfo)"
+                      >
+                        <el-option
+                          v-for="item in state.currentLinkPanelViewArray.filter(
+                            curItem =>
+                              !viewSelectedField.includes(curItem.id) ||
+                              curItem.id === targetViewInfo.targetViewId
+                          )"
+                          :key="item.id"
+                          :label="item.name"
+                          :value="item.id"
+                        >
+                          <span v-if="item.isPlugin" style="float: left">
+                            <svg-icon
+                              :icon-class="
+                                item.type !== 'buddle-map'
+                                  ? '/api/pluginCommon/staticInfo/' + item.type + '/svg'
+                                  : item.type
+                              "
+                              style="width: 14px; height: 14px"
+                            />
+                          </span>
+                          <span v-else style="float: left">
+                            <svg-icon :icon-class="item.type" style="width: 14px; height: 14px" />
+                          </span>
+                          <span style="float: left; font-size: 12px"> {{ item.name }}</span>
+                        </el-option>
+                      </el-select>
+                    </div>
+                  </el-col>
+                  <el-col :span="11">
+                    <div class="select-filed">
+                      <el-select
+                        v-model="targetViewInfo.targetFieldId"
+                        filterable
+                        :disabled="
+                          state.viewIdFieldArrayMap[targetViewInfo.targetViewId] &&
+                          state.viewIdFieldArrayMap[targetViewInfo.targetViewId].length === 1 &&
+                          state.viewIdFieldArrayMap[targetViewInfo.targetViewId][0].id === 'empty'
+                        "
+                        style="width: 100%"
+                        size="mini"
+                        :placeholder="t('fu.search_bar.please_select')"
+                      >
+                        <el-option
+                          v-for="viewField in state.viewIdFieldArrayMap[
+                            targetViewInfo.targetViewId
+                          ]"
+                          :key="viewField.id"
+                          :label="viewField.name"
+                          :value="viewField.id"
+                        >
+                          <span style="float: left">
+                            <svg-icon
+                              v-if="viewField.deType === 0"
+                              icon-class="field_text"
+                              class="field-icon-text"
+                            />
+                            <svg-icon
+                              v-if="viewField.deType === 1"
+                              icon-class="field_time"
+                              class="field-icon-time"
+                            />
+                            <svg-icon
+                              v-if="viewField.deType === 2 || viewField.deType === 3"
+                              icon-class="field_value"
+                              class="field-icon-value"
+                            />
+                            <svg-icon
+                              v-if="viewField.deType === 5"
+                              icon-class="field_location"
+                              class="field-icon-location"
+                            />
+                          </span>
+                          <span style="float: left; font-size: 12px">{{ viewField.name }}</span>
+                        </el-option>
+                      </el-select>
+                    </div>
+                  </el-col>
+                  <el-col :span="2">
+                    <div>
+                      <el-button
+                        icon="el-icon-delete"
+                        type="text"
+                        size="small"
+                        style="float: left"
+                        @click="deleteOuterParamsField(index)"
+                      />
+                    </div>
+                  </el-col>
+                </el-row>
+              </el-row>
+
+              <el-row class="bottom">
+                <el-button
+                  size="mini"
+                  type="success"
+                  icon="el-icon-plus"
+                  round
+                  @click="addOuterParamsField"
+                  >{{ t('visualization.add_param_link_field') }}
+                </el-button>
+              </el-row>
+
+              <!--    <el-button slot="reference">T</el-button>-->
+              <template v-slot:reference>
+                <i class="icon iconfont icon-edit slot-class" />
+              </template>
+            </el-row>
+            <el-row v-if="state.outerParamsInfo.linkType === 'outer'" style="height: 300px">
+              <el-input
+                v-model="state.outerParamsInfo.content"
+                :autosize="{ minRows: 14 }"
+                type="textarea"
+                :placeholder="t('visualization.input_jump_link')"
+              />
+            </el-row>
+          </el-row>
+          <el-row
+            v-else
+            style="height: 100%; background-color: var(--MainContentBG)"
+            class="custom-position"
+          >
+            {{ t('visualization.select_param') }}
+          </el-row>
+        </el-col>
+      </el-row>
+    </el-row>
+    <el-row class="root-class">
+      <el-button size="mini" @click="cancel()">{{ t('commons.cancel') }} </el-button>
+      <el-button type="primary" size="mini" @click="save()">{{ t('commons.confirm') }} </el-button>
+    </el-row>
+  </el-row>
+</template>
+
+<script setup lang="ts">
+import { ref, reactive, computed, nextTick } from 'vue'
+import { dvMainStoreWithOut } from '@/store/modules/data-visualization/dvMain'
+import { storeToRefs } from 'pinia'
+import { ElMessage } from 'element-plus-secondary'
+import { useI18n } from '@/hooks/web/useI18n'
+import { deepCopy } from '@/utils/utils'
+import generateID from '@/utils/generateID'
+import { queryWithDvId, updateOuterParamsSet } from '@/api/visualization/outerParams'
+import { detailList } from '@/api/visualization/dataVisualization'
+import checkArrayRepeat from '@/utils/check'
+const dvMainStore = dvMainStoreWithOut()
+const { dvInfo, componentData, canvasStyleData } = storeToRefs(dvMainStore)
+const outerParamsInfoTree = ref(null)
+const emits = defineEmits(['outerParamsSetVisibleChange'])
+const { t } = useI18n()
+
+const state = reactive({
+  loading: false,
+  treeProp: {
+    id: 'paramsInfoId',
+    label: 'paramName',
+    children: 'children'
+  },
+  outerParams: {},
+  outerParamsInfoArray: null,
+  mapOuterParamsInfoArray: {},
+  panelList: [],
+  outerParamsInfo: null,
+  currentFiledTreeNode: null,
+  defaultOuterParamsInfo: {
+    paramName: '',
+    checked: true,
+    targetViewInfoList: []
+  },
+  defaultTargetViewInfo: {
+    targetViewId: null,
+    targetFieldId: null
+  },
+  currentLinkPanelViewArray: [],
+  viewIdFieldArrayMap: {},
+  widgetSubjectsTrans: {
+    timeYearWidget: '年份过滤组件',
+    timeMonthWidget: '年月过滤组件',
+    timeDateWidget: '日期过滤组件',
+    timeDateRangeWidget: '日期范围过滤组件',
+    textSelectWidget: '文本下拉过滤组件',
+    textSelectGridWidget: '文本列表过滤组件',
+    textInputWidget: '文本搜索过滤组件',
+    textSelectTreeWidget: '下拉树过滤组件',
+    numberSelectWidget: '数字下拉过滤组件',
+    numberSelectGridWidget: '数字列表过滤组件',
+    numberRangeWidget: '数值区间过滤组件'
+  }
+})
+
+const viewSelectedField = computed(() =>
+  state.outerParamsInfo?.targetViewInfoList?.map(targetViewInfo => targetViewInfo.targetViewId)
+)
+
+const init = () => {
+  // 获取当前仪表板外部跳转蚕食信息
+  queryWithDvId(dvInfo.id).then(rsp => {
+    state.outerParams = rsp.data
+    state.outerParamsInfoArray = state.outerParams?.outerParamsInfoArray
+    if (state.outerParamsInfoArray.length > 0) {
+      state.outerParamsInfoArray.forEach(outerParamsInfo => {
+        state.mapOuterParamsInfoArray[outerParamsInfo.paramsInfoId] = outerParamsInfo
+      })
+      const firstNode = state.outerParamsInfoArray[0]
+      nextTick(() => {
+        outerParamsInfoTree.value.setCurrentKey(firstNode.paramsInfoId)
+        nodeClick(firstNode)
+      })
+    }
+  })
+  getPanelViewList(dvInfo.id)
+}
+
+const cancel = () => {
+  emits('outerParamsSetVisibleChange', false)
+}
+
+const save = () => {
+  if (checkArrayRepeat(state.outerParams.outerParamsInfoArray, 'paramName')) {
+    ElMessage.warning({
+      message: t('visualization.repeat_params'),
+      showClose: true
+    })
+    return
+  }
+  updateOuterParamsSet(state.outerParams).then(rsp => {
+    ElMessage({
+      message: t('commons.save_success'),
+      type: 'success',
+      showClose: true
+    })
+    cancel()
+  })
+}
+
+const nodeClick = data => {
+  state.outerParamsInfo = state.mapOuterParamsInfoArray[data.paramsInfoId]
+}
+
+// 获取当前视图字段 关联仪表板的视图信息列表
+const getPanelViewList = dvId => {
+  detailList(dvId).then(rsp => {
+    state.viewIdFieldArrayMap = {}
+    state.currentLinkPanelViewArray = rsp.data
+    if (state.currentLinkPanelViewArray) {
+      state.currentLinkPanelViewArray.forEach(view => {
+        state.viewIdFieldArrayMap[view.id] = view.tableFields
+      })
+    }
+    // 增加过滤组件匹配
+    componentData.value.forEach(componentItem => {
+      if (componentItem.type === 'custom') {
+        state.currentLinkPanelViewArray.push({
+          id: componentItem.id,
+          type: 'filter',
+          name: componentItem.options.attrs.title
+            ? componentItem.options.attrs.title
+            : state.widgetSubjectsTrans[componentItem.serviceName]
+        })
+        state.viewIdFieldArrayMap[componentItem.id] = [
+          { id: 'empty', name: t('visualization.filter_no_select') }
+        ]
+      }
+    })
+  })
+}
+
+const panelNodeClick = (data, node) => {
+  state.outerParamsInfo.targetViewInfoList = []
+  getPanelViewList(data.id)
+}
+
+const inputVal = value => {
+  if (!value) {
+    state.outerParamsInfo.targetViewInfoList = []
+    state.viewIdFieldArrayMap = {}
+    state.currentLinkPanelViewArray = []
+  }
+}
+const addOuterParamsField = () => {
+  state.outerParamsInfo.targetViewInfoList.push({
+    targetViewId: '',
+    targetFieldId: ''
+  })
+}
+const deleteOuterParamsField = index => {
+  state.outerParamsInfo.targetViewInfoList.splice(index, 1)
+}
+
+const normalizer = node => {
+  // 去掉children=null的属性
+  if (node.children === null || node.children === 'null') {
+    delete node.children
+  }
+}
+
+const viewInfoOnChange = targetViewInfo => {
+  if (
+    state.viewIdFieldArrayMap[targetViewInfo.targetViewId] &&
+    state.viewIdFieldArrayMap[targetViewInfo.targetViewId].length === 1 &&
+    state.viewIdFieldArrayMap[targetViewInfo.targetViewId][0].id === 'empty'
+  ) {
+    targetViewInfo.targetFieldId = 'empty'
+  } else {
+    targetViewInfo.targetFieldId = null
+  }
+}
+const sourceFieldCheckedChange = data => {
+  if (data.checked) {
+    state.outerParams?.checked = true
+  }
+  nextTick(() => {
+    outerParamsInfoTree.value.setCurrentKey(data.paramsInfoId)
+    nodeClick(data)
+  })
+}
+
+const addOuterParamsInfo = () => {
+  outerParamsInfoTree.value.checked = true
+  const outerParamsInfo = deepCopy(state.defaultOuterParamsInfo)
+  outerParamsInfo['paramsInfoId'] = generateID()
+  state.outerParamsInfoArray.push(outerParamsInfo)
+  state.mapOuterParamsInfoArray[outerParamsInfo.paramsInfoId] = outerParamsInfo
+}
+
+const removeOuterParamsInfo = (node, data) => {
+  const parent = node.parent
+  const children = parent.data.children || parent.data
+  const index = children.findIndex(d => d.paramsInfoId === data.paramsInfoId)
+  children.splice(index, 1)
+  if (data.paramsInfoId === state.outerParamsInfo.paramsInfoId) {
+    delete state.mapOuterParamsInfoArray[data.paramsInfoId]
+    state.outerParamsInfo = null
+  }
+}
+</script>
+
+<style scoped lang="less">
+.root-class {
+  margin: 15px 0px 5px;
+  text-align: center;
+}
+
+.preview {
+  margin-top: 5px;
+  border: 1px solid #e6e6e6;
+  height: 350px !important;
+  overflow: hidden;
+  background-size: 100% 100% !important;
+}
+
+.preview-show {
+  border-left: 1px solid #e6e6e6;
+  height: 350px;
+  background-size: 100% 100% !important;
+}
+
+.slot-class {
+  color: white;
+}
+
+.bottom {
+  margin-top: 15px;
+  text-align: center;
+}
+
+.ellip {
+  /*width: 100%;*/
+  margin-left: 10px;
+  margin-right: 10px;
+  overflow: hidden; /*超出部分隐藏*/
+  white-space: nowrap; /*不换行*/
+  text-overflow: ellipsis; /*超出部分文字以...显示*/
+  text-align: center;
+  background-color: #f7f8fa;
+  color: #3d4d66;
+  font-size: 12px;
+  line-height: 24px;
+  height: 24px;
+  border-radius: 3px;
+}
+
+.select-filed {
+  /*width: 100%;*/
+  margin-left: 10px;
+  margin-right: 10px;
+  overflow: hidden; /*超出部分隐藏*/
+  white-space: nowrap; /*不换行*/
+  text-overflow: ellipsis; /*超出部分文字以...显示*/
+  color: #3d4d66;
+  font-size: 12px;
+  line-height: 35px;
+  height: 35px;
+  border-radius: 3px;
+}
+
+v-deep(.el-popover) {
+  height: 200px;
+  overflow: auto;
+}
+
+.custom-position {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  font-size: 14px;
+  flex-flow: row nowrap;
+  color: #9ea6b2;
+}
+
+.tree-style {
+  padding: 10px 15px;
+  height: 100%;
+  overflow-y: auto;
+}
+
+v-deep(.vue-treeselect__control) {
+  height: 28px;
+}
+
+v-deep(.vue-treeselect__single-value) {
+  color: #606266;
+  line-height: 28px !important;
+}
+
+.custom-tree-node {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  font-size: 14px;
+}
+
+.auth-span {
+  float: right;
+  width: 40px;
+  margin-right: 5px;
+}
+
+.tree-head {
+  height: 30px;
+  line-height: 30px;
+  border-bottom: 1px solid var(--TableBorderColor, #e6e6e6);
+  background-color: var(--SiderBG, #f7f8fa);
+  font-size: 12px;
+  color: var(--TableColor, #3d4d66);
+}
+
+.tree-content {
+  height: calc(100% - 70px);
+  overflow-y: auto;
+}
+
+.tree-bottom {
+  margin-top: 7px;
+  text-align: center;
+}
+
+v-deep(.vue-treeselect__placeholder {
+  line-height: 28px;
+}
+
+v-deep(.el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content) {
+  background-color: #8dbbef !important;
+}
+
+.tree-content v-deep(.el-input__inner) {
+  background: transparent;
+  border: 0px !important;
+}
+</style>
diff --git a/core/core-frontend/src/utils/check.ts b/core/core-frontend/src/utils/check.ts
new file mode 100644
index 0000000000..1932b39db1
--- /dev/null
+++ b/core/core-frontend/src/utils/check.ts
@@ -0,0 +1,10 @@
+export default function checkArrayRepeat(arrayData, key) {
+  for (let i = 0; i < arrayData.length; i++) {
+    for (let j = i + 1; j < arrayData.length; j++) {
+      if (arrayData[i][key] === arrayData[j][key]) {
+        return true
+      }
+    }
+  }
+  return false
+}
diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/VisualizationOuterParamsApi.java b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/VisualizationOuterParamsApi.java
new file mode 100644
index 0000000000..7aefbdf6ab
--- /dev/null
+++ b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/VisualizationOuterParamsApi.java
@@ -0,0 +1,20 @@
+package io.dataease.api.visualization;
+
+import io.dataease.api.visualization.dto.VisualizationOuterParamsDTO;
+import io.dataease.api.visualization.response.VisualizationOuterParamsBaseResponse;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("outerParams")
+public interface VisualizationOuterParamsApi {
+
+
+    @GetMapping("/queryWithDvId/{dvId}")
+    VisualizationOuterParamsDTO queryWithVisualizationId(@PathVariable("dvId") String dvId);
+
+    @PostMapping("/updateOuterParamsSet")
+    void updateOuterParamsSet(@RequestBody VisualizationOuterParamsDTO OuterParamsDTO);
+
+    @GetMapping("/getOuterParamsInfo/{dvId}")
+    VisualizationOuterParamsBaseResponse getOuterParamsInfo(@PathVariable("dvId") String dvId);
+}
diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/dto/VisualizationOuterParamsDTO.java b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/dto/VisualizationOuterParamsDTO.java
new file mode 100644
index 0000000000..256fbb90d1
--- /dev/null
+++ b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/dto/VisualizationOuterParamsDTO.java
@@ -0,0 +1,9 @@
+package io.dataease.api.visualization.dto;
+
+import io.dataease.api.visualization.vo.VisualizationOuterParamsVO;
+
+
+
+public class VisualizationOuterParamsDTO extends VisualizationOuterParamsVO {
+
+}
diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/dto/VisualizationOuterParamsInfoDTO.java b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/dto/VisualizationOuterParamsInfoDTO.java
new file mode 100644
index 0000000000..7ecb488370
--- /dev/null
+++ b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/dto/VisualizationOuterParamsInfoDTO.java
@@ -0,0 +1,8 @@
+package io.dataease.api.visualization.dto;
+
+import io.dataease.api.visualization.vo.VisualizationOuterParamsInfoVO;
+
+
+public class VisualizationOuterParamsInfoDTO extends VisualizationOuterParamsInfoVO {
+
+}
diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/dto/VisualizationOuterParamsTargetViewInfoDTO.java b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/dto/VisualizationOuterParamsTargetViewInfoDTO.java
new file mode 100644
index 0000000000..a6c226fe44
--- /dev/null
+++ b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/dto/VisualizationOuterParamsTargetViewInfoDTO.java
@@ -0,0 +1,9 @@
+package io.dataease.api.visualization.dto;
+
+import io.dataease.api.visualization.vo.VisualizationOuterParamsTargetViewInfoVO;
+
+
+public class VisualizationOuterParamsTargetViewInfoDTO extends VisualizationOuterParamsTargetViewInfoVO {
+
+
+}
diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/response/VisualizationOuterParamsBaseResponse.java b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/response/VisualizationOuterParamsBaseResponse.java
new file mode 100644
index 0000000000..40107c1758
--- /dev/null
+++ b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/response/VisualizationOuterParamsBaseResponse.java
@@ -0,0 +1,24 @@
+package io.dataease.api.visualization.response;
+
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Author: wangjiahao
+ * Description:
+ */
+@Data
+public class VisualizationOuterParamsBaseResponse {
+
+    // 获取仪表板外部参数映射信息
+    private Map<String, List<String>> outerParamsInfoMap;
+
+    public VisualizationOuterParamsBaseResponse(Map<String, List<String>> outerParamsInfoMap) {
+        this.outerParamsInfoMap = outerParamsInfoMap;
+    }
+
+    public VisualizationOuterParamsBaseResponse() {
+    }
+}
diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationOuterParamsInfoVO.java b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationOuterParamsInfoVO.java
new file mode 100644
index 0000000000..d09c85be29
--- /dev/null
+++ b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationOuterParamsInfoVO.java
@@ -0,0 +1,108 @@
+package io.dataease.api.visualization.vo;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 外部参数配置表
+ * </p>
+ *
+ * @author fit2cloud
+ * @since 2024-03-08
+ */
+public class VisualizationOuterParamsInfoVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    private String paramsInfoId;
+
+    /**
+     * visualization_outer_params 表的 ID
+     */
+    private String paramsId;
+
+    /**
+     * 参数名
+     */
+    private String paramName;
+
+    /**
+     * 是否启用
+     */
+    private Boolean checked;
+
+    /**
+     * 复制来源
+     */
+    private String copyFrom;
+
+    /**
+     * 复制来源ID
+     */
+    private String copyId;
+
+    public String getParamsInfoId() {
+        return paramsInfoId;
+    }
+
+    public void setParamsInfoId(String paramsInfoId) {
+        this.paramsInfoId = paramsInfoId;
+    }
+
+    public String getParamsId() {
+        return paramsId;
+    }
+
+    public void setParamsId(String paramsId) {
+        this.paramsId = paramsId;
+    }
+
+    public String getParamName() {
+        return paramName;
+    }
+
+    public void setParamName(String paramName) {
+        this.paramName = paramName;
+    }
+
+    public Boolean getChecked() {
+        return checked;
+    }
+
+    public void setChecked(Boolean checked) {
+        this.checked = checked;
+    }
+
+    public String getCopyFrom() {
+        return copyFrom;
+    }
+
+    public void setCopyFrom(String copyFrom) {
+        this.copyFrom = copyFrom;
+    }
+
+    public String getCopyId() {
+        return copyId;
+    }
+
+    public void setCopyId(String copyId) {
+        this.copyId = copyId;
+    }
+
+    @Override
+    public String toString() {
+        return "VisualizationOuterParamsInfo{" +
+        "paramsInfoId = " + paramsInfoId +
+        ", paramsId = " + paramsId +
+        ", paramName = " + paramName +
+        ", checked = " + checked +
+        ", copyFrom = " + copyFrom +
+        ", copyId = " + copyId +
+        "}";
+    }
+}
diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationOuterParamsTargetViewInfoVO.java b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationOuterParamsTargetViewInfoVO.java
new file mode 100644
index 0000000000..29555c08a4
--- /dev/null
+++ b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationOuterParamsTargetViewInfoVO.java
@@ -0,0 +1,108 @@
+package io.dataease.api.visualization.vo;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 外部参数联动视图字段信息表
+ * </p>
+ *
+ * @author fit2cloud
+ * @since 2024-03-08
+ */
+public class VisualizationOuterParamsTargetViewInfoVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    private String targetId;
+
+    /**
+     * visualization_outer_params_info 表的 ID
+     */
+    private String paramsInfoId;
+
+    /**
+     * 联动视图ID
+     */
+    private String targetViewId;
+
+    /**
+     * 联动字段ID
+     */
+    private String targetFieldId;
+
+    /**
+     * 复制来源
+     */
+    private String copyFrom;
+
+    /**
+     * 复制来源ID
+     */
+    private String copyId;
+
+    public String getTargetId() {
+        return targetId;
+    }
+
+    public void setTargetId(String targetId) {
+        this.targetId = targetId;
+    }
+
+    public String getParamsInfoId() {
+        return paramsInfoId;
+    }
+
+    public void setParamsInfoId(String paramsInfoId) {
+        this.paramsInfoId = paramsInfoId;
+    }
+
+    public String getTargetViewId() {
+        return targetViewId;
+    }
+
+    public void setTargetViewId(String targetViewId) {
+        this.targetViewId = targetViewId;
+    }
+
+    public String getTargetFieldId() {
+        return targetFieldId;
+    }
+
+    public void setTargetFieldId(String targetFieldId) {
+        this.targetFieldId = targetFieldId;
+    }
+
+    public String getCopyFrom() {
+        return copyFrom;
+    }
+
+    public void setCopyFrom(String copyFrom) {
+        this.copyFrom = copyFrom;
+    }
+
+    public String getCopyId() {
+        return copyId;
+    }
+
+    public void setCopyId(String copyId) {
+        this.copyId = copyId;
+    }
+
+    @Override
+    public String toString() {
+        return "VisualizationOuterParamsTargetViewInfo{" +
+        "targetId = " + targetId +
+        ", paramsInfoId = " + paramsInfoId +
+        ", targetViewId = " + targetViewId +
+        ", targetFieldId = " + targetFieldId +
+        ", copyFrom = " + copyFrom +
+        ", copyId = " + copyId +
+        "}";
+    }
+}
diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationOuterParamsVO.java b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationOuterParamsVO.java
new file mode 100644
index 0000000000..f2fa1b7f5a
--- /dev/null
+++ b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationOuterParamsVO.java
@@ -0,0 +1,108 @@
+package io.dataease.api.visualization.vo;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 外部参数关联关系表
+ * </p>
+ *
+ * @author fit2cloud
+ * @since 2024-03-08
+ */
+public class VisualizationOuterParamsVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    private String paramsId;
+
+    /**
+     * 可视化资源ID
+     */
+    private String visualizationId;
+
+    /**
+     * 是否启用外部参数标识（1-是，0-否）
+     */
+    private Boolean checked;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 复制来源
+     */
+    private String copyFrom;
+
+    /**
+     * 复制来源ID
+     */
+    private String copyId;
+
+    public String getParamsId() {
+        return paramsId;
+    }
+
+    public void setParamsId(String paramsId) {
+        this.paramsId = paramsId;
+    }
+
+    public String getVisualizationId() {
+        return visualizationId;
+    }
+
+    public void setVisualizationId(String visualizationId) {
+        this.visualizationId = visualizationId;
+    }
+
+    public Boolean getChecked() {
+        return checked;
+    }
+
+    public void setChecked(Boolean checked) {
+        this.checked = checked;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getCopyFrom() {
+        return copyFrom;
+    }
+
+    public void setCopyFrom(String copyFrom) {
+        this.copyFrom = copyFrom;
+    }
+
+    public String getCopyId() {
+        return copyId;
+    }
+
+    public void setCopyId(String copyId) {
+        this.copyId = copyId;
+    }
+
+    @Override
+    public String toString() {
+        return "VisualizationOuterParams{" +
+        "paramsId = " + paramsId +
+        ", visualizationId = " + visualizationId +
+        ", checked = " + checked +
+        ", remark = " + remark +
+        ", copyFrom = " + copyFrom +
+        ", copyId = " + copyId +
+        "}";
+    }
+}

From b82dfa43cf751895383d01681c484bd6916f59a8 Mon Sep 17 00:00:00 2001
From: maninhill <41712985+maninhill@users.noreply.github.com>
Date: Sun, 10 Mar 2024 22:12:20 +0800
Subject: [PATCH 10/12] =?UTF-8?q?chore=EF=BC=9A=E6=9B=B4=E6=96=B0=20README?=
 =?UTF-8?q?.md=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=B5=8C=E5=85=A5=E5=BC=8F=20BI?=
 =?UTF-8?q?=20=E4=BD=93=E9=AA=8C=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index ec857810b3..e1cc6204b4 100644
--- a/README.md
+++ b/README.md
@@ -52,6 +52,7 @@ DataEase 是开源的数据可视化分析工具，帮助用户快速分析数
 -   [在线文档](https://dataease.io/docs/)
 -   [社区论坛](https://bbs.fit2cloud.com/c/de/6)
 -   [快速入门视频](https://www.bilibili.com/video/BV1Z84y1X7eF/)
+-   [嵌入式 BI 体验](https://embedded-bi.dataease.cn/)
 
 ## License
 

From fc6f49184e6de4b2c875360d78131e46a7bde40d Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Mon, 11 Mar 2024 11:56:18 +0800
Subject: [PATCH 11/12] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE)?=
 =?UTF-8?q?:=20=E7=B3=BB=E7=BB=9F=E5=8F=82=E6=95=B0-=E5=9C=B0=E5=9B=BE?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE-=E5=9C=B0=E7=90=86=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E4=BB=A3=E7=A0=81=E5=AD=97=E6=AE=B5=E8=A7=84?=
 =?UTF-8?q?=E5=88=99=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/parameter/map/GeometryEdit.vue     | 71 +++++++++++++++++--
 1 file changed, 67 insertions(+), 4 deletions(-)

diff --git a/core/core-frontend/src/views/system/parameter/map/GeometryEdit.vue b/core/core-frontend/src/views/system/parameter/map/GeometryEdit.vue
index cb653309bb..ddcec49b15 100644
--- a/core/core-frontend/src/views/system/parameter/map/GeometryEdit.vue
+++ b/core/core-frontend/src/views/system/parameter/map/GeometryEdit.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { ref, reactive } from 'vue'
+import { ref, reactive, computed } from 'vue'
 import { ElMessage, ElLoading } from 'element-plus-secondary'
 import { useI18n } from '@/hooks/web/useI18n'
 import type {
@@ -31,7 +31,38 @@ const treeProps = {
   label: 'name',
   disabled: 'readOnly'
 }
-
+const formatPid = computed(() => {
+  if (!state.form.pid) return ''
+  const pid = state.form.pid
+  return pid.replace(/(0+)$/g, '').replace(/\D/g, '')
+})
+const codeTips = ref(
+  '国家代码由三位数字组成，省、市、区县、乡镇代码由两位数字组成；非国家区域需要再后面补0'
+)
+const pidChange = () => {
+  state.form.code = null
+}
+const validateCode = (_: any, value: any, callback: any) => {
+  const isCountry = !formatPid.value
+  if (isCountry) {
+    const reg = /^[0-9]\d{2}$/
+    if (!reg.test(value) || value === '000') {
+      const msg = '请输入非0的三位数字'
+      callback(new Error(msg))
+    } else {
+      callback()
+    }
+  } else {
+    const fullValue = formatPid.value + value
+    const reg = /^[1-9](\d{8}|\d{10})$/
+    if (!reg.test(fullValue)) {
+      const msg = '请输入9或11位数字'
+      callback(new Error(msg))
+    } else {
+      callback()
+    }
+  }
+}
 const rule = reactive<FormRules>({
   pid: [
     {
@@ -45,7 +76,8 @@ const rule = reactive<FormRules>({
       required: true,
       message: t('common.require'),
       trigger: 'blur'
-    }
+    },
+    { validator: validateCode, trigger: 'blur' }
   ],
   name: [
     {
@@ -81,6 +113,7 @@ const submitForm = async (formEl: FormInstance | undefined) => {
   await formEl.validate(valid => {
     if (valid) {
       const param = { ...state.form }
+      param['code'] = formatPid.value ? formatPid.value + param['code'] : param['code']
       const formData = buildFormData(geoFile.value, param)
       showLoading()
       request
@@ -179,11 +212,34 @@ defineExpose({
           check-strictly
           :render-after-expand="false"
           :placeholder="t('common.please_select')"
+          @current-change="pidChange"
         />
       </el-form-item>
 
       <el-form-item label="区域代码" prop="code">
-        <el-input v-model="state.form.code" />
+        <template v-slot:label>
+          <span class="area-code-label">
+            <span>区域代码</span>
+            <el-tooltip effect="dark" :content="codeTips" placement="top">
+              <el-icon class="info-tips"><Icon name="dv-info"></Icon></el-icon>
+            </el-tooltip>
+          </span>
+        </template>
+
+        <el-input v-if="state.form.pid" v-model="state.form.code">
+          <template #prefix>
+            {{ formatPid }}
+          </template>
+        </el-input>
+        <el-tooltip
+          v-else
+          class="box-item"
+          effect="dark"
+          content="请先选择上级区域"
+          placement="top"
+        >
+          <el-input v-model="state.form.code" disabled />
+        </el-tooltip>
       </el-form-item>
 
       <el-form-item label="区域名称" prop="name">
@@ -253,4 +309,11 @@ defineExpose({
   width: calc(100% - 48px);
   height: 30px;
 }
+.area-code-label {
+  display: inline-flex;
+  align-items: center;
+  i {
+    margin-left: 4px;
+  }
+}
 </style>

From 35f828209b51cc6212a922fb27d6ca8633ce98d5 Mon Sep 17 00:00:00 2001
From: wisonic-s <shaochuan.wu@fit2cloud.com>
Date: Mon, 11 Mar 2024 16:48:39 +0800
Subject: [PATCH 12/12] =?UTF-8?q?feat(=E5=9B=BE=E8=A1=A8):=20=E5=9C=B0?=
 =?UTF-8?q?=E5=9B=BE=E5=9B=BE=E4=BE=8B=E6=98=BE=E7=A4=BA=E4=B8=BA=E6=95=B4?=
 =?UTF-8?q?=E6=95=B0=20#8202?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/js/panel/charts/map/map.ts     |  6 +--
 .../components/js/panel/common/common_antv.ts | 42 +++++++++++++++++++
 .../components/js/panel/types/impl/l7plot.ts  |  8 +++-
 3 files changed, 52 insertions(+), 4 deletions(-)

diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/map/map.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/map/map.ts
index 9b58b75123..b02978581f 100644
--- a/core/core-frontend/src/views/chart/components/js/panel/charts/map/map.ts
+++ b/core/core-frontend/src/views/chart/components/js/panel/charts/map/map.ts
@@ -218,7 +218,6 @@ export class Map extends L7PlotChartView<ChoroplethOptions, Choropleth> {
           content.push(name)
         }
         if (label.showQuota) {
-          valueFormatter
           areaMap[name] && content.push(valueFormatter(areaMap[name], label.quotaLabelFormatter))
         }
         item.properties['_DE_LABEL_'] = content.join('\n\n')
@@ -229,7 +228,7 @@ export class Map extends L7PlotChartView<ChoroplethOptions, Choropleth> {
       colors = colors.slice(0, validArea)
     }
     if (colors.length) {
-      options.color.value = colors
+      options.color['value'] = colors
     }
     return options
   }
@@ -244,7 +243,8 @@ export class Map extends L7PlotChartView<ChoroplethOptions, Choropleth> {
       this.configLabel,
       this.configStyle,
       this.configTooltip,
-      this.configBasicStyle
+      this.configBasicStyle,
+      this.configLegend
     )(chart, options, extra)
   }
 }
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 09f8da1e6f..dd1216f852 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
@@ -12,6 +12,15 @@ import { Tooltip } from '@antv/g2plot/esm'
 import { add } from 'mathjs'
 import isEmpty from 'lodash-es/isEmpty'
 import _ from 'lodash'
+import type { LegendOptions } from '@antv/l7plot/dist/esm/types/legend'
+import { CategoryLegendListItem } from '@antv/l7plot-component/dist/lib/types/legend'
+import createDom from '@antv/dom-util/esm/create-dom'
+import {
+  CONTAINER_TPL,
+  ITEM_TPL,
+  LIST_CLASS
+} from '@antv/l7plot-component/dist/esm/legend/category/constants'
+import substitute from '@antv/util/esm/substitute'
 
 export function getPadding(chart: Chart): number[] {
   if (chart.drill) {
@@ -772,3 +781,36 @@ export function getTooltipSeriesTotalMap(data: any[]): Record<string, number> {
   })
   return result
 }
+
+export function configL7Legend(): LegendOptions {
+  return {
+    customContent: (_: string, items: CategoryLegendListItem[]) => {
+      const showItems = items?.length > 30 ? items.slice(0, 30) : items
+      if (showItems?.length) {
+        const containerDom = createDom(CONTAINER_TPL) as HTMLElement
+        const listDom = containerDom.getElementsByClassName(LIST_CLASS)[0] as HTMLElement
+        showItems.forEach(item => {
+          let value = '-'
+          if (item.value !== '') {
+            if (Array.isArray(item.value)) {
+              item.value.forEach((v, i) => {
+                item.value[i] = Number.isNaN(v) || v === 'NaN' ? 'NaN' : parseFloat(v).toFixed(0)
+              })
+              value = item.value.join('-')
+            } else {
+              const tmp = item.value as string
+              value = Number.isNaN(tmp) || tmp === 'NaN' ? 'NaN' : parseFloat(tmp).toFixed(0)
+            }
+          }
+          const substituteObj = { ...item, value }
+
+          const domStr = substitute(ITEM_TPL, substituteObj)
+          const itemDom = createDom(domStr)
+          listDom.appendChild(itemDom)
+        })
+        return listDom
+      }
+      return ''
+    }
+  }
+}
diff --git a/core/core-frontend/src/views/chart/components/js/panel/types/impl/l7plot.ts b/core/core-frontend/src/views/chart/components/js/panel/types/impl/l7plot.ts
index 17d99f20d7..c22d32c9ca 100644
--- a/core/core-frontend/src/views/chart/components/js/panel/types/impl/l7plot.ts
+++ b/core/core-frontend/src/views/chart/components/js/panel/types/impl/l7plot.ts
@@ -4,6 +4,7 @@ import { PlotOptions } from '@antv/l7plot/dist/esm/types/plot'
 import { Plot as L7Plot } from '@antv/l7plot/dist/esm/core/plot'
 import {
   configL7Label,
+  configL7Legend,
   configL7Style,
   configL7Tooltip
 } from '@/views/chart/components/js/panel/common/common_antv'
@@ -13,6 +14,7 @@ import {
   ChartLibraryType
 } from '@/views/chart/components/js/panel/types'
 import { defaultsDeep } from 'lodash-es'
+import { ChoroplethOptions } from '@antv/l7plot/dist/esm/plots/choropleth'
 
 export interface L7PlotDrawOptions<P> extends AntVDrawOptions<P> {
   areaId?: string
@@ -43,7 +45,11 @@ export abstract class L7PlotChartView<
     defaultsDeep(options.tooltip, tooltip)
     return options
   }
-
+  protected configLegend(_: Chart, options: ChoroplethOptions) {
+    const legend = configL7Legend()
+    defaultsDeep(options.legend, legend)
+    return options
+  }
   protected constructor(name: string, defaultData?: any[]) {
     super(ChartLibraryType.L7_PLOT, name)
     this.defaultData = defaultData