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/formconfig.jsx | 64 ++++++++++++++++++++++++++++++-
1 files changed, 61 insertions(+), 3 deletions(-)
diff --git a/src/menu/components/share/actioncomponent/formconfig.jsx b/src/menu/components/share/actioncomponent/formconfig.jsx
index eec1f28..4acbe8e 100644
--- a/src/menu/components/share/actioncomponent/formconfig.jsx
+++ b/src/menu/components/share/actioncomponent/formconfig.jsx
@@ -215,7 +215,7 @@
{ value: 'mkUnBinding', text: '鐢ㄦ埛瑙ｇ粦' },
{ value: 'mkUnsubscribe', text: '娉ㄩ攢璐︽埛' },
{ value: 'reAuth', text: '鍒囨崲鎺堟潈鐮� / 灏忕▼搴忔竻绌虹紦瀛�' },
- { value: 'reSystem', text: '鍒囨崲绯荤粺锛圓PP鍐咃級' },
+ { value: 'reSystem', text: '鍒囨崲绯荤粺' },
{ value: 'clearCache', text: '娓呯┖鏈湴閰嶇疆' },
{ value: 'copyurl', text: '澶嶅埗閾炬帴鍦板潃' },
{ value: 'expPdf', text: '瀵煎嚭PDF' },
@@ -364,6 +364,16 @@
}
}
+ if (card.syncComponents && card.syncComponents[0] && Array.isArray(card.syncComponents[0])) {
+ card.syncComponents = card.syncComponents.map((item, i) => {
+ return {
+ syncComId: item,
+ label: '',
+ uuid: 'fixed' + i
+ }
+ })
+ }
+
let forms = [
{
type: 'select',
@@ -464,7 +474,7 @@
key: 'procMode',
label: '鍙傛暟澶勭悊',
initVal: card.procMode || (card.innerFunc ? 'inner' : 'system'),
- tooltip: '褰撹繑鍥炲�煎瓨鍦� mk_ex_invoke 涓斿�间负 false 鏃讹紝涓嶄細璋冪敤澶栭儴鎺ュ彛锛涘綋杩斿洖鍊煎瓨鍦� mk_ex_data 鏃讹紝灏嗕互姝や负鍙傛暟鍒嗘壒璇锋眰鑷畾涔夋帴鍙ｃ�傛敞锛氬綋閫夆�滄棤鈥濇椂锛屾寜閽�夎鏃朵細浼犻�掍富閿紝瀛樺湪琛ㄥ崟鏃朵細浼犻�掕〃鍗曞瓧娈碉紝瀛樺湪BID鏃朵細浼燘ID瀛楁銆�',
+ tooltip: '褰撹繑鍥炲�煎瓨鍦� mk_ex_invoke 涓斿�间负 false 鏃讹紝涓嶄細璋冪敤澶栭儴鎺ュ彛锛涘綋杩斿洖鍊煎瓨鍦� mk_ex_invoke 涓斿�间负 true_inside 鏃讹紝灏嗚烦杩囧閮ㄦ帴鍙ｇ洿鎺ヨ皟鐢ㄥ洖璋冿紙鍥炶皟鍙傛暟璇蜂娇鐢� mk_in_api 杩斿洖锛�;褰撹繑鍥炲�煎瓨鍦� mk_ex_data 鏃讹紝灏嗕互姝や负鍙傛暟鍒嗘壒璇锋眰鑷畾涔夋帴鍙ｃ�傛敞锛氬綋閫夆�滄棤鈥濇椂锛屾寜閽�夎鏃朵細浼犻�掍富閿紝瀛樺湪琛ㄥ崟鏃朵細浼犻�掕〃鍗曞瓧娈碉紝瀛樺湪BID鏃朵細浼燘ID瀛楁銆�',
required: true,
options: [{
value: 'system',
@@ -1079,6 +1089,22 @@
options: menulist
},
{
+ type: 'radio',
+ key: 'urlPar',
+ label: 'URL鍙橀噺',
+ initVal: card.urlPar || 'false',
+ tooltip: '鍒锋柊鑿滃崟鏃舵槸鍚︽竻闄RL鍙橀噺銆�',
+ required: false,
+ options: [{
+ value: 'true',
+ text: '娓呯┖'
+ }, {
+ value: 'false',
+ text: '涓嶆竻绌�'
+ }],
+ forbid: isApp || viewType === 'popview',
+ },
+ {
type: !appType ? 'cascader' : 'select',
key: 'openmenu',
label: '鎵撳紑鑿滃崟',
@@ -1626,6 +1652,14 @@
}]
},
{
+ type: 'number',
+ key: 'execInterval',
+ label: '鎵ц闂撮殧',
+ initVal: card.execInterval || 0,
+ tooltip: '涓ゆ璇锋眰鐨勬椂闂撮棿闅旓紙鍗曚綅姣锛夈��',
+ required: false
+ },
+ {
type: 'radio',
key: 'progress',
label: '杩涘害鎻愮ず',
@@ -1954,7 +1988,7 @@
key: 'procMode',
label: '鍙傛暟澶勭悊',
initVal: card.procMode || (card.innerFunc ? 'inner' : 'system'),
- tooltip: '褰撹繑鍥炲�煎瓨鍦� mk_ex_invoke 涓斿�间负 false 鏃讹紝涓嶄細璋冪敤澶栭儴鎺ュ彛锛涘綋杩斿洖鍊煎瓨鍦� mk_ex_data 鏃讹紝灏嗕互姝や负鍙傛暟鍒嗘壒璇锋眰鑷畾涔夋帴鍙ｃ�傛敞锛氬綋閫夆�滄棤鈥濇椂锛屾寜閽�夎鏃朵細浼犻�掍富閿紝瀛樺湪琛ㄥ崟鏃朵細浼犻�掕〃鍗曞瓧娈碉紝瀛樺湪BID鏃朵細浼燘ID瀛楁銆�',
+ tooltip: '褰撹繑鍥炲�煎瓨鍦� mk_ex_invoke 涓斿�间负 false 鏃讹紝涓嶄細璋冪敤澶栭儴鎺ュ彛锛涘綋杩斿洖鍊煎瓨鍦� mk_ex_invoke 涓斿�间负 true_inside 鏃讹紝灏嗚烦杩囧閮ㄦ帴鍙ｇ洿鎺ヨ皟鐢ㄥ洖璋冿紙鍥炶皟鍙傛暟璇蜂娇鐢� mk_in_api 杩斿洖锛�;褰撹繑鍥炲�煎瓨鍦� mk_ex_data 鏃讹紝灏嗕互姝や负鍙傛暟鍒嗘壒璇锋眰鑷畾涔夋帴鍙ｃ�傛敞锛氬綋閫夆�滄棤鈥濇椂锛屾寜閽�夎鏃朵細浼犻�掍富閿紝瀛樺湪琛ㄥ崟鏃朵細浼犻�掕〃鍗曞瓧娈碉紝瀛樺湪BID鏃朵細浼燘ID瀛楁銆�',
required: true,
options: [{
value: 'system',
@@ -2489,6 +2523,22 @@
options: menulist
},
{
+ type: 'radio',
+ key: 'urlPar',
+ label: 'URL鍙橀噺',
+ initVal: card.urlPar || 'false',
+ tooltip: '鍒锋柊鑿滃崟鏃舵槸鍚︽竻闄RL鍙橀噺銆�',
+ required: false,
+ options: [{
+ value: 'true',
+ text: '娓呯┖'
+ }, {
+ value: 'false',
+ text: '涓嶆竻绌�'
+ }],
+ forbid: viewType === 'popview',
+ },
+ {
type: 'cascader',
key: 'openmenu',
label: '鎵撳紑鑿滃崟',
@@ -2832,6 +2882,14 @@
}]
},
{
+ type: 'number',
+ key: 'execInterval',
+ label: '鎵ц闂撮殧',
+ initVal: card.execInterval || 0,
+ tooltip: '涓ゆ璇锋眰鐨勬椂闂撮棿闅旓紙鍗曚綅姣锛夈��',
+ required: false
+ },
+ {
type: 'radio',
key: 'progress',
label: '杩涘害鎻愮ず',
--
Gitblit v1.8.0