From 35f51aad9824b55bbe67c0fb21bd3d3d24381c2f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 16 七月 2023 21:42:33 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/form/simple-form/index.jsx | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/src/menu/components/form/simple-form/index.jsx b/src/menu/components/form/simple-form/index.jsx
index 5c012de..f113cc2 100644
--- a/src/menu/components/form/simple-form/index.jsx
+++ b/src/menu/components/form/simple-form/index.jsx
@@ -69,7 +69,7 @@
scripts: [],
subcards: [{
uuid: Utils.getuuid(),
- setting: {title: '绌�', align: 'left_right', enable: 'true'},
+ setting: {title: '', align: 'left_right', enable: 'true'},
style: {},
fields: [],
subButton: {label: '鎻愪氦', type: 'submit', intertype: 'system', reload: 'false', sqlType: 'update', sql: '', Ot: 'notRequired', execSuccess: 'never', enable: 'true', style: {backgroundColor: '#1890ff', color: '#ffffff', paddingLeft: '25px', paddingRight: '25px', paddingTop: '5px', paddingBottom: '5px'}},
@@ -344,6 +344,8 @@
index = i
}
+ if (!item.field) return
+
if (['text', 'number', 'textarea', 'color'].includes(item.type) && _item.field !== item.field) {
_inputfields.push({
field: item.field,
@@ -364,18 +366,21 @@
})
}
- if (!['select', 'link', 'radio', 'checkcard'].includes(item.type)) return
- if (item.type === 'checkcard' && item.multiple === 'true') return // 閫夐」鍗″閫�
- if (item.field && !uniq.has(item.field)) {
+ if (!['select', 'link', 'radio', 'checkcard', 'multiselect'].includes(item.type)) return
+
+ _linksupFields.push({
+ field: item.field,
+ label: item.label
+ })
+
+ if (item.type === 'multiselect' || (item.type === 'checkcard' && item.multiple === 'true')) return
+
+ if (!uniq.has(item.field)) {
uniq.set(item.field, true)
_linkableFields.push({
field: item.field,
label: item.label + '-琛ㄥ崟'
- })
- _linksupFields.push({
- field: item.field,
- label: item.label
})
}
})
--
Gitblit v1.8.0