From 2ae980243b7ad705dea575eadcfc4cf4e24073bd Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 17 五月 2022 22:57:19 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/form/normal-form/index.jsx | 35 ++++++++++++++++-------------------
1 files changed, 16 insertions(+), 19 deletions(-)
diff --git a/src/menu/components/form/normal-form/index.jsx b/src/menu/components/form/normal-form/index.jsx
index 7635452..e10544c 100644
--- a/src/menu/components/form/normal-form/index.jsx
+++ b/src/menu/components/form/normal-form/index.jsx
@@ -461,35 +461,31 @@
index = i
}
+ let label = item.label || ''
+ if (item.field && item.field.toLowerCase() !== label.toLowerCase()) {
+ label = label + ' (' + item.field + ')'
+ }
+
if (['text', 'number', 'textarea', 'color'].includes(item.type) && _item.field !== item.field) {
_inputfields.push({
field: item.field,
- label: _inputIndex + '銆�' + item.label
+ label: _inputIndex + '銆�' + label
})
_inputIndex++
}
- if (appType === 'mob') {
- if (_form.field !== item.field && item.hidden !== 'true' && ['text', 'number'].includes(item.type)) {
- _tabfields.push({
- field: item.field,
- label: _tabIndex + '銆�' + item.label
- })
- _tabIndex++
- }
- } else {
- if (_form.field !== item.field && item.hidden !== 'true' && ['text', 'number', 'select', 'link'].includes(item.type)) {
- _tabfields.push({
- field: item.field,
- label: _tabIndex + '銆�' + item.label
- })
- _tabIndex++
- }
+
+ if (_item.field !== item.field && item.hidden !== 'true' && ['text', 'number', 'select', 'link'].includes(item.type)) {
+ _tabfields.push({
+ field: item.field,
+ label: _tabIndex + '銆�' + label
+ })
+ _tabIndex++
}
if (item.type === 'switch') {
_linksupFields.push({
field: item.field,
- label: _linkIndex + '銆�' + item.label
+ label: _linkIndex + '銆�' + label
})
}
@@ -504,7 +500,7 @@
})
_linksupFields.push({
field: item.field,
- label: _linkIndex + '銆�' + item.label
+ label: _linkIndex + '銆�' + label
})
_linkIndex++
}
@@ -735,6 +731,7 @@
/>}
<FormAction config={card} group={group} updateconfig={this.updateGroup}/>
</div> : null}
+ <div className="component-name"><div className="center">{card.name}</div></div>
<Modal
title={this.state.dict['model.edit']}
visible={this.state.visible}
--
Gitblit v1.8.0