From f1b34ac71028360bc3ad2fbc9a931c13a0d3de57 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Tue, 2 Jul 2024 17:00:51 +0800
Subject: [PATCH 01/13] =?UTF-8?q?fix(=E6=9F=A5=E8=AF=A2=E7=BB=84=E4=BB=B6)?=
 =?UTF-8?q?:=20=E8=BF=87=E6=BB=A4=E6=9D=A1=E4=BB=B6=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E4=B8=8D=E5=90=8C=E6=95=B0=E6=8D=AE=E9=9B=86=E7=9A=84=E6=95=B0?=
 =?UTF-8?q?=E5=80=BC=E7=B1=BB=E5=9E=8B=E7=9A=84=E5=AD=97=E6=AE=B5=EF=BC=8C?=
 =?UTF-8?q?=E5=9C=A8=E8=AE=BE=E7=BD=AE=E7=BA=A7=E8=81=94=E6=97=B6=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E8=8E=B7=E5=8F=96=E8=A2=AB=E7=BA=A7=E8=81=94=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/custom-component/v-query/QueryCascade.vue            | 4 ++--
 .../custom-component/v-query/QueryConditionConfiguration.vue | 5 +++--
 core/core-frontend/src/custom-component/v-query/Select.vue   | 1 +
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/core/core-frontend/src/custom-component/v-query/QueryCascade.vue b/core/core-frontend/src/custom-component/v-query/QueryCascade.vue
index 674f06ecce..f0e9ec50f5 100644
--- a/core/core-frontend/src/custom-component/v-query/QueryCascade.vue
+++ b/core/core-frontend/src/custom-component/v-query/QueryCascade.vue
@@ -209,8 +209,8 @@ defineExpose({
       <el-icon style="font-size: 16px">
         <Icon name="icon_info_colorful"></Icon>
       </el-icon>
-      基于当前查询组件的查询条件,如果需要进行及联配置,需要满足以下条件:<br />
-      1、展示类型为:文本下拉组件和数字下拉组件;2、选项值来源为:选择数据集<br />
+      基于当前查询组件的查询条件，如果需要进行级联联配置，需要满足以下条件：<br />
+      1. 展示类型：文本下拉组件和数字下拉组件；2. 选项值来源：选择数据集<br />
     </div>
     <el-button text @click="addCascadeBlock">
       <template #icon>
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 bd388eddc6..e578bff266 100644
--- a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
+++ b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
@@ -538,7 +538,9 @@ const openCascadeDialog = () => {
         name: next.name,
         queryId: next.id,
         fieldId: next.field.id,
-        deType: next.field.deType
+        deType: datasetMap[next.dataset.id].fields?.dimensionList.find(
+          ele => ele.id === next.field.id
+        )?.deType
       }
       return pre
     }, {})
@@ -765,7 +767,6 @@ const cancelValueSource = () => {
   valueSource.value = cloneDeep(curComponent.value.valueSource)
   if (!valueSource.value.length) {
     valueSource.value.push('')
-    valueSource.value.push('')
   }
   manual.value.hide()
 }
