From 6ca240a14ccf55d4e0a94fff77e95f64db2cdfcc Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 11 十月 2024 17:34:25 +0800
Subject: [PATCH] 2024-10-11
---
src/menu/components/card/cardcellcomponent/index.jsx | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/src/menu/components/card/cardcellcomponent/index.jsx b/src/menu/components/card/cardcellcomponent/index.jsx
index 50386cc..d6fa1a5 100644
--- a/src/menu/components/card/cardcellcomponent/index.jsx
+++ b/src/menu/components/card/cardcellcomponent/index.jsx
@@ -21,6 +21,7 @@
const VerifyPrint = asyncComponent(() => import('@/templates/sharecomponent/actioncomponent/verifyprint'))
const VerifyExcelIn = asyncComponent(() => import('@/templates/sharecomponent/actioncomponent/verifyexcelin'))
const VerifyExcelOut = asyncComponent(() => import('@/templates/sharecomponent/actioncomponent/verifyexcelout'))
+const VerifyPay = asyncComponent(() => import('@/templates/sharecomponent/actioncomponent/verifypay'))
class CardCellComponent extends Component {
static propTpyes = {
@@ -255,14 +256,9 @@
} else if (_card.eleType === 'button') { // 鎷嗗垎style
_card.style = fromJS(style).toJS()
- if (style.float === 'center') {
- delete _card.style.float
- } else if (style.float) {
+ if (style.float) {
_card.wrapStyle = {textAlign: style.float}
delete _card.style.float
- }
- if (style.textAlign === 'center') {
- delete _card.style.textAlign
}
if (style.minHeight === '28px') {
delete _card.style.minHeight
@@ -395,6 +391,14 @@
}
if (res.width % 1) {
res.width = (res.width + '').replace(/.5/, 'x')
+ }
+
+ if (res.eleType === 'formula' && res.eval === 'false' && res.noValue === 'hide') {
+ let keys = res.formula.match(/@[0-9a-z_]+@/ig)
+ if (keys) {
+ res.$keys = keys.map(key => key.slice(1, -1).toLowerCase())
+ res.$keys = Array.from(new Set(res.$keys))
+ }
}
let _elements = elements.map(cell => {
@@ -562,17 +566,17 @@
*/
deleteElement = (card) => {
const { elements } = this.state
- let _this = this
+ let that = this
confirm({
content: '纭畾鍒犻櫎鍏冪礌鍚楋紵',
onOk() {
let _elements = elements.filter(item => item.uuid !== card.uuid)
- _this.setState({
+ that.setState({
elements: _elements
}, () => {
- _this.props.updateElement(_elements)
+ that.props.updateElement(_elements)
})
},
onCancel() {}
@@ -806,6 +810,12 @@
columns={side === 'sub' ? cards.subColumns : cards.columns}
wrappedComponentRef={(inst) => this.verifyRef = inst}
/>
+ } else if (card.payMode === 'system') {
+ return <VerifyPay
+ card={card}
+ columns={side === 'sub' ? cards.subColumns : cards.columns}
+ wrappedComponentRef={(inst) => this.verifyRef = inst}
+ />
}
}
--
Gitblit v1.8.0