From f2b6db6afa76ff6fe1b13c605c89e0b201a79177 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 20 六月 2023 15:42:09 +0800
Subject: [PATCH] 2023-06-20

---
 src/menu/components/form/formaction/actionform/index.jsx |  248 ++++++++++++++++++++----------------------------
 1 files changed, 104 insertions(+), 144 deletions(-)

diff --git a/src/menu/components/form/formaction/actionform/index.jsx b/src/menu/components/form/formaction/actionform/index.jsx
index 1a17b84..6e9ac94 100644
--- a/src/menu/components/form/formaction/actionform/index.jsx
+++ b/src/menu/components/form/formaction/actionform/index.jsx
@@ -1,7 +1,6 @@
 import React, {Component} from 'react'
 import PropTypes from 'prop-types'
-// import { fromJS } from 'immutable'
-import { Form, Row, Col, Input, Select, Radio, Tooltip, InputNumber, Cascader, notification } from 'antd'
+import { Form, Row, Col, Input, Select, Radio, Tooltip, InputNumber, Cascader } from 'antd'
 import { QuestionCircleOutlined } from '@ant-design/icons'
 import { formRule } from '@/utils/option.js'
 
@@ -17,89 +16,102 @@
   }
 
   state = {
-    formlist: null,  // 琛ㄥ崟淇℃伅
-    interType: null, // 鎺ュ彛绫诲瀷锛氬唴閮ㄣ�佸閮�
-    procMode: null,  // 鍙傛暟鏂瑰紡
-    linkmenu: null,
-    callbackType: null
+    formlist: null
   }
 
