From 03a22ec6f9ad7303d10b4c65bb5bc6fa5cbd448a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 22 十月 2022 23:21:42 +0800
Subject: [PATCH] 2022-10-22
---
src/menu/components/card/cardcellcomponent/index.jsx | 78 +++++++++++++++-----------------------
1 files changed, 31 insertions(+), 47 deletions(-)
diff --git a/src/menu/components/card/cardcellcomponent/index.jsx b/src/menu/components/card/cardcellcomponent/index.jsx
index ce15a0c..520b227 100644
--- a/src/menu/components/card/cardcellcomponent/index.jsx
+++ b/src/menu/components/card/cardcellcomponent/index.jsx
@@ -3,11 +3,9 @@
import { is, fromJS } from 'immutable'
import { Modal, Button } from 'antd'
-import zhCN from '@/locales/zh-CN/model.js'
-import enUS from '@/locales/en-US/model.js'
import asyncComponent from '@/utils/asyncComponent'
import { getCardCellForm } from './formconfig'
-import { getActionForm } from '@/menu/components/share/actioncomponent/formconfig'
+import { getActionForm, getBaseTableActionForm } from '@/menu/components/share/actioncomponent/formconfig'
import MKEmitter from '@/utils/events.js'
import MenuUtils from '@/utils/utils-custom.js'
@@ -34,7 +32,6 @@
}
state = {
- dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
appType: sessionStorage.getItem('appType'),
card: null, // 缂栬緫涓厓绱�
formlist: null, // 琛ㄥ崟淇℃伅
@@ -102,9 +99,7 @@
if (cardCell.uuid !== parentId) return
- const { elements } = this.state
-
- let _elements = elements.map(item => {
+ let _elements = this.state.elements.map(item => {
if (keys.includes(item.uuid)) {
return this.resetCardStyle(item, {...item.style, ...style})
}
@@ -265,12 +260,10 @@
if (card.eleType === 'button') {
this.handleAction(card)
} else {
- let anchors = MenuUtils.getAnchors(window.GLOB.customMenu.components, cards.uuid) || []
-
this.setState({
visible: true,
card: card,
- formlist: getCardCellForm(card, cards.type, cards.subtype, cardCell, anchors)
+ formlist: getCardCellForm(card, cards, cardCell)
})
}
}
@@ -293,20 +286,10 @@
}
let ableField = usefulFields.join(', ')
+ let msg = `鍑芥暟鍚嶇О闇�浠�${ableField}绛夊瓧绗﹀紑濮�;`
let functip = <div>
- <p style={{marginBottom: '5px'}}>{this.state.dict['model.tooltip.func.innerface'].replace('@ableField', ableField)}</p>
+ <p style={{marginBottom: '5px'}}>{msg}</p>
</div>
-
- let menulist = sessionStorage.getItem('fstMenuList')
- if (menulist) {
- try {
- menulist = JSON.parse(menulist)
- } catch (e) {
- menulist = []
- }
- } else {
- menulist = []
- }
let supId = ''
if (cards.setting && cards.setting.supModule) {
@@ -318,14 +301,23 @@
}
}
- let modules = MenuUtils.getSubModules(window.GLOB.customMenu.components, cards.uuid, supId) || []
- let anchors = MenuUtils.getAnchors(window.GLOB.customMenu.components, cards.uuid) || []
+ let modules = MenuUtils.getSubModules(window.GLOB.customMenu.components, cards.uuid, supId)
- this.setState({
- actvisible: true,
- card: card,
- formlist: getActionForm(card, functip, cards, usefulFields, menulist, modules, anchors)
- })
+ if (cards.subtype === 'basetable') {
+ this.setState({
+ actvisible: true,
+ card: card,
+ formlist: getBaseTableActionForm(card, functip, cards, usefulFields, modules)
+ })
+ } else {
+ let anchors = MenuUtils.getAnchors(window.GLOB.customMenu.components, cards.uuid) || []
+
+ this.setState({
+ actvisible: true,
+ card: card,
+ formlist: getActionForm(card, functip, cards, usefulFields, modules, anchors)
+ })
+ }
}
/**
@@ -446,13 +438,14 @@
res.style = {}
}
} else if (res.class !== cell.class || res.show !== cell.show || !res.style) {
+ let cl = res.class.replace('border-', '')
let style = {}
if (res.show === 'link' || res.show === 'icon') {
- style.color = color[res.class]
+ style.color = color[cl]
style.backgroundColor = 'transparent'
} else {
style.color = '#ffffff'
- style.backgroundColor = color[res.class]
+ style.backgroundColor = color[cl]
}
res.style = {...res.style, ...style}
}
@@ -476,19 +469,17 @@
*/
deleteElement = (card) => {
const { cardCell, side } = this.props
- const { dict, elements, appType } = this.state
+ const { elements, appType } = this.state
let _this = this
confirm({
- content: dict['model.confirm'] + dict['model.delete'] + '鍏冪礌鍚楋紵',
+ content: '纭畾鍒犻櫎鍏冪礌鍚楋紵',
onOk() {
let _elements = elements.filter(item => item.uuid !== card.uuid)
if (card.OpenType === 'popview' || card.verify || card.modal) {
card.$parentId = cardCell.uuid
card.$side = side || ''
-
- // MKEmitter.emit('logButton', cards.uuid, card)
}
_this.setState({
@@ -655,14 +646,12 @@
getVerify = (card) => {
const { cards } = this.props
- const { dict } = this.state
if (!card) return null
if (['pop', 'prompt', 'exec', 'form'].includes(card.OpenType)) {
return <VerifyCard
card={card}
- dict={dict}
config={cards}
columns={cards.columns}
wrappedComponentRef={(inst) => this.verifyRef = inst}
@@ -670,21 +659,18 @@
} else if (card.OpenType === 'excelIn') {
return <VerifyExcelIn
card={card}
- dict={dict}
columns={cards.columns}
wrappedComponentRef={(inst) => this.verifyRef = inst}
/>
} else if (card.OpenType === 'excelOut') {
return <VerifyExcelOut
card={card}
- dict={dict}
config={cards}
wrappedComponentRef={(inst) => this.verifyRef = inst}
/>
} else if (card.OpenType === 'funcbutton' && card.funcType === 'print') {
return <VerifyPrint
card={card}
- dict={dict}
columns={cards.columns}
wrappedComponentRef={(inst) => this.verifyRef = inst}
/>
@@ -693,7 +679,7 @@
render() {
const { cards, cardCell } = this.props
- const { elements, visible, actvisible, profVisible, card, dict, record } = this.state
+ const { elements, visible, actvisible, profVisible, card, record } = this.state
return (
<div className="model-menu-card-cell-list">
@@ -722,7 +708,6 @@
destroyOnClose
>
<ElementForm
- dict={dict}
card={card}
formlist={this.state.formlist}
inputSubmit={this.handleSubmit}
@@ -738,14 +723,13 @@
maskClosable={false}
onCancel={this.editModalCancel}
footer={[
- record && record.intertype === 'inner' ? <CreateFunc key="create" dict={dict} ref="btnCreatFunc" trigger={this.creatFunc}/> : null,
- <Button key="cancel" onClick={this.editModalCancel}>{dict['model.cancel']}</Button>,
- <Button key="confirm" type="primary" onClick={this.handleActionSubmit}>{dict['model.confirm']}</Button>
+ record && record.intertype === 'inner' ? <CreateFunc key="create" ref="btnCreatFunc" trigger={this.creatFunc}/> : null,
+ <Button key="cancel" onClick={this.editModalCancel}>鍙栨秷</Button>,
+ <Button key="confirm" type="primary" onClick={this.handleActionSubmit}>纭畾</Button>
]}
destroyOnClose
>
<ActionForm
- dict={dict}
type={cards.type === 'balcony' ? '' : 'card'}
card={card}
formlist={this.state.formlist}
@@ -761,7 +745,7 @@
visible={profVisible}
width={'90vw'}
maskClosable={false}
- okText={dict['model.submit']}
+ okText="鎻愪氦"
onOk={this.verifySubmit}
onCancel={() => {
if (this.verifyRef.handleCancel) {
--
Gitblit v1.8.0