From b8aa5da1b2873bea760483cc5ab335fde9fb6de6 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 12 五月 2022 18:15:56 +0800
Subject: [PATCH] 2022-05-12
---
src/menu/components/card/data-card/index.jsx | 103 +++++++++++++++++++++++++++++++--------------------
1 files changed, 62 insertions(+), 41 deletions(-)
diff --git a/src/menu/components/card/data-card/index.jsx b/src/menu/components/card/data-card/index.jsx
index c864bd0..08c4749 100644
--- a/src/menu/components/card/data-card/index.jsx
+++ b/src/menu/components/card/data-card/index.jsx
@@ -1,7 +1,8 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { Icon, Popover, Modal, Pagination, notification } from 'antd'
+import { Popover, Modal, Pagination, 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'
@@ -14,7 +15,6 @@
const SettingComponent = asyncIconComponent(() => import('@/menu/datasource'))
const NormalForm = asyncIconComponent(() => import('@/components/normalform'))
const CardComponent = asyncComponent(() => import('../cardcomponent'))
-const Nodes = asyncComponent(() => import('./node-wrap'))
const MobPagination = asyncIconComponent(() => import('@/menu/components/share/mobPagination'))
const LogComponent = asyncIconComponent(() => import('@/menu/components/share/logcomponent'))
const CopyComponent = asyncIconComponent(() => import('@/menu/components/share/copycomponent'))
@@ -46,7 +46,6 @@
let _card = {
uuid: card.uuid,
type: card.type,
- floor: card.floor,
tabId: card.tabId || '',
parentId: card.parentId || '',
format: 'array', // 缁勪欢灞炴�� - 鏁版嵁鏍煎紡
@@ -57,7 +56,7 @@
name: card.name,
subtype: card.subtype,
setting: { interType: 'system' },
- wrap: { name: card.name, width: card.width || 24, title: '', pagestyle: 'page', switch: 'false', cardType: '' },
+ wrap: { name: card.name, width: card.width || 24, title: '', pagestyle: 'page', cardType: '' },
style: { marginLeft: '0px', marginRight: '0px', marginTop: '8px', marginBottom: '8px' },
headerStyle: { fontSize: '16px', borderBottomWidth: '1px', borderBottomColor: '#e8e8e8' },
columns: [],
@@ -88,6 +87,10 @@
_card.style = config.style
_card.headerStyle = config.headerStyle
+ _card.setting = config.setting
+ _card.columns = config.columns
+ _card.scripts = config.scripts
+
_card.subcards = config.subcards.map(scard => {
scard.uuid = Utils.getuuid()
scard.elements = scard.elements.map(elem => {
@@ -115,11 +118,31 @@
})
this.props.updateConfig(_card)
} else {
- card.action = card.action || [] // 鍏煎
- card.search = card.search || [] // 鍏煎
+ let _card = fromJS(card).toJS()
+ _card.action = _card.action || [] // 鍏煎
+ _card.search = _card.search || [] // 鍏煎
+
+ if (appType === 'mob') {
+ _card.action = _card.action.map(item => {
+ if (!item.color) {
+ if (item.sqlType === 'LogicDelete' || item.sqlType === 'delete') {
+ item.color = 'danger'
+ } else if (item.sqlType === 'insert') {
+ item.color = 'success'
+ } else if (item.sqlType === 'update' || item.sqlType === 'insertOrUpdate' || item.sqlType === 'custom') {
+ item.color = 'primary'
+ } else if (item.sqlType === 'audit') {
+ item.color = 'warning'
+ } else {
+ item.color = 'weak'
+ }
+ }
+ return item
+ })
+ }
this.setState({
- card: fromJS(card).toJS()
+ card: _card
})
}
}
@@ -273,7 +296,6 @@
newcard.type = 'select'
newcard.resourceType = '0'
newcard.options = []
- newcard.setAll = 'false'
newcard.orderType = 'asc'
newcard.match = '='
}
@@ -413,7 +435,7 @@
newcard = {
uuid: Utils.getuuid(),
$cardType: 'extendCard',
- setting: { width: 6, type: 'simple', click: 'button'},
+ setting: { width: 6, type: 'simple', click: ''},
style: {
height,
borderWidth: '1px', borderColor: '#e8e8e8',
@@ -455,11 +477,29 @@
getWrapForms = () => {
const { card } = this.state
- return getWrapForm(card.wrap, card.subtype)
+ return getWrapForm(card.wrap, card.subtype, card.columns, card.uuid, card.supNodes)
}
updateWrap = (res) => {
- this.updateComponent({...this.state.card, wrap: res})
+ let _card = {...this.state.card, wrap: res}
+
+ if (res.supNodes) {
+ _card.supNodes = res.supNodes
+ _card.supNodes = _card.supNodes.map(item => {
+ item.componentId = item.nodes[item.nodes.length - 1]
+ return item
+ })
+
+ delete res.supNodes
+ } else {
+ delete _card.supNodes
+ }
+
+ if (res.layout === 'flex') {
+ _card.wrap.pagestyle = 'page'
+ }
+
+ this.updateComponent(_card)
}
pasteComponent = (res, resolve) => {
@@ -600,30 +640,9 @@
}
}
- updateSupNodes = (res) => {
- const { card } = this.state
-
- this.setState({
- card: {...card, supNodes: res}
- })
-
- this.updateComponent({...card, supNodes: res})
- }
-
render() {
const { card, appType } = this.state
- let offset = 0
- if (card.wrap.cardFloat && card.wrap.cardFloat !== 'left') {
- let _width = 0
- card.subcards.forEach(card => {
- _width += card.setting.width
- })
- offset = _width < 24 ? 24 - _width : 0
- if (card.wrap.cardFloat === 'center') {
- offset = Math.floor(offset / 2)
- }
- }
let _style = resetStyle(card.style)
return (
@@ -631,29 +650,31 @@
<NormalHeader 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" />
- {appType !== 'mob' ? <Icon className="plus" title="娣诲姞鎼滅储" onClick={() => this.addSearch()} type="plus-circle" /> : null}
- <Icon className="plus" title="娣诲姞鎸夐挳" onClick={() => this.addButton()} type="plus-square" />
+ <PlusOutlined className="plus" title="娣诲姞鍗＄墖" onClick={() => this.addCard()}/>
+ {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}>
- <Icon type="edit" style={{color: '#1890ff'}} title="缂栬緫"/>
+ <EditOutlined style={{color: '#1890ff'}} title="缂栬緫"/>
</NormalForm>
- {card.wrap.supType === 'multi' && appType !== 'mob' ? <Nodes card={card} updateMenus={this.updateSupNodes}/> : null}
<CopyComponent type="datacard" card={card}/>
<PasteComponent options={['action', 'search', 'form', 'cardcell']} updateConfig={this.pasteComponent} />
- <Icon className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle} type="font-colors" />
+ <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>
<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 className={'float-' + (card.wrap.cardFloat || 'left')}>
+ {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' ? <MobPagination /> : null}
+ <div className="component-name"><div className="center">{card.name}</div></div>
</div>
)
}
--
Gitblit v1.8.0