浏览代码

初始多表格demo修改

RuoYi 5 年之前
父节点
当前提交
64f0e9d282

+ 13 - 5
ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js

@@ -245,9 +245,9 @@
 				}
 			},
             // 搜索-默认第一个form
-            search: function(formId, data) {
+            search: function(formId, tableId, data) {
             	var currentId = $.common.isEmpty(formId) ? $('form').attr('id') : formId;
-    		    var params = $.btTable.bootstrapTable('getOptions');
+            	var params = $.common.isEmpty(tableId) ? $.btTable.bootstrapTable('getOptions') : $("#" + tableId).bootstrapTable('getOptions');
     		    params.queryParams = function(params) {
                     var search = $.common.formToJSON(currentId);
                     if($.common.isNotEmpty(data)){
@@ -262,7 +262,11 @@
                     search.isAsc = params.order;
     		        return search;
     		    }
-    		    $.btTable.bootstrapTable('refresh', params);
+    		    if($.common.isNotEmpty(tableId)){
+    				$("#" + tableId).bootstrapTable('refresh', params);
+    			} else{
+    				$.btTable.bootstrapTable('refresh', params);
+    			}
     		},
     		// 导出数据
     		exportExcel: function(formId) {
@@ -478,11 +482,15 @@
         // 表单封装处理
     	form: {
     		// 表单重置
-    		reset: function(formId) {
+    		reset: function(formId, tableId) {
             	var currentId = $.common.isEmpty(formId) ? $('form').attr('id') : formId;
             	$("#" + currentId)[0].reset();
             	if ($.table._option.type == table_type.bootstrapTable) {
-            	    $.btTable.bootstrapTable('refresh');
+            	    if($.common.isEmpty(tableId)){
+            	    	$.btTable.bootstrapTable('refresh');
+                	} else{
+                	    $("#" + tableId).bootstrapTable('refresh');
+                	}
             	}
             },
             // 获取选中复选框项

+ 1 - 1
ruoyi-admin/src/main/resources/templates/demo/table/curd.html

@@ -15,7 +15,7 @@
 	        <a class="btn btn-danger" onclick="removeRowByUniqueId()">
 	            <i class="fa fa-remove"></i> 根据值删除行
 	        </a>
-	         <a class="btn btn-danger" onclick="removeRowAll()">
+	        <a class="btn btn-danger" onclick="removeRowAll()">
 	            <i class="fa fa-remove"></i> 删除所有行
 	        </a>
 	        <a class="btn btn-info" onclick="updateRow()">

+ 69 - 21
ruoyi-admin/src/main/resources/templates/demo/table/multi.html

@@ -4,15 +4,71 @@
 	<th:block th:include="include :: header('初始多表格')" />
 </head>
 <body class="gray-bg">
-     <div class="container-div">
-		<div class="row">
+    <div class="container-div">
+        <div class="row">
+            <div class="col-sm-12 search-collapse">
+                <form id="form1">
+                    <div class="select-list">
+                        <ul>
+						    <li>
+								用户名称:<input type="text" name="userName"/>
+							</li>
+							<li>
+								<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search('form1', 'bootstrap-table1')"><i class="fa fa-search"></i>&nbsp;搜索</a>
+							    <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset('form1', 'bootstrap-table1')"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+							</li>
+						</ul>
+					</div>
+				</form>
+			</div>
+            <div class="btn-group-sm" id="toolbar1" role="group">
+	            <a class="btn btn-success">
+	                <i class="fa fa-plus"></i> 新增
+	            </a>
+	            <a class="btn btn-primary">
+	                <i class="fa fa-edit"></i> 修改
+	            </a>
+	            <a class="btn btn-danger">
+	                <i class="fa fa-remove"></i> 删除
+	            </a>
+            </div>
 			<div class="col-sm-12 select-table table-striped">
-				<table id="bootstrap-table-1" data-mobile-responsive="true"></table>
+				<table id="bootstrap-table1" data-mobile-responsive="true"></table>
 			</div>
 		</div>
-		<div class="row">
+	</div>
+	
+	<div class="container-div">
+        <div class="row">
+            <div class="col-sm-12 search-collapse">
+                <form id="form2">
+                    <div class="select-list">
+                        <ul>
+                            <li>
+								用户名称:<input type="text" name="userName"/>
+							</li>
+							<li>
+								<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search('form2', 'bootstrap-table2')"><i class="fa fa-search"></i>&nbsp;搜索</a>
+							    <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset('form2', 'bootstrap-table2')"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+							</li>
+						</ul>
+					</div>
+				</form>
+			</div>
+			
+            <div class="btn-group-sm" id="toolbar2" role="group">
+	            <a class="btn btn-success">
+	                <i class="fa fa-plus"></i> 新增
+	            </a>
+	            <a class="btn btn-primary">
+	                <i class="fa fa-edit"></i> 修改
+	            </a>
+	            <a class="btn btn-danger">
+	                <i class="fa fa-remove"></i> 删除
+	            </a>
+            </div>
 			<div class="col-sm-12 select-table table-striped">
-				<table id="bootstrap-table-2" data-mobile-responsive="true"></table>
+				<table id="bootstrap-table2" data-mobile-responsive="true"></table>
 			</div>
 		</div>
 	</div>
@@ -23,12 +79,9 @@
 
         $(function() {
             var options = {
-            	id: "bootstrap-table-1",
+            	id: "bootstrap-table1",
+            	toolbar: "toolbar1",
                 url: prefix + "/list",
-                createUrl: prefix + "/add",
-                updateUrl: prefix + "/edit/{id}",
-                removeUrl: prefix + "/remove",
-				exportUrl: prefix + "/export",
 		        showSearch: false,
 		        showRefresh: false,
 		        showToggle: false,
@@ -73,8 +126,8 @@
 		            align: 'center',
 		            formatter: function(value, row, index) {
 		            	var actions = [];
-		            	actions.push('<a class="btn btn-success btn-xs" href="#"><i class="fa fa-edit"></i>编辑</a> ');
-                        actions.push('<a class="btn btn-danger btn-xs" href="#"><i class="fa fa-remove"></i>删除</a>');
+		            	actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs" href="javascript:void(0)"><i class="fa fa-remove"></i>删除</a>');
 						return actions.join('');
 		            }
 		        }]
@@ -82,21 +135,16 @@
             $.table.init(options);
         });
         
-        function queryParams(params) {
-            var search = $.table.queryParams(params);
-            search.userName = '测试1';
-            return search;
-        }
         
         $(function() {
             var options = {
-            	id: "bootstrap-table-2",
+            	id: "bootstrap-table2",
+            	toolbar: "toolbar2",
                 url: prefix + "/list",
 		        showSearch: false,
 		        showRefresh: false,
 		        showToggle: false,
 		        showColumns: false,
-		        queryParams: queryParams,
                 columns: [{
 		            checkbox: true
 		        },
@@ -137,8 +185,8 @@
 		            align: 'center',
 		            formatter: function(value, row, index) {
 		            	var actions = [];
-		            	actions.push('<a class="btn btn-success btn-xs" href="#"><i class="fa fa-edit"></i>编辑</a> ');
-                        actions.push('<a class="btn btn-danger btn-xs" href="#"><i class="fa fa-remove"></i>删除</a>');
+		            	actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs" href="javascript:void(0)"><i class="fa fa-remove"></i>删除</a>');
 						return actions.join('');
 		            }
 		        }]

+ 1 - 1
ruoyi-admin/src/main/resources/templates/monitor/operlog/operlog.html

@@ -151,7 +151,7 @@
 		function searchPre() {
 		    var data = {};
 		    data.businessTypes = $.common.join($('#businessTypes').selectpicker('val'));
-		    $.table.search('operlog-form', data);
+		    $.table.search('operlog-form', 'bootstrap-table', data);
 		}
 		
 		function resetPre() {