From 06a670976e2145a10ea05207041d3cf3164cd380 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 03 二月 2024 18:13:25 +0800
Subject: [PATCH] Merge branch 'positec' into dms

---
 src/menu/components/share/actioncomponent/actionform/index.jsx |   26 +++++++++++++++++++-------
 1 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/menu/components/share/actioncomponent/actionform/index.jsx b/src/menu/components/share/actioncomponent/actionform/index.jsx
index 3c8a93c..2239c41 100644
--- a/src/menu/components/share/actioncomponent/actionform/index.jsx
+++ b/src/menu/components/share/actioncomponent/actionform/index.jsx
@@ -14,9 +14,9 @@
 const MkEditIcon = asyncComponent(() => import('@/components/mkIcon'))
 const MKTable = asyncComponent(() => import('@/components/normalform/modalform/mkTable'))
 const acTyOptions = {
-  pop: ['label', 'OpenType', 'intertype', 'Ot', 'show', 'swipe', 'icon', 'class', 'color', 'execSuccess', 'execError', 'syncComponent', 'switchTab', 'anchors', 'width', 'openmenu', 'refreshTab', 'position', 'tipTitle', 'hidden', 'preButton'],
-  prompt: ['label', 'OpenType', 'intertype', 'Ot', 'show', 'swipe', 'icon', 'class', 'color', 'execSuccess', 'execError', 'syncComponent', 'switchTab', 'anchors', 'width', 'openmenu', 'refreshTab', 'position', 'tipTitle', 'hidden', 'preButton'],
-  exec: ['label', 'OpenType', 'intertype', 'Ot', 'show', 'swipe', 'icon', 'class', 'color', 'execSuccess', 'execError', 'syncComponent', 'switchTab', 'anchors', 'width', 'openmenu', 'refreshTab', 'hidden', 'preButton'],
+  pop: ['label', 'OpenType', 'intertype', 'Ot', 'show', 'swipe', 'icon', 'class', 'color', 'execSuccess', 'execError', 'syncComponent', 'switchTab', 'anchors', 'width', 'openmenu', 'refreshTab', 'position', 'tipTitle', 'hidden', 'preButton', 'formCache'],
+  prompt: ['label', 'OpenType', 'intertype', 'Ot', 'show', 'swipe', 'icon', 'class', 'color', 'execSuccess', 'execError', 'syncComponent', 'switchTab', 'anchors', 'width', 'openmenu', 'refreshTab', 'position', 'tipTitle', 'hidden', 'preButton', 'formCache'],
+  exec: ['label', 'OpenType', 'intertype', 'Ot', 'show', 'swipe', 'icon', 'class', 'color', 'execSuccess', 'execError', 'syncComponent', 'switchTab', 'anchors', 'width', 'openmenu', 'refreshTab', 'hidden', 'preButton', 'formCache'],
   excelIn: ['label', 'Ot', 'OpenType', 'intertype', 'show', 'icon', 'class', 'color', 'sheet', 'execSuccess', 'execError', 'syncComponent', 'switchTab', 'width', 'hidden'],
   excelOut: ['label', 'Ot', 'OpenType', 'intertype', 'show', 'icon', 'class', 'color', 'execSuccess', 'execError', 'syncComponent', 'switchTab', 'pagination', 'search', 'width', 'hidden'],
   popview: ['label', 'Ot', 'OpenType', 'show', 'icon', 'class', 'color', 'popClose', 'width', 'display', 'ratio', 'syncComponent', 'clickouter', 'maskStyle', 'closeButton', 'hidden'],
@@ -505,6 +505,10 @@
       } else if (_funcType === 'refund') {
         shows.push('Ot', 'execSuccess', 'execError', 'syncComponent', 'openmenu')
         reOptions.Ot = requireOptions.filter(op => ['requiredSgl'].includes(op.value))
+      } else if (_funcType === 'shareLink') {
+        shows.push('shortUrl', 'shareUrl', 'shareProUrl', 'shareTip')
+      // } else if (_funcType === 'expPdf') {
+      //   shows.push('exportType')
       }
     }
     
@@ -523,7 +527,7 @@
           shows.push('reason')
         }
       }
-    } else {
+    } else if (openType !== 'funcbutton' || !['expPdf', 'shareLink'].includes(this.record.funcType)) {
       if (openType !== 'excelOut') {
         reOptions.control = [
           { value: '', text: '鏃�' },
@@ -780,6 +784,7 @@
       let className = ''
       let content = null
       let initVal = item.initVal || ''
+      let help = item.help || ''
 
       if (item.type === 'splitLine') {
         fields.push(
@@ -857,6 +862,7 @@
             filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0 ||
               option.props.extend.toLowerCase().indexOf(input.toLowerCase()) >= 0}
             onChange={(value) => {this.optionChange(item.key, value)}}
+            on
             getPopupContainer={() => document.getElementById('winter')}
           >
             {item.options.map((option, index) =>
@@ -909,7 +915,7 @@
         rules = [
           { required: item.required, message: '璇锋坊鍔�' + item.label + '!' }
         ]
-        content = (<MKTable tip={''} columns={item.columns || []} actions={[]}/>)
+        content = (<MKTable columns={item.columns || []} actions={item.actions}/>)
       } else if (item.type === 'icon') {
         rules = [
           { required: item.required, message: '璇烽�夋嫨' + item.label + '!' }
@@ -936,7 +942,7 @@
           { required: item.required, message: '璇烽�夋嫨' + item.label + '!' }
         ]
 
-        content = <MkPrintTemps />
+        content = <MkPrintTemps onChange={(value) => {this.optionChange(item.key, value)}}/>
       } else if (item.type === 'keyinterface') {
         span = 24
         className = 'textarea'
@@ -947,9 +953,13 @@
         content = <KeyInterface type={item.key === 'exInterface' ? 'develop' : 'product'}/>
       }
 
+      if (help && typeof(help) === 'function') {
+        help = help(this.record)
+      }
+
       fields.push(
         <Col span={span} key={index}>
-          <Form.Item className={className} help={item.help} label={item.tooltip ?
+          <Form.Item className={className} help={help} label={item.tooltip ?
             <Tooltip placement="topLeft" overlayStyle={{maxWidth: item.tooltip.length > 25 ? 350 : 250 }} title={<span onClick={(e) => e.stopPropagation()}>{item.tooltip}</span>}>
               <QuestionCircleOutlined className="mk-form-tip" />
               {item.label}
@@ -1077,6 +1087,8 @@
                 }
               })
             }
+          } else if (values.OpenType === 'funcbutton' && values.funcType === 'expPdf') {
+            values.Ot = 'notRequired'
           }
           
           if (values.outerBlacklist) {

--
Gitblit v1.8.0