From 3fc643dea8f8c957a95a86d250b5d8b06fb740e1 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 03 三月 2022 23:48:59 +0800
Subject: [PATCH] 2022-03-03
---
src/menu/components/table/edit-table/index.jsx | 150 +++++++++++++++-----------------------------------
1 files changed, 45 insertions(+), 105 deletions(-)
diff --git a/src/menu/components/table/edit-table/index.jsx b/src/menu/components/table/edit-table/index.jsx
index 00d7aac..933ea98 100644
--- a/src/menu/components/table/edit-table/index.jsx
+++ b/src/menu/components/table/edit-table/index.jsx
@@ -1,7 +1,8 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { Icon, Popover, notification } from 'antd'
+import { Popover } from 'antd'
+import { PlusOutlined, PlusCircleOutlined, PlusSquareOutlined, EditOutlined, ToolOutlined, DeleteOutlined, FontColorsOutlined } from '@ant-design/icons'
import asyncComponent from '@/utils/asyncComponent'
import asyncIconComponent from '@/utils/asyncIconComponent'
@@ -22,7 +23,6 @@
const CopyComponent = asyncIconComponent(() => import('@/menu/components/share/copycomponent'))
const UserComponent = asyncIconComponent(() => import('@/menu/components/share/usercomponent'))
const PasteComponent = asyncIconComponent(() => import('@/menu/components/share/pastecomponent'))
-const LogComponent = asyncIconComponent(() => import('@/menu/components/share/logcomponent'))
const ColumnComponent = asyncComponent(() => import('./columns'))
class TableCardEditComponent extends Component {
@@ -46,20 +46,19 @@
let _card = {
uuid: card.uuid,
type: card.type,
- floor: card.floor,
tabId: card.tabId || '',
parentId: card.parentId || '',
format: 'array', // 缁勪欢灞炴�� - 鏁版嵁鏍煎紡
pageable: true, // 缁勪欢灞炴�� - 鏄惁鍙垎椤�
- switchable: true, // 缁勪欢灞炴�� - 鏁版嵁鏄惁鍙垏鎹�
+ switchable: false, // 缁勪欢灞炴�� - 鏁版嵁鏄惁鍙垏鎹�
dataName: card.dataName || '',
width: card.width || 24,
search: [],
action: [],
name: card.name,
subtype: card.subtype,
- setting: { interType: 'system' },
- wrap: { name: card.name, width: card.width || 24, bordered: 'true', tableType: 'checkbox', show: 'true' },
+ setting: { interType: 'system', laypage: 'false' },
+ wrap: { name: card.name, width: card.width || 24, bordered: 'true', show: 'true' },
style: { marginLeft: '8px', marginRight: '8px', marginTop: '8px', marginBottom: '8px' },
headerStyle: { fontSize: '16px', borderBottomWidth: '1px', borderBottomColor: '#e8e8e8' },
columns: [],
@@ -70,6 +69,7 @@
],
scripts: [],
btnlog: [],
+ submit: {intertype: 'system', default: 'true', innerFunc: '', execSuccess: 'grid', execError: 'never', scripts: [], uniques: []},
isNew: true
}
@@ -80,6 +80,10 @@
_card.wrap.name = card.name
_card.style = config.style
_card.headerStyle = config.headerStyle
+
+ _card.setting = config.setting
+ _card.columns = config.columns
+ _card.scripts = config.scripts
let oriUids = {}
_card.action = config.action.map(item => {
@@ -94,9 +98,7 @@
})
_card.cols = config.cols.map(col => {
col.uuid = Utils.getuuid()
- if (col.type === 'colspan' && col.subcols) {
- col = this.loopCol(col)
- } else if (col.type === 'custom' && col.elements) {
+ if (col.type === 'custom' && col.elements) {
col.elements = col.elements.map(cell => {
cell.uuid = Utils.getuuid()
return cell
@@ -130,7 +132,7 @@
componentDidMount () {
MKEmitter.addListener('submitStyle', this.getStyle)
MKEmitter.addListener('submitModal', this.handleSave)
- MKEmitter.addListener('logButton', this.logButton)
+ MKEmitter.addListener('completeSave', this.completeSave)
}
shouldComponentUpdate (nextProps, nextState) {
@@ -146,31 +148,25 @@
}
MKEmitter.removeListener('submitStyle', this.getStyle)
MKEmitter.removeListener('submitModal', this.handleSave)
- MKEmitter.removeListener('logButton', this.logButton)
+ MKEmitter.removeListener('completeSave', this.completeSave)
}
- loopCol = (col) => {
- col.subcols = col.subcols.map(c => {
- c.uuid = Utils.getuuid()
- if (c.type === 'colspan' && c.subcols) {
- c = this.loopCol(c)
- } else if (c.type === 'custom' && c.elements) {
- c.elements = c.elements.map(cell => {
- cell.uuid = Utils.getuuid()
- return cell
- })
- }
- return c
- })
+ completeSave = () => {
+ const { card } = this.state
- return col
+ if (card.isNew) {
+ let item = fromJS(card).toJS()
+ item.cols = item.cols.filter(a => !a.origin)
+
+ delete item.isNew
+
+ this.setState({card: item})
+ }
}
filterOrigin = (component) => {
if (component.isNew) {
let item = fromJS(component).toJS()
- item.search = item.search.filter(a => !a.origin)
- item.action = item.action.filter(a => !a.origin)
item.cols = item.cols.filter(a => !a.origin)
delete item.isNew
@@ -195,20 +191,6 @@
this.filterOrigin(component)
}
- logButton = (id, item) => {
- const { card } = this.state
-
- if (id !== card.uuid) return
-
- let btnlog = card.btnlog || []
- btnlog.push(item)
-
- this.setState({
- card: {...card, btnlog}
- })
- this.filterOrigin({...card, btnlog})
- }
-
changeStyle = () => {
const { card } = this.state
@@ -218,14 +200,9 @@
getStyle = (comIds, style) => {
const { card } = this.state
- if (comIds[0] !== card.uuid) return
+ if (comIds[0] !== card.uuid || comIds.length !== 1) return
- let _card = {}
- if (comIds.length === 1) {
- _card = {...card, style}
- } else {
- return
- }
+ let _card = {...card, style}
this.setState({
card: _card
@@ -243,11 +220,9 @@
}
addSearch = () => {
- let card = fromJS(this.state.card).toJS()
+ const { card } = this.state
- card.search.push({uuid: Utils.getuuid(), focus: true, label: 'label', type: 'text', match: '='})
-
- this.setState({card})
+ MKEmitter.emit('plusSearch', card.uuid, {uuid: Utils.getuuid(), focus: true, label: 'label', type: 'text', match: '='}, 'simple')
}
addButton = () => {
@@ -257,10 +232,10 @@
newcard.uuid = Utils.getuuid()
newcard.focus = true
- newcard.label = 'label'
+ newcard.label = '瀵煎叆Excel'
newcard.sqlType = ''
newcard.Ot = 'requiredSgl'
- newcard.OpenType = 'pop'
+ newcard.OpenType = 'excelIn'
newcard.icon = ''
newcard.class = 'green'
newcard.intertype = card.setting.interType || 'system'
@@ -328,46 +303,6 @@
this.filterOrigin(card)
}
- handleLog = (type, logs, item) => {
- let card = fromJS(this.state.card).toJS()
-
- if (type === 'revert') {
- let done = false
- if (item.$parentId) {
- card.cols.forEach(col => {
- if (col.type !== 'action') return
- if (item.$parentId === col.uuid) {
- col.elements = col.elements ? [...col.elements, item] : [item]
- done = true
- }
- })
- }
-
- if (!done) {
- card.action = card.action ? [...card.action, item] : [item]
- }
-
- card.btnlog = logs
-
- this.setState({ card })
- this.filterOrigin(card)
- notification.success({
- top: 92,
- message: '鎭㈠鎴愬姛锛�',
- duration: 2
- })
- } else {
- card.btnlog = logs
- this.setState({ card })
- this.filterOrigin(card)
- notification.success({
- top: 92,
- message: '娓呴櫎鎴愬姛锛�',
- duration: 2
- })
- }
- }
-
getWrapForms = () => {
const { wrap, action } = this.state.card
@@ -375,7 +310,13 @@
}
updateWrap = (res) => {
- this.updateComponent({...this.state.card, wrap: res})
+ let card = {...this.state.card, wrap: res}
+
+ if (res.tableType) {
+ card.switchable = true
+ }
+
+ this.updateComponent(card)
}
clickComponent = (e) => {
@@ -391,28 +332,27 @@
return (
<div className="menu-normal-table-edit-box" style={_style} onClick={this.clickComponent} id={card.uuid}>
- <NormalHeader defaultshow="hidden" hideSearch="true" config={card} updateComponent={this.updateComponent}/>
+ <NormalHeader hideSearch="true" config={card} updateComponent={this.updateComponent}/>
<Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
<div className="mk-popover-control">
- <Icon className="plus" title="娣诲姞鍒�" onClick={this.addColumns} type="plus" />
- {appType !== 'mob' ? <Icon className="plus" title="娣诲姞鎼滅储" onClick={this.addSearch} type="plus-circle" /> : null}
- <Icon className="plus" title="娣诲姞鎸夐挳" onClick={this.addButton} type="plus-square" />
+ <PlusOutlined className="plus" title="娣诲姞鍒�" onClick={this.addColumns}/>
+ {appType !== 'mob' ? <PlusCircleOutlined className="plus" title="娣诲姞鎼滅储" onClick={this.addSearch}/> : null}
+ <PlusSquareOutlined className="plus" title="娣诲姞鎸夐挳" onClick={this.addButton}/>
<NormalForm title="琛ㄦ牸璁剧疆" width={800} update={this.updateWrap} getForms={this.getWrapForms}>
- <Icon type="edit" style={{color: '#1890ff'}} title="缂栬緫"/>
+ <EditOutlined style={{color: '#1890ff'}} title="缂栬緫"/>
</NormalForm>
<CopyComponent type="normaltable" card={card}/>
<PasteComponent config={card} options={['action', 'search', 'form', 'cols']} updateConfig={this.updateComponent} />
- <Icon className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle} type="font-colors" />
- <LogComponent btnlog={card.btnlog || []} handlelog={this.handleLog} />
+ <FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle}/>
<UserComponent config={card}/>
- <Icon className="close" title="鍒犻櫎缁勪欢" type="delete" onClick={() => this.props.deletecomponent(card.uuid)} />
+ <DeleteOutlined className="close" title="鍒犻櫎缁勪欢" onClick={() => this.props.deletecomponent(card.uuid)} />
<SettingComponent config={card} updateConfig={this.updateComponent} />
</div>
} trigger="hover">
- <Icon type="tool" />
+ <ToolOutlined />
</Popover>
<SearchComponent config={card} updatesearch={this.updateconfig}/>
- <ActionComponent config={card} setSubConfig={this.setSubConfig} updateaction={this.updateComponent}/>
+ <ActionComponent type="editable" config={card} setSubConfig={this.setSubConfig} updateaction={this.updateComponent}/>
<ColumnComponent config={card} updatecolumn={this.updateconfig}/>
</div>
)
--
Gitblit v1.8.0