From f3d4db769ba9b51b799d981511a710fd443d0e08 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 21 四月 2025 12:18:03 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/table/edit-table/columns/index.jsx | 311 +++++++++++++++++++++++++++++----------------------
1 files changed, 174 insertions(+), 137 deletions(-)
diff --git a/src/menu/components/table/edit-table/columns/index.jsx b/src/menu/components/table/edit-table/columns/index.jsx
index abd291a..16de3eb 100644
--- a/src/menu/components/table/edit-table/columns/index.jsx
+++ b/src/menu/components/table/edit-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, Button, Typography } from 'antd'
-import { PlusOutlined, FileSyncOutlined, EditOutlined, CopyOutlined, DeleteOutlined, FontColorsOutlined, CloseCircleOutlined, AntDesignOutlined } from '@ant-design/icons'
+import { PlusOutlined, PlusSquareOutlined, FileSyncOutlined, EditOutlined, CopyOutlined, DeleteOutlined, FontColorsOutlined, CloseCircleOutlined, AntDesignOutlined } from '@ant-design/icons'
import asyncComponent from '@/utils/asyncComponent'
import asyncIconComponent from '@/utils/asyncIconComponent'
@@ -16,17 +16,18 @@
const EditColumn = asyncComponent(() => import('./editColumn'))
const TableVerify = asyncComponent(() => import('./tableIn'))
const MarkColumn = asyncIconComponent(() => import('@/menu/components/share/markcomponent'))
+const ColsControl = asyncIconComponent(() => import('@/menu/components/share/colsControl'))
const CardCellComponent = asyncComponent(() => import('@/menu/components/card/cardcellcomponent'))
const PasteComponent = asyncIconComponent(() => import('@/components/paste'))
class HeaderCol extends Component {
deleteCol = () => {
- const _this = this
+ const that = this
confirm({
content: '纭畾鍒犻櫎鏄剧ず鍒楀悧锛�',
onOk() {
- _this.props.deleteCol(_this.props.column)
+ that.props.deleteCol(that.props.column)
},
onCancel() {}
})
@@ -35,6 +36,27 @@
updateMarks = (vals) => {
const { column } = this.props
this.props.updateCol({...column, marks: vals})
+ }
+
+ copycolumn = () => {
+ const { column } = this.props
+
+ let oInput = document.createElement('input')
+ let val = {
+ copyType: 'editcols',
+ cols: [column]
+ }
+
+ 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) {
@@ -47,69 +69,48 @@
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 ||
+ (nextProps.className && this.props.className !== nextProps.className) ||
+ window.GLOB.columnId === nextProps.column.uuid ||
+ window.GLOB.precolumnId === nextProps.column.uuid
}
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 (!column) return (
- <th {...restProps} index={index}>
- {children}
- </th>
+ <th {...restProps}>{children}</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>
- )
+ 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', 'extend'].includes(column.type) ? <MarkColumn field={column.field || ''} columns={fields} marks={column.marks} onSubmit={this.updateMarks} /> : null }
+ </div>
+ } trigger="hover">
+ {children}
+ </Popover>
+ </th>),
+ )
}
}
@@ -124,17 +125,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
},
}
@@ -172,22 +184,16 @@
<CardCellComponent cards={config} cardCell={column} elements={column.elements} updateElement={this.updateCard}/>
</td>
)
- } else if (column && column.type === 'action') {
- return (
- <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>
- )
} else if (column) {
let val = column.field || ''
if (column.type === 'index') {
val = '$Index'
} else if (column.type === 'formula') {
val = column.formula
- if (column.eval === 'false') {
- val = val.replace(/\n/ig, '<br/>').replace(/\s/ig, ' ')
- val = <span style={{fontWeight: 'inherit'}} dangerouslySetInnerHTML={{__html: val}}></span>
- }
+ // if (column.eval === 'false') {
+ // val = val.replace(/\n/ig, '<br/>').replace(/\s/ig, ' ')
+ // val = <span style={{fontWeight: 'inherit'}} dangerouslySetInnerHTML={{__html: val}}></span>
+ // }
}
return (
<td style={style} className={className}>
@@ -208,8 +214,9 @@
class NormalTableColumns extends Component {
static propTpyes = {
- config: PropTypes.object, // 閰嶇疆淇℃伅
- updatecolumn: PropTypes.func // 鏁版嵁鍙樺寲
+ config: PropTypes.object,
+ updatecolumn: PropTypes.func,
+ addColumns: PropTypes.func
}
state = {
@@ -268,19 +275,23 @@
}
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.submit), fromJS(nextProps.config.submit)) ||
- !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
@@ -289,19 +300,27 @@
})
}
+ 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)
+ }
+ })
+ }
+
dropCol = (item, hoverIndex) => {
let _columns = fromJS(this.state.columns).toJS()
let type = item.subType
- if (!['text', 'number', 'textarea', 'custom', 'action', 'formula', 'index', 'colspan'].includes(item.subType)) {
+ if (!['text', 'number', 'textarea', 'custom', 'formula', 'index', 'colspan'].includes(item.subType)) {
type = 'text'
}
- let col = { focus: true, uuid: Utils.getuuid(), label: 'label', field: '', type: type, elements: [] }
+ let col = { focus: true, uuid: Utils.getuuid(), Width: 120, 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 = '搴忓彿'
}
@@ -356,14 +375,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 || cell.width === 0 ? 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') {
@@ -376,31 +404,35 @@
})
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)
}
}
submitCol = (col) => {
const { card } = this.state
+
+ if (!card) return
col.uuid = card.uuid
col.isSub = card.isSub === true
@@ -411,10 +443,10 @@
} 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 || []) : []
}
+
+ window.GLOB.precolumnId = window.GLOB.columnId || ''
+ window.GLOB.columnId = col.uuid
this.setState({card: null})
this.updateCol(col)
@@ -472,7 +504,22 @@
deleteCol = (col) => {
let _columns = fromJS(this.state.columns).toJS()
- _columns = this.loopDelCol(_columns, col)
+ if (col.type === 'colspan' && col.subcols && col.subcols.length > 0) {
+ let Index = _columns.findIndex(item => item.uuid === col.uuid)
+
+ if (Index !== -1) {
+ let list = col.subcols.map(item => {
+ item.isSub = false
+ return item
+ })
+
+ _columns.splice(Index, 1, ...list)
+ } else {
+ _columns = this.loopDelCol(_columns, col)
+ }
+ } else {
+ _columns = this.loopDelCol(_columns, col)
+ }
this.setState({
columns: _columns
@@ -497,13 +544,8 @@
let oInput = document.createElement('input')
let val = {
- copyType: 'cols',
+ copyType: 'editcols',
cols: columns.filter(col => !col.origin)
- }
-
- let srcid = localStorage.getItem(window.location.href.split('#')[0] + 'srcId')
- if (srcid) {
- val.$srcId = srcid
}
oInput.value = window.btoa(window.encodeURIComponent(JSON.stringify(val)))
@@ -545,13 +587,13 @@
columns.push(cell)
})
- const _this = this
+ const that = this
confirm({
content: '纭畾鍚屾瀛楁闆嗗悧锛�',
onOk() {
- _this.setState({columns}, () => {
- _this.props.updatecolumn({..._this.props.config, cols: columns})
+ that.setState({columns}, () => {
+ that.props.updatecolumn({...that.props.config, cols: columns})
})
},
onCancel() {}
@@ -559,13 +601,13 @@
}
clear = () => {
- const _this = this
+ const that = this
confirm({
content: '纭畾娓呯┖鏄剧ず鍒楀悧锛�',
onOk() {
- _this.setState({columns: []}, () => {
- _this.props.updatecolumn({..._this.props.config, cols: []})
+ that.setState({columns: []}, () => {
+ that.props.updatecolumn({...that.props.config, cols: []})
})
},
onCancel() {}
@@ -585,10 +627,6 @@
})
}
- componentDidMount () {
- MKEmitter.addListener('submitStyle', this.getStyle)
- }
-
/**
* @description 缁勪欢閿�姣侊紝娓呴櫎state鏇存柊锛屾竻闄ゅ揩鎹烽敭璁剧疆
*/
@@ -596,10 +634,9 @@
this.setState = () => {
return
}
- MKEmitter.removeListener('submitStyle', this.getStyle)
}
- handlecolumns = (columns, fields, config, isSub) => {
+ handlecolumns = (columns, fields, config, pId) => {
return columns.map((col, index) => {
let title = col.label
if (col.editable === 'true') {
@@ -618,8 +655,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,
@@ -631,7 +669,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,
}
})
}
@@ -668,8 +706,10 @@
} trigger="hover">
<Button className="submit-btn" style={config.submit.style} onDoubleClick={() => this.setState({visible: true})} type="primary">鎻愪氦</Button>
</Popover>
+ <PlusOutlined title="娣诲姞鍒�" onClick={this.props.addColumns}/>
<CopyOutlined title="澶嶅埗鏄剧ず鍒�" onClick={this.copycolumn} />
<MarkColumn columns={fields} type="line" marks={lineMarks} onSubmit={this.updateLineMarks} />
+ <ColsControl config={config} onSubmit={this.props.updatecolumn}/>
<FileSyncOutlined title="鍚屾瀛楁闆�" onClick={this.syncfield} />
<DeleteOutlined title="娓呯┖鏄剧ず鍒�" onClick={this.clear}/>
</div>
@@ -692,21 +732,18 @@
}}
/>
</DndProvider>
- <EditColumn column={card} columns={this.state.columns} fields={fields} submitCol={this.submitCol} cancelCol={this.cancelCol}/>
+ <EditColumn column={card} wrap={config.wrap} columns={this.state.columns} fields={fields} submitCol={this.submitCol} cancelCol={this.cancelCol}/>
<Modal
wrapClassName="mk-pop-modal"
visible={visible}
- width={'75vw'}
+ width={'90vw'}
maskClosable={false}
onOk={this.verifySubmit}
onCancel={() => { this.setState({ visible: false }) }}
destroyOnClose
>
<TableVerify
- card={config.submit}
- setting={config.setting}
- cols={config.cols}
- columns={config.columns}
+ config={config}
wrappedComponentRef={(inst) => this.verifyRef = inst}
/>
</Modal>
--
Gitblit v1.8.0