From b0a33234e5232afcec3b2ba81cfa0c94fa36d832 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 3 Dec 2024 18:56:49 +0800
Subject: [PATCH 1/8] =?UTF-8?q?style(=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F)?=
 =?UTF-8?q?:=20=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../custom-component/picture-group/PictureGroupUploadAttr.vue  | 1 +
 .../components/editor/editor-senior/components/Threshold.vue   | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/core/core-frontend/src/custom-component/picture-group/PictureGroupUploadAttr.vue b/core/core-frontend/src/custom-component/picture-group/PictureGroupUploadAttr.vue
index b698f20922..4afbcf4a3f 100644
--- a/core/core-frontend/src/custom-component/picture-group/PictureGroupUploadAttr.vue
+++ b/core/core-frontend/src/custom-component/picture-group/PictureGroupUploadAttr.vue
@@ -148,6 +148,7 @@ onBeforeUnmount(() => {
       <el-form-item
         v-if="curComponent.style.adaptation"
         class="form-item form-item-custom"
+        :class="'form-item-' + themes"
         :label="t('visualization.pic_adaptor_type')"
         size="small"
         :effect="themes"
diff --git a/core/core-frontend/src/views/chart/components/editor/editor-senior/components/Threshold.vue b/core/core-frontend/src/views/chart/components/editor/editor-senior/components/Threshold.vue
index 78a606705e..a8baef03ad 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-senior/components/Threshold.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-senior/components/Threshold.vue
@@ -1188,6 +1188,9 @@ span {
     background: #f5f6f7;
     &.field-style-dark {
       background: #1a1a1a;
+      :deep(.field-text) {
+        color: #a6a6a6;
+      }
     }
   }
 }

From 7177f8afa4c36ed481fcab0e3692c3545a436c7b Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 3 Dec 2024 19:24:52 +0800
Subject: [PATCH 2/8] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):?=
 =?UTF-8?q?=20=E9=98=88=E5=80=BC=E5=91=8A=E8=AD=A6-=E6=95=B0=E5=80=BC?=
 =?UTF-8?q?=E5=8A=A8=E6=80=81=E7=B1=BB=E5=9E=8B=E9=80=89=E6=8B=A9=E7=AD=89?=
 =?UTF-8?q?=E4=BA=8E=E6=97=A0=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chart/manage/ChartViewThresholdManage.java     | 14 +++++++++++---
 de-xpack                                           |  2 +-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewThresholdManage.java b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewThresholdManage.java
