From 2245384d97d69e36d09cd6baa877e50a81d9aff9 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 29 十二月 2021 21:59:09 +0800
Subject: [PATCH] 2021-12-29

---
 src/templates/sharecomponent/actioncomponent/actionform/index.jsx |  979 ++++++++++++++++++++++++---------------------------------
 1 files changed, 413 insertions(+), 566 deletions(-)

diff --git a/src/templates/sharecomponent/actioncomponent/actionform/index.jsx b/src/templates/sharecomponent/actioncomponent/actionform/index.jsx
index 2fa4671..2dae98e 100644
--- a/src/templates/sharecomponent/actioncomponent/actionform/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/actionform/index.jsx
@@ -4,7 +4,7 @@
 import { Form, Row, Col, Input, Select, Radio, notification, Tooltip, InputNumber, Cascader } from 'antd'
 import { QuestionCircleOutlined } from '@ant-design/icons'
 
-import { btnClasses, formRule } from '@/utils/option.js'
+import { formRule } from '@/utils/option.js'
 import asyncComponent from '@/utils/asyncComponent'
 import Utils from '@/utils/utils.js'
 import './index.scss'
@@ -19,7 +19,7 @@
   excelIn: ['label', 'Ot', 'OpenType', 'intertype', 'icon', 'class', 'sheet', 'execSuccess', 'execError'],
   excelOut: ['label', 'OpenType', 'intertype', 'icon', 'class', 'execSuccess', 'execError', 'pagination', 'search'],
   popview: ['label', 'Ot', 'OpenType', 'icon', 'class', 'position', 'tabType', 'linkTab', 'popClose', 'display', 'ratio', 'clickouter'],
-  tab: ['label', 'Ot', 'OpenType', 'icon', 'class', 'position'],
+  tab: ['label', 'Ot', 'OpenType', 'icon', 'class', 'position', 'linkmenu'],
   innerpage: ['label', 'Ot', 'OpenType', 'pageTemplate', 'icon', 'class', 'position'],
   funcbutton: ['label', 'OpenType', 'funcType', 'icon', 'class']
 }
@@ -30,21 +30,11 @@
     setting: PropTypes.object,   // 椤甸潰璁剧疆
     formlist: PropTypes.any,     // 琛ㄥ崟淇℃伅
     card: PropTypes.any,         // 鎸夐挳淇℃伅
-    tabs: PropTypes.array,       // 鎵�鏈夋爣绛鹃〉
     inputSubmit: PropTypes.any   // 鍥炶溅鎻愪氦浜嬩欢
   }
 
   state = {
     formlist: null,  // 琛ㄥ崟淇℃伅
-    openType: null,  // 鎵撳紑鏂瑰紡
-    interType: null, // 鎺ュ彛绫诲瀷锛氬唴閮ㄣ�佸閮�
-    funcType: null,  // 鍔熻兘绫诲瀷
-    position: null,  // 鎸夐挳浣嶇疆
-    procMode: null,  // 澶栭儴鎺ュ彛鍙傛暟澶勭悊鏂瑰紡
-    control: '',
-    display: '',
-    pageTemplate: null,
-    Ot: null,
     requireOptions: [{
       value: 'notRequired',
       text: this.props.dict['header.form.notRequired']
@@ -93,77 +83,33 @@
     }]
   }
 
