From f3d4db769ba9b51b799d981511a710fd443d0e08 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 21 四月 2025 12:18:03 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/mob/components/topbar/normal-navbar/options.jsx | 38 ++++++++++++++++++++++++++++++++++++--
1 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/src/mob/components/topbar/normal-navbar/options.jsx b/src/mob/components/topbar/normal-navbar/options.jsx
index 9ae983c..a66aa8b 100644
--- a/src/mob/components/topbar/normal-navbar/options.jsx
+++ b/src/mob/components/topbar/normal-navbar/options.jsx
@@ -7,6 +7,13 @@
export default function (wrap) {
let menulist = sessionStorage.getItem('appMenus')
let searchable = true
+ let adapters = sessionStorage.getItem('adapter')
+ if (adapters) {
+ adapters = adapters.split(',')
+ } else {
+ adapters = []
+ }
+
window.GLOB.customMenu.components.forEach(item => {
if (item.type === 'search') {
searchable = false
@@ -37,6 +44,9 @@
if (wrap.refresh === 'true') {
funs.push('refresh')
}
+ if (wrap.resetPwd === 'true') {
+ funs.push('resetPwd')
+ }
const topbarWrapForm = [
{
@@ -57,7 +67,7 @@
label: '鏍囬',
initval: wrap.title || '',
// tooltip: '浣跨敤鎼滅储妗嗘椂锛屾爣棰樼敤浜庢悳绱㈡潯浠堕殣钘忔椂锛堝綋鍚敤榛戝悕鍗曪紝鐧诲綍鐢ㄦ埛鏃犳潈闄愭椂锛夋樉绀恒�傛敞锛欯username浠ｈ〃鐢ㄦ埛鍚嶏紝@fullname浠ｈ〃濮撳悕銆�',
- tooltip: '娉細@username浠ｈ〃鐢ㄦ埛鍚嶏紝@fullname浠ｈ〃濮撳悕銆�',
+ tooltip: '娉細@username浠ｈ〃鐢ㄦ埛鍚嶏紝@fullname浠ｈ〃濮撳悕锛孈appname浠ｈ〃搴旂敤鍚嶃��',
required: false
},
{
@@ -70,13 +80,16 @@
options: [
{value: 'back', label: '杩斿洖'},
{value: 'scan', label: '鎵竴鎵�'},
+ {value: 'resetPwd', label: '淇敼瀵嗙爜'},
{value: 'refresh', label: '鍒锋柊'},
{value: 'logout', label: '閫�鍑�'},
],
controlFields: [
{field: 'reload', values: ['back']},
{field: 'linkmenu', values: ['scan']},
+ {field: 'prefix', values: ['scan']},
],
+ span: 24
},
{
type: 'radio',
@@ -167,6 +180,27 @@
options: menulist
},
{
+ type: 'text',
+ field: 'prefix',
+ label: '鍓嶇紑',
+ initval: wrap.prefix || '',
+ tooltip: '鎵爜淇℃伅灏嗕笌鍓嶇紑鎷兼帴鍚庢墽琛屻�傛敞锛氳烦杞彍鍗曢渶浠kbid锛�:鎴�,锛夊紑澶达紝mkbid锛�:鎴�,锛夎烦杞悗灏嗚鍘婚櫎銆備緥濡傦細mkbid:123456 璺宠浆鍚庨〉闈ID涓� 123456銆�',
+ required: false
+ },
+ {
+ type: 'radio',
+ field: 'minishow',
+ label: '灏忕▼搴忎腑',
+ initval: wrap.minishow || 'false',
+ tooltip: '瀵艰埅鏍忓湪灏忕▼搴忎腑鏄惁鏄剧ず銆�',
+ required: false,
+ options: [
+ {value: 'true', label: '鏄剧ず'},
+ {value: 'false', label: '闅愯棌'},
+ ],
+ forbid: !adapters.includes('wxmini')
+ },
+ {
type: 'radio',
field: 'menuPosition',
label: '鑷畾涔夎彍鍗曚綅缃�',
@@ -185,7 +219,7 @@
initval: wrap.menus || [],
required: false,
span: 24,
- actions: ['view'],
+ actions: ['edit', 'del', 'add', 'move', 'view'],
tip: <span style={{fontSize: '12px', color: '#959595', position: 'relative', top: '-8px'}}>褰撲娇鐢ㄥ浘鏍�<MkIcon type="user"/>锛屼笖鍙充晶鍙湁涓�涓彍鍗曟椂锛屼細鏄剧ず鐢ㄦ埛澶村儚銆�</span>,
columns: [
{
--
Gitblit v1.8.0