From 04c038af25f79ac7fc80e93054856a614f22b63b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 12 六月 2024 16:43:39 +0800
Subject: [PATCH] 2024-06-12
---
src/menu/components/share/actioncomponent/actionform/index.jsx | 72 ++++++++++++++++++++++++++----------
1 files changed, 52 insertions(+), 20 deletions(-)
diff --git a/src/menu/components/share/actioncomponent/actionform/index.jsx b/src/menu/components/share/actioncomponent/actionform/index.jsx
index a88a6f8..104c448 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, notification } from 'antd'
import { QuestionCircleOutlined } from '@ant-design/icons'
import { formRule } from '@/utils/option.js'
@@ -15,9 +15,9 @@
const CodeMirror = asyncComponent(() => import('@/templates/zshare/codemirror'))
const MKTable = asyncComponent(() => import('@/components/normalform/modalform/mkTable'))
const acTyOptions = {
- pop: ['label', 'OpenType', 'intertype', 'Ot', 'show', 'hover', 'swipe', 'icon', 'class', 'color', 'execSuccess', 'execError', 'syncComponent', 'switchTab', 'anchors', 'width', 'openmenu', 'refreshTab', 'position', 'tipTitle', 'hoverTitle', 'hidden', 'preButton', 'formCache'],
- prompt: ['label', 'OpenType', 'intertype', 'Ot', 'show', 'hover', 'swipe', 'icon', 'class', 'color', 'execSuccess', 'execError', 'syncComponent', 'switchTab', 'anchors', 'width', 'openmenu', 'refreshTab', 'position', 'tipTitle', 'hoverTitle', 'hidden', 'preButton', 'formCache'],
- exec: ['label', 'OpenType', 'intertype', 'Ot', 'show', 'hover', 'swipe', 'icon', 'class', 'color', 'execSuccess', 'execError', 'syncComponent', 'switchTab', 'anchors', 'width', 'openmenu', 'refreshTab', 'hoverTitle', 'hidden', 'preButton', 'formCache'],
+ pop: ['label', 'OpenType', 'intertype', 'Ot', 'show', 'hover', 'swipe', 'icon', 'class', 'color', 'execSuccess', 'execError', 'syncComponent', 'switchTab', 'anchors', 'width', 'openmenu', 'refreshTab', 'position', 'hoverTitle', 'hidden', 'preButton'],
+ prompt: ['label', 'OpenType', 'intertype', 'Ot', 'show', 'hover', 'swipe', 'icon', 'class', 'color', 'execSuccess', 'execError', 'syncComponent', 'switchTab', 'anchors', 'width', 'openmenu', 'refreshTab', 'position', 'tipTitle', 'hoverTitle', 'hidden', 'preButton'],
+ exec: ['label', 'OpenType', 'intertype', 'Ot', 'show', 'hover', 'swipe', 'icon', 'class', 'color', 'execSuccess', 'execError', 'syncComponent', 'switchTab', 'anchors', 'width', 'openmenu', 'refreshTab', 'hoverTitle', 'hidden', 'preButton'],
excelIn: ['label', 'Ot', 'OpenType', 'intertype', 'show', 'hover', 'icon', 'class', 'color', 'sheet', 'execSuccess', 'execError', 'syncComponent', 'switchTab', 'width', 'hidden'],
excelOut: ['label', 'Ot', 'OpenType', 'intertype', 'show', 'hover', 'icon', 'class', 'color', 'execSuccess', 'execError', 'syncComponent', 'switchTab', 'pagination', 'search', 'width', 'hidden'],
popview: ['label', 'Ot', 'OpenType', 'show', 'hover', 'icon', 'class', 'color', 'popClose', 'width', 'display', 'ratio', 'syncComponent', 'clickouter', 'maskStyle', 'closeButton', 'hidden'],
@@ -215,13 +215,13 @@
shows.push('exInterface', 'exProInterface')
}
} else if (intertype === 'inner') {
- shows.push('innerFunc', 'output', 'recordUser')
+ shows.push('innerFunc', 'output', 'extraParam')
if (Ot === 'requiredOnce') { // 鍓嶇疆鍑芥暟
shows.push('preFunc')
}
reRequired.innerFunc = true
} else {
- shows.push('sql', 'sqlType', 'output')
+ shows.push('sql', 'sqlType', 'output', 'database')
}
if (Ot === 'required') {
@@ -296,10 +296,10 @@
shows.push('exInterface', 'exProInterface')
}
} else if (intertype === 'inner') {
- shows.push('innerFunc', 'recordUser')
+ shows.push('innerFunc', 'extraParam')
reRequired.innerFunc = true
} else {
- shows.push('sql', 'sqlType')
+ shows.push('sql', 'sqlType', 'database')
}
if (this.record.execSuccess === 'goback') {
@@ -347,8 +347,10 @@
shows.push('exInterface', 'exProInterface')
}
} else if (this.record.intertype === 'inner') {
- shows.push('innerFunc', 'recordUser')
+ shows.push('innerFunc', 'extraParam')
reRequired.innerFunc = true
+ } else {
+ shows.push('database')
}
if (this.record.execSuccess === 'grid' || this.record.execError === 'grid') {
shows.push('resetPageIndex')
@@ -382,8 +384,10 @@
shows.push('exInterface', 'exProInterface')
}
} else if (this.record.intertype === 'inner') {
- shows.push('innerFunc', 'recordUser')
+ shows.push('innerFunc', 'extraParam')
reRequired.innerFunc = true
+ } else {
+ shows.push('database')
}
if (this.record.execSuccess === 'grid' || this.record.execError === 'grid') {
shows.push('resetPageIndex')
@@ -415,7 +419,7 @@
if (shows.includes('linkmenu') && this.record.linkmenu[0] === 'multiMenu') {
shows.push('multiMenus')
- } else if (this.record.sysId === 'js') {
+ } else if (Ot === 'notRequired' && this.record.sysId === 'js') {
shows.push('sign')
}
@@ -425,13 +429,9 @@
reOptions.Ot = requireOptions.filter(op => ['notRequired', 'requiredSgl'].includes(op.value))
if (this.record.pageTemplate === 'custom') {
- shows.push('url', 'proUrl', 'joint', 'open')
+ shows.push('url', 'proUrl', 'open')
} else if (this.record.pageTemplate === 'linkpage') {
shows.push('linkmenu', 'open')
-
- if (Ot === 'requiredSgl') {
- shows.push('joint')
- }
reRequired.linkmenu = true
reTooltip.linkmenu = ''
@@ -473,7 +473,7 @@
shows.push('exInterface', 'exProInterface')
}
} else if (this.record.intertype === 'inner') {
- shows.push('innerFunc', 'recordUser')
+ shows.push('innerFunc', 'extraParam')
reRequired.innerFunc = true
}
if (this.record.execSuccess === 'grid' || this.record.execError === 'grid') {
@@ -517,7 +517,7 @@
}
reOptions.Ot = requireOptions.filter(op => ['requiredSgl'].includes(op.value))
} else if (_funcType === 'refund') {
- shows.push('Ot', 'execSuccess', 'execError', 'syncComponent', 'openmenu')
+ shows.push('Ot', 'execSuccess', 'execError', 'syncComponent', 'openmenu', 'tipTitle')
reOptions.Ot = requireOptions.filter(op => ['requiredSgl'].includes(op.value))
} else if (_funcType === 'shareLink') {
shows.push('shortUrl', 'shareUrl', 'shareProUrl', 'shareTip')
@@ -602,6 +602,7 @@
* 3銆佸垏鎹㈡爣绛剧被鍨嬶紝閲嶇疆鍙�夋爣绛�
*/
optionChange = (key, value) => {
+ const { type } = this.props
const { hasclass, appType, requireOptions } = this.state
this.record[key] = value
@@ -636,9 +637,16 @@
_fieldval.label = '瀵煎嚭Excel'
_fieldval.class = 'dgreen'
_fieldval.execSuccess = 'never'
- _fieldval.Ot = 'requiredOnce'
_fieldval.control = ''
- this.record.Ot = 'requiredOnce'
+
+ if (type !== 'card') {
+ _fieldval.Ot = 'requiredOnce'
+ this.record.Ot = 'requiredOnce'
+ } else {
+ _fieldval.Ot = 'notRequired'
+ this.record.Ot = 'notRequired'
+ }
+
this.record.label = '瀵煎嚭Excel'
this.record.class = 'dgreen'
this.record.execSuccess = 'never'
@@ -719,6 +727,10 @@
} else if (value === 'custom') {
_fieldval.Ot = 'required'
}
+ if (_fieldval.Ot === 'required' && this.record.execError === 'never') {
+ this.record.execError = 'grid'
+ _fieldval.execError = 'grid'
+ }
if (this.props.type === 'card' && _fieldval.Ot === 'required') { // 鍗＄墖涓棤澶氳閫夐」
_fieldval.Ot = 'requiredSgl'
@@ -737,6 +749,9 @@
if (appType !== 'mob' && value === 'notRequired') {
this.record.control = ''
_fieldval.control = ''
+ } else if (value === 'required' && this.record.execError === 'never') {
+ this.record.execError = 'grid'
+ _fieldval.execError = 'grid'
}
} else if (key === 'pageTemplate') {
if (value === 'pay') {
@@ -1035,6 +1050,15 @@
values.config = card.config || null
values.$fixed = card.$fixed || false
+ if (['pop', 'prompt', 'exec'].includes(values.OpenType) && values.Ot === 'required' && values.execError === 'never') {
+ notification.warning({
+ top: 92,
+ message: '閫夋嫨澶氳鏃讹紝闇�璁剧疆澶辫触鍚庣殑鍒锋柊椤�!',
+ duration: 5
+ })
+ return
+ }
+
if (card.OpenType === 'excelOut' && values.OpenType === 'excelIn') {
values.verify = {columns: [], scripts: [], sheet: 'Sheet1', default: 'true', range: 1, uniques: []}
if (card.verify && card.verify.columns) {
@@ -1179,6 +1203,14 @@
})
}
+ if (values.extraParam) {
+ values.extraParam.forEach(n => {
+ values[n] = 'true'
+ })
+
+ delete values.extraParam
+ }
+
resolve(values)
} else {
reject(err)
--
Gitblit v1.8.0