From 8d66ff34fae5b048a6b7923cc75d34f13a08be9d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 02 八月 2022 11:42:43 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/templates/zshare/modalform/fieldtable/index.jsx | 32 +++++++++++++++++++++++++-------
1 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/src/templates/zshare/modalform/fieldtable/index.jsx b/src/templates/zshare/modalform/fieldtable/index.jsx
index 0a64952..d9100da 100644
--- a/src/templates/zshare/modalform/fieldtable/index.jsx
+++ b/src/templates/zshare/modalform/fieldtable/index.jsx
@@ -11,7 +11,6 @@
class EdiFieldsTable extends Component {
static propTpyes = {
- dict: PropTypes.object, // 瀛楀吀椤�
onChange: PropTypes.func // 鏁版嵁鍙樺寲
}
@@ -63,11 +62,20 @@
editable: true,
width: '20%',
options: [
- {value: 'left', text: 'left'},
- {value: 'center', text: 'center'},
- {value: 'right', text: 'right'},
- {value: 'justify', text: 'justify'}
- ]
+ {value: 'left', text: '灞呭乏'},
+ {value: 'center', text: '灞呬腑'},
+ {value: 'right', text: '灞呭彸'},
+ // {value: 'justify', text: 'justify'}
+ ],
+ render: (text, record) => {
+ if (text === 'center') {
+ return '灞呬腑'
+ } else if (text === 'right') {
+ return '灞呭彸'
+ } else {
+ return '灞呭乏'
+ }
+ }
}
]
}
@@ -109,6 +117,16 @@
this.setState({loading: false})
})
return
+ } else if (fields.filter(f => f.toLowerCase() === 'value').length > 0) {
+ notification.warning({
+ top: 92,
+ message: '瀛楁鍚嶄笉鍙娇鐢╲alue锛�',
+ duration: 5
+ })
+ this.setState({loading: true}, () => {
+ this.setState({loading: false})
+ })
+ return
}
this.setState({ data }, () => {
@@ -121,7 +139,7 @@
return (
<div className="modal-card-field-table">
- {data.length < 3 ? <PlusOutlined className="add-row" onClick={this.handleAdd} /> : null}
+ {data.length < 6 ? <PlusOutlined className="add-row" onClick={this.handleAdd} /> : null}
{!loading ? <EditTable indexShow={false} actions={['edit', 'move', 'del']} data={data} columns={columns} onChange={this.changeData}/> : null}
</div>
)
--
Gitblit v1.8.0