From c45a375e5b4ce0e33c7fc8a1aecdad67d60acc9e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 01 三月 2021 15:09:06 +0800
Subject: [PATCH] 2021-03-01
---
src/menu/components/table/normal-table/index.jsx | 282 ++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 234 insertions(+), 48 deletions(-)
diff --git a/src/menu/components/table/normal-table/index.jsx b/src/menu/components/table/normal-table/index.jsx
index bf244ea..3b8cb9b 100644
--- a/src/menu/components/table/normal-table/index.jsx
+++ b/src/menu/components/table/normal-table/index.jsx
@@ -2,9 +2,9 @@
import PropTypes from 'prop-types'
import {connect} from 'react-redux'
import { is, fromJS } from 'immutable'
-import { Icon, Popover, Modal } from 'antd'
+import { Icon, Popover, Modal, notification } from 'antd'
-// import asyncComponent from '@/utils/asyncComponent'
+import asyncComponent from '@/utils/asyncComponent'
import asyncIconComponent from '@/utils/asyncIconComponent'
import MKEmitter from '@/utils/events.js'
@@ -12,12 +12,18 @@
import zhCN from '@/locales/zh-CN/model.js'
import enUS from '@/locales/en-US/model.js'
-import SearchComponent from '@/templates/sharecomponent/searchcomponent'
import './index.scss'
const SettingComponent = asyncIconComponent(() => import('@/menu/datasource'))
-// const WrapComponent = asyncIconComponent(() => import('../data-card/wrapsetting'))
-// const SearchComponent = asyncComponent(() => import('@/menu/searchcomponent'))
+const SearchComponent = asyncComponent(() => import('@/templates/sharecomponent/searchcomponent'))
+const ActionComponent = asyncComponent(() => import('@/menu/components/share/actioncomponent'))
+const NormalHeader = asyncComponent(() => import('@/menu/components/share/normalheader'))
+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'))
+const WrapComponent = asyncIconComponent(() => import('./wrapsetting'))
const { confirm } = Modal
@@ -29,7 +35,7 @@
}
state = {
- dict: localStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
+ dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
card: null,
back: false
}
@@ -46,18 +52,68 @@
parentId: card.parentId || '',
format: 'array', // 缁勪欢灞炴�� - 鏁版嵁鏍煎紡
pageable: true, // 缁勪欢灞炴�� - 鏄惁鍙垎椤�
- switchable: false, // 缁勪欢灞炴�� - 鏁版嵁鏄惁鍙垏鎹�
+ switchable: true, // 缁勪欢灞炴�� - 鏁版嵁鏄惁鍙垏鎹�
dataName: card.dataName || '',
- width: 12,
- search: [],
+ 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' }
+ ],
+ action: [
+ { origin: true, uuid: Utils.getuuid(), label: '娣诲姞', intertype: 'system', OpenType: 'pop', icon: 'plus', class: 'green', btnstyle: {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', btnstyle: {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', btnstyle: {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: 12 },
+ wrap: { name: card.name, width: card.width || 24, bordered: 'true', tableType: 'checkbox' },
style: { marginLeft: '8px', marginRight: '8px', marginTop: '8px', marginBottom: '8px' },
- headerStyle: { fontSize: '16px' },
+ headerStyle: { fontSize: '16px', borderBottomWidth: '1px', borderBottomColor: '#e8e8e8' },
columns: [],
- scripts: []
+ cols: [
+ { origin: true, uuid: Utils.getuuid(), Align: 'left', label: 'label1', field: '', Hide: 'false', type: 'text', Width: 120 },
+ { origin: true, uuid: Utils.getuuid(), Align: 'left', label: 'label2', field: '', Hide: 'false', IsSort: 'true', type: 'text', Width: 120 },
+ { origin: true, uuid: Utils.getuuid(), Align: 'left', label: 'label3', field: '', Hide: 'false', IsSort: 'true', type: 'text', Width: 120 },
+ ],
+ scripts: [],
+ btnlog: [],
+ }
+
+ if (card.config) {
+ let config = fromJS(card.config).toJS()
+
+ _card.wrap = config.wrap
+ _card.wrap.name = card.name
+ _card.style = config.style
+ _card.headerStyle = config.headerStyle
+
+ _card.action = config.action.map(item => {
+ item.uuid = Utils.getuuid()
+ return item
+ })
+ _card.search = config.search.map(item => {
+ item.uuid = Utils.getuuid()
+ return item
+ })
+ _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) {
+ col.elements = col.elements.map(cell => {
+ cell.uuid = Utils.getuuid()
+ return cell
+ })
+ } else if (col.type === 'action' && col.elements) {
+ col.elements = col.elements.map(cell => {
+ cell.uuid = Utils.getuuid()
+ return cell
+ })
+ }
+ return col
+ })
}
this.setState({
@@ -73,6 +129,8 @@
componentDidMount () {
MKEmitter.addListener('submitStyle', this.getStyle)
+ MKEmitter.addListener('submitModal', this.handleSave)
+ MKEmitter.addListener('logButton', this.logButton)
}
shouldComponentUpdate (nextProps, nextState) {
@@ -87,6 +145,25 @@
return
}
MKEmitter.removeListener('submitStyle', this.getStyle)
+ MKEmitter.removeListener('submitModal', this.handleSave)
+ MKEmitter.removeListener('logButton', this.logButton)
+ }
+
+ 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
+ })
+
+ return col
}
/**
@@ -103,6 +180,19 @@
this.props.updateConfig(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.props.updateConfig({...card, btnlog})
+ }
/**
* @description 鍗曚釜鍗＄墖淇℃伅鏇存柊
@@ -127,12 +217,6 @@
MKEmitter.emit('changeStyle', [card.uuid], ['background', 'border', 'padding', 'margin'], card.style)
}
- changeTitleStyle = () => {
- const { card } = this.state
-
- MKEmitter.emit('changeStyle', [card.uuid, 'header'], ['font', 'border'], card.headerStyle)
- }
-
getStyle = (comIds, style) => {
const { card } = this.state
@@ -141,8 +225,6 @@
let _card = {}
if (comIds.length === 1) {
_card = {...card, style}
- } else if (comIds.length === 2 && comIds[1] === 'header') {
- _card = {...card, headerStyle: style}
} else {
return
}
@@ -154,70 +236,174 @@
this.props.updateConfig(_card)
}
- addCard = () => {
+ addColumns = () => {
let card = fromJS(this.state.card).toJS()
- // let newcard = {
- // uuid: Utils.getuuid(),
- // setting: { width: 6, type: 'simple'},
- // style: {
- // paddingTop: '5px', paddingBottom: '5px', paddingLeft: '15px', paddingRight: '15px',
- // },
- // elements: []
- // }
-
+ card.cols.push({ focus: true, uuid: Utils.getuuid(), label: 'label', field: '', type: 'text' })
+
this.setState({card})
- this.props.updateConfig(card)
}
addSearch = () => {
+ let card = fromJS(this.state.card).toJS()
+
+ card.search.push({uuid: Utils.getuuid(), focus: true, label: 'label', type: 'text', match: '='})
+
+ this.setState({card})
+ }
+
+ addButton = () => {
const { card } = this.state
let newcard = {}
newcard.uuid = Utils.getuuid()
newcard.focus = true
-
+
newcard.label = 'label'
- newcard.initval = ''
- newcard.type = 'select'
- newcard.resourceType = '0'
- newcard.options = []
- newcard.setAll = 'false'
- newcard.orderType = 'asc'
- newcard.display = 'dropdown'
- newcard.match = '='
+ newcard.sqlType = ''
+ newcard.Ot = 'requiredSgl'
+ newcard.OpenType = 'pop'
+ newcard.icon = ''
+ newcard.class = 'green'
+ newcard.intertype = card.setting.interType || 'system'
+ newcard.innerFunc = card.setting.innerFunc || ''
+ newcard.sysInterface = card.setting.sysInterface || ''
+ newcard.outerFunc = card.setting.outerFunc || ''
+ newcard.interface = card.setting.interface || ''
+ newcard.execSuccess = 'grid'
+ newcard.execError = 'never'
+ newcard.errorTime = 10
+ newcard.verify = null
+ newcard.show = 'button'
+ newcard.btnstyle = {marginRight: '15px'}
- // 娉ㄥ唽浜嬩欢-娣诲姞鎼滅储
- MKEmitter.emit('addSearch', card.uuid, newcard)
+ // 娉ㄥ唽浜嬩欢-娣诲姞鎸夐挳
+ MKEmitter.emit('addButton', card.uuid, newcard)
}
/**
* @description 鏇存柊鎼滅储鏉′欢閰嶇疆淇℃伅
*/
- updatesearch = (config) => {
+ updateconfig = (config) => {
this.setState({
card: config
})
+ this.props.updateConfig(config)
+ }
+
+ setSubConfig = (item) => {
+ const { card } = this.state
+ let btn = fromJS(item).toJS()
+
+ if (btn.OpenType === 'pop' || btn.execMode === 'pop') {
+ if (!btn.modal) {
+ btn.modal = {
+ setting: { title: btn.label, width: 60, cols: '2', container: 'view', focus: '', finish: 'close', clickouter: 'unclose', display: 'modal' },
+ tables: [],
+ groups: [],
+ fields: []
+ }
+ }
+ MKEmitter.emit('changeModal', card, btn)
+ } else if (btn.OpenType === 'popview') {
+ MKEmitter.emit('changePopview', card, btn)
+ }
+ }
+
+ handleSave = (_cards, btn, modal) => {
+ let card = fromJS(this.state.card).toJS()
+
+ if (card.uuid !== _cards.uuid) return
+
+ let _index = card.action.findIndex(cell => cell.uuid === btn.uuid)
+
+ if (_index === -1) return
+
+ card.action = card.action.map(cell => {
+ if (cell.uuid === btn.uuid) {
+ cell.modal = modal
+ }
+
+ return cell
+ })
+
+ this.setState({card})
+ this.props.updateConfig(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.props.updateConfig(card)
+ notification.success({
+ top: 92,
+ message: '鎭㈠鎴愬姛锛�',
+ duration: 2
+ })
+ } else {
+ card.btnlog = logs
+ this.setState({ card })
+ this.props.updateConfig(card)
+ notification.success({
+ top: 92,
+ message: '娓呴櫎鎴愬姛锛�',
+ duration: 2
+ })
+ }
+ }
+
+ clickComponent = (e) => {
+ if (sessionStorage.getItem('style-control') === 'true' || sessionStorage.getItem('style-control') === 'component') {
+ e.stopPropagation()
+ MKEmitter.emit('clickComponent', this.state.card)
+ }
}
render() {
const { card } = this.state
return (
- <div className="menu-normal-table-edit-box" style={{...card.style, height: card.wrap.height}}>
- <SearchComponent config={card} updatesearch={this.updatesearch}/>
+ <div className="menu-normal-table-edit-box" style={{...card.style, height: card.wrap.height}} onClick={this.clickComponent} id={card.uuid}>
+ <NormalHeader defaultshow="hidden" 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.addCard} type="plus" />
+ <Icon className="plus" title="娣诲姞鍒�" onClick={this.addColumns} type="plus" />
<Icon className="plus" title="娣诲姞鎼滅储" onClick={this.addSearch} type="plus-circle" />
- {/* {menu ? <WrapComponent config={card} MenuType={menu.MenuType} updateConfig={this.updateComponent} /> : null} */}
+ <Icon className="plus" title="娣诲姞鎸夐挳" onClick={this.addButton} type="plus-square" />
+ <WrapComponent config={card} updateConfig={this.updateComponent} />
+ <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} />
+ <UserComponent config={card}/>
<Icon className="close" title="鍒犻櫎缁勪欢" type="delete" onClick={() => this.props.deletecomponent(card.uuid)} />
- {card.wrap.datatype !== 'static' ? <SettingComponent config={card} updateConfig={this.updateComponent} /> : null}
+ <SettingComponent config={card} updateConfig={this.updateComponent} />
</div>
} trigger="hover">
<Icon type="tool" />
</Popover>
+ <SearchComponent config={card} updatesearch={this.updateconfig}/>
+ <ActionComponent config={card} setSubConfig={this.setSubConfig} updateaction={this.updateComponent}/>
+ <ColumnComponent config={card} updatecolumn={this.updateconfig}/>
</div>
)
}
--
Gitblit v1.8.0