From af6486b3629d23e426ce85b87dbc20dfa15b1afe Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 07 十一月 2022 18:50:27 +0800
Subject: [PATCH] 2022-11-07
---
src/menu/components/table/base-table/columns/index.jsx | 177 ++++++++++++++++++++++++++++------------------------------
1 files changed, 86 insertions(+), 91 deletions(-)
diff --git a/src/menu/components/table/base-table/columns/index.jsx b/src/menu/components/table/base-table/columns/index.jsx
index 44be56a..3aa43cd 100644
--- a/src/menu/components/table/base-table/columns/index.jsx
+++ b/src/menu/components/table/base-table/columns/index.jsx
@@ -2,14 +2,12 @@
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
import { DndProvider, DragSource, DropTarget } from 'react-dnd'
-import { Table, Popover, Modal, message } from 'antd'
-import { PlusOutlined, FileSyncOutlined, EditOutlined, CopyOutlined, DeleteOutlined, FontColorsOutlined, CloseCircleOutlined, AntDesignOutlined } from '@ant-design/icons'
+import { Table, Popover, Modal, message, notification } from 'antd'
+import { PlusOutlined, 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'
@@ -17,8 +15,8 @@
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'))
+const FieldsComponent = asyncComponent(() => import('@/templates/sharecomponent/fieldscomponent'))
class HeaderCol extends Component {
deleteCol = () => {
@@ -52,7 +50,7 @@
}
render() {
- const { connectDragSource, connectDropTarget, moveCol, addElement, updateCol, editColumn, pasteCell, changeStyle, deleteCol, index, column, align, fields, children, ...restProps } = this.props
+ const { connectDragSource, connectDropTarget, moveCol, addElement, dropCol, updateCol, editColumn, pasteCell, changeStyle, deleteCol, index, column, align, fields, children, ...restProps } = this.props
if (index !== undefined) {
return connectDragSource(
@@ -107,10 +105,14 @@
const ColTarget = {
drop(props, monitor) {
- const dragIndex = monitor.getItem().index
+ const item = monitor.getItem()
+ const dragIndex = item.index
const hoverIndex = props.index
- if (dragIndex === undefined || hoverIndex === undefined || dragIndex === hoverIndex) {
+ if (item.$init) {
+ props.dropCol(item, hoverIndex)
+ return
+ } else if (dragIndex === undefined || hoverIndex === undefined || dragIndex === hoverIndex) {
return
}
@@ -140,8 +142,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() {
@@ -149,13 +150,13 @@
if (column && column.type === 'custom') {
return (
- <td style={{padding: 0, minWidth: column.Width || 100, ...(column.style || {})}} className={className}>
+ <td style={{padding: 0, minWidth: (column.Width || 100) / 2, ...(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 5px', textAlign: column.Align, minWidth: (column.Width || 100) / 2}} className={'action-column ' + className}>
<CardCellComponent cards={config} cardCell={column} elements={column.elements} updateElement={this.updateCard}/>
</td>
)
@@ -171,7 +172,7 @@
}
}
return (
- <td style={{...style, minWidth: column.Width || 100}} className={className}>
+ <td style={{...style, minWidth: (column.Width || 100) / 2}} className={className}>
{val}
{column.Hide === 'true' ? <CloseCircleOutlined style={{marginLeft: '5px', color: 'orange', fontSize: '12px'}}/> : null}
{column.marks && column.marks.length ? <AntDesignOutlined className="profile"/> : null}
@@ -194,8 +195,6 @@
}
state = {
- dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
- appType: sessionStorage.getItem('appType'),
tableId: '',
data: [{uuid: Utils.getuuid()}],
refresh: false, // 寮哄埗鍒锋柊
@@ -255,7 +254,6 @@
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
}
@@ -272,10 +270,31 @@
})
}
+ 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 === 'action') {
+ col.label = '鎿嶄綔'
+ } 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
@@ -294,6 +313,10 @@
let config = {...this.props.config, cols: _columns}
if (btn) {
config.action = config.action.filter(item => item.uuid !== btn.uuid)
+
+ setTimeout(() => {
+ MKEmitter.emit('revert', config.uuid)
+ }, 200)
}
this.props.updatecolumn(config)
@@ -313,11 +336,10 @@
cell.uuid = Utils.getuuid()
cell.focus = true
- MKEmitter.emit('cardAddElement', [this.props.config.uuid, col.uuid], cell)
+ MKEmitter.emit('cardAddElement', col.uuid, cell)
}
addElement = (col) => {
- const { config } = this.props
let column = fromJS(col).toJS()
if (column.type === 'colspan') {
@@ -333,7 +355,7 @@
let newcard = {uuid: Utils.getuuid(), focus: true, width: 24, eleType: 'text', datatype: 'dynamic', style: {paddingLeft: '4px'}}
// 娉ㄥ唽浜嬩欢-娣诲姞鍏冪礌
- MKEmitter.emit('cardAddElement', [config.uuid, column.uuid], newcard)
+ MKEmitter.emit('cardAddElement', column.uuid, newcard)
} else if (column.type === 'action') {
let newcard = {
uuid: Utils.getuuid(),
@@ -349,12 +371,12 @@
}
// 娉ㄥ唽浜嬩欢-娣诲姞鍏冪礌
- MKEmitter.emit('cardAddElement', [config.uuid, column.uuid], newcard)
+ MKEmitter.emit('cardAddElement', column.uuid, newcard)
}
}
- submitCol = (col) => {
- const { card } = this.state
+ submitCol = (col, resolve) => {
+ const { card, columns } = this.state
col.uuid = card.uuid
col.isSub = card.isSub === true
@@ -366,6 +388,28 @@
col.elements = card.type === 'custom' ? (card.elements || []) : []
} else if (col.type === 'action') {
col.elements = card.type === 'action' ? (card.elements || []) : []
+ }
+
+ if (!col.field || col.isSub) {
+ resolve()
+ } else {
+ let _cols = []
+ columns.forEach(c => {
+ if (c.field && col.uuid !== c.uuid) {
+ _cols.push(c.field.toLowerCase())
+ }
+ })
+
+ if (_cols.includes(col.field.toLowerCase())) {
+ notification.warning({
+ top: 92,
+ message: '瀛楁宸插瓨鍦紒',
+ duration: 5
+ })
+ return
+ } else {
+ resolve()
+ }
}
this.setState({card: null})
@@ -408,7 +452,6 @@
}
deleteCol = (col) => {
- const { appType } = this.state
let _columns = fromJS(this.state.columns).toJS()
_columns = this.loopDelCol(_columns, col)
@@ -418,19 +461,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) => {
@@ -476,7 +506,6 @@
title: col.label,
dataIndex: col.uuid,
align: col.Align,
- // sorter: !isSub && col.IsSort === 'true',
sorter: col.IsSort === 'true',
onCell: () => ({
column: col,
@@ -491,6 +520,7 @@
align: col.Align,
moveCol: this.moveCol,
updateCol: this.updateCol,
+ dropCol: this.dropCol,
addElement: this.addElement,
editColumn: this.editColumn,
pasteCell: this.pasteCell,
@@ -502,59 +532,25 @@
})
}
- syncfield = () => {
- const { fields } = this.state
- let columns = fromJS(this.state.columns).toJS()
+ plusColumns = (id, items) => {
+ const { config } = this.props
- columns = columns.filter(c => !c.origin)
+ if (id !== config.uuid) return
- let keys = columns.map(col => col.field)
+ let _columns = fromJS(this.state.columns).toJS()
+ _columns = _columns.filter(a => !a.origin)
- fields.forEach(item => {
- if (keys.includes(item.field)) return
+ _columns.push(...items)
- 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() {}
+ this.setState({
+ columns: _columns
+ }, () => {
+ this.props.updatecolumn({...config, cols: _columns})
})
}
- clear = () => {
- const _this = this
-
- confirm({
- content: '纭畾娓呯┖鏄剧ず鍒楀悧锛�',
- onOk() {
- _this.setState({columns: []}, () => {
- _this.props.updatecolumn({..._this.props.config, cols: []})
- })
- },
- onCancel() {}
- })
+ componentDidMount () {
+ MKEmitter.addListener('plusColumns', this.plusColumns)
}
/**
@@ -564,11 +560,12 @@
this.setState = () => {
return
}
+ MKEmitter.removeListener('plusColumns', this.plusColumns)
}
render() {
const { config } = this.props
- const { fields, card, lineMarks, dict, tableId, appType } = this.state
+ const { fields, card, lineMarks, tableId } = this.state
const components = {
header: {
cell: DragableHeaderCol
@@ -583,10 +580,9 @@
return (
<div className={`normal-table-columns ${config.setting.laypage} ${config.wrap.tableType} ${config.wrap.mode || ''}`} id={tableId}>
<div className="col-control">
+ <FieldsComponent config={config} type="columns" />
<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
@@ -598,18 +594,17 @@
dataSource={this.state.data}
rowSelection={config.wrap.tableType ? { type: 'radio' } : null}
columns={columns}
- pagination={appType !== 'mob' ? {
+ pagination={{
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