From 8d66ff34fae5b048a6b7923cc75d34f13a08be9d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 02 八月 2022 11:42:43 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/pc/components/login/normal-login/options.jsx | 177 +++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 141 insertions(+), 36 deletions(-)
diff --git a/src/pc/components/login/normal-login/options.jsx b/src/pc/components/login/normal-login/options.jsx
index c423354..05fa848 100644
--- a/src/pc/components/login/normal-login/options.jsx
+++ b/src/pc/components/login/normal-login/options.jsx
@@ -41,19 +41,12 @@
required: true
},
{
- type: 'checkbox',
- field: 'loginWays',
- label: '鐧诲綍鏂瑰紡',
- initval: wrap.loginWays || [],
+ type: 'select',
+ field: 'linkmenu',
+ label: '鍏宠仈鑿滃崟',
+ initval: wrap.linkmenu || '',
required: true,
- options: [
- { label: '璐﹀彿', value: 'uname_pwd' },
- { label: '鐭俊', value: 'sms_vcode' },
- { label: '鎵爜', value: 'app_scan', disabled: appType === 'mob' },
- ],
- controlFields: [
- {field: 'tempId', values: ['sms_vcode']}
- ]
+ options: menulist
},
{
type: 'number',
@@ -66,17 +59,17 @@
precision: 0,
required: true
},
- {
- type: 'number',
- field: 'maxWidth',
- label: '鏈�澶у搴�',
- initval: wrap.maxWidth || '',
- tooltip: '鐧诲綍妗嗙殑鏈�澶у搴﹀�笺��',
- min: 100,
- max: 2000,
- precision: 0,
- required: false
- },
+ // {
+ // type: 'number',
+ // field: 'maxWidth',
+ // label: '鏈�澶у搴�',
+ // initval: wrap.maxWidth || '',
+ // tooltip: '鐧诲綍妗嗙殑鏈�澶у搴﹀�笺��',
+ // min: 100,
+ // max: 2000,
+ // precision: 0,
+ // required: false
+ // },
{
type: 'styleInput',
field: 'height',
@@ -88,34 +81,146 @@
},
{
type: 'radio',
- field: 'link',
- label: '閾炬帴',
- initval: wrap.link || 'menu',
- required: false,
+ field: 'classify',
+ label: '缁勪欢绫诲瀷',
+ initval: wrap.classify || 'login',
+ tooltip: '娉ㄥ唽鐧诲綍閮藉瓨鍦ㄦ椂锛屽湪鍏紬鍙蜂笌灏忕▼搴忎腑浼樺厛鏄剧ず娉ㄥ唽锛孉PP涓嶩5涓紭鍏堟樉绀虹櫥褰曘��',
+ required: true,
options: [
- {value: 'menu', label: '鑿滃崟'},
- {value: 'linkmenu', label: '鍏宠仈鑿滃崟'},
+ { label: '鐧诲綍', value: 'login' },
+ { label: '娉ㄥ唽', value: 'signin' },
+ { label: '娉ㄥ唽/鐧诲綍', value: 'all' },
],
controlFields: [
- {field: 'linkmenu', values: ['linkmenu']}
+ {field: 'loginWays', values: ['login', 'all']},
+ {field: 'logintip', values: ['login', 'all']},
+ {field: 'signWays', values: ['signin', 'all']},
+ {field: 'protocol', values: ['signin', 'all']},
+ {field: 'signtip', values: ['signin', 'all']},
]
},
{
- type: 'select',
- field: 'linkmenu',
- label: '鍏宠仈鑿滃崟',
- initval: wrap.linkmenu || '',
+ type: 'hint',
+ field: 'logintip',
+ label: '鐧诲綍閰嶇疆'
+ },
+ {
+ type: 'checkbox',
+ field: 'loginWays',
+ label: '鐧诲綍鏂瑰紡',
+ initval: wrap.loginWays || [],
required: true,
- options: menulist
+ options: [
+ { label: '璐﹀彿', value: 'uname_pwd' },
+ { label: '鐭俊', value: 'sms_vcode' },
+ { label: '鎵爜', value: 'app_scan', disabled: appType === 'mob' },
+ ],
+ controlFields: [
+ {field: 'tempId', values: ['sms_vcode']},
+ {field: 'shortcut', values: ['uname_pwd']},
+ ]
},
{
type: 'select', // $楠岃瘉鐮�$ $mob$ $send_type$
field: 'tempId',
label: '鐭俊妯℃澘',
initval: wrap.tempId || '',
- tooltip: '鐭俊妯℃澘鍙湪绠＄悊绯荤粺 HS-濂囦簯鐭俊妯℃澘 澶勬坊鍔犮��',
+ tooltip: '鐭俊妯℃澘鍙湪 浜戠郴缁�->搴旂敤鏈嶅姟->寮�鍙戣�呬腑蹇�->鐭俊妯℃澘 澶勬坊鍔犮��',
required: true,
options: msgTemps
+ },
+ {
+ type: 'radio',
+ field: 'shortcut',
+ label: '蹇嵎鏂瑰紡',
+ initval: wrap.shortcut || 'remember',
+ tooltip: '璐﹀彿瀵嗙爜鐧诲綍鏃剁殑蹇嵎鏂瑰紡銆�',
+ required: false,
+ options: [
+ {value: 'none', label: '鏃�'},
+ {value: 'remember', label: '璁颁綇瀵嗙爜'},
+ {value: 'autologon', label: '鑷姩鐧诲綍'},
+ ]
+ },
+ {
+ type: 'hint',
+ field: 'signtip',
+ label: '娉ㄥ唽閰嶇疆'
+ },
+ {
+ type: 'checkbox',
+ field: 'signWays',
+ label: '娉ㄥ唽鏂瑰紡',
+ initval: wrap.signWays || [],
+ tooltip: '寰俊鎺堟潈鍙湪灏忕▼搴忎腑鏈夋晥銆�',
+ required: true,
+ options: [
+ { label: '璐﹀彿', value: 'uname_pwd' },
+ { label: '鐭俊', value: 'sms_vcode' },
+ { label: '寰俊', value: 'weixin', disabled: appType !== 'mob' },
+ ],
+ controlFields: [
+ {field: 'signTempId', values: ['sms_vcode']}
+ ]
+ },
+ {
+ type: 'select', // $楠岃瘉鐮�$ $mob$ $send_type$
+ field: 'signTempId',
+ label: '鐭俊妯℃澘',
+ initval: wrap.signTempId || '',
+ tooltip: '鐭俊妯℃澘鍙湪 浜戠郴缁�->搴旂敤鏈嶅姟->寮�鍙戣�呬腑蹇�->鐭俊妯℃澘 澶勬坊鍔犮��',
+ required: true,
+ options: msgTemps
+ },
+ {
+ type: 'radio',
+ field: 'protocol',
+ label: '鍗忚',
+ initval: wrap.protocol || 'false',
+ required: false,
+ options: [
+ {value: 'false', label: '鏃�'},
+ {value: 'true', label: '鏈�'},
+ ],
+ controlFields: [
+ {field: 'tip', values: ['true']},
+ {field: 'groups', values: ['true']},
+ ]
+ },
+ {
+ type: 'text',
+ field: 'tip',
+ label: '鎻愮ず鏂囧瓧',
+ initval: wrap.tip || '鎴戝凡闃呰骞跺悓鎰�',
+ required: true
+ },
+ {
+ type: 'table',
+ field: 'groups',
+ label: '鍗忚缁�',
+ initval: wrap.groups || [],
+ required: true,
+ span: 24,
+ columns: [
+ {
+ title: '鏂囨湰',
+ dataIndex: 'label',
+ inputType: 'input',
+ editable: true,
+ unique: true,
+ required: true,
+ width: '35%'
+ },
+ {
+ title: '閾炬帴',
+ dataIndex: 'link',
+ inputType: 'input',
+ editable: true,
+ unique: true,
+ required: true,
+ width: '40%'
+ },
+ ]
}
]
--
Gitblit v1.8.0