From 4f778aa9ecc40db34c11d5d1cd9a61b67d09ab07 Mon Sep 17 00:00:00 2001
From: wisonic-s <shaochuan.wu@fit2cloud.com>
Date: Tue, 24 Oct 2023 11:19:41 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BB=AA=E8=A1=A8=E7=9B=98/=E6=B0=B4?=
 =?UTF-8?q?=E6=B3=A2=E5=9B=BE=E5=8A=A8=E6=80=81=E5=80=BC=E6=97=A0=E6=95=88?=
 =?UTF-8?q?=E6=97=B6=E8=BE=B9=E6=A1=86=E6=98=BE=E7=A4=BA=E4=B8=BA=E7=BA=A2?=
 =?UTF-8?q?=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../editor-style/components/MiscSelector.vue  | 61 +++++++++++--------
 1 file changed, 34 insertions(+), 27 deletions(-)

diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/components/MiscSelector.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/components/MiscSelector.vue
index f2f10d118c..87e96ce028 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/MiscSelector.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/MiscSelector.vue
@@ -225,7 +225,7 @@ const getQuotaField = id => {
 }
 
 const isValidField = field => {
-  return field.id !== 'count' && field.deType !== 0 && field.deType !== 1 && field.deType !== 5
+  return field.id !== '-1' && state.quotaData.findIndex(ele => ele.id === field.id) !== -1
 }
 
 const showProperty = prop => props.propertyInner?.includes(prop)
@@ -310,27 +310,25 @@ onMounted(() => {
           <el-form-item class="form-item" :class="'form-item-' + themes">
             <el-select
               :effect="themes"
-              v-model="state.miscForm.gaugeMinField.id"
               :placeholder="t('chart.field')"
+              :class="{ 'invalid-field': !validMinField }"
+              v-model="state.miscForm.gaugeMinField.id"
               @change="changeQuotaField('min', true)"
             >
               <el-option
+                class="series-select-option"
                 v-for="item in state.quotaData"
                 :key="item.id"
                 :label="item.name"
                 :value="item.id"
               >
-                <span style="float: left">
-                  <el-icon>
-                    <Icon
-                      :className="`field-icon-${fieldType[item.deType]}`"
-                      :name="`field_${fieldType[item.deType]}`"
-                    ></Icon>
-                  </el-icon>
-                </span>
-                <span class="field-item">
-                  {{ item.name }}
-                </span>
+                <el-icon style="margin-right: 8px">
+                  <Icon
+                    :className="`field-icon-${fieldType[item.deType]}`"
+                    :name="`field_${fieldType[item.deType]}`"
+                  />
+                </el-icon>
+                {{ item.name }}
               </el-option>
             </el-select>
           </el-form-item>
@@ -339,8 +337,8 @@ onMounted(() => {
           <el-form-item class="form-item" :class="'form-item-' + themes">
             <el-select
               :effect="themes"
-              v-model="state.miscForm.gaugeMinField.summary"
               :placeholder="t('chart.summary')"
+              v-model="state.miscForm.gaugeMinField.summary"
               @change="changeQuotaField('min')"
             >
               <el-option v-if="validMinField" key="sum" value="sum" :label="t('chart.sum')" />
@@ -403,27 +401,25 @@ onMounted(() => {
           <el-form-item class="form-item" :class="'form-item-' + themes">
             <el-select
               :effect="themes"
-              v-model="state.miscForm.gaugeMaxField.id"
               :placeholder="t('chart.field')"
+              :class="{ 'invalid-field': !validMaxField }"
+              v-model="state.miscForm.gaugeMaxField.id"
               @change="changeQuotaField('max', true)"
             >
               <el-option
+                class="series-select-option"
                 v-for="item in state.quotaData"
                 :key="item.id"
                 :label="item.name"
                 :value="item.id"
               >
-                <span style="float: left">
-                  <el-icon>
-                    <Icon
-                      :className="`field-icon-${fieldType[item.deType]}`"
-                      :name="`field_${fieldType[item.deType]}`"
-                    ></Icon>
-                  </el-icon>
-                </span>
-                <span class="field-item">
-                  {{ item.name }}
-                </span>
+                <el-icon style="margin-right: 8px">
+                  <Icon
+                    :className="`field-icon-${fieldType[item.deType]}`"
+                    :name="`field_${fieldType[item.deType]}`"
+                  />
+                </el-icon>
+                {{ item.name }}
               </el-option>
             </el-select>
           </el-form-item>
@@ -547,8 +543,9 @@ onMounted(() => {
           <el-form-item class="form-item" :class="'form-item-' + themes">
             <el-select
               :effect="themes"
-              v-model="state.miscForm.liquidMaxField.id"
               :placeholder="t('chart.field')"
+              :class="{ 'invalid-field': !validLiquidMaxField }"
+              v-model="state.miscForm.liquidMaxField.id"
               @change="changeQuotaField('max', true)"
             >
               <el-option
@@ -875,22 +872,32 @@ onMounted(() => {
     flex-direction: row;
     justify-content: space-between;
   }
+
   :deep(.dynamic-item) {
     width: 100px !important;
   }
 }
+
 .field-item {
   float: left;
   color: #8492a6;
   font-size: 12px;
 }
+
 .margin-bottom-8 {
   margin-bottom: 8px !important;
 }
+
 .series-select-option {
   display: flex;
   align-items: center;
   justify-content: start;
   padding: 0 11px;
 }
+
+.invalid-field {
+  ::v-deep(.ed-input__wrapper) {
+    box-shadow: 0 0 0 1px rgb(245, 74, 69) inset !important;
+  }
+}
 </style>