From fe21d23b147ed5cec22b4f76a88840b05495d4ad Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 18 六月 2022 22:33:59 +0800
Subject: [PATCH] 2022-06-18

---
 src/menu/components/form/formaction/actionform/index.jsx |   57 ++++++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 46 insertions(+), 11 deletions(-)

diff --git a/src/menu/components/form/formaction/actionform/index.jsx b/src/menu/components/form/formaction/actionform/index.jsx
index f36d0b1..e0a8cdd 100644
--- a/src/menu/components/form/formaction/actionform/index.jsx
+++ b/src/menu/components/form/formaction/actionform/index.jsx
@@ -21,6 +21,7 @@
     formlist: null,  // 琛ㄥ崟淇℃伅
     interType: null, // 鎺ュ彛绫诲瀷锛氬唴閮ㄣ�佸閮�
     procMode: null,  // 鍙傛暟鏂瑰紡
+    linkmenu: null
   }
 
   
@@ -30,11 +31,12 @@
     let _intertype = card.intertype || 'system'  // 鎺ュ彛绫诲瀷
     let _procMode = card.procMode || 'system'    // 鍙傛暟璇锋眰鏂瑰紡
 
-    let _options = this.getOptions(_intertype, _procMode)
+    let _options = this.getOptions(_intertype, _procMode, card.linkmenu)
 
     this.setState({
       interType: _intertype,
       procMode: _procMode,
+      linkmenu: card.linkmenu,
       formlist: this.props.formlist.map(item => {
         if (item.key === 'innerFunc' && _procMode === 'inner') {
           item.required = true
@@ -46,7 +48,7 @@
     })
   }
 
-  getOptions = (_intertype, _procMode) => {
+  getOptions = (_intertype, _procMode, linkmenu) => {
     const { card } = this.props
 
     if (card.type === 'prev') {
@@ -54,7 +56,7 @@
     } else if (card.type === 'next') {
       return ['type', 'label', 'enable']
     }
-    let _options = ['type', 'label', 'intertype', 'syncComponent', 'linkmenu', 'open', 'enable', 'output'] // 閫夐」鍒楄〃
+    let _options = ['type', 'label', 'intertype', 'Ot', 'execSuccess', 'syncComponent', 'anchors', 'linkmenu', 'enable', 'output', 'reload'] // 閫夐」鍒楄〃
     
     if (_intertype === 'custom') {
       _options.pop()
@@ -71,6 +73,10 @@
     } else {
       _options.push('sql', 'sqlType')
     }
+    
+    if (linkmenu && linkmenu !== 'goback') {
+      _options.push('open')
+    }
 
     return _options
   }
@@ -82,10 +88,10 @@
    * 3銆佸垏鎹㈡爣绛剧被鍨嬶紝閲嶇疆鍙�夋爣绛�
    */
   optionChange = (key, value) => {
-    const { procMode } = this.state
+    const { procMode, linkmenu } = this.state
 
     if (key === 'intertype') {
-      let _options = this.getOptions(value, procMode)
+      let _options = this.getOptions(value, procMode, linkmenu)
 
       this.setState({
         interType: value,
@@ -101,7 +107,7 @@
         })
       })
     } else if (key === 'procMode') {
-      let _options = this.getOptions(this.state.interType, value)
+      let _options = this.getOptions(this.state.interType, value, linkmenu)
 
       this.setState({
         procMode: value,
@@ -111,6 +117,16 @@
           if (item.key === 'innerFunc') {
             item.required = true
           }
+          return item
+        })
+      })
+    } else if (key === 'linkmenu') {
+      let _options = this.getOptions(this.state.interType, procMode, value)
+
+      this.setState({
+        linkmenu: value,
+        formlist: this.state.formlist.map(item => {
+          item.hidden = !_options.includes(item.key)
           return item
         })
       })
@@ -144,12 +160,13 @@
 
   getFields() {
     const { getFieldDecorator } = this.props.form
+    const { interType } = this.state
     const fields = []
 
     this.state.formlist.forEach((item, index) => {
       if (item.hidden || item.forbid) return
 
-      if (item.type === 'text') { // 鏂囨湰鎼滅储
+      if (item.type === 'text') {
         let _rules = []
         if (item.key === 'innerFunc') {
           let str = '^(' + item.fields.join('|') + ')'
@@ -169,6 +186,24 @@
             max: formRule.func.max,
             message: formRule.func.maxMessage
           }]
+        } else if (item.key === 'output') {
+          if (interType === 'system') {
+            _rules = [{
+              pattern: /^@[0-9a-zA-Z_]*$/,
+              message: '鍙橀噺浠绗﹀紑澶达紝鍙娇鐢ㄥ瓧姣嶃�佹暟瀛椾互鍙奯'
+            }, {
+              max: 100,
+              message: '鏈�澶�100涓瓧绗︺��'
+            }]
+          } else {
+            _rules = [{
+              pattern: /^[0-9a-zA-Z_]*$/,
+              message: '瀛楁鍙娇鐢ㄥ瓧姣嶃�佹暟瀛椾互鍙奯'
+            }, {
+              max: 100,
+              message: '鏈�澶�100涓瓧绗︺��'
+            }]
+          }
         } else {
           _rules = [{
             max: formRule.input.max,
@@ -221,14 +256,14 @@
                     message: this.props.dict['form.required.input'] + item.label + '!'
                   }
                 ]
-              })(<InputNumber min={0} max={10000} precision={0} />)}
+              })(<InputNumber min={0} max={10000} precision={0} onPressEnter={this.handleSubmit}/>)}
             </Form.Item>
           </Col>
         )
       } else if (item.type === 'select') { // 涓嬫媺鎼滅储
         fields.push(
           <Col span={12} key={index}>
-            <Form.Item label={item.tooltip ?
+            <Form.Item help={item.help || null} label={item.tooltip ?
               <Tooltip placement="topLeft" overlayClassName={item.tooltipClass} title={item.tooltip}>
                 <QuestionCircleOutlined className="mk-form-tip" />
                 {item.label}
@@ -245,7 +280,7 @@
               })(
                 <Select
                   showSearch
-                  filterOption={(input, option) => option.props.children[2].toLowerCase().indexOf(input.toLowerCase()) >= 0}
+                  filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0}
                   onChange={(value) => {this.optionChange(item.key, value)}}
                   getPopupContainer={() => document.getElementById('winter')}
                   allowClear={item.allowClear}
@@ -360,7 +395,7 @@
       }
     }
     return (
-      <Form {...formItemLayout} className="menu-action-list-form" id="winter">
+      <Form {...formItemLayout} className="menu-form-action-list" id="winter">
         <Row gutter={24}>{this.getFields()}</Row>
       </Form>
     )

--
Gitblit v1.8.0