github
/
RuoYi
mirror of https://gitee.com/y_project/RuoYi.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

新增表格检索折叠按钮

pull/28/MERGE
RuoYi 2018-10-01 21:32:01 +08:00
parent 4425b81e6d
commit fffeef3db5
19 changed files with 639 additions and 638 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1234
sql/ry_20180903.sql → sql/ry_20181001.sql
View File

File diff suppressed because it is too large Load Diff

4
src/main/resources/static/ajax/libs/bootstrap-table/bootstrap-table.min.js vendored
View File

File diff suppressed because one or more lines are too long

8
src/main/resources/static/ruoyi/css/ry-ui.css
View File

@ -311,7 +311,7 @@ label {
height: 100%;
}
.select-info,.select-table {
.search-collapse,.select-table {
width: 100%;
background: #fff;
border-radius: 6px;
@ -321,16 +321,16 @@ label {
box-shadow: 1px 1px 3px rgba(0,0,0,.2);
}
.select-info {
.search-collapse {
position: relative;
}
.select-info .col-sm-6 .control-label {
.search-collapse .col-sm-6 .control-label {
color: #333;
}
@media ( max-width : 768px) {
.select-info {
.search-collapse {
display: none;
}
}

1
src/main/resources/static/ruoyi/js/ry-ui.js
View File

@ -33,6 +33,7 @@
toolbar: '#toolbar', // 指定工作栏
sidePagination: "server", // 启用服务端分页
search: $.common.visible(options.search), // 是否显示搜索框功能
showSearch: $.common.visible(options.showSearch), // 是否显示检索信息
showRefresh: $.common.visible(options.showRefresh), // 是否显示刷新按钮
showColumns: $.common.visible(options.showColumns), // 是否显示隐藏某列下拉框
showToggle: $.common.visible(options.showToggle), // 是否显示详细视图和列表视图的切换按钮

2
src/main/resources/templates/monitor/job/job.html
View File

@ -7,7 +7,7 @@
<div class="container-div">
<div class="row">
<div class="col-sm-12 select-info">
<div class="col-sm-12 search-collapse">
<form id="job-form">
<div class="select-list">
<ul>

2
src/main/resources/templates/monitor/job/jobLog.html
View File

@ -7,7 +7,7 @@
<div class="container-div">
<div class="row">
<div class="col-sm-12 select-info">
<div class="col-sm-12 search-collapse">
<form id="jobLog-form">
<div class="select-list">
<ul>

2
src/main/resources/templates/monitor/logininfor/logininfor.html
View File

@ -7,7 +7,7 @@
<div class="container-div">
<div class="row">
<div class="col-sm-12 select-info">
<div class="col-sm-12 search-collapse">
<form id="logininfor-form">
<div class="select-list">
<ul>

2
src/main/resources/templates/monitor/online/online.html
View File

@ -7,7 +7,7 @@
<div class="container-div">
<div class="row">
<div class="col-sm-12 select-info">
<div class="col-sm-12 search-collapse">
<form id="online-form">
<div class="select-list">
<ul>

2
src/main/resources/templates/monitor/operlog/operlog.html
View File

@ -7,7 +7,7 @@
<div class="container-div">
<div class="row">
<div class="col-sm-12 select-info">
<div class="col-sm-12 search-collapse">
<form id="operlog-form">
<div class="select-list">
<ul>

2
src/main/resources/templates/system/config/config.html
View File

@ -6,7 +6,7 @@
<div class="container-div">
<div class="row">
<div class="col-sm-12 select-info">
<div class="col-sm-12 search-collapse">
<form id="config-form">
<div class="select-list">
<ul>

2
src/main/resources/templates/system/dept/dept.html
View File

@ -6,7 +6,7 @@
<body class="gray-bg">
<div class="container-div">
<div class="row">
<div class="col-sm-12 select-info">
<div class="col-sm-12 search-collapse">
<form id="dept-form">
<div class="select-list">
<ul>

2
src/main/resources/templates/system/dict/data/data.html
View File

@ -7,7 +7,7 @@
<div class="container-div">
<div class="row">
<div class="col-sm-12 select-info">
<div class="col-sm-12 search-collapse">
<form id="data-form">
<div class="select-list">
<ul>

2
src/main/resources/templates/system/dict/type/type.html
View File

@ -7,7 +7,7 @@
<div class="container-div">
<div class="row">
<div class="col-sm-12 select-info">
<div class="col-sm-12 search-collapse">
<form id="type-form">
<div class="select-list">
<ul>

2
src/main/resources/templates/system/menu/menu.html
View File

@ -6,7 +6,7 @@
<div class="container-div">
<div class="row">
<div class="col-sm-12 select-info">
<div class="col-sm-12 search-collapse">
<form id="menu-form">
<div class="select-list">
<ul>

2
src/main/resources/templates/system/notice/notice.html
View File

@ -6,7 +6,7 @@
<div class="container-div">
<div class="row">
<div class="col-sm-12 select-info">
<div class="col-sm-12 search-collapse">
<form id="notice-form">
<div class="select-list">
<ul>

2
src/main/resources/templates/system/post/post.html
View File

@ -7,7 +7,7 @@
<div class="container-div">
<div class="row">
<div class="col-sm-12 select-info">
<div class="col-sm-12 search-collapse">
<form id="post-form">
<div class="select-list">
<ul>

2
src/main/resources/templates/system/role/role.html
View File

@ -7,7 +7,7 @@
<div class="container-div">
<div class="row">
<div class="col-sm-12 select-info">
<div class="col-sm-12 search-collapse">
<form id="role-form">
<div class="select-list">
<ul>

2
src/main/resources/templates/system/user/user.html
View File

@ -30,7 +30,7 @@
<div class="container-div ui-layout-center">
<div class="row">
<div class="col-sm-12 select-info">
<div class="col-sm-12 search-collapse">
<form id="user-form">
<input type="hidden" id="deptId" name="deptId">
<input type="hidden" id="parentId" name="parentId">

2
src/main/resources/templates/tool/gen/gen.html
View File

@ -6,7 +6,7 @@
<div class="container-div">
<div class="row">
<div class="col-sm-12 select-info">
<div class="col-sm-12 search-collapse">
<form id="gen-form">
<div class="select-list">
<ul>