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/templates/sharecomponent/actioncomponent/actionform/index.jsx | 55 +++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 47 insertions(+), 8 deletions(-)
diff --git a/src/templates/sharecomponent/actioncomponent/actionform/index.jsx b/src/templates/sharecomponent/actioncomponent/actionform/index.jsx
index e197357..e244c74 100644
--- a/src/templates/sharecomponent/actioncomponent/actionform/index.jsx
+++ b/src/templates/sharecomponent/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 } from 'antd'
+import { Form, Row, Col, Input, Select, Radio, Tooltip, InputNumber, Cascader, Typography } from 'antd'
import { QuestionCircleOutlined } from '@ant-design/icons'
import { formRule } from '@/utils/option.js'
@@ -12,6 +12,7 @@
const MkEditIcon = asyncComponent(() => import('@/components/mkIcon'))
const { TextArea } = Input
+const { Paragraph } = Typography
const actionTypeOptions = {
pop: ['label', 'position', 'OpenType', 'intertype', 'Ot', 'icon', 'class', 'execSuccess', 'execError', 'openmenu', 'output', 'tipTitle', 'hidden'],
prompt: ['label', 'position', 'OpenType', 'intertype', 'Ot', 'icon', 'class', 'execSuccess', 'execError', 'openmenu', 'output', 'tipTitle', 'hidden'],
@@ -175,6 +176,10 @@
shows.push('sql', 'sqlType', 'output')
}
+ if (Ot === 'required') {
+ shows.push('progress')
+ }
+
if (this.record.sqlType === 'insert') {
reOptions.Ot = requireOptions.filter(op => op.value === 'notRequired')
} else {
@@ -270,7 +275,12 @@
} else if (_funcType === 'closetab') {
shows.push('refreshTab')
} else if (_funcType === 'megvii') {
- shows.push('subFunc')
+ shows.push('subFunc', 'progress')
+ } else if (_funcType === 'filezip') {
+ reOptions.Ot = requireOptions
+ reRequired.innerFunc = false
+
+ shows.push('innerFunc', 'Ot', 'execSuccess', 'execError', 'urlkey')
}
}
@@ -332,7 +342,6 @@
if (value === 'pop' || value === 'prompt' || value === 'exec') {
_fieldval.intertype = 'system'
_fieldval.sqlType = ''
-
} else if (value === 'excelIn') {
_fieldval.intertype = 'system'
_fieldval.Ot = 'notRequired'
@@ -342,15 +351,15 @@
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'
+ _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'
@@ -415,12 +424,14 @@
_fieldval.class = 'purple'
} else if (value === 'audit') {
_fieldval.label = '瀹℃牳'
- _fieldval.Ot = 'requiredSgl'
+ _fieldval.Ot = 'required'
_fieldval.class = 'primary'
} else if (value === 'LogicDelete' || value === 'delete') {
_fieldval.label = '鍒犻櫎'
- _fieldval.Ot = 'requiredSgl'
+ _fieldval.Ot = 'required'
_fieldval.class = 'danger'
+ } else if (value === 'custom') {
+ _fieldval.Ot = 'required'
}
if (this.record.position === 'grid') {
@@ -508,7 +519,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 },
@@ -519,6 +530,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 })
}
@@ -595,6 +624,16 @@
</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