From 3ab48c2aea029329cd3b137911469b1e6eb40d47 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 04 七月 2024 15:33:50 +0800
Subject: [PATCH] 2024-07-04
---
src/menu/components/share/actioncomponent/actionform/index.jsx | 121 +++++++++++++++++++++++++++++++---------
1 files changed, 94 insertions(+), 27 deletions(-)
diff --git a/src/menu/components/share/actioncomponent/actionform/index.jsx b/src/menu/components/share/actioncomponent/actionform/index.jsx
index 3faa23c..730898c 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'
@@ -18,8 +18,8 @@
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'],
+ excelIn: ['label', 'Ot', 'OpenType', 'intertype', 'show', 'hover', 'icon', 'class', 'color', 'sheet', 'execSuccess', 'execError', 'syncComponent', 'switchTab', 'width', 'hidden', 'refreshTab'],
+ excelOut: ['label', 'Ot', 'OpenType', 'intertype', 'show', 'hover', 'icon', 'class', 'color', 'execSuccess', 'execError', 'syncComponent', 'switchTab', 'pagination', 'search', 'width', 'hidden', 'refreshTab'],
popview: ['label', 'Ot', 'OpenType', 'show', 'hover', 'icon', 'class', 'color', 'popClose', 'width', 'display', 'ratio', 'syncComponent', 'clickouter', 'maskStyle', 'closeButton', 'hidden'],
tab: ['label', 'Ot', 'OpenType', 'show', 'hover', 'icon', 'class', 'color', 'linkmenu', 'width', 'hidden', 'openTab'],
innerpage: ['label', 'Ot', 'OpenType', 'pageTemplate', 'show', 'hover', 'swipe', 'icon', 'class', 'color', 'width', 'hidden'],
@@ -221,7 +221,7 @@
}
reRequired.innerFunc = true
} else {
- shows.push('sql', 'sqlType', 'output')
+ shows.push('sql', 'sqlType', 'output', 'database')
}
if (Ot === 'required') {
@@ -299,7 +299,7 @@
shows.push('innerFunc', 'extraParam')
reRequired.innerFunc = true
} else {
- shows.push('sql', 'sqlType')
+ shows.push('sql', 'sqlType', 'database')
}
if (this.record.execSuccess === 'goback') {
@@ -349,6 +349,8 @@
} else if (this.record.intertype === 'inner') {
shows.push('innerFunc', 'extraParam')
reRequired.innerFunc = true
+ } else {
+ shows.push('database')
}
if (this.record.execSuccess === 'grid' || this.record.execError === 'grid') {
shows.push('resetPageIndex')
@@ -384,6 +386,8 @@
} else if (this.record.intertype === 'inner') {
shows.push('innerFunc', 'extraParam')
reRequired.innerFunc = true
+ } else {
+ shows.push('database')
}
if (this.record.execSuccess === 'grid' || this.record.execError === 'grid') {
shows.push('resetPageIndex')
@@ -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 = ''
@@ -443,6 +443,15 @@
reOptions.Ot = requireOptions
} else if (this.record.pageTemplate === 'pay') {
reOptions.Ot = requireOptions.filter(op => op.value === 'requiredSgl')
+
+ shows.push('payMode', 'wxApp', 'wxMerch')
+ if (this.record.payMode === 'inner') {
+ reRequired.innerFunc = true
+ shows.push('innerFunc')
+ }
+ if (this.record.payMode !== 'none') {
+ shows.push('output')
+ }
}
} else if (openType === 'funcbutton') {
reOptions.intertype = this.state.interTypeOptions.filter(op => op.value !== 'custom')
@@ -511,16 +520,38 @@
shows.push('innerFunc', 'Ot', 'execSuccess', 'execError', 'urlkey')
} else if (_funcType === 'pay') {
- shows.push('payType', 'Ot', 'execSuccess', 'execError', 'syncComponent', 'openmenu')
+ shows.push('payType', 'wxApp', 'wxMerch', 'Ot', 'execSuccess', 'execError', 'syncComponent', 'openmenu')
if (this.record.openmenu && this.record.openmenu !== 'goback') {
shows.push('open')
}
reOptions.Ot = requireOptions.filter(op => ['requiredSgl'].includes(op.value))
+ shows.push('payMode')
+ if (this.record.payMode === 'inner') {
+ reRequired.innerFunc = true
+ shows.push('innerFunc')
+ }
+ if (this.record.payMode !== 'none') {
+ shows.push('output')
+ }
} 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))
+
+ shows.push('payMode')
+ if (this.record.payMode === 'inner') {
+ reRequired.innerFunc = true
+ shows.push('innerFunc')
+ }
+ if (this.record.payMode !== 'none') {
+ shows.push('output')
+ }
} else if (_funcType === 'shareLink') {
shows.push('shortUrl', 'shareUrl', 'shareProUrl', 'shareTip')
+ } else if (_funcType === 'openLocation') {
+ shows.push('Ot')
+ if (Ot === 'requiredSgl') {
+ shows.push('nameField', 'addressField')
+ }
// } else if (_funcType === 'expPdf') {
// shows.push('exportType')
}
@@ -727,6 +758,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'
@@ -745,6 +780,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') {
@@ -849,22 +887,42 @@
{ max: 512, message: '鏈�澶�512涓瓧绗�' }
)
} else if (item.key === 'output') {
- if (this.record.intertype === 'system' || ((this.record.intertype === 'outer' || this.record.intertype === 'custom') && this.record.callbackType === 'script')) {
- rules = [{
- pattern: /^@[0-9a-zA-Z_]+@?$/,
- message: '鍙橀噺浠绗﹀紑澶达紝鍙娇鐢ㄥ瓧姣嶃�佹暟瀛椾互鍙奯'
- }, {
- max: 100,
- message: '鏈�澶�100涓瓧绗︺��'
- }]
+ if (['pop', 'prompt', 'exec'].includes(this.record.OpenType)) {
+ if (this.record.intertype === 'system' || ((this.record.intertype === 'outer' || this.record.intertype === 'custom') && this.record.callbackType === 'script')) {
+ 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 = [{
- pattern: /^[0-9a-zA-Z_]*$/,
- message: '瀛楁鍙娇鐢ㄥ瓧姣嶃�佹暟瀛椾互鍙奯'
- }, {
- max: 100,
- message: '鏈�澶�100涓瓧绗︺��'
- }]
+ if (this.record.payMode === '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 })
@@ -1043,6 +1101,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) {
--
Gitblit v1.8.0