+  record = {}
   
   UNSAFE_componentWillMount () {
-    const { card } = this.props
+    this.props.formlist.forEach(item => {
+      this.record[item.key] = item.initVal
+    })
 
-    let _opentype = card.OpenType               // 鎵撳紑鏂瑰紡
-    // let _tabType = card.tabType || 'SubTable'   // 鎸夐挳涓哄脊绐楋紙鏍囩锛夋椂锛屾爣绛剧殑绫诲瀷
-    let _intertype = card.intertype || 'system' // 鎺ュ彛绫诲瀷
-    let _procMode = card.procMode || 'system'   // 鍙傛暟澶勭悊鏂瑰紡
-    let _funcType = card.funcType || ''         // 鍔熻兘鎸夐挳榛樿绫诲瀷
-    let _pageTemplate = card.pageTemplate       // 鏂伴〉闈㈢被鍨�
-    let _Ot = card.Ot || 'requiredSgl'
-    let control = card.control || ''
-    let _display = card.display || 'modal'
+    let { shows, reOptions, reTypes, reRequired, reReadonly } = this.getMutilOptions()
 
-    if (_opentype === 'outerpage') {
-      card.pageTemplate = 'custom'
-      _opentype = 'innerpage'
-    }
-
-    let _tabs = this.props.tabs.filter(tab => tab.type === 'SubTable')
-    let _options = this.getOptions(_opentype, _intertype, _funcType, _pageTemplate, _procMode, _Ot, control, _display)
-    
     this.setState({
-      display: _display,
-      control: control,
-      Ot: _Ot,
-      openType: _opentype,
-      pageTemplate: _pageTemplate,
-      interType: _intertype,
-      procMode: _procMode,
-      position: card.position || 'toolbar',
-      funcType: _funcType,
       formlist: this.props.formlist.map(item => {
-        if (item.key === 'class') {
-          item.options = btnClasses
-        } else if (item.key === 'innerFunc' && _procMode === 'inner') {
-          item.required = true
-        } else if (item.key === 'intertype') {
-          let iscustom = ['pop', 'prompt', 'exec'].includes(_opentype)
-          item.options = this.state.interTypeOptions.filter(op => (iscustom || op.value !== 'custom'))
-        } else if (item.key === 'Ot') {
-          if (card.position === 'grid' || _pageTemplate === 'pay') { // 琛岀骇鎸夐挳銆佹敮浠樻寜閽紝鍙兘閫夊崟琛�
-            item.options = this.state.requireOptions.filter(op => ['requiredSgl'].includes(op.value))
-          } else if (_opentype === 'innerpage' && _pageTemplate === 'billprint') {
-            item.options = this.state.requireOptions.filter(op => ['notRequired', 'requiredSgl', 'required'].includes(op.value))
-          } else if (['innerpage', 'tab', 'popview', 'excelIn'].includes(_opentype)) {
-            item.options = this.state.requireOptions.filter(op => ['notRequired', 'requiredSgl'].includes(op.value))
-          } else if (card.sqlType === 'insert') {
-            item.options = this.state.requireOptions.filter(op => ['notRequired'].includes(op.value))
-          } else {
-            item.options = this.state.requireOptions
-          }
-        } else if (item.key === 'sqlType') {
-          if (['prompt', 'exec'].includes(_opentype)) {
-            item.options = this.state.deleteOptions
-          } else {
-            item.options = this.state.insertUpdateOptions
-          }
-        } else if (item.key === 'linkTab') {
-          item.options = [
-            {
-              value: '',
-              text: '鏂板缓'
-            },
-            ..._tabs
-          ]
-        } else if (item.key === 'OpenType') {
-          item.initVal = _opentype
+        item.hidden = !shows.includes(item.key)
+        item.initVal = this.record[item.key]
+
+        if (reOptions[item.key]) {
+          item.options = reOptions[item.key]
+        }
+        if (reTypes[item.key]) {
+          item.type = reTypes[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
       })
     })
@@ -182,342 +128,344 @@
     }
   }
 
-  getOptions = (_opentype, _intertype, _funcType, _pageTemplate, _procMode, _Ot, _control, _display) => {
-    let _options = fromJS(actionTypeOptions[_opentype]).toJS() // 閫夐」鍒楄〃
-    
-    if (_opentype === 'innerpage') {         // 鏂伴〉闈紝鍙�夋ā鏉�(鑷畾涔夋椂锛屽彲濉叆澶栭儴閾炬帴)
-      if (_pageTemplate === 'custom') {
-        _options.push('url', 'joint')
-      } else if (_pageTemplate === 'billprint') {
-        _options.push('printTemp')
+  getMutilOptions = () => {
+    const { requireOptions } = this.state
+
+    let openType = this.record.OpenType
+    let Ot = this.record.Ot
+    let shows = fromJS(actionTypeOptions[openType] || []).toJS()
+    let reOptions = {}
+    let reTypes = {}
+    let reRequired = {}
+    let reReadonly = {}
+
+    if (openType === 'pop' || openType === 'prompt' || openType === 'exec') {
+      let intertype = this.record.intertype
+
+      reOptions.intertype = this.state.interTypeOptions
+
+      if (intertype === 'custom') {
+        shows.push('procMode', 'interface', 'callbackType', 'cbTable', 'proInterface', 'method', 'cross')
+        if (this.record.procMode === 'system') {
+          shows.push('sql', 'sqlType')
+        } else {
+          reRequired.innerFunc = true
+          shows.push('innerFunc')
+        }
+        reReadonly.interface = false
+        reRequired.interface = true
+      } else if (intertype === 'outer') {
+        shows.push('innerFunc', 'sysInterface', 'interface', 'proInterface', 'outerFunc', 'callbackFunc', 'output')
+        reRequired.innerFunc = false
+
+        if (this.record.sysInterface === 'false') {
+          reReadonly.interface = false
+          reRequired.interface = true
+        } else {
+          reReadonly.interface = true
+          reRequired.interface = false
+        }
+      } else if (intertype === 'inner') {
+        shows.push('innerFunc', 'output')
+        reRequired.innerFunc = true
+      } else {
+        shows.push('sql', 'sqlType', 'output')
       }
-    } else if (_opentype === 'tab') {         // 鏍囩椤�
-      if (this.props.card.tabTemplate !== 'FormTab') {
-        _options.push('linkmenu')
+
+      if (this.record.sqlType === 'insert') {
+        reOptions.Ot = requireOptions.filter(op => op.value === 'notRequired')
+      } else {
+        reOptions.Ot = requireOptions
       }
-    } else if (_opentype === 'excelOut') {    // 瀵煎叆瀵煎嚭
-      if (_intertype === 'outer') {
-        _options.push('innerFunc', 'sysInterface', 'interface', 'proInterface', 'outerFunc')
-      } else if (_intertype === 'inner') {
-        _options.push('innerFunc')
+
+      if (openType === 'prompt' || openType === 'exec') {
+        reOptions.sqlType = this.state.deleteOptions
+      } else {
+        reOptions.sqlType = this.state.insertUpdateOptions
       }
-    } else if (_opentype === 'excelIn') {    // 瀵煎叆瀵煎嚭
-      if (_intertype === 'outer') {
-        _options.push('innerFunc', 'sysInterface', 'interface', 'proInterface', 'outerFunc', 'callbackFunc')
-      } else if (_intertype === 'inner') {
-        _options.push('innerFunc')
+    } else if (openType === 'excelIn') {
+      reOptions.intertype = this.state.interTypeOptions.filter(op => op.value !== 'custom')
+      reOptions.Ot = requireOptions.filter(op => ['notRequired', 'requiredSgl'].includes(op.value))
+
+      if (this.record.intertype === 'outer') {
+        shows.push('innerFunc', 'sysInterface', 'interface', 'proInterface', 'outerFunc', 'callbackFunc')
+        reRequired.innerFunc = false
+
+        if (this.record.sysInterface === 'false') {
+          reReadonly.interface = false
+          reRequired.interface = true
+        } else {
+          reReadonly.interface = true
+          reRequired.interface = false
+        }
+      } else if (this.record.intertype === 'inner') {
+        shows.push('innerFunc')
+        reRequired.innerFunc = true
       }
-    } else if (_opentype === 'funcbutton') {
+    } else if (openType === 'excelOut') {
+      reOptions.intertype = this.state.interTypeOptions.filter(op => op.value !== 'custom')
+
+      if (this.record.intertype === 'outer') {
+        shows.push('innerFunc', 'sysInterface', 'interface', 'proInterface', 'outerFunc')
+        reRequired.innerFunc = false
+
+        if (this.record.sysInterface === 'false') {
+          reReadonly.interface = false
+          reRequired.interface = true
+        } else {
+          reReadonly.interface = true
+          reRequired.interface = false
+        }
+      } else if (this.record.intertype === 'inner') {
+        shows.push('innerFunc')
+        reRequired.innerFunc = true
+      }
+    } else if (openType === 'popview') {
+      reOptions.Ot = requireOptions.filter(op => ['notRequired', 'requiredSgl'].includes(op.value))
+
+      if (this.record.display === 'drawer') {
+        shows.push('placement')
+      }
+    } else if (openType === 'tab') {
+      reOptions.Ot = requireOptions.filter(op => ['notRequired', 'requiredSgl'].includes(op.value))
+
+      reRequired.linkmenu = true
+    } else if (openType === 'innerpage') {
+      reOptions.Ot = requireOptions.filter(op => ['notRequired', 'requiredSgl'].includes(op.value))
+
+      if (this.record.pageTemplate === 'custom') {
+        shows.push('url', 'joint')
+      } else if (this.record.pageTemplate === 'billprint') {
+        shows.push('printTemp')
+        reOptions.Ot = requireOptions.filter(op => ['notRequired', 'requiredSgl', 'required'].includes(op.value))
+      } else if (this.record.pageTemplate === 'pay' || this.record.pageTemplate === 'print' || this.record.pageTemplate === 'billprintTemp') {
+        reOptions.Ot = requireOptions.filter(op => op.value === 'requiredSgl')
+      }
+    } else if (openType === 'funcbutton') {
+      reOptions.intertype = this.state.interTypeOptions.filter(op => op.value !== 'custom')
+      reOptions.Ot = requireOptions
+
+      let _funcType = this.record.funcType
+
       if (_funcType === 'print') {
-        _options.push('execMode', 'intertype', 'Ot', 'execSuccess', 'execError')
-        if (_intertype === 'outer') {
-          _options.push('innerFunc', 'sysInterface', 'interface', 'proInterface', 'outerFunc', 'callbackFunc')
-        } else if (_intertype === 'inner') {
-          _options.push('innerFunc')
+        shows.push('execMode', 'intertype', 'Ot', 'execSuccess', 'execError', 'resetPageIndex')
+        if (this.record.intertype === 'outer') {
+          shows.push('innerFunc', 'sysInterface', 'interface', 'proInterface', 'outerFunc', 'callbackFunc')
+          reRequired.innerFunc = false
+
+          if (this.record.sysInterface === 'false') {
+            reReadonly.interface = false
+            reRequired.interface = true
+          } else {
+            reReadonly.interface = true
+            reRequired.interface = false
+          }
+        } else if (this.record.intertype === 'inner') {
+          shows.push('innerFunc')
+          reRequired.innerFunc = true
         }
       } else if (_funcType === 'closetab') {
-        _options.push('refreshTab')
+        shows.push('refreshTab')
       }
-    } else if (_opentype === 'popview') {
-      if (_display === 'drawer') {
-        _options.push('placement')
-      }
+    }
+
+    if (this.record.position === 'grid') { // 琛ㄦ牸涓寜閽彧鑳介�夊崟琛�
+      reOptions.Ot = requireOptions.filter(op => op.value === 'requiredSgl')
+    }
+    
+    if (Ot !== 'notRequired') {
+      reOptions.control = [
+        { value: '', text: '鏃�' },
+        { value: 'disabled', text: '绂佺敤' },
+        { value: 'hidden', text: '闅愯棌' },
+        { value: 'parent', text: '涓婄骇' }
+      ]
     } else {
-      if (_intertype === 'custom') {
-        _options.push('procMode', 'interface', 'callbackType', 'cbTable', 'proInterface', 'method', 'cross')
-        if (_procMode === 'system') {
-          _options.push('sql', 'sqlType')
-        } else {
-          _options.push('innerFunc')
-        }
-      } else if (_intertype === 'outer') {
-        _options.push('innerFunc', 'sysInterface', 'interface', 'proInterface', 'outerFunc', 'callbackFunc')
-      } else if (_intertype === 'inner') {
-        _options.push('innerFunc', 'preFunc')
-      } else {
-        _options.push('sql', 'sqlType')
-      }
+      reOptions.control = [
+        { value: '', text: '鏃�' },
+        { value: 'parent', text: '涓婄骇' }
+      ]
+    }
+    shows.push('control')
+    if (this.record.control === 'parent') {
+      reTypes.controlField = 'text'
+    } else {
+      reTypes.controlField = 'select'
+    }
+    if (this.record.control) {
+      shows.push('controlField', 'controlVal')
     }
 
-    if (_options.includes('execSuccess') || _options.includes('popClose')) {
-      _options.push('resetPageIndex')
+    return {
+      shows,
+      reOptions,
+      reTypes,
+      reRequired,
+      reReadonly
     }
-
-    if (_Ot !== 'notRequired' && _opentype !== 'excelOut') {
-      _options.push('control')
-      if (_control) {
-        _options.push('controlField', 'controlVal')
-      }
-    }
-
-    return _options
   }
 
   /**
    * @description 鍒囨崲
    */
   optionChange = (key, value) => {
-    const { openType, funcType, procMode, Ot, control, display } = this.state
-    const { card } = this.props
+    this.record[key] = value
+    let _fieldval = {}
 
     if (key === 'OpenType') {
-      let _options = this.getOptions(value, 'system', '', this.state.pageTemplate, 'system', Ot, control, 'modal')
-      let _fieldval = {}
-      let _formlist = this.state.formlist.map(item => {
-        item.hidden = !_options.includes(item.key)
+      this.record.intertype = 'system'
+      this.record.procMode = 'system'
+      this.record.display = 'modal'
+      this.record.position = 'toolbar'
+      this.record.pageTemplate = ''
+      this.record.funcType = ''
+      this.record.sqlType = ''
 
-        if (item.key === 'intertype') {
-          let iscustom = ['pop', 'prompt', 'exec'].includes(value)
-          item.options = this.state.interTypeOptions.filter(op => (iscustom || op.value !== 'custom'))
-        } else if (item.key === 'control') {
-          item.initVal = control
-        } else if (item.key === 'display') {
-          item.initVal = 'modal'
-        }
+      if (value === 'pop' || value === 'prompt' || value === 'exec') {
+        _fieldval.intertype = 'system'
+        _fieldval.sqlType = ''
+  
+      } else if (value === 'excelIn') {
+        _fieldval.intertype = 'system'
+        _fieldval.Ot = 'notRequired'
+        
+        _fieldval.label = this.props.dict['model.form.excelIn']
+        _fieldval.class = 'dgreen'
+        this.record.Ot = 'notRequired'
+        this.record.label = this.props.dict['model.form.excelIn']
+        this.record.class = 'dgreen'
+       
+  
+      } else if (value === 'excelOut') {
+        _fieldval.intertype = 'system'
+        _fieldval.label = this.props.dict['model.form.excelOut']
+        _fieldval.class = 'dgreen'
+        this.record.Ot = 'notRequired'
+        this.record.label = this.props.dict['model.form.excelOut']
+        this.record.class = 'dgreen'
+  
+      } else if (value === 'popview') {
+        _fieldval.display = 'modal'
+        _fieldval.Ot = 'requiredSgl'
+        _fieldval.popClose = 'grid'
+        this.record.display = 'modal'
+        this.record.Ot = 'requiredSgl'
+        this.record.popClose = 'grid'
+  
+      } else if (value === 'tab') {
+        _fieldval.Ot = 'requiredSgl'
+        this.record.Ot = 'requiredSgl'
+  
+      } else if (value === 'innerpage') {
+        _fieldval.Ot = 'requiredSgl'
+        this.record.Ot = 'requiredSgl'
+        
+      }
+      
+      if (value === 'excelIn') {
+        _fieldval.label = this.props.dict['model.form.excelIn']
+        _fieldval.class = 'border-dgreen'
+      } else if (value === 'excelOut') {
+        _fieldval.label = this.props.dict['model.form.excelOut']
+        _fieldval.class = 'dgreen'
+        _fieldval.control = ''
+        this.record.control = ''
+      }
 
-        if (item.hidden) return item
+      if (_fieldval.Ot === 'notRequired') {
+        this.record.control = ''
+        _fieldval.control = ''
+      }
 
-        if (item.key === 'intertype') {
-          _fieldval.intertype = 'system'
-        } else if (item.key === 'Ot') {
-          if (this.state.position === 'grid' || this.state.pageTemplate === 'pay') {
-            item.options = this.state.requireOptions.filter(op => ['requiredSgl'].includes(op.value))
-            _fieldval.Ot = 'requiredSgl'
-          } else if (value === 'innerpage' && this.state.pageTemplate === 'billprint') {
-            item.options = this.state.requireOptions.filter(op => ['notRequired', 'requiredSgl', 'required'].includes(op.value))
-            _fieldval.Ot = 'requiredSgl'
-          } else if (['innerpage', 'tab', 'popview'].includes(value)) {
-            item.options = this.state.requireOptions.filter(op => ['notRequired', 'requiredSgl'].includes(op.value))
-            _fieldval.Ot = 'requiredSgl'
-          } else if (value === 'excelIn') {
-            item.options = this.state.requireOptions.filter(op => ['notRequired', 'requiredSgl'].includes(op.value))
-            _fieldval.Ot = 'notRequired'
-          } else {
-            item.options = this.state.requireOptions
-          }
-        } else if (item.key === 'sqlType') {
-          if (['prompt', 'exec'].includes(value)) {
-            item.options = this.state.deleteOptions
-          } else {
-            item.options = this.state.insertUpdateOptions
-          }
-          _fieldval.sqlType = ''
-        }
-
-        return item
-      })
-
-      this.setState({
-        openType: value,
-        funcType: '',
-        intertype: 'system',
-        procMode: 'system',
-        display: 'modal',
-        formlist: _formlist
-      }, () => {
-        if (value === 'excelIn') {
-          _fieldval.label = this.props.dict['model.form.excelIn']
-          _fieldval.class = 'border-dgreen'
-        } else if (value === 'excelOut') {
-          _fieldval.label = this.props.dict['model.form.excelOut']
-          _fieldval.class = 'dgreen'
-        }
-
-        this.props.form.setFieldsValue(_fieldval)
-      })
+      if (!['funcbutton', 'excelIn', 'excelOut'].includes(value)) {
+        _fieldval.position = 'toolbar'
+      }
     } else if (key === 'position') {
-      let _fieldval = {}
-
-      this.setState({
-        position: value,
-        formlist: this.state.formlist.map(item => {
-          if (item.key === 'Ot') {
-            if (value === 'grid' || this.state.pageTemplate === 'pay') {
-              item.options = this.state.requireOptions.filter(op => ['requiredSgl'].includes(op.value))
-              _fieldval.Ot = 'requiredSgl'
-            } else if (openType === 'innerpage' && this.state.pageTemplate === 'billprint') {
-              item.options = this.state.requireOptions.filter(op => ['notRequired', 'requiredSgl', 'required'].includes(op.value))
-              _fieldval.Ot = 'requiredSgl'
-            } else if (['innerpage', 'tab', 'popview'].includes(openType)) {
-              item.options = this.state.requireOptions.filter(op => ['notRequired', 'requiredSgl'].includes(op.value))
-              _fieldval.Ot = 'requiredSgl'
-            } else {
-              item.options = this.state.requireOptions
-            }
-          }
-          return item
-        })
-      }, () => {
-        this.props.form.setFieldsValue(_fieldval)
-      })
+      if (value === 'grid') {
+        _fieldval.Ot = 'requiredSgl'
+        this.record.Ot = 'requiredSgl'
+      } else if (['pop', 'prompt', 'exec'].includes(this.record.OpenType) && this.record.sqlType === 'insert') {
+        _fieldval.Ot = 'notRequired'
+        this.record.Ot = 'notRequired'
+      }
     } else if (key === 'funcType') {
-      let _options = this.getOptions('funcbutton', this.state.interType, value, card.pageTemplate, procMode, Ot, control, display)
-      let _fieldval = {}
-
       if (value === 'print') {
         _fieldval.label = '鎵撳嵃'
       } else if (value === 'closetab') {
         _fieldval.label = '鍏抽棴'
       }
-
-      this.setState({
-        funcType: value,
-        formlist: this.state.formlist.map(item => {
-          item.hidden = !_options.includes(item.key)
-
-          if (item.hidden) return item
-
-          if (item.key === 'intertype') {
-            _fieldval.intertype = this.state.interType
-          } else if (item.key === 'Ot' && value === 'print') {
-            item.options = this.state.requireOptions
-          }
-
-          return item
-        })
-      }, () => {
-        this.props.form.setFieldsValue(_fieldval)
-      })
     } else if (key === 'sqlType') {
-      let _fieldval = {}
-      this.setState({
-        formlist: this.state.formlist.map(item => {
-          if (item.key === 'Ot' && value === 'insert') {
-            item.options = this.state.requireOptions.filter(op => ['notRequired'].includes(op.value))
-          } else if (item.key === 'Ot') {
-            item.options = this.state.requireOptions
-          }
-          return item
-        })
-      }, () => {
-        if (value === 'insert') {
-          _fieldval.label = '娣诲姞'
-          _fieldval.class = 'green'
-          _fieldval.Ot = 'notRequired'
-        } else if (value === 'update') {
-          _fieldval.label = '淇敼'
-          _fieldval.class = 'purple'
-          _fieldval.Ot = 'requiredSgl'
-        } else if (value === 'audit') {
-          _fieldval.label = '瀹℃牳'
-          _fieldval.class = 'primary'
-          _fieldval.Ot = 'requiredSgl'
-        } else if (value === 'LogicDelete' || value === 'delete') {
-          _fieldval.label = '鍒犻櫎'
-          _fieldval.class = 'danger'
-          _fieldval.Ot = 'required'
-        }
+      if (value === 'insert') {
+        _fieldval.label = '娣诲姞'
+        _fieldval.Ot = 'notRequired'
+        _fieldval.class = 'green'
+      } else if (value === 'update') {
+        _fieldval.label = '淇敼'
+        _fieldval.Ot = 'requiredSgl'
+        _fieldval.class = 'purple'
+      } else if (value === 'audit') {
+        _fieldval.label = '瀹℃牳'
+        _fieldval.Ot = 'requiredSgl'
+        _fieldval.class = 'primary'
+      } else if (value === 'LogicDelete' || value === 'delete') {
+        _fieldval.label = '鍒犻櫎'
+        _fieldval.Ot = 'requiredSgl'
+        _fieldval.class = 'danger'
+      }
 
-        this.props.form.setFieldsValue(_fieldval)
-      })
+      if (this.record.position === 'grid') {
+        _fieldval.Ot = 'requiredSgl'
+      }
+
+      this.record.label = _fieldval.label
+      this.record.Ot = _fieldval.Ot
+      this.record.class = _fieldval.class || ''
+
+      if (_fieldval.Ot === 'notRequired') {
+        this.record.control = ''
+        _fieldval.control = ''
+      }
+      
     } else if (key === 'pageTemplate') {
-      let _options = this.getOptions('innerpage', this.state.interType, this.state.funcType, value, procMode, Ot, control, display)
-      let _fieldval = {}
-
-      this.setState({
-        pageTemplate: value,
-        formlist: this.state.formlist.map(item => {
-          item.hidden = !_options.includes(item.key)
-
-          if (item.key === 'Ot') {
-            if (value === 'pay') {
-              item.options = this.state.requireOptions.filter(op => ['requiredSgl'].includes(op.value))
-              _fieldval.Ot = 'requiredSgl'
-            } else if (value === 'billprint') {
-              item.options = this.state.requireOptions.filter(op => ['notRequired', 'requiredSgl', 'required'].includes(op.value))
-              _fieldval.Ot = 'requiredSgl'
-            } else {
-              item.options = this.state.requireOptions.filter(op => ['notRequired', 'requiredSgl'].includes(op.value))
-            }
-          }
-  
-          return item
-        })
-      }, () => {
-        this.props.form.setFieldsValue(_fieldval)
-      })
+      if (value === 'pay') {
+        _fieldval.Ot = 'requiredSgl'
+      } else if (value === 'billprint') {
+        _fieldval.Ot = 'requiredSgl'
+      }
     } else if (key === 'intertype') {
-      let _options = this.getOptions(openType, value, funcType, '', procMode, Ot, control, display)
-
-      this.setState({
-        interType: value,
-        formlist: this.state.formlist.map(item => {
-          item.hidden = !_options.includes(item.key)
-
-          if (item.key === 'innerFunc') {
-            item.required = value === 'inner'
-          } else if (item.key === 'interface') {
-            item.readonly = false
-          } else if (item.key === 'sysInterface') {
-            item.initVal = 'false'
-          } else if (item.key === 'Ot') {
-            item.options = this.state.requireOptions
-          }
-          return item
-        })
-      })
-    } else if (key === 'procMode') {
-      let _options = this.getOptions(openType, this.state.interType, funcType, '', value, Ot, control, display)
-
-      this.setState({
-        procMode: value,
-        formlist: this.state.formlist.map(item => {
-          item.hidden = !_options.includes(item.key)
-
-          if (item.key === 'innerFunc') {
-            item.required = true
-          }
-          return item
-        })
-      })
-    } else if (key === 'Ot') {
-      let _options = this.getOptions(openType, this.state.interType, funcType, this.state.pageTemplate, procMode, value, control, display)
-
-      this.setState({
-        Ot: value,
-        formlist: this.state.formlist.map(item => {
-          item.hidden = !_options.includes(item.key)
-          return item
-        })
-      })
-    } else if (key === 'control') {
-      let _options = this.getOptions(openType, this.state.interType, funcType, this.state.pageTemplate, procMode, Ot, value, display)
-
-      this.setState({
-        control: value,
-        formlist: this.state.formlist.map(item => {
-          item.hidden = !_options.includes(item.key)
-          return item
-        })
-      })
-    } else if (key === 'display') {
-      let _options = this.getOptions(openType, this.state.interType, funcType, this.state.pageTemplate, procMode, Ot, control, value)
-
-      this.setState({
-        display: value,
-        formlist: this.state.formlist.map(item => {
-          item.hidden = !_options.includes(item.key)
-          return item
-        })
-      })
+      this.record.sysInterface = 'false'
     } else 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, reOptions, reTypes, 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 (reOptions[item.key]) {
+          item.options = reOptions[item.key]
+        }
+        if (reTypes[item.key]) {
+          item.type = reTypes[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) => {
@@ -529,208 +477,111 @@
   }
 
   getFields() {
+    const { dict } = this.props
     const { getFieldDecorator } = this.props.form
     const fields = []
 
     this.state.formlist.forEach((item, index) => {
       if (item.hidden) return
 
-      if (item.type === 'text') { // 鏂囨湰鎼滅储
-        let _rules = []
-        if (item.key === 'innerFunc' || item.key === 'preFunc') {
+      let span = 12
+      let rules = []
+      let className = ''
+      let content = null
+      let initVal = item.initVal || ''
+
+      if (item.type === 'text') {
+        rules = [
+          { required: item.required, message: dict['form.required.input'] + item.label + '!' }
+        ]
+  
+        if (item.key === 'innerFunc') {
           let str = '^(' + item.fields.join('|') + ')'
           let _patten = new RegExp(str + formRule.func.innerPattern + '$', 'g')
-          _rules = [{
-            pattern: _patten,
-            message: formRule.func.innerMessage
-          }, {
-            max: formRule.func.max,
-            message: formRule.func.maxMessage
-          }]
+          rules.push(
+            { pattern: _patten, message: formRule.func.innerMessage },
+            { max: formRule.func.max, message: formRule.func.maxMessage }
+          )
         } else if (item.key === 'outerFunc' || item.key === 'callbackFunc') {
-          _rules = [{
-            pattern: formRule.func.pattern,
-            message: formRule.func.message
-          }, {
-            max: formRule.func.max,
-            message: formRule.func.maxMessage
-          }]
+          rules.push(
+            { pattern: formRule.func.pattern, message: formRule.func.message },
+            { max: formRule.func.max, message: formRule.func.maxMessage }
+          )
         } else {
-          _rules = [{
-            max: formRule.input.max,
-            message: formRule.input.message
-          }]
+          rules.push({ max: formRule.input.max, message: formRule.input.message })
         }
-        fields.push(
-          <Col span={12} key={index}>
-            <Form.Item label={item.tooltip ?
-              <Tooltip placement="topLeft" overlayClassName={item.tooltipClass} title={item.tooltip}>
-                <QuestionCircleOutlined className="mk-form-tip" />
-                {item.label}
-              </Tooltip> : item.label
-            }>
-              {getFieldDecorator(item.key, {
-                initialValue: item.initVal || '',
-                rules: [
-                  {
-                    required: item.readonly ? false : !!item.required,
-                    message: this.props.dict['form.required.input'] + item.label + '!'
-                  },
-                  ..._rules
-                ]
-              })(<Input placeholder="" autoComplete="off" disabled={item.readonly} onPressEnter={this.handleSubmit} />)}
-            </Form.Item>
-          </Col>
-        )
+
+        content = <Input placeholder="" autoComplete="off" onPressEnter={this.handleSubmit} />
       } else if (item.type === 'number') {
-        fields.push(
-          <Col span={12} key={index}>
-            <Form.Item label={item.tooltip ?
-              <Tooltip placement="topLeft" overlayClassName={item.tooltipClass} title={item.tooltip}>
-                <QuestionCircleOutlined className="mk-form-tip" />
-                {item.label}
-              </Tooltip> : item.label
-            }>
-              {getFieldDecorator(item.key, {
-                initialValue: item.initVal,
-                rules: [
-                  {
-                    required: item.readonly ? false : !!item.required,
-                    message: this.props.dict['form.required.input'] + item.label + '!'
-                  }
-                ]
-              })(<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 ?
-              <Tooltip placement="topLeft" overlayClassName={item.tooltipClass} title={item.tooltip}>
-                <QuestionCircleOutlined className="mk-form-tip" />
-                {item.label}
-              </Tooltip> : item.label
-            }>
-              {getFieldDecorator(item.key, {
-                initialValue: item.initVal || '',
-                rules: [
-                  {
-                    required: !!item.required,
-                    message: this.props.dict['form.required.select'] + item.label + '!'
-                  }
-                ]
-              })(
-                <Select
-                  showSearch
-                  filterOption={(input, option) => option.props.children[2].toLowerCase().indexOf(input.toLowerCase()) >= 0}
-                  onChange={(value) => {this.optionChange(item.key, value)}}
-                  getPopupContainer={() => document.getElementById('winter')}
-                >
-                  {item.options.map((option, index) =>
-                    <Select.Option id={`${index}`} title={option.text} key={`${index}`} value={option.value || option.field}>
-                      {option.text || option.label}
-                    </Select.Option>
-                  )}
-                </Select>
-              )}
-            </Form.Item>
-          </Col>
-        )
-      } else if (item.type === 'icon') { // 涓嬫媺鎼滅储
-        fields.push(
-          <Col span={12} key={index}>
-            <Form.Item label={item.tooltip ?
-              <Tooltip placement="topLeft" overlayClassName={item.tooltipClass} title={item.tooltip}>
-                <QuestionCircleOutlined className="mk-form-tip" />
-                {item.label}
-              </Tooltip> : item.label
-            }>
-              {getFieldDecorator(item.key, {
-                initialValue: item.initVal || '',
-                rules: [
-                  {
-                    required: !!item.required,
-                    message: this.props.dict['form.required.select'] + item.label + '!'
-                  }
-                ]
-              })(
-                <MkEditIcon options={['edit', 'direction', 'normal', 'data', 'hint']} allowClear/>
-              )}
-            </Form.Item>
-          </Col>
-        )
+        rules = [
+          { required: item.required, message: dict['form.required.input'] + item.label + '!' }
+        ]
+
+        content = <InputNumber min={item.min} max={item.max} precision={item.precision} />
+      } else if (item.type === 'select') {
+        rules = [
+          { required: item.required, message: dict['form.required.select'] + item.label + '!' }
+        ]
+
+        content = <Select
+          showSearch
+          allowClear={item.allowClear === true}
+          filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0}
+          onChange={(value) => {this.optionChange(item.key, value)}}
+          getPopupContainer={() => document.getElementById('winter')}
+        >
+          {item.options.map((option, index) =>
+            <Select.Option key={index} value={(option.value || option.field || '')}>
+              {(option.text || option.label)}
+            </Select.Option>
+          )}
+        </Select>
       } else if (item.type === 'radio') {
-        fields.push(
-          <Col span={12} key={index}>
-            <Form.Item label={item.tooltip ?
-              <Tooltip placement="topLeft" overlayClassName={item.tooltipClass} title={item.tooltip}>
-                <QuestionCircleOutlined className="mk-form-tip" />
-                {item.label}
-              </Tooltip> : item.label
-            }>
-              {getFieldDecorator(item.key, {
-                initialValue: item.initVal,
-                rules: [
-                  {
-                    required: !!item.required,
-                    message: this.props.dict['form.required.select'] + item.label + '!'
-                  }
-                ]
-              })(
-                <Radio.Group onChange={(e) => {this.optionChange(item.key, e.target.value)}} disabled={item.readonly}>
-                  {
-                    item.options.map(option => {
-                      return (
-                        <Radio key={option.value} value={option.value}>{option.text}</Radio>
-                      )
-                    })
-                  }
-                </Radio.Group>
-              )}
-            </Form.Item>
-          </Col>
-        )
+        rules = [
+          { required: item.required, message: dict['form.required.select'] + item.label + '!' }
+        ]
+
+        content = <Radio.Group onChange={(e) => {this.optionChange(item.key, e.target.value)}}>
+          {item.options.map(option => <Radio key={option.value} value={option.value}>{option.text}</Radio>)}
+        </Radio.Group>
+      } else if (item.type === 'cascader') {
+        initVal = item.initVal || []
+        rules = [
+          { required: item.required, message: dict['form.required.select'] + item.label + '!' }
+        ]
+
+        content = <Cascader options={item.options || []} expandTrigger="hover" placeholder=""/>
+      } else if (item.type === 'icon') {
+        rules = [
+          { required: item.required, message: dict['form.required.select'] + item.label + '!' }
+        ]
+
+        content = <MkEditIcon options={['edit', 'hint', 'direction', 'normal', 'data']} allowClear/>
       } else if (item.type === 'textarea') {
-        fields.push(
-          <Col span={24} key={index}>
-            <Form.Item label={item.label} className="textarea">
-              {getFieldDecorator(item.key, {
-                initialValue: item.initVal,
-                rules: [
-                  {
-                    required: item.readonly ? false : !!item.required,
-                    message: this.props.dict['form.required.input'] + item.label + '!'
-                  }
-                ]
-              })(<TextArea rows={2} readOnly={item.readonly} />)}
-            </Form.Item>
-          </Col>
-        )
-      } else if (item.type === 'cascader') { // 澶氶��
-        fields.push(
-          <Col span={12} key={index}>
-            <Form.Item label={item.tooltip ?
-              <Tooltip placement="topLeft" overlayClassName={item.tooltipClass} title={item.tooltip}>
-                <QuestionCircleOutlined className="mk-form-tip" />
-                {item.label}
-              </Tooltip> : item.label
-            }>
-              {getFieldDecorator(item.key, {
-                initialValue: item.initVal || [],
-                rules: [
-                  {
-                    required: !!item.required,
-                    message: this.props.dict['form.required.select'] + item.label + '!'
-                  }
-                ]
-              })(
-                <Cascader allowClear options={item.options || []} placeholder="" />
-              )}
-            </Form.Item>
-          </Col>
-        )
+        span = 24
+        className = 'textarea'
+        rules = [
+          { required: item.readonly ? false : item.required, message: dict['form.required.input'] + item.label + '!' }
+        ]
+
+        content = <TextArea rows={2} readOnly={item.readonly}/>
       }
+
+      fields.push(
+        <Col span={span} key={index}>
+          <Form.Item className={className} label={item.tooltip ?
+            <Tooltip placement="topLeft" title={item.tooltip}>
+              <QuestionCircleOutlined className="mk-form-tip" />
+              {item.label}
+            </Tooltip> : item.label
+          }>
+            {getFieldDecorator(item.key, {
+              initialValue: initVal,
+              rules: rules
+            })(content)}
+          </Form.Item>
+        </Col>
+      )
     })
     return fields
   }
@@ -743,10 +594,9 @@
         if (!err) {
           values.uuid = card.uuid
           values.verify = card.verify || null
+          values.position = values.position || 'toolbar'
 
-          if (values.OpenType === 'excelIn') {
-            values.position = 'toolbar'
-          } else if (values.OpenType === 'excelOut') {
+          if (values.OpenType === 'excelOut') {
             if (values.intertype === 'system' && setting.interType !== 'system') { // 瀵煎嚭excel闇�浣跨敤鏌ヨ鏁版嵁婧�
               notification.warning({
                 top: 92,
@@ -756,12 +606,9 @@
               return
             }
             
-            values.position = 'toolbar'
             values.Ot = 'notRequired'
           } else if (values.OpenType === 'popview' && !values.linkTab) { // 娌℃湁鍏宠仈鏍囩锛堟柊寤烘椂锛夛紝鍒涘缓鏂版爣绛綢d
             values.linkTab = Utils.getuuid()
-          } else if (values.OpenType === 'funcbutton') { // 杞崲鎵撳嵃鏃舵墦寮�鏂瑰紡
-            values.position = 'toolbar'
           } else if (['pop', 'prompt', 'exec'].includes(values.OpenType) && values.verify) {
             if ((values.Ot === 'requiredOnce' || card.Ot === 'requiredOnce') && card.Ot !== values.Ot) {
               values.verify.uniques = []

--
Gitblit v1.8.0