From 0d6459d3bcd158d358752d2a6721a80e1192e110 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 24 十一月 2020 19:10:11 +0800
Subject: [PATCH] 2020-11-24
---
src/templates/modalconfig/index.jsx | 69 +++++++++++++++++-----------------
1 files changed, 35 insertions(+), 34 deletions(-)
diff --git a/src/templates/modalconfig/index.jsx b/src/templates/modalconfig/index.jsx
index a6f6da3..04b0365 100644
--- a/src/templates/modalconfig/index.jsx
+++ b/src/templates/modalconfig/index.jsx
@@ -5,7 +5,7 @@
import { DndProvider } from 'react-dnd'
import HTML5Backend from 'react-dnd-html5-backend'
import moment from 'moment'
-import { Button, Card, Modal, Collapse, notification, Select, List, Icon, Empty, Popover } from 'antd'
+import { Button, Card, Modal, Collapse, notification, Select, List, Icon, Empty, Popover, Switch } from 'antd'
import Api from '@/api'
import Utils from '@/utils/utils.js'
@@ -66,7 +66,8 @@
curgroup: null, // 褰撳墠缁勶紝鏂板缓鎴栫紪杈�
sources: null, // 琛ㄥ崟绫诲瀷
sqlVerifing: false, // sql楠岃瘉
- openEdition: '' // 缂栬緫鐗堟湰鏍囪锛岄槻姝㈠浜烘搷浣�
+ openEdition: '', // 缂栬緫鐗堟湰鏍囪锛岄槻姝㈠浜烘搷浣�
+ showField: false // 鏄剧ず琛ㄥ崟瀛楁鍊�
}
/**
@@ -1090,21 +1091,21 @@
}
render () {
- const { config, source } = this.state
+ const { config, source, dict } = this.state
return (
<div className="modal-form-board">
<DndProvider backend={HTML5Backend}>
<div className="tools">
<Collapse accordion defaultActiveKey="1" bordered={false}>
- <Panel header={this.state.dict['header.menu.basedata']} key="0" id="modal-basedata">
+ <Panel header={dict['header.menu.basedata']} key="0" id="modal-basedata">
<MenuForm
- dict={this.state.dict}
+ dict={dict}
formlist={this.state.modalformlist}
/>
<div className="ant-col ant-form-item-label">
- <label title={this.state.dict['header.menu.table.add']}>
- {this.state.dict['header.menu.table.add']}
+ <label title={dict['header.menu.table.add']}>
+ {dict['header.menu.table.add']}
</label>
</div>
<Select
@@ -1113,7 +1114,7 @@
className="tables"
style={{ width: '100%' }}
optionFilterProp="children"
- value={this.state.dict['header.menu.table.placeholder']}
+ value={dict['header.menu.table.placeholder']}
onChange={this.onTableChange}
getPopupContainer={() => document.getElementById('modal-basedata')}
filterOption={(input, option) => {
@@ -1135,32 +1136,30 @@
</List.Item>}
/>}
</Panel>
- <Panel header={this.state.dict['header.menu.form']} key="1">
+ <Panel header={dict['header.menu.form']} key="1">
<div className="search-element">
{source.map((item, index) => {
return (<SourceElement key={index} content={item}/>)
})}
</div>
- <Button type="primary" block onClick={() => this.queryField()}>{this.state.dict['header.menu.form.add']}</Button>
- <Button type="primary" block onClick={() => this.handleGroup()}>{this.state.dict['header.menu.group.add']}</Button>
+ <Button type="primary" block onClick={() => this.queryField()}>{dict['header.menu.form.add']}</Button>
+ <Button type="primary" block onClick={() => this.handleGroup()}>{dict['header.menu.group.add']}</Button>
</Panel>
</Collapse>
</div>
<div className="setting">
- <Card title={this.state.dict['header.menu.form.configurable']} bordered={false} extra={
+ <Card title={dict['header.menu.form.configurable']} bordered={false} extra={
<div>
- <EditComponent dict={this.state.dict} type="form" config={this.state.config} refresh={this.updateConfig}/>
- <Button type="primary" onClick={this.submitConfig} loading={this.state.menuloading}>{this.state.dict['model.save']}</Button>
- <Button onClick={this.cancelConfig}>{this.state.dict['model.back']}</Button>
+ <EditComponent dict={dict} type="form" config={this.state.config} refresh={this.updateConfig}/>
+ <Button type="primary" onClick={this.submitConfig} loading={this.state.menuloading}>{dict['model.save']}</Button>
+ <Button onClick={this.cancelConfig}>{dict['model.back']}</Button>
</div>
} style={{ width: '100%' }}>
<Icon type="setting" onClick={this.changeSetting} />
<div className="ant-modal-content" style={{width: config.setting.width + '%'}}>
- <button type="button" className="ant-modal-close">
- <span className="ant-modal-close-x"><Icon type="close"/></span>
- </button>
<div className="ant-modal-header">
<div className="ant-modal-title">{config.setting.title}</div>
+ <Switch checkedChildren={dict['model.switch.open']} unCheckedChildren={dict['model.switch.close']} defaultChecked={this.state.showField} onChange={(val) => this.setState({showField: val})} />
</div>
<div className="ant-modal-body">
<div className="modal-form">
@@ -1183,7 +1182,8 @@
group={group}
list={group.sublist}
setting={config.setting}
- placeholder={this.state.dict['header.form.modal.placeholder']}
+ showField={this.state.showField}
+ placeholder={dict['header.form.modal.placeholder']}
handleList={this.handleList}
handleForm={this.handleForm}
closeForm={this.closeForm}
@@ -1196,7 +1196,8 @@
<DragElement
list={config.fields}
setting={config.setting}
- placeholder={this.state.dict['header.form.modal.placeholder']}
+ showField={this.state.showField}
+ placeholder={dict['header.form.modal.placeholder']}
handleList={this.handleList}
handleForm={this.handleForm}
closeForm={this.closeForm}
@@ -1207,10 +1208,10 @@
<div className="ant-modal-footer">
<div>
<button type="button" className="ant-btn">
- <span>{this.state.dict['model.cancel']}</span>
+ <span>{dict['model.cancel']}</span>
</button>
<button type="button" className="ant-btn ant-btn-primary">
- <span>{this.state.dict['model.confirm']}</span>
+ <span>{dict['model.confirm']}</span>
</button>
</div>
<div className="action-mask"></div>
@@ -1220,7 +1221,7 @@
</div>
</DndProvider>
<Modal
- title={this.state.dict['model.edit']}
+ title={dict['model.edit']}
visible={this.state.visible}
width={850}
maskClosable={false}
@@ -1230,7 +1231,7 @@
destroyOnClose
>
{<ModalForm
- dict={this.state.dict}
+ dict={dict}
card={this.state.card}
formlist={this.state.formlist}
inputSubmit={this.handleSubmit}
@@ -1239,13 +1240,13 @@
</Modal>
<Modal
wrapClassName="modal-fields"
- title={this.state.dict['model.edit']}
+ title={dict['model.edit']}
visible={this.state.tableVisible}
width={'65vw'}
maskClosable={false}
style={{minWidth: '900px', maxWidth: '1200px'}}
onOk={this.addFieldSubmit}
- cancelText={this.state.dict['model.close']}
+ cancelText={dict['model.close']}
onCancel={() => { this.setState({ tableVisible: false }) }}
destroyOnClose
>
@@ -1257,7 +1258,7 @@
}
</Modal>
<Modal
- title={this.state.dict['model.edit']}
+ title={dict['model.edit']}
visible={this.state.settingVisible}
width={700}
maskClosable={false}
@@ -1267,7 +1268,7 @@
>
<SettingForm
config={config}
- dict={this.state.dict}
+ dict={dict}
isSubTab={!!this.props.editTab}
inputSubmit={this.settingSave}
wrappedComponentRef={(inst) => this.settingRef = inst}
@@ -1280,16 +1281,16 @@
visible={this.state.closeVisible}
onCancel={() => { this.setState({closeVisible: false}) }}
footer={[
- <Button key="save" className="mk-btn mk-green" loading={this.state.closeloading} onClick={this.submitConfig}>{this.state.dict['model.save']}</Button>,
- <Button key="confirm" className="mk-btn mk-yellow" onClick={this.handleViewBack}>{this.state.dict['model.notsave']}</Button>,
- <Button key="cancel" onClick={() => { this.setState({closeVisible: false}) }}>{this.state.dict['model.cancel']}</Button>
+ <Button key="save" className="mk-btn mk-green" loading={this.state.closeloading} onClick={this.submitConfig}>{dict['model.save']}</Button>,
+ <Button key="confirm" className="mk-btn mk-yellow" onClick={this.handleViewBack}>{dict['model.notsave']}</Button>,
+ <Button key="cancel" onClick={() => { this.setState({closeVisible: false}) }}>{dict['model.cancel']}</Button>
]}
destroyOnClose
>
- {this.state.dict['header.menu.config.placeholder']}
+ {dict['header.menu.config.placeholder']}
</Modal>
<Modal
- title={this.state.dict['header.menu.group.manage']}
+ title={dict['header.menu.group.manage']}
visible={this.state.groupVisible}
width={700}
maskClosable={false}
@@ -1298,8 +1299,8 @@
destroyOnClose
>
<GroupForm
+ dict={dict}
config={config}
- dict={this.state.dict}
group={this.state.curgroup}
inputSubmit={this.handleGroupSave}
wrappedComponentRef={(inst) => this.groupRef = inst}
--
Gitblit v1.8.0