From bd1dfc9e6c9b9f8076ca2783ce598e0936b4c664 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 22 十二月 2021 14:36:03 +0800
Subject: [PATCH] 2021-12-22

---
 src/templates/sharecomponent/actioncomponent/actionform/index.jsx |  638 ++++++++++++++++++++++++++-------------------------------
 1 files changed, 296 insertions(+), 342 deletions(-)

diff --git a/src/templates/sharecomponent/actioncomponent/actionform/index.jsx b/src/templates/sharecomponent/actioncomponent/actionform/index.jsx
index e159cec..20d48f2 100644
--- a/src/templates/sharecomponent/actioncomponent/actionform/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/actionform/index.jsx
@@ -1,14 +1,26 @@
 import React, {Component} from 'react'
 import PropTypes from 'prop-types'
-import { Form, Row, Col, Input, Select, Icon, Radio, notification, Tooltip, InputNumber, Cascader } from 'antd'
-import { btnIcons, btnClasses, formRule } from '@/utils/option.js'
+import { fromJS } from 'immutable'
+import { Form, Row, Col, Input, Select, Radio, notification, Tooltip, InputNumber, Cascader } from 'antd'
+import { QuestionCircleOutlined } from '@ant-design/icons'
 
-import Api from '@/api'
-import options from '@/store/options.js'
+import { btnIcons, btnClasses, formRule } from '@/utils/option.js'
+import MkIcon from '@/components/mk-icon'
 import Utils from '@/utils/utils.js'
 import './index.scss'
 
 const { TextArea } = Input
