From 569ccb3c1ff82f30ffefa7d3700571448d742662 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 03 十二月 2020 11:46:28 +0800
Subject: [PATCH] 2020-12-03
---
src/menu/components/table/normal-table/columns/index.jsx | 269 +++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 225 insertions(+), 44 deletions(-)
diff --git a/src/menu/components/table/normal-table/columns/index.jsx b/src/menu/components/table/normal-table/columns/index.jsx
index 8a5d67c..afcd6ac 100644
--- a/src/menu/components/table/normal-table/columns/index.jsx
+++ b/src/menu/components/table/normal-table/columns/index.jsx
@@ -2,56 +2,80 @@
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
import { DndProvider, DragSource, DropTarget } from 'react-dnd'
-import { Table, Form, Popover, Icon } from 'antd'
+import { Table, Form, Popover, Icon, Modal } from 'antd'
+import asyncComponent from '@/utils/asyncComponent'
import asyncIconComponent from '@/utils/asyncIconComponent'
import Utils from '@/utils/utils.js'
import zhCN from '@/locales/zh-CN/model.js'
import enUS from '@/locales/en-US/model.js'
+import MKEmitter from '@/utils/events.js'
import './index.scss'
+const { confirm } = Modal
const coldict = localStorage.getItem('lang') !== 'en-US' ? zhCN : enUS
const EditColumn = asyncIconComponent(() => import('./editColumn'))
+const CardCellComponent = asyncComponent(() => import('@/menu/components/card/cardcellcomponent'))
class HeaderCol extends Component {
- updateCol = (values) => {
- const { column } = this.props
- this.props.updateCol({...column, ...values})
+ deleteCol = () => {
+ const _this = this
+
+ confirm({
+ content: '纭畾鍒犻櫎鏄剧ず鍒楀悧锛�',
+ onOk() {
+ _this.props.deleteCol(_this.props.column)
+ },
+ onCancel() {}
+ })
}
- deleteCol = () => {
- this.props.deleteCol(this.props.column)
+ shouldComponentUpdate (nextProps, nextState) {
+
+ if (!nextProps.column) return false
+
+ return !is(fromJS(this.props.column), fromJS(nextProps.column)) ||
+ !is(fromJS(this.props.fields), fromJS(nextProps.fields)) ||
+ this.props.index !== nextProps.index
}
render() {
- const { connectDragSource, connectDropTarget, moveCol, updateCol, deleteCol, index, column, fields, children, ...restProps } = this.props
+ const { connectDragSource, connectDropTarget, moveCol, addElement, editColumn, deleteCol, index, column, align, fields, children, ...restProps } = this.props
if (index !== undefined) {
return connectDragSource(
- connectDropTarget(<th {...restProps} index={index} style={{ cursor: 'move' }}>
+ connectDropTarget(<th {...restProps} index={index} style={{ cursor: 'move', textAlign: align }}>
<Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
<div className="mk-popover-control">
- <EditColumn column={column} dict={coldict} fields={fields} updateCol={this.updateCol} deleteCol={this.deleteCol}/>
- <Icon className="close" title="delete" type="delete" onClick={this.deleteCol} />
+ {column && (column.type === 'custom' || column.type === 'colspan' || column.type === 'action') ?
+ <Icon className="plus" title="娣诲姞" type="plus" onClick={() => this.props.addElement(column)} /> : null
+ }
+ <Icon className="edit" title="缂栬緫" type="edit" onClick={() => this.props.editColumn(column)} />
+ <Icon className="close" title="鍒犻櫎" type="delete" onClick={this.deleteCol} />
</div>
} trigger="hover">
{children}
</Popover>
</th>),
)
- } else {
+ } else if (column) {
return (
<th {...restProps}>
<Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
<div className="mk-popover-control">
- <EditColumn column={column} dict={coldict} fields={fields} updateCol={this.updateCol} deleteCol={this.deleteCol}/>
- <Icon className="close" title="delete" type="delete" onClick={this.deleteCol} />
+ {column && column.type === 'custom' ?
+ <Icon className="plus" title="娣诲姞" type="plus" onClick={() => this.props.addElement(column)} /> : null
+ }
+ <Icon className="edit" title="缂栬緫" type="edit" onClick={() => this.props.editColumn(column)} />
+ <Icon className="close" title="鍒犻櫎" type="delete" onClick={this.deleteCol} />
</div>
} trigger="hover">
{children}
</Popover>
</th>
)
+ } else {
+ return (<th {...restProps}>{children}</th>)
}
}
}
@@ -87,18 +111,45 @@
)
class EditableCell extends Component {
- render() {
- const { column, children, style } = this.props
+ updateCard = (vals) => {
+ const { column } = this.props
+ this.props.upComponent({...column, elements: vals})
+ }
- if (column) {
+ shouldComponentUpdate (nextProps, nextState) {
+ const { config, column } = this.props
+
+ if (!nextProps.column) return true
+
+ return !is(fromJS(column), fromJS(nextProps.column)) ||
+ !is(fromJS(config.columns), fromJS(nextProps.config.columns)) ||
+ !is(fromJS(config.search), fromJS(nextProps.config.search))
+ }
+
+ render() {
+ const { column, config, children, className, style } = this.props
+
+ if (column && column.type === 'custom') {
return (
- <td style={style}>
+ <td style={{padding: 0, verticalAlign: 'top', minWidth: column.Width || 100}} 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}} className={className}>
+ <CardCellComponent cards={config} cardCell={column} elements={column.elements} updateElement={this.updateCard}/>
+ </td>
+ )
+ } else if (column) {
+ return (
+ <td style={{...style, minWidth: column.Width || 100}} className={className}>
{column.field}
</td>
)
} else {
return (
- <td style={style}>
+ <td style={style} className={className}>
{children}
</td>
)
@@ -108,10 +159,8 @@
class EditTable extends Component {
static propTpyes = {
- actions: PropTypes.any, // 鎿嶄綔椤�
- data: PropTypes.any, // 鏁版嵁鍒楄〃
- columns: PropTypes.array, // 鏄剧ず鍒�
- onChange: PropTypes.func // 鏁版嵁鍙樺寲
+ config: PropTypes.object, // 閰嶇疆淇℃伅
+ updatecolumn: PropTypes.func // 鏁版嵁鍙樺寲
}
state = {
@@ -121,21 +170,32 @@
}
UNSAFE_componentWillMount () {
+ const { config } = this.props
+
this.setState({
- columns: fromJS(this.props.config.cols).toJS(),
- fields: fromJS(this.props.config.columns).toJS()
+ columns: fromJS(config.cols).toJS(),
+ fields: fromJS(config.columns).toJS()
})
}
UNSAFE_componentWillReceiveProps (nextProps) {
if (!is(fromJS(this.state.columns), fromJS(nextProps.config.cols))) {
- this.setState({columns: fromJS(nextProps.config.cols).toJS()})
+ let _columns = fromJS(nextProps.config.cols).toJS()
+ this.setState({columns: _columns})
+ if (_columns[_columns.length - 1] && _columns[_columns.length - 1].focus) {
+ this.editColumn(_columns[_columns.length - 1])
+ }
} else if (!is(fromJS(this.state.fields), fromJS(nextProps.config.columns))) {
this.setState({fields: fromJS(nextProps.config.columns).toJS()})
}
}
shouldComponentUpdate (nextProps, nextState) {
- return !is(fromJS(this.state), fromJS(nextState))
+ const { config } = this.props
+
+ return !is(fromJS(this.state), fromJS(nextState)) ||
+ !is(fromJS(config.wrap), fromJS(nextProps.config.wrap)) ||
+ !is(fromJS(config.search), fromJS(nextProps.config.search)) ||
+ config.setting.laypage !== nextProps.config.setting.laypage
}
moveCol = (dragIndex, hoverIndex) => {
@@ -146,20 +206,139 @@
this.setState({
columns: _columns
}, () => {
- // this.props.onChange(_data)
+ this.props.updatecolumn({...this.props.config, cols: _columns})
})
}
updateCol = (col) => {
+ let _columns = fromJS(this.state.columns).toJS()
+ if (col.isSub) {
+ _columns = _columns.map(column => {
+ if (column.type === 'colspan') {
+ column.subcols = column.subcols.map(item => {
+ if (item.uuid === col.uuid) {
+ return col
+ }
+ return item
+ })
+ }
+ return column
+ })
+ } else {
+ _columns = _columns.map(column => {
+ if (column.uuid === col.uuid) {
+ return col
+ }
+ return column
+ })
+ }
+
+ this.setState({
+ columns: _columns,
+ }, () => {
+ this.props.updatecolumn({...this.props.config, cols: _columns})
+ })
+ }
+
+ editColumn = (col) => {
+ this.setState({
+ card: fromJS(col).toJS()
+ })
+ }
+
+ addElement = (col) => {
+ const { config } = this.props
+ let column = fromJS(col).toJS()
+
+ if (column.type === 'colspan') {
+ column.subcols = column.subcols || []
+ let subcol = { isSub: true, focus: true, uuid: Utils.getuuid(), label: 'label', field: '', type: 'text' }
+ column.subcols.push(subcol)
+
+ this.setState({
+ card: subcol
+ })
+ this.updateCol(column)
+ } else if (column.type === 'custom') {
+ let newcard = {uuid: Utils.getuuid(), focus: true, eleType: 'text', datatype: 'dynamic'}
+
+ // 娉ㄥ唽浜嬩欢-娣诲姞鍏冪礌
+ MKEmitter.emit('cardAddElement', [config.uuid, 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',
+ $type: 'tableButton'
+ }
+
+ // 娉ㄥ唽浜嬩欢-娣诲姞鍏冪礌
+ MKEmitter.emit('cardAddElement', [config.uuid, column.uuid], newcard)
+ }
+ }
+
+ submitCol = (col) => {
+ const { card } = this.state
+
+ col.uuid = card.uuid
+ col.isSub = card.isSub === true
+ col.marks = card.marks || []
+
+ if (col.type === 'colspan') {
+ col.subcols = card.subcols || []
+ } else if (col.type === 'custom') {
+ col.elements = card.type === 'custom' ? (card.elements || []) : []
+ } else if (col.type === 'action') {
+ col.elements = card.type === 'action' ? (card.elements || []) : []
+ }
+
+ this.setState({card: null})
+ this.updateCol(col)
+ }
+
+ cancelCol = () => {
+ const { card } = this.state
+
+ if (card.focus) {
+ this.deleteCol(card)
+ }
+
+ this.setState({card: null})
}
deleteCol = (col) => {
+ let _columns = fromJS(this.state.columns).toJS()
+ if (col.isSub) {
+ _columns = _columns.map(column => {
+ if (column.type !== 'colspan') return column
+ if (column.subcols && column.subcols.length > 0) {
+ column.subcols = column.subcols.filter(item => item.uuid !== col.uuid)
+ }
+ return column
+ })
+ } else {
+ _columns = _columns.filter(column => column.uuid !== col.uuid)
+ }
+
+ this.setState({
+ columns: _columns
+ }, () => {
+ this.props.updatecolumn({...this.props.config, cols: _columns})
+ })
}
render() {
- const { fields } = this.state
+ const { config } = this.props
+ const { fields, card } = this.state
const components = {
header: {
cell: DragableHeaderCol
@@ -173,48 +352,53 @@
return {
title: col.label,
dataIndex: col.field,
- align: 'right',
+ align: col.Align,
sorter: col.IsSort === 'true',
onCell: () => ({
column: col,
- fields: fields
+ width: col.Width,
+ config: config,
+ upComponent: this.updateCol
}),
children: col.subcols && col.subcols.length > 0 ? col.subcols.map(cell => ({
- align: 'left',
+ align: col.Align,
title: cell.label,
key: cell.uuid,
onCell: () => ({
column: cell,
- fields: fields
+ width: cell.Width,
+ config: config,
+ upComponent: this.updateCol
}),
onHeaderCell: () => ({
column: cell,
- fields: fields,
- updateCol: this.updateCol,
+ align: cell.Align,
+ addElement: this.addElement,
+ editColumn: this.editColumn,
deleteCol: this.deleteCol,
})
})) : null,
onHeaderCell: () => ({
index,
column: col,
- fields: fields,
+ align: col.Align,
moveCol: this.moveCol,
- updateCol: this.updateCol,
+ addElement: this.addElement,
+ editColumn: this.editColumn,
deleteCol: this.deleteCol,
})
}
})
return (
- <div className="normal-table-columns">
+ <div className={`normal-table-columns ${config.setting.laypage} ${config.wrap.tableType}`}>
<DndProvider>
<Table
- bordered
rowKey="uuid"
- // bordered={false}
+ bordered={config.wrap.border !== 'false'}
components={components}
dataSource={this.state.data}
- rowSelection={{type: 'radio'}}
+ rowSelection={config.wrap.tableType ? { type: 'radio' } : null}
columns={columns}
rowClassName="editable-row"
pagination={{
@@ -225,12 +409,9 @@
total: 58,
showTotal: (total, range) => `${range[0]}-${range[1]} 鍏� ${total} 鏉
}}
- // onRow={(record, index) => ({
- // index,
- // moveRow: this.moveRow,
- // })}
/>
</DndProvider>
+ <EditColumn column={card} dict={coldict} fields={fields} submitCol={this.submitCol} cancelCol={this.cancelCol}/>
</div>
)
}
--
Gitblit v1.8.0