From 01a88094eaa183714ed7490ca7b85fee1e7bb064 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 20 五月 2023 23:03:41 +0800
Subject: [PATCH] 2023-05-20
---
src/menu/components/table/base-table/columns/index.jsx | 165 ++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 115 insertions(+), 50 deletions(-)
diff --git a/src/menu/components/table/base-table/columns/index.jsx b/src/menu/components/table/base-table/columns/index.jsx
index a5f8102..c6b6e95 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, PlusSquareOutlined, EditOutlined, CopyOutlined, DeleteOutlined, FontColorsOutlined, CloseCircleOutlined, AntDesignOutlined, InfoOutlined } from '@ant-design/icons'
import asyncComponent from '@/utils/asyncComponent'
import asyncIconComponent from '@/utils/asyncIconComponent'
@@ -46,31 +46,36 @@
return !is(fromJS(this.props.column), fromJS(nextProps.column)) ||
!is(fromJS(this.props.fields), fromJS(nextProps.fields)) ||
- this.props.index !== nextProps.index
+ this.props.index !== nextProps.index ||
+ window.GLOB.columnId === nextProps.column.uuid || window.GLOB.precolumnId === nextProps.column.uuid
}
render() {
const { connectDragSource, connectDropTarget, moveCol, addElement, dropCol, updateCol, editColumn, pasteCell, changeStyle, deleteCol, index, column, align, fields, children, ...restProps } = this.props
- if (index !== undefined) {
+ if (index !== undefined && column) {
let style = {cursor: 'move', textAlign: align}
if (column.Width) {
style.width = column.Width
style.minWidth = column.Width
}
+ if (window.GLOB.columnId === column.uuid) {
+ style.color = '#1890ff'
+ }
+
return connectDragSource(
- connectDropTarget(<th {...restProps} index={index} style={style} onDoubleClick={() => column && this.props.editColumn(column)}>
+ connectDropTarget(<th {...restProps} index={index} style={style} 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', 'action'].includes(column.type) ?
- <PlusOutlined className="plus" title="娣诲姞" onClick={() => this.props.addElement(column)} /> : null
- }
+ {column.type === 'colspan' ? <PlusOutlined className="plus" title="娣诲姞鍒�" onClick={() => this.props.addElement(column)} /> : null}
+ {column.type === 'custom' ? <PlusOutlined className="plus" title="娣诲姞鍏冪礌" onClick={() => this.props.addElement(column)} /> : null}
+ {column.type === 'custom' ? <PlusSquareOutlined className="plus" title="娣诲姞鎸夐挳" onClick={() => this.props.addElement(column, 'button')} /> : 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}
+ {column.type === 'custom' ? <PasteComponent options={['customCardElement', 'action']} updateConfig={(res, resolve) => this.props.pasteCell(column, res, resolve)} /> : null}
+ {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 field={column.field || ''} columns={fields} marks={column.marks} onSubmit={this.updateMarks} /> : null }
+ {['text', 'number', 'formula'].includes(column.type) ? <MarkColumn field={column.field || ''} columns={fields} marks={column.marks} onSubmit={this.updateMarks} /> : null }
</div>
} trigger="hover">
{children}
@@ -83,17 +88,22 @@
style.width = column.Width
style.minWidth = column.Width
}
+
+ if (window.GLOB.columnId === column.uuid) {
+ style.color = '#1890ff'
+ }
+
return (
<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) ?
- <PlusOutlined className="plus" title="娣诲姞" onClick={() => this.props.addElement(column)} /> : null
- }
+ {column.type === 'colspan' ? <PlusOutlined className="plus" title="娣诲姞鍒�" onClick={() => this.props.addElement(column)} /> : null}
+ {column.type === 'custom' ? <PlusOutlined className="plus" title="娣诲姞鍏冪礌" onClick={() => this.props.addElement(column)} /> : null}
+ {column.type === 'custom' ? <PlusSquareOutlined className="plus" title="娣诲姞鎸夐挳" onClick={() => this.props.addElement(column, 'button')} /> : 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}
+ {column.type === 'custom' ? <PasteComponent options={['customCardElement', 'action']} 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 field={column.field || ''} columns={fields} marks={column.marks} onSubmit={this.updateMarks} /> : null }
+ {['text', 'number', 'formula'].includes(column.type) ? <MarkColumn field={column.field || ''} columns={fields} marks={column.marks} onSubmit={this.updateMarks} /> : null }
</div>
} trigger="hover">
{children}
@@ -140,6 +150,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
@@ -162,12 +200,6 @@
if (column && column.type === 'custom') {
return (
<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}} className={'action-column ' + className}>
<CardCellComponent cards={config} cardCell={column} elements={column.elements} updateElement={this.updateCard}/>
</td>
)
@@ -284,11 +316,9 @@
dropCol = (item, hoverIndex) => {
let _columns = fromJS(this.state.columns).toJS()
- let col = { focus: true, uuid: Utils.getuuid(), label: 'label', field: '', type: item.subType, elements: [] }
+ let col = { focus: true, uuid: Utils.getuuid(), Width: 120, label: 'label', field: '', type: item.subType, elements: [] }
if (col.type === 'colspan') {
col.subcols = []
- } else if (col.type === 'action') {
- col.label = '鎿嶄綔'
} else if (col.type === 'index') {
col.label = '搴忓彿'
}
@@ -326,7 +356,7 @@
config.action = config.action.filter(item => item.uuid !== btn.uuid)
setTimeout(() => {
- MKEmitter.emit('revert', config.uuid)
+ MKEmitter.emit('revertBtn', config.uuid)
}, 200)
}
@@ -343,14 +373,23 @@
pasteCell = (col, cell, resolve) => {
resolve({status: true})
- delete cell.copyType
cell.uuid = Utils.getuuid()
cell.focus = true
+
+ if (!cell.eleType) {
+ if (cell.copyType === 'action') {
+ cell.eleType = 'button'
+ cell.width = cell.width || 12
+ } else {
+ cell.eleType = 'text'
+ }
+ }
+ delete cell.copyType
MKEmitter.emit('cardAddElement', col.uuid, cell)
}
- addElement = (col) => {
+ addElement = (col, type) => {
let column = fromJS(col).toJS()
if (column.type === 'colspan') {
@@ -363,26 +402,28 @@
})
this.updateCol(column)
} else if (column.type === 'custom') {
- let newcard = {uuid: Utils.getuuid(), focus: true, width: 24, eleType: 'text', datatype: 'dynamic', style: {paddingLeft: '4px'}}
+ if (type === 'button') {
+ let newcard = {
+ uuid: Utils.getuuid(),
+ focus: true,
+ eleType: 'button',
+ label: 'button',
+ OpenType: 'prompt',
+ class: 'primary',
+ intertype: 'system',
+ execSuccess: 'grid',
+ execError: 'never',
+ show: 'link'
+ }
- // 娉ㄥ唽浜嬩欢-娣诲姞鍏冪礌
- MKEmitter.emit('cardAddElement', column.uuid, newcard)
- } else if (column.type === 'action') {
- let newcard = {
- uuid: Utils.getuuid(),
- focus: true,
- eleType: 'button',
- label: 'button',
- OpenType: 'prompt',
- class: 'primary',
- intertype: 'system',
- execSuccess: 'grid',
- execError: 'never',
- show: 'link'
+ // 娉ㄥ唽浜嬩欢-娣诲姞鍏冪礌
+ MKEmitter.emit('cardAddElement', column.uuid, newcard)
+ } else {
+ let newcard = {uuid: Utils.getuuid(), focus: true, width: 24, eleType: 'text', datatype: 'dynamic', style: {paddingLeft: '4px'}}
+
+ // 娉ㄥ唽浜嬩欢-娣诲姞鍏冪礌
+ MKEmitter.emit('cardAddElement', column.uuid, newcard)
}
-
- // 娉ㄥ唽浜嬩欢-娣诲姞鍏冪礌
- MKEmitter.emit('cardAddElement', column.uuid, newcard)
}
}
@@ -396,9 +437,8 @@
if (col.type === 'colspan') {
col.subcols = card.subcols || []
} else if (col.type === 'custom') {
+ col.style = card.style || {}
col.elements = card.type === 'custom' ? (card.elements || []) : []
- } else if (col.type === 'action') {
- col.elements = card.type === 'action' ? (card.elements || []) : []
}
if (!col.field || col.isSub) {
@@ -422,6 +462,9 @@
resolve()
}
}
+
+ window.GLOB.precolumnId = window.GLOB.columnId || ''
+ window.GLOB.columnId = col.uuid
this.setState({card: null})
this.updateCol(col)
@@ -560,6 +603,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)
}
@@ -599,11 +663,12 @@
}
return (
- <div className={`normal-table-columns ${config.setting.laypage} ${config.wrap.tableType} ${config.wrap.mode || ''}`} id={tableId}>
+ <div className={`normal-table-columns ${config.setting.laypage} ${config.wrap.tableType} ${config.wrap.mode || ''} table-vertical-${config.wrap.vertical || ''} table-col-${columns.length}`} id={tableId}>
<div className="col-control">
<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) => {
@@ -626,7 +691,7 @@
} : false}
/>
}) :
- <Table
+ (columns.length === 0 ? <DragableEmptyCol dropCol={this.dropCol}/> : <Table
rowKey="uuid"
size={config.wrap.size || 'middle'}
bordered={config.wrap.bordered !== 'false'}
@@ -642,7 +707,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