From 569ccb3c1ff82f30ffefa7d3700571448d742662 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 03 十二月 2020 11:46:28 +0800
Subject: [PATCH] 2020-12-03
---
src/menu/components/table/normal-table/index.jsx | 196 +++++++++++++++++++++---------------------------
1 files changed, 87 insertions(+), 109 deletions(-)
diff --git a/src/menu/components/table/normal-table/index.jsx b/src/menu/components/table/normal-table/index.jsx
index 4f408e0..d3831f8 100644
--- a/src/menu/components/table/normal-table/index.jsx
+++ b/src/menu/components/table/normal-table/index.jsx
@@ -4,7 +4,7 @@
import { is, fromJS } from 'immutable'
import { Icon, Popover, Modal } 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,13 @@
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/actioncomponent'))
+const ColumnComponent = asyncComponent(() => import('./columns'))
+const WrapComponent = asyncIconComponent(() => import('./wrapsetting'))
const { confirm } = Modal
@@ -38,29 +39,6 @@
const { card } = this.props
if (card.isNew) {
- let subcards = null
-
- if (card.config) {
- subcards = JSON.parse(card.config)
- subcards = subcards.map(scard => {
- scard.uuid = Utils.getuuid()
- scard.elements = scard.elements.map(elem => {
- elem.uuid = Utils.getuuid()
- return elem
- })
- return scard
- })
- } else {
- subcards = [{
- uuid: Utils.getuuid(),
- setting: { width: 24, type: 'simple'},
- style: {
- paddingTop: '5px', paddingBottom: '5px', paddingLeft: '15px', paddingRight: '15px',
- },
- elements: []
- }]
- }
-
let _card = {
uuid: card.uuid,
type: card.type,
@@ -69,19 +47,31 @@
parentId: card.parentId || '',
format: 'array', // 缁勪欢灞炴�� - 鏁版嵁鏍煎紡
pageable: true, // 缁勪欢灞炴�� - 鏄惁鍙垎椤�
- switchable: false, // 缁勪欢灞炴�� - 鏁版嵁鏄惁鍙垏鎹�
+ switchable: true, // 缁勪欢灞炴�� - 鏁版嵁鏄惁鍙垏鎹�
dataName: card.dataName || '',
- width: 12,
- search: [],
+ 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' },
+ { origin: true, uuid: Utils.getuuid(), label: '淇敼', intertype: 'system', OpenType: 'pop', icon: 'form', class: 'purple' },
+ { origin: true, uuid: Utils.getuuid(), label: '鍒犻櫎', intertype: 'system', OpenType: 'prompt', icon: 'delete', class: 'red' }
+ ],
name: card.name,
subtype: card.subtype,
setting: { interType: 'system' },
- wrap: { name: card.name, width: 12 },
+ wrap: { name: card.name, width: 24, border: 'true', tableType: 'checkbox' },
style: { marginLeft: '8px', marginRight: '8px', marginTop: '8px', marginBottom: '8px' },
- headerStyle: { fontSize: '16px' },
columns: [],
- scripts: [],
- subcards: subcards
+ 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: []
}
this.setState({
@@ -127,34 +117,17 @@
this.props.updateConfig(component)
}
- /**
- * @description 鍗曚釜鍗＄墖淇℃伅鏇存柊
- */
- updateCard = (cell) => {
- let card = fromJS(this.state.card).toJS()
-
- card.subcards = card.subcards.map(item => {
- if (item.uuid === cell.uuid) return cell
- return item
- })
-
- this.setState({card})
-
- this.props.updateConfig(card)
- }
/**
* @description 鍗曚釜鍗＄墖淇℃伅鏇存柊
*/
- deleteCard = (cell) => {
+ deleteCard = () => {
let card = fromJS(this.state.card).toJS()
let _this = this
confirm({
content: '纭畾鍒犻櫎鍗＄墖鍚楋紵',
onOk() {
- card.subcards = card.subcards.filter(item => item.uuid !== cell.uuid)
-
_this.setState({card})
_this.props.updateConfig(card)
},
@@ -168,12 +141,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
@@ -182,8 +149,6 @@
let _card = {}
if (comIds.length === 1) {
_card = {...card, style}
- } else if (comIds.length === 2 && comIds[1] === 'header') {
- _card = {...card, headerStyle: style}
} else {
return
}
@@ -198,91 +163,104 @@
addCard = () => {
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: []
- }
-
- if (card.subcards.length > 0) {
- newcard = fromJS(card.subcards[card.subcards.length - 1]).toJS()
- newcard.uuid = Utils.getuuid()
- newcard.elements = newcard.elements.map(elem => {
- elem.uuid = Utils.getuuid()
- return elem
- })
- }
-
- card.subcards.push(newcard)
+ // let newcard = {
+ // uuid: Utils.getuuid(),
+ // setting: { width: 6, type: 'simple'},
+ // style: {
+ // paddingTop: '5px', paddingBottom: '5px', paddingLeft: '15px', paddingRight: '15px',
+ // },
+ // elements: []
+ // }
this.setState({card})
this.props.updateConfig(card)
}
+ addColumns = () => {
+ let card = fromJS(this.state.card).toJS()
+
+ card.cols.push({ focus: true, uuid: Utils.getuuid(), label: 'label', field: '', type: 'text' })
+
+ this.setState({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'
- // 娉ㄥ唽浜嬩欢-娣诲姞鎼滅储
- 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 = (btn) => {
+
}
render() {
+ const { menu } = this.props
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="table-header" style={card.headerStyle}>
- <Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
- <div className="mk-popover-control">
- <Icon className="style" title="璋冩暣鏍峰紡" onClick={this.changeTitleStyle} type="font-colors" />
- </div>
- } trigger="hover">
- <span className="table-title">{card.wrap.title || ''}</span>
- </Popover>
- {/* <SearchComponent config={card} updatesearch={this.updateComponent}/> */}
- </div>
<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.addSearch} type="plus-circle" />
- {/* {menu ? <WrapComponent config={card} MenuType={menu.MenuType} updateConfig={this.updateComponent} /> : null} */}
+ <Icon className="plus" title="娣诲姞鍒�" onClick={this.addColumns} type="plus" />
+ {menu && menu.MenuType !== 'billPrint' ? <Icon className="plus" title="娣诲姞鎼滅储" onClick={this.addSearch} type="plus-circle" /> : null}
+ {menu && menu.MenuType !== 'billPrint' ? <Icon className="plus" title="娣诲姞鎸夐挳" onClick={this.addButton} type="plus-square" /> : null}
+ {menu ? <WrapComponent config={card} MenuType={menu.MenuType} updateConfig={this.updateComponent} /> : null}
<Icon className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle} type="font-colors" />
<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
+ type="normaltable"
+ config={card}
+ setSubConfig={this.setSubConfig}
+ updateaction={this.updateComponent}
+ />
+ <ColumnComponent config={card} updatecolumn={this.updateconfig}/>
</div>
)
}
--
Gitblit v1.8.0