From d17368d4a5bdec6db2d8a85c7901cdb25cc59cd4 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 11 十月 2021 15:16:25 +0800
Subject: [PATCH] 2021-10-11
---
src/menu/components/table/edit-table/columns/index.jsx | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/src/menu/components/table/edit-table/columns/index.jsx b/src/menu/components/table/edit-table/columns/index.jsx
index 569b68d..fdf0b84 100644
--- a/src/menu/components/table/edit-table/columns/index.jsx
+++ b/src/menu/components/table/edit-table/columns/index.jsx
@@ -315,10 +315,24 @@
MKEmitter.emit('changeStyle', [col.uuid], ['font', 'padding'], col.style || {})
}
+ changeSubmitStyle = () => {
+ const { config } = this.props
+
+ MKEmitter.emit('changeStyle', [config.uuid, 'submit'], ['font', 'background', 'border', 'margin', 'padding'], config.submit.style || {})
+ }
+
getStyle = (comIds, style) => {
+ const { config } = this.props
const { editStyleCard } = this.state
- if (!editStyleCard || comIds[0] !== editStyleCard.uuid || comIds.length !== 1) return
+ if (comIds.length === 2 && comIds[0] === config.uuid && comIds[1] === 'submit') {
+ let submit = {...config.submit, style}
+
+ this.props.updatecolumn({...config, submit: submit})
+
+ return
+ }
+ if (comIds.length !== 1 || !editStyleCard || comIds[0] !== editStyleCard.uuid) return
let _card = {...editStyleCard, style}
@@ -451,6 +465,7 @@
const { config } = this.props
this.verifyRef.handleConfirm().then(res => {
+ res.style = config.submit.style || {}
this.setState({
visible: false
}, () => {
@@ -486,8 +501,12 @@
}
const columns = this.state.columns.map((col, index) => {
+ let title = col.label
+ if (col.editable === 'true') {
+ title = <span>{col.label}<Icon style={{position: 'absolute', bottom: 0, right: 0, color: '#1890ff'}} type="edit" /></span>
+ }
return {
- title: col.label,
+ title: title,
dataIndex: col.uuid,
align: col.Align,
sorter: col.IsSort === 'true',
@@ -526,9 +545,10 @@
<Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
<div className="mk-popover-control">
<Icon className="edit" title="缂栬緫" type="edit" onClick={() => this.setState({visible: true})} />
+ <Icon className="style" title="璋冩暣鏍峰紡" onClick={this.changeSubmitStyle} type="font-colors" />
</div>
} trigger="hover">
- <Button style={{height: '24px', marginRight: '10px', backgroundColor: '#1890ff'}} onDoubleClick={() => this.setState({visible: true})} type="primary">鎻愪氦</Button>
+ <Button className="submit-btn" style={config.submit.style} onDoubleClick={() => this.setState({visible: true})} type="primary">鎻愪氦</Button>
</Popover>
<Icon title="澶嶅埗鏄剧ず鍒�" type="copy" onClick={this.copycolumn} />
<MarkColumn columns={fields} type="line" marks={lineMarks} onSubmit={this.updateLineMarks} />
@@ -568,6 +588,7 @@
>
<TableVerify
card={config.submit}
+ setting={config.setting}
dict={dict}
cols={config.cols}
columns={config.columns}
--
Gitblit v1.8.0