From 8d66ff34fae5b048a6b7923cc75d34f13a08be9d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 02 八月 2022 11:42:43 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/share/actioncomponent/formconfig.jsx | 88 +++++++++++++++++++++++++++++++++++---------
1 files changed, 70 insertions(+), 18 deletions(-)
diff --git a/src/menu/components/share/actioncomponent/formconfig.jsx b/src/menu/components/share/actioncomponent/formconfig.jsx
index 7dd44d3..6ffb4b4 100644
--- a/src/menu/components/share/actioncomponent/formconfig.jsx
+++ b/src/menu/components/share/actioncomponent/formconfig.jsx
@@ -89,6 +89,7 @@
{ value: 'print', text: '鏍囩鎵撳嵃' },
{ value: 'closetab', text: '鏍囩鍏抽棴' },
{ value: 'megvii', text: '鏃疯闈㈡澘鏈�' },
+ { value: 'filezip', text: '鏂囦欢鍘嬬缉鍖�' },
]
if (isApp) {
@@ -107,11 +108,14 @@
opentypes = opentypes.filter(item => ['pop', 'prompt', 'exec', 'innerpage', 'funcbutton'].includes(item.value))
funTypes = [
{ value: 'scan', text: '鎵爜' },
- { value: 'logout', text: '閫�鍑�' },
+ { value: 'pay', text: '鏀粯' },
+ { value: 'resetPwd', text: '淇敼瀵嗙爜'},
{ value: 'mkBinding', text: '寮�閫氭壂鐮佺櫥褰�' },
{ value: 'mkUnBinding', text: '鐢ㄦ埛瑙ｇ粦' },
{ value: 'mkUnsubscribe', text: '娉ㄩ攢璐︽埛' },
{ value: 'reAuth', text: '鍒囨崲绯荤粺锛堟竻绌虹紦瀛�-灏忕▼搴忥級' },
+ { value: 'copyurl', text: '澶嶅埗閾炬帴鍦板潃' },
+ { value: 'logout', text: '閫�鍑�' },
{ value: 'goBack', text: '杩斿洖' },
]
pageTemps = [
@@ -160,6 +164,19 @@
}
if (appType === 'mob' && card.control === 'parent') {
card.control = ''
+ }
+
+ if (card.execSuccess === 'goback') {
+ card.openmenu = 'goback'
+ card.execSuccess = 'never'
+ }
+
+ let closetab = []
+ if (!appType) {
+ closetab = [{
+ value: 'closetab',
+ text: '鍏抽棴鏍囩'
+ }]
}
let forms = [
@@ -236,6 +253,20 @@
required: true,
},
{
+ type: 'checkbox',
+ key: 'payType',
+ label: '鏀粯鏂瑰紡',
+ initVal: card.payType || [],
+ required: true,
+ options: [{
+ value: 'wxpay',
+ text: '寰俊'
+ }, {
+ value: 'alipay',
+ text: '鏀粯瀹�'
+ }]
+ },
+ {
type: 'radio',
key: 'procMode',
label: '鍙傛暟澶勭悊',
@@ -272,6 +303,15 @@
tooltip: functip,
fields: usefulFields,
required: false,
+ },
+ {
+ type: 'text',
+ key: 'urlkey',
+ label: '鍦板潃瀛楁',
+ initVal: card.urlkey || '',
+ tooltip: '鍥剧墖锛堟枃浠讹級閾炬帴鐨勫瓧娈靛悕銆�',
+ required: false,
+ readonly: false
},
{
type: 'select',
@@ -427,10 +467,8 @@
}, {
value: 'mainline',
text: '鍒锋柊涓婄骇缁勪欢 - 琛�'
- }, {
- value: !appType ? 'closetab' : 'goback',
- text: !appType ? '鍏抽棴鏍囩' : '杩斿洖锛堜笂涓�涓〉闈級'
- },
+ },
+ ...closetab,
...refresh]
},
{
@@ -631,7 +669,7 @@
key: 'syncComponent',
label: '鍒锋柊缁勪欢',
initVal: card.syncComponent || [],
- tooltip: '鎵ц鎴愬姛鍚庯紙鎴栧脊绐楁爣绛惧叧闂椂锛夛紝闇�瑕佸悓姝ュ埛鏂扮殑缁勪欢',
+ tooltip: '鎵ц鎴愬姛鍚庯紙鎴栧脊绐楁爣绛惧叧闂椂锛夛紝闇�瑕佸悓姝ュ埛鏂扮殑缁勪欢銆傛敞锛氶�夋嫨褰撳墠缁勪欢鐨勪笂绾х粍浠舵棤鏁堛��',
required: false,
options: modules
},
@@ -640,7 +678,7 @@
key: 'switchTab',
label: '鍒囨崲鏍囩',
initVal: card.switchTab || [],
- tooltip: '鎵ц鎴愬姛鍚庯紝闇�瑕佸垏鎹㈢殑鏍囩椤�',
+ tooltip: '鎵ц鎴愬姛鍚庯紝闇�瑕佸垏鎹㈢殑鏍囩椤点��' + (appType === 'mob' ? '娉細灏忕▼搴忎腑鏃犳晥' : ''),
required: false,
options: tabs
},
@@ -649,7 +687,7 @@
key: 'anchors',
label: '璺宠浆閿氱偣',
initVal: card.anchors || [],
- tooltip: '鎵ц鎴愬姛鍚庯紝闇�瑕佽烦杞殑閿氱偣',
+ tooltip: '鎵ц鎴愬姛鍚庯紝闇�瑕佽烦杞殑閿氱偣銆�' + (appType === 'mob' ? '娉細灏忕▼搴忎腑鏃犳晥' : ''),
required: false,
options: anchors
},
@@ -669,16 +707,17 @@
label: '鎵撳紑鑿滃崟',
tooltip: '鎵ц鎴愬姛鍚庨渶瑕佹墦寮�鐨勮彍鍗曘��',
initVal: card.openmenu || (!appType ? [] : ''),
+ help: appType === 'mob' || appType === 'pc' ? '鍙繑鍥炰笂涓�椤点��' : null,
required: false,
allowClear: true,
- options: appType === 'mob' ? [...appMenus, {value: 'goback', text: '杩斿洖锛堜笂涓�椤碉級'}] : (appType === 'pc' ? appMenus : menulist),
+ options: appType === 'mob' || appType === 'pc' ? [...appMenus, {value: 'goback', text: '杩斿洖锛堜笂涓�椤碉級'}] : menulist,
forbid: viewType === 'popview'
},
{
type: 'text',
key: 'output',
label: '杩斿洖鍊�',
- tooltip: '鎵ц鎴愬姛鍚庣殑杩斿洖鍊笺�備緥濡傦細@id',
+ tooltip: '鎵ц鎴愬姛鍚庣殑杩斿洖鍊笺�傜郴缁熷嚱鏁板彲鎸囧畾杩斿洖鐨勫彉閲忥紙浠绗﹀紑澶达紝濡侤id锛夛紱鑷畾涔夊嚱鏁板彲鎸囧畾杩斿洖瀛楁锛堝id锛夈��',
initVal: card.output || '',
required: false,
forbid: viewType === 'popview'
@@ -696,15 +735,13 @@
key: 'open',
label: '鎵撳紑鏂瑰紡',
initVal: card.open || 'blank',
+ tooltip: '鑿滃崟鎵撳紑鏂瑰紡銆�',
required: true,
- forbid: appType !== 'pc',
- options: [{
- value: 'blank',
- text: '鏂扮獥鍙�'
- }, {
- value: 'self',
- text: '褰撳墠绐楀彛'
- }]
+ forbid: appType !== 'pc' && appType !== 'mob',
+ options: [
+ {value: 'blank', text: appType !== 'mob' ? '鏂扮獥鍙�' : '鏂伴〉闈�'},
+ {value: 'self', text: appType !== 'mob' ? '褰撳墠绐楀彛' : '褰撳墠椤甸潰'},
+ ]
},
{
type: 'radio',
@@ -914,6 +951,21 @@
value: 'true',
text: '鏄�'
}]
+ },
+ {
+ type: 'radio',
+ key: 'progress',
+ label: '杩涘害鎻愮ず',
+ initVal: card.progress || 'number',
+ required: false,
+ forbid: appType === 'mob',
+ options: [{
+ value: 'number',
+ text: '鍓╀綑鏁�'
+ }, {
+ value: 'progressbar',
+ text: '杩涘害鏉�'
+ }]
}
]
--
Gitblit v1.8.0