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 | 145 ++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 133 insertions(+), 12 deletions(-)
diff --git a/src/menu/components/share/actioncomponent/formconfig.jsx b/src/menu/components/share/actioncomponent/formconfig.jsx
index 684488f..4acbe8e 100644
--- a/src/menu/components/share/actioncomponent/formconfig.jsx
+++ b/src/menu/components/share/actioncomponent/formconfig.jsx
@@ -1,5 +1,5 @@
import React from 'react'
-import { btnClasses } from '@/utils/option.js'
+import { btnClasses, modalClasses } from '@/utils/option.js'
/**
* @description 鑾峰彇鎸夐挳琛ㄥ崟閰嶇疆淇℃伅
@@ -187,6 +187,9 @@
} else {
appMenus = []
}
+ // if (appType === 'mob') {
+ // appMenus.push({value: 'sign', text: '绛惧悕锛堢郴缁熼〉锛�'})
+ // }
appMenus.push({value: 'goback', text: '杩斿洖锛堜笂涓�椤碉級'})
} else {
menulist = sessionStorage.getItem('fstMenuList')
@@ -211,12 +214,14 @@
{ value: 'mkBinding', text: '寮�閫氭壂鐮佺櫥褰�' },
{ value: 'mkUnBinding', text: '鐢ㄦ埛瑙ｇ粦' },
{ value: 'mkUnsubscribe', text: '娉ㄩ攢璐︽埛' },
- { value: 'reAuth', text: '鍒囨崲绯荤粺锛堟竻绌虹紦瀛�-灏忕▼搴忥級' },
+ { value: 'reAuth', text: '鍒囨崲鎺堟潈鐮� / 灏忕▼搴忔竻绌虹紦瀛�' },
+ { value: 'reSystem', text: '鍒囨崲绯荤粺' },
{ value: 'clearCache', text: '娓呯┖鏈湴閰嶇疆' },
{ value: 'copyurl', text: '澶嶅埗閾炬帴鍦板潃' },
{ value: 'expPdf', text: '瀵煎嚭PDF' },
{ value: 'shareLink', text: '鍒嗕韩閾炬帴' },
{ value: 'openLocation', text: '鎵撳紑鍦板浘'},
+ { value: 'wxPublicAuth', text: '寰俊鍏紬鍙锋巿鏉�'},
{ value: 'logout', text: '閫�鍑�' },
{ value: 'goBack', text: '杩斿洖' },
]
@@ -359,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',
@@ -459,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',
@@ -838,6 +853,10 @@
value: 'never',
text: '涓嶅埛鏂�'
}, {
+ value: 'line',
+ text: '鍒锋柊琛�',
+ $disabled: !['table_normaltable', 'table_editable', 'table_basetable', 'card_datacard', 'card_dualdatacard'].includes(alltype)
+ }, {
value: 'grid',
text: '鍒锋柊褰撳墠缁勪欢'
}, {
@@ -1068,6 +1087,22 @@
required: false,
forbid: isApp || viewType === 'popview',
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',
@@ -1464,6 +1499,15 @@
},
{
type: 'text',
+ key: 'extValue',
+ label: '鎵╁睍鍊�',
+ initVal: card.extValue || '',
+ required: true,
+ readonly: false,
+ forbid: appType === 'mob'
+ },
+ {
+ type: 'text',
key: 'extLabel',
label: '鎵╁睍鍚嶇О',
initVal: card.extLabel || '',
@@ -1472,12 +1516,30 @@
forbid: appType === 'mob'
},
{
+ type: 'select',
+ key: 'extStyle',
+ label: '鎵╁睍鏍峰紡',
+ initVal: card.extStyle || '',
+ required: false,
+ options: modalClasses,
+ forbid: appType === 'mob'
+ },
+ {
type: 'text',
- key: 'extValue',
- label: '鎵╁睍鍊�',
- initVal: card.extValue || '',
- required: true,
+ key: 'confLabel',
+ label: '纭畾鍚嶇О',
+ initVal: card.confLabel || '',
+ required: false,
readonly: false,
+ forbid: appType === 'mob'
+ },
+ {
+ type: 'select',
+ key: 'confStyle',
+ label: '纭畾鏍峰紡',
+ initVal: card.confStyle || '',
+ required: false,
+ options: modalClasses,
forbid: appType === 'mob'
},
{
@@ -1588,6 +1650,14 @@
value: 'single',
text: '閫愭潯璇锋眰'
}]
+ },
+ {
+ type: 'number',
+ key: 'execInterval',
+ label: '鎵ц闂撮殧',
+ initVal: card.execInterval || 0,
+ tooltip: '涓ゆ璇锋眰鐨勬椂闂撮棿闅旓紙鍗曚綅姣锛夈��',
+ required: false
},
{
type: 'radio',
@@ -1918,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',
@@ -2284,6 +2354,9 @@
value: 'never',
text: '涓嶅埛鏂�'
}, {
+ value: 'line',
+ text: '鍒锋柊琛�'
+ }, {
value: 'grid',
text: '鍒锋柊褰撳墠缁勪欢'
}, {
@@ -2448,6 +2521,22 @@
required: false,
forbid: viewType === 'popview',
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',
@@ -2739,6 +2828,14 @@
},
{
type: 'text',
+ key: 'extValue',
+ label: '鎵╁睍鍊�',
+ initVal: card.extValue || '',
+ required: true,
+ readonly: false
+ },
+ {
+ type: 'text',
key: 'extLabel',
label: '鎵╁睍鍚嶇О',
initVal: card.extLabel || '',
@@ -2746,12 +2843,28 @@
readonly: false
},
{
+ type: 'select',
+ key: 'extStyle',
+ label: '鎵╁睍鏍峰紡',
+ initVal: card.extStyle || '',
+ required: false,
+ options: modalClasses
+ },
+ {
type: 'text',
- key: 'extValue',
- label: '鎵╁睍鍊�',
- initVal: card.extValue || '',
- required: true,
+ key: 'confLabel',
+ label: '纭畾鍚嶇О',
+ initVal: card.confLabel || '',
+ required: false,
readonly: false
+ },
+ {
+ type: 'select',
+ key: 'confStyle',
+ label: '纭畾鏍峰紡',
+ initVal: card.confStyle || '',
+ required: false,
+ options: modalClasses
},
{
type: 'radio',
@@ -2769,6 +2882,14 @@
}]
},
{
+ type: 'number',
+ key: 'execInterval',
+ label: '鎵ц闂撮殧',
+ initVal: card.execInterval || 0,
+ tooltip: '涓ゆ璇锋眰鐨勬椂闂撮棿闅旓紙鍗曚綅姣锛夈��',
+ required: false
+ },
+ {
type: 'radio',
key: 'progress',
label: '杩涘害鎻愮ず',
--
Gitblit v1.8.0