From b8e1395f02c929eaa96b949cf6027ee2a43856a6 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 06 九月 2022 19:03:37 +0800
Subject: [PATCH] 2022-09-06
---
src/menu/components/table/edit-table/columns/index.jsx | 193 +++++++++++++++++++++++++++++++++++-------------
1 files changed, 141 insertions(+), 52 deletions(-)
diff --git a/src/menu/components/table/edit-table/columns/index.jsx b/src/menu/components/table/edit-table/columns/index.jsx
index 639a389..870e23a 100644
--- a/src/menu/components/table/edit-table/columns/index.jsx
+++ b/src/menu/components/table/edit-table/columns/index.jsx
@@ -2,7 +2,8 @@
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
import { DndProvider, DragSource, DropTarget } from 'react-dnd'
-import { Table, Popover, Icon, Modal, message } from 'antd'
+import { Table, Popover, Modal, message, Button } from 'antd'
+import { PlusOutlined, FileSyncOutlined, EditOutlined, CopyOutlined, DeleteOutlined, FontColorsOutlined, CloseCircleOutlined, AntDesignOutlined } from '@ant-design/icons'
import asyncComponent from '@/utils/asyncComponent'
import asyncIconComponent from '@/utils/asyncIconComponent'
@@ -14,8 +15,10 @@
const { confirm } = Modal
const EditColumn = asyncComponent(() => import('./editColumn'))
+const TableVerify = asyncComponent(() => import('./tableIn'))
const MarkColumn = asyncIconComponent(() => import('@/menu/components/share/markcomponent'))
const CardCellComponent = asyncComponent(() => import('@/menu/components/card/cardcellcomponent'))
+const PasteComponent = asyncIconComponent(() => import('@/components/paste'))
class HeaderCol extends Component {
deleteCol = () => {
@@ -41,7 +44,7 @@
return true
}
- if (!nextProps.column) return false
+ if (!nextProps.column) return true
return !is(fromJS(this.props.column), fromJS(nextProps.column)) ||
!is(fromJS(this.props.fields), fromJS(nextProps.fields)) ||
@@ -49,19 +52,27 @@
}
render() {
- const { connectDragSource, connectDropTarget, moveCol, addElement, updateCol, editColumn, changeStyle, deleteCol, index, column, align, fields, children, ...restProps } = this.props
+ const { connectDragSource, connectDropTarget, moveCol, addElement, updateCol, editColumn, pasteCell, changeStyle, deleteCol, index, column, align, fields, children, ...restProps } = this.props
+
+ if (!column) return (
+ <th {...restProps} index={index}>
+ {children}
+ </th>
+ )
return connectDragSource(
- connectDropTarget(<th {...restProps} index={index} style={{ cursor: 'move', textAlign: align }} onDoubleClick={() => column && this.props.editColumn(column)}>
+ 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">
- {column && ['custom', 'action'].includes(column.type) ?
- <Icon className="plus" title="娣诲姞" type="plus" onClick={() => this.props.addElement(column)} /> : null
+ <div className="mk-popover-control" onDoubleClick={(e) => e.stopPropagation()}>
+ {['custom', 'action'].includes(column.type) ?
+ <PlusOutlined className="plus" title="娣诲姞" onClick={() => this.props.addElement(column)} /> : null
}
- <Icon className="edit" title="缂栬緫" type="edit" onClick={() => this.props.editColumn(column)} />
- {column && column.type === 'custom' ? <Icon className="style" title="璋冩暣鏍峰紡" onClick={() => this.props.changeStyle(column)} type="font-colors" /> : null}
- <Icon className="close" title="鍒犻櫎" type="delete" onClick={this.deleteCol} />
- {column && ['text', 'number'].includes(column.type) ? <MarkColumn columns={fields} marks={column.marks} onSubmit={this.updateMarks} /> : 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}
@@ -134,11 +145,21 @@
</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>
+ }
+ }
return (
<td style={{...style, minWidth: column.Width || 100}} className={className}>
- {column.field || (column.type === 'index' ? '$Index' : '')}
- {column.Hide === 'true' ? <Icon style={{marginLeft: '5px', color: 'orange', fontSize: '12px'}} type="close-circle" /> : null}
- {column.marks && column.marks.length ? <Icon className="profile" type="ant-design"/> : null}
+ {val}
+ {column.Hide === 'true' ? <CloseCircleOutlined style={{marginLeft: '5px', color: 'orange', fontSize: '12px'}}/> : null}
+ {column.marks && column.marks.length ? <AntDesignOutlined className="profile"/> : null}
</td>
)
} else {
@@ -181,18 +202,17 @@
return uuid.join('')
}) ()
- if (config.wrap && config.wrap.borderColor) { // 杈规棰滆壊
- let style = `#${tableId} table, #${tableId} tr, #${tableId} th, #${tableId} td {border-color: ${config.wrap.borderColor}}`
- let ele = document.createElement('style')
- ele.innerHTML = style
- document.getElementsByTagName('head')[0].appendChild(ele)
- }
-
this.setState({
tableId,
columns: fromJS(config.cols).toJS(),
fields: fromJS(config.columns).toJS(),
lineMarks: config.lineMarks ? fromJS(config.lineMarks).toJS() : []
+ }, () => {
+ const element = document.getElementById(tableId)
+ element && element.style.setProperty('--mk-table-border-color', config.wrap.borderColor || '#e8e8e8')
+ element && element.style.setProperty('--mk-table-color', config.wrap.color || 'rgba(0, 0, 0, 0.65)')
+ element && element.style.setProperty('--mk-table-font-size', config.wrap.fontSize || '14px')
+ element && element.style.setProperty('--mk-table-font-weight', config.wrap.fontWeight || 'normal')
})
}
@@ -206,11 +226,12 @@
}
} else if (!is(fromJS(this.state.fields), fromJS(nextProps.config.columns))) {
this.setState({fields: fromJS(nextProps.config.columns).toJS()})
- } else if (this.props.config.wrap.borderColor !== nextProps.config.wrap.borderColor) {
- let style = `#${this.state.tableId} table, #${this.state.tableId} tr, #${this.state.tableId} th, #${this.state.tableId} td {border-color: ${nextProps.config.wrap.borderColor}}`
- let ele = document.createElement('style')
- ele.innerHTML = style
- document.getElementsByTagName('head')[0].appendChild(ele)
+ } else if (!is(fromJS(this.props.config.wrap), fromJS(nextProps.config.wrap))) {
+ const element = document.getElementById(this.state.tableId)
+ element && element.style.setProperty('--mk-table-border-color', nextProps.config.wrap.borderColor || '#e8e8e8')
+ element && element.style.setProperty('--mk-table-color', nextProps.config.wrap.color || 'rgba(0, 0, 0, 0.65)')
+ element && element.style.setProperty('--mk-table-font-size', nextProps.config.wrap.fontSize || '14px')
+ element && element.style.setProperty('--mk-table-font-weight', nextProps.config.wrap.fontWeight || 'normal')
}
}
@@ -219,6 +240,7 @@
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
@@ -263,12 +285,22 @@
})
}
+ pasteCell = (col, cell, resolve) => {
+ resolve({status: true})
+
+ delete cell.copyType
+ cell.uuid = Utils.getuuid()
+ cell.focus = true
+
+ MKEmitter.emit('cardAddElement', [this.props.config.uuid, col.uuid], cell)
+ }
+
addElement = (col) => {
const { config } = this.props
let column = fromJS(col).toJS()
if (column.type === 'custom') {
- let newcard = {uuid: Utils.getuuid(), focus: true, eleType: 'text', datatype: 'dynamic', style: {paddingLeft: '4px'}}
+ let newcard = {uuid: Utils.getuuid(), focus: true, width: 24, eleType: 'text', datatype: 'dynamic', style: {paddingLeft: '4px'}}
// 娉ㄥ唽浜嬩欢-娣诲姞鍏冪礌
MKEmitter.emit('cardAddElement', [config.uuid, column.uuid], newcard)
@@ -283,8 +315,7 @@
intertype: 'system',
execSuccess: 'grid',
execError: 'never',
- show: 'link',
- $type: 'tableButton'
+ show: 'link'
}
// 娉ㄥ唽浜嬩欢-娣诲姞鍏冪礌
@@ -294,10 +325,6 @@
submitCol = (col) => {
const { card } = this.state
-
- col.uuid = card.uuid
- col.isSub = card.isSub === true
- col.marks = card.marks || []
if (col.type === 'custom') {
col.elements = card.type === 'custom' ? (card.elements || []) : []
@@ -314,13 +341,25 @@
editStyleCard: fromJS(col).toJS()
})
- MKEmitter.emit('changeStyle', [col.uuid], ['font', 'padding'], col.style || {})
+ MKEmitter.emit('changeStyle', ['font', 'padding'], col.style || {}, this.getStyle)
}
- getStyle = (comIds, style) => {
- const { editStyleCard } = this.state
+ changeSubmitStyle = () => {
+ const { config } = this.props
- if (!editStyleCard || comIds[0] !== editStyleCard.uuid || comIds.length !== 1) return
+ MKEmitter.emit('changeStyle', ['font', 'background', 'border', 'margin', 'padding'], config.submit.style || {}, this.getSubmitStyle)
+ }
+
+ getSubmitStyle = (style) => {
+ const { config } = this.props
+
+ let submit = {...config.submit, style}
+
+ this.props.updatecolumn({...config, submit: submit})
+ }
+
+ getStyle = (style) => {
+ const { editStyleCard } = this.state
let _card = {...editStyleCard, style}
@@ -383,6 +422,11 @@
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)))
document.body.appendChild(oInput)
oInput.select()
@@ -408,7 +452,7 @@
let cell = { uuid: Utils.getuuid(), label: item.label, field: item.field, Align: 'left', Hide: 'false', IsSort: 'false', Width: 120, blacklist: [], postfix: '', prefix: '', linkmenu: [], marks: [], perspective: 'linkmenu' }
- if (/Nvarchar/ig.test(item.datatype)) {
+ if (/Nvarchar|date/ig.test(item.datatype)) {
cell.type = 'text'
cell.rowspan = 'false'
cell.textFormat = 'none'
@@ -417,6 +461,7 @@
cell.format = 'none'
cell.sum = 'false'
cell.decimal = item.decimal || 0
+ cell.Width = 80
}
columns.push(cell)
@@ -449,6 +494,19 @@
})
}
+ verifySubmit = () => {
+ const { config } = this.props
+
+ this.verifyRef.handleConfirm().then(res => {
+ res.style = config.submit.style || {}
+ this.setState({
+ visible: false
+ }, () => {
+ this.props.updatecolumn({...config, submit: res})
+ })
+ })
+ }
+
componentDidMount () {
MKEmitter.addListener('submitStyle', this.getStyle)
}
@@ -465,7 +523,7 @@
render() {
const { config } = this.props
- const { fields, card, lineMarks, dict, tableId } = this.state
+ const { fields, card, lineMarks, dict, tableId, visible } = this.state
const components = {
header: {
cell: DragableHeaderCol
@@ -475,9 +533,20 @@
}
}
+ let rowSelection = null
+ if (config.wrap.tableType) {
+ rowSelection = {
+ type: config.wrap.tableType === 'radio' ? 'radio' : 'checkbox',
+ }
+ }
+
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: col.label,
+ title: title,
dataIndex: col.uuid,
align: col.Align,
sorter: col.IsSort === 'true',
@@ -496,35 +565,36 @@
updateCol: this.updateCol,
addElement: this.addElement,
editColumn: this.editColumn,
+ pasteCell: this.pasteCell,
changeStyle: this.changeStyle,
deleteCol: this.deleteCol,
}),
}
})
- let style = {}
- if (config.wrap.color) {
- style.color = config.wrap.color
- }
- if (config.wrap.fontSize) {
- style.fontSize = config.wrap.fontSize
- }
-
return (
<div className={`edit-table-columns ${config.setting.laypage} ${config.wrap.mode || ''}`} id={tableId}>
<div className="col-control">
- <Icon title="澶嶅埗鏄剧ず鍒�" type="copy" onClick={this.copycolumn} />
+ <Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
+ <div className="mk-popover-control">
+ <EditOutlined className="edit" title="缂栬緫" onClick={() => this.setState({visible: true})} />
+ <FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={this.changeSubmitStyle}/>
+ </div>
+ } trigger="hover">
+ <Button className="submit-btn" style={config.submit.style} onDoubleClick={() => this.setState({visible: true})} type="primary">鎻愪氦</Button>
+ </Popover>
+ <CopyOutlined title="澶嶅埗鏄剧ず鍒�" onClick={this.copycolumn} />
<MarkColumn columns={fields} type="line" marks={lineMarks} onSubmit={this.updateLineMarks} />
- <Icon title="鍚屾瀛楁闆�" type="file-sync" onClick={this.syncfield} />
- <Icon title="娓呯┖鏄剧ず鍒�" type="delete" onClick={this.clear}/>
+ <FileSyncOutlined title="鍚屾瀛楁闆�" onClick={this.syncfield} />
+ <DeleteOutlined title="娓呯┖鏄剧ず鍒�" onClick={this.clear}/>
</div>
<DndProvider>
<Table
rowKey="uuid"
size={config.wrap.size || 'middle'}
rowClassName="editable-row"
- style={style}
bordered={config.wrap.bordered !== 'false'}
+ rowSelection={rowSelection}
components={components}
dataSource={this.state.data}
columns={columns}
@@ -539,6 +609,25 @@
/>
</DndProvider>
<EditColumn column={card} dict={dict} columns={this.state.columns} fields={fields} submitCol={this.submitCol} cancelCol={this.cancelCol}/>
+ <Modal
+ wrapClassName="model-table-action-verify-modal"
+ title={'缂栬緫'}
+ visible={visible}
+ width={'75vw'}
+ maskClosable={false}
+ onOk={this.verifySubmit}
+ onCancel={() => { this.setState({ visible: false }) }}
+ destroyOnClose
+ >
+ <TableVerify
+ card={config.submit}
+ setting={config.setting}
+ dict={dict}
+ cols={config.cols}
+ columns={config.columns}
+ wrappedComponentRef={(inst) => this.verifyRef = inst}
+ />
+ </Modal>
</div>
)
}
--
Gitblit v1.8.0