Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
fgqyxxlr
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
yaru
fgqyxxlr
Commits
dcbc77b4
Commit
dcbc77b4
authored
Mar 30, 2020
by
RuoYi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复更多操作部分浏览器不兼容情况
parent
1e6b78c3
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
19 additions
and
22 deletions
+19
-22
ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
+15
-18
ruoyi-admin/src/main/resources/templates/index.html
+1
-1
ruoyi-admin/src/main/resources/templates/system/role/role.html
+1
-1
ruoyi-admin/src/main/resources/templates/system/user/user.html
+1
-1
ruoyi-quartz/src/main/resources/templates/monitor/job/job.html
+1
-1
No files found.
ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
View file @
dcbc77b4
...
...
@@ -260,24 +260,21 @@ var table = {
// 浮动提示框特效
$
(
".table [data-toggle='tooltip']"
).
tooltip
();
// 气泡弹出框特效
$
(
'.table [data-toggle="popover"]'
).
each
(
function
()
{
$
(
this
).
popover
({
trigger
:
"manual"
,
html
:
true
,
animation
:
false
,
container
:
"body"
,
placement
:
"left"
}).
on
(
"mouseenter"
,
function
()
{
var
_this
=
this
;
$
(
this
).
popover
(
"show"
);
$
(
".popover"
).
on
(
"mouseleave"
,
function
()
{
$
(
_this
).
popover
(
'hide'
);
});
}).
on
(
"mouseleave"
,
function
()
{
var
_this
=
this
;
setTimeout
(
function
()
{
if
(
!
$
(
".popover:hover"
).
length
)
$
(
_this
).
popover
(
"hide"
);
},
100
);
});
// 气泡弹出框特效(移到元素时)
$
(
document
).
on
(
"mouseenter"
,
'.table [data-toggle="popover"]'
,
function
()
{
var
_this
=
this
;
$
(
this
).
popover
(
"show"
);
$
(
".popover"
).
on
(
"mouseleave"
,
function
()
{
$
(
_this
).
popover
(
'hide'
);
});
})
// 气泡弹出框特效(离开元素时)
$
(
document
).
on
(
"mouseleave"
,
'.table [data-toggle="popover"]'
,
function
()
{
var
_this
=
this
;
setTimeout
(
function
()
{
if
(
!
$
(
".popover:hover"
).
length
)
$
(
_this
).
popover
(
"hide"
);
},
100
);
});
},
// 表格销毁
...
...
ruoyi-admin/src/main/resources/templates/index.html
View file @
dcbc77b4
...
...
@@ -147,7 +147,7 @@
</ul>
</li>
<li>
<a
href=
"#"
><i
class=
"fa fa-sitemap"
></i>
<span
class=
"nav-label"
>
四层菜单
</span>
<span
class=
"fa arrow"
></span></a>
<a
href=
"#"
><i
class=
"fa fa-sitemap"
></i>
四层菜单
<span
class=
"fa arrow"
></span></a>
<ul
class=
"nav nav-second-level collapse"
>
<li>
<a
href=
"#"
id=
"damian"
>
三级菜单1
<span
class=
"fa arrow"
></span></a>
...
...
ruoyi-admin/src/main/resources/templates/system/role/role.html
View file @
dcbc77b4
...
...
@@ -118,7 +118,7 @@
var
more
=
[];
more
.
push
(
"<a class='btn btn-default btn-xs "
+
editFlag
+
"' href='javascript:void(0)' onclick='authDataScope("
+
row
.
roleId
+
")'><i class='fa fa-check-square-o'></i>数据权限</a> "
);
more
.
push
(
"<a class='btn btn-default btn-xs "
+
editFlag
+
"' href='javascript:void(0)' onclick='authUser("
+
row
.
roleId
+
")'><i class='fa fa-user'></i>分配用户</a>"
);
actions
.
push
(
'<a
class="btn btn-info btn-xs" role="button" data-toggle="pop
over" data-content="'
+
more
.
join
(
''
)
+
'"><i class="fa fa-chevron-circle-right"></i>更多操作</a>'
);
actions
.
push
(
'<a
tabindex="0" class="btn btn-info btn-xs" role="button" data-container="body" data-placement="left" data-toggle="popover" data-html="true" data-trigger="h
over" data-content="'
+
more
.
join
(
''
)
+
'"><i class="fa fa-chevron-circle-right"></i>更多操作</a>'
);
return
actions
.
join
(
''
);
}
}]
...
...
ruoyi-admin/src/main/resources/templates/system/user/user.html
View file @
dcbc77b4
...
...
@@ -169,7 +169,7 @@
var
more
=
[];
more
.
push
(
"<a class='btn btn-default btn-xs "
+
resetPwdFlag
+
"' href='javascript:void(0)' onclick='resetPwd("
+
row
.
userId
+
")'><i class='fa fa-key'></i>重置密码</a> "
);
more
.
push
(
"<a class='btn btn-default btn-xs "
+
editFlag
+
"' href='javascript:void(0)' onclick='authRole("
+
row
.
userId
+
")'><i class='fa fa-check-square-o'></i>分配角色</a>"
);
actions
.
push
(
'<a
class="btn btn-info btn-xs" role="button" data-toggle="pop
over" data-content="'
+
more
.
join
(
''
)
+
'"><i class="fa fa-chevron-circle-right"></i>更多操作</a>'
);
actions
.
push
(
'<a
tabindex="0" class="btn btn-info btn-xs" role="button" data-container="body" data-placement="left" data-toggle="popover" data-html="true" data-trigger="h
over" data-content="'
+
more
.
join
(
''
)
+
'"><i class="fa fa-chevron-circle-right"></i>更多操作</a>'
);
return
actions
.
join
(
''
);
}
}]
...
...
ruoyi-quartz/src/main/resources/templates/monitor/job/job.html
View file @
dcbc77b4
...
...
@@ -130,7 +130,7 @@
more
.
push
(
"<a class='btn btn-default btn-xs "
+
statusFlag
+
"' href='javascript:void(0)' onclick='run("
+
row
.
jobId
+
")'><i class='fa fa-play-circle-o'></i> 执行一次</a> "
);
more
.
push
(
"<a class='btn btn-default btn-xs "
+
detailFlag
+
"' href='javascript:void(0)' onclick='$.operate.detail("
+
row
.
jobId
+
")'><i class='fa fa-search'></i>任务详细</a> "
);
more
.
push
(
"<a class='btn btn-default btn-xs "
+
detailFlag
+
"' href='javascript:void(0)' onclick='jobLog("
+
row
.
jobId
+
")'><i class='fa fa-list'></i>调度日志</a>"
);
actions
.
push
(
'<a class="btn btn-info btn-xs" role="button" data-
toggle="pop
over" data-content="'
+
more
.
join
(
''
)
+
'"><i class="fa fa-chevron-circle-right"></i>更多操作</a>'
);
actions
.
push
(
'<a class="btn btn-info btn-xs" role="button" data-
container="body" data-placement="left" data-toggle="popover" data-html="true" data-trigger="h
over" data-content="'
+
more
.
join
(
''
)
+
'"><i class="fa fa-chevron-circle-right"></i>更多操作</a>'
);
return
actions
.
join
(
''
);
}
}]
...
...
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