From e4aaf0ddd0c102c992b87967dee6f0c7c439d630 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Thu, 19 Sep 2024 11:31:30 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E5=9B=BE=E8=A1=A8):=20=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E7=BB=84=E9=BB=98=E8=AE=A4=E5=B1=95=E7=A4=BA=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/custom-component/picture-group/Attr.vue        |  5 ++---
 .../src/custom-component/picture-group/Component.vue   | 10 ++++++++--
 .../editor/editor-senior/components/Threshold.vue      |  2 ++
 .../components/dialog/PictureGroupThresholdEdit.vue    |  3 ++-
 .../components/js/panel/charts/others/picture-group.ts | 10 ++--------
 5 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/core/core-frontend/src/custom-component/picture-group/Attr.vue b/core/core-frontend/src/custom-component/picture-group/Attr.vue
index 156bae32ff..edc64b1053 100644
--- a/core/core-frontend/src/custom-component/picture-group/Attr.vue
+++ b/core/core-frontend/src/custom-component/picture-group/Attr.vue
@@ -177,11 +177,10 @@ onBeforeUnmount(() => {
     <el-row class="pic-adaptor">
       <el-form-item
         v-if="curComponent.style.adaptation"
-        class="form-item"
+        class="form-item form-item-custom"
         label="图片适应方式"
         size="small"
         :effect="themes"
-        :class="'form-item-' + themes"
       >
         <el-radio-group
           size="small"
@@ -309,7 +308,7 @@ onBeforeUnmount(() => {
   }
 }
 
-.form-item-dark {
+.form-item-custom {
   .ed-radio {
     margin-right: 4px !important;
   }
diff --git a/core/core-frontend/src/custom-component/picture-group/Component.vue b/core/core-frontend/src/custom-component/picture-group/Component.vue
index e298305ce0..1b43374342 100644
--- a/core/core-frontend/src/custom-component/picture-group/Component.vue
+++ b/core/core-frontend/src/custom-component/picture-group/Component.vue
@@ -107,6 +107,7 @@ const initCurFields = chartDetails => {
 }
 
 const conditionAdaptor = (chart: Chart) => {
+  state.showUrl = null
   if (!chart || !chart.senior) {
     return
   }
@@ -118,7 +119,7 @@ const conditionAdaptor = (chart: Chart) => {
   if (conditions?.length > 0) {
     for (let i = 0; i < conditions.length; i++) {
       const field = conditions[i]
-      let defaultValueColor = 'none'
+      let defaultValueColor = null
       const checkResult = mappingColor(
         dataRowNameSelect.value[field.field.name],
         defaultValueColor,
@@ -139,8 +140,13 @@ const withInit = () => {
 }
 
 const calcData = (view: Chart, callback) => {
-  console.log('===calcData1')
   isError.value = false
+  const { threshold } = parseJson(view.senior)
+  if (!threshold.enable) {
+    withInit()
+    callback?.()
+    return
+  }
   if (view.tableId || view['dataFrom'] === 'template') {
     const v = JSON.parse(JSON.stringify(view))
     getData(v)
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 bf498d50c7..08cd6f84b8 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
@@ -575,11 +575,13 @@ init()
                 <span v-else-if="item.term === 'not_empty'" :title="t('chart.filter_not_empty')">
                   {{ t('chart.filter_not_empty') }}
                 </span>
+                <span v-else-if="item.term === 'default'" title="默认"> 默认 </span>
               </div>
               <div style="flex: 1; margin: 0 8px">
                 <span
                   v-if="
                     !item.term.includes('null') &&
+                    !item.term.includes('default') &&
                     !item.term.includes('empty') &&
                     item.term !== 'between'
                   "
diff --git a/core/core-frontend/src/views/chart/components/editor/editor-senior/components/dialog/PictureGroupThresholdEdit.vue b/core/core-frontend/src/views/chart/components/editor/editor-senior/components/dialog/PictureGroupThresholdEdit.vue
index 95079d2d06..a369b1d1df 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-senior/components/dialog/PictureGroupThresholdEdit.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-senior/components/dialog/PictureGroupThresholdEdit.vue
@@ -366,7 +366,8 @@ init()
               v-if="
                 !item.term.includes('null') &&
                 !item.term.includes('empty') &&
-                item.term !== 'between'
+                item.term !== 'between' &&
+                !item.term.includes('default')
               "
               :span="10"
               style="text-align: center"
diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/others/picture-group.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/others/picture-group.ts
index 0679e1e868..88e05ab251 100644
--- a/core/core-frontend/src/views/chart/components/js/panel/charts/others/picture-group.ts
+++ b/core/core-frontend/src/views/chart/components/js/panel/charts/others/picture-group.ts
@@ -6,17 +6,11 @@ const { t } = useI18n()
  * 图片组图表
  */
 export class PictureGroupView extends AbstractChartView {
-  properties: EditorProperty[] = [
-    'background-overall-component',
-    'border-style',
-    'threshold',
-    'function-cfg'
-  ]
+  properties: EditorProperty[] = ['background-overall-component', 'border-style', 'threshold']
   propertyInner: EditorPropertyInner = {
     'background-overall-component': ['all'],
     'border-style': ['all'],
-    threshold: ['tableThreshold'],
-    'function-cfg': ['emptyDataStrategy']
+    threshold: ['tableThreshold']
   }
   axis: AxisType[] = ['xAxis', 'yAxis', 'filter']
   axisConfig: AxisConfig = {