From 46f79b491173d284a4900d19e7aecf7509481438 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 21 一月 2022 17:21:25 +0800
Subject: [PATCH] 2022-01-21
---
src/menu/datasource/verifycard/settingform/index.jsx | 31 ++++---------------------------
1 files changed, 4 insertions(+), 27 deletions(-)
diff --git a/src/menu/datasource/verifycard/settingform/index.jsx b/src/menu/datasource/verifycard/settingform/index.jsx
index 4d61040..fe0d88c 100644
--- a/src/menu/datasource/verifycard/settingform/index.jsx
+++ b/src/menu/datasource/verifycard/settingform/index.jsx
@@ -14,7 +14,6 @@
class SettingForm extends Component {
static propTpyes = {
dict: PropTypes.object, // 瀛楀吀椤�
- menu: PropTypes.any, // 鑿滃崟閰嶇疆淇℃伅
config: PropTypes.object, // 缁勪欢閰嶇疆
setting: PropTypes.object, // 鏁版嵁婧愰厤缃�
modules: PropTypes.array, // 鍙粦瀹氱殑涓婄骇缁勪欢
@@ -32,9 +31,9 @@
}
UNSAFE_componentWillMount () {
- const { menu, config } = this.props
+ const { config } = this.props
- let modules = MenuUtils.getSupModules(menu.components, config.uuid) || []
+ let modules = MenuUtils.getSupModules(window.GLOB.customMenu.components, config.uuid) || []
modules.unshift({
value: 'empty',
@@ -228,28 +227,6 @@
</Radio.Group>)}
</Form.Item>
</Col> : null}
- {interType === 'system' ? <Col span={8}>
- <Form.Item label={
- <Tooltip placement="topLeft" title={'鑷畾涔夎剼鏈腑鐨勫彉閲忥紙闄ゆ姤閿欏強鍙敤瀛楁澶栵級锛岄渶浠ユ鏍囪瘑寮�澶淬��'}>
- <QuestionCircleOutlined className="mk-form-tip" />
- 鍙橀噺鏍囪瘑
- </Tooltip>
- }>
- {getFieldDecorator('varMark', {
- initialValue: setting.varMark || '',
- rules: [
- {
- pattern: /^[a-zA-Z_]*$/ig,
- message: '璇蜂娇鐢ㄥ瓧姣嶆垨_'
- },
- {
- max: 3,
- message: '鏈�澶氫笁涓瓧绗︺��'
- }
- ]
- })(<Input placeholder={''} autoComplete="off" />)}
- </Form.Item>
- </Col> : null}
{interType === 'inner' ? <Col span={8}>
<Form.Item label={tooltip ?
<Tooltip placement="topLeft" title={tooltip}>
@@ -371,7 +348,7 @@
</Radio.Group>)}
</Form.Item>
</Col> : null}
- {!['navbar', 'balcony', 'menubar'].includes(config.type) ? <Col span={8}>
+ {!['navbar', 'balcony', 'menubar'].includes(config.type) && (!config.wrap || config.wrap.supType !== 'multi') ? <Col span={8}>
<Form.Item label={
<Tooltip placement="topLeft" title={'璇ョ粍浠跺鏋滃彈鍏朵粬缁勪欢鎺у埗锛岃閫夐」鐩稿簲鐨勭粍浠讹紝娌℃湁鏃堕�夆�滄棤鈥濄��'}>
<QuestionCircleOutlined className="mk-form-tip" />
@@ -422,7 +399,7 @@
</Form.Item>
</Col> : null}
{/* 1銆佷笉鍒嗛〉涓斾笉瀛樺湪涓婄骇妯″潡 */}
- {!['navbar', 'menubar'].includes(config.type) && (!config.pageable || (config.pageable && laypage === 'false')) && (!supModule || supModule.length === 0 || supModule[0] === 'empty') ? <Col span={8}>
+ {!['navbar'].includes(config.type) && (!config.pageable || (config.pageable && laypage === 'false')) && (!supModule || supModule.length === 0 || supModule[0] === 'empty') ? <Col span={8}>
<Form.Item label={
<Tooltip placement="topLeft" title={'鍒濆鍖栧姞杞芥椂锛屾槸鍚︿笌鍏朵粬缁勪欢涓�鍚屽姞杞芥暟鎹紝娉細浠呭湪浣跨敤绯荤粺鍑芥暟锛屼笖鍒濆鍖栧姞杞芥暟鎹椂鏈夋晥锛屽垎椤佃姹傛椂鏃犳晥銆�'}>
<QuestionCircleOutlined className="mk-form-tip" />
--
Gitblit v1.8.0