From 5046d0d13dc6a8563b8e54e31913bc44cfa1072f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 26 四月 2022 19:23:18 +0800
Subject: [PATCH] 2022-04-26
---
src/menu/components/table/normal-table/index.jsx | 160 ++++++++++++++++++++++++++++++++++------------------
1 files changed, 104 insertions(+), 56 deletions(-)
diff --git a/src/menu/components/table/normal-table/index.jsx b/src/menu/components/table/normal-table/index.jsx
index 4bd4dd7..39da770 100644
--- a/src/menu/components/table/normal-table/index.jsx
+++ b/src/menu/components/table/normal-table/index.jsx
@@ -1,19 +1,20 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { Icon, Popover, Modal, notification } from 'antd'
+import { Popover, notification } from 'antd'
+import { PlusOutlined, PlusCircleOutlined, PlusSquareOutlined, EditOutlined, ToolOutlined, DeleteOutlined, FontColorsOutlined } from '@ant-design/icons'
import asyncComponent from '@/utils/asyncComponent'
import asyncIconComponent from '@/utils/asyncIconComponent'
import { resetStyle } from '@/utils/utils-custom.js'
import MKEmitter from '@/utils/events.js'
+import getWrapForm from './options'
import Utils from '@/utils/utils.js'
-import zhCN from '@/locales/zh-CN/model.js'
-import enUS from '@/locales/en-US/model.js'
import './index.scss'
const SettingComponent = asyncIconComponent(() => import('@/menu/datasource'))
+const NormalForm = asyncIconComponent(() => import('@/components/normalform'))
const SearchComponent = asyncComponent(() => import('@/templates/sharecomponent/searchcomponent'))
const ActionComponent = asyncComponent(() => import('@/menu/components/share/actioncomponent'))
const NormalHeader = asyncComponent(() => import('@/menu/components/share/normalheader'))
@@ -22,9 +23,6 @@
const PasteComponent = asyncIconComponent(() => import('@/menu/components/share/pastecomponent'))
const LogComponent = asyncIconComponent(() => import('@/menu/components/share/logcomponent'))
const ColumnComponent = asyncComponent(() => import('./columns'))
-const WrapComponent = asyncIconComponent(() => import('./wrapsetting'))
-
-const { confirm } = Modal
class TableCardEditComponent extends Component {
static propTpyes = {
@@ -34,7 +32,6 @@
}
state = {
- dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
appType: sessionStorage.getItem('appType'),
card: null,
back: false
@@ -42,12 +39,12 @@
UNSAFE_componentWillMount () {
const { card } = this.props
+ const { appType } = this.state
if (card.isNew) {
let _card = {
uuid: card.uuid,
type: card.type,
- floor: card.floor,
tabId: card.tabId || '',
parentId: card.parentId || '',
format: 'array', // 缁勪欢灞炴�� - 鏁版嵁鏍煎紡
@@ -56,19 +53,18 @@
dataName: card.dataName || '',
width: card.width || 24,
search: [
- { origin: true, uuid: Utils.getuuid(), label: 'label', type: 'text', match: 'like' },
- { origin: true, uuid: Utils.getuuid(), label: 'label', type: 'select', match: 'equal' },
- { origin: true, uuid: Utils.getuuid(), label: 'label', type: 'date', match: 'greater' }
+ { origin: true, uuid: Utils.getuuid(), label: 'label', field: '', type: 'text', match: 'like' },
+ { origin: true, uuid: Utils.getuuid(), label: 'label', field: '', type: 'select', match: 'equal' }
],
action: [
- { origin: true, uuid: Utils.getuuid(), label: '娣诲姞', intertype: 'system', OpenType: 'pop', icon: 'plus', class: 'green', style: {color: 'rgb(255, 255, 255)', background: 'rgb(38, 194, 129)', marginRight: '15px'} },
- { origin: true, uuid: Utils.getuuid(), label: '淇敼', intertype: 'system', OpenType: 'pop', icon: 'form', class: 'purple', style: {color: 'rgb(255, 255, 255)', background: 'rgb(142, 68, 173)', marginRight: '15px'} },
- { origin: true, uuid: Utils.getuuid(), label: '鍒犻櫎', intertype: 'system', OpenType: 'prompt', icon: 'delete', class: 'danger', style: {color: 'rgb(255, 255, 255)', background: 'rgb(255, 77, 79)', marginRight: '15px'} }
+ { origin: true, uuid: Utils.getuuid(), label: '娣诲姞', intertype: 'system', OpenType: 'pop', execSuccess: 'grid', icon: 'plus', class: 'green', style: {color: 'rgb(255, 255, 255)', background: 'rgb(38, 194, 129)', marginRight: '15px'} },
+ { origin: true, uuid: Utils.getuuid(), label: '淇敼', intertype: 'system', OpenType: 'pop', execSuccess: 'grid', icon: 'form', class: 'purple', style: {color: 'rgb(255, 255, 255)', background: 'rgb(142, 68, 173)', marginRight: '15px'} },
+ { origin: true, uuid: Utils.getuuid(), label: '鍒犻櫎', intertype: 'system', OpenType: 'prompt', execSuccess: 'grid', Ot: 'required', icon: 'delete', class: 'danger', style: {color: 'rgb(255, 255, 255)', background: 'rgb(255, 77, 79)', marginRight: '15px'} }
],
name: card.name,
subtype: card.subtype,
setting: { interType: 'system' },
- wrap: { name: card.name, width: card.width || 24, bordered: 'true', tableType: 'checkbox' },
+ wrap: { name: card.name, width: card.width || 24, bordered: 'true', tableType: 'checkbox', show: 'true' },
style: { marginLeft: '8px', marginRight: '8px', marginTop: '8px', marginBottom: '8px' },
headerStyle: { fontSize: '16px', borderBottomWidth: '1px', borderBottomColor: '#e8e8e8' },
columns: [],
@@ -79,6 +75,7 @@
],
scripts: [],
btnlog: [],
+ isNew: true
}
if (card.config) {
@@ -88,6 +85,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 => {
@@ -122,14 +123,25 @@
_card.wrap.doubleClick = oriUids[_card.wrap.doubleClick] || ''
}
}
+
+ if (appType === 'mob') {
+ _card.search = []
+ _card.action = _card.action.filter(a => !a.origin)
+ }
this.setState({
card: _card
})
- this.props.updateConfig(_card)
+
+ this.filterOrigin(_card)
} else {
+ let _card = fromJS(card).toJS()
+ if (appType === 'mob') {
+ _card.search = []
+ }
+
this.setState({
- card: fromJS(card).toJS()
+ card: _card
})
}
}
@@ -138,6 +150,7 @@
MKEmitter.addListener('submitStyle', this.getStyle)
MKEmitter.addListener('submitModal', this.handleSave)
MKEmitter.addListener('logButton', this.logButton)
+ MKEmitter.addListener('completeSave', this.completeSave)
}
shouldComponentUpdate (nextProps, nextState) {
@@ -154,6 +167,22 @@
MKEmitter.removeListener('submitStyle', this.getStyle)
MKEmitter.removeListener('submitModal', this.handleSave)
MKEmitter.removeListener('logButton', this.logButton)
+ MKEmitter.removeListener('completeSave', this.completeSave)
+ }
+
+ completeSave = () => {
+ const { card } = this.state
+
+ if (card.isNew) {
+ let item = fromJS(card).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
+
+ this.setState({card: item}, () => { MKEmitter.emit('revert') })
+ }
}
loopCol = (col) => {
@@ -173,6 +202,21 @@
return col
}
+ 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
+
+ this.props.updateConfig(item)
+ } else {
+ this.props.updateConfig(component)
+ }
+ }
+
/**
* @description 鍗＄墖琛屽灞備俊鎭洿鏂帮紙鏁版嵁婧愶紝鏍峰紡绛夛級
*/
@@ -184,7 +228,7 @@
component.width = component.wrap.width
component.name = component.wrap.name
- this.props.updateConfig(component)
+ this.filterOrigin(component)
}
logButton = (id, item) => {
@@ -198,30 +242,13 @@
this.setState({
card: {...card, btnlog}
})
- this.props.updateConfig({...card, btnlog})
- }
-
- /**
- * @description 鍗曚釜鍗＄墖淇℃伅鏇存柊
- */
- deleteCard = () => {
- let card = fromJS(this.state.card).toJS()
- let _this = this
-
- confirm({
- content: '纭畾鍒犻櫎鍗＄墖鍚楋紵',
- onOk() {
- _this.setState({card})
- _this.props.updateConfig(card)
- },
- onCancel() {}
- })
+ this.filterOrigin({...card, btnlog})
}
changeStyle = () => {
const { card } = this.state
- MKEmitter.emit('changeStyle', [card.uuid], ['background', 'border', 'padding', 'margin'], card.style)
+ MKEmitter.emit('changeStyle', [card.uuid], ['background', 'border', 'padding', 'margin', 'shadow'], card.style)
}
getStyle = (comIds, style) => {
@@ -240,7 +267,7 @@
card: _card
})
- this.props.updateConfig(_card)
+ this.filterOrigin(_card)
}
addColumns = () => {
@@ -252,11 +279,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 = () => {
@@ -279,7 +304,6 @@
newcard.interface = card.setting.interface || ''
newcard.execSuccess = 'grid'
newcard.execError = 'never'
- newcard.errorTime = 10
newcard.verify = null
newcard.show = 'button'
newcard.style = {marginRight: '15px'}
@@ -295,7 +319,7 @@
this.setState({
card: config
})
- this.props.updateConfig(config)
+ this.filterOrigin(config)
}
setSubConfig = (item) => {
@@ -335,7 +359,7 @@
})
this.setState({card})
- this.props.updateConfig(card)
+ this.filterOrigin(card)
}
handleLog = (type, logs, item) => {
@@ -360,7 +384,7 @@
card.btnlog = logs
this.setState({ card })
- this.props.updateConfig(card)
+ this.filterOrigin(card)
notification.success({
top: 92,
message: '鎭㈠鎴愬姛锛�',
@@ -369,13 +393,30 @@
} else {
card.btnlog = logs
this.setState({ card })
- this.props.updateConfig(card)
+ this.filterOrigin(card)
notification.success({
top: 92,
message: '娓呴櫎鎴愬姛锛�',
duration: 2
})
}
+ }
+
+ getWrapForms = () => {
+ const { wrap, action, columns, cols } = this.state.card
+
+ let _actions = [...action]
+
+ cols.forEach(col => {
+ if (col.type !== 'action') return
+ _actions.push(...col.elements)
+ })
+
+ return getWrapForm(wrap, _actions, columns)
+ }
+
+ updateWrap = (res) => {
+ this.updateComponent({...this.state.card, wrap: res})
}
clickComponent = (e) => {
@@ -387,27 +428,34 @@
render() {
const { card, appType } = this.state
+ let options = ['action', 'search', 'form', 'cols']
let _style = resetStyle(card.style)
+
+ if (appType === 'mob') {
+ options = ['action', 'cols']
+ }
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" />
- <WrapComponent config={card} updateConfig={this.updateComponent} />
+ <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}>
+ <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" />
+ <PasteComponent config={card} options={options} updateConfig={this.updateComponent} />
+ <FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle}/>
<LogComponent btnlog={card.btnlog || []} handlelog={this.handleLog} />
<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}/>
--
Gitblit v1.8.0