+  record = {}
   
   UNSAFE_componentWillMount () {
-    const { card } = this.props
+    this.props.formlist.forEach(item => {
+      this.record[item.key] = item.initVal
+    })
 
-    let _intertype = card.intertype || 'system'  // 鎺ュ彛绫诲瀷
-    let _procMode = card.procMode || 'system'    // 鍙傛暟璇锋眰鏂瑰紡
-    let _callbackType = card.callbackType || 'script'
-
-    let _options = this.getOptions(_intertype, _procMode, card.linkmenu, _callbackType)
+    let { shows, reRequired, reReadonly } = this.getMutilOptions()
 
     this.setState({
-      interType: _intertype,
-      procMode: _procMode,
-      callbackType: _callbackType,
-      linkmenu: card.linkmenu,
       formlist: this.props.formlist.map(item => {
-        if (item.key === 'innerFunc' && _procMode === 'inner') {
-          item.required = true
+        item.hidden = !shows.includes(item.key)
+        item.initVal = this.record[item.key]
+
+        if (reRequired[item.key] !== undefined) {
+          item.required = reRequired[item.key]
+        }
+        if (reReadonly[item.key] !== undefined) {
+          item.readonly = reReadonly[item.key]
         }
 
-        item.hidden = !_options.includes(item.key)
         return item
       })
     })
   }
 
-  getOptions = (_intertype, _procMode, linkmenu, _callbackType) => {
-    const { card } = this.props
+  getMutilOptions = () => {
+    let shows = []
+    let reRequired = {}
+    let reReadonly = {}
 
-    if (card.type === 'prev') {
-      return ['type', 'label', 'enable', 'actionType']
-    } else if (card.type === 'next') {
-      return ['type', 'label', 'enable', 'actionType']
-    } else if (card.type === 'close') {
-      return ['type', 'label', 'enable']
-    }
-    
-    let _options = ['type', 'label', 'intertype', 'Ot', 'execSuccess', 'syncComponent', 'anchors', 'linkmenu', 'enable', 'output', 'reload'] // 閫夐」鍒楄〃
-    
-    if (_intertype === 'custom') {
-      _options.pop()
-      _options.push('procMode', 'interface', 'callbackType', 'proInterface', 'method', 'cross', 'stringify')
-      if (_procMode === 'system') {
-        _options.push('sql', 'sqlType')
-      } else {
-        _options.push('innerFunc')
-      }
-      if (_callbackType === 'func') {
-        _options.push('callbackFunc')
-      } else if (_callbackType !== 'none') {
-        _options.push('cbTable')
-      }
-    } else if (_intertype === 'outer') {
-      _options.push('procMode', 'sysInterface', 'interface', 'proInterface', 'outerFunc', 'callbackType')
-      if (_procMode === 'system') {
-        _options.push('sql', 'sqlType')
-      } else if (_procMode === 'inner') {
-        _options.push('innerFunc')
-      }
-      if (_callbackType === 'func') {
-        _options.push('callbackFunc')
-      } else if (_callbackType !== 'none') {
-        _options.push('cbTable')
-      }
-
-    } else if (_intertype === 'inner') {
-      _options.push('innerFunc')
+    if (this.record.type === 'prev') {
+      shows = ['type', 'label', 'enable', 'actionType']
+    } else if (this.record.type === 'next') {
+      shows = ['type', 'label', 'enable', 'actionType']
+    } else if (this.record.type === 'close') {
+      shows = ['type', 'label', 'enable']
     } else {
-      _options.push('sql', 'sqlType')
-    }
-    
-    if (linkmenu && linkmenu !== 'goback') {
-      _options.push('open')
+      shows = ['type', 'label', 'intertype', 'Ot', 'execSuccess', 'syncComponent', 'anchors', 'linkmenu', 'enable', 'output', 'reload'] // 閫夐」鍒楄〃
+      
+      if (this.record.intertype === 'custom') {
+        shows.pop()
+        shows.push('procMode', 'interface', 'callbackType', 'proInterface', 'method', 'cross', 'stringify')
+        if (this.record.procMode === 'system') {
+          shows.push('sql', 'sqlType')
+        } else if (this.record.procMode === 'inner') {
+          shows.push('innerFunc')
+        }
+        if (this.record.callbackType === 'func') {
+          shows.push('callbackFunc')
+        } else if (this.record.callbackType !== 'none') {
+          shows.push('cbTable')
+        }
+      } else if (this.record.intertype === 'outer') {
+        shows.push('procMode', 'sysInterface', 'interface', 'outerFunc', 'callbackType')
+        if (this.record.procMode === 'system') {
+          shows.push('sql', 'sqlType')
+        } else if (this.record.procMode === 'inner') {
+          shows.push('innerFunc')
+        }
+        if (this.record.callbackType === 'func') {
+          shows.push('callbackFunc')
+        } else if (this.record.callbackType !== 'none') {
+          shows.push('cbTable')
+        }
+
+        reRequired.outerFunc = false
+        if (this.record.sysInterface === 'false') {
+          reReadonly.interface = false
+          reRequired.interface = true
+
+          shows.push('proInterface')
+        } else if (this.record.sysInterface === 'true') {
+          reReadonly.interface = true
+          reRequired.interface = false
+          reRequired.outerFunc = true
+        }
+      } else if (this.record.intertype === 'inner') {
+        shows.push('innerFunc')
+      } else {
+        shows.push('sql', 'sqlType')
+      }
+      
+      if (this.record.linkmenu && this.record.linkmenu !== 'goback') {
+        shows.push('open')
+      }
     }
 
-    return _options
+    return {
+      shows,
+      reRequired,
+      reReadonly
+    }
   }
 
   /**
@@ -109,79 +121,35 @@
    * 3銆佸垏鎹㈡爣绛剧被鍨嬶紝閲嶇疆鍙�夋爣绛�
    */
   optionChange = (key, value) => {
-    const { procMode, linkmenu, callbackType } = this.state
+    this.record[key] = value
+    let _fieldval = {}
 
-    if (key === 'intertype') {
-      let _options = this.getOptions(value, procMode, linkmenu, callbackType)
-
-      this.setState({
-        interType: value,
-        formlist: this.state.formlist.map(item => {
-          item.hidden = !_options.includes(item.key)
-
-          if (item.key === 'interface') {
-            item.readonly = false
-          } else if (item.key === 'sysInterface') {
-            item.initVal = 'false'
-          }
-          return item
-        })
-      })
-    } else if (key === 'procMode') {
-      let _options = this.getOptions(this.state.interType, value, linkmenu, callbackType)
-
-      this.setState({
-        procMode: value,
-        formlist: this.state.formlist.map(item => {
-          item.hidden = !_options.includes(item.key)
-
-          if (item.key === 'procMode') {
-            item.initVal = value
-          }
-          return item
-        })
-      })
-    } else if (key === 'linkmenu') {
-      let _options = this.getOptions(this.state.interType, procMode, value, callbackType)
-
-      this.setState({
-        linkmenu: value,
-        formlist: this.state.formlist.map(item => {
-          item.hidden = !_options.includes(item.key)
-          return item
-        })
-      })
-    } else if (key === 'callbackType') {
-      let _options = this.getOptions(this.state.interType, procMode, linkmenu, value)
-
-      this.setState({
-        callbackType: value,
-        formlist: this.state.formlist.map(item => {
-          if (item.key === 'callbackType') {
-            item.initVal = value
-          }
-          item.hidden = !_options.includes(item.key)
-          return item
-        })
-      })
-    } else if (key === 'sysInterface') {
+    if (key === 'sysInterface') {
       if (value === 'true') {
-        this.props.form.setFieldsValue({
-          interface: window.GLOB.mainSystemApi || ''
-        })
+        _fieldval.interface = window.GLOB.mainSystemApi || ''
+        this.record.interface = window.GLOB.mainSystemApi || ''
       }
-      this.setState({
-        formlist: this.state.formlist.map(item => {
-          if (item.key === 'interface' && value === 'true') {
-            item.readonly = true
-          } else if (item.key === 'interface') {
-            item.readonly = false
-          }
-
-          return item
-        })
-      })
     }
+
+    let { shows, reRequired, reReadonly } = this.getMutilOptions()
+
+    this.setState({
+      formlist: this.state.formlist.map(item => {
+        item.hidden = !shows.includes(item.key)
+        item.initVal = this.record[item.key]
+
+        if (reRequired[item.key] !== undefined) {
+          item.required = reRequired[item.key]
+        }
+        if (reReadonly[item.key] !== undefined) {
+          item.readonly = reReadonly[item.key]
+        }
+
+        return item
+      })
+    }, () => {
+      this.props.form.setFieldsValue(_fieldval)
+    })
   }
 
   handleSubmit = (e) => {
@@ -394,7 +362,7 @@
                   }
                 ]
               })(
-                <Cascader options={item.options || []} expandTrigger="hover" placeholder=""/>
+                <Cascader onChange={(value) => {this.optionChange(item.key, value)}} options={item.options || []} expandTrigger="hover" placeholder=""/>
               )}
             </Form.Item>
           </Col>
@@ -409,14 +377,6 @@
     return new Promise((resolve, reject) => {
       this.props.form.validateFieldsAndScroll((err, values) => {
         if (!err) {
-          if (values.intertype === 'outer' && values.sysInterface === 'true' && !values.outerFunc) {
-            notification.warning({
-              top: 92,
-              message: '浣跨敤鍗曠偣绯荤粺璇峰~鍐欏閮ㄥ嚱鏁帮紒',
-              duration: 10
-            })
-            return
-          }
           resolve(values)
         } else {
           reject(err)

--
Gitblit v1.8.0