From 2b639156302123d4490f03ec02385c4750d1fa11 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期一, 27 一月 2025 13:59:16 +0800 Subject: [PATCH] 2025-01-27 --- src/menu/components/share/actioncomponent/actionform/index.jsx | 234 +++++++++++++++++++++++++++++++++++++++++++++------------- 1 files changed, 180 insertions(+), 54 deletions(-) diff --git a/src/menu/components/share/actioncomponent/actionform/index.jsx b/src/menu/components/share/actioncomponent/actionform/index.jsx index a88a6f8..727c2dc 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,16 +15,16 @@ 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'], - 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'], + pop: ['label', 'OpenType', 'intertype', 'Ot', 'show', 'hover', 'swipe', 'icon', 'class', 'color', 'execSuccess', 'execError', 'syncComponent', 'switchTab', 'anchors', 'width', 'openmenu', 'refreshTab', 'position', 'hoverTitle', 'hidden', 'preButton', 'extBtn', 'reload'], + prompt: ['label', 'OpenType', 'intertype', 'Ot', 'show', 'hover', 'swipe', 'icon', 'class', 'color', 'execSuccess', 'execError', 'syncComponent', 'switchTab', 'anchors', 'width', 'openmenu', 'refreshTab', 'position', 'tipTitle', 'hoverTitle', 'hidden', 'preButton', 'reload'], + exec: ['label', 'OpenType', 'intertype', 'Ot', 'show', 'hover', 'swipe', 'icon', 'class', 'color', 'execSuccess', 'execError', 'syncComponent', 'switchTab', 'anchors', 'width', 'openmenu', 'refreshTab', 'hoverTitle', 'hidden', 'preButton', 'reload'], + 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'], funcbutton: ['label', 'OpenType', 'funcType', 'show', 'hover', 'swipe', 'icon', 'class', 'color', 'width', 'hidden'], - form: ['label', 'OpenType', 'formType', 'intertype', 'Ot', 'execSuccess', 'execError', 'syncComponent', 'width', 'openmenu', 'refreshTab', 'title', 'hidden'] + form: ['label', 'OpenType', 'formType', 'intertype', 'Ot', 'execSuccess', 'execError', 'syncComponent', 'width', 'openmenu', 'refreshTab', 'title', 'hidden', 'reload'] } class ActionForm extends Component { @@ -215,25 +215,30 @@ 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') { shows.push('progress') - } - if (Ot === 'required' && (intertype === 'inner' || intertype === 'system')) { - shows.push('execType') + if (intertype === 'inner' || intertype === 'system') { + shows.push('execType') + if (this.record.execType === 'single') { + shows.push('execInterval') + } + } else { + shows.push('execInterval') + } } if (this.record.openmenu && this.record.openmenu !== 'goback') { shows.push('open') } - if (this.record.execSuccess === 'grid' || this.record.execError === 'grid') { + if (['grid'].includes(this.record.execSuccess) || ['grid'].includes(this.record.execError)) { shows.push('resetPageIndex') } @@ -248,9 +253,12 @@ } else { reOptions.sqlType = this.state.insertUpdateOptions } - // if (this.record.execSuccess === 'goback') { - shows.push('reload') - // } + if (openType === 'pop') { + shows.push('extBtn') + if (this.record.extBtn === 'true') { + shows.push('extLabel', 'extStyle', 'confLabel', 'confStyle', 'extValue') + } + } } else if (openType === 'form') { let intertype = this.record.intertype @@ -296,16 +304,13 @@ 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') { - shows.push('reload') - } - if (this.record.execSuccess === 'grid' || this.record.execError === 'grid') { + if (['grid'].includes(this.record.execSuccess) || ['grid'].includes(this.record.execError)) { shows.push('resetPageIndex') } @@ -347,10 +352,12 @@ 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') { + if (['grid'].includes(this.record.execSuccess) || ['grid'].includes(this.record.execError)) { shows.push('resetPageIndex') } } else if (openType === 'excelOut') { @@ -382,10 +389,12 @@ 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') { + if (['grid'].includes(this.record.execSuccess) || ['grid'].includes(this.record.execError)) { shows.push('resetPageIndex') } if (this.record.Ot !== 'notRequired' && appType === 'mob') { @@ -415,7 +424,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 +434,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 +448,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') @@ -473,17 +487,22 @@ 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') { + if (['grid'].includes(this.record.execSuccess) || ['grid'].includes(this.record.execError)) { shows.push('resetPageIndex') } if (this.record.execMode === 'pop' || this.record.execMode === 'prompt') { shows.push('position') } } else if (_funcType === 'mkBinding' || _funcType === 'mkUnBinding') { - shows.push('execSuccess', 'execError') + shows.push('execSuccess', 'execError', 'tipTitle') + } else if (_funcType === 'mkUnsubscribe' || _funcType === 'reAuth') { + shows.push('tipTitle') + } else if (_funcType === 'reSystem') { + shows.push('tipTitle', 'Ot') + reOptions.Ot = requireOptions.filter(op => op.value === 'requiredSgl') } else if (_funcType === 'closetab') { shows.push('refreshTab') } else if (_funcType === 'scan') { @@ -511,16 +530,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') } @@ -585,6 +626,10 @@ } } + if (shows.includes('refreshTab') && this.record.refreshTab && this.record.refreshTab.length) { + shows.push('urlPar') + } + return { shows, reOptions, @@ -602,6 +647,7 @@ * 3銆佸垏鎹㈡爣绛剧被鍨嬶紝閲嶇疆鍙�夋爣绛� */ optionChange = (key, value) => { + const { type } = this.props const { hasclass, appType, requireOptions } = this.state this.record[key] = value @@ -636,9 +682,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' @@ -700,6 +753,10 @@ _fieldval.color = 'primary' } } + this.record.resetPageIndex = 'false' + if ([this.record.execSuccess, this.record.execError].includes('grid')) { + _fieldval.resetPageIndex = 'false' + } } else if (value === 'audit') { _fieldval.label = '瀹℃牳' _fieldval.Ot = 'required' @@ -716,8 +773,16 @@ } else { _fieldval.color = 'danger' } + this.record.resetPageIndex = 'true' + if ([this.record.execSuccess, this.record.execError].includes('grid')) { + _fieldval.resetPageIndex = 'true' + } } 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') { // 鍗$墖涓棤澶氳閫夐」 @@ -737,6 +802,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') { @@ -841,23 +909,48 @@ { 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 if (item.key === 'extValue') { + rules.push( + { pattern: /^[0-9a-zA-Z_]*$/, message: '璇蜂娇鐢ㄥ瓧姣嶃�佹暟瀛椾互鍙奯' }, + { max: 50, message: '鏈�澶�50涓瓧绗︺��' } + ) } else { rules.push({ max: formRule.input.max, message: formRule.input.message }) } @@ -1035,6 +1128,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) { @@ -1158,6 +1260,9 @@ if (values.outerBlacklist) { values.outerBlacklist = values.outerBlacklist.replace(/\s/ig, '') } + if (values.controlVal) { + values.controlVal = values.controlVal.replace(/\t+|\v+|\s+/g, '') + } if (values.openmenu && Array.isArray(values.openmenu) && values.openmenu.length > 0) { let list = null @@ -1179,6 +1284,27 @@ }) } + if (values.extraParam) { + values.extraParam.forEach(n => { + values[n] = 'true' + }) + + delete values.extraParam + } + + if (values.refreshTab && values.refreshTab.length && ['pop', 'prompt', 'exec'].includes(values.OpenType) && window.GLOB.customMenu) { + let id = values.refreshTab[values.refreshTab.length - 1] + if (id === window.GLOB.customMenu.uuid) { + if (values.execSuccess !== 'never' || (values.syncComponent && values.syncComponent.length)) { + notification.warning({ + top: 92, + message: '鎸夐挳鍒锋柊鑿滃崟涓哄綋鍓嶈彍鍗曟椂锛屾垚鍔熷悗鐨勭粍浠跺埛鏂帮紙鎴栧叧闂爣绛撅級灏嗗け鏁�!', + duration: 5 + }) + } + } + } + resolve(values) } else { reject(err) -- Gitblit v1.8.0