From 49f09cc6f8ff8c30a75ed1a9d6f510b69b73962a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 12 十二月 2023 21:05:37 +0800
Subject: [PATCH] 2023-12-12
---
src/menu/components/table/normal-table/columns/index.jsx | 184 +++++++++++++++++++++++++++------------------
1 files changed, 109 insertions(+), 75 deletions(-)
diff --git a/src/menu/components/table/normal-table/columns/index.jsx b/src/menu/components/table/normal-table/columns/index.jsx
index 47ea9a5..585012a 100644
--- a/src/menu/components/table/normal-table/columns/index.jsx
+++ b/src/menu/components/table/normal-table/columns/index.jsx
@@ -12,11 +12,12 @@
import './index.scss'
const { confirm } = Modal
-const { Paragraph } = Typography
+const { Paragraph } = Typography
const EditColumn = asyncComponent(() => import('./editColumn'))
const MarkColumn = asyncIconComponent(() => import('@/menu/components/share/markcomponent'))
const CardCellComponent = asyncComponent(() => import('@/menu/components/card/cardcellcomponent'))
const MobPagination = asyncIconComponent(() => import('@/menu/components/share/mobPagination'))
+const ColsControl = asyncIconComponent(() => import('@/menu/components/share/colsControl'))
const PasteComponent = asyncIconComponent(() => import('@/components/paste'))
class HeaderCol extends Component {
@@ -37,6 +38,32 @@
this.props.updateCol({...column, marks: vals})
}
+ copycolumn = () => {
+ const { column } = this.props
+
+ let oInput = document.createElement('input')
+ let val = {
+ copyType: 'cols',
+ cols: [column]
+ }
+
+ let srcid = localStorage.getItem(window.location.href.split('#')[0] + 'srcId')
+ if (srcid) {
+ val.$srcId = srcid
+ }
+
+ oInput.value = window.btoa(window.encodeURIComponent(JSON.stringify(val)))
+ document.body.appendChild(oInput)
+ oInput.select()
+ document.execCommand('Copy')
+ oInput.className = 'oInput'
+ oInput.style.display = 'none'
+
+ message.success('澶嶅埗鎴愬姛銆�')
+
+ document.body.removeChild(oInput)
+ }
+
shouldComponentUpdate (nextProps, nextState) {
if (this.props.rowSpan !== nextProps.rowSpan || this.props.colSpan !== nextProps.colSpan) {
@@ -52,68 +79,41 @@
}
render() {
- const { connectDragSource, connectDropTarget, moveCol, dropCol, addElement, updateCol, editColumn, pasteCell, changeStyle, deleteCol, index, column, align, fields, children, ...restProps } = this.props
+ const { connectDragSource, connectDropTarget, moveCol, componentId, dropCol, addElement, updateCol, editColumn, pasteCell, changeStyle, deleteCol, index, column, align, fields, children, ...restProps } = this.props
- if (index !== undefined && column) {
- let style = {cursor: 'move', textAlign: align}
- if (column.Width) {
- style.width = column.Width
- style.minWidth = column.Width
- }
+ if (!column) return (
+ <th {...restProps}>{children}</th>
+ )
- if (window.GLOB.columnId === column.uuid) {
- style.color = '#1890ff'
- }
-
- 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()}>
- {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', '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>),
- )
- } else if (column) {
- let style = {textAlign: align}
- if (column.Width) {
- 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.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', 'action']} updateConfig={(res, resolve) => this.props.pasteCell(column, res, resolve)} /> : 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 {
- return (<th {...restProps}>{children}</th>)
+ 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={() => 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.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)} />
+ <CopyOutlined title="澶嶅埗鏄剧ず鍒�" style={{color: '#26C281'}} onClick={this.copycolumn} />
+ {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} />
+ {['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,17 +128,28 @@
const ColTarget = {
drop(props, monitor) {
const item = monitor.getItem()
- const dragIndex = item.index
- const hoverIndex = props.index
+ let dragIndex = item.index
+ let hoverIndex = props.index
if (item.$init) {
- props.dropCol(item, hoverIndex)
+ if (/sub_/.test(hoverIndex)) {
+ message.warning('鍚堝苟鍒楀瓙鍏冪礌鏆備笉鏀寔鎷栨嫿娣诲姞銆�')
+ } else {
+ props.dropCol(item, hoverIndex.replace(new RegExp(props.componentId + '@', 'ig'), ''))
+ }
return
} else if (dragIndex === undefined || hoverIndex === undefined || dragIndex === hoverIndex) {
return
+ } else {
+ let reg = new RegExp(props.componentId + '@', 'ig')
+ if (reg.test(dragIndex)) {
+ props.moveCol(dragIndex.replace(reg, ''), hoverIndex.replace(reg, ''))
+ } else {
+ message.warning('鎷栧姩鍏冪礌涓嶅湪褰撳墠缁勪欢涓��')
+ return
+ }
}
- props.moveCol(dragIndex, hoverIndex)
monitor.getItem().index = hoverIndex
},
}
@@ -267,23 +278,38 @@
}
shouldComponentUpdate (nextProps, nextState) {
- const { config } = this.props
-
- return !is(fromJS(this.state), fromJS(nextState)) ||
- !is(fromJS(config.wrap), fromJS(nextProps.config.wrap)) ||
- !is(fromJS(config.action), fromJS(nextProps.config.action)) ||
- config.setting.laypage !== nextProps.config.setting.laypage
+ return !is(fromJS(this.state), fromJS(nextState)) || !is(fromJS(this.props.config), fromJS(nextProps.config))
}
moveCol = (dragIndex, hoverIndex) => {
let _columns = fromJS(this.state.columns).toJS()
- _columns.splice(hoverIndex, 0, ..._columns.splice(dragIndex, 1))
+ if (/^sub_/.test(dragIndex) || /^sub_/.test(hoverIndex)) {
+ let sign1 = dragIndex.split('_')
+ let sign2 = hoverIndex.split('_')
+ if (sign1[1] !== sign2[1]) {
+ message.warning('鎷栧姩鍏冪礌涓嶅湪鍚屼竴涓悎骞跺垪涓��')
+ return
+ }
+ this.loopMoveCol(_columns, sign1[1], sign1[2], sign2[2])
+ } else {
+ _columns.splice(hoverIndex, 0, ..._columns.splice(dragIndex, 1))
+ }
this.setState({
columns: _columns
}, () => {
this.props.updatecolumn({...this.props.config, cols: _columns})
+ })
+ }
+
+ loopMoveCol = (columns, colId, dragIndex, hoverIndex) => {
+ columns.forEach(column => {
+ if (column.type === 'colspan' && column.uuid === colId) {
+ column.subcols.splice(hoverIndex, 0, ...column.subcols.splice(dragIndex, 1))
+ } else if (column.type === 'colspan') {
+ this.loopMoveCol(column.subcols, colId, dragIndex, hoverIndex)
+ }
})
}
@@ -507,7 +533,7 @@
document.body.removeChild(oInput)
}
- handlecolumns = (columns, fields, config, isSub) => {
+ handlecolumns = (columns, fields, config, pId) => {
return columns.map((col, index) => {
return {
title: col.label,
@@ -521,8 +547,9 @@
upComponent: this.updateCol
}),
onHeaderCell: () => ({
- index: isSub ? undefined : index,
+ index: pId ? config.uuid + '@sub_' + pId + '_' + index : config.uuid + '@' + index,
column: col,
+ componentId: config.uuid,
fields: fields,
align: col.Align,
moveCol: this.moveCol,
@@ -534,7 +561,7 @@
changeStyle: this.changeStyle,
deleteCol: this.deleteCol,
}),
- children: col.subcols && col.subcols.length ? this.handlecolumns(col.subcols, fields, config, true) : null,
+ children: col.subcols && col.subcols.length ? this.handlecolumns(col.subcols, fields, config, col.uuid) : null,
}
})
}
@@ -559,7 +586,6 @@
} else {
cell.type = 'number'
cell.format = 'none'
- cell.sum = 'false'
cell.decimal = item.decimal || 0
cell.Width = 80
}
@@ -594,6 +620,12 @@
})
}
+ addColumns = () => {
+ const { config } = this.props
+
+ MKEmitter.emit('addColumns', config.uuid)
+ }
+
/**
* @description 缁勪欢閿�姣侊紝娓呴櫎state鏇存柊锛屾竻闄ゅ揩鎹烽敭璁剧疆
*/
@@ -620,8 +652,10 @@
return (
<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">
+ <PlusOutlined style={{color: '#26C281'}} title="娣诲姞鍒�" onClick={this.addColumns}/>
<CopyOutlined title="澶嶅埗鏄剧ず鍒�" onClick={this.copycolumn} />
<MarkColumn columns={fields} type="line" marks={lineMarks} onSubmit={this.updateLineMarks} />
+ {appType !== 'mob' ? <ColsControl config={config} onSubmit={this.props.updatecolumn}/> : null}
<FileSyncOutlined title="鍚屾瀛楁闆�" onClick={this.syncfield} />
<DeleteOutlined title="娓呯┖鏄剧ず鍒�" onClick={this.clear}/>
</div>
--
Gitblit v1.8.0