From cc1a76df575c18f0d0ee96e8658461efdce3a918 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 17 一月 2023 18:01:01 +0800
Subject: [PATCH] 2023-01-17
---
src/menu/components/table/base-table/columns/index.jsx | 161 ++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 133 insertions(+), 28 deletions(-)
diff --git a/src/menu/components/table/base-table/columns/index.jsx b/src/menu/components/table/base-table/columns/index.jsx
index 58ed260..b7cd7e3 100644
--- a/src/menu/components/table/base-table/columns/index.jsx
+++ b/src/menu/components/table/base-table/columns/index.jsx
@@ -2,8 +2,8 @@
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
import { DndProvider, DragSource, DropTarget } from 'react-dnd'
-import { Table, Popover, Modal, message } from 'antd'
-import { PlusOutlined, EditOutlined, CopyOutlined, DeleteOutlined, FontColorsOutlined, CloseCircleOutlined, AntDesignOutlined } from '@ant-design/icons'
+import { Table, Popover, Modal, message, notification } from 'antd'
+import { PlusOutlined, EditOutlined, CopyOutlined, DeleteOutlined, FontColorsOutlined, CloseCircleOutlined, AntDesignOutlined, InfoOutlined } from '@ant-design/icons'
import asyncComponent from '@/utils/asyncComponent'
import asyncIconComponent from '@/utils/asyncIconComponent'
@@ -12,7 +12,7 @@
import './index.scss'
const { confirm } = Modal
-const EditColumn = asyncIconComponent(() => import('./editColumn'))
+const EditColumn = asyncComponent(() => import('./editColumn'))
const MarkColumn = asyncIconComponent(() => import('@/menu/components/share/markcomponent'))
const CardCellComponent = asyncComponent(() => import('@/menu/components/card/cardcellcomponent'))
const PasteComponent = asyncIconComponent(() => import('@/components/paste'))
@@ -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) ?
@@ -62,7 +68,7 @@
}
<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 && (column.type === 'custom' || column.type === 'action') ? <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 }
</div>
@@ -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, textAlign: column.Align, ...(column.style || {})}} 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}
@@ -313,6 +352,10 @@
let config = {...this.props.config, cols: _columns}
if (btn) {
config.action = config.action.filter(item => item.uuid !== btn.uuid)
+
+ setTimeout(() => {
+ MKEmitter.emit('revert', config.uuid)
+ }, 200)
}
this.props.updatecolumn(config)
@@ -371,8 +414,8 @@
}
}
- submitCol = (col) => {
- const { card } = this.state
+ submitCol = (col, resolve) => {
+ const { card, columns } = this.state
col.uuid = card.uuid
col.isSub = card.isSub === true
@@ -381,9 +424,33 @@
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.style = card.style || {}
col.elements = card.type === 'action' ? (card.elements || []) : []
+ }
+
+ if (!col.field || col.isSub) {
+ resolve()
+ } else {
+ let _cols = []
+ columns.forEach(c => {
+ if (c.field && col.uuid !== c.uuid) {
+ _cols.push(c.field.toLowerCase())
+ }
+ })
+
+ if (_cols.includes(col.field.toLowerCase())) {
+ notification.warning({
+ top: 92,
+ message: '瀛楁宸插瓨鍦紒',
+ duration: 5
+ })
+ return
+ } else {
+ resolve()
+ }
}
this.setState({card: null})
@@ -435,19 +502,6 @@
}, () => {
this.props.updatecolumn({...this.props.config, cols: _columns})
})
-
- if (col.type !== 'action') return
-
- let uuids = []
- col.elements && col.elements.forEach(c => {
- if (c.OpenType !== 'popview') return
-
- uuids.push(c.uuid)
- })
-
- if (uuids.length === 0) return
-
- MKEmitter.emit('delButtons', uuids)
}
updateLineMarks = (vals) => {
@@ -536,6 +590,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)
}
@@ -563,19 +638,49 @@
}
const columns = this.handlecolumns(this.state.columns, fields, config)
+ let groups = null
+ if (columns.length > 12) {
+ let g = Math.ceil(columns.length / 8)
+ let n = Math.ceil(columns.length / g)
+ groups = []
+
+ for (let i = 0, len = columns.length; i < len; i += n) {
+ groups.push(columns.slice(i, i + n))
+ }
+ }
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 || ''}`} 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>
- <Table
+ {groups ? groups.map((group, i) => {
+ return <Table
+ key={i}
+ rowKey="uuid"
+ size={config.wrap.size || 'middle'}
+ bordered={config.wrap.bordered !== 'false'}
+ components={components}
+ dataSource={this.state.data}
+ rowSelection={config.wrap.tableType && i === 0 ? { type: 'radio' } : null}
+ columns={group}
+ pagination={i === groups.length - 1 ? {
+ current: 1,
+ pageSize: 10,
+ pageSizeOptions: ['10', '25', '50', '100', '500', '1000'],
+ showSizeChanger: true,
+ total: 58,
+ showTotal: (total, range) => `${range[0]}-${range[1]} 鍏� ${total} 鏉
+ } : false}
+ />
+ }) :
+ (columns.length === 0 ? <DragableEmptyCol dropCol={this.dropCol}/> : <Table
rowKey="uuid"
size={config.wrap.size || 'middle'}
- rowClassName="editable-row"
bordered={config.wrap.bordered !== 'false'}
components={components}
dataSource={this.state.data}
@@ -589,7 +694,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