Home Explore Help
Register Sign In
sunwei
/
education_nanguan
Watch 1
Star 0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

新增表格检索折叠按钮

RuoYi 6 years ago
parent
4425b81e6d
commit
fffeef3db5
19 changed files with 639 additions and 538 deletions
Unified View Show Diff Stats
  1. 617 517
      sql/ry_20180903.sql
  2. 2 2
      src/main/resources/static/ajax/libs/bootstrap-table/bootstrap-table.min.js
  3. 4 4
      src/main/resources/static/ruoyi/css/ry-ui.css
  4. 1 0
      src/main/resources/static/ruoyi/js/ry-ui.js
  5. 1 1
      src/main/resources/templates/monitor/job/job.html
  6. 1 1
      src/main/resources/templates/monitor/job/jobLog.html
  7. 1 1
      src/main/resources/templates/monitor/logininfor/logininfor.html
  8. 1 1
      src/main/resources/templates/monitor/online/online.html
  9. 1 1
      src/main/resources/templates/monitor/operlog/operlog.html
  10. 1 1
      src/main/resources/templates/system/config/config.html
  11. 1 1
      src/main/resources/templates/system/dept/dept.html
  12. 1 1
      src/main/resources/templates/system/dict/data/data.html
  13. 1 1
      src/main/resources/templates/system/dict/type/type.html
  14. 1 1
      src/main/resources/templates/system/menu/menu.html
  15. 1 1
      src/main/resources/templates/system/notice/notice.html
  16. 1 1
      src/main/resources/templates/system/post/post.html
  17. 1 1
      src/main/resources/templates/system/role/role.html
  18. 1 1
      src/main/resources/templates/system/user/user.html
  19. 1 1
      src/main/resources/templates/tool/gen/gen.html

File diff suppressed because it is too large
+ 617 - 517
sql/ry_20180903.sql


File diff suppressed because it is too large
+ 2 - 2
src/main/resources/static/ajax/libs/bootstrap-table/bootstrap-table.min.js


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

@@ -311,7 +311,7 @@ label {
 
 	height: 100%;

 	height: 100%;

 }

 }

 

 

