Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
guns-vip
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
chenjunxiong
guns-vip
Commits
bed224c8
Commit
bed224c8
authored
Jul 01, 2019
by
fengshuonan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
更新菜单图标可以选择
parent
af888f48
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
40 additions
and
7 deletions
+40
-7
guns-sys/src/main/webapp/assets/common/js/common.js
+2
-1
guns-sys/src/main/webapp/assets/expand/module/iconPicker/iconPicker.js
+0
-0
guns-sys/src/main/webapp/assets/modular/system/menu/menu_add.js
+16
-1
guns-sys/src/main/webapp/assets/modular/system/menu/menu_edit.js
+18
-1
guns-sys/src/main/webapp/pages/common/_sidebar.html
+2
-2
guns-sys/src/main/webapp/pages/modular/system/menu/menu_add.html
+1
-1
guns-sys/src/main/webapp/pages/modular/system/menu/menu_edit.html
+1
-1
No files found.
guns-sys/src/main/webapp/assets/common/js/common.js
View file @
bed224c8
...
...
@@ -101,7 +101,8 @@ layui.config({
zTree
:
'zTree/zTree'
,
selectPlus
:
'../../expand/module/selectPlus/selectPlus'
,
ax
:
'../../expand/module/ax/ax'
,
ztree
:
'../../expand/module/ztree/ztree-object'
ztree
:
'../../expand/module/ztree/ztree-object'
,
iconPicker
:
'../../expand/module/iconPicker/iconPicker'
}).
use
([
'admin'
],
function
()
{
var
$
=
layui
.
jquery
;
var
admin
=
layui
.
admin
;
...
...
guns-sys/src/main/webapp/assets/expand/module/iconPicker/iconPicker.js
0 → 100755
View file @
bed224c8
This diff is collapsed.
Click to expand it.
guns-sys/src/main/webapp/assets/modular/system/menu/menu_add.js
View file @
bed224c8
...
...
@@ -8,13 +8,14 @@ var MenuInfoDlg = {
}
};
layui
.
use
([
'layer'
,
'form'
,
'admin'
,
'laydate'
,
'ax'
],
function
()
{
layui
.
use
([
'layer'
,
'form'
,
'admin'
,
'laydate'
,
'ax'
,
'iconPicker'
],
function
()
{
var
$
=
layui
.
jquery
;
var
$ax
=
layui
.
ax
;
var
form
=
layui
.
form
;
var
admin
=
layui
.
admin
;
var
laydate
=
layui
.
laydate
;
var
layer
=
layui
.
layer
;
var
iconPicker
=
layui
.
iconPicker
;
// 点击父级菜单
$
(
'#pcodeName'
).
click
(
function
()
{
...
...
@@ -56,4 +57,17 @@ layui.use(['layer', 'form', 'admin', 'laydate', 'ax'], function () {
$
(
"#backupPage"
).
click
(
function
()
{
window
.
location
.
href
=
Feng
.
ctxPath
+
"/menu"
;
});
//初始化图标选择
iconPicker
.
render
({
elem
:
'#icon'
,
type
:
'fontClass'
,
search
:
true
,
page
:
true
,
limit
:
48
,
click
:
function
(
data
)
{
}
});
iconPicker
.
checkIcon
(
'iconPicker'
,
'layui-icon-star-fill'
);
});
\ No newline at end of file
guns-sys/src/main/webapp/assets/modular/system/menu/menu_edit.js
View file @
bed224c8
...
...
@@ -8,13 +8,14 @@ var MenuInfoDlg = {
}
};
layui
.
use
([
'layer'
,
'form'
,
'admin'
,
'laydate'
,
'ax'
],
function
()
{
layui
.
use
([
'layer'
,
'form'
,
'admin'
,
'laydate'
,
'ax'
,
'iconPicker'
],
function
()
{
var
$
=
layui
.
jquery
;
var
$ax
=
layui
.
ax
;
var
form
=
layui
.
form
;
var
admin
=
layui
.
admin
;
var
laydate
=
layui
.
laydate
;
var
layer
=
layui
.
layer
;
var
iconPicker
=
layui
.
iconPicker
;
//获取菜单信息
var
ajax
=
new
$ax
(
Feng
.
ctxPath
+
"/menu/getMenuInfo?menuId="
+
Feng
.
getUrlParam
(
"menuId"
));
...
...
@@ -56,8 +57,23 @@ layui.use(['layer', 'form', 'admin', 'laydate', 'ax'], function () {
//添加 return false 可成功跳转页面
return
false
;
});
//返回按钮
$
(
"#backupPage"
).
click
(
function
()
{
window
.
location
.
href
=
Feng
.
ctxPath
+
"/menu"
;
});
//初始化图标选择
iconPicker
.
render
({
elem
:
'#icon'
,
type
:
'fontClass'
,
search
:
true
,
page
:
true
,
limit
:
12
,
click
:
function
(
data
)
{
}
});
iconPicker
.
checkIcon
(
'iconPicker'
,
result
.
data
.
icon
);
});
\ No newline at end of file
guns-sys/src/main/webapp/pages/common/_sidebar.html
View file @
bed224c8
...
...
@@ -5,11 +5,11 @@
@for(menu in menus) {
@if(tool.isEmpty(menu.children)){
<li
class=
"layui-nav-item"
>
<a
lay-href=
"${menu.url}"
><i
class=
"${menu.icon}"
></i>
 
<cite>
${menu.name}
</cite></a>
<a
lay-href=
"${menu.url}"
><i
class=
"
layui-icon
${menu.icon}"
></i>
 
<cite>
${menu.name}
</cite></a>
</li>
@}else{
<li
class=
"layui-nav-item"
>
<a><i
class=
"${menu.icon}"
></i>
 
<cite>
${menu.name}
</cite></a>
<a><i
class=
"
layui-icon
${menu.icon}"
></i>
 
<cite>
${menu.name}
</cite></a>
<dl
class=
"layui-nav-child"
>
@for(subMenu in menu.children){
@if(tool.isEmpty(subMenu.children)){
...
...
guns-sys/src/main/webapp/pages/modular/system/menu/menu_add.html
View file @
bed224c8
...
...
@@ -49,7 +49,7 @@
<div
class=
"layui-form-item"
>
<label
class=
"layui-form-label"
>
图标
</label>
<div
class=
"layui-input-block"
>
<input
name=
"icon"
placeholder=
"请输入图标
"
type=
"text"
class=
"layui-input"
/>
<input
name=
"icon"
id=
"icon"
placeholder=
"请输入图标"
lay-filter=
"iconPicker
"
type=
"text"
class=
"layui-input"
/>
</div>
</div>
<div
class=
"layui-form-item"
>
...
...
guns-sys/src/main/webapp/pages/modular/system/menu/menu_edit.html
View file @
bed224c8
...
...
@@ -49,7 +49,7 @@
<div
class=
"layui-form-item"
>
<label
class=
"layui-form-label"
>
图标
</label>
<div
class=
"layui-input-block"
>
<input
name=
"icon"
placeholder=
"请输入图标
"
type=
"text"
class=
"layui-input"
/>
<input
name=
"icon"
id=
"icon"
placeholder=
"请输入图标"
lay-filter=
"iconPicker
"
type=
"text"
class=
"layui-input"
/>
</div>
</div>
<div
class=
"layui-form-item"
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment