From f267d04e0561a0a20d1f2a9f558a273558ece90d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 24 五月 2021 17:50:19 +0800
Subject: [PATCH] 2021-05-24
---
src/menu/components/table/normal-table/columns/index.jsx | 226 ++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 144 insertions(+), 82 deletions(-)
diff --git a/src/menu/components/table/normal-table/columns/index.jsx b/src/menu/components/table/normal-table/columns/index.jsx
index 944cf5b..eefeb09 100644
--- a/src/menu/components/table/normal-table/columns/index.jsx
+++ b/src/menu/components/table/normal-table/columns/index.jsx
@@ -2,7 +2,7 @@
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
import { DndProvider, DragSource, DropTarget } from 'react-dnd'
-import { Table, Form, Popover, Icon, Modal, message } from 'antd'
+import { Table, Popover, Icon, Modal, message } from 'antd'
import asyncComponent from '@/utils/asyncComponent'
import asyncIconComponent from '@/utils/asyncIconComponent'
@@ -14,7 +14,7 @@
const { confirm } = Modal
const EditColumn = asyncIconComponent(() => import('./editColumn'))
-const MarkColumn = asyncIconComponent(() => import('./markcolumn'))
+const MarkColumn = asyncIconComponent(() => import('@/menu/components/share/markcomponent'))
const CardCellComponent = asyncComponent(() => import('@/menu/components/card/cardcellcomponent'))
class HeaderCol extends Component {
@@ -36,6 +36,10 @@
}
shouldComponentUpdate (nextProps, nextState) {
+
+ if (this.props.rowSpan !== nextProps.rowSpan || this.props.colSpan !== nextProps.colSpan) {
+ return true
+ }
if (!nextProps.column) return false
@@ -66,10 +70,10 @@
)
} else if (column) {
return (
- <th {...restProps}>
+ <th {...restProps} key={column.uuid}>
<Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
<div className="mk-popover-control">
- {column && column.type === 'custom' ?
+ {column && ['custom', 'colspan'].includes(column.type) ?
<Icon className="plus" title="娣诲姞" type="plus" onClick={() => this.props.addElement(column)} /> : null
}
<Icon className="edit" title="缂栬緫" type="edit" onClick={() => this.props.editColumn(column)} />
@@ -117,7 +121,7 @@
}))(HeaderCol),
)
-class EditableCell extends Component {
+class EditableColumnCell extends Component {
updateCard = (vals, action) => {
const { column } = this.props
this.props.upComponent({...column, elements: vals}, action)
@@ -152,8 +156,8 @@
} else if (column) {
return (
<td style={{...style, minWidth: column.Width || 100}} className={className}>
- {column.field}
- {column.marks && column.marks.length > 0 ? <Icon className="profile" type="ant-design"/> : null}
+ {column.field || (column.type === 'index' ? '$Index' : '')}
+ {column.marks && column.marks.length ? <Icon className="profile" type="ant-design"/> : null}
</td>
)
} else {
@@ -166,15 +170,17 @@
}
}
-class EditTable extends Component {
+class NormalTableColumns extends Component {
static propTpyes = {
config: PropTypes.object, // 閰嶇疆淇℃伅
updatecolumn: PropTypes.func // 鏁版嵁鍙樺寲
}
state = {
- dict: localStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
+ dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
+ tableId: '',
data: [{uuid: Utils.getuuid()}],
+ refresh: false, // 寮哄埗鍒锋柊
columns: [],
fields: [],
lineMarks: []
@@ -183,7 +189,24 @@
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('')
+ }) ()
+
+ 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() : []
@@ -194,15 +217,20 @@
if (!is(fromJS(this.state.columns), fromJS(nextProps.config.cols))) {
let _columns = fromJS(nextProps.config.cols).toJS()
this.setState({columns: _columns})
-
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 (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)
}
}
+
shouldComponentUpdate (nextProps, nextState) {
const { config } = this.props
@@ -225,29 +253,21 @@
})
}
+ 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, action) => {
let _columns = fromJS(this.state.columns).toJS()
-
- 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
- })
- }
+ _columns = this.loopCol(_columns, col)
this.setState({
columns: _columns,
@@ -333,19 +353,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) => {
let _columns = fromJS(this.state.columns).toJS()
+ _columns = this.loopDelCol(_columns, col)
- 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
+ if (col.type === 'action') {
+ let uuids = []
+ col.elements && col.elements.forEach(c => {
+ uuids.push(c.uuid)
})
- } else {
- _columns = _columns.filter(column => column.uuid !== col.uuid)
+ MKEmitter.emit('delButtons', uuids)
}
this.setState({
@@ -371,8 +397,8 @@
let oInput = document.createElement('input')
let val = {
- copyType: 'columns',
- columns: columns
+ copyType: 'cols',
+ cols: columns.filter(col => !col.origin)
}
oInput.value = window.btoa(window.encodeURIComponent(JSON.stringify(val)))
@@ -387,52 +413,21 @@
document.body.removeChild(oInput)
}
- render() {
- const { config } = this.props
- const { fields, card, lineMarks, dict } = this.state
- const components = {
- header: {
- cell: DragableHeaderCol
- },
- body: {
- cell: EditableCell
- }
- }
-
- const columns = this.state.columns.map((col, index) => {
+ handlecolumns = (columns, fields, config, isSub) => {
+ return columns.map((col, index) => {
return {
title: col.label,
- dataIndex: col.field,
+ dataIndex: col.uuid,
align: col.Align,
- sorter: col.IsSort === 'true',
+ sorter: !isSub && col.IsSort === 'true',
onCell: () => ({
column: col,
width: col.Width,
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,
- fields: fields,
- align: cell.Align,
- updateCol: this.updateCol,
- addElement: this.addElement,
- editColumn: this.editColumn,
- deleteCol: this.deleteCol,
- })
- })) : null,
onHeaderCell: () => ({
- index,
+ index: isSub ? undefined : index,
column: col,
fields: fields,
align: col.Align,
@@ -441,25 +436,92 @@
addElement: this.addElement,
editColumn: this.editColumn,
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/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
+ }
+
+ columns.push(cell)
+ })
+
+ const _this = this
+
+ confirm({
+ content: '纭畾鍚屾瀛楁闆嗗悧锛�',
+ onOk() {
+ _this.setState({columns}, () => {
+ _this.props.updatecolumn({..._this.props.config, cols: columns})
+ })
+ },
+ onCancel() {}
+ })
+ }
+
+ render() {
+ const { config } = this.props
+ const { fields, card, lineMarks, dict, tableId } = this.state
+ const components = {
+ header: {
+ cell: DragableHeaderCol
+ },
+ body: {
+ cell: EditableColumnCell
+ }
+ }
+
+ const columns = this.handlecolumns(this.state.columns, fields, config)
+
+ let style = {}
+ if (config.wrap.color) {
+ style.color = config.wrap.color
+ }
+ if (config.wrap.fontSize) {
+ style.fontSize = config.wrap.fontSize
+ }
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">
<Icon title="澶嶅埗" type="copy" onClick={this.copycolumn} />
<MarkColumn columns={fields} type="line" marks={lineMarks} onSubmit={this.updateLineMarks} />
+ <Icon title="鍚屾" type="file-sync" onClick={this.syncfield} />
</div>
<DndProvider>
<Table
rowKey="uuid"
+ size={config.wrap.size || 'middle'}
+ rowClassName="editable-row"
+ style={style}
bordered={config.wrap.bordered !== 'false'}
components={components}
dataSource={this.state.data}
rowSelection={config.wrap.tableType ? { type: 'radio' } : null}
columns={columns}
- rowClassName="editable-row"
pagination={{
current: 1,
pageSize: 10,
@@ -476,4 +538,4 @@
}
}
-export default Form.create()(EditTable)
\ No newline at end of file
+export default NormalTableColumns
\ No newline at end of file
--
Gitblit v1.8.0