From 326aa6b3effaccc71cfe0775d47b0f29eb3695a6 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 25 八月 2024 00:36:40 +0800
Subject: [PATCH] 2024-08-25

---
 src/menu/components/share/actioncomponent/index.jsx |   47 +++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/src/menu/components/share/actioncomponent/index.jsx b/src/menu/components/share/actioncomponent/index.jsx
index 0109542..c30f245 100644
--- a/src/menu/components/share/actioncomponent/index.jsx
+++ b/src/menu/components/share/actioncomponent/index.jsx
@@ -20,6 +20,7 @@
 const VerifyExcelIn = asyncSpinComponent(() => import('@/templates/sharecomponent/actioncomponent/verifyexcelin'))
 const VerifyExcelOut = asyncSpinComponent(() => import('@/templates/sharecomponent/actioncomponent/verifyexcelout'))
 const VerifyMegvii = asyncSpinComponent(() => import('@/templates/sharecomponent/actioncomponent/verifymegvii'))
+const VerifyPay = asyncSpinComponent(() => import('@/templates/sharecomponent/actioncomponent/verifypay'))
 
 class ActionComponent extends Component {
   static propTpyes = {
@@ -120,7 +121,17 @@
     const { card, actionlist } = this.state
 
     let _card = fromJS(card).toJS()
-    _card.style = style
+    _card.style = fromJS(style).toJS()
+
+    if (_card.style.paddingLeft === '15px') {
+      delete _card.style.paddingLeft
+    }
+    if (_card.style.paddingRight === '15px') {
+      delete _card.style.paddingRight
+    }
+    if (_card.style.minHeight === '28px') {
+      delete _card.style.minHeight
+    }
 
     let _actionlist = actionlist.map(cell => {
       if (cell.uuid === _card.uuid) return _card
@@ -138,6 +149,10 @@
     let _style = element.style ? fromJS(element.style).toJS() : {}
     let options = ['font', 'border', 'background', 'margin', 'padding', 'minHeight']
 
+    _style.paddingLeft = _style.paddingLeft || '15px'
+    _style.paddingRight = _style.paddingRight || '15px'
+    _style.minHeight = _style.minHeight || '28px'
+
     this.setState({
       card: element
     })
@@ -148,6 +163,8 @@
   addButton = (cardId, element) => {
     if (cardId !== this.props.config.uuid) return
 
+    delete element.eleType
+    
     const { actionlist } = this.state
 
     this.setState({actionlist: [...actionlist, element]})
@@ -206,8 +223,10 @@
         supId = ''
       }
     }
+
+    let menu = window.GLOB.customMenu
     
-    let modules = MenuUtils.getSubModules(window.GLOB.customMenu.components, config.uuid, supId, config.subtype !== 'basetable')
+    let modules = MenuUtils.getSubModules(menu.components, config.uuid, supId, menu.interfaces || null)
 
     if (config.subtype === 'basetable') {
       delete card.eleType // 鍖哄垎鎸夐挳浣嶇疆
@@ -218,7 +237,7 @@
         formlist: getBaseTableActionForm(card, functip, config, usefulFields, modules)
       })
     } else {
-      let anchors = MenuUtils.getAnchors(window.GLOB.customMenu.components, config.uuid) || []
+      let anchors = MenuUtils.getAnchors(menu.components, config.uuid) || []
   
       this.setState({
         visible: true,
@@ -283,12 +302,17 @@
               output: 'true',
               required: 'false',
               type: 'text',
+              noValue: 'true',
               uuid: Utils.getuuid()
             }
   
             if (item.type === 'number') {
               cell.type = 'number'
               cell.decimal = item.decimal
+
+              if (item.noValue === 'hide') {
+                cell.noValue = 'false'
+              }
             }
   
             columns.push(cell)
@@ -466,19 +490,19 @@
    */
   deleteElement = (card) => {
     const { config } = this.props
-    let _this = this
+    let that = this
 
     confirm({
       content: `纭畾鍒犻櫎 - ${card.label} 锛焋,
       onOk() {
-        let _actionlist = fromJS(_this.state.actionlist).toJS()
+        let _actionlist = fromJS(that.state.actionlist).toJS()
 
         _actionlist = _actionlist.filter(item => item.uuid !== card.uuid)
 
-        _this.setState({
+        that.setState({
           actionlist: _actionlist
         }, () => {
-          _this.props.updateaction({...config, action: _actionlist})
+          that.props.updateaction({...config, action: _actionlist})
         })
       },
       onCancel() {}
@@ -501,7 +525,7 @@
   verifySubmit = () => {
     const { config } = this.props
     const { card } = this.state
-    
+
     this.verifyRef.handleConfirm().then(res => {
       let _actionlist = fromJS(this.state.actionlist).toJS()
       _actionlist = _actionlist.filter(item => !item.origin || item.uuid === card.uuid)
@@ -675,6 +699,12 @@
         columns={config.columns}
         wrappedComponentRef={(inst) => this.verifyRef = inst}
       />
+    } else if (card.payMode === 'system') {
+      return <VerifyPay
+        card={card}
+        columns={config.columns}
+        wrappedComponentRef={(inst) => this.verifyRef = inst}
+      />
     }
   }
 
@@ -711,6 +741,7 @@
           destroyOnClose
         >
           <ActionForm
+            type={config.type === 'tree' ? 'card' : ''}
             card={card}
             formlist={this.state.formlist}
             inputSubmit={this.handleSubmit}

--
Gitblit v1.8.0