From 6a0110feb3eb6515447c5a477f20eeaaaabb328b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 26 九月 2021 15:10:07 +0800
Subject: [PATCH] 2021-09-26
---
src/menu/components/card/data-card/index.jsx | 388 +++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 301 insertions(+), 87 deletions(-)
diff --git a/src/menu/components/card/data-card/index.jsx b/src/menu/components/card/data-card/index.jsx
index 5ced615..51c6974 100644
--- a/src/menu/components/card/data-card/index.jsx
+++ b/src/menu/components/card/data-card/index.jsx
@@ -1,25 +1,26 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
-import { connect } from 'react-redux'
import { is, fromJS } from 'immutable'
import { Icon, Popover, Modal, Pagination, notification } from 'antd'
import asyncComponent from '@/utils/asyncComponent'
import asyncIconComponent from '@/utils/asyncIconComponent'
-
+import { resetStyle } from '@/utils/utils-custom.js'
import MKEmitter from '@/utils/events.js'
import Utils from '@/utils/utils.js'
+import getWrapForm from './options'
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 WrapComponent = asyncIconComponent(() => import('./wrapsetting'))
+const NormalForm = asyncIconComponent(() => import('@/components/normalform'))
const CardComponent = asyncComponent(() => import('../cardcomponent'))
+const MobPagination = asyncIconComponent(() => import('@/menu/components/share/mobPagination'))
const LogComponent = asyncIconComponent(() => import('@/menu/components/share/logcomponent'))
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 PasteComponent = asyncIconComponent(() => import('@/components/paste'))
const NormalHeader = asyncComponent(() => import('@/menu/components/share/normalheader'))
const ActionComponent = asyncComponent(() => import('@/menu/components/share/actioncomponent'))
@@ -33,13 +34,15 @@
}
state = {
- dict: localStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
+ dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
card: null,
+ appType: sessionStorage.getItem('appType'),
back: false
}
UNSAFE_componentWillMount () {
const { card } = this.props
+ const { appType } = this.state
if (card.isNew) {
let _card = {
@@ -52,20 +55,21 @@
pageable: true, // 缁勪欢灞炴�� - 鏄惁鍙垎椤�
switchable: true, // 缁勪欢灞炴�� - 鏁版嵁鏄惁鍙垏鎹�
dataName: card.dataName || '',
- width: 24,
+ width: card.width || 24,
name: card.name,
subtype: card.subtype,
setting: { interType: 'system' },
- wrap: { name: card.name, width: 24, title: '', pagestyle: 'page', switch: 'false' },
+ wrap: { name: card.name, width: card.width || 24, title: '', pagestyle: 'page', switch: 'false', cardType: '' },
style: { marginLeft: '0px', marginRight: '0px', marginTop: '8px', marginBottom: '8px' },
headerStyle: { fontSize: '16px', borderBottomWidth: '1px', borderBottomColor: '#e8e8e8' },
columns: [],
scripts: [],
action: [],
+ search: [],
btnlog: [],
subcards: [{
uuid: Utils.getuuid(),
- setting: { width: 6, type: 'simple'},
+ setting: { width: appType === 'mob' ? 24 : 6, type: 'simple'},
style: {
borderWidth: '1px', borderColor: '#e8e8e8',
paddingTop: '15px', paddingBottom: '15px', paddingLeft: '15px', paddingRight: '15px',
@@ -80,8 +84,8 @@
if (card.config) {
let config = fromJS(card.config).toJS()
- _card.setting = config.setting
_card.wrap = config.wrap
+ _card.wrap.name = card.name
_card.style = config.style
_card.headerStyle = config.headerStyle
@@ -97,15 +101,11 @@
})
return scard
})
- _card.columns = config.columns.map(col => {
- col.uuid = Utils.getuuid()
- return col
- })
- _card.scripts = config.scripts.map(col => {
- col.uuid = Utils.getuuid()
- return col
- })
_card.action = config.action.map(col => {
+ col.uuid = Utils.getuuid()
+ return col
+ })
+ _card.search = config.search.map(col => {
col.uuid = Utils.getuuid()
return col
})
@@ -118,6 +118,7 @@
} else {
card.action = card.action || [] // 鍏煎
card.search = card.search || [] // 鍏煎
+
this.setState({
card: fromJS(card).toJS()
})
@@ -131,7 +132,7 @@
}
shouldComponentUpdate (nextProps, nextState) {
- return !is(fromJS(this.state), fromJS(nextState)) || (!this.props.menu && nextProps.menu)
+ return !is(fromJS(this.state), fromJS(nextState))
}
/**
@@ -177,13 +178,17 @@
/**
* @description 鍗曚釜鍗＄墖淇℃伅鏇存柊
*/
- updateCard = (cell) => {
+ updateCard = (cell, btn) => {
let card = fromJS(this.state.card).toJS()
card.subcards = card.subcards.map(item => {
if (item.uuid === cell.uuid) return cell
return item
})
+
+ if (btn) {
+ card.action = card.action.filter(item => item.uuid !== btn.uuid)
+ }
this.setState({card})
@@ -194,6 +199,7 @@
* @description 鍗曚釜鍗＄墖淇℃伅鏇存柊
*/
deleteCard = (cell) => {
+ const { appType } = this.state
let card = fromJS(this.state.card).toJS()
let _this = this
@@ -202,25 +208,31 @@
onOk() {
card.subcards = card.subcards.filter(item => item.uuid !== cell.uuid)
- let uuids = []
- cell.elements && cell.elements.forEach(c => {
- if (c.eleType === 'button') {
- uuids.push(c.uuid)
- }
- })
- cell.backElements && cell.backElements.forEach(c => {
- if (c.eleType === 'button') {
- uuids.push(c.uuid)
- }
- })
- MKEmitter.emit('delButtons', uuids)
-
if (card.btnlog) {
card.btnlog = card.btnlog.filter(c => c.$parentId !== cell.uuid)
}
_this.setState({card})
_this.props.updateConfig(card)
+
+ if (appType === 'mob') return
+
+ let uuids = []
+
+ cell.elements && cell.elements.forEach(c => {
+ if (c.eleType !== 'button' || (appType === 'pc' && c.OpenType !== 'popview')) return
+
+ uuids.push(c.uuid)
+ })
+ cell.backElements && cell.backElements.forEach(c => {
+ if (c.eleType !== 'button' || (appType === 'pc' && c.OpenType !== 'popview')) return
+
+ uuids.push(c.uuid)
+ })
+
+ if (uuids.length === 0) return
+
+ MKEmitter.emit('delButtons', uuids)
},
onCancel() {}
})
@@ -229,7 +241,7 @@
changeStyle = () => {
const { card } = this.state
- MKEmitter.emit('changeStyle', [card.uuid], ['background', 'border', 'padding', 'margin'], card.style)
+ MKEmitter.emit('changeStyle', [card.uuid], ['background', 'height', 'border', 'padding', 'margin', 'shadow'], card.style)
}
getStyle = (comIds, style) => {
@@ -246,68 +258,80 @@
this.props.updateConfig(_card)
}
- addSearch = () => {
+ addSearch = (copy) => {
const { card } = this.state
let newcard = {}
- newcard.uuid = Utils.getuuid()
- newcard.focus = true
- newcard.label = 'label'
- newcard.type = 'select'
- newcard.resourceType = '0'
- newcard.options = []
- newcard.setAll = 'false'
- newcard.orderType = 'asc'
- newcard.display = 'dropdown'
- newcard.match = '='
+ if (copy) {
+ newcard = copy
+ newcard.focus = true
+ } else {
+ newcard.uuid = Utils.getuuid()
+ newcard.focus = true
+
+ newcard.label = 'label'
+ newcard.type = 'select'
+ newcard.resourceType = '0'
+ newcard.options = []
+ newcard.setAll = 'false'
+ newcard.orderType = 'asc'
+ newcard.display = 'dropdown'
+ newcard.match = '='
+ }
// 娉ㄥ唽浜嬩欢-娣诲姞鎼滅储
MKEmitter.emit('addSearch', card.uuid, newcard)
}
- addButton = () => {
+ addButton = (copy) => {
const { card } = this.state
let newcard = {}
- newcard.uuid = Utils.getuuid()
- newcard.focus = true
-
- newcard.label = 'label'
- 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.verify = null
- newcard.show = 'button'
- newcard.btnstyle = {marginRight: '15px'}
+
+ if (copy) {
+ newcard = copy
+ newcard.focus = true
+ } else {
+ newcard.uuid = Utils.getuuid()
+ newcard.focus = true
+
+ newcard.label = 'label'
+ 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.verify = null
+ newcard.show = 'button'
+ newcard.style = {marginRight: '15px'}
+ }
// 娉ㄥ唽浜嬩欢-娣诲姞鎸夐挳
MKEmitter.emit('addButton', card.uuid, newcard)
}
setSubConfig = (item) => {
- const { card } = this.state
+ const { card, appType } = this.state
let btn = fromJS(item).toJS()
- if (btn.OpenType === 'pop') {
+ 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' },
+ setting: { title: btn.label, width: appType === 'mob' ? 100 : 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') {
+ } else if (btn.OpenType === 'popview' && appType !== 'mob') {
MKEmitter.emit('changePopview', card, btn)
}
}
@@ -376,6 +400,201 @@
}
}
+ addCard = (copy) => {
+ let card = fromJS(this.state.card).toJS()
+ let newcard = {}
+
+ if (copy) { // 绮樿创
+ newcard = copy
+ } else {
+ let height = card.subcards[0].style.height
+ if (height === 'auto') {
+ height = '100px'
+ }
+
+ newcard = {
+ uuid: Utils.getuuid(),
+ $cardType: 'extendCard',
+ setting: { width: 6, type: 'simple', click: 'button'},
+ style: {
+ height,
+ borderWidth: '1px', borderColor: '#e8e8e8',
+ paddingTop: '15px', paddingBottom: '15px', paddingLeft: '15px', paddingRight: '15px',
+ marginLeft: '8px', marginRight: '8px', marginTop: '8px', marginBottom: '8px'
+ },
+ backStyle: {},
+ elements: [],
+ backElements: []
+ }
+ }
+
+ card.subcards.push(newcard)
+
+ this.setState({card})
+ this.props.updateConfig(card)
+ }
+
+ move = (item, direction) => {
+ let card = fromJS(this.state.card).toJS()
+
+ let dragIndex = card.subcards.findIndex(c => c.uuid === item.uuid)
+ let hoverIndex = null
+
+ if (direction === 'left') {
+ hoverIndex = dragIndex - 1
+ } else {
+ hoverIndex = dragIndex + 1
+ }
+
+ if (hoverIndex === -1 || hoverIndex === card.subcards.length) return
+
+ card.subcards.splice(hoverIndex, 0, ...card.subcards.splice(dragIndex, 1))
+
+ this.setState({card})
+ this.props.updateConfig(card)
+ }
+
+ getWrapForms = () => {
+ const { card } = this.state
+
+ return getWrapForm(card.wrap, card.subtype)
+ }
+
+ updateWrap = (res) => {
+ this.updateComponent({...this.state.card, wrap: res})
+ }
+
+ pasteComponent = (res, resolve) => {
+ const { card, appType } = this.state
+
+ let type = res.copyType
+ delete res.copyType
+
+ if (type === 'cardcell') {
+ res.uuid = Utils.getuuid()
+ res.setting = res.setting || {}
+ res.$cardType = 'extendCard'
+ res.setting.width = res.setting.width || 6
+
+ let copyBtns = []
+ let mobtypes = ['pop', 'prompt', 'exec', 'innerpage']
+
+ let elements = []
+ res.elements && res.elements.forEach(cell => {
+ if (cell.datatype === 'dynamic') {
+ cell.datatype = 'static'
+ }
+
+ if (cell.eleType !== 'button') {
+ cell.uuid = Utils.getuuid()
+ elements.push(cell)
+ } else if (appType === 'mob' && !mobtypes.includes(cell.OpenType)) {
+ return
+ } else {
+ let _uuid = Utils.getuuid()
+
+ if (cell.OpenType === 'popview') {
+ let _cell = fromJS(cell).toJS()
+ _cell.$originUuid = _cell.uuid
+ _cell.uuid = _uuid
+ copyBtns.push(_cell)
+ }
+
+ cell.uuid = _uuid
+ elements.push(cell)
+ }
+ })
+
+ res.elements = elements
+
+ let backElements = []
+
+ if (appType !== 'mob') {
+ res.backElements && res.backElements.forEach(cell => {
+ if (cell.datatype === 'dynamic') {
+ cell.datatype = 'static'
+ }
+
+ if (cell.eleType !== 'button') {
+ cell.uuid = Utils.getuuid()
+ backElements.push(cell)
+ } else if (appType === 'mob' && !mobtypes.includes(cell.OpenType)) {
+ return
+ } else {
+ let _uuid = Utils.getuuid()
+
+ if (cell.OpenType === 'popview') {
+ let _cell = fromJS(cell).toJS()
+ _cell.$originUuid = _cell.uuid
+ _cell.uuid = _uuid
+ copyBtns.push(_cell)
+ }
+
+ cell.uuid = _uuid
+ backElements.push(cell)
+ }
+ })
+ }
+
+ res.backElements = backElements
+
+ if (copyBtns.length > 0) {
+ MKEmitter.emit('copyButtons', copyBtns)
+ }
+
+ resolve({status: true})
+
+ this.addCard(res)
+ } else if (type === 'search' || type === 'form') {
+ if (appType === 'mob') {
+ resolve({status: false, message: '绉诲姩绔暟鎹崱涓嶆敮鎸佹坊鍔犳悳绱㈡潯浠躲��'})
+ } else {
+ res.uuid = Utils.getuuid()
+ let keys = card.search.map(item => item.field.toLowerCase())
+
+ if (type === 'form') {
+ if (['number', 'switch', 'textarea', 'fileupload', 'hint', 'color', 'funcvar'].includes(res.type)) {
+ res.type = 'text'
+ } else if (res.type === 'radio') {
+ res.type = 'select'
+ } else if (res.type === 'checkbox') {
+ res.type = 'multiselect'
+ } else if (res.type === 'datetime') {
+ res.type = 'date'
+ }
+ }
+
+ if (res.field && keys.includes(res.field.toLowerCase())) {
+ resolve({status: false, message: '鎼滅储瀛楁宸插瓨鍦紒'})
+ return
+ }
+
+ resolve({status: true})
+
+ this.addSearch(res)
+ }
+ } else if (type === 'action') {
+ if (appType === 'mob' && !['pop', 'prompt', 'exec', 'innerpage'].includes(res.OpenType)) {
+ resolve({status: false, message: '绉诲姩绔笉鏀寔姝ょ被鍨嬬殑鎸夐挳銆�'})
+ } else {
+ let _uuid = Utils.getuuid()
+
+ if (res.OpenType === 'popview') {
+ let _cell = fromJS(res).toJS()
+ _cell.$originUuid = _cell.uuid
+ _cell.uuid = _uuid
+
+ MKEmitter.emit('copyButtons', [_cell])
+ }
+
+ resolve({status: true})
+
+ res.uuid = _uuid
+ this.addButton(res)
+ }
+ }
+ }
+
clickComponent = (e) => {
if (sessionStorage.getItem('style-control') === 'true' || sessionStorage.getItem('style-control') === 'component') {
e.stopPropagation()
@@ -384,7 +603,7 @@
}
render() {
- const { card } = this.state
+ const { card, appType } = this.state
let offset = 0
if (card.wrap.cardFloat && card.wrap.cardFloat !== 'left') {
@@ -397,17 +616,21 @@
offset = Math.floor(offset / 2)
}
}
+ let _style = resetStyle(card.style)
return (
- <div className="menu-data-card-edit-box" style={{...card.style}} onClick={this.clickComponent} id={card.uuid}>
+ <div className={'menu-data-card-edit-box ' + appType} style={_style} onClick={this.clickComponent} id={card.uuid}>
<NormalHeader defaultshow="hidden" 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.addSearch} type="plus-circle" />
- <Icon className="plus" title="娣诲姞鎸夐挳" onClick={this.addButton} type="plus-square" />
- <WrapComponent config={card} updateConfig={this.updateComponent} />
+ <Icon className="plus" title="娣诲姞鍗＄墖" onClick={() => this.addCard()} 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" />
+ <NormalForm title="鏁版嵁鍗¤缃�" width={800} update={this.updateWrap} getForms={this.getWrapForms}>
+ <Icon type="edit" style={{color: '#1890ff'}} title="缂栬緫"/>
+ </NormalForm>
<CopyComponent type="datacard" card={card}/>
- <PasteComponent config={card} options={['action', 'search', 'form']} updateConfig={this.updateComponent} />
+ <PasteComponent options={['action', 'search', 'form', 'cardcell']} updateConfig={this.pasteComponent} />
<Icon className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle} type="font-colors" />
<LogComponent btnlog={card.btnlog || []} handlelog={this.handleLog} />
<UserComponent config={card}/>
@@ -417,23 +640,14 @@
} trigger="hover">
<Icon type="tool" />
</Popover>
- <ActionComponent config={card} setSubConfig={this.setSubConfig} updateaction={this.updateComponent}/>
- {card.subcards.map((subcard, index) => (<CardComponent key={subcard.uuid} offset={!index ? offset : 0} cards={card} card={subcard} updateElement={this.updateCard} deleteElement={this.deleteCard}/>))}
+ <ActionComponent config={card} type="datacard" setSubConfig={this.setSubConfig} updateaction={this.updateComponent}/>
+ {card.subcards.map((subcard, index) => (<CardComponent key={subcard.uuid} offset={!index ? offset : 0} cards={card} card={subcard} move={this.move} updateElement={this.updateCard} deleteElement={this.deleteCard}/>))}
<div style={{clear: 'both'}}></div>
- {card.wrap.pagestyle !== 'switch' && card.setting.laypage === 'true' ? <Pagination total={85} size="small" showTotal={total => `鍏� ${total} 鏉} pageSize={20} defaultCurrent={1}/> : null}
+ {card.wrap.pagestyle === 'page' && card.setting.laypage === 'true' && appType !== 'mob' ? <Pagination total={85} size="small" showTotal={total => `鍏� ${total} 鏉} pageSize={20} defaultCurrent={1}/> : null}
+ {card.wrap.pagestyle === 'page' && card.setting.laypage === 'true' && appType === 'mob' ? <MobPagination /> : null}
</div>
)
}
}
-const mapStateToProps = (state) => {
- return {
- menu: state.customMenu
- }
-}
-
-const mapDispatchToProps = () => {
- return {}
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(DataCardEditComponent)
\ No newline at end of file
+export default DataCardEditComponent
\ No newline at end of file
--
Gitblit v1.8.0