From 761b4c9a11ba8503d3232551d1905bf53eabc406 Mon Sep 17 00:00:00 2001
From: jianneng-fit2cloud <jianneng.pan@fit2cloud.com>
Date: Wed, 9 Oct 2024 14:41:00 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=9B=BE=E8=A1=A8):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E6=A0=B7=E5=BC=8F=E6=9D=A1=E4=BB=B6=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E5=8A=A8=E6=80=81=E5=80=BC=E6=97=B6=EF=BC=8C=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E5=AD=97=E6=AE=B5=E8=A2=AB=E6=B8=85=E7=A9=BA=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/dialog/TableThresholdEdit.vue  | 23 ++++++++-----------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/core/core-frontend/src/views/chart/components/editor/editor-senior/components/dialog/TableThresholdEdit.vue b/core/core-frontend/src/views/chart/components/editor/editor-senior/components/dialog/TableThresholdEdit.vue
index dc4a514edb..5f3b6829f4 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-senior/components/dialog/TableThresholdEdit.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-senior/components/dialog/TableThresholdEdit.vue
@@ -185,12 +185,13 @@ const init = () => {
   state.thresholdArr = JSON.parse(JSON.stringify(props.threshold)) as TableThreshold[]
   initFields()
 }
-const initOptions = item => {
-  if (item.field) {
-    if ([0, 5, 7].includes(item.field.deType)) {
+const initOptions = (item, fieldObj) => {
+  if (fieldObj) {
+    if ([0, 5, 7].includes(fieldObj.deType)) {
       item.options = JSON.parse(JSON.stringify(textOptions))
-    } else if (item.field.deType === 1) {
+    } else if (fieldObj.deType === 1) {
       item.options = JSON.parse(JSON.stringify(dateOptions))
+      item.type = 'fixed'
     } else {
       item.options = JSON.parse(JSON.stringify(valueOptions))
     }
@@ -250,19 +251,19 @@ const addField = item => {
     state.fields.forEach(ele => {
       if (item.fieldId === ele.id) {
         item.field = JSON.parse(JSON.stringify(ele))
-        initOptions(item)
+        initOptions(item, item.field)
       }
       if (item.dynamicField?.fieldId === ele.id) {
         item.dynamicField.field = JSON.parse(JSON.stringify(ele))
-        initOptions(item)
+        initOptions(item, item.dynamicField.field)
       }
       if (item.dynamicMinField?.fieldId === ele.id) {
         item.dynamicMinField.field = JSON.parse(JSON.stringify(ele))
-        initOptions(item)
+        initOptions(item, item.dynamicMinField.field)
       }
       if (item.dynamicMaxField?.fieldId === ele.id) {
         item.dynamicMaxField.field = JSON.parse(JSON.stringify(ele))
-        initOptions(item)
+        initOptions(item, item.dynamicMaxField.field)
       }
     })
   }
@@ -294,12 +295,9 @@ const dynamicSummaryOptions = [
 
 const getConditionsFields = (fieldItem, conditionItem, conditionItemField) => {
   const fieldItemDeType = state.fields.filter(ele => ele.id === fieldItem.fieldId)?.[0]?.deType
-  if (!fieldItemDeType) {
-    fieldItem.fieldId = null
+  if (fieldItemDeType === undefined || fieldItemDeType === null) {
     conditionItem.fieldId = null
     conditionItemField.fieldId = null
-    changeThreshold()
-    return state.fields
   }
   const result = state.fields.filter(item => item.deType === fieldItemDeType) ?? []
   if (!result.find(ele => ele.id === conditionItemField.fieldId)) {
@@ -343,7 +341,6 @@ const changeConditionItemType = item => {
     item.dynamicMinField.summary = 'value'
     item.dynamicMaxField.summary = 'value'
   }
-  changeThreshold()
 }
 const getFieldOptions = fieldItem => {
   const deType = state.fields.filter(ele => ele.id === fieldItem.fieldId)?.[0]?.deType