From c8804ceb1fe2dea76f9949c5ea04423876ee2c81 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 28 六月 2024 14:02:47 +0800
Subject: [PATCH] 2024-06-28

---
 src/menu/components/card/cardcellcomponent/index.jsx |   47 +++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/src/menu/components/card/cardcellcomponent/index.jsx b/src/menu/components/card/cardcellcomponent/index.jsx
index 44495b6..693f87a 100644
--- a/src/menu/components/card/cardcellcomponent/index.jsx
+++ b/src/menu/components/card/cardcellcomponent/index.jsx
@@ -21,14 +21,16 @@
 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 = {
-    cards: PropTypes.object,         // 鑿滃崟閰嶇疆淇℃伅
+    cards: PropTypes.object,
     cardCell: PropTypes.object,
     side: PropTypes.string,
-    elements: PropTypes.array,       // 鍏冪礌闆�
-    updateElement: PropTypes.func    // 鑿滃崟閰嶇疆鏇存柊
+    timestamp: PropTypes.any,
+    elements: PropTypes.array,
+    updateElement: PropTypes.func
   }
 
   state = {
@@ -74,7 +76,7 @@
   }
 
   UNSAFE_componentWillReceiveProps(nextProps) {
-    if (this.props.side !== nextProps.side && nextProps.side) {
+    if (this.props.timestamp !== nextProps.timestamp && nextProps.timestamp) {
       this.setState({
         elements: fromJS(nextProps.elements).toJS()
       })
@@ -150,9 +152,13 @@
       } else {
         options.push('width', 'minHeight', 'float')
         _style.minHeight = _style.minHeight || '28px'
+        _style.textAlign = _style.textAlign || 'center'
       }
+
       if (element.wrapStyle) {
         _style.float = element.wrapStyle.textAlign || 'left'
+      } else {
+        _style.float = _style.float || 'center'
       }
     } else if (element.eleType === 'picture') {
       options = ['background', 'border', 'margin']
@@ -167,6 +173,10 @@
       options = ['padding', 'margin']
     } else if (element.eleType === 'splitline') {
       options = ['padding', 'margin']
+    }
+    if (['text', 'number', 'formula', 'currentDate'].includes(element.eleType)) {
+      options.push('fontFamily')
+      _style.fontFamily = _style.fontFamily ? _style.fontFamily.split(',') : []
     }
 
     if (element.eleType !== 'button' && element.eleType !== 'tag') {
@@ -203,8 +213,16 @@
     let _card = fromJS(card).toJS()
 
     if (['text', 'number', 'formula', 'currentDate', 'sequence', 'icon'].includes(_card.eleType)) {
-      _card.style = style
+      _card.style = fromJS(style).toJS()
       let line = _card.height || null
+
+      if (style.fontFamily) {
+        if (style.fontFamily.length === 0) {
+          delete _card.style.fontFamily
+        } else {
+          _card.style.fontFamily = style.fontFamily.join(',')
+        }
+      }
 
       if (['currentDate', 'sequence'].includes(_card.eleType) || (_card.eleType === 'icon' && _card.tipType !== 'text')) {
         line = 1
@@ -238,9 +256,17 @@
     } else if (_card.eleType === 'button') { // 鎷嗗垎style
       _card.style = fromJS(style).toJS()
 
-      if (style.float) {
+      if (style.float === 'center') {
+        delete _card.style.float
+      } else 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
       }
     } else if (_card.eleType === 'picture') {
       _card.style = style
@@ -378,6 +404,9 @@
 
           if (!['text', 'number', 'icon'].includes(res.eleType)) {
             delete res.style.display
+          }
+          if (!['text', 'number', 'formula', 'currentDate'].includes(res.eleType)) {
+            delete res.style.fontFamily
           }
           
           if (res.eleType === 'splitline' && (cell.eleType !== 'splitline' || cell.focus)) {
@@ -778,6 +807,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