From fb3ec146a9e1444ece749d0bcf232a554e933fb0 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 17 五月 2022 22:56:16 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/share/actioncomponent/formconfig.jsx | 72 +++++++++++++++++++++++++++++------
1 files changed, 59 insertions(+), 13 deletions(-)
diff --git a/src/menu/components/share/actioncomponent/formconfig.jsx b/src/menu/components/share/actioncomponent/formconfig.jsx
index e40ee92..7dd44d3 100644
--- a/src/menu/components/share/actioncomponent/formconfig.jsx
+++ b/src/menu/components/share/actioncomponent/formconfig.jsx
@@ -12,7 +12,7 @@
* @param {*} usefulFields 瀛樺偍杩囩▼鍙敤鐨勫紑濮嬪瓧娈�
* @param {*} type 鎸夐挳绫诲瀷锛岀敤浜庡尯鍒嗗彲閫夌殑鎵撳紑鏂瑰紡
*/
-export function getActionForm (card, functip, config, usefulFields, type, menulist = [], modules = []) {
+export function getActionForm (card, functip, config, usefulFields, type, menulist = [], modules = [], anchors = []) {
let appType = sessionStorage.getItem('appType')
let viewType = sessionStorage.getItem('editMenuType') // 寮圭獥 popview
let printTemps = sessionStorage.getItem('printTemps')
@@ -88,6 +88,7 @@
{ value: 'changeuser', text: '鍒囨崲鐢ㄦ埛' },
{ value: 'print', text: '鏍囩鎵撳嵃' },
{ value: 'closetab', text: '鏍囩鍏抽棴' },
+ { value: 'megvii', text: '鏃疯闈㈡澘鏈�' },
]
if (isApp) {
@@ -177,6 +178,16 @@
initVal: card.funcType || '',
required: true,
options: funTypes
+ },
+ {
+ type: 'radio',
+ key: 'subFunc',
+ label: '鎺ュ彛鍚嶇О',
+ initVal: card.subFunc || 'addUser',
+ required: true,
+ options: [
+ { value: 'addUser', text: '娣诲姞鐢ㄦ埛' },
+ ]
},
{
type: 'radio',
@@ -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: '鍒锋柊涓婄骇缁勪欢 - 琛�'
@@ -634,6 +646,15 @@
},
{
type: 'cascader',
+ key: 'anchors',
+ label: '璺宠浆閿氱偣',
+ initVal: card.anchors || [],
+ tooltip: '鎵ц鎴愬姛鍚庯紝闇�瑕佽烦杞殑閿氱偣',
+ required: false,
+ options: anchors
+ },
+ {
+ type: 'cascader',
key: 'refreshTab',
label: '鍒锋柊鑿滃崟',
initVal: card.refreshTab || [],
@@ -650,14 +671,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'
@@ -707,7 +728,7 @@
precision: 0,
label: '姣斾緥',
initVal: card.ratio || 85,
- tooltip: '灏忎簬100涓哄搴︼紙鎴栭珮搴︼級鐧惧垎姣旓紝澶т簬100涓哄儚绱犲�笺��',
+ tooltip: '妯℃�佹鎴栨娊灞夌殑瀹藉害锛屽皬浜�100涓虹獥鍙ｅ搴︼紙鎴栭珮搴︼級鐧惧垎姣旓紝澶т簬100涓哄儚绱犲�笺��',
required: true
},
{
@@ -813,6 +834,13 @@
required: false
},
{
+ type: 'text',
+ key: 'reason',
+ label: '绂佺敤鍘熷洜',
+ initVal: card.reason || '',
+ required: false
+ },
+ {
type: 'splitLine',
key: 'title',
label: '琛ㄥ崟',
@@ -832,8 +860,11 @@
label: '寮�鍏冲昂瀵�',
initVal: card.size || 'default',
options: [{
- value: 'default',
+ value: 'large',
text: '澶�'
+ }, {
+ value: 'default',
+ text: '涓�'
}, {
value: 'small',
text: '灏�'
@@ -869,6 +900,21 @@
initVal: card.closeText || '',
required: false,
},
+ {
+ type: 'radio',
+ key: 'hidden',
+ label: '闅愯棌',
+ initVal: card.hidden || 'false',
+ tooltip: '闅愯棌鍚庢寜閽湪椤甸潰涓笉鏄剧ず锛屼笖涓嶅弬涓庢潈闄愬垎閰嶃��',
+ required: false,
+ options: [{
+ value: 'false',
+ text: '鍚�'
+ }, {
+ value: 'true',
+ text: '鏄�'
+ }]
+ }
]
return forms
--
Gitblit v1.8.0