From f3dafc941859bf305bfe9cd4aa7262c61339ba4c Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 28 四月 2022 10:21:20 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/share/actioncomponent/formconfig.jsx | 68 ++++++++++++++++++++++-----------
1 files changed, 45 insertions(+), 23 deletions(-)
diff --git a/src/menu/components/share/actioncomponent/formconfig.jsx b/src/menu/components/share/actioncomponent/formconfig.jsx
index c6f833e..171b5ef 100644
--- a/src/menu/components/share/actioncomponent/formconfig.jsx
+++ b/src/menu/components/share/actioncomponent/formconfig.jsx
@@ -63,17 +63,17 @@
})
}
- if (type === 'editable') {
- opentypes = [
- {
- value: 'excelIn',
- text: Formdict['model.form.excelIn']
- }, {
- value: 'excelOut',
- text: Formdict['model.form.excelOut']
- }
- ]
- }
+ // if (type === 'editable') {
+ // opentypes = [
+ // {
+ // value: 'excelIn',
+ // text: Formdict['model.form.excelIn']
+ // }, {
+ // value: 'excelOut',
+ // text: Formdict['model.form.excelOut']
+ // }
+ // ]
+ // }
let tabs = getTabs(JSON.parse(JSON.stringify(modules)))
@@ -112,6 +112,7 @@
{ value: 'mkUnsubscribe', text: '娉ㄩ攢璐︽埛' },
{ value: 'reAuth', text: '鍒囨崲绯荤粺锛堟竻绌虹紦瀛�-灏忕▼搴忥級' },
{ value: 'goBack', text: '杩斿洖' },
+ // { value: 'megvii', text: '鏃疯闈㈡澘鏈�' },
]
pageTemps = [
{ value: 'linkpage', text: '鍏宠仈鑿滃崟' },
@@ -150,7 +151,7 @@
if (type === 'card') {
opentypes.push({
value: 'form',
- text: '琛ㄥ崟'
+ text: '琛ㄥ崟锛堝紑鍏虫垨鍕鹃�夋锛�'
})
}
@@ -178,6 +179,16 @@
required: true,
options: funTypes
},
+ // {
+ // type: 'select',
+ // key: 'subFunc',
+ // label: '鎺ュ彛鍚嶇О',
+ // initVal: card.subFunc || '',
+ // required: true,
+ // options: [
+ // { value: 'login', text: '鐧诲綍' }
+ // ]
+ // },
{
type: 'radio',
key: 'formType',
@@ -284,6 +295,7 @@
label: '鍏宠仈鑿滃崟',
initVal: card.linkmenu || (isApp ? '' : []),
required: true,
+ extendName: 'MenuNo',
options: isApp ? appMenus : menulist
},
{
@@ -401,17 +413,17 @@
key: 'execSuccess',
label: Formdict['model.form.afterSuccess'],
initVal: card.execSuccess || 'grid',
- tooltip: refresh.length ? '鎵ц鍒锋柊婧愮粍浠舵椂锛岃鍦ㄦ簮鎸夐挳涓缃叧闂悗鍒锋柊閭ｄ竴椤癸紝娉細姝ゆ椂浼氬悓姝ュ埛鏂板綋鍓嶇粍浠跺拰涓婄骇缁勪欢-琛屻��' : '鍒锋柊涓婄骇缁勪欢-琛屾椂锛屼細鍚屾鍒锋柊褰撳墠缁勪欢锛屾敞锛氫笂绾х粍浠跺湪鏁版嵁婧愪腑娣诲姞銆�',
+ tooltip: refresh.length ? '鎵ц鍒锋柊婧愮粍浠舵椂锛岃鍦ㄦ簮鎸夐挳涓缃叧闂悗鍒锋柊閭ｄ竴椤癸紝娉細姝ゆ椂浼氬悓姝ュ埛鏂板綋鍓嶇粍浠跺拰涓婄骇缁勪欢-琛屻��' : '閫夋嫨鍒锋柊琛屾椂锛屽鏋滈�夋嫨澶氭潯鏁版嵁浼氬埛鏂拌〃鏍笺�傛敞锛氫笂绾х粍浠跺湪鏁版嵁婧愪腑娣诲姞銆�',
required: true,
options: [{
value: 'never',
text: Formdict['header.form.refresh.never']
}, {
- value: 'grid',
- text: '鍒锋柊褰撳墠缁勪欢'
- }, {
value: 'line',
text: '鍒锋柊琛�'
+ }, {
+ value: 'grid',
+ text: '鍒锋柊褰撳墠缁勪欢'
}, {
value: 'mainline',
text: '鍒锋柊涓婄骇缁勪欢 - 琛�'
@@ -426,17 +438,17 @@
key: 'execError',
label: Formdict['model.form.afterError'],
initVal: card.execError || 'never',
- tooltip: refresh.length ? '鎵ц鍒锋柊婧愮粍浠舵椂锛岃鍦ㄦ簮鎸夐挳涓缃叧闂悗鍒锋柊閭ｄ竴椤癸紝娉細姝ゆ椂浼氬悓姝ュ埛鏂板綋鍓嶇粍浠跺拰涓婄骇缁勪欢-琛屻��' : '鍒锋柊涓婄骇缁勪欢-琛屾椂锛屼細鍚屾鍒锋柊褰撳墠缁勪欢锛屾敞锛氫笂绾х粍浠跺湪鏁版嵁婧愪腑娣诲姞銆�',
+ tooltip: refresh.length ? '鎵ц鍒锋柊婧愮粍浠舵椂锛岃鍦ㄦ簮鎸夐挳涓缃叧闂悗鍒锋柊閭ｄ竴椤癸紝娉細姝ゆ椂浼氬悓姝ュ埛鏂板綋鍓嶇粍浠跺拰涓婄骇缁勪欢-琛屻��' : '閫夋嫨鍒锋柊琛屾椂锛屽鏋滈�夋嫨澶氭潯鏁版嵁浼氬埛鏂拌〃鏍硷紝娉細涓婄骇缁勪欢鍦ㄦ暟鎹簮涓坊鍔犮��',
required: true,
options: [{
value: 'never',
text: Formdict['header.form.refresh.never']
}, {
- value: 'grid',
- text: '鍒锋柊褰撳墠缁勪欢'
- }, {
value: 'line',
text: '鍒锋柊琛�'
+ }, {
+ value: 'grid',
+ text: '鍒锋柊褰撳墠缁勪欢'
}, {
value: 'mainline',
text: '鍒锋柊涓婄骇缁勪欢 - 琛�'
@@ -650,14 +662,14 @@
initVal: card.openmenu || (!appType ? [] : ''),
required: false,
allowClear: true,
- options: appType === 'mob' ? [...appMenus, {value: 'goback', text: '杩斿洖'}] : (appType === 'pc' ? appMenus : menulist),
+ options: appType === 'mob' ? [...appMenus, {value: 'goback', text: '杩斿洖锛堜笂涓�椤碉級'}] : (appType === 'pc' ? appMenus : menulist),
forbid: viewType === 'popview'
},
{
type: 'text',
key: 'output',
label: '杩斿洖鍊�',
- tooltip: '鎵ц鎴愬姛鍚庣殑杩斿洖鍊笺��',
+ tooltip: '鎵ц鎴愬姛鍚庣殑杩斿洖鍊笺�備緥濡傦細@id',
initVal: card.output || '',
required: false,
forbid: viewType === 'popview'
@@ -813,6 +825,13 @@
required: false
},
{
+ type: 'text',
+ key: 'reason',
+ label: '绂佺敤鍘熷洜',
+ initVal: card.reason || '',
+ required: false
+ },
+ {
type: 'splitLine',
key: 'title',
label: '琛ㄥ崟',
@@ -832,9 +851,12 @@
label: '寮�鍏冲昂瀵�',
initVal: card.size || 'default',
options: [{
- value: 'default',
+ value: 'large',
text: '澶�'
}, {
+ value: 'default',
+ text: '涓�'
+ }, {
value: 'small',
text: '灏�'
}]
--
Gitblit v1.8.0