From 704f82b06befe96e5f739b2dce419f76f5683a6f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 15 八月 2022 09:27:54 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/table/normal-table/columns/index.jsx | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/src/menu/components/table/normal-table/columns/index.jsx b/src/menu/components/table/normal-table/columns/index.jsx
index 8ae474a..d22150a 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,6 +63,7 @@
<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 === '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 }
@@ -80,6 +82,7 @@
<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 }
</div>
@@ -303,6 +306,16 @@
})
}
+ 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) => {
const { config } = this.props
let column = fromJS(col).toJS()
@@ -482,6 +495,7 @@
updateCol: this.updateCol,
addElement: this.addElement,
editColumn: this.editColumn,
+ pasteCell: this.pasteCell,
changeStyle: this.changeStyle,
deleteCol: this.deleteCol,
}),
--
Gitblit v1.8.0