From 8d66ff34fae5b048a6b7923cc75d34f13a08be9d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 02 八月 2022 11:42:43 +0800
Subject: [PATCH] Merge branch 'develop'

---
 src/menu/components/share/actioncomponent/actionform/index.jsx |   54 ++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 48 insertions(+), 6 deletions(-)

diff --git a/src/menu/components/share/actioncomponent/actionform/index.jsx b/src/menu/components/share/actioncomponent/actionform/index.jsx
index f654b14..2cfa4c0 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'],
@@ -383,6 +384,11 @@
         shows.push('reload')
       } else if (_funcType === 'megvii') {
         shows.push('subFunc', 'progress')
+      } else if (_funcType === 'filezip') {
+        reOptions.Ot = requireOptions
+        reRequired.innerFunc = false
+
+        shows.push('innerFunc', 'Ot', 'execSuccess', 'execError', 'urlkey')
       } else if (_funcType === 'pay') {
         shows.push('payType', 'Ot', 'execSuccess', 'execError', 'syncComponent', 'openmenu')
         reOptions.Ot = requireOptions.filter(op => ['requiredSgl'].includes(op.value))
@@ -471,7 +477,6 @@
       if (value === 'pop' || value === 'prompt' || value === 'exec') {
         _fieldval.intertype = 'system'
         _fieldval.sqlType = ''
-  
       } else if (value === 'form') {
         _fieldval.Ot = 'requiredSgl'
 
@@ -491,9 +496,11 @@
         _fieldval.intertype = 'system'
         _fieldval.label = this.props.dict['model.form.excelOut']
         _fieldval.class = 'dgreen'
+        _fieldval.execSuccess = 'never'
         this.record.Ot = 'notRequired'
         this.record.label = this.props.dict['model.form.excelOut']
         this.record.class = 'dgreen'
+        this.record.execSuccess = 'never'
   
       } else if (value === 'popview') {
         _fieldval.display = 'modal'
@@ -558,7 +565,7 @@
         }
       } else if (value === 'audit') {
         _fieldval.label = '瀹℃牳'
-        _fieldval.Ot = 'requiredSgl'
+        _fieldval.Ot = 'required'
         if (hasclass) {
           _fieldval.class = 'primary'
         } else {
@@ -566,12 +573,18 @@
         }
       } else if (value === 'LogicDelete' || value === 'delete') {
         _fieldval.label = '鍒犻櫎'
-        _fieldval.Ot = 'requiredSgl'
+        _fieldval.Ot = 'required'
         if (hasclass) {
           _fieldval.class = 'danger'
         } else {
           _fieldval.color = 'danger'
         }
+      } else if (value === 'custom') {
+        _fieldval.Ot = 'required'
+      }
+
+      if (this.props.type === 'card' && _fieldval.Ot === 'required') { // 鍗＄墖涓棤澶氳閫夐」
+        _fieldval.Ot = 'requiredSgl'
       }
 
       this.record.label = _fieldval.label || this.record.label || ''
@@ -670,7 +683,7 @@
         ]
   
         if (item.key === 'innerFunc') {
-          let str = '^(' + item.fields.join('|') + ')'
+          let str = item.fields && item.fields.length ? '^(' + item.fields.join('|') + ')' : '^'
           let _patten = new RegExp(str + formRule.func.innerPattern + '$', 'g')
           rules.push(
             { pattern: _patten, message: formRule.func.innerMessage },
@@ -681,6 +694,24 @@
             { pattern: formRule.func.pattern, message: formRule.func.message },
             { max: formRule.func.max, message: formRule.func.maxMessage }
           )
+        } else if (item.key === 'output') {
+          if (this.record.intertype === 'system') {
+            rules = [{
+              pattern: /^@[0-9a-zA-Z_]+@?$/,
+              message: '鍙橀噺浠绗﹀紑澶达紝鍙娇鐢ㄥ瓧姣嶃�佹暟瀛椾互鍙奯'
+            }, {
+              max: 100,
+              message: '鏈�澶�100涓瓧绗︺��'
+            }]
+          } else {
+            rules = [{
+              pattern: /^[0-9a-zA-Z_]*$/,
+              message: '瀛楁鍙娇鐢ㄥ瓧姣嶃�佹暟瀛椾互鍙奯'
+            }, {
+              max: 100,
+              message: '鏈�澶�100涓瓧绗︺��'
+            }]
+          }
         } else {
           rules.push({ max: formRule.input.max, message: formRule.input.message })
         }
@@ -768,7 +799,7 @@
 
       fields.push(
         <Col span={span} key={index}>
-          <Form.Item className={className} help={item.help || null} label={item.tooltip ?
+          <Form.Item className={className} help={item.help} label={item.tooltip ?
             <Tooltip placement="topLeft" title={item.tooltip}>
               <QuestionCircleOutlined className="mk-form-tip" />
               {item.label}
@@ -782,6 +813,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