From 8d5f915fafd0cbbb1996372b4fdbc060d9b2eaff Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Fri, 7 Feb 2025 14:40:25 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=95=B0=E6=8D=AE=E9=9B=86):=20=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=9B=86=E5=A2=9E=E5=8A=A0=E5=88=86=E7=BB=84=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../v-query/QueryConditionConfiguration.vue   |  2 +-
 .../visualized/data/dataset/form/index.vue    | 24 ++++++++++++-------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
index 8c14264f33..5696b8832c 100644
--- a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
+++ b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
@@ -2934,7 +2934,7 @@ defineExpose({
                       </el-option>
                     </el-select>
                   </div>
-                  <div class="value flex-align-center">
+                  <div style="display: flex; align-items: center" class="value">
                     <span :title="t('v_query.display_field')" class="label ellipsis">{{
                       t('v_query.display_field')
                     }}</span>
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 2dcb09fef5..ffd9af0431 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
@@ -480,7 +480,7 @@ const delFieldById = arr => {
     }, [])
     const allfieldsId = allfields.value.map(ele => ele.id).concat(paramsId)
     allfields.value = allfields.value.filter(ele => {
-      if (ele.extField !== 2) return true
+      if (![2, 3].includes(ele.extField)) return true
       const idMap = ele.originName.match(/\[(.+?)\]/g)
       if (!idMap) return true
       const result = idMap.every(itm => {
@@ -503,7 +503,7 @@ const delFieldByIdFake = (arr, fakeAllfields) => {
     fakeAllfields = fakeAllfields.filter(ele => ele.id !== targetId)
     const allfieldsId = fakeAllfields.map(ele => ele.id)
     fakeAllfields = fakeAllfields.filter(ele => {
-      if (ele.extField !== 2) return true
+      if (![2, 3].includes(ele.extField)) return true
       const idMap = ele.originName.match(/\[(.+?)\]/g)
       if (
         !idMap ||
@@ -527,7 +527,7 @@ const delFieldByIdFake = (arr, fakeAllfields) => {
 const deleteField = item => {
   let tip = ''
   const idArr = allfields.value.reduce((pre, next) => {
-    if (next.extField !== 2) return pre
+    if (![2, 3].includes(next.extField)) return pre
     let idMap = next.originName.match(/\[(.+?)\]/g) || []
     idMap = idMap.filter(itx => !next.params?.map(element => element.id).includes(itx.slice(1, -1)))
     const result = idMap.map(itm => {
@@ -855,8 +855,10 @@ const dfsFields = (arr, list) => {
 const getDelIdArr = (newArr, oldArr) => {
   const idMapNew = newArr.map(ele => ele.id)
   return [
-    ...oldArr.filter(ele => ele.extField !== 2).filter(ele => !idMapNew.includes(ele.id)),
-    ...oldArr.filter(ele => ele.extField === 2)
+    ...oldArr
+      .filter(ele => ![2, 3].includes(ele.extField))
+      .filter(ele => !idMapNew.includes(ele.id)),
+    ...oldArr.filter(ele => [2, 3].includes(ele.extField))
   ]
 }
 
@@ -865,7 +867,7 @@ const diffArr = (newArr, oldArr) => {
   const idMapOld = oldArr.map(ele => ele.id)
   const arr = newArr.filter(ele => !idMapOld.includes(ele.id))
   return cloneDeep([
-    ...oldArr.filter(ele => ele.extField === 2),
+    ...oldArr.filter(ele => [2, 3].includes(ele.extField)),
     ...arr,
     ...oldArr.filter(ele => idMapNew.includes(ele.id))
   ])
@@ -955,7 +957,7 @@ const confirmEditUnion = () => {
       cancelButtonText: t('common.cancel'),
       showCancelButton: true,
       tip: `${t('data_set.field')}: ${allfields.value
-        .filter(ele => [...new Set(idArr)].includes(ele.id) && ele.extField !== 2)
+        .filter(ele => [...new Set(idArr)].includes(ele.id) && ![2, 3].includes(ele.extField))
         .map(ele => ele.name)
         .join(',')}, ${t('data_set.confirm_the_deletion')}`,
       confirmButtonType: 'danger',
@@ -1029,7 +1031,8 @@ const fieldGroupRules = {
   name: [{ required: true, message: t('dataset.input_edit_name'), trigger: 'blur' }],
   groupList: [{ validator: validatePass }]
 }
-const currentGroupField = reactive({
+
+const defaultObj = {
   name: '',
   id: +new Date(),
   datasourceId: '',
@@ -1054,7 +1057,8 @@ const currentGroupField = reactive({
       max: null
     }
   ]
-})
+}
+const currentGroupField = reactive(cloneDeep(defaultObj))
 const ruleGroupFieldRef = ref()
 const editGroupField = ref(false)
 const enumValueLoading = ref(false)
@@ -1062,6 +1066,8 @@ const groupFields = shallowRef([])
 const enumValue = shallowRef([])
 const addGroupField = () => {
   groupFields.value = allfields.value.filter(ele => ![2, 3].includes(ele.extField))
+  Object.assign(currentGroupField, cloneDeep(defaultObj))
+  currentGroupField.id = guid()
   editGroupField.value = true
 }
 const handleFieldschange = val => {