From 639939790fa36dd8689d837c3f9348181abd1b04 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Fri, 7 Feb 2025 10:43:03 +0800
Subject: [PATCH] =?UTF-8?q?fix(=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

---
 .../visualized/data/dataset/form/index.vue    | 28 +++++++++++++++----
 1 file changed, 23 insertions(+), 5 deletions(-)

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 b2f5058f4a..2dcb09fef5 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
@@ -394,7 +394,11 @@ const handleFieldMore = (ele, type) => {
   }
   switch (type) {
     case 'copy':
-      copyField(ele)
+      if (ele.extField === 3) {
+        copyGroupField(ele)
+      } else {
+        copyField(ele)
+      }
       break
     case 'delete':
       deleteField(ele)
@@ -452,6 +456,16 @@ const copyField = item => {
   allfields.value.splice(index + 1, 0, param)
 }
 
+const selectable = row => ![3].includes(row.extField)
+
+const copyGroupField = item => {
+  const param = cloneDeep(item)
+  param.id = guid()
+  param.name = getFieldName(dimensions.value.concat(quota.value), item.name)
+  const index = allfields.value.findIndex(ele => ele.id === item.id)
+  allfields.value.splice(index + 1, 0, param)
+}
+
 const delFieldById = arr => {
   const delId = [...arr]
   while (delId.length) {
@@ -1085,12 +1099,14 @@ const initGroupField = val => {
   Object.assign(currentGroupField, val)
   const groupList = []
   val.groupList.forEach(ele => {
-    const { name, text = [], startTime, endTime, min, max } = ele
+    const { name, text = [], startTime, endTime, min, max, minTerm, maxTerm } = ele
     const obj = {
       name,
       text,
       min,
       max,
+      minTerm,
+      maxTerm,
       time: []
     }
     if (currentGroupField.deTypeOrigin === 1) {
@@ -1108,12 +1124,14 @@ const confirmGroupField = () => {
     if (val) {
       const groupList = []
       currentGroupField.groupList.forEach(ele => {
-        const { name, text = [], time, min, max } = ele
+        const { name, text = [], time, min, max, minTerm, maxTerm } = ele
         const obj = {
           name,
           text,
           min,
           max,
+          minTerm,
+          maxTerm,
           startTime: '',
           endTime: ''
         }
@@ -1978,7 +1996,7 @@ const getDsIconName = data => {
                     :height="quotaTableHeight"
                     style="width: 100%"
                   >
-                    <el-table-column type="selection" width="40" />
+                    <el-table-column :selectable="selectable" type="selection" width="40" />
                     <el-table-column prop="name" :label="t('dataset.field_name')" width="264">
                       <template #default="scope">
                         <div class="column-style">
@@ -2138,7 +2156,7 @@ const getDsIconName = data => {
                         <el-tooltip effect="dark" :content="t('dataset.edit')" placement="top">
                           <template #default>
                             <el-button
-                              v-if="scope.row.extField === 2"
+                              v-if="[2, 3].includes(scope.row.extField)"
                               text
                               @click="handleFieldMore(scope.row, 'editor')"
                             >