From 8f394e7ef20cc0abba3f47c23a63b069e9dd0e45 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 19 十月 2022 15:09:30 +0800
Subject: [PATCH] 2022-10-19
---
src/menu/components/card/table-card/index.jsx | 336 ++++++++++++++++++++++++++++++++++---------------------
1 files changed, 205 insertions(+), 131 deletions(-)
diff --git a/src/menu/components/card/table-card/index.jsx b/src/menu/components/card/table-card/index.jsx
index 8f41080..91e11b6 100644
--- a/src/menu/components/card/table-card/index.jsx
+++ b/src/menu/components/card/table-card/index.jsx
@@ -1,16 +1,15 @@
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 } 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 } from '@/utils/utils-custom.js'
import MKEmitter from '@/utils/events.js'
import Utils from '@/utils/utils.js'
import getWrapForm from '../data-card/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'))
@@ -19,9 +18,10 @@
const MobPagination = asyncIconComponent(() => import('@/menu/components/share/mobPagination'))
const CopyComponent = asyncIconComponent(() => import('@/menu/components/share/copycomponent'))
const PasteComponent = asyncIconComponent(() => import('@/components/paste'))
-const LogComponent = asyncIconComponent(() => import('@/menu/components/share/logcomponent'))
const UserComponent = asyncIconComponent(() => import('@/menu/components/share/usercomponent'))
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
@@ -33,7 +33,6 @@
}
state = {
- dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
card: null,
appType: sessionStorage.getItem('appType'),
back: false
@@ -46,13 +45,9 @@
let _card = {
uuid: card.uuid,
type: card.type,
- floor: card.floor,
- tabId: card.tabId || '',
- parentId: card.parentId || '',
format: 'array', // 缁勪欢灞炴�� - 鏁版嵁鏍煎紡
pageable: true, // 缁勪欢灞炴�� - 鏄惁鍙垎椤�
switchable: false, // 缁勪欢灞炴�� - 鏁版嵁鏄惁鍙垏鎹�
- dataName: card.dataName || '',
width: card.width || 12,
search: [],
name: card.name,
@@ -71,7 +66,7 @@
},
elements: []
}],
- btnlog: [],
+ action: [],
}
if (card.config) {
@@ -81,6 +76,10 @@
_card.wrap.name = card.name
_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()
@@ -94,21 +93,43 @@
col.uuid = Utils.getuuid()
return col
})
+ if (config.action) {
+ _card.action = config.action.map(col => {
+ col.uuid = Utils.getuuid()
+ return col
+ })
+ }
+ }
+
+ this.updateComponent(_card)
+ } else {
+ let _card = fromJS(card).toJS()
+ if (!_card.action) {
+ _card.action = []
+ }
+
+ if (this.state.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: _card
})
- this.props.updateConfig(_card)
- } else {
- this.setState({
- card: fromJS(card).toJS()
- })
}
- }
-
- componentDidMount () {
- MKEmitter.addListener('submitStyle', this.getStyle)
- MKEmitter.addListener('logButton', this.logButton)
}
shouldComponentUpdate (nextProps, nextState) {
@@ -122,36 +143,80 @@
this.setState = () => {
return
}
- MKEmitter.removeListener('submitStyle', this.getStyle)
- 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) => {
- this.setState({
- card: 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.errors = []
+
+ // let supModule = card.setting.supModule ? card.setting.supModule[card.setting.supModule.length - 1] || '' : ''
+ // if (supModule === 'empty') {
+ // supModule = ''
+ // }
+ let columns = card.columns.map(c => c.field)
+ // let lowcols = card.columns.map(c => c.field.toLowerCase())
+
+ if (card.subcards.length === 0) {
+ card.errors.push({ level: 0, detail: '鍗＄墖涓嶅彲涓虹┖锛�'})
+ }
+
+ if (card.setting.interType === 'system' && card.setting.execute !== 'false' && !card.setting.dataresource) {
+ card.errors.push({ level: 0, detail: '鏈缃暟鎹簮锛�'})
+ } else if (card.setting.interType === 'system' && card.setting.execute === 'false' && card.scripts.filter(script => script.status !== 'false').length === 0) {
+ card.errors.push({ level: 0, detail: '鏁版嵁婧愪腑鏃犲彲鐢ㄨ剼鏈紒'})
+ } else if (!card.setting.primaryKey) {
+ card.errors.push({ level: 0, detail: '鏈缃富閿紒'})
+ } else if (!columns.includes(card.setting.primaryKey)) {
+ card.errors.push({ level: 0, detail: '涓婚敭宸插け鏁堬紒'})
+ } else if (!card.setting.supModule) {
+ card.errors.push({ level: 0, detail: '鏈缃笂绾х粍浠讹紒'})
+ }
+
+ if (card.errors.length === 0) {
+ card.$tables = getTables(card)
+ }
+
+ card.subcards.forEach((item, i) => {
+ let linkbtn = item.setting.linkbtn || ''
+ item.elements.forEach(cell => {
+ if (cell.eleType === 'button') {
+ if (cell.OpenType === 'pop' || (cell.OpenType === 'funcbutton' && cell.execMode === 'pop')) {
+ if (!cell.modal || cell.modal.fields.length === 0) {
+ card.errors.push({ level: 1, detail: `鎸夐挳鈥�${cell.label}鈥濅腑琛ㄥ崟灏氭湭娣诲姞`})
+ }
+ }
+ if (linkbtn && linkbtn === cell.uuid) {
+ linkbtn = ''
+ }
+ } else if (cell.datatype === 'dynamic' && cell.field && !columns.includes(cell.field)) {
+ card.errors.push({ level: 1, detail: `鍗＄墖涓姩鎬佸瓧娈碘��${cell.field}鈥濇棤鏁坄})
+ }
+ })
+
+ if (linkbtn) {
+ card.errors.push({ level: 1, detail: `绗�${i + 1}寮犲崱鐗囦腑缁戝畾鎸夐挳宸插垹闄})
+ }
})
- component.width = component.wrap.width
- component.name = component.wrap.name
+ this.setState({
+ card: card
+ })
- this.props.updateConfig(component)
+ this.props.updateConfig(card)
}
/**
@@ -165,9 +230,7 @@
return item
})
- this.setState({card})
-
- this.props.updateConfig(card)
+ this.updateComponent(card)
}
/**
@@ -183,12 +246,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)
+ _this.updateComponent(card)
if (appType === 'mob') return
@@ -211,21 +269,13 @@
changeStyle = () => {
const { card } = this.state
- MKEmitter.emit('changeStyle', [card.uuid], ['height', 'background', 'border', 'padding', 'margin', 'shadow'], card.style)
+ MKEmitter.emit('changeStyle', ['height', 'background', 'border', 'padding', 'margin', 'shadow'], card.style, this.getStyle)
}
- getStyle = (comIds, style) => {
- const { card } = this.state
+ getStyle = (style) => {
+ let _card = {...this.state.card, style}
- if (comIds[0] !== card.uuid || comIds.length > 1) return
-
- let _card = {...card, style}
-
- this.setState({
- card: _card
- })
-
- this.props.updateConfig(_card)
+ this.updateComponent(_card)
}
addCard = (copy) => {
@@ -255,9 +305,8 @@
}
card.subcards.push(newcard)
-
- this.setState({card})
- this.props.updateConfig(card)
+
+ this.updateComponent(card)
}
addSearch = (copy) => {
@@ -277,61 +326,12 @@
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)
- }
-
- 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
- }
- })
- }
-
- card.btnlog = logs
-
- this.setState({ card })
- this.props.updateConfig(card)
- if (!done) {
- notification.warning({
- top: 92,
- message: '闄勫睘鍗＄墖宸插垹闄わ紒',
- duration: 2
- })
- } else {
- 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
- })
- }
}
move = (item, direction) => {
@@ -350,14 +350,13 @@
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)
+ return getWrapForm(card.wrap, card.subtype, null, null, null, card.setting)
}
updateWrap = (res) => {
@@ -376,7 +375,7 @@
res.setting.width = res.setting.width || 6
let copyBtns = []
- let mobtypes = ['pop', 'prompt', 'exec', 'innerpage']
+ let mobtypes = ['pop', 'prompt', 'exec', 'innerpage', 'funcbutton']
let elements = []
res.elements && res.elements.forEach(cell => {
@@ -443,10 +442,68 @@
}
}
+ addButton = (copy) => {
+ const { card } = this.state
+
+ let newcard = {}
+
+ 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, appType } = this.state
+ let btn = fromJS(item).toJS()
+
+ if (btn.OpenType === 'pop' || btn.execMode === 'pop') {
+ if (!btn.modal) {
+ btn.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' && appType !== 'mob') {
+ MKEmitter.emit('changePopview', card, btn)
+ }
+ }
+
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)
+ })
}
}
@@ -456,30 +513,47 @@
return (
<div className="menu-table-card-edit-box" style={_style} onClick={this.clickComponent} id={card.uuid}>
- <NormalHeader defaultshow="hidden" config={card} updateComponent={this.updateComponent}/>
+ <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}
+ <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>
<CopyComponent type="tablecard" card={card}/>
<PasteComponent options={['cardcell', 'search', 'form']} updateConfig={this.pasteComponent} />
- <Icon className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle} type="font-colors" />
- <LogComponent btnlog={card.btnlog || []} handlelog={this.handleLog} />
+ <FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle}/>
+ <ClockComponent config={card} updateConfig={this.updateComponent}/>
<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)} />
{card.wrap.datatype !== 'static' ? <SettingComponent config={card} updateConfig={this.updateComponent} /> : null}
</div>
} trigger="hover">
- <Icon type="tool" />
+ <ToolOutlined />
</Popover>
+ <ActionComponent config={card} setSubConfig={this.setSubConfig} updateaction={this.updateComponent}/>
<div style={{minHeight: 'calc(100% - 90px)'}}>
{card.subcards.map(subcard => (<CardSimpleComponent key={subcard.uuid} cards={card} card={subcard} updateElement={this.updateCard} move={this.move} deleteElement={this.deleteCard}/>))}
</div>
- {card.setting.laypage === 'true' && card.wrap.pagestyle !== 'slide' && appType !== 'mob' ? <Pagination size="small" total={50} /> : null}
- {card.setting.laypage === 'true' && card.wrap.pagestyle !== 'slide' && appType === 'mob' ? <MobPagination /> : null}
+ {card.setting.laypage === 'true' && card.wrap.pagestyle === 'page' && appType !== 'mob' ? <Pagination size="small" total={50} /> : null}
+ {card.setting.laypage === 'true' && card.wrap.pagestyle === 'page' && appType === 'mob' ? <MobPagination /> : null}
+ {card.setting.laypage === 'true' && card.wrap.pagestyle === 'more' ? <div className="mk-more">鏌ョ湅鏇村<DownOutlined/></div> : null}
+ <div className="component-name">
+ <div className="center">
+ <div className="title">{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