From 31871ca836e6fcbea9b1c54e2ec15f49667bf093 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 23 十二月 2022 14:14:04 +0800
Subject: [PATCH] 2022-12-23
---
src/menu/components/table/base-table/columns/index.jsx | 77 ++++++++++++++++++++++++++++++++++----
1 files changed, 69 insertions(+), 8 deletions(-)
diff --git a/src/menu/components/table/base-table/columns/index.jsx b/src/menu/components/table/base-table/columns/index.jsx
index cea83cd..07ec61f 100644
--- a/src/menu/components/table/base-table/columns/index.jsx
+++ b/src/menu/components/table/base-table/columns/index.jsx
@@ -3,7 +3,7 @@
import { is, fromJS } from 'immutable'
import { DndProvider, DragSource, DropTarget } from 'react-dnd'
import { Table, Popover, Modal, message, notification } from 'antd'
-import { PlusOutlined, EditOutlined, CopyOutlined, DeleteOutlined, FontColorsOutlined, CloseCircleOutlined, AntDesignOutlined } from '@ant-design/icons'
+import { PlusOutlined, EditOutlined, CopyOutlined, DeleteOutlined, FontColorsOutlined, CloseCircleOutlined, AntDesignOutlined, InfoOutlined } from '@ant-design/icons'
import asyncComponent from '@/utils/asyncComponent'
import asyncIconComponent from '@/utils/asyncIconComponent'
@@ -53,8 +53,14 @@
const { connectDragSource, connectDropTarget, moveCol, addElement, dropCol, updateCol, editColumn, pasteCell, changeStyle, deleteCol, index, column, align, fields, children, ...restProps } = this.props
if (index !== undefined) {
+ let style = {cursor: 'move', textAlign: align}
+ if (column.Width) {
+ style.width = column.Width
+ style.minWidth = column.Width
+ }
+
return connectDragSource(
- connectDropTarget(<th {...restProps} index={index} style={{ cursor: 'move', textAlign: align }} onDoubleClick={() => column && this.props.editColumn(column)}>
+ connectDropTarget(<th {...restProps} index={index} style={style} onDoubleClick={() => column && this.props.editColumn(column)}>
<Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
<div className="mk-popover-control" onDoubleClick={(e) => e.stopPropagation()}>
{column && ['custom', 'colspan', 'action'].includes(column.type) ?
@@ -72,8 +78,13 @@
</th>),
)
} else if (column) {
+ let style = {textAlign: align}
+ if (column.Width) {
+ style.width = column.Width
+ style.minWidth = column.Width
+ }
return (
- <th {...restProps} key={column.uuid} onDoubleClick={() => this.props.editColumn(column)}>
+ <th {...restProps} style={style} key={column.uuid} onDoubleClick={() => this.props.editColumn(column)}>
<Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
<div className="mk-popover-control" onDoubleClick={(e) => e.stopPropagation()}>
{column && ['custom', 'colspan'].includes(column.type) ?
@@ -129,6 +140,34 @@
}))(HeaderCol),
)
+class HeaderEmptyCol extends Component {
+ render() {
+ const { connectDragSource, connectDropTarget } = this.props
+
+ return connectDragSource(
+ connectDropTarget(<div style={{border: '1px solid #e8e8e8', textAlign: 'center', height: '100px', lineHeight: '100px', color: '#bcbcbc'}}>璇锋坊鍔犳樉绀哄垪</div>)
+ )
+ }
+}
+
+const ColEmptyTarget = {
+ drop(props, monitor) {
+ const item = monitor.getItem()
+
+ if (item.$init) {
+ props.dropCol(item, 0)
+ }
+ }
+}
+
+const DragableEmptyCol = DropTarget('col', ColEmptyTarget, connect => ({
+ connectDropTarget: connect.dropTarget()
+}))(
+ DragSource('col', rowSource, connect => ({
+ connectDragSource: connect.dragSource(),
+ }))(HeaderEmptyCol)
+)
+
class EditableColumnCell extends Component {
updateCard = (vals, btn) => {
const { column } = this.props
@@ -150,13 +189,13 @@
if (column && column.type === 'custom') {
return (
- <td style={{padding: 0, minWidth: (column.Width || 100) / 2, ...(column.style || {})}} className={className}>
+ <td style={{padding: 0, ...(column.style || {})}} className={className}>
<CardCellComponent cards={config} cardCell={column} elements={column.elements} updateElement={this.updateCard}/>
</td>
)
} else if (column && column.type === 'action') {
return (
- <td style={{padding: '0 5px', textAlign: column.Align, minWidth: (column.Width || 100) / 2}} className={'action-column ' + className}>
+ <td style={{padding: '0 5px', textAlign: column.Align}} className={'action-column ' + className}>
<CardCellComponent cards={config} cardCell={column} elements={column.elements} updateElement={this.updateCard}/>
</td>
)
@@ -172,7 +211,7 @@
}
}
return (
- <td style={{...style, minWidth: (column.Width || 100) / 2}} className={className}>
+ <td style={{...style}} className={className}>
{val}
{column.Hide === 'true' ? <CloseCircleOutlined style={{marginLeft: '5px', color: 'orange', fontSize: '12px'}}/> : null}
{column.marks && column.marks.length ? <AntDesignOutlined className="profile"/> : null}
@@ -549,6 +588,27 @@
})
}
+ copyFields = () => {
+ const { config } = this.props
+ let m = []
+ let n = []
+
+ config.columns.forEach(col => {
+ m.push(`${col.field}(${col.label})`)
+ n.push(col.field)
+ })
+
+ let oInput = document.createElement('input')
+ oInput.value = `/*${m.join(',')}*/
+ ${n.join(',')}`
+ document.body.appendChild(oInput)
+ oInput.select()
+ document.execCommand('Copy')
+ document.body.removeChild(oInput)
+
+ message.success('澶嶅埗鎴愬姛銆�')
+ }
+
componentDidMount () {
MKEmitter.addListener('plusColumns', this.plusColumns)
}
@@ -593,6 +653,7 @@
<FieldsComponent config={config} type="columns" />
<CopyOutlined title="澶嶅埗鏄剧ず鍒�" onClick={this.copycolumn} />
<MarkColumn columns={fields} type="line" marks={lineMarks} onSubmit={this.updateLineMarks} />
+ <InfoOutlined title="澶嶅埗瀛楁" style={{color: 'orange'}} onClick={this.copyFields}/>
</div>
<DndProvider>
{groups ? groups.map((group, i) => {
@@ -615,7 +676,7 @@
} : false}
/>
}) :
- <Table
+ (columns.length === 0 ? <DragableEmptyCol dropCol={this.dropCol}/> : <Table
rowKey="uuid"
size={config.wrap.size || 'middle'}
bordered={config.wrap.bordered !== 'false'}
@@ -631,7 +692,7 @@
total: 58,
showTotal: (total, range) => `${range[0]}-${range[1]} 鍏� ${total} 鏉
}}
- />}
+ />)}
</DndProvider>
<EditColumn column={card} fields={fields} submitCol={this.submitCol} cancelCol={this.cancelCol}/>
</div>
--
Gitblit v1.8.0