From 33e303523ffd8be12df44e4fbb4a942d121d5a20 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 03 八月 2022 14:30:52 +0800
Subject: [PATCH] 2022-08-03
---
src/menu/components/table/normal-table/columns/index.jsx | 411 ++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 308 insertions(+), 103 deletions(-)
diff --git a/src/menu/components/table/normal-table/columns/index.jsx b/src/menu/components/table/normal-table/columns/index.jsx
index 70b2e48..d22150a 100644
--- a/src/menu/components/table/normal-table/columns/index.jsx
+++ b/src/menu/components/table/normal-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, Form, Popover, Icon, Modal } from 'antd'
+import { Table, Popover, Modal, message } 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'
@@ -13,9 +14,11 @@
import './index.scss'
const { confirm } = Modal
-const coldict = localStorage.getItem('lang') !== 'en-US' ? zhCN : enUS
const EditColumn = asyncIconComponent(() => 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 PasteComponent = asyncIconComponent(() => import('@/components/paste'))
class HeaderCol extends Component {
deleteCol = () => {
@@ -30,7 +33,16 @@
})
}
+ updateMarks = (vals) => {
+ const { column } = this.props
+ this.props.updateCol({...column, marks: vals})
+ }
+
shouldComponentUpdate (nextProps, nextState) {
+
+ if (this.props.rowSpan !== nextProps.rowSpan || this.props.colSpan !== nextProps.colSpan) {
+ return true
+ }
if (!nextProps.column) return false
@@ -40,18 +52,21 @@
}
render() {
- const { connectDragSource, connectDropTarget, moveCol, addElement, editColumn, 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 (index !== undefined) {
return connectDragSource(
- connectDropTarget(<th {...restProps} index={index} style={{ cursor: 'move', textAlign: align }}>
+ connectDropTarget(<th {...restProps} index={index} style={{ cursor: 'move', textAlign: align }} onDoubleClick={() => column && this.props.editColumn(column)}>
<Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
- <div className="mk-popover-control">
- {column && (column.type === 'custom' || column.type === 'colspan' || column.type === 'action') ?
- <Icon className="plus" title="娣诲姞" type="plus" onClick={() => this.props.addElement(column)} /> : null
+ <div className="mk-popover-control" onDoubleClick={(e) => e.stopPropagation()}>
+ {column && ['custom', 'colspan', '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)} />
- <Icon className="close" title="鍒犻櫎" type="delete" onClick={this.deleteCol} />
+ <EditOutlined className="edit" title="缂栬緫" onClick={() => this.props.editColumn(column)} />
+ {column && column.type === 'custom' ? <PasteComponent options={['customCardElement']} updateConfig={(res, resolve) => this.props.pasteCell(column, res, resolve)} /> : null}
+ {column && column.type === 'custom' ? <FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={() => this.props.changeStyle(column)}/> : null}
+ <DeleteOutlined className="close" title="鍒犻櫎" onClick={this.deleteCol} />
+ {column && ['text', 'number', 'formula'].includes(column.type) ? <MarkColumn columns={fields} marks={column.marks} onSubmit={this.updateMarks} /> : null }
</div>
} trigger="hover">
{children}
@@ -60,14 +75,16 @@
)
} else if (column) {
return (
- <th {...restProps}>
+ <th {...restProps} 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">
- {column && column.type === 'custom' ?
- <Icon className="plus" title="娣诲姞" type="plus" onClick={() => this.props.addElement(column)} /> : null
+ <div className="mk-popover-control" onDoubleClick={(e) => e.stopPropagation()}>
+ {column && ['custom', 'colspan'].includes(column.type) ?
+ <PlusOutlined className="plus" title="娣诲姞" 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} />
+ <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 columns={fields} marks={column.marks} onSubmit={this.updateMarks} /> : null }
</div>
} trigger="hover">
{children}
@@ -110,10 +127,10 @@
}))(HeaderCol),
)
-class EditableCell extends Component {
- updateCard = (vals) => {
+class EditableColumnCell extends Component {
+ updateCard = (vals, btn) => {
const { column } = this.props
- this.props.upComponent({...column, elements: vals})
+ this.props.upComponent({...column, elements: vals}, btn)
}
shouldComponentUpdate (nextProps, nextState) {
@@ -123,6 +140,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))
}
@@ -131,20 +149,32 @@
if (column && column.type === 'custom') {
return (
- <td style={{padding: 0, minWidth: column.Width || 100}} className={className}>
+ <td style={{padding: 0, minWidth: column.Width || 100, ...(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={className}>
+ <td style={{padding: '0 5px', textAlign: column.Align, minWidth: column.Width || 100}} 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>
+ }
+ }
return (
<td style={{...style, minWidth: column.Width || 100}} className={className}>
- {column.field}
+ {val}
+ {column.Hide === 'true' ? <CloseCircleOutlined style={{marginLeft: '5px', color: 'orange', fontSize: '12px'}}/> : null}
+ {column.marks && column.marks.length ? <AntDesignOutlined className="profile"/> : null}
</td>
)
} else {
@@ -157,24 +187,47 @@
}
}
-class EditTable extends Component {
+class NormalTableColumns extends Component {
static propTpyes = {
config: PropTypes.object, // 閰嶇疆淇℃伅
updatecolumn: PropTypes.func // 鏁版嵁鍙樺寲
}
state = {
+ dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
+ appType: sessionStorage.getItem('appType'),
+ tableId: '',
data: [{uuid: Utils.getuuid()}],
+ refresh: false, // 寮哄埗鍒锋柊
columns: [],
- fields: []
+ fields: [],
+ editStyleCard: null,
+ lineMarks: []
}
UNSAFE_componentWillMount () {
const { config } = this.props
+ let tableId = (() => {
+ let uuid = []
+ let _options = 'abcdefghigklmnopqrstuv'
+ for (let i = 0; i < 19; i++) {
+ uuid.push(_options.substr(Math.floor(Math.random() * 0x20), 1))
+ }
+ return uuid.join('')
+ }) ()
+
this.setState({
+ tableId,
columns: fromJS(config.cols).toJS(),
- fields: fromJS(config.columns).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')
})
}
@@ -182,19 +235,28 @@
if (!is(fromJS(this.state.columns), fromJS(nextProps.config.cols))) {
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])
+ let lastcol = _columns.slice(-1)[0]
+ if (lastcol && lastcol.focus) {
+ this.editColumn(lastcol)
}
} else if (!is(fromJS(this.state.fields), fromJS(nextProps.config.columns))) {
this.setState({fields: fromJS(nextProps.config.columns).toJS()})
+ } 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')
}
}
+
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.search), fromJS(nextProps.config.search)) ||
+ !is(fromJS(config.action), fromJS(nextProps.config.action)) ||
config.setting.laypage !== nextProps.config.setting.laypage
}
@@ -210,34 +272,31 @@
})
}
- updateCol = (col) => {
- let _columns = fromJS(this.state.columns).toJS()
+ 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
+ })
+ }
- 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
- })
- }
+ updateCol = (col, btn) => {
+ let _columns = fromJS(this.state.columns).toJS()
+ _columns = this.loopCol(_columns, col)
this.setState({
columns: _columns,
}, () => {
- this.props.updatecolumn({...this.props.config, cols: _columns})
+ let config = {...this.props.config, cols: _columns}
+ if (btn) {
+ config.action = config.action.filter(item => item.uuid !== btn.uuid)
+ }
+
+ this.props.updatecolumn(config)
})
}
@@ -245,6 +304,16 @@
this.setState({
card: fromJS(col).toJS()
})
+ }
+
+ 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) => {
@@ -261,7 +330,7 @@
})
this.updateCol(column)
} else if (column.type === 'custom') {
- let newcard = {uuid: Utils.getuuid(), focus: true, eleType: 'text', datatype: 'dynamic'}
+ let newcard = {uuid: Utils.getuuid(), focus: true, width: 24, eleType: 'text', datatype: 'dynamic', style: {paddingLeft: '4px'}}
// 娉ㄥ唽浜嬩欢-娣诲姞鍏冪礌
MKEmitter.emit('cardAddElement', [config.uuid, column.uuid], newcard)
@@ -276,8 +345,7 @@
intertype: 'system',
execSuccess: 'grid',
execError: 'never',
- show: 'link',
- $type: 'tableButton'
+ show: 'link'
}
// 娉ㄥ唽浜嬩欢-娣诲姞鍏冪礌
@@ -304,6 +372,24 @@
this.updateCol(col)
}
+ changeStyle = (col) => {
+ this.setState({
+ editStyleCard: fromJS(col).toJS()
+ })
+
+ MKEmitter.emit('changeStyle', [col.uuid], ['font', 'padding'], col.style || {})
+ }
+
+ getStyle = (comIds, style) => {
+ const { editStyleCard } = this.state
+
+ if (!editStyleCard || comIds[0] !== editStyleCard.uuid || comIds.length !== 1) return
+
+ let _card = {...editStyleCard, style}
+
+ this.updateCol(_card)
+ }
+
cancelCol = () => {
const { card } = this.state
@@ -314,45 +400,85 @@
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()
- 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)
- }
+ _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)
}
- render() {
- const { config } = this.props
- const { fields, card } = this.state
- const components = {
- header: {
- cell: DragableHeaderCol
- },
- body: {
- cell: EditableCell
- }
+ updateLineMarks = (vals) => {
+ this.setState({
+ lineMarks: vals
+ }, () => {
+ this.props.updatecolumn({...this.props.config, lineMarks: vals})
+ })
+ }
+
+ /**
+ * @description 鏄剧ず鍒楀鍒�
+ */
+ copycolumn = () => {
+ const { columns } = this.state
+
+ let oInput = document.createElement('input')
+ let val = {
+ copyType: 'cols',
+ cols: columns.filter(col => !col.origin)
}
-
- const columns = this.state.columns.map((col, index) => {
+
+ 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)
+ }
+
+ handlecolumns = (columns, fields, config, isSub) => {
+ return columns.map((col, index) => {
return {
title: col.label,
- dataIndex: col.field,
+ dataIndex: col.uuid,
align: col.Align,
+ // sorter: !isSub && col.IsSort === 'true',
sorter: col.IsSort === 'true',
onCell: () => ({
column: col,
@@ -360,61 +486,140 @@
config: config,
upComponent: this.updateCol
}),
- children: col.subcols && col.subcols.length > 0 ? col.subcols.map(cell => ({
- align: col.Align,
- title: cell.label,
- key: cell.uuid,
- onCell: () => ({
- column: cell,
- width: cell.Width,
- config: config,
- upComponent: this.updateCol
- }),
- onHeaderCell: () => ({
- column: cell,
- align: cell.Align,
- addElement: this.addElement,
- editColumn: this.editColumn,
- deleteCol: this.deleteCol,
- })
- })) : null,
onHeaderCell: () => ({
- index,
+ index: isSub ? undefined : index,
column: col,
+ fields: fields,
align: col.Align,
moveCol: this.moveCol,
+ 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,
}
})
+ }
+
+ syncfield = () => {
+ const { fields } = this.state
+ let columns = fromJS(this.state.columns).toJS()
+
+ columns = columns.filter(c => !c.origin)
+
+ let keys = columns.map(col => col.field)
+
+ fields.forEach(item => {
+ if (keys.includes(item.field)) return
+
+ let cell = { uuid: Utils.getuuid(), label: item.label, field: item.field, Align: 'left', Hide: 'false', IsSort: 'true', Width: 120, blacklist: [], postfix: '', prefix: '', linkmenu: [], marks: [], perspective: 'linkmenu' }
+
+ if (/Nvarchar|date/ig.test(item.datatype)) {
+ cell.type = 'text'
+ cell.rowspan = 'false'
+ cell.textFormat = 'none'
+ } else {
+ cell.type = 'number'
+ cell.format = 'none'
+ cell.sum = 'false'
+ cell.decimal = item.decimal || 0
+ cell.Width = 80
+ }
+
+ columns.push(cell)
+ })
+
+ const _this = this
+
+ confirm({
+ content: '纭畾鍚屾瀛楁闆嗗悧锛�',
+ onOk() {
+ _this.setState({columns}, () => {
+ _this.props.updatecolumn({..._this.props.config, cols: columns})
+ })
+ },
+ onCancel() {}
+ })
+ }
+
+ clear = () => {
+ const _this = this
+
+ confirm({
+ content: '纭畾娓呯┖鏄剧ず鍒楀悧锛�',
+ onOk() {
+ _this.setState({columns: []}, () => {
+ _this.props.updatecolumn({..._this.props.config, cols: []})
+ })
+ },
+ onCancel() {}
+ })
+ }
+
+ componentDidMount () {
+ MKEmitter.addListener('submitStyle', this.getStyle)
+ }
+
+ /**
+ * @description 缁勪欢閿�姣侊紝娓呴櫎state鏇存柊锛屾竻闄ゅ揩鎹烽敭璁剧疆
+ */
+ componentWillUnmount () {
+ this.setState = () => {
+ return
+ }
+ MKEmitter.removeListener('submitStyle', this.getStyle)
+ }
+
+ render() {
+ const { config } = this.props
+ const { fields, card, lineMarks, dict, tableId, appType } = this.state
+ const components = {
+ header: {
+ cell: DragableHeaderCol
+ },
+ body: {
+ cell: EditableColumnCell
+ }
+ }
+
+ const columns = this.handlecolumns(this.state.columns, fields, config)
return (
- <div className={`normal-table-columns ${config.setting.laypage} ${config.wrap.tableType}`}>
+ <div className={`normal-table-columns ${config.setting.laypage} ${config.wrap.tableType} ${config.wrap.mode || ''}`} id={tableId}>
+ <div className="col-control">
+ <CopyOutlined title="澶嶅埗鏄剧ず鍒�" onClick={this.copycolumn} />
+ <MarkColumn columns={fields} type="line" marks={lineMarks} onSubmit={this.updateLineMarks} />
+ <FileSyncOutlined title="鍚屾瀛楁闆�" onClick={this.syncfield} />
+ <DeleteOutlined title="娓呯┖鏄剧ず鍒�" onClick={this.clear}/>
+ </div>
<DndProvider>
<Table
rowKey="uuid"
- bordered={config.wrap.border !== 'false'}
+ size={config.wrap.size || 'middle'}
+ rowClassName="editable-row"
+ bordered={config.wrap.bordered !== 'false'}
components={components}
dataSource={this.state.data}
rowSelection={config.wrap.tableType ? { type: 'radio' } : null}
columns={columns}
- rowClassName="editable-row"
- pagination={{
+ pagination={appType !== 'mob' ? {
current: 1,
pageSize: 10,
pageSizeOptions: ['10', '25', '50', '100', '500', '1000'],
showSizeChanger: true,
total: 58,
showTotal: (total, range) => `${range[0]}-${range[1]} 鍏� ${total} 鏉
- }}
+ } : false}
/>
+ {appType === 'mob' && config.setting.laypage !== 'fasle' ? <MobPagination /> : null}
</DndProvider>
- <EditColumn column={card} dict={coldict} fields={fields} submitCol={this.submitCol} cancelCol={this.cancelCol}/>
+ <EditColumn column={card} dict={dict} fields={fields} submitCol={this.submitCol} cancelCol={this.cancelCol}/>
</div>
)
}
}
-export default Form.create()(EditTable)
\ No newline at end of file
+export default NormalTableColumns
\ No newline at end of file
--
Gitblit v1.8.0