From b8e1395f02c929eaa96b949cf6027ee2a43856a6 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 06 九月 2022 19:03:37 +0800
Subject: [PATCH] 2022-09-06
---
src/menu/components/table/normal-table/columns/index.jsx | 67 ++++++++++++++++-----------------
1 files changed, 33 insertions(+), 34 deletions(-)
diff --git a/src/menu/components/table/normal-table/columns/index.jsx b/src/menu/components/table/normal-table/columns/index.jsx
index 5d7552b..e4c9a64 100644
--- a/src/menu/components/table/normal-table/columns/index.jsx
+++ b/src/menu/components/table/normal-table/columns/index.jsx
@@ -18,6 +18,7 @@
const MarkColumn = asyncIconComponent(() => import('@/menu/components/share/markcomponent'))
const CardCellComponent = asyncComponent(() => import('@/menu/components/card/cardcellcomponent'))
const MobPagination = asyncIconComponent(() => import('@/menu/components/share/mobPagination'))
+const PasteComponent = asyncIconComponent(() => import('@/components/paste'))
class HeaderCol extends Component {
deleteCol = () => {
@@ -51,7 +52,7 @@
}
render() {
- const { connectDragSource, connectDropTarget, moveCol, addElement, updateCol, editColumn, changeStyle, deleteCol, index, column, align, fields, children, ...restProps } = this.props
+ const { connectDragSource, connectDropTarget, moveCol, addElement, updateCol, editColumn, pasteCell, changeStyle, deleteCol, index, column, align, fields, children, ...restProps } = this.props
if (index !== undefined) {
return connectDragSource(
@@ -62,9 +63,11 @@
<PlusOutlined className="plus" title="娣诲姞" onClick={() => this.props.addElement(column)} /> : null
}
<EditOutlined className="edit" title="缂栬緫" onClick={() => this.props.editColumn(column)} />
+ {column && column.type === 'custom' ? <PasteComponent options={['customCardElement']} updateConfig={(res, resolve) => this.props.pasteCell(column, res, resolve)} /> : null}
+ {column && column.type === 'action' ? <PasteComponent options={['action']} updateConfig={(res, resolve) => this.props.pasteCell(column, res, resolve)} /> : null}
{column && column.type === 'custom' ? <FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={() => this.props.changeStyle(column)}/> : null}
<DeleteOutlined className="close" title="鍒犻櫎" onClick={this.deleteCol} />
- {column && ['text', 'number', 'formula'].includes(column.type) ? <MarkColumn columns={fields} marks={column.marks} onSubmit={this.updateMarks} /> : null }
+ {column && ['text', 'number', 'formula'].includes(column.type) ? <MarkColumn field={column.field || ''} columns={fields} marks={column.marks} onSubmit={this.updateMarks} /> : null }
</div>
} trigger="hover">
{children}
@@ -80,8 +83,9 @@
<PlusOutlined className="plus" title="娣诲姞" onClick={() => this.props.addElement(column)} /> : null
}
<EditOutlined className="edit" title="缂栬緫" onClick={() => this.props.editColumn(column)} />
+ {column.type === 'custom' ? <PasteComponent options={['customCardElement']} updateConfig={(res, resolve) => this.props.pasteCell(column, res, resolve)} /> : null}
<DeleteOutlined className="close" title="鍒犻櫎" onClick={this.deleteCol} />
- {column && ['text', 'number', 'formula'].includes(column.type) ? <MarkColumn columns={fields} marks={column.marks} onSubmit={this.updateMarks} /> : null }
+ {column && ['text', 'number', 'formula'].includes(column.type) ? <MarkColumn field={column.field || ''} columns={fields} marks={column.marks} onSubmit={this.updateMarks} /> : null }
</div>
} trigger="hover">
{children}
@@ -164,7 +168,7 @@
val = column.formula
if (column.eval === 'false') {
val = val.replace(/\n/ig, '<br/>').replace(/\s/ig, ' ')
- val = <span dangerouslySetInnerHTML={{__html: val}}></span>
+ val = <span style={{fontWeight: 'inherit'}} dangerouslySetInnerHTML={{__html: val}}></span>
}
}
return (
@@ -214,18 +218,17 @@
return uuid.join('')
}) ()
- if (config.wrap && config.wrap.borderColor) { // 杈规棰滆壊
- let style = `#${tableId} table, #${tableId} tr, #${tableId} th, #${tableId} td {border-color: ${config.wrap.borderColor}}`
- let ele = document.createElement('style')
- ele.innerHTML = style
- document.getElementsByTagName('head')[0].appendChild(ele)
- }
-
this.setState({
tableId,
columns: fromJS(config.cols).toJS(),
fields: fromJS(config.columns).toJS(),
lineMarks: config.lineMarks ? fromJS(config.lineMarks).toJS() : []
+ }, () => {
+ const element = document.getElementById(tableId)
+ element && element.style.setProperty('--mk-table-border-color', config.wrap.borderColor || '#e8e8e8')
+ element && element.style.setProperty('--mk-table-color', config.wrap.color || 'rgba(0, 0, 0, 0.65)')
+ element && element.style.setProperty('--mk-table-font-size', config.wrap.fontSize || '14px')
+ element && element.style.setProperty('--mk-table-font-weight', config.wrap.fontWeight || 'normal')
})
}
@@ -239,11 +242,12 @@
}
} else if (!is(fromJS(this.state.fields), fromJS(nextProps.config.columns))) {
this.setState({fields: fromJS(nextProps.config.columns).toJS()})
- } else if (this.props.config.wrap.borderColor !== nextProps.config.wrap.borderColor) {
- let style = `#${this.state.tableId} table, #${this.state.tableId} tr, #${this.state.tableId} th, #${this.state.tableId} td {border-color: ${nextProps.config.wrap.borderColor}}`
- let ele = document.createElement('style')
- ele.innerHTML = style
- document.getElementsByTagName('head')[0].appendChild(ele)
+ } else if (!is(fromJS(this.props.config.wrap), fromJS(nextProps.config.wrap))) {
+ const element = document.getElementById(this.state.tableId)
+ element && element.style.setProperty('--mk-table-border-color', nextProps.config.wrap.borderColor || '#e8e8e8')
+ element && element.style.setProperty('--mk-table-color', nextProps.config.wrap.color || 'rgba(0, 0, 0, 0.65)')
+ element && element.style.setProperty('--mk-table-font-size', nextProps.config.wrap.fontSize || '14px')
+ element && element.style.setProperty('--mk-table-font-weight', nextProps.config.wrap.fontWeight || 'normal')
}
}
@@ -301,6 +305,16 @@
this.setState({
card: fromJS(col).toJS()
})
+ }
+
+ pasteCell = (col, cell, resolve) => {
+ resolve({status: true})
+
+ delete cell.copyType
+ cell.uuid = Utils.getuuid()
+ cell.focus = true
+
+ MKEmitter.emit('cardAddElement', [this.props.config.uuid, col.uuid], cell)
}
addElement = (col) => {
@@ -364,13 +378,11 @@
editStyleCard: fromJS(col).toJS()
})
- MKEmitter.emit('changeStyle', [col.uuid], ['font', 'padding'], col.style || {})
+ MKEmitter.emit('changeStyle', ['font', 'padding'], col.style || {}, this.getStyle)
}
- getStyle = (comIds, style) => {
+ getStyle = (style) => {
const { editStyleCard } = this.state
-
- if (!editStyleCard || comIds[0] !== editStyleCard.uuid || comIds.length !== 1) return
let _card = {...editStyleCard, style}
@@ -482,6 +494,7 @@
updateCol: this.updateCol,
addElement: this.addElement,
editColumn: this.editColumn,
+ pasteCell: this.pasteCell,
changeStyle: this.changeStyle,
deleteCol: this.deleteCol,
}),
@@ -545,10 +558,6 @@
})
}
- componentDidMount () {
- MKEmitter.addListener('submitStyle', this.getStyle)
- }
-
/**
* @description 缁勪欢閿�姣侊紝娓呴櫎state鏇存柊锛屾竻闄ゅ揩鎹烽敭璁剧疆
*/
@@ -556,7 +565,6 @@
this.setState = () => {
return
}
- MKEmitter.removeListener('submitStyle', this.getStyle)
}
render() {
@@ -573,14 +581,6 @@
const columns = this.handlecolumns(this.state.columns, fields, config)
- let style = {}
- if (config.wrap.color) {
- style.color = config.wrap.color
- }
- if (config.wrap.fontSize) {
- style.fontSize = config.wrap.fontSize
- }
-
return (
<div className={`normal-table-columns ${config.setting.laypage} ${config.wrap.tableType} ${config.wrap.mode || ''}`} id={tableId}>
<div className="col-control">
@@ -594,7 +594,6 @@
rowKey="uuid"
size={config.wrap.size || 'middle'}
rowClassName="editable-row"
- style={style}
bordered={config.wrap.bordered !== 'false'}
components={components}
dataSource={this.state.data}
--
Gitblit v1.8.0