From 2c573446cd5059b09c06c8673eaf1f51f43967ce Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 14 六月 2024 13:44:27 +0800
Subject: [PATCH] 2024-06-14
---
src/menu/components/table/normal-table/columns/index.jsx | 416 +++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 261 insertions(+), 155 deletions(-)
diff --git a/src/menu/components/table/normal-table/columns/index.jsx b/src/menu/components/table/normal-table/columns/index.jsx
index c88a996..17246ed 100644
--- a/src/menu/components/table/normal-table/columns/index.jsx
+++ b/src/menu/components/table/normal-table/columns/index.jsx
@@ -2,20 +2,23 @@
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, Typography } from 'antd'
+import { PlusOutlined, PlusSquareOutlined, FileSyncOutlined, EditOutlined, CopyOutlined, DeleteOutlined, FontColorsOutlined, CloseCircleOutlined, AntDesignOutlined } from '@ant-design/icons'
import asyncComponent from '@/utils/asyncComponent'
import asyncIconComponent from '@/utils/asyncIconComponent'
import Utils from '@/utils/utils.js'
-import zhCN from '@/locales/zh-CN/model.js'
-import enUS from '@/locales/en-US/model.js'
import MKEmitter from '@/utils/events.js'
import './index.scss'
const { confirm } = Modal
-const EditColumn = asyncIconComponent(() => import('./editColumn'))
+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 {
deleteCol = () => {
@@ -35,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) {
@@ -45,50 +74,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, addElement, updateCol, editColumn, 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) {
- return connectDragSource(
- connectDropTarget(<th {...restProps} index={index} style={{ cursor: 'move', textAlign: align }}>
- <Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
- <div className="mk-popover-control">
- {column && ['custom', 'colspan', 'action'].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)} />
- {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 }
- </div>
- } trigger="hover">
- {children}
- </Popover>
- </th>),
- )
- } else if (column) {
- return (
- <th {...restProps} key={column.uuid}>
- <Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
- <div className="mk-popover-control">
- {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)} />
- <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 }
- </div>
- } trigger="hover">
- {children}
- </Popover>
- </th>
- )
- } else {
- return (<th {...restProps}>{children}</th>)
+ if (!column) 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', 'extend'].includes(column.type) ? <MarkColumn field={column.field || ''} columns={fields} marks={column.marks} onSubmit={this.updateMarks} /> : null }
+ </div>
+ } trigger="hover">
+ {children}
+ </Popover>
+ </th>),
+ )
}
}
@@ -102,14 +129,29 @@
const ColTarget = {
drop(props, monitor) {
- const dragIndex = monitor.getItem().index
- const hoverIndex = props.index
+ const item = monitor.getItem()
+ let dragIndex = item.index
+ let hoverIndex = props.index
- if (dragIndex === undefined || hoverIndex === undefined || dragIndex === hoverIndex) {
+ if (item.$init) {
+ 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
},
}
@@ -123,9 +165,9 @@
)
class EditableColumnCell extends Component {
- updateCard = (vals, action) => {
+ updateCard = (vals, btn) => {
const { column } = this.props
- this.props.upComponent({...column, elements: vals}, action)
+ this.props.upComponent({...column, elements: vals}, btn)
}
shouldComponentUpdate (nextProps, nextState) {
@@ -135,8 +177,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))
+ !is(fromJS(config.action), fromJS(nextProps.config.action))
}
render() {
@@ -144,21 +185,26 @@
if (column && column.type === 'custom') {
return (
- <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={'action-column ' + className}>
+ <td style={{padding: 0, ...(column.style || {})}} className={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 || (column.type === 'index' ? '$Index' : '')}
- {column.marks && column.marks.length ? <Icon className="profile" type="ant-design"/> : null}
+ <td style={{...style}} className={className}>
+ {column.field ? <Paragraph className="col-copy" copyable={{ text: column.field }}>{val}</Paragraph> : val}
+ {column.marks && column.marks.length ? <AntDesignOutlined className="profile"/> : null}
+ {column.Hide === 'true' ? <CloseCircleOutlined className="close-col"/> : null}
</td>
)
} else {
@@ -178,7 +224,6 @@
}
state = {
- dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
appType: sessionStorage.getItem('appType'),
tableId: '',
data: [{uuid: Utils.getuuid()}],
@@ -201,18 +246,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')
})
}
@@ -226,28 +270,33 @@
}
} 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')
}
}
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
+ 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
@@ -256,10 +305,39 @@
})
}
+ 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 col = { focus: true, uuid: Utils.getuuid(), label: 'label', field: '', type: item.subType, elements: [] }
+ if (col.type === 'colspan') {
+ col.subcols = []
+ } else if (col.type === 'index') {
+ col.label = '搴忓彿'
+ }
+
+ _columns.splice(hoverIndex, 0, col)
+
+ this.setState({
+ columns: _columns
+ }, () => {
+ this.editColumn(col)
+ })
+ }
+
loopCol = (columns, col) => {
return columns.map(column => {
if (column.type === 'colspan') {
- column.subcols = this.loopCol(column.subcols, col)
+ column.subcols = this.loopCol(column.subcols || [], col)
}
if (column.uuid === col.uuid) {
return col
@@ -268,18 +346,23 @@
})
}
- updateCol = (col, action) => {
+ updateCol = (col, btn) => {
let _columns = fromJS(this.state.columns).toJS()
_columns = this.loopCol(_columns, col)
this.setState({
columns: _columns,
}, () => {
- if (action) {
- this.props.updatecolumn({...this.props.config, cols: _columns, action})
- } else {
- 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)
+
+ setTimeout(() => {
+ MKEmitter.emit('revertBtn', config.uuid)
+ }, 200)
}
+
+ this.props.updatecolumn(config)
})
}
@@ -289,8 +372,27 @@
})
}
- addElement = (col) => {
- const { config } = this.props
+ pasteCell = (col, cell, resolve) => {
+ resolve({status: true})
+
+ cell.uuid = Utils.getuuid()
+ cell.focus = true
+
+ if (!cell.eleType) {
+ if (cell.copyType === 'action') {
+ cell.eleType = 'button'
+ cell.width = cell.width || 12
+ } else {
+ cell.eleType = 'text'
+ }
+ }
+
+ delete cell.copyType
+
+ MKEmitter.emit('cardAddElement', col.uuid, cell)
+ }
+
+ addElement = (col, type) => {
let column = fromJS(col).toJS()
if (column.type === 'colspan') {
@@ -303,27 +405,28 @@
})
this.updateCol(column)
} else if (column.type === 'custom') {
- let newcard = {uuid: Utils.getuuid(), focus: true, eleType: 'text', datatype: 'dynamic'}
+ 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', [config.uuid, 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',
- $type: 'tableButton'
+ // 娉ㄥ唽浜嬩欢-娣诲姞鍏冪礌
+ 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', [config.uuid, column.uuid], newcard)
}
}
@@ -337,10 +440,12 @@
if (col.type === 'colspan') {
col.subcols = card.subcols || []
} else if (col.type === 'custom') {
+ col.style = card.style || {}
col.elements = card.type === 'custom' ? (card.elements || []) : []
- } else if (col.type === 'action') {
- 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)
@@ -351,13 +456,11 @@
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) => {
+ getStyle = (style) => {
const { editStyleCard } = this.state
-
- if (!editStyleCard || comIds[0] !== editStyleCard.uuid || comIds.length !== 1) return
let _card = {...editStyleCard, style}
@@ -384,7 +487,6 @@
}
deleteCol = (col) => {
- const { appType } = this.state
let _columns = fromJS(this.state.columns).toJS()
_columns = this.loopDelCol(_columns, col)
@@ -394,19 +496,6 @@
}, () => {
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)
}
updateLineMarks = (vals) => {
@@ -429,6 +518,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()
@@ -441,13 +535,13 @@
document.body.removeChild(oInput)
}
- handlecolumns = (columns, fields, config, isSub) => {
+ handlecolumns = (columns, fields, config, pId) => {
return columns.map((col, index) => {
return {
title: col.label,
dataIndex: col.uuid,
align: col.Align,
- sorter: !isSub && col.IsSort === 'true',
+ sorter: col.IsSort === 'true',
onCell: () => ({
column: col,
width: col.Width,
@@ -455,18 +549,21 @@
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,
+ dropCol: this.dropCol,
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,
+ children: col.subcols && col.subcols.length ? this.handlecolumns(col.subcols, fields, config, col.uuid) : null,
}
})
}
@@ -484,15 +581,15 @@
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)) {
+ 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)
@@ -511,8 +608,24 @@
})
}
- componentDidMount () {
- MKEmitter.addListener('submitStyle', this.getStyle)
+ clear = () => {
+ const _this = this
+
+ confirm({
+ content: '纭畾娓呯┖鏄剧ず鍒楀悧锛�',
+ onOk() {
+ _this.setState({columns: []}, () => {
+ _this.props.updatecolumn({..._this.props.config, cols: []})
+ })
+ },
+ onCancel() {}
+ })
+ }
+
+ addColumns = () => {
+ const { config } = this.props
+
+ MKEmitter.emit('addColumns', config.uuid)
}
/**
@@ -522,12 +635,11 @@
this.setState = () => {
return
}
- MKEmitter.removeListener('submitStyle', this.getStyle)
}
render() {
const { config } = this.props
- const { fields, card, lineMarks, dict, tableId } = this.state
+ const { fields, card, lineMarks, tableId, appType } = this.state
const components = {
header: {
cell: DragableHeaderCol
@@ -539,43 +651,37 @@
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} ${config.wrap.mode || ''}`} id={tableId}>
+ <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">
- <Icon title="澶嶅埗" type="copy" onClick={this.copycolumn} />
+ <PlusOutlined style={{color: '#26C281'}} title="娣诲姞鍒�" onClick={this.addColumns}/>
+ <CopyOutlined title="澶嶅埗鏄剧ず鍒�" onClick={this.copycolumn} />
<MarkColumn columns={fields} type="line" marks={lineMarks} onSubmit={this.updateLineMarks} />
- <Icon title="鍚屾" type="file-sync" onClick={this.syncfield} />
+ {appType !== 'mob' ? <ColsControl config={config} onSubmit={this.props.updatecolumn}/> : null}
+ <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'}
components={components}
dataSource={this.state.data}
rowSelection={config.wrap.tableType ? { type: 'radio' } : null}
columns={columns}
- 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={dict} fields={fields} submitCol={this.submitCol} cancelCol={this.cancelCol}/>
+ <EditColumn column={card} fields={fields} submitCol={this.submitCol} cancelCol={this.cancelCol}/>
</div>
)
}
--
Gitblit v1.8.0