From cbeffcc0902631909c0373f274752a97ddaf2d4e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 06 八月 2022 01:41:54 +0800
Subject: [PATCH] 2022-08-06

---
 src/menu/components/share/actioncomponent/actionform/index.jsx |   63 ++++++++++++++++++++++++++-----
 1 files changed, 53 insertions(+), 10 deletions(-)

diff --git a/src/menu/components/share/actioncomponent/actionform/index.jsx b/src/menu/components/share/actioncomponent/actionform/index.jsx
index e3aff10..4bcfa1c 100644
--- a/src/menu/components/share/actioncomponent/actionform/index.jsx
+++ b/src/menu/components/share/actioncomponent/actionform/index.jsx
@@ -1,7 +1,7 @@
 import React, {Component} from 'react'
 import PropTypes from 'prop-types'
 import { fromJS } from 'immutable'
-import { Form, Row, Col, Input, Select, Radio, Tooltip, InputNumber, Cascader, Checkbox } from 'antd'
+import { Form, Row, Col, Input, Select, Radio, Tooltip, InputNumber, Cascader, Checkbox, Typography } from 'antd'
 import { QuestionCircleOutlined } from '@ant-design/icons'
 import { formRule } from '@/utils/option.js'
 
@@ -9,6 +9,7 @@
 import './index.scss'
 
 const { TextArea } = Input
+const { Paragraph } = Typography
 const MkEditIcon = asyncComponent(() => import('@/components/mkIcon'))
 const acTyOptions = {
   pop: ['label', 'OpenType', 'intertype', 'Ot', 'show', 'swipe', 'icon', 'class', 'color', 'execSuccess', 'execError', 'syncComponent', 'switchTab', 'anchors', 'width', 'openmenu', 'refreshTab', 'position', 'tipTitle', 'hidden'],
@@ -60,13 +61,13 @@
     }],
     interTypeOptions: [{
       value: 'system',
-      text: this.props.dict['model.interface.system']
+      text: '绯荤粺'
     }, {
       value: 'inner',
-      text: this.props.dict['model.interface.inner']
+      text: '鍐呴儴'
     }, {
       value: 'outer',
-      text: this.props.dict['model.interface.outer']
+      text: '澶栭儴'
     }, {
       value: 'custom',
       text: '鑷畾涔�'
@@ -162,18 +163,33 @@
       reOptions.intertype = this.state.interTypeOptions
 
       if (intertype === 'custom') {
-        shows.push('procMode', 'interface', 'callbackType', 'cbTable', 'proInterface', 'method', 'cross')
+        shows.push('procMode', 'interface', 'callbackType', 'proInterface', 'method', 'cross')
         if (this.record.procMode === 'system') {
           shows.push('sql', 'sqlType')
-        } else {
+        } else if (this.record.procMode === 'inner') {
           reRequired.innerFunc = true
           shows.push('innerFunc')
+        }
+        if (this.record.callbackType === 'func') {
+          shows.push('callbackFunc')
+        } else if (this.record.callbackType !== 'none') {
+          shows.push('cbTable')
         }
         reReadonly.interface = false
         reRequired.interface = true
       } else if (intertype === 'outer') {
-        shows.push('innerFunc', 'sysInterface', 'interface', 'proInterface', 'outerFunc', 'callbackFunc', 'output')
-        reRequired.innerFunc = false
+        shows.push('procMode', 'sysInterface', 'interface', 'proInterface', 'outerFunc', 'callbackType', 'output')
+        if (this.record.procMode === 'system') {
+          shows.push('sql', 'sqlType')
+        } else if (this.record.procMode === 'inner') {
+          reRequired.innerFunc = true
+          shows.push('innerFunc')
+        }
+        if (this.record.callbackType === 'func') {
+          shows.push('callbackFunc')
+        } else if (this.record.callbackType !== 'none') {
+          shows.push('cbTable')
+        }
 
         if (this.record.sysInterface === 'false') {
           reReadonly.interface = false
@@ -225,8 +241,18 @@
       reOptions.intertype = this.state.interTypeOptions.filter(item => item.value !== 'custom')
 
       if (intertype === 'outer') {
-        shows.push('innerFunc', 'sysInterface', 'interface', 'proInterface', 'outerFunc', 'callbackFunc')
-        reRequired.innerFunc = false
+        shows.push('procMode', 'sysInterface', 'interface', 'proInterface', 'outerFunc', 'callbackType')
+        if (this.record.procMode === 'system') {
+          shows.push('sql', 'sqlType')
+        } else if (this.record.procMode === 'inner') {
+          reRequired.innerFunc = true
+          shows.push('innerFunc')
+        }
+        if (this.record.callbackType === 'func') {
+          shows.push('callbackFunc')
+        } else if (this.record.callbackType !== 'none') {
+          shows.push('cbTable')
+        }
 
         if (this.record.sysInterface === 'false') {
           reReadonly.interface = false
@@ -264,6 +290,7 @@
       if (this.record.intertype === 'outer') {
         shows.push('innerFunc', 'sysInterface', 'interface', 'proInterface', 'outerFunc', 'callbackFunc')
         reRequired.innerFunc = false
+        reRequired.callbackFunc = false
 
         if (this.record.sysInterface === 'false') {
           reReadonly.interface = false
@@ -345,6 +372,7 @@
         if (this.record.intertype === 'outer') {
           shows.push('innerFunc', 'sysInterface', 'interface', 'proInterface', 'outerFunc', 'callbackFunc')
           reRequired.innerFunc = false
+          reRequired.callbackFunc = false
 
           if (this.record.sysInterface === 'false') {
             reReadonly.interface = false
@@ -582,6 +610,10 @@
         _fieldval.Ot = 'required'
       }
 
+      if (this.props.type === 'card' && _fieldval.Ot === 'required') { // 鍗$墖涓棤澶氳閫夐」
+        _fieldval.Ot = 'requiredSgl'
+      }
+
       this.record.label = _fieldval.label || this.record.label || ''
       this.record.Ot = _fieldval.Ot || this.record.Ot || ''
       this.record.class = _fieldval.class || this.record.class || ''
@@ -808,6 +840,17 @@
         </Col>
       )
     })
+
+    if (window.debugger && this.props.card.uuid) {
+      fields.push(
+        <Col span={12} key="uuid">
+          <Form.Item label="鎸夐挳ID">
+            <Paragraph copyable>{this.props.card.uuid}</Paragraph>
+          </Form.Item>
+        </Col>
+      )
+    }
+
     return fields
   }
 

--
Gitblit v1.8.0