+const actionTypeOptions = {
+  pop: ['label', 'position', 'OpenType', 'intertype', 'Ot', 'icon', 'class', 'execSuccess', 'execError', 'openmenu', 'output'],
+  prompt: ['label', 'position', 'OpenType', 'intertype', 'Ot', 'icon', 'class', 'execSuccess', 'execError', 'openmenu', 'output'],
+  exec: ['label', 'position', 'OpenType', 'intertype', 'Ot', 'icon', 'class', 'execSuccess', 'execError', 'openmenu', 'output'],
+  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', 'placement', 'clickouter'],
+  tab: ['label', 'Ot', 'OpenType', 'icon', 'class', 'position'],
+  innerpage: ['label', 'Ot', 'OpenType', 'pageTemplate', 'icon', 'class', 'position'],
+  funcbutton: ['label', 'OpenType', 'funcType', 'icon', 'class']
+}
 
 class MainSearch extends Component {
   static propTpyes = {
@@ -26,6 +38,10 @@
     interType: null, // 鎺ュ彛绫诲瀷锛氬唴閮ㄣ�佸閮�
     funcType: null,  // 鍔熻兘绫诲瀷
     position: null,  // 鎸夐挳浣嶇疆
+    procMode: null,  // 澶栭儴鎺ュ彛鍙傛暟澶勭悊鏂瑰紡
+    control: '',
+    pageTemplate: null,
+    Ot: null,
     requireOptions: [{
       value: 'notRequired',
       text: this.props.dict['header.form.notRequired']
@@ -40,9 +56,6 @@
       text: this.props.dict['header.form.requiredOnce']
     }],
     insertUpdateOptions: [{
-      value: '',
-      text: this.props.dict['model.empty']
-    }, {
       value: 'insert',
       text: this.props.dict['header.form.action.insert']
     }, {
@@ -53,17 +66,27 @@
       text: this.props.dict['header.form.action.audit']
     }],
     deleteOptions: [{
-      value: '',
-      text: this.props.dict['model.empty']
-    }, {
       value: 'LogicDelete',
-      text: this.props.dict['header.form.action.LogicDelete']
+      text: '閫昏緫鍒犻櫎'
     }, {
       value: 'delete',
-      text: this.props.dict['header.form.action.delete']
+      text: '鐗╃悊鍒犻櫎'
     }, {
       value: 'custom',
       text: this.props.dict['header.form.custom']
+    }],
+    interTypeOptions: [{
+      value: 'system',
+      text: this.props.dict['model.interface.system']
+    }, {
+      value: 'inner',
+      text: this.props.dict['model.interface.inner']
+    }, {
+      value: 'outer',
+      text: this.props.dict['model.interface.outer']
+    }, {
+      value: 'custom',
+      text: '鑷畾涔�'
     }]
   }
 
@@ -71,81 +94,51 @@
   UNSAFE_componentWillMount () {
     const { card } = this.props
 
-    let _menulist = this.props.formlist.filter(form => form.key === 'linkmenu')[0] || ''
-    let _opentype = card.OpenType             // 鎵撳紑鏂瑰紡
-    let _tabType = card.tabType || 'SubTable' // 鎸夐挳涓哄脊绐楋紙鏍囩锛夋椂锛屾爣绛剧殑绫诲瀷
-    let _options = null                       // 閫夐」鍒楄〃
+    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 || ''
 
-    if (card.execMode) {           // 杞崲鎵撳嵃鏃舵墦寮�鏂瑰紡
-      _opentype = 'funcbutton'
-    } else if (_opentype === 'outerpage') {
+    if (_opentype === 'outerpage') {
       card.pageTemplate = 'custom'
       _opentype = 'innerpage'
     }
 
-    let _tabs = this.props.tabs.filter(tab => tab.type === _tabType)
-
-    if (_opentype === 'innerpage') {                                     // 鏂伴〉闈紝鍙�夋ā鏉�(鑷畾涔夋椂锛屽彲濉叆澶栭儴閾炬帴)
-      _options = ['label', 'Ot', 'OpenType', 'pageTemplate', 'icon', 'class', 'position']
-      if (card.pageTemplate === 'custom') {
-        _options.push('url', 'joint')
-      }
-    } else if (_opentype === 'blank' || _opentype === 'tab') {           // 鏂版爣绛炬垨褰撳墠椤甸潰鏇挎崲
-      _options = ['label', 'Ot', 'OpenType', 'icon', 'class', 'position', 'tabTemplate']
-      if (card.tabTemplate === 'ThdMenu') {
-        _options.push('linkmenu')
-      }
-    } else if (_opentype === 'popview') {                                // 妯℃�佹鏍囩椤�
-      _options = ['label', 'Ot', 'OpenType', 'icon', 'class', 'position', 'tabType', 'linkTab', 'popClose']
-    } else if (_opentype === 'excelOut') {    // 瀵煎叆瀵煎嚭
-      if (card.intertype === 'outer') {
-        _options = ['label', 'OpenType', 'intertype', 'innerFunc', 'sysInterface', 'interface', 'outerFunc', 'icon', 'class', 'execSuccess', 'execError', 'pagination', 'search']
-      } else {
-        _options = ['label', 'OpenType', 'intertype', 'innerFunc', 'icon', 'class', 'execSuccess', 'execError', 'pagination', 'search']
-      }
-    } else if (_opentype === 'excelIn') {    // 瀵煎叆瀵煎嚭
-      if (card.intertype === 'outer') {
-        _options = ['label', 'Ot', 'OpenType', 'intertype', 'innerFunc', 'sysInterface', 'interface', 'outerFunc', 'callbackFunc', 'icon', 'class', 'sheet', 'execSuccess', 'execError']
-      } else {
-        _options = ['label', 'Ot', 'OpenType', 'intertype', 'innerFunc', 'icon', 'class', 'sheet', 'execSuccess', 'execError']
-      }
-    } else if (_opentype === 'funcbutton') {
-      if (!card.funcType) {
-        _options = ['label', 'OpenType', 'funcType', 'icon', 'class']
-      } else if (card.funcType === 'changeuser') {
-        _options = ['label', 'OpenType', 'funcType', 'icon', 'class']
-      } else if (card.funcType === 'print') {
-        if (card.intertype === 'outer') {
-          _options = ['label', 'OpenType', 'funcType', 'execMode', 'intertype', 'innerFunc', 'sysInterface', 'interface', 'outerFunc', 'callbackFunc', 'Ot', 'icon', 'class', 'execSuccess', 'execError']
-        } else {
-          _options = ['label', 'OpenType', 'funcType', 'execMode', 'intertype', 'innerFunc', 'Ot', 'icon', 'class', 'execSuccess', 'execError']
-        }
-      }
-    } else {
-      if (card.intertype === 'outer') {
-        _options = ['label', 'position', 'OpenType', 'intertype', 'innerFunc', 'sysInterface', 'interface', 'outerFunc', 'callbackFunc', 'Ot', 'icon', 'class', 'execSuccess', 'execError']
-      } else {
-        _options = ['label', 'position', 'OpenType', 'intertype', 'innerFunc', 'Ot', 'icon', 'class', 'execSuccess', 'execError', 'sql', 'sqlType']
-      }
-    }
+    let _tabs = this.props.tabs.filter(tab => tab.type === 'SubTable')
+    let _options = this.getOptions(_opentype, _intertype, _funcType, _pageTemplate, _procMode, _Ot, control)
+    
     this.setState({
+      control: control,
+      Ot: _Ot,
       openType: _opentype,
-      menulist: _menulist.options || [],
-      interType: card.intertype || 'inner',
+      pageTemplate: _pageTemplate,
+      interType: _intertype,
+      procMode: _procMode,
       position: card.position || 'toolbar',
-      funcType: card.funcType,
+      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 === 'icon') {
           item.options = btnIcons
+        } 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' || card.pageTemplate === 'pay') { // 琛岀骇鎸夐挳銆佹敮浠樻寜閽紝鍙兘閫夊崟琛�
+          if (card.position === 'grid' || _pageTemplate === 'pay') { // 琛岀骇鎸夐挳銆佹敮浠樻寜閽紝鍙兘閫夊崟琛�
             item.options = this.state.requireOptions.filter(op => ['requiredSgl'].includes(op.value))
-          } else if (['innerpage', 'blank', 'tab', 'popview', 'excelIn'].includes(_opentype)) {
+          } 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', 'requiredSgl', 'required'].includes(op.value))
+            item.options = this.state.requireOptions.filter(op => ['notRequired'].includes(op.value))
           } else {
             item.options = this.state.requireOptions
           }
@@ -180,81 +173,111 @@
       try {
         let _form = document.getElementById('label')
         _form.select()
-      } catch {
+      } catch (e) {
         console.warn('琛ㄥ崟focus澶辫触锛�')
       }
     }
   }
 
+  getOptions = (_opentype, _intertype, _funcType, _pageTemplate, _procMode, _Ot, _control) => {
+    let _options = fromJS(actionTypeOptions[_opentype]).toJS() // 閫夐」鍒楄〃
+    
+    if (_opentype === 'innerpage') {         // 鏂伴〉闈紝鍙�夋ā鏉�(鑷畾涔夋椂锛屽彲濉叆澶栭儴閾炬帴)
+      if (_pageTemplate === 'custom') {
+        _options.push('url', 'joint')
+      } else if (_pageTemplate === 'billprint') {
+        _options.push('printTemp')
+      }
+    } else if (_opentype === 'tab') {         // 鏍囩椤�
+      if (this.props.card.tabTemplate !== 'FormTab') {
+        _options.push('linkmenu')
+      }
+    } else if (_opentype === 'excelOut') {    // 瀵煎叆瀵煎嚭
+      if (_intertype === 'outer') {
+        _options.push('innerFunc', 'sysInterface', 'interface', 'proInterface', 'outerFunc')
+      } else if (_intertype === 'inner') {
+        _options.push('innerFunc')
+      }
+    } 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 === 'funcbutton') {
+      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')
+        }
+      } else if (_funcType === 'closetab') {
+        _options.push('refreshTab')
+      }
+    } else if (_opentype !== 'popview') { // 鎵撳紑鏂瑰紡涓嶆槸寮圭獥椤甸潰鏃�
+      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')
+      }
+    }
+
+    if (_options.includes('execSuccess') || _options.includes('popClose')) {
+      _options.push('resetPageIndex')
+    }
+
+    if (_Ot !== 'notRequired' && _opentype !== 'excelOut') {
+      _options.push('control')
+      if (_control) {
+        _options.push('controlField', 'controlVal')
+      }
+    }
+
+    return _options
+  }
+
   /**
-   * @description 涓嬫媺鍒囨崲
-   * 1銆佹墦寮�鏂瑰紡鍒囨崲锛岄噸缃彲瑙佽〃鍗曞拰琛ㄥ崟鍊�
-   * 2銆佹樉绀轰綅缃垏鎹紝閲嶇疆閫夋嫨琛�
-   * 3銆佸垏鎹㈡爣绛剧被鍨嬶紝閲嶇疆鍙�夋爣绛�
+   * @description 鍒囨崲
    */
