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 | 129 +++++++++---------------------------------
1 files changed, 29 insertions(+), 100 deletions(-)
diff --git a/src/menu/components/card/table-card/index.jsx b/src/menu/components/card/table-card/index.jsx
index 50f198d..91e11b6 100644
--- a/src/menu/components/card/table-card/index.jsx
+++ b/src/menu/components/card/table-card/index.jsx
@@ -2,11 +2,11 @@
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
import { Popover, Modal, Pagination } from 'antd'
-import { PlusOutlined, PlusCircleOutlined, PlusSquareOutlined, EditOutlined, ToolOutlined, DeleteOutlined, FontColorsOutlined } from '@ant-design/icons'
+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'
@@ -18,9 +18,9 @@
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
@@ -45,12 +45,9 @@
let _card = {
uuid: card.uuid,
type: card.type,
- tabId: card.tabId || '',
- parentId: card.parentId || '',
format: 'array', // 缁勪欢灞炴�� - 鏁版嵁鏍煎紡
pageable: true, // 缁勪欢灞炴�� - 鏄惁鍙垎椤�
switchable: false, // 缁勪欢灞炴�� - 鏁版嵁鏄惁鍙垏鎹�
- dataName: card.dataName || '',
width: card.width || 12,
search: [],
name: card.name,
@@ -70,7 +67,6 @@
elements: []
}],
action: [],
- btnlog: [],
}
if (card.config) {
@@ -136,11 +132,6 @@
}
}
- componentDidMount () {
- MKEmitter.addListener('submitStyle', this.getStyle)
- // MKEmitter.addListener('logButton', this.logButton)
- }
-
shouldComponentUpdate (nextProps, nextState) {
return !is(fromJS(this.state), fromJS(nextState))
}
@@ -152,20 +143,7 @@
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.updateComponent({...card, btnlog})
- // }
/**
* @description 鍗＄墖琛屽灞備俊鎭洿鏂帮紙鏁版嵁婧愶紝鏍峰紡绛夛級
@@ -173,7 +151,6 @@
updateComponent = (card) => {
card.width = card.wrap.width
card.name = card.wrap.name
- card.btnlog = []
if (window.GLOB.styling && card.errors) { // 鏍峰紡淇敼鏃朵笉鍋氱瓫鏌�
this.setState({
@@ -186,6 +163,13 @@
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: '鍗＄墖涓嶅彲涓虹┖锛�'})
}
@@ -196,16 +180,15 @@
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: '鏈缃笂绾х粍浠讹紒'})
}
- let supModule = card.setting.supModule ? card.setting.supModule[card.setting.supModule.length - 1] || '' : ''
- if (supModule === 'empty') {
- supModule = ''
+ if (card.errors.length === 0) {
+ card.$tables = getTables(card)
}
- let columns = card.columns.map(c => c.field)
- let lowcols = card.columns.map(c => c.field.toLowerCase())
card.subcards.forEach((item, i) => {
let linkbtn = item.setting.linkbtn || ''
@@ -214,14 +197,6 @@
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}鈥濅腑琛ㄥ崟灏氭湭娣诲姞`})
- } else {
- cell.modal.fields.forEach(m => {
- if (m.type === 'linkMain' && !supModule) {
- card.errors.push({ level: 1, detail: `鎸夐挳鈥�${cell.label}鈥濅腑鍏宠仈涓昏〃琛ㄥ崟鈥�${m.label}鈥濇棤鏁坄})
- } else if (m.field && !columns.includes(m.field) && lowcols.includes(m.field.toLowerCase())) {
- card.errors.push({ level: 1, detail: `鎸夐挳鈥�${cell.label}鈥濅腑琛ㄥ崟鈥�${m.label}鈥濆ぇ灏忓啓涓庡瓧娈甸泦涓嶄竴鑷碻})
- }
- })
}
}
if (linkbtn && linkbtn === cell.uuid) {
@@ -271,10 +246,6 @@
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.updateComponent(card)
if (appType === 'mob') return
@@ -298,15 +269,11 @@
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
-
- if (comIds[0] !== card.uuid || comIds.length > 1) return
-
- let _card = {...card, style}
+ getStyle = (style) => {
+ let _card = {...this.state.card, style}
this.updateComponent(_card)
}
@@ -366,51 +333,6 @@
// 娉ㄥ唽浜嬩欢-娣诲姞鎼滅储
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.updateComponent(card)
- // if (!done) {
- // notification.warning({
- // top: 92,
- // message: '闄勫睘鍗＄墖宸插垹闄わ紒',
- // duration: 2
- // })
- // } else {
- // notification.success({
- // top: 92,
- // message: '鎭㈠鎴愬姛锛�',
- // duration: 2
- // })
- // }
- // } else {
- // card.btnlog = logs
- // this.updateComponent(card)
- // notification.success({
- // top: 92,
- // message: '娓呴櫎鎴愬姛锛�',
- // duration: 2
- // })
- // }
- // }
move = (item, direction) => {
let card = fromJS(this.state.card).toJS()
@@ -575,7 +497,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)
+ })
}
}
@@ -597,7 +525,7 @@
<CopyComponent type="tablecard" card={card}/>
<PasteComponent options={['cardcell', 'search', 'form']} 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)} />
{card.wrap.datatype !== 'static' ? <SettingComponent config={card} updateConfig={this.updateComponent} /> : null}
@@ -605,12 +533,13 @@
} trigger="hover">
<ToolOutlined />
</Popover>
- <ActionComponent config={card} type="datacard" setSubConfig={this.setSubConfig} updateaction={this.updateComponent}/>
+ <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>
--
Gitblit v1.8.0