-.select-info,.select-table {

+.search-collapse,.select-table {

 	width: 100%;

 	width: 100%;

 	background: #fff;

 	background: #fff;

 	border-radius: 6px;

 	border-radius: 6px;

@@ -321,16 +321,16 @@ label {
 
 	box-shadow: 1px 1px 3px rgba(0,0,0,.2);

 	box-shadow: 1px 1px 3px rgba(0,0,0,.2);

 }

 }

 

 

-.select-info {

+.search-collapse {

 	position: relative;

 	position: relative;

 }

 }

 

 

-.select-info .col-sm-6 .control-label {

+.search-collapse .col-sm-6 .control-label {

 	color: #333;

 	color: #333;

 }

 }

 

 

 @media ( max-width : 768px) {

 @media ( max-width : 768px) {

-	.select-info {

+	.search-collapse {

 		display: none;

 		display: none;

 	}

 	}

 }

 }

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

@@ -33,6 +33,7 @@
 
         	        toolbar: '#toolbar',                                // 指定工作栏

         	        toolbar: '#toolbar',                                // 指定工作栏

                     sidePagination: "server",                           // 启用服务端分页 

                     sidePagination: "server",                           // 启用服务端分页 

                     search: $.common.visible(options.search),           // 是否显示搜索框功能

                     search: $.common.visible(options.search),           // 是否显示搜索框功能

+                    showSearch: $.common.visible(options.showSearch),   // 是否显示检索信息

                     showRefresh: $.common.visible(options.showRefresh), // 是否显示刷新按钮

                     showRefresh: $.common.visible(options.showRefresh), // 是否显示刷新按钮

         			showColumns: $.common.visible(options.showColumns), // 是否显示隐藏某列下拉框

         			showColumns: $.common.visible(options.showColumns), // 是否显示隐藏某列下拉框

         			showToggle: $.common.visible(options.showToggle),   // 是否显示详细视图和列表视图的切换按钮

         			showToggle: $.common.visible(options.showToggle),   // 是否显示详细视图和列表视图的切换按钮

+ 1 - 1
src/main/resources/templates/monitor/job/job.html
View File 

@@ -7,7 +7,7 @@
 
 	

 	

 	<div class="container-div">

 	<div class="container-div">

 		<div class="row">

 		<div class="row">

-			<div class="col-sm-12 select-info">

+			<div class="col-sm-12 search-collapse">

 				<form id="job-form">

 				<form id="job-form">

 					<div class="select-list">

 					<div class="select-list">

 						<ul>

 						<ul>

+ 1 - 1
src/main/resources/templates/monitor/job/jobLog.html
View File 

@@ -7,7 +7,7 @@
 
 

 

 	<div class="container-div">

 	<div class="container-div">

 		<div class="row">

 		<div class="row">

-			<div class="col-sm-12 select-info">

+			<div class="col-sm-12 search-collapse">

 				<form id="jobLog-form">

 				<form id="jobLog-form">

 					<div class="select-list">

 					<div class="select-list">

 						<ul>

 						<ul>

+ 1 - 1
src/main/resources/templates/monitor/logininfor/logininfor.html
View File 

@@ -7,7 +7,7 @@
 
 

 

 	<div class="container-div">

 	<div class="container-div">

 		<div class="row">

 		<div class="row">

-			<div class="col-sm-12 select-info">

+			<div class="col-sm-12 search-collapse">

 				<form id="logininfor-form">

 				<form id="logininfor-form">

 					<div class="select-list">

 					<div class="select-list">

 						<ul>

 						<ul>

+ 1 - 1
src/main/resources/templates/monitor/online/online.html
View File 

@@ -7,7 +7,7 @@
 
 

 

     <div class="container-div">

     <div class="container-div">

 		<div class="row">

 		<div class="row">

-			<div class="col-sm-12 select-info">

+			<div class="col-sm-12 search-collapse">

 				<form id="online-form">

 				<form id="online-form">

 					<div class="select-list">

 					<div class="select-list">

 						<ul>

 						<ul>

+ 1 - 1
src/main/resources/templates/monitor/operlog/operlog.html
View File 

@@ -7,7 +7,7 @@
 
 	

 	

 	<div class="container-div">

 	<div class="container-div">

 		<div class="row">

 		<div class="row">

-			<div class="col-sm-12 select-info">

+			<div class="col-sm-12 search-collapse">

 				<form id="operlog-form">

 				<form id="operlog-form">

 					<div class="select-list">

 					<div class="select-list">

 						<ul>

 						<ul>

+ 1 - 1
src/main/resources/templates/system/config/config.html
View File 

@@ -6,7 +6,7 @@
 
     

     

      <div class="container-div">

      <div class="container-div">

 		<div class="row">

 		<div class="row">

-			<div class="col-sm-12 select-info">

+			<div class="col-sm-12 search-collapse">

 				<form id="config-form">

 				<form id="config-form">

 					<div class="select-list">

 					<div class="select-list">

 						<ul>

 						<ul>

+ 1 - 1
src/main/resources/templates/system/dept/dept.html
View File 

@@ -6,7 +6,7 @@
 
 <body class="gray-bg">

 <body class="gray-bg">

 	<div class="container-div">

 	<div class="container-div">

 		<div class="row">

 		<div class="row">

-			<div class="col-sm-12 select-info">

+			<div class="col-sm-12 search-collapse">

 				<form id="dept-form">

 				<form id="dept-form">

 					<div class="select-list">

 					<div class="select-list">

 						<ul>

 						<ul>

+ 1 - 1
src/main/resources/templates/system/dict/data/data.html
View File 

@@ -7,7 +7,7 @@
 
 	

 	

 	<div class="container-div">

 	<div class="container-div">

 		<div class="row">

 		<div class="row">

-			<div class="col-sm-12 select-info">

+			<div class="col-sm-12 search-collapse">

 				<form id="data-form">

 				<form id="data-form">

 					<div class="select-list">

 					<div class="select-list">

 						<ul>

 						<ul>

+ 1 - 1
src/main/resources/templates/system/dict/type/type.html
View File 

@@ -7,7 +7,7 @@
 
 	

 	

 	<div class="container-div">

 	<div class="container-div">

 		<div class="row">

 		<div class="row">

-			<div class="col-sm-12 select-info">

+			<div class="col-sm-12 search-collapse">

 				<form id="type-form">

 				<form id="type-form">

 					<div class="select-list">

 					<div class="select-list">

 						<ul>

 						<ul>

+ 1 - 1
src/main/resources/templates/system/menu/menu.html
View File 

@@ -6,7 +6,7 @@
 
 

 

     <div class="container-div">

     <div class="container-div">

 		<div class="row">

 		<div class="row">

-			<div class="col-sm-12 select-info">

+			<div class="col-sm-12 search-collapse">

 				<form id="menu-form">

 				<form id="menu-form">

 					<div class="select-list">

 					<div class="select-list">

 						<ul>

 						<ul>

+ 1 - 1
src/main/resources/templates/system/notice/notice.html
View File 

@@ -6,7 +6,7 @@
 
     

     

     <div class="container-div">

     <div class="container-div">

 		<div class="row">

 		<div class="row">

-			<div class="col-sm-12 select-info">

+			<div class="col-sm-12 search-collapse">

 				<form id="notice-form">

 				<form id="notice-form">

 					<div class="select-list">

 					<div class="select-list">

 						<ul>

 						<ul>

+ 1 - 1
src/main/resources/templates/system/post/post.html
View File 

@@ -7,7 +7,7 @@
 
 	

 	

 	<div class="container-div">

 	<div class="container-div">

 		<div class="row">

 		<div class="row">

-			<div class="col-sm-12 select-info">

+			<div class="col-sm-12 search-collapse">

 				<form id="post-form">

 				<form id="post-form">

 					<div class="select-list">

 					<div class="select-list">

 						<ul>

 						<ul>

+ 1 - 1
src/main/resources/templates/system/role/role.html
View File 

@@ -7,7 +7,7 @@
 
 	

 	

 	<div class="container-div">

 	<div class="container-div">

 		<div class="row">

 		<div class="row">

-			<div class="col-sm-12 select-info">

+			<div class="col-sm-12 search-collapse">

 				<form id="role-form">

 				<form id="role-form">

 					<div class="select-list">

 					<div class="select-list">

 						<ul>

 						<ul>

+ 1 - 1
src/main/resources/templates/system/user/user.html
View File 

@@ -30,7 +30,7 @@
 
 	

 	

 	<div class="container-div ui-layout-center">

 	<div class="container-div ui-layout-center">

 		<div class="row">

 		<div class="row">

-			<div class="col-sm-12 select-info">

+			<div class="col-sm-12 search-collapse">

 				<form id="user-form">

 				<form id="user-form">

 					<input type="hidden" id="deptId" name="deptId">

 					<input type="hidden" id="deptId" name="deptId">

 	                <input type="hidden" id="parentId" name="parentId">

 	                <input type="hidden" id="parentId" name="parentId">

+ 1 - 1
src/main/resources/templates/tool/gen/gen.html
View File 

@@ -6,7 +6,7 @@
 
     

     

     <div class="container-div">

     <div class="container-div">

 		<div class="row">

 		<div class="row">

-			<div class="col-sm-12 select-info">

+			<div class="col-sm-12 search-collapse">

 				<form id="gen-form">

 				<form id="gen-form">

 					<div class="select-list">

 					<div class="select-list">

 						<ul>

 						<ul>