From c2580fb8de3bdaabb4179b0ce0fcd2fbac802441 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 01 三月 2023 00:49:14 +0800
Subject: [PATCH] 2023-03-01
---
src/menu/components/table/edit-table/columns/index.jsx | 226 ++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 145 insertions(+), 81 deletions(-)
diff --git a/src/menu/components/table/edit-table/columns/index.jsx b/src/menu/components/table/edit-table/columns/index.jsx
index 09ab9f2..afa1eba 100644
--- a/src/menu/components/table/edit-table/columns/index.jsx
+++ b/src/menu/components/table/edit-table/columns/index.jsx
@@ -59,25 +59,57 @@
</th>
)
- return connectDragSource(
- connectDropTarget(<th {...restProps} index={index} style={{ cursor: 'move', textAlign: align }} 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()}>
- {['custom', 'action'].includes(column.type) ?
- <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}
- {column.type === 'action' ? <PasteComponent options={['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} />
- {['text', 'number', 'formula'].includes(column.type) ? <MarkColumn field={column.field || ''} columns={fields} marks={column.marks} onSubmit={this.updateMarks} /> : null }
- </div>
- } trigger="hover">
- {children}
- </Popover>
- </th>),
- )
+ 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={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()}>
+ {['custom', 'colspan', 'action'].includes(column.type) ?
+ <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}
+ {column.type === 'action' ? <PasteComponent options={['action']} updateConfig={(res, resolve) => this.props.pasteCell(column, res, resolve)} /> : null}
+ {column.type === 'custom' || column.type === 'action' ? <FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={() => this.props.changeStyle(column)}/> : null}
+ <DeleteOutlined className="close" title="鍒犻櫎" onClick={this.deleteCol} />
+ {['text', 'number', 'formula'].includes(column.type) ? <MarkColumn field={column.field || ''} columns={fields} marks={column.marks} onSubmit={this.updateMarks} /> : null }
+ </div>
+ } trigger="hover">
+ {children}
+ </Popover>
+ </th>),
+ )
+ } else if (column) {
+ let style = {textAlign: align}
+ if (column.Width) {
+ style.width = column.Width
+ style.minWidth = column.Width
+ }
+
+ 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()}>
+ {['custom', 'colspan'].includes(column.type) ?
+ <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 field={column.field || ''} columns={fields} marks={column.marks} onSubmit={this.updateMarks} /> : null }
+ </div>
+ } trigger="hover">
+ {children}
+ </Popover>
+ </th>
+ )
+ }
}
}
@@ -128,8 +160,7 @@
return !is(fromJS(column), fromJS(nextProps.column)) ||
!is(fromJS(config.columns), fromJS(nextProps.config.columns)) ||
- !is(fromJS(config.action), fromJS(nextProps.config.action)) ||
- !is(fromJS(config.search), fromJS(nextProps.config.search))
+ !is(fromJS(config.action), fromJS(nextProps.config.action))
}
render() {
@@ -137,13 +168,13 @@
if (column && column.type === 'custom') {
return (
- <td style={{padding: 0, minWidth: column.Width || 100, ...(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}} 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>
)
@@ -159,7 +190,7 @@
}
}
return (
- <td style={{...style, minWidth: column.Width || 100}} className={className}>
+ <td style={style} className={className}>
{column.field ? <Paragraph className="col-copy" copyable={{ text: column.field }}>{val}</Paragraph> : val}
{column.marks && column.marks.length ? <AntDesignOutlined className="profile"/> : null}
{column.Hide === 'true' ? <CloseCircleOutlined className="close-col"/> : null}
@@ -182,7 +213,6 @@
}
state = {
- appType: sessionStorage.getItem('appType'),
tableId: '',
data: [{uuid: Utils.getuuid()}],
refresh: false, // 寮哄埗鍒锋柊
@@ -243,7 +273,6 @@
return !is(fromJS(this.state), fromJS(nextState)) ||
!is(fromJS(config.wrap), fromJS(nextProps.config.wrap)) ||
!is(fromJS(config.submit), fromJS(nextProps.config.submit)) ||
- !is(fromJS(config.search), fromJS(nextProps.config.search)) ||
!is(fromJS(config.action), fromJS(nextProps.config.action)) ||
config.setting.laypage !== nextProps.config.setting.laypage
}
@@ -264,11 +293,18 @@
let _columns = fromJS(this.state.columns).toJS()
let type = item.subType
- if (item.subType === 'link' || item.subType === 'colspan' || item.subType === 'picture') {
+ if (!['text', 'number', 'textarea', 'custom', 'action', 'formula', 'index', 'colspan'].includes(item.subType)) {
type = 'text'
}
let col = { focus: true, uuid: Utils.getuuid(), label: 'label', field: '', type: type, elements: [] }
+ if (col.type === 'colspan') {
+ col.subcols = []
+ } else if (col.type === 'action') {
+ col.label = '鎿嶄綔'
+ } else if (col.type === 'index') {
+ col.label = '搴忓彿'
+ }
_columns.splice(hoverIndex, 0, col)
@@ -279,14 +315,21 @@
})
}
- updateCol = (col, btn) => {
- let _columns = fromJS(this.state.columns).toJS()
- _columns = _columns.map(column => {
+ loopCol = (columns, col) => {
+ return columns.map(column => {
+ if (column.type === 'colspan') {
+ column.subcols = this.loopCol(column.subcols || [], col)
+ }
if (column.uuid === col.uuid) {
return col
}
return column
})
+ }
+
+ updateCol = (col, btn) => {
+ let _columns = fromJS(this.state.columns).toJS()
+ _columns = this.loopCol(_columns, col)
this.setState({
columns: _columns,
@@ -294,6 +337,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)
@@ -319,7 +366,16 @@
addElement = (col) => {
let column = fromJS(col).toJS()
- if (column.type === 'custom') {
+ 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, width: 24, eleType: 'text', datatype: 'dynamic', style: {paddingLeft: '4px'}}
// 娉ㄥ唽浜嬩欢-娣诲姞鍏冪礌
@@ -346,9 +402,17 @@
submitCol = (col) => {
const { card } = this.state
- if (col.type === 'custom') {
+ 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.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 || []) : []
}
@@ -396,30 +460,25 @@
this.setState({card: null})
}
+ loopDelCol = (columns, col) => {
+ return columns.filter(column => {
+ if (column.type === 'colspan') {
+ column.subcols = this.loopDelCol(column.subcols, col)
+ }
+ return column.uuid !== col.uuid
+ })
+ }
+
deleteCol = (col) => {
- const { appType } = this.state
let _columns = fromJS(this.state.columns).toJS()
- _columns = _columns.filter(column => column.uuid !== col.uuid)
+ _columns = this.loopDelCol(_columns, col)
this.setState({
columns: _columns
}, () => {
this.props.updatecolumn({...this.props.config, cols: _columns})
})
-
- if (col.type !== 'action' || appType === 'mob') return
-
- let uuids = []
- col.elements && col.elements.forEach(c => {
- if (appType === 'pc' && c.OpenType !== 'popview') return
-
- uuids.push(c.uuid)
- })
-
- if (uuids.length === 0) return
-
- MKEmitter.emit('delButtons', uuids)
}
updateLineMarks = (vals) => {
@@ -541,6 +600,43 @@
MKEmitter.removeListener('submitStyle', this.getStyle)
}
+ handlecolumns = (columns, fields, config, isSub) => {
+ return columns.map((col, index) => {
+ let title = col.label
+ if (col.editable === 'true') {
+ title = <span>{col.label}<EditOutlined style={{position: 'absolute', bottom: 0, right: 0, color: '#1890ff', opacity: '0.7'}}/></span>
+ }
+
+ return {
+ title: title,
+ dataIndex: col.uuid,
+ align: col.Align,
+ sorter: col.IsSort === 'true',
+ onCell: () => ({
+ column: col,
+ width: col.Width,
+ config: config,
+ upComponent: this.updateCol
+ }),
+ onHeaderCell: () => ({
+ index: isSub ? undefined : index,
+ column: col,
+ fields: fields,
+ align: col.Align,
+ moveCol: this.moveCol,
+ dropCol: this.dropCol,
+ updateCol: this.updateCol,
+ addElement: this.addElement,
+ editColumn: this.editColumn,
+ pasteCell: this.pasteCell,
+ changeStyle: this.changeStyle,
+ deleteCol: this.deleteCol,
+ }),
+ children: col.subcols && col.subcols.length ? this.handlecolumns(col.subcols, fields, config, true) : null,
+ }
+ })
+ }
+
render() {
const { config } = this.props
const { fields, card, lineMarks, tableId, visible } = this.state
@@ -560,41 +656,10 @@
}
}
- const columns = this.state.columns.map((col, index) => {
- let title = col.label
- if (col.editable === 'true') {
- title = <span>{col.label}<EditOutlined style={{position: 'absolute', bottom: 0, right: 0, color: '#1890ff', opacity: '0.7'}}/></span>
- }
- return {
- title: title,
- dataIndex: col.uuid,
- align: col.Align,
- sorter: col.IsSort === 'true',
- onCell: () => ({
- column: col,
- width: col.Width,
- config: config,
- upComponent: this.updateCol
- }),
- onHeaderCell: () => ({
- index,
- column: col,
- fields: fields,
- align: col.Align,
- moveCol: this.moveCol,
- dropCol: this.dropCol,
- updateCol: this.updateCol,
- addElement: this.addElement,
- editColumn: this.editColumn,
- pasteCell: this.pasteCell,
- changeStyle: this.changeStyle,
- deleteCol: this.deleteCol,
- }),
- }
- })
+ const columns = this.handlecolumns(this.state.columns, fields, config)
return (
- <div className={`edit-table-columns ${config.setting.laypage} ${config.wrap.mode || ''}`} id={tableId}>
+ <div className={`edit-table-columns ${config.setting.laypage} ${config.wrap.mode || ''} table-vertical-${config.wrap.vertical || ''}`} id={tableId}>
<div className="col-control">
<Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
<div className="mk-popover-control">
@@ -613,7 +678,6 @@
<Table
rowKey="uuid"
size={config.wrap.size || 'middle'}
- rowClassName="editable-row"
bordered={config.wrap.bordered !== 'false'}
rowSelection={rowSelection}
components={components}
--
Gitblit v1.8.0