diff --git a/core/core-frontend/src/custom-component/v-query/Select.vue b/core/core-frontend/src/custom-component/v-query/Select.vue
index 59bddff66e..11f2447921 100644
--- a/core/core-frontend/src/custom-component/v-query/Select.vue
+++ b/core/core-frontend/src/custom-component/v-query/Select.vue
@@ -417,6 +417,7 @@ watch(
 watch(
   () => config.value.optionValueSource,
   (valNew, newOld) => {
+    if (!props.isConfig) return
     if ([valNew, newOld].includes(2)) {
       selectValue.value = Array.isArray(selectValue.value) ? [] : undefined
       config.value.selectValue = cloneDeep(selectValue.value)

From 35b10ff7f899dc9823d0faf3bf24c21a5450dd9f Mon Sep 17 00:00:00 2001
From: wisonic-s <shaochuan.wu@fit2cloud.com>
Date: Tue, 2 Jul 2024 17:05:59 +0800
Subject: [PATCH 02/13] =?UTF-8?q?fix(=E5=9B=BE=E8=A1=A8):=20=E8=AE=A1?=
 =?UTF-8?q?=E6=95=B0=E5=AD=97=E6=AE=B5=E5=A4=B1=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/io/dataease/chart/manage/ChartDataManage.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java
index c44f99c4b3..9be93b0874 100644
--- a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java
+++ b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java
@@ -127,7 +127,8 @@ public class ChartDataManage {
         List<DataSetRowPermissionsTreeDTO> rowPermissionsTree = permissionManage.getRowPermissionsTree(table.getId(), chartExtRequest.getUser());
         //将没有权限的列删掉
         List<String> dataeaseNames = columnPermissionFields.stream().map(DatasetTableFieldDTO::getDataeaseName).collect(Collectors.toList());
-
+        //计数字段
+        dataeaseNames.add("*");
         AxisFormatResult formatResult = chartHandler.formatAxis(view);
         formatResult.getContext().put("desensitizationList", desensitizationList);
         var xAxis = formatResult.getAxisMap().get(ChartAxis.xAxis);

From 63eb855e4ff75172570744ae5d81914f4ef72f9d Mon Sep 17 00:00:00 2001
From: ulleo <ulleo.wang@gmail.com>
Date: Tue, 2 Jul 2024 17:10:07 +0800
Subject: [PATCH 03/13] =?UTF-8?q?fix(=E5=9B=BE=E8=A1=A8):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E5=9F=BA=E7=A1=80=E6=A0=B7=E5=BC=8F=E9=80=8F=E6=98=8E?=
 =?UTF-8?q?=E5=BA=A6=E8=BE=93=E5=85=A5=E6=A1=86=E6=97=A0=E6=B3=95=E9=99=90?=
 =?UTF-8?q?=E5=88=B60-100=E6=95=B4=E6=95=B0=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/BasicStyleSelector.vue         | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/components/BasicStyleSelector.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/components/BasicStyleSelector.vue
index 6b39db4dad..f959c70bd6 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/BasicStyleSelector.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/BasicStyleSelector.vue
@@ -57,6 +57,22 @@ const emit = defineEmits(['onBasicStyleChange', 'onMiscChange'])
 const changeBasicStyle = (prop?: string, requestData = false) => {
   emit('onBasicStyleChange', { data: state.basicStyleForm, requestData }, prop)
 }
+const onAlphaChange = v => {
+  const _v = parseInt(v)
+  if (_v >= 0 && _v <= 100) {
+    state.basicStyleForm.alpha = _v
+  } else if (_v < 0) {
+    state.basicStyleForm.alpha = 0
+  } else if (_v > 100) {
+    state.basicStyleForm.alpha = 100
+  } else {
+    const basicStyle = cloneDeep(props.chart.customAttr.basicStyle)
+    const oldForm = defaultsDeep(basicStyle, cloneDeep(DEFAULT_BASIC_STYLE)) as ChartBasicStyle
+    state.basicStyleForm.alpha = oldForm.alpha
+  }
+  changeBasicStyle('alpha')
+}
+
 const changeMisc = prop => {
   emit('onMiscChange', { data: state.miscForm, requestData: true }, prop)
 }
@@ -275,7 +291,7 @@ onMounted(() => {
               :max="100"
               class="basic-input-number"
               :controls="false"
-              @change="changeBasicStyle('alpha')"
+              @change="onAlphaChange"
             >
               <template #suffix> % </template>
             </el-input>
@@ -521,7 +537,7 @@ onMounted(() => {
                 :max="100"
                 class="basic-input-number"
                 :controls="false"
-                @change="changeBasicStyle('alpha')"
+                @change="onAlphaChange"
               >
                 <template #suffix> % </template>
               </el-input>

From 24f884e7a3df8cf71f6928ede42f1dd2270e416e Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Tue, 2 Jul 2024 17:22:06 +0800
Subject: [PATCH 04/13] =?UTF-8?q?fix(xpack):=20=E8=B7=AF=E7=94=B1=E4=B8=8D?=
 =?UTF-8?q?=E7=94=9F=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/components/plugin/src/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/core-frontend/src/components/plugin/src/index.vue b/core/core-frontend/src/components/plugin/src/index.vue
index fdb7328aa0..1aa2afdf6d 100644
--- a/core/core-frontend/src/components/plugin/src/index.vue
+++ b/core/core-frontend/src/components/plugin/src/index.vue
@@ -8,7 +8,7 @@ import { i18n } from '@/plugins/vue-i18n'
 import * as Vue from 'vue'
 import axios from 'axios'
 import * as Pinia from 'pinia'
-import * as vueRouter from 'vue-router'
+import router from '@/router'
 import tinymce from 'tinymce/tinymce'
 import { useEmitt } from '@/hooks/web/useEmitt'
 
@@ -107,7 +107,7 @@ onMounted(async () => {
       window['Vue'] = Vue
       window['Axios'] = axios
       window['Pinia'] = Pinia
-      window['vueRouter'] = vueRouter
+      window['vueRouter'] = router
       window['MittAll'] = useEmitt().emitter.all
       window['I18n'] = i18n
       if (!window.tinymce) {

From fb7990ed186c78b68a03ca5aeed1ba25074e14c3 Mon Sep 17 00:00:00 2001
From: ulleo <ulleo.wang@gmail.com>
Date: Tue, 2 Jul 2024 17:34:46 +0800
Subject: [PATCH 05/13] =?UTF-8?q?feat(=E5=9B=BE=E8=A1=A8):=20=E5=8C=BA?=
 =?UTF-8?q?=E9=97=B4=E6=9D=A1=E5=BD=A2=E5=9B=BE=E5=8E=BB=E9=99=A4=E8=BD=B4?=
 =?UTF-8?q?=E5=80=BC=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/js/panel/charts/bar/range-bar.ts      | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/bar/range-bar.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/bar/range-bar.ts
index 7f24cb8390..a887e7d5eb 100644
--- a/core/core-frontend/src/views/chart/components/js/panel/charts/bar/range-bar.ts
+++ b/core/core-frontend/src/views/chart/components/js/panel/charts/bar/range-bar.ts
@@ -47,7 +47,17 @@ export class RangeBar extends G2PlotChartView<BarOptions, Bar> {
       'showGap',
       'show'
     ],
-    'x-axis-selector': [...BAR_EDITOR_PROPERTY_INNER['x-axis-selector'], 'axisLabelFormatter']
+    'x-axis-selector': [...BAR_EDITOR_PROPERTY_INNER['x-axis-selector'], 'axisLabelFormatter'],
+    'y-axis-selector': [
+      'name',
+      'color',
+      'fontSize',
+      'axisLine',
+      'splitLine',
+      'axisForm',
+      'axisLabel',
+      'position'
+    ]
   }
   axis: AxisType[] = [...BAR_AXIS_TYPE, 'yAxisExt']
   protected baseOptions: BarOptions = {

From d0d185f8efb84d86c9589654490360a590a3cbcd Mon Sep 17 00:00:00 2001
From: ulleo <ulleo.wang@gmail.com>
Date: Tue, 2 Jul 2024 17:53:00 +0800
Subject: [PATCH 06/13] =?UTF-8?q?fix(=E5=9B=BE=E8=A1=A8):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E7=A6=81=E7=94=A8=E6=A0=87=E9=A2=98=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E5=9B=BE=E8=A1=A8=E4=BB=8D=E4=BC=9A=E6=98=BE=E7=A4=BA=E5=A4=87?=
 =?UTF-8?q?=E6=B3=A8=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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 ede289b4d4..93f940df2a 100644
--- a/core/core-frontend/src/views/chart/components/views/index.vue
+++ b/core/core-frontend/src/views/chart/components/views/index.vue
@@ -282,7 +282,7 @@ const initTitle = () => {
       )
     }
 
-    state.title_remark.show = customStyle.text.remarkShow
+    state.title_remark.show = customStyle.text.show && customStyle.text.remarkShow
     state.title_remark.remark = customStyle.text.remark
   }
 }

From c263dfdda9e6501d5e3529f28ce1b3dda7651b3e Mon Sep 17 00:00:00 2001
From: maninhill <41712985+maninhill@users.noreply.github.com>
Date: Tue, 2 Jul 2024 18:18:08 +0800
Subject: [PATCH 07/13] chore: Update CONTRIBUTING.md

---
 CONTRIBUTING.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 22fd416bb9..f19c3ae223 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,5 +1,10 @@
 # Contributing
 
+As a contributor, you should agree that:
+
+a. The producer can adjust the open-source agreement to be more strict or relaxed as deemed necessary.
+b. Your contributed code may be used for commercial purposes, including but not limited to its cloud business operations.
+
 ## Create pull request
 PR are always welcome, even if they only contain small fixes like typos or a few lines of code. If there will be a significant effort, please document it as an issue and get a discussion going before starting to work on it.
 

From cd3847d5fe21eac72356e1c83ecf51b54c133563 Mon Sep 17 00:00:00 2001
From: ulleo <ulleo.wang@gmail.com>
Date: Tue, 2 Jul 2024 18:19:22 +0800
Subject: [PATCH 08/13] =?UTF-8?q?fix(=E5=9B=BE=E8=A1=A8):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E6=9F=B1=E7=BA=BF=E7=BB=84=E5=90=88=E5=9B=BE=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=8C=87=E6=A0=87=E6=98=BE=E7=A4=BA=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E5=90=8E=EF=BC=8C=E5=9B=BE=E4=BE=8B=E6=B2=A1=E6=9C=89=E5=8F=98?=
 =?UTF-8?q?=E5=8C=96=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

#10009
#10277
---
 .../chart/components/js/panel/charts/others/chart-mix.ts      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/others/chart-mix.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/others/chart-mix.ts
index cf301fca78..c1d3ac63aa 100644
--- a/core/core-frontend/src/views/chart/components/js/panel/charts/others/chart-mix.ts
+++ b/core/core-frontend/src/views/chart/components/js/panel/charts/others/chart-mix.ts
@@ -423,9 +423,9 @@ export class ColumnLineMix extends G2PlotChartView<DualAxesOptions, DualAxes> {
         formatter: (text: string, item: any, index: number) => {
           let name = undefined
           if (item.viewId === 'left-axes-view' && text === 'value') {
-            name = left[0]?.name
+            name = left[0]?.categories[0]
           } else if (item.viewId === 'right-axes-view' && text === 'valueExt') {
-            name = right[0]?.name
+            name = right[0]?.categories[0]
           }
           item.id = item.id + '__' + index //防止重复的图例出现问题，但是左右轴如果有相同的怎么办
           if (name === undefined) {

From ebef25efb54a29ebe2b254cf713a3d31ec6f543d Mon Sep 17 00:00:00 2001
From: wisonic-s <shaochuan.wu@fit2cloud.com>
Date: Tue, 2 Jul 2024 18:24:37 +0800
Subject: [PATCH 09/13] =?UTF-8?q?fix(=E5=9B=BE=E8=A1=A8):=20=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E4=B8=8B=E9=92=BB=E6=98=BE=E7=A4=BA=E8=B7=AF=E5=BE=84?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/dataease/chart/charts/impl/DefaultChartHandler.java  | 6 ++++++
 .../main/java/io/dataease/chart/manage/ChartDataManage.java | 1 +
 2 files changed, 7 insertions(+)

diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/DefaultChartHandler.java b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/DefaultChartHandler.java
index 3cbfb42dd9..e5afb313c3 100644
--- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/DefaultChartHandler.java
+++ b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/DefaultChartHandler.java
@@ -137,6 +137,12 @@ public class DefaultChartHandler extends AbstractChartPlugin {
 
         Map<String, Object> mapTableNormal = ChartDataBuild.transTableNormal(xAxis, yAxis, view, calcResult.getOriginData(), extStack, desensitizationList);
         var drillFilters = filterResult.getFilterList().stream().filter(f -> f.getFilterType() == 1).collect(Collectors.toList());
+        // 日期下钻替换回去
+        drillFilters.forEach(f -> {
+            if (CollectionUtils.isNotEmpty(f.getOriginValue())) {
+                f.setValue(f.getOriginValue());
+            }
+        });
         var isDrill = CollectionUtils.isNotEmpty(drillFilters);
         // 构建结果
         Map<String, Object> dataMap = new HashMap<>();
diff --git a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java
index 9be93b0874..31394eaa8a 100644
--- a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java
+++ b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java
@@ -281,6 +281,7 @@ public class ChartDataManage {
                         drillFilter.setFilterType(1);
                         if (datasetTableField.getDeType() == 1) {
                             drillFilter.setOperator("between");
+                            drillFilter.setOriginValue(Collections.singletonList(dim.getValue()));
                             // 把value类似过滤组件处理，获得start time和end time
                             Map<String, Long> stringLongMap = Utils.parseDateTimeValue(dim.getValue());
                             drillFilter.setValue(Arrays.asList(String.valueOf(stringLongMap.get("startTime")), String.valueOf(stringLongMap.get("endTime"))));

From 319e1b94caa22f3ca96b5a13df081acec64ebe25 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 2 Jul 2024 18:29:35 +0800
Subject: [PATCH 10/13] =?UTF-8?q?fix(X-Pack):=20=E5=AF=BC=E8=88=AA?=
 =?UTF-8?q?=E6=A0=8F=E7=BB=84=E7=BB=87=E5=88=87=E6=8D=A2=E5=99=A8=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87=E5=90=8D=E7=A7=B0=E4=B8=8D=E6=98=BE=E7=A4=BA?=
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 9eb6242878..7b229ca2b5 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit 9eb62428789427f0287c11a61b799b59119cdc78
+Subproject commit 7b229ca2b545b19467f3b4b2db61ee5bd6ad1e41

From 055bfdd9955870577522de244f40fbe14e33648f Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Tue, 2 Jul 2024 18:35:26 +0800
Subject: [PATCH 11/13] =?UTF-8?q?fix(=E6=9F=A5=E8=AF=A2=E7=BB=84=E4=BB=B6)?=
 =?UTF-8?q?:=20=E6=9F=A5=E8=AF=A2=E7=BB=84=E4=BB=B6=E9=80=89=E9=A1=B9?=
 =?UTF-8?q?=E5=80=BC=E9=BB=98=E8=AE=A4=E4=B8=80=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/custom-component/v-query/QueryConditionConfiguration.vue | 1 -
 1 file changed, 1 deletion(-)

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 e578bff266..bba11ab4b7 100644
--- a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
+++ b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
@@ -964,7 +964,6 @@ const handleCondition = item => {
   valueSource.value = cloneDeep(curComponent.value.valueSource)
   if (!valueSource.value.length) {
     valueSource.value.push('')
-    valueSource.value.push('')
   }
   parameterCompletion()
   nextTick(() => {

From 03115c98892a455eff98cf3cc0494ea110ccbf1a Mon Sep 17 00:00:00 2001
From: wisonic-s <shaochuan.wu@fit2cloud.com>
Date: Tue, 2 Jul 2024 18:46:36 +0800
Subject: [PATCH 12/13] =?UTF-8?q?fix(=E5=9B=BE=E8=A1=A8):=20=E9=80=8F?=
 =?UTF-8?q?=E8=A7=86=E8=A1=A8=E5=AF=BC=E5=87=BA=E6=8C=89=E9=92=AE=E9=9A=90?=
 =?UTF-8?q?=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/visualization/UserViewEnlarge.vue            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/core-frontend/src/components/visualization/UserViewEnlarge.vue b/core/core-frontend/src/components/visualization/UserViewEnlarge.vue
index dca999451f..0271c7d905 100644
--- a/core/core-frontend/src/components/visualization/UserViewEnlarge.vue
+++ b/core/core-frontend/src/components/visualization/UserViewEnlarge.vue
@@ -47,7 +47,7 @@
       </el-button>
       <el-button
         class="m-button"
-        v-if="optType === 'details' && authShow"
+        v-if="optType === 'details' && authShow && viewInfo.type === 'table-pivot'"
         link
         icon="Download"
         size="middle"

From cc351cbdee0058fbdbfee56c51acf0a7e0a65596 Mon Sep 17 00:00:00 2001
From: wisonic-s <shaochuan.wu@fit2cloud.com>
Date: Tue, 2 Jul 2024 18:54:33 +0800
Subject: [PATCH 13/13] =?UTF-8?q?fix(=E5=9B=BE=E8=A1=A8):=20=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E4=B8=8B=E9=92=BB=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/dataease/extensions/view/dto/ChartExtFilterDTO.java     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartExtFilterDTO.java b/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartExtFilterDTO.java
index 9a91accf2f..9af98e72d2 100644
--- a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartExtFilterDTO.java
+++ b/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartExtFilterDTO.java
@@ -1,6 +1,7 @@
 package io.dataease.extensions.view.dto;
 
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.dataease.extensions.datasource.dto.DatasetTableFieldDTO;
 import lombok.Data;
 
@@ -19,5 +20,7 @@ public class ChartExtFilterDTO {
     private List<DatasetTableFieldDTO> datasetTableFieldList;
     private String dateStyle;
     private String datePattern;
+    @JsonIgnore
+    private List<String> originValue;
     private int filterType;// 0-过滤组件，1-下钻，2-联动，外部参数
 }