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 | 209 ++++++++++++++++++++++++++++++++++------------------
1 files changed, 137 insertions(+), 72 deletions(-)
diff --git a/src/mob/components/topbar/normal-navbar/options.jsx b/src/mob/components/topbar/normal-navbar/options.jsx
index 260e5b2..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
@@ -21,6 +28,24 @@
}
} else {
menulist = []
+ }
+
+ let funs = []
+
+ if (wrap.back === 'true') {
+ funs.push('back')
+ }
+ if (wrap.logout === 'true') {
+ funs.push('logout')
+ }
+ if (wrap.scan === 'true') {
+ funs.push('scan')
+ }
+ if (wrap.refresh === 'true') {
+ funs.push('refresh')
+ }
+ if (wrap.resetPwd === 'true') {
+ funs.push('resetPwd')
}
const topbarWrapForm = [
@@ -41,87 +66,95 @@
field: 'title',
label: '鏍囬',
initval: wrap.title || '',
- tooltip: '浣跨敤鎼滅储妗嗘椂锛屾爣棰樼敤浜庢悳绱㈡潯浠堕殣钘忔椂锛堝綋鍚敤榛戝悕鍗曪紝鐧诲綍鐢ㄦ埛鏃犳潈闄愭椂锛夋樉绀恒��',
+ // tooltip: '浣跨敤鎼滅储妗嗘椂锛屾爣棰樼敤浜庢悳绱㈡潯浠堕殣钘忔椂锛堝綋鍚敤榛戝悕鍗曪紝鐧诲綍鐢ㄦ埛鏃犳潈闄愭椂锛夋樉绀恒�傛敞锛欯username浠ｈ〃鐢ㄦ埛鍚嶏紝@fullname浠ｈ〃濮撳悕銆�',
+ tooltip: '娉細@username浠ｈ〃鐢ㄦ埛鍚嶏紝@fullname浠ｈ〃濮撳悕锛孈appname浠ｈ〃搴旂敤鍚嶃��',
required: false
},
{
- type: 'radio',
- field: 'menuPosition',
- label: '鑿滃崟浣嶇疆',
- initval: wrap.menuPosition || 'right',
- tooltip: '鑷畾涔夎彍鍗曠殑浣嶇疆銆�',
+ type: 'checkbox',
+ field: 'funs',
+ label: '鎵╁睍鍔熻兘',
+ tooltip: '1銆佽繑鍥炰笂涓�椤碉紱2銆佺粦瀹氬叕浼楀彿鍚庡彲鍒嗕韩褰撳墠椤甸潰锛�3銆佷簩缁寸爜浠モ�渓ogin鈥濆紑澶存椂涓烘壂鐮佺櫥褰曪紝浜岀淮鐮佷互鈥渉ttp鈥濆紑澶翠负椤甸潰璺宠浆锛屼簩缁寸爜浠モ�渕kbid鈥濆紑澶翠负鑿滃崟璺宠浆锛屼笖璁剧疆鏈夊叧鑱旇彍鍗曪紱4銆佸綋鍓嶉〉闈㈠埛鏂帮紱5銆侀��鍑虹郴缁燂紝杩斿洖绗竴涓〉闈€��',
+ initval: funs,
required: false,
options: [
- {value: 'left', label: '宸︿晶'},
- {value: 'right', label: '鍙充晶'},
+ {value: 'back', label: '杩斿洖'},
+ {value: 'scan', label: '鎵竴鎵�'},
+ {value: 'resetPwd', label: '淇敼瀵嗙爜'},
+ {value: 'refresh', label: '鍒锋柊'},
+ {value: 'logout', label: '閫�鍑�'},
],
controlFields: [
- {field: 'back', values: ['right']},
- ]
+ {field: 'reload', values: ['back']},
+ {field: 'linkmenu', values: ['scan']},
+ {field: 'prefix', values: ['scan']},
+ ],
+ span: 24
},
{
type: 'radio',
- field: 'back',
- label: '杩斿洖',
- initval: wrap.back || 'true',
+ field: 'mode',
+ label: '寮规鑳屾櫙',
+ initval: wrap.mode || 'dark',
+ tooltip: '褰撳瓨鍦ㄦ墿灞曞姛鑳芥垨鑷畾涔夎彍鍗曟椂锛屽睍绀哄搴斾俊鎭脊绐楃殑鑳屾櫙棰滆壊銆�',
required: false,
options: [
- {value: 'true', label: '鏄剧ず'},
- {value: 'false', label: '闅愯棌'},
- ],
- controlFields: [
- {field: 'reload', values: ['true']},
+ {value: 'light', label: '鐧借壊'},
+ {value: 'dark', label: '榛戣壊'},
]
},
// {
// type: 'radio',
- // field: 'search',
- // label: '鎼滅储',
- // initval: wrap.search || 'false',
+ // field: 'back',
+ // label: '杩斿洖',
+ // initval: wrap.back || 'true',
+ // required: false,
+ // options: [
+ // {value: 'true', label: '鏄剧ず'},
+ // {value: 'false', label: '闅愯棌'},
+ // ],
+ // controlFields: [
+ // {field: 'reload', values: ['true']},
+ // ]
+ // },
+ // {
+ // type: 'radio',
+ // field: 'logout',
+ // label: '閫�鍑�',
+ // initval: wrap.logout || 'false',
+ // tooltip: '鐐瑰嚮閫�鍑烘椂锛岃繑鍥炵涓�涓〉闈€��',
// required: false,
// options: [
// {value: 'true', label: '鏄剧ず'},
// {value: 'false', label: '闅愯棌'},
// ]
// },
- {
- type: 'radio',
- field: 'logout',
- label: '閫�鍑�',
- initval: wrap.logout || 'false',
- tooltip: '鐐瑰嚮閫�鍑烘椂锛岃繑鍥炵涓�涓〉闈€��',
- required: false,
- options: [
- {value: 'true', label: '鏄剧ず'},
- {value: 'false', label: '闅愯棌'},
- ]
- },
- {
- type: 'radio',
- field: 'scan',
- label: '鎵竴鎵�',
- initval: wrap.scan || 'false',
- tooltip: '绯荤粺鍔熻兘锛�1銆佹壂鐮佺櫥褰曪紝浜岀淮鐮佷互鈥渓ogin鈥濆紑澶达紝2銆侀〉闈㈣烦杞紝浜岀淮鐮佷互鈥渉ttp鈥濆紑澶达紝3銆佽彍鍗曡烦杞紝浜岀淮鐮佷互鈥渕kbid鈥濆紑澶达紝涓旇缃叧鑱旇彍鍗�',
- required: false,
- options: [
- {value: 'true', label: '鏄剧ず'},
- {value: 'false', label: '闅愯棌'},
- ],
- controlFields: [
- {field: 'linkmenu', values: ['true']},
- ]
- },
- {
- type: 'radio',
- field: 'refresh',
- label: '鍒锋柊',
- initval: wrap.refresh || 'false',
- required: false,
- options: [
- {value: 'true', label: '鏄剧ず'},
- {value: 'false', label: '闅愯棌'},
- ]
- },
+ // {
+ // type: 'radio',
+ // field: 'scan',
+ // label: '鎵竴鎵�',
+ // initval: wrap.scan || 'false',
+ // tooltip: '绯荤粺鍔熻兘锛�1銆佹壂鐮佺櫥褰曪紝浜岀淮鐮佷互鈥渓ogin鈥濆紑澶达紝2銆侀〉闈㈣烦杞紝浜岀淮鐮佷互鈥渉ttp鈥濆紑澶达紝3銆佽彍鍗曡烦杞紝浜岀淮鐮佷互鈥渕kbid鈥濆紑澶达紝涓旇缃叧鑱旇彍鍗�',
+ // required: false,
+ // options: [
+ // {value: 'true', label: '鏄剧ず'},
+ // {value: 'false', label: '闅愯棌'},
+ // ],
+ // controlFields: [
+ // {field: 'linkmenu', values: ['true']},
+ // ]
+ // },
+ // {
+ // type: 'radio',
+ // field: 'refresh',
+ // label: '鍒锋柊',
+ // initval: wrap.refresh || 'false',
+ // required: false,
+ // options: [
+ // {value: 'true', label: '鏄剧ず'},
+ // {value: 'false', label: '闅愯棌'},
+ // ]
+ // },
{
type: 'radio',
field: 'reload',
@@ -138,17 +171,6 @@
}]
},
{
- type: 'radio',
- field: 'mode',
- label: '寮规鑳屾櫙',
- initval: wrap.mode || 'dark',
- required: false,
- options: [
- {value: 'light', label: '鐧借壊'},
- {value: 'dark', label: '榛戣壊'},
- ]
- },
- {
type: 'select',
field: 'linkmenu',
label: '鍏宠仈鑿滃崟',
@@ -158,12 +180,47 @@
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: '鑷畾涔夎彍鍗曚綅缃�',
+ initval: wrap.menuPosition || 'right',
+ tooltip: '鑷畾涔夎彍鍗曠殑浣嶇疆銆傛敞锛氳彍鍗曚綅浜庡乏渚ф椂浼氭樉绀哄ご鍍忥紝涓旇繑鍥炲姛鑳借绂佺敤銆�',
+ required: false,
+ options: [
+ {value: 'left', label: '宸︿晶'},
+ {value: 'right', label: '鍙充晶'},
+ ]
+ },
+ {
type: 'table',
field: 'menus',
label: '鑷畾涔夎彍鍗�',
initval: wrap.menus || [],
required: false,
span: 24,
+ actions: ['edit', 'del', 'add', 'move', 'view'],
+ tip: <span style={{fontSize: '12px', color: '#959595', position: 'relative', top: '-8px'}}>褰撲娇鐢ㄥ浘鏍�<MkIcon type="user"/>锛屼笖鍙充晶鍙湁涓�涓彍鍗曟椂锛屼細鏄剧ず鐢ㄦ埛澶村儚銆�</span>,
columns: [
{
title: '鍥炬爣',
@@ -172,7 +229,15 @@
editable: true,
required: true,
render: (text, record) => <MkIcon type={text}/>,
- width: '35%'
+ width: '23%'
+ },
+ {
+ title: '鑷畾涔夊悕绉�',
+ dataIndex: 'name',
+ inputType: 'text',
+ editable: true,
+ required: false,
+ width: '23%'
},
{
title: '鑿滃崟',
@@ -181,7 +246,7 @@
editable: true,
required: true,
extends: [{key: 'label', value: 'label'}],
- width: '35%',
+ width: '23%',
render: (text, record) => record.label,
options: menulist
}
--
Gitblit v1.8.0