From 2ae980243b7ad705dea575eadcfc4cf4e24073bd Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 17 五月 2022 22:57:19 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/share/actioncomponent/formconfig.jsx | 50 +++++++++++++++++++++++++++++++++++++-------------
1 files changed, 37 insertions(+), 13 deletions(-)
diff --git a/src/menu/components/share/actioncomponent/formconfig.jsx b/src/menu/components/share/actioncomponent/formconfig.jsx
index 171b5ef..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) {
@@ -112,7 +113,6 @@
{ value: 'mkUnsubscribe', text: '娉ㄩ攢璐︽埛' },
{ value: 'reAuth', text: '鍒囨崲绯荤粺锛堟竻绌虹紦瀛�-灏忕▼搴忥級' },
{ value: 'goBack', text: '杩斿洖' },
- // { value: 'megvii', text: '鏃疯闈㈡澘鏈�' },
]
pageTemps = [
{ value: 'linkpage', text: '鍏宠仈鑿滃崟' },
@@ -179,16 +179,16 @@
required: true,
options: funTypes
},
- // {
- // type: 'select',
- // key: 'subFunc',
- // label: '鎺ュ彛鍚嶇О',
- // initVal: card.subFunc || '',
- // required: true,
- // options: [
- // { value: 'login', text: '鐧诲綍' }
- // ]
- // },
+ {
+ type: 'radio',
+ key: 'subFunc',
+ label: '鎺ュ彛鍚嶇О',
+ initVal: card.subFunc || 'addUser',
+ required: true,
+ options: [
+ { value: 'addUser', text: '娣诲姞鐢ㄦ埛' },
+ ]
+ },
{
type: 'radio',
key: 'formType',
@@ -646,6 +646,15 @@
},
{
type: 'cascader',
+ key: 'anchors',
+ label: '璺宠浆閿氱偣',
+ initVal: card.anchors || [],
+ tooltip: '鎵ц鎴愬姛鍚庯紝闇�瑕佽烦杞殑閿氱偣',
+ required: false,
+ options: anchors
+ },
+ {
+ type: 'cascader',
key: 'refreshTab',
label: '鍒锋柊鑿滃崟',
initVal: card.refreshTab || [],
@@ -719,7 +728,7 @@
precision: 0,
label: '姣斾緥',
initVal: card.ratio || 85,
- tooltip: '灏忎簬100涓哄搴︼紙鎴栭珮搴︼級鐧惧垎姣旓紝澶т簬100涓哄儚绱犲�笺��',
+ tooltip: '妯℃�佹鎴栨娊灞夌殑瀹藉害锛屽皬浜�100涓虹獥鍙ｅ搴︼紙鎴栭珮搴︼級鐧惧垎姣旓紝澶т簬100涓哄儚绱犲�笺��',
required: true
},
{
@@ -891,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