From 7673d7198ee1e242bf3ef94fac2b5da4e4399e94 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Wed, 12 Feb 2025 11:13:00 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E9=9B=86):=20=E5=88=86?=
 =?UTF-8?q?=E7=BB=84=E5=AD=97=E6=AE=B5=E5=BC=B9=E7=AA=97=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E6=98=BE=E7=A4=BA=E4=B8=8D=E6=AD=A3=E7=A1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data/dataset/form/FieldMore.vue           | 10 ++++-
 .../visualized/data/dataset/form/index.vue    | 45 ++++++++++++++++---
 2 files changed, 48 insertions(+), 7 deletions(-)

diff --git a/core/core-frontend/src/views/visualized/data/dataset/form/FieldMore.vue b/core/core-frontend/src/views/visualized/data/dataset/form/FieldMore.vue
index 1a86a7ae0b..5f2f8dce86 100644
--- a/core/core-frontend/src/views/visualized/data/dataset/form/FieldMore.vue
+++ b/core/core-frontend/src/views/visualized/data/dataset/form/FieldMore.vue
@@ -146,7 +146,11 @@ const handleChange = () => {
 <template>
   <el-popover
     :popper-class="
-      options.length === 6 ? 'menu-more_popper_one menu-more_popper_six' : 'menu-more_popper_one'
+      options.length === 6
+        ? 'menu-more_popper_one menu-more_popper_six'
+        : extField === 3
+        ? 'menu-more_popper_one menu-more_popper_three'
+        : 'menu-more_popper_one'
     "
     :persistent="false"
     ref="popover"
@@ -206,6 +210,10 @@ const handleChange = () => {
 .menu-more_popper_six > :first-child > :first-child > :first-child {
   height: 210px;
 }
+
+.menu-more_popper_three > :first-child > :first-child > :first-child {
+  height: 145px;
+}
 .menu-more_popper_one {
   padding: 0 !important;
   background: transparent !important;
diff --git a/core/core-frontend/src/views/visualized/data/dataset/form/index.vue b/core/core-frontend/src/views/visualized/data/dataset/form/index.vue
index 61335a8ba3..bc238f983b 100644
--- a/core/core-frontend/src/views/visualized/data/dataset/form/index.vue
+++ b/core/core-frontend/src/views/visualized/data/dataset/form/index.vue
@@ -1202,6 +1202,34 @@ const addGroupFields = () => {
   })
 }
 
+const handleChangeGroupList = () => {
+  let result = false
+  currentGroupField.groupList.forEach(ele => {
+    const { name, text = [], time, min, max } = ele
+    if (!result) {
+      switch (currentGroupField.deTypeOrigin) {
+        case 0:
+          result = !name || !text.length
+          break
+        case 1:
+          result = !name || !time.length
+          break
+        case 2:
+        case 3:
+        case 4:
+          result = !name || min === null || max === null
+          break
+        default:
+          break
+      }
+    }
+  })
+  console.log(result, 'result')
+  if (currentGroupField.name && !result) {
+    ruleGroupFieldRef.value.validate()
+  }
+}
+
 const removeGroupFields = index => {
   currentGroupField.groupList.splice(index, 1)
 }
@@ -2619,11 +2647,13 @@ const getDsIconName = data => {
                 style="width: 278px"
                 :validate-event="false"
                 v-model="item.name"
+                @change="handleChangeGroupList"
                 :placeholder="t('common.inputText')"
               />
               <el-select
                 v-if="[0, null].includes(currentGroupField.deTypeOrigin)"
                 style="flex: 1; margin-left: 24px"
+                @change="handleChangeGroupList"
                 multiple
                 collapse-tags
                 :validate-event="false"
@@ -2640,6 +2670,7 @@ const getDsIconName = data => {
                 <el-input-number
                   :placeholder="t('dataset.please_enter_number')"
                   v-model="item.min"
+                  @change="handleChangeGroupList"
                   :validate-event="false"
                   controls-position="right"
                 />
@@ -2654,12 +2685,6 @@ const getDsIconName = data => {
                 <div :title="currentGroupField.title" class="name ellipsis">
                   {{ currentGroupField.title }}
                 </div>
-                <el-input-number
-                  :placeholder="t('dataset.please_enter_number')"
-                  v-model="item.max"
-                  :validate-event="false"
-                  controls-position="right"
-                />
                 <el-select v-model="item.maxTerm">
                   <el-option
                     v-for="item in equalMin"
@@ -2668,6 +2693,13 @@ const getDsIconName = data => {
                     :value="item.value"
                   />
                 </el-select>
+                <el-input-number
+                  :placeholder="t('dataset.please_enter_number')"
+                  v-model="item.max"
+                  @change="handleChangeGroupList"
+                  :validate-event="false"
+                  controls-position="right"
+                />
               </div>
               <div
                 class="group-fields_num"
@@ -2677,6 +2709,7 @@ const getDsIconName = data => {
                   :end-placeholder="t('commons.date.end_date')"
                   :start-placeholder="t('commons.date.start_date')"
                   :validate-event="false"
+                  @change="handleChangeGroupList"
                   v-model="item.time"
                   type="daterange"
                 />