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 | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/menu/components/share/actioncomponent/formconfig.jsx b/src/menu/components/share/actioncomponent/formconfig.jsx
index 97dac96..171b5ef 100644
--- a/src/menu/components/share/actioncomponent/formconfig.jsx
+++ b/src/menu/components/share/actioncomponent/formconfig.jsx
@@ -112,6 +112,7 @@
{ value: 'mkUnsubscribe', text: '娉ㄩ攢璐︽埛' },
{ value: 'reAuth', text: '鍒囨崲绯荤粺锛堟竻绌虹紦瀛�-灏忕▼搴忥級' },
{ value: 'goBack', text: '杩斿洖' },
+ // { value: 'megvii', text: '鏃疯闈㈡澘鏈�' },
]
pageTemps = [
{ value: 'linkpage', 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',
@@ -658,7 +669,7 @@
type: 'text',
key: 'output',
label: '杩斿洖鍊�',
- tooltip: '鎵ц鎴愬姛鍚庣殑杩斿洖鍊笺��',
+ tooltip: '鎵ц鎴愬姛鍚庣殑杩斿洖鍊笺�備緥濡傦細@id',
initVal: card.output || '',
required: false,
forbid: viewType === 'popview'
@@ -840,9 +851,12 @@
label: '寮�鍏冲昂瀵�',
initVal: card.size || 'default',
options: [{
- value: 'default',
+ value: 'large',
text: '澶�'
}, {
+ value: 'default',
+ text: '涓�'
+ }, {
value: 'small',
text: '灏�'
}]
--
Gitblit v1.8.0