From f3d4db769ba9b51b799d981511a710fd443d0e08 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 21 四月 2025 12:18:03 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/share/actioncomponent/actionform/index.jsx | 70 +++++++++++++++++++++++++++++------
1 files changed, 58 insertions(+), 12 deletions(-)
diff --git a/src/menu/components/share/actioncomponent/actionform/index.jsx b/src/menu/components/share/actioncomponent/actionform/index.jsx
index 2bd768f..77ac27d 100644
--- a/src/menu/components/share/actioncomponent/actionform/index.jsx
+++ b/src/menu/components/share/actioncomponent/actionform/index.jsx
@@ -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', 'hoverTitle', 'hidden', 'preButton', 'excache'],
- prompt: ['label', 'OpenType', 'intertype', 'Ot', 'show', 'hover', 'swipe', 'icon', 'class', 'color', 'execSuccess', 'execError', 'syncComponent', 'switchTab', 'anchors', 'width', 'openmenu', 'refreshTab', 'position', 'tipTitle', 'hoverTitle', 'hidden', 'preButton', 'excache'],
- exec: ['label', 'OpenType', 'intertype', 'Ot', 'show', 'hover', 'swipe', 'icon', 'class', 'color', 'execSuccess', 'execError', 'syncComponent', 'switchTab', 'anchors', 'width', 'openmenu', 'refreshTab', 'hoverTitle', 'hidden', 'preButton', 'excache'],
+ 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 {
@@ -161,6 +161,8 @@
let reRequired = {}
let reReadonly = {}
+ reTooltip.interface = ''
+ reTooltip.proInterface = '姝ｅ紡绯荤粺鎵�浣跨敤鐨勬帴鍙ｅ湴鍧�銆�'
if (['pop', 'prompt', 'exec'].includes(openType)) {
let intertype = this.record.intertype
@@ -183,6 +185,8 @@
}
reReadonly.interface = false
reRequired.interface = true
+ reTooltip.interface = `鍙娇鐢ㄥ彉閲廆mywebsite@ (鍩熷悕+铏氭嫙鐩綍)銆丂mydomain@ (鍩熷悕)锛屽锛欯mywebsite@/webapi/dostars 浠ｈ〃 ${window.GLOB.baseurl}webapi/dostars銆俙
+ reTooltip.proInterface += reTooltip.interface
} else if (intertype === 'outer') {
shows.push('procMode', 'sysInterface', 'outerFunc', 'callbackType')
if (this.record.procMode === 'system') {
@@ -226,9 +230,15 @@
if (Ot === 'required') {
shows.push('progress')
+ if (intertype === 'inner' || intertype === 'system') {
+ shows.push('execType')
+ if (this.record.execType === 'single') {
+ shows.push('execInterval')
+ }
+ }
}
- if (Ot === 'required' && (intertype === 'inner' || intertype === 'system')) {
- shows.push('execType')
+ if (intertype === 'outer' || intertype === 'custom') {
+ shows.push('execInterval')
}
if (this.record.openmenu && this.record.openmenu !== 'goback') {
shows.push('open')
@@ -248,9 +258,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
@@ -302,9 +315,6 @@
shows.push('sql', 'sqlType', 'database')
}
- if (this.record.execSuccess === 'goback') {
- shows.push('reload')
- }
if (['grid'].includes(this.record.execSuccess) || ['grid'].includes(this.record.execError)) {
shows.push('resetPageIndex')
}
@@ -495,6 +505,9 @@
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') {
@@ -616,6 +629,10 @@
if (['pop', 'prompt', 'exec', 'popview', 'tab', 'innerpage'].includes(openType)) {
shows.push('showName')
}
+ }
+
+ if (shows.includes('refreshTab') && this.record.refreshTab && this.record.refreshTab.length) {
+ shows.push('urlPar')
}
return {
@@ -741,6 +758,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'
@@ -756,6 +777,10 @@
_fieldval.class = 'danger'
} 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'
@@ -926,6 +951,11 @@
}]
}
}
+ } 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 })
}
@@ -1235,6 +1265,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
@@ -1264,6 +1297,19 @@
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