From c6f8e27d35cd31bb6393a1e7f747b6b2593dbd7a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 08 六月 2022 13:56:57 +0800
Subject: [PATCH] 2022-06-08
---
src/menu/components/share/actioncomponent/actionform/index.jsx | 41 +++++++++++++++++++++++++++++++----------
1 files changed, 31 insertions(+), 10 deletions(-)
diff --git a/src/menu/components/share/actioncomponent/actionform/index.jsx b/src/menu/components/share/actioncomponent/actionform/index.jsx
index d4cfb8c..497d406 100644
--- a/src/menu/components/share/actioncomponent/actionform/index.jsx
+++ b/src/menu/components/share/actioncomponent/actionform/index.jsx
@@ -11,16 +11,16 @@
const { TextArea } = Input
const MkEditIcon = asyncComponent(() => import('@/components/mkIcon'))
const acTyOptions = {
- pop: ['label', 'OpenType', 'intertype', 'Ot', 'show', 'swipe', 'icon', 'class', 'color', 'execSuccess', 'execError', 'resetPageIndex', 'syncComponent', 'switchTab', 'anchors', 'width', 'openmenu', 'open', 'refreshTab', 'position', 'tipTitle', 'hidden'],
- prompt: ['label', 'OpenType', 'intertype', 'Ot', 'show', 'swipe', 'icon', 'class', 'color', 'execSuccess', 'execError', 'resetPageIndex', 'syncComponent', 'switchTab', 'anchors', 'width', 'openmenu', 'open', 'refreshTab', 'position', 'tipTitle', 'hidden'],
- exec: ['label', 'OpenType', 'intertype', 'Ot', 'show', 'swipe', 'icon', 'class', 'color', 'execSuccess', 'execError', 'resetPageIndex', 'syncComponent', 'switchTab', 'anchors', 'width', 'openmenu', 'open', 'refreshTab', 'hidden'],
- excelIn: ['label', 'Ot', 'OpenType', 'intertype', 'show', 'icon', 'class', 'color', 'sheet', 'execSuccess', 'execError', 'resetPageIndex', 'syncComponent', 'switchTab', 'width', 'hidden'],
- excelOut: ['label', 'OpenType', 'intertype', 'show', 'icon', 'class', 'color', 'execSuccess', 'execError', 'syncComponent', 'switchTab', 'resetPageIndex', 'pagination', 'search', 'width', 'hidden'],
- popview: ['label', 'Ot', 'OpenType', 'show', 'icon', 'class', 'color', 'popClose', 'resetPageIndex', 'width', 'display', 'ratio', 'syncComponent', 'clickouter', 'hidden'],
+ pop: ['label', 'OpenType', 'intertype', 'Ot', 'show', 'swipe', 'icon', 'class', 'color', 'execSuccess', 'execError', 'syncComponent', 'switchTab', 'anchors', 'width', 'openmenu', 'refreshTab', 'position', 'tipTitle', 'hidden'],
+ prompt: ['label', 'OpenType', 'intertype', 'Ot', 'show', 'swipe', 'icon', 'class', 'color', 'execSuccess', 'execError', 'syncComponent', 'switchTab', 'anchors', 'width', 'openmenu', 'refreshTab', 'position', 'tipTitle', 'hidden'],
+ exec: ['label', 'OpenType', 'intertype', 'Ot', 'show', 'swipe', 'icon', 'class', 'color', 'execSuccess', 'execError', 'syncComponent', 'switchTab', 'anchors', 'width', 'openmenu', 'refreshTab', 'hidden'],
+ excelIn: ['label', 'Ot', 'OpenType', 'intertype', 'show', 'icon', 'class', 'color', 'sheet', 'execSuccess', 'execError', 'syncComponent', 'switchTab', 'width', 'hidden'],
+ excelOut: ['label', 'OpenType', 'intertype', 'show', 'icon', 'class', 'color', 'execSuccess', 'execError', 'syncComponent', 'switchTab', 'pagination', 'search', 'width', 'hidden'],
+ popview: ['label', 'Ot', 'OpenType', 'show', 'icon', 'class', 'color', 'popClose', 'width', 'display', 'ratio', 'syncComponent', 'clickouter', 'hidden'],
tab: ['label', 'Ot', 'OpenType', 'show', 'icon', 'class', 'color', 'linkmenu', 'width', 'hidden'],
innerpage: ['label', 'Ot', 'OpenType', 'pageTemplate', 'show', 'swipe', 'icon', 'class', 'color', 'width', 'open', 'hidden'],
funcbutton: ['label', 'OpenType', 'funcType', 'show', 'swipe', 'icon', 'class', 'color', 'width', 'hidden'],
- form: ['label', 'OpenType', 'formType', 'intertype', 'Ot', 'execSuccess', 'execError', 'resetPageIndex', 'syncComponent', 'width', 'open', 'refreshTab', 'title', 'hidden']
+ form: ['label', 'OpenType', 'formType', 'intertype', 'Ot', 'execSuccess', 'execError', 'syncComponent', 'width', 'refreshTab', 'title', 'hidden']
}
class ActionForm extends Component {
@@ -192,6 +192,12 @@
if (Ot === 'required') {
shows.push('progress')
}
+ if (this.record.openmenu && this.record.openmenu !== 'goback') {
+ shows.push('open')
+ }
+ if (this.record.execSuccess === 'grid' || this.record.execError === 'grid') {
+ shows.push('resetPageIndex')
+ }
if (this.record.sqlType === 'insert') {
reOptions.Ot = requireOptions.filter(op => op.value === 'notRequired')
@@ -239,6 +245,9 @@
if (this.record.execSuccess === 'goback') {
shows.push('reload')
}
+ if (this.record.execSuccess === 'grid' || this.record.execError === 'grid') {
+ shows.push('resetPageIndex')
+ }
reOptions.Ot = requireOptions
reOptions.sqlType = [{
@@ -267,6 +276,9 @@
shows.push('innerFunc')
reRequired.innerFunc = true
}
+ if (this.record.execSuccess === 'grid' || this.record.execError === 'grid') {
+ shows.push('resetPageIndex')
+ }
} else if (openType === 'excelOut') {
reOptions.intertype = this.state.interTypeOptions.filter(op => op.value !== 'custom')
@@ -285,11 +297,17 @@
shows.push('innerFunc')
reRequired.innerFunc = true
}
+ if (this.record.execSuccess === 'grid' || this.record.execError === 'grid') {
+ shows.push('resetPageIndex')
+ }
} else if (openType === 'popview') {
reOptions.Ot = requireOptions.filter(op => ['notRequired', 'requiredSgl'].includes(op.value))
if (this.record.display === 'drawer') {
shows.push('placement')
+ }
+ if (this.record.popClose === 'grid') {
+ shows.push('resetPageIndex')
}
} else if (openType === 'tab') {
reOptions.Ot = requireOptions.filter(op => ['notRequired', 'requiredSgl'].includes(op.value))
@@ -323,7 +341,7 @@
let _funcType = this.record.funcType
if (_funcType === 'print') {
- shows.push('execMode', 'intertype', 'Ot', 'execSuccess', 'execError', 'resetPageIndex')
+ shows.push('execMode', 'intertype', 'Ot', 'execSuccess', 'execError')
if (this.record.intertype === 'outer') {
shows.push('innerFunc', 'sysInterface', 'interface', 'proInterface', 'outerFunc', 'callbackFunc')
reRequired.innerFunc = false
@@ -338,6 +356,9 @@
} else if (this.record.intertype === 'inner') {
shows.push('innerFunc')
reRequired.innerFunc = true
+ }
+ if (this.record.execSuccess === 'grid' || this.record.execError === 'grid') {
+ shows.push('resetPageIndex')
}
} else if (_funcType === 'mkBinding' || _funcType === 'mkUnBinding') {
shows.push('execSuccess', 'execError')
@@ -363,7 +384,7 @@
} else if (_funcType === 'megvii') {
shows.push('subFunc', 'progress')
} else if (_funcType === 'pay') {
- shows.push('payType', 'Ot')
+ shows.push('payType', 'Ot', 'execSuccess', 'execError', 'syncComponent', 'openmenu')
reOptions.Ot = requireOptions.filter(op => ['requiredSgl'].includes(op.value))
}
}
@@ -747,7 +768,7 @@
fields.push(
<Col span={span} key={index}>
- <Form.Item className={className} label={item.tooltip ?
+ <Form.Item className={className} help={item.help || null} label={item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
<QuestionCircleOutlined className="mk-form-tip" />
{item.label}
--
Gitblit v1.8.0