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/modalconfig/index.jsx | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/src/menu/modalconfig/index.jsx b/src/menu/modalconfig/index.jsx
index c58d00f..2d63246 100644
--- a/src/menu/modalconfig/index.jsx
+++ b/src/menu/modalconfig/index.jsx
@@ -4,7 +4,8 @@
import { DndProvider } from 'react-dnd'
import HTML5Backend from 'react-dnd-html5-backend'
import moment from 'moment'
-import { Button, Card, Modal, Collapse, notification, Icon, Switch } from 'antd'
+import { Button, Card, Modal, Collapse, notification, Switch } from 'antd'
+import { SettingOutlined } from '@ant-design/icons'
import Api from '@/api'
import Utils from '@/utils/utils.js'
@@ -113,10 +114,7 @@
let _inputfields = []
let _tabfields = []
let _linkableFields = []
- let _linksupFields = [{
- field: '',
- label: '绌�'
- }]
+ let _linksupFields = []
let standardform = null
let uniq = new Map()
@@ -146,7 +144,15 @@
_tabIndex++
}
+ if (item.type === 'switch') {
+ _linksupFields.push({
+ field: item.field,
+ label: _linkIndex + '銆�' + item.label
+ })
+ }
+
if (!['select', 'link', 'radio', 'checkcard'].includes(item.type)) return
+ if (item.type === 'checkcard' && item.multiple === 'true') return // 閫夐」鍗″閫�
if (item.field && !uniq.has(item.field)) {
uniq.set(item.field, true)
@@ -463,16 +469,16 @@
</Collapse>
</div>
<div className="setting">
- <Card title={dict['header.menu.form.configurable']} bordered={false} extra={
+ <Card title="琛ㄥ崟閰嶇疆" bordered={false} extra={
<div>
<Button type="danger" onClick={this.clearConfig}>娓呯┖</Button>
<EditComponent dict={dict} options={['form']} config={this.state.config} plusFields={this.plusFields}/>
- <Button type="primary" loading={saving} onClick={this.submitConfig}>淇濆瓨</Button>
+ <Button type="primary" id="save-modal-config" loading={saving} onClick={this.submitConfig}>淇濆瓨</Button>
<Button onClick={this.cancelConfig}>杩斿洖</Button>
</div>
} style={{ width: '100%' }}>
- <Icon type="setting" onClick={this.changeSetting} />
- <div className="ant-modal-content" style={{width: config.setting.width + '%'}}>
+ <SettingOutlined onClick={this.changeSetting} />
+ <div className="ant-modal-content" style={{width: config.setting.width > 100 ? config.setting.width : config.setting.width + '%'}}>
<div className="ant-modal-header">
<div className="ant-modal-title">{config.setting.title}</div>
<Button className="mk-cols-change" onClick={() => this.changecols(1)}>1鍒�</Button>
--
Gitblit v1.8.0