From bdfec44c9f3a37dbbe05bf14a252ffec04132a86 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 06 九月 2022 21:24:28 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/share/actioncomponent/formconfig.jsx | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/menu/components/share/actioncomponent/formconfig.jsx b/src/menu/components/share/actioncomponent/formconfig.jsx
index 25baad2..789803c 100644
--- a/src/menu/components/share/actioncomponent/formconfig.jsx
+++ b/src/menu/components/share/actioncomponent/formconfig.jsx
@@ -91,15 +91,16 @@
let pageTemps = [
{ value: 'billprint', text: '鍗曟嵁鎵撳嵃' },
- { value: 'pay', text: Formdict['model.pay'] },
- { value: 'custom', text: Formdict['header.form.custom'] }
+ { value: 'pay', text: '鏀粯' },
+ { value: 'custom', text: '鑷畾涔�' }
]
const isApp = ['pc', 'mob'].includes(appType)
let funTypes = [
- { value: 'changeuser', text: '鍒囨崲鐢ㄦ埛' },
{ value: 'print', text: '鏍囩鎵撳嵃' },
+ { value: 'refund', text: '閫�娆�' },
{ value: 'closetab', text: '鏍囩鍏抽棴' },
+ { value: 'changeuser', text: '鍒囨崲鐢ㄦ埛' },
{ value: 'megvii', text: '鏃疯闈㈡澘鏈�' },
{ value: 'filezip', text: '鏂囦欢鍘嬬缉鍖�' },
]
@@ -121,6 +122,7 @@
funTypes = [
{ value: 'scan', text: '鎵爜' },
{ value: 'pay', text: '鏀粯' },
+ { value: 'refund', text: '閫�娆�' },
{ value: 'resetPwd', text: '淇敼瀵嗙爜'},
{ value: 'mkBinding', text: '寮�閫氭壂鐮佺櫥褰�' },
{ value: 'mkUnBinding', text: '鐢ㄦ埛瑙ｇ粦' },
@@ -137,6 +139,7 @@
} else if (appType === 'pc') {
opentypes = opentypes.filter(item => item.value !== 'tab')
funTypes = [
+ { value: 'refund', text: '閫�娆�' },
{ value: 'changeuser', text: '鍒囨崲鐢ㄦ埛' },
]
pageTemps = [
@@ -282,7 +285,7 @@
type: 'radio',
key: 'procMode',
label: '鍙傛暟澶勭悊',
- initVal: card.procMode || 'system',
+ initVal: card.procMode || (card.innerFunc ? 'inner' : 'system'),
required: true,
options: [{
value: 'system',
@@ -430,7 +433,7 @@
type: 'radio',
key: 'callbackType',
label: '鍥炶皟鏂瑰紡',
- initVal: card.callbackType || 'script',
+ initVal: card.callbackType || (card.callbackFunc ? 'func' : 'none'),
tooltip: '浣跨敤鍚庡彴鑴氭湰鎵ц鏃讹紝闇�瑕侀厤鍚堣鍒掍换鍔°��',
required: true,
options: [{
@@ -690,7 +693,7 @@
key: 'syncComponent',
label: '鍒锋柊缁勪欢',
initVal: card.syncComponent || [],
- tooltip: '鎵ц鎴愬姛鍚庯紙鎴栧脊绐楁爣绛惧叧闂椂锛夛紝闇�瑕佸悓姝ュ埛鏂扮殑缁勪欢銆傛敞锛氶�夋嫨褰撳墠缁勪欢鐨勪笂绾х粍浠舵棤鏁堛��',
+ tooltip: '鎵ц鎴愬姛鍚庯紙鎴栧脊绐楁爣绛惧叧闂椂锛夛紝闇�瑕佸悓姝ュ埛鏂扮殑缁勪欢銆傛敞锛氶�夋嫨褰撳墠缁勪欢鐨勪笂绾х粍浠舵棤鏁堬紝鍒锋柊涓婄骇缁勪欢璇烽�夋嫨鎴愬姛鍚庘�滃埛鏂颁笂绾х粍浠� - 琛屸�濄��',
required: false,
options: modules
},
--
Gitblit v1.8.0