From cf83be61fa551f9907377af31e0896f67ee610c4 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 15 七月 2024 19:45:46 +0800
Subject: [PATCH] Merge branch 'master' into positec

---
 src/templates/comtableconfig/updatetable/index.jsx |   34 ++++++++++++++++++++++++++++++++++
 1 files changed, 34 insertions(+), 0 deletions(-)

diff --git a/src/templates/comtableconfig/updatetable/index.jsx b/src/templates/comtableconfig/updatetable/index.jsx
index ed03667..c1a3d21 100644
--- a/src/templates/comtableconfig/updatetable/index.jsx
+++ b/src/templates/comtableconfig/updatetable/index.jsx
@@ -429,6 +429,40 @@
   
                 if (_LongParam) {
                   _LongParam.uuid = item.uuid
+
+                  if (_LongParam.fields && _LongParam.fields.length === 0 && _LongParam.groups && _LongParam.groups.length > 0) {
+                    _LongParam.groups.forEach(group => {
+                      if (group.sublist && group.sublist.length > 0) {
+                        _LongParam.fields.push({
+                          uuid: Utils.getuuid(),
+                          label: group.label,
+                          field: '',
+                          type: 'split'
+                        })
+                        _LongParam.fields.push(...group.sublist)
+                      }
+                    })
+                  }
+
+                  let span = _LongParam.setting && _LongParam.setting.cols ? (24 / _LongParam.setting.cols) : 12
+                  if (![24, 12, 8].includes(span)) {
+                    span = 12
+                  }
+
+                  if (_LongParam.fields) {
+                    _LongParam.fields = _LongParam.fields.map(n => {
+                      if (!n.span && n.type !== 'split') {
+                        if (['textarea', 'hint', 'checkcard', 'brafteditor'].includes(n.type)) {
+                          n.span = 24
+                        } else {
+                          n.span = span
+                        }
+                      }
+
+                      return n
+                    })
+                  }
+
                   resolve(_LongParam)
                 } else {
                   resolve({uuid: item.uuid, $empty: true})

--
Gitblit v1.8.0