-  openTypeChange = (key, value) => {
+  optionChange = (key, value) => {
+    const { openType, funcType, procMode, Ot, control } = this.state
     const { card } = this.props
 
     if (key === 'OpenType') {
-      let _options = null
-      if (value === 'innerpage') {
-        _options = ['label', 'Ot', 'OpenType', 'pageTemplate', 'icon', 'class', 'position']
-        if (card.pageTemplate === 'custom') {
-          _options.push('url', 'joint')
-        }
-      } else if (value === 'blank' || value === 'tab') {
-        _options = ['label', 'Ot', 'OpenType', 'icon', 'class', 'position', 'tabTemplate']
-        if (card.tabTemplate === 'ThdMenu') {
-          _options.push('linkmenu')
-        }
-      } else if (value === 'popview') {
-        _options = ['label', 'Ot', 'OpenType', 'icon', 'class', 'position', 'tabType', 'linkTab', 'popClose']
-      } else if (value === 'excelOut') {
-        if (this.state.interType === 'outer') {
-          _options = ['label', 'OpenType', 'intertype', 'innerFunc', 'sysInterface', 'interface', 'outerFunc', 'icon', 'class', 'execSuccess', 'execError', 'pagination', 'search']
-        } else {
-          _options = ['label', 'OpenType', 'intertype', 'innerFunc', 'icon', 'class', 'execSuccess', 'execError', 'pagination', 'search']
-        }
-      } else if (value === 'excelIn') {
-        if (this.state.interType === 'outer') {
-          _options = ['label', 'Ot', 'OpenType', 'intertype', 'innerFunc', 'sysInterface', 'interface', 'outerFunc', 'callbackFunc', 'icon', 'class', 'sheet', 'execSuccess', 'execError']
-        } else {
-          _options = ['label', 'Ot', 'OpenType', 'intertype', 'innerFunc', 'icon', 'class', 'sheet', 'execSuccess', 'execError']
-        }
-      } else if (value === 'funcbutton') {
-        if (!this.state.funcType) {
-          _options = ['label', 'OpenType', 'funcType', 'icon', 'class']
-        } else if (this.state.funcType === 'changeuser') {
-          _options = ['label', 'OpenType', 'funcType', 'icon', 'class']
-        } else if (this.state.funcType === 'print') {
-          if (this.state.interType === 'outer') {
-            _options = ['label', 'OpenType', 'funcType', 'execMode', 'intertype', 'innerFunc', 'sysInterface', 'interface', 'outerFunc', 'callbackFunc', 'Ot', 'icon', 'class', 'execSuccess', 'execError']
-          } else {
-            _options = ['label', 'OpenType', 'funcType', 'execMode', 'intertype', 'innerFunc', 'Ot', 'icon', 'class', 'execSuccess', 'execError']
-          }
-        }
-      } else {
-        if (this.state.interType === 'inner') {
-          _options = ['label', 'position', 'OpenType', 'intertype', 'innerFunc', 'Ot', 'icon', 'class', 'execSuccess', 'execError', 'sql', 'sqlType']
-        } else {
-          _options = ['label', 'position', 'OpenType', 'intertype', 'innerFunc', 'Ot', 'icon', 'class', 'execSuccess', 'execError', 'sysInterface', 'interface', 'outerFunc', 'callbackFunc']
-        }
-      }
-
+      let _options = this.getOptions(value, 'system', '', this.state.pageTemplate, 'system', Ot, control)
       let _fieldval = {}
-      
       let _formlist = this.state.formlist.map(item => {
         item.hidden = !_options.includes(item.key)
+
+        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
+        }
 
         if (item.hidden) return item
 
         if (item.key === 'intertype') {
-          _fieldval.intertype = this.state.interType
+          _fieldval.intertype = 'system'
         } else if (item.key === 'Ot') {
-          if (this.state.position === 'grid') {
+          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 (['innerpage', 'blank', 'tab', 'popview'].includes(value)) {
+          } 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') {
@@ -277,6 +300,9 @@
 
       this.setState({
         openType: value,
+        funcType: '',
+        intertype: 'system',
+        procMode: 'system',
         formlist: _formlist
       }, () => {
         if (value === 'excelIn') {
@@ -296,10 +322,13 @@
         position: value,
         formlist: this.state.formlist.map(item => {
           if (item.key === 'Ot') {
-            if (value === 'grid') {
+            if (value === 'grid' || this.state.pageTemplate === 'pay') {
               item.options = this.state.requireOptions.filter(op => ['requiredSgl'].includes(op.value))
               _fieldval.Ot = 'requiredSgl'
-            } else if (['innerpage', 'blank', 'tab', 'popview'].includes(this.state.openType)) {
+            } 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 {
@@ -311,42 +340,18 @@
       }, () => {
         this.props.form.setFieldsValue(_fieldval)
       })
-    } else if (key === 'tabType') {
-      let _tabs = this.props.tabs.filter(tab => tab.type === value)
-      let _fieldval = {}
-
-      this.setState({
-        formlist: this.state.formlist.map(item => {
-          if (item.key === 'linkTab') {
-            item.options = [
-              {
-                value: '',
-                text: '鏂板缓'
-              },
-              ..._tabs
-            ]
-          }
-          return item
-        })
-      }, () => {
-        this.props.form.setFieldsValue(_fieldval)
-      })
     } else if (key === 'funcType') {
-      let _options = null
-      if (!value) {
-        _options = ['label', 'OpenType', 'funcType', 'icon', 'class']
-      } else if (value === 'changeuser') {
-        _options = ['label', 'OpenType', 'funcType', 'icon', 'class']
-      } else if (value === 'print') {
-        if (this.state.interType === 'outer') {
-          _options = ['label', 'OpenType', 'funcType', 'execMode', 'intertype', 'innerFunc', 'sysInterface', 'interface', 'outerFunc', 'callbackFunc', 'Ot', 'icon', 'class', 'execSuccess', 'execError']
-        } else {
-          _options = ['label', 'OpenType', 'funcType', 'execMode', 'intertype', 'innerFunc', 'Ot', 'icon', 'class', 'execSuccess', 'execError']
-        }
-      }
+      let _options = this.getOptions('funcbutton', this.state.interType, value, card.pageTemplate, procMode, Ot, control)
       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)
 
@@ -368,7 +373,7 @@
       this.setState({
         formlist: this.state.formlist.map(item => {
           if (item.key === 'Ot' && value === 'insert') {
-            item.options = this.state.requireOptions.filter(op => ['notRequired', 'requiredSgl', 'required'].includes(op.value))
+            item.options = this.state.requireOptions.filter(op => ['notRequired'].includes(op.value))
           } else if (item.key === 'Ot') {
             item.options = this.state.requireOptions
           }
@@ -385,7 +390,7 @@
           _fieldval.Ot = 'requiredSgl'
         } else if (value === 'audit') {
           _fieldval.label = '瀹℃牳'
-          _fieldval.class = 'purple'
+          _fieldval.class = 'primary'
           _fieldval.Ot = 'requiredSgl'
         } else if (value === 'LogicDelete' || value === 'delete') {
           _fieldval.label = '鍒犻櫎'
@@ -396,22 +401,20 @@
         this.props.form.setFieldsValue(_fieldval)
       })
     } else if (key === 'pageTemplate') {
-      let _options = null
+      let _options = this.getOptions('innerpage', this.state.interType, this.state.funcType, value, procMode, Ot, control)
       let _fieldval = {}
-      if (value === 'custom') {
-        _options = ['label', 'Ot', 'OpenType', 'pageTemplate', 'url', 'joint', 'icon', 'class', 'position']
-      } else {
-        _options = ['label', 'Ot', 'OpenType', 'pageTemplate', 'icon', 'class', 'position']
-      }
 
       this.setState({
-        openType: value,
+        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))
@@ -423,62 +426,17 @@
       }, () => {
         this.props.form.setFieldsValue(_fieldval)
       })
-    } else if (key === 'tabTemplate') {
-      let _options = ['label', 'Ot', 'OpenType', 'icon', 'class', 'position', 'tabTemplate']
-
-      if (value === 'ThdMenu') {
-        _options.push('linkmenu')
-      }
-
-      this.setState({
-        openType: value,
-        formlist: this.state.formlist.map(item => {
-          item.hidden = !_options.includes(item.key)
-  
-          return item
-        })
-      })
-    }
-  }
-
-  onChange = (e, key) => {
-    const { openType } = this.state
-    let value = e.target.value
-
-    if (key === 'intertype') {
-      let _options = null
-      if (openType === 'excelOut') {
-        if (value === 'outer') {
-          _options = ['label', 'OpenType', 'intertype', 'innerFunc', 'sysInterface', 'interface', 'outerFunc', 'icon', 'class', 'execSuccess', 'execError', 'pagination', 'search']
-        } else {
-          _options = ['label', 'OpenType', 'intertype', 'innerFunc', 'icon', 'class', 'execSuccess', 'execError', 'pagination', 'search']
-        }
-      } else if (openType === 'excelIn') {
-        if (value === 'outer') {
-          _options = ['label', 'Ot', 'OpenType', 'intertype', 'innerFunc', 'sysInterface', 'interface', 'outerFunc', 'callbackFunc', 'icon', 'class', 'sheet', 'execSuccess', 'execError']
-        } else {
-          _options = ['label', 'Ot', 'OpenType', 'intertype', 'innerFunc', 'icon', 'class', 'sheet', 'execSuccess', 'execError']
-        }
-      } else if (openType === 'funcbutton') {
-        if (value === 'outer') {
-          _options = ['label', 'OpenType', 'funcType', 'execMode', 'intertype', 'innerFunc', 'sysInterface', 'interface', 'outerFunc', 'callbackFunc', 'Ot', 'icon', 'class', 'execSuccess', 'execError']
-        } else {
-          _options = ['label', 'OpenType', 'funcType', 'execMode', 'intertype', 'innerFunc', 'Ot', 'icon', 'class', 'execSuccess', 'execError']
-        }
-      } else {
-        if (value === 'inner') {
-          _options = ['label', 'position', 'OpenType', 'intertype', 'innerFunc', 'Ot', 'icon', 'class', 'execSuccess', 'execError', 'sql', 'sqlType']
-        } else {
-          _options = ['label', 'position', 'OpenType', 'intertype', 'innerFunc', 'Ot', 'icon', 'class', 'execSuccess', 'execError', 'sysInterface', 'interface', 'outerFunc', 'callbackFunc']
-        }
-      }
+    } else if (key === 'intertype') {
+      let _options = this.getOptions(openType, value, funcType, '', procMode, Ot, control)
 
       this.setState({
         interType: value,
         formlist: this.state.formlist.map(item => {
           item.hidden = !_options.includes(item.key)
 
-          if (item.key === 'interface') {
+          if (item.key === 'innerFunc') {
+            item.required = value === 'inner'
+          } else if (item.key === 'interface') {
             item.readonly = false
           } else if (item.key === 'sysInterface') {
             item.initVal = 'false'
@@ -487,10 +445,40 @@
           }
           return item
         })
-      }, () => {
-        if (this.props.form.getFieldValue('sqlType') !== undefined) {
-          this.props.form.setFieldsValue({sqlType: ''})
-        }
+      })
+    } else if (key === 'procMode') {
+      let _options = this.getOptions(openType, this.state.interType, funcType, '', value, Ot, control)
+
+      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)
+
+      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)
+
+      this.setState({
+        control: value,
+        formlist: this.state.formlist.map(item => {
+          item.hidden = !_options.includes(item.key)
+          return item
+        })
       })
     } else if (key === 'sysInterface') {
       if (value === 'true') {
@@ -529,7 +517,7 @@
 
       if (item.type === 'text') { // 鏂囨湰鎼滅储
         let _rules = []
-        if (item.key === 'innerFunc') {
+        if (item.key === 'innerFunc' || item.key === 'preFunc') {
           let str = '^(' + item.fields.join('|') + ')'
           let _patten = new RegExp(str + formRule.func.innerPattern + '$', 'g')
           _rules = [{
@@ -557,7 +545,7 @@
           <Col span={12} key={index}>
             <Form.Item label={item.tooltip ?
               <Tooltip placement="topLeft" overlayClassName={item.tooltipClass} title={item.tooltip}>
-                <Icon type="question-circle" />
+                <QuestionCircleOutlined className="mk-form-tip" />
                 {item.label}
               </Tooltip> : item.label
             }>
@@ -579,7 +567,7 @@
           <Col span={12} key={index}>
             <Form.Item label={item.tooltip ?
               <Tooltip placement="topLeft" overlayClassName={item.tooltipClass} title={item.tooltip}>
-                <Icon type="question-circle" />
+                <QuestionCircleOutlined className="mk-form-tip" />
                 {item.label}
               </Tooltip> : item.label
             }>
@@ -591,7 +579,7 @@
                     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>
         )
@@ -600,7 +588,7 @@
           <Col span={12} key={index}>
             <Form.Item label={item.tooltip ?
               <Tooltip placement="topLeft" overlayClassName={item.tooltipClass} title={item.tooltip}>
-                <Icon type="question-circle" />
+                <QuestionCircleOutlined className="mk-form-tip" />
                 {item.label}
               </Tooltip> : item.label
             }>
@@ -616,12 +604,13 @@
                 <Select
                   showSearch
                   filterOption={(input, option) => option.props.children[2].toLowerCase().indexOf(input.toLowerCase()) >= 0}
-                  onChange={(value) => {this.openTypeChange(item.key, value)}}
+                  onChange={(value) => {this.optionChange(item.key, value)}}
+                  allowClear={item.key === 'icon'}
                   getPopupContainer={() => document.getElementById('winter')}
                 >
                   {item.options.map((option, index) =>
-                    <Select.Option id={`${index}`} title={option.text} key={`${index}`} value={option.value}>
-                      {item.key === 'icon' && option.value && <Icon type={option.value} />} {option.text}
+                    <Select.Option id={`${index}`} title={option.text} key={`${index}`} value={option.value || option.field}>
+                      {item.key === 'icon' && option.value ? <MkIcon type={option.value} /> : null} {option.text || option.label}
                     </Select.Option>
                   )}
                 </Select>
@@ -632,7 +621,12 @@
       } else if (item.type === 'radio') {
         fields.push(
           <Col span={12} key={index}>
-            <Form.Item label={item.label}>
+            <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: [
@@ -642,7 +636,7 @@
                   }
                 ]
               })(
-                <Radio.Group onChange={(e) => {this.onChange(e, item.key)}} disabled={item.readonly}>
+                <Radio.Group onChange={(e) => {this.optionChange(item.key, e.target.value)}} disabled={item.readonly}>
                   {
                     item.options.map(option => {
                       return (
@@ -660,15 +654,26 @@
           <Col span={24} key={index}>
             <Form.Item label={item.label} className="textarea">
               {getFieldDecorator(item.key, {
-                initialValue: item.initVal
-              })(<TextArea rows={4} />)}
+                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.label}>
+            <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: [
@@ -678,11 +683,7 @@
                   }
                 ]
               })(
-                <Cascader
-                  options={this.state.menulist}
-                  loadData={this.loadData}
-                  placeholder=""
-                />
+                <Cascader allowClear options={item.options || []} placeholder="" />
               )}
             </Form.Item>
           </Col>
@@ -692,133 +693,86 @@
     return fields
   }
 
-  loadData = selectedOptions => {
-    const { MenuID } = this.props
-    const targetOption = selectedOptions[selectedOptions.length - 1]
-    targetOption.loading = true
-
-    let _param = {
-      func: 'sPC_Get_FunMenu',
-      ParentID: targetOption.value,
-      systemType: options.sysType,
-      debug: 'Y'
-    }
-
-    Api.getSystemConfig(_param).then(result => {
-      if (result.status) {
-        targetOption.loading = false
-        targetOption.children = result.data.map(item => {
-          let submenu = {
-            value: item.ParentID,
-            label: item.MenuNameP,
-            children: item.FunMenu.map(cell => {
-              return {
-                value: cell.MenuID,
-                label: cell.MenuName,
-                MenuID: cell.MenuID,
-                MenuName: cell.MenuName,
-                MenuNo: cell.MenuNo,
-                Ot: cell.Ot,
-                PageParam: cell.PageParam,
-                LinkUrl: cell.LinkUrl,
-                disabled: cell.MenuID === MenuID
-              }
-            })
-          }
-
-          return submenu
-        })
-
-        this.setState({
-          menulist: [...this.state.menulist]
-        })
-      } else {
-        notification.warning({
-          top: 92,
-          message: result.message,
-          duration: 5
-        })
-        targetOption.loading = false
-      }
-    })
-  }
-
   handleConfirm = () => {
-    const { setting } = this.props
-    const { menulist } = this.state
+    const { setting, card } = this.props
     // 琛ㄥ崟鎻愪氦鏃舵鏌ヨ緭鍏ュ�兼槸鍚︽纭�
     return new Promise((resolve, reject) => {
       this.props.form.validateFieldsAndScroll((err, values) => {
         if (!err) {
-          values.uuid = this.props.card.uuid
-          values.verify = this.props.card.verify || null
+          values.uuid = card.uuid
+          values.verify = card.verify || null
 
           if (values.OpenType === 'excelIn') {
             values.position = 'toolbar'
           } else if (values.OpenType === 'excelOut') {
-            if (values.intertype === 'inner' && !values.innerFunc) {
-              if ((setting.interType === 'inner' && setting.innerFunc) || setting.interType === 'outer') {
-                notification.warning({
-                  top: 92,
-                  message: '琛ㄦ牸鏁版嵁鏌ヨ鏈娇鐢ㄦ暟鎹簮锛屽鍑篍xcel浣跨敤鍐呴儴鎺ュ彛鏃讹紝闇�鑷畾涔夊唴閮ㄥ嚱鏁帮紒',
-                  duration: 5
-                })
-                return
-              }
+            if (values.intertype === 'system' && setting.interType !== 'system') { // 瀵煎嚭excel闇�浣跨敤鏌ヨ鏁版嵁婧�
+              notification.warning({
+                top: 92,
+                message: '琛ㄦ牸鏁版嵁鏌ヨ鏈娇鐢ㄧ郴缁熷嚱鏁帮紝瀵煎嚭Excel涓嶅彲浣跨敤绯荤粺鍑芥暟锛�',
+                duration: 5
+              })
+              return
             }
             
             values.position = 'toolbar'
             values.Ot = 'notRequired'
           } else if (values.OpenType === 'popview' && !values.linkTab) { // 娌℃湁鍏宠仈鏍囩锛堟柊寤烘椂锛夛紝鍒涘缓鏂版爣绛綢d
             values.linkTab = Utils.getuuid()
-            values.createTab = true // 鐢ㄤ簬鏍囪鎸夐挳澶嶅埗鏃讹紝鏄惁澶嶅埗鍘熸湁鏍囩
           } else if (values.OpenType === 'funcbutton') { // 杞崲鎵撳嵃鏃舵墦寮�鏂瑰紡
             values.position = 'toolbar'
-            if (values.funcType === 'print') {
-              values.OpenType = values.execMode
-            }
           } else if (['pop', 'prompt', 'exec'].includes(values.OpenType) && values.verify) {
-            if (values.Ot === 'requiredOnce' && ['notRequired', 'requiredSgl', 'required'].includes(this.props.card.Ot)) {
+            if ((values.Ot === 'requiredOnce' || card.Ot === 'requiredOnce') && card.Ot !== values.Ot) {
               values.verify.uniques = []
-            } else if (this.props.card.Ot === 'requiredOnce' && ['notRequired', 'requiredSgl', 'required'].includes(values.Ot)) {
-              values.verify.uniques = []
+            }
+            if (card.Ot !== values.Ot) {
+              if (values.Ot === 'notRequired') {
+                values.verify.invalid = 'false'
+              } else if (card.Ot === 'notRequired' && values.Ot !== 'notRequired') {
+                values.verify.invalid = 'true'
+              }
+            }
+          } else if (values.OpenType === 'tab' && values.linkmenu) {
+            if (sessionStorage.getItem('thdMenuList')) {
+              let list = null
+              try {
+                list = JSON.parse(sessionStorage.getItem('thdMenuList')) || []
+              } catch (e) {
+                list = []
+              }
+
+              let id = values.linkmenu[values.linkmenu.length - 1]
+        
+              list.forEach(item => {
+                if (item.MenuID === id) {
+                  values.MenuID = id
+                  values.MenuName = item.MenuName
+                  values.MenuNo = item.MenuNo
+                  values.tabType = item.type
+                }
+              })
             }
           }
+          if (values.openmenu && Array.isArray(values.openmenu) && values.openmenu.length > 0) {
+            let list = null
+            try {
+              list = JSON.parse(sessionStorage.getItem('thdMenuList')) || []
+            } catch (e) {
+              list = []
+            }
 
-          // 鍏宠仈涓夌骇鑿滃崟
-          if (values.OpenType === 'tab' && values.linkmenu && values.linkmenu.length > 0) {
-            let linkThdMenu = ''
-            menulist.forEach(menu => {
-              if (menu.value === values.linkmenu[0]) {
-                menu.children.forEach(item => {
-                  if (item.value === values.linkmenu[1]) {
-                    item.children.forEach(cell => {
-                      if (cell.value === values.linkmenu[2]) {
-                        linkThdMenu = cell
-                      }
-                    })
-                  }
-                })
+            let id = values.openmenu[values.openmenu.length - 1]
+
+            list.forEach(item => {
+              if (item.MenuID === id) {
+                values.MenuID = id
+                values.MenuName = item.MenuName
+                values.MenuNo = item.MenuNo
+                values.tabType = item.type
               }
             })
-            values.linkThdMenu = linkThdMenu
           }
 
-          if (values.innerFunc === '' && values.sql === '') {
-            notification.warning({
-              top: 92,
-              message: this.props.dict['header.form.actionhelp.tablename'],
-              duration: 5
-            })
-          } else if (values.innerFunc === '' && values.sql !== '' && values.sqlType === '') {
-            notification.warning({
-              top: 92,
-              message: this.props.dict['header.form.actionhelp.sqlType'],
-              duration: 5
-            })
-          } else {
-            resolve(values)
-          }
+          resolve(values)
         } else {
           reject(err)
         }
@@ -838,7 +792,7 @@
       }
     }
     return (
-      <Form {...formItemLayout} className="ant-advanced-search-form commontable-action-form" id="winter">
+      <Form {...formItemLayout} className="normal-action-list-form" id="winter">
         <Row gutter={24}>{this.getFields()}</Row>
       </Form>
     )

--
Gitblit v1.8.0