index c08d1c2a65..c63c17ae03 100644
--- a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewThresholdManage.java
+++ b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewThresholdManage.java
@@ -413,7 +413,7 @@ public class ChartViewThresholdManage {
         DatasetTableFieldDTO field = item.getField();
         String dataeaseName = field.getDataeaseName();
         String value = item.getValue();
-        float tempFVal = 0f;
+        Float tempFVal = StringUtils.equalsAny(value, "min", "max") ? null : 0f;
         int validLen = 0;
 
         for (Map<String, Object> row : rows) {
@@ -421,9 +421,17 @@ public class ChartViewThresholdManage {
             if (ObjectUtils.isEmpty(o)) continue;
             float fvalue = Float.parseFloat(o.toString());
             if (StringUtils.equals("min", value)) {
-                tempFVal = Math.min(tempFVal, fvalue);
+                if (ObjectUtils.isEmpty(tempFVal)) {
+                    tempFVal = fvalue;
+                } else {
+                    tempFVal = Math.min(tempFVal, fvalue);
+                }
             } else if (StringUtils.equals("max", value)) {
-                tempFVal = Math.max(tempFVal, fvalue);
+                if (ObjectUtils.isEmpty(tempFVal)) {
+                    tempFVal = fvalue;
+                } else {
+                    tempFVal = Math.max(tempFVal, fvalue);
+                }
             } else if (StringUtils.equals("average", value)) {
                 tempFVal += fvalue;
                 validLen++;
diff --git a/de-xpack b/de-xpack
index 7669a4307a..d72300fcc5 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit 7669a4307af32432eb22554f14b819d49c336695
+Subproject commit d72300fcc522eb25360827914057298d5f95dfff

From 4b1117fc2bae4ebe272eb357aafb7e7bda313044 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 3 Dec 2024 19:39:58 +0800
Subject: [PATCH 3/8] =?UTF-8?q?refactor(=E6=95=B0=E6=8D=AE=E5=A4=A7?=
 =?UTF-8?q?=E5=B1=8F):=20=E9=80=82=E9=85=8D=E5=A4=A7=E5=B1=8F=E7=A7=BB?=
 =?UTF-8?q?=E5=8A=A8=E7=AB=AF=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/visualization/CanvasOptBar.vue           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/core-frontend/src/components/visualization/CanvasOptBar.vue b/core/core-frontend/src/components/visualization/CanvasOptBar.vue
index ea3b5e3af2..9199b4ddf2 100644
--- a/core/core-frontend/src/components/visualization/CanvasOptBar.vue
+++ b/core/core-frontend/src/components/visualization/CanvasOptBar.vue
@@ -1,6 +1,6 @@
 <template>
   <div
-    v-if="existLinkage && !dvMainStore.mobileInPc"
+    v-if="existLinkage && (!dvMainStore.mobileInPc || isMobile())"
     class="bar-main-right"
     :class="{ 'bar-main-edit-right': dvEditMode }"
     @mousedown="handOptBarMousedown"
@@ -19,7 +19,7 @@ import { dvMainStoreWithOut } from '@/store/modules/data-visualization/dvMain'
 import { computed } from 'vue'
 import { isMainCanvas } from '@/utils/canvasUtils'
 import { useEmitt } from '@/hooks/web/useEmitt'
-
+import { isMobile } from '@/utils/utils'
 const dvMainStore = dvMainStoreWithOut()
 
 const props = defineProps({
@@ -49,7 +49,7 @@ const clearAllLinkage = () => {
 }
 
 const dvEditMode = computed(() => {
-  return dvMainStore.dvInfo.type === 'dataV' && dvMainStore.editMode === 'preview'
+  return dvMainStore.dvInfo.type === 'dataV' && dvMainStore.editMode === 'preview' && !isMobile()
 })
 const existLinkage = computed(() => {
   if (isMainCanvas(props.canvasId)) {

From a53c0d4bdb0535199ab0e9ade17a7d6dd6118dbe Mon Sep 17 00:00:00 2001
From: jianneng-fit2cloud <jianneng.pan@fit2cloud.com>
Date: Tue, 3 Dec 2024 21:38:10 +0800
Subject: [PATCH 4/8] =?UTF-8?q?fix(=E5=9B=BE=E8=A1=A8):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E6=9B=B4=E6=96=B0=E5=9B=BE=E8=A1=A8=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=AD=98=E5=9C=A8=E5=9B=BE=E8=A1=A8=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/chart/components/views/index.vue    | 67 +++++++++++++------
 1 file changed, 45 insertions(+), 22 deletions(-)

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 a7d0e15b19..deb0783458 100644
--- a/core/core-frontend/src/views/chart/components/views/index.vue
+++ b/core/core-frontend/src/views/chart/components/views/index.vue
@@ -617,6 +617,8 @@ onBeforeMount(() => {
 const listenerEnable = computed(() => {
   return !showPosition.value.includes('viewDialog')
 })
+// 存储所有数据集字段，用于判断图表拖入的字段是否存在
+const viewAllDatasetFields = new Map()
 const showEmpty = ref(false)
 const checkFieldIsAllowEmpty = (allField?) => {
   showEmpty.value = false
@@ -632,47 +634,68 @@ const checkFieldIsAllowEmpty = (allField?) => {
       return
     }
     const axisConfigMap = new Map(Object.entries(chartView.axisConfig))
-    // 验证拖入的字段是否包含在当前数据集字段中，如果一个都不在数据集字段中，则显示空图表
+    // 验证拖入的字段是否包含在当前数据集字段中，如果有一个不在数据集字段中，则显示空图表
     let includeDatasetField = false
     if (allField && allField.length > 0) {
-      axisConfigMap.forEach((value, key) => {
-        if (view.value?.[key]?.length > 0) {
-          view.value[key].forEach(item => {
-            if (!allField.find(field => field.id === item.id)) {
-              includeDatasetField = true
-              return false
-            }
-          })
-          if (includeDatasetField) {
-            return false
+      viewAllDatasetFields.set(view.value.id, allField)
+      outerLoop: for (const [key, value] of axisConfigMap) {
+        // 只判断必须的
+        if (value['allowEmpty']) continue
+        if (!view.value?.[key]?.length) continue
+        for (const item of view.value[key]) {
+          if (!allField.find(field => field.id === item.id)) {
+            includeDatasetField = true
+            break outerLoop
           }
         }
-      })
+      }
     }
     if (includeDatasetField) {
       showEmpty.value = true
       return
     }
-    axisConfigMap.forEach((value, key) => {
-      // 不允许为空,并且没限制长度
-      if (!value['allowEmpty'] && !value['limit'] && view.value?.[key]?.length === 0) {
-        showEmpty.value = true
-        return false
+    for (const [key, value] of axisConfigMap) {
+      // 跳过允许为空的配置项
+      if (value['allowEmpty']) continue
+
+      // 如果有数据集字段并且字段值存在且不为空
+      if (viewAllDatasetFields.get(view.value?.id)) {
+        if (!view.value?.[key]?.length) continue
+        // 检查图表字段是否有不在数据集中
+        for (const item of view.value[key]) {
+          if (!viewAllDatasetFields.get(view.value?.id).find(field => field.id === item.id)) {
+            includeDatasetField = true
+            break
+          }
+        }
+        // 如果有不在数据集中
+        if (includeDatasetField) {
+          showEmpty.value = true
+          break
+        }
       }
-      // 不允许为空， 限制长度
+
+      // 如果没有限制长度，且值为空，标记为空并跳出
+      if (!value['limit'] && view.value?.[key]?.length === 0) {
+        showEmpty.value = true
+        break
+      }
+
+      // 如果有限制长度，且字段长度不足，标记为空并跳出
       if (
-        !value['allowEmpty'] &&
         value['limit'] &&
         (!view.value?.[key] || view.value?.[key]?.length < parseInt(value['limit']))
       ) {
         showEmpty.value = true
-        return false
+        break
       }
+
+      // 如果是table-info类型且字段为空，标记为空并跳出
       if (view.value?.type === 'table-info' && view.value?.[key]?.length === 0) {
         showEmpty.value = true
-        return false
+        break
       }
-    })
+    }
   }
 }
 const changeChartType = () => {

From 43ea3cc08bb37a546dfb6136cbff8cd07ef0d073 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 3 Dec 2024 22:46:29 +0800
Subject: [PATCH 5/8] =?UTF-8?q?fix(=E5=9B=BE=E8=A1=A8):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E9=83=A8=E5=88=86=E5=9B=BE=E8=A1=A8=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E9=87=8D=E5=A4=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/chart/components/js/util.ts              | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/core/core-frontend/src/views/chart/components/js/util.ts b/core/core-frontend/src/views/chart/components/js/util.ts
index 27da58d6dd..faaa4aa89e 100644
--- a/core/core-frontend/src/views/chart/components/js/util.ts
+++ b/core/core-frontend/src/views/chart/components/js/util.ts
@@ -456,8 +456,12 @@ export const getGeoJsonFile = async (areaId: string): Promise<FeatureCollection>
   return toRaw(geoJson)
 }
 
-const getExcelDownloadRequest = data => {
-  const fields = JSON.parse(JSON.stringify(data.fields))
+const getExcelDownloadRequest = (data, type?) => {
+  let fields = JSON.parse(JSON.stringify(data.fields))
+  // liquid gauge 只需要导出一个字段
+  if (['gauge', 'liquid'].includes(type) && fields.length > 1) {
+    fields = fields.slice(1)
+  }
   const tableRow = JSON.parse(JSON.stringify(data.tableRow))
   const excelHeader = fields.map(item => item.chartShowName ?? item.name)
   const excelTypes = fields.map(item => item.deType)
@@ -516,7 +520,7 @@ export const exportExcelDownload = (chart, callBack?) => {
       delete request.multiInfo
     }
   } else {
-    const req = getExcelDownloadRequest(chart.data)
+    const req = getExcelDownloadRequest(chart.data, chart.type)
     request = {
       ...request,
       ...req

From 93d39e333cebf68bf42e03d2b0fa00e121ba5299 Mon Sep 17 00:00:00 2001
From: wisonic <shaochuan.wu@fit2cloud.com>
Date: Tue, 3 Dec 2024 22:45:38 +0800
Subject: [PATCH 6/8] =?UTF-8?q?fix(=E5=9B=BE=E8=A1=A8):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E6=98=8E=E7=BB=86=E8=A1=A8=E5=90=88=E5=B9=B6=E5=8D=95?=
 =?UTF-8?q?=E5=85=83=E6=A0=BC=E8=AE=A1=E7=AE=97=E9=94=99=E8=AF=AF=20#13283?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/chart/components/js/panel/common/common_table.ts    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/core-frontend/src/views/chart/components/js/panel/common/common_table.ts b/core/core-frontend/src/views/chart/components/js/panel/common/common_table.ts
index e9e69d7940..9bebf104f2 100644
--- a/core/core-frontend/src/views/chart/components/js/panel/common/common_table.ts
+++ b/core/core-frontend/src/views/chart/components/js/panel/common/common_table.ts
@@ -1505,7 +1505,7 @@ export function configMergeCells(chart: Chart, options: S2Options, dataConfig: S
                   showText: j === textIndex
                 })
               }
-              if (index === end) {
+              if (index === end && lastVal === curVal) {
                 tmpMergeCells.push({
                   colIndex: showIndex ? i + 1 : i,
                   rowIndex: index,
@@ -1513,7 +1513,7 @@ export function configMergeCells(chart: Chart, options: S2Options, dataConfig: S
                 })
               }
               mergedCellsInfo.push(tmpMergeCells)
-              curMergedColInfo.push([lastIndex, index === end ? index : index - 1])
+              curMergedColInfo.push([lastIndex, index === end && lastVal === curVal ? index : index - 1])
             }
             lastVal = curVal
             lastIndex = index

From f1b3bd9e6409998860fd0026960dfd479679427f Mon Sep 17 00:00:00 2001
From: jianneng-fit2cloud <jianneng.pan@fit2cloud.com>
Date: Tue, 3 Dec 2024 23:58:24 +0800
Subject: [PATCH 7/8] =?UTF-8?q?fix(=E5=9B=BE=E8=A1=A8):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E6=98=BE=E7=A4=BA=E6=9C=80=E5=80=BC=E5=8B=BE=E9=80=89?=
 =?UTF-8?q?=E5=90=8E=EF=BC=8C=E5=A6=82=E6=9E=9C=E5=88=87=E6=8D=A2=E5=85=B6?=
 =?UTF-8?q?=E4=BB=96=E8=A7=86=E5=9B=BE=E4=BB=8D=E7=84=B6=E4=BC=9A=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98=20#13215?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/chart/components/editor/index.vue     |  1 +
 .../src/views/chart/components/views/index.vue      | 13 +++++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/core/core-frontend/src/views/chart/components/editor/index.vue b/core/core-frontend/src/views/chart/components/editor/index.vue
index d8906e6a33..783fcadac5 100644
--- a/core/core-frontend/src/views/chart/components/editor/index.vue
+++ b/core/core-frontend/src/views/chart/components/editor/index.vue
@@ -917,6 +917,7 @@ const onTypeChange = (render, type) => {
   view.value.render = render
   view.value.type = type
   emitter.emit('chart-type-change')
+  emitter.emit('chart-type-change-' + view.value.id)
   // 处理配置项默认值，不同图表的同一配置项默认值不同
   const chartViewInstance = chartViewManager.getChartView(view.value.render, view.value.type)
   if (chartViewInstance) {
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 deb0783458..3741ac053f 100644
--- a/core/core-frontend/src/views/chart/components/views/index.vue
+++ b/core/core-frontend/src/views/chart/components/views/index.vue
@@ -54,6 +54,7 @@ import { viewFieldTimeTrans } from '@/utils/viewUtils'
 import { CHART_TYPE_CONFIGS } from '@/views/chart/components/editor/util/chart'
 import request from '@/config/axios'
 import { store } from '@/store'
+import { clearExtremum } from '@/views/chart/components/js/extremumUitl'
 
 const { wsCache } = useCache()
 const chartComponent = ref<any>()
@@ -138,8 +139,7 @@ const props = defineProps({
   }
 })
 const dynamicAreaId = ref('')
-const { view, showPosition, element, active, searchCount, scale } = toRefs(props)
-
+const { view, showPosition, element, active, searchCount, scale, suffixId } = toRefs(props)
 const titleShow = computed(() => {
   return (
     !['rich-text', 'picture-group'].includes(element.value.innerType) &&
@@ -816,6 +816,15 @@ onMounted(() => {
       initTitle()
     }
   })
+  useEmitt({
+    name: 'chart-type-change-' + view.value.id,
+    callback: () => {
+      const chart = cloneDeep(view.value)
+      chart.container =
+        'container-' + showPosition.value + '-' + view.value.id + '-' + suffixId.value
+      clearExtremum(chart)
+    }
+  })
 
   const { refreshViewEnable, refreshUnit, refreshTime } = view.value
   buildInnerRefreshTimer(refreshViewEnable, refreshUnit, refreshTime)

From fea6bcc40ca1b7adea5292516149b0383859e6cd Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Wed, 4 Dec 2024 08:38:17 +0800
Subject: [PATCH 8/8] =?UTF-8?q?refactor:=20=E5=9B=BD=E9=99=85=E5=8C=96?=
 =?UTF-8?q?=E9=80=82=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/components/de-app/AppExportForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/core-frontend/src/components/de-app/AppExportForm.vue b/core/core-frontend/src/components/de-app/AppExportForm.vue
index c318738ef9..ed4d37c19e 100644
--- a/core/core-frontend/src/components/de-app/AppExportForm.vue
+++ b/core/core-frontend/src/components/de-app/AppExportForm.vue
@@ -19,7 +19,7 @@
           <el-input
             v-model="state.form.appName"
             autocomplete="off"
-            :placeholder="t('visualization.input_name')"
+            :placeholder="t('common.input_name')"
           />
         </el-form-item>
         <el-form-item :label="t('visualization.app_version')" prop="version">