From 7b0dbecd1d6155d26ec67be0a47a16264c738c85 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 09 五月 2023 14:48:10 +0800
Subject: [PATCH] 2023-05-09
---
src/menu/components/card/data-card/index.jsx | 326 ++++++++++++++++++++----------------------------------
1 files changed, 121 insertions(+), 205 deletions(-)
diff --git a/src/menu/components/card/data-card/index.jsx b/src/menu/components/card/data-card/index.jsx
index a63e8c1..ae1bcf9 100644
--- a/src/menu/components/card/data-card/index.jsx
+++ b/src/menu/components/card/data-card/index.jsx
@@ -1,12 +1,12 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { Popover, Modal, Pagination, notification } from 'antd'
-import { PlusOutlined, PlusCircleOutlined, PlusSquareOutlined, EditOutlined, ToolOutlined, DeleteOutlined, FontColorsOutlined } from '@ant-design/icons'
+import { Popover, Modal, Pagination, message } from 'antd'
+import { PlusOutlined, PlusCircleOutlined, PlusSquareOutlined, EditOutlined, ToolOutlined, DeleteOutlined, FontColorsOutlined, DownOutlined } from '@ant-design/icons'
import asyncComponent from '@/utils/asyncComponent'
import asyncIconComponent from '@/utils/asyncIconComponent'
-import { resetStyle } from '@/utils/utils-custom.js'
+import { resetStyle, getTables, checkComponent } from '@/utils/utils-custom.js'
import MKEmitter from '@/utils/events.js'
import Utils from '@/utils/utils.js'
import getWrapForm from './options'
@@ -16,11 +16,11 @@
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('@/components/paste'))
const NormalHeader = asyncComponent(() => import('@/menu/components/share/normalheader'))
+const ClockComponent = asyncIconComponent(() => import('@/menu/components/share/clockcomponent'))
const ActionComponent = asyncComponent(() => import('@/menu/components/share/actioncomponent'))
const { confirm } = Modal
@@ -46,12 +46,9 @@
let _card = {
uuid: card.uuid,
type: card.type,
- tabId: card.tabId || '',
- parentId: card.parentId || '',
format: 'array', // 缁勪欢灞炴�� - 鏁版嵁鏍煎紡
pageable: true, // 缁勪欢灞炴�� - 鏄惁鍙垎椤�
switchable: true, // 缁勪欢灞炴�� - 鏁版嵁鏄惁鍙垏鎹�
- dataName: card.dataName || '',
width: card.width || 24,
name: card.name,
subtype: card.subtype,
@@ -63,7 +60,6 @@
scripts: [],
action: [],
search: [],
- btnlog: [],
subcards: [{
uuid: Utils.getuuid(),
setting: { width: appType === 'mob' ? 24 : 6, type: 'simple'},
@@ -73,7 +69,12 @@
marginLeft: '8px', marginRight: '8px', marginTop: '8px', marginBottom: '8px'
},
backStyle: {},
- elements: [],
+ elements: [{
+ uuid: Utils.getuuid(),
+ eleType: 'text',
+ datatype: 'static',
+ value: '寰幆鍖哄煙'
+ }],
backElements: [],
menus: []
}]
@@ -113,10 +114,7 @@
})
}
- this.setState({
- card: _card
- })
- this.props.updateConfig(_card)
+ this.updateComponent(_card)
} else {
let _card = fromJS(card).toJS()
_card.action = _card.action || [] // 鍏煎
@@ -147,12 +145,6 @@
}
}
- componentDidMount () {
- MKEmitter.addListener('submitStyle', this.getStyle)
- MKEmitter.addListener('submitModal', this.handleSave)
- MKEmitter.addListener('logButton', this.logButton)
- }
-
shouldComponentUpdate (nextProps, nextState) {
return !is(fromJS(this.state), fromJS(nextState))
}
@@ -164,37 +156,39 @@
this.setState = () => {
return
}
- MKEmitter.removeListener('submitStyle', this.getStyle)
- MKEmitter.removeListener('submitModal', this.handleSave)
- MKEmitter.removeListener('logButton', this.logButton)
}
- 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 鍗＄墖琛屽灞備俊鎭洿鏂帮紙鏁版嵁婧愶紝鏍峰紡绛夛級
*/
- updateComponent = (component) => {
+ updateComponent = (card) => {
+ card.width = card.wrap.width
+ card.name = card.wrap.name
+
+ if (window.GLOB.styling && card.errors) { // 鏍峰紡淇敼鏃朵笉鍋氱瓫鏌�
+ this.setState({
+ card: card
+ })
+
+ this.props.updateConfig(card)
+ return
+ }
+
+ card.$c_ds = true
+ card.$c_ac = true
+ card.$c_sc = true
+
+ card.errors = checkComponent(card)
+
+ if (card.errors.length === 0) {
+ card.$tables = getTables(card)
+ }
+
this.setState({
- card: component
+ card: card
})
- component.width = component.wrap.width
- component.name = component.wrap.name
-
- this.props.updateConfig(component)
+ this.props.updateConfig(card)
}
/**
@@ -210,18 +204,18 @@
if (btn) {
card.action = card.action.filter(item => item.uuid !== btn.uuid)
+ setTimeout(() => {
+ MKEmitter.emit('revertBtn', card.uuid)
+ }, 200)
}
- this.setState({card})
-
- this.props.updateConfig(card)
+ this.updateComponent(card)
}
/**
* @description 鍗曚釜鍗＄墖淇℃伅鏇存柊
*/
deleteCard = (cell) => {
- const { appType } = this.state
let card = fromJS(this.state.card).toJS()
let _this = this
@@ -230,31 +224,7 @@
onOk() {
card.subcards = card.subcards.filter(item => item.uuid !== cell.uuid)
- 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)
+ _this.updateComponent(card)
},
onCancel() {}
})
@@ -263,21 +233,13 @@
changeStyle = () => {
const { card } = this.state
- MKEmitter.emit('changeStyle', [card.uuid], ['background', 'height', 'border', 'padding', 'margin', 'shadow'], card.style)
+ MKEmitter.emit('changeStyle', ['background', 'height', 'border', 'padding', 'margin', 'shadow', 'clear', 'minHeight'], card.style, this.getStyle)
}
- getStyle = (comIds, style) => {
- const { card } = this.state
-
- if (comIds.length !== 1 || comIds[0] !== card.uuid) return
-
- let _card = {...card, style}
-
- this.setState({
- card: _card
- })
+ getStyle = (style) => {
+ let _card = {...this.state.card, style}
- this.props.updateConfig(_card)
+ this.updateComponent(_card)
}
addSearch = (copy) => {
@@ -356,70 +318,6 @@
}
}
- 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.subcards.forEach(col => {
- if (item.$parentId === col.uuid) {
- if (item.$side !== 'back') {
- col.elements = col.elements ? [...col.elements, item] : [item]
- } else {
- col.backElements = col.backElements ? [...col.backElements, 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
- })
- }
- }
-
addCard = (copy) => {
let card = fromJS(this.state.card).toJS()
let newcard = {}
@@ -449,9 +347,8 @@
}
card.subcards.push(newcard)
-
- this.setState({card})
- this.props.updateConfig(card)
+
+ this.updateComponent(card)
}
move = (item, direction) => {
@@ -470,18 +367,19 @@
card.subcards.splice(hoverIndex, 0, ...card.subcards.splice(dragIndex, 1))
- this.setState({card})
- this.props.updateConfig(card)
+ this.updateComponent(card)
}
getWrapForms = () => {
const { card } = this.state
-
- return getWrapForm(card.wrap, card.subtype, card.columns, card.uuid, card.supNodes)
+
+ return getWrapForm(card.wrap, card.subtype, card.columns, card.uuid, card.supNodes, card.setting)
}
updateWrap = (res) => {
- let _card = {...this.state.card, wrap: res}
+ const { card } = this.state
+
+ let _card = {...card, wrap: res}
if (res.supNodes) {
_card.supNodes = res.supNodes
@@ -498,8 +396,27 @@
if (res.layout === 'flex') {
_card.wrap.pagestyle = 'page'
}
+
+ if (res.selStyle === 'tabs' && card.wrap.selStyle !== 'tabs') {
+ Object.keys(_card.style).forEach(key => {
+ if (/^border/.test(key)) {
+ delete _card.style[key]
+ }
+ })
+ _card.style.borderBottomColor = '#eeeeee'
+ _card.style.borderBottomWidth = '1px'
+ _card.style.paddingBottom = '0px'
- this.updateComponent(_card)
+ _card.subcards.forEach(item => {
+ delete item.style.marginBottom
+ })
+
+ this.setState({card: {..._card, subcards: []}}, () => {
+ this.updateComponent(_card)
+ })
+ } else {
+ this.updateComponent(_card)
+ }
}
pasteComponent = (res, resolve) => {
@@ -514,14 +431,13 @@
res.$cardType = 'extendCard'
res.setting.width = res.setting.width || 6
- let copyBtns = []
- let mobtypes = ['pop', 'prompt', 'exec', 'innerpage']
+ let mobtypes = ['pop', 'prompt', 'exec', 'innerpage', 'funcbutton', 'form']
let elements = []
res.elements && res.elements.forEach(cell => {
- if (cell.datatype === 'dynamic') {
- cell.datatype = 'static'
- }
+ // if (cell.datatype === 'dynamic') {
+ // cell.datatype = 'static'
+ // }
if (cell.eleType !== 'button') {
cell.uuid = Utils.getuuid()
@@ -529,16 +445,7 @@
} 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
+ cell.uuid = Utils.getuuid()
elements.push(cell)
}
})
@@ -549,9 +456,9 @@
if (appType !== 'mob') {
res.backElements && res.backElements.forEach(cell => {
- if (cell.datatype === 'dynamic') {
- cell.datatype = 'static'
- }
+ // if (cell.datatype === 'dynamic') {
+ // cell.datatype = 'static'
+ // }
if (cell.eleType !== 'button') {
cell.uuid = Utils.getuuid()
@@ -559,26 +466,13 @@
} 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
+ cell.uuid = Utils.getuuid()
backElements.push(cell)
}
})
}
res.backElements = backElements
-
- if (copyBtns.length > 0) {
- MKEmitter.emit('copyButtons', copyBtns)
- }
resolve({status: true})
@@ -612,22 +506,16 @@
this.addSearch(res)
}
} else if (type === 'action') {
+ if (res.style) {
+ delete res.style.width
+ delete res.style.float
+ }
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
+ res.uuid = Utils.getuuid()
this.addButton(res)
}
}
@@ -636,7 +524,13 @@
clickComponent = (e) => {
if (sessionStorage.getItem('style-control') === 'true' || sessionStorage.getItem('style-control') === 'component') {
e.stopPropagation()
- MKEmitter.emit('clickComponent', this.state.card)
+ MKEmitter.emit('clickComponent', this.state.card.uuid, null, (style) => {
+ let _card = {...this.state.card}
+ _card.style = {..._card.style, ...style}
+
+ this.setState({ card: _card })
+ this.props.updateConfig(_card)
+ })
}
}
@@ -659,7 +553,7 @@
<CopyComponent type="datacard" card={card}/>
<PasteComponent options={['action', 'search', 'form', 'cardcell']} updateConfig={this.pasteComponent} />
<FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle}/>
- <LogComponent btnlog={card.btnlog || []} handlelog={this.handleLog} />
+ <ClockComponent config={card} updateConfig={this.updateComponent}/>
<UserComponent config={card}/>
<DeleteOutlined className="close" title="鍒犻櫎缁勪欢" onClick={() => this.props.deletecomponent(card.uuid)} />
<SettingComponent config={card} updateConfig={this.updateComponent} />
@@ -667,14 +561,36 @@
} trigger="hover">
<ToolOutlined />
</Popover>
- <ActionComponent config={card} type="datacard" setSubConfig={this.setSubConfig} updateaction={this.updateComponent}/>
- <div className={'float-' + (card.wrap.cardFloat || 'left')}>
+ <ActionComponent config={card} setSubConfig={this.setSubConfig} updateaction={this.updateComponent}/>
+ <div className={'float-' + (card.wrap.cardFloat || 'left') + ' select-' + card.wrap.selStyle}>
{card.subcards.map((subcard, index) => (<CardComponent key={subcard.uuid} cards={card} card={subcard} move={this.move} updateElement={this.updateCard} deleteElement={this.deleteCard}/>))}
</div>
<div style={{clear: 'both'}}></div>
- {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' ? <Pagination total={45} size="small" showTotal={total => `1-10 鍏� ${total} 鏉} showSizeChanger={true} pageSize={10} defaultCurrent={1}/> : null}
{card.wrap.pagestyle === 'page' && card.setting.laypage === 'true' && appType === 'mob' ? <MobPagination /> : null}
- {/* <div className="component-name"><div className="center">{card.name}</div></div> */}
+ {card.wrap.pagestyle === 'more' && card.setting.laypage === 'true' ? <div className="mk-more">鏌ョ湅鏇村<DownOutlined/></div> : null}
+ <div className="component-name">
+ <div className="center">
+ <div className="title" onDoubleClick={() => {
+ let oInput = document.createElement('input')
+ oInput.value = 'anchor' + card.uuid
+ document.body.appendChild(oInput)
+ oInput.select()
+ document.execCommand('Copy')
+ document.body.removeChild(oInput)
+ message.success('澶嶅埗鎴愬姛銆�')
+ }}>{card.name}</div>
+ <div className="content">
+ {card.errors && card.errors.map((err, index) => {
+ if (err.level === 0) {
+ return <span key={index} className="error">{err.detail}</span>
+ } else {
+ return <span key={index} className="waring">{err.detail}锛�</span>
+ }
+ })}
+ </div>
+ </div>
+ </div>
</div>
)
}
--
Gitblit v1.8.0