From 35a49e9462de54ccd4d41950ee911c40fe2b8223 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Fri, 4 Dec 2020 10:48:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E5=AD=90=E8=A1=A8=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=80=9A=E7=94=A8addColumn=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/static/ruoyi/js/common.js  | 10 ++++++++
 .../templates/demo/table/subdata.html         | 23 +++++++------------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js b/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js
index 9c75b0c14..d07d0aa0e 100644
--- a/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js
+++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js
@@ -438,6 +438,16 @@ var sub = {
             return;
         }
         $("#" + table.options.id).bootstrapTable('remove', { field: subColumn, values: ids });
+    },
+    addColumn: function(row, tableId) {
+    	var currentId = $.common.isEmpty(tableId) ? table.options.id : tableId;
+    	table.set(currentId);
+    	var count = $("#" + currentId).bootstrapTable('getData').length;
+    	sub.editColumn();
+    	$("#" + currentId).bootstrapTable('insertRow', {
+            index: count + 1,
+            row: row
+        });
     }
 };
 
diff --git a/ruoyi-admin/src/main/resources/templates/demo/table/subdata.html b/ruoyi-admin/src/main/resources/templates/demo/table/subdata.html
index 5dd3c2b11..f55e87533 100644
--- a/ruoyi-admin/src/main/resources/templates/demo/table/subdata.html
+++ b/ruoyi-admin/src/main/resources/templates/demo/table/subdata.html
@@ -164,22 +164,15 @@
             autoclose: true
         });
         
-        
         function addColumn() {
-        	var count = $("#" + table.options.id).bootstrapTable('getData').length;
-        	sub.editColumn();
-        	
-        	$("#" + table.options.id).bootstrapTable('insertRow', {
-        		index: count,
-                row: {
-                	index: $.table.serialNumber(count),
-                	name: "",
-                	weight: "",
-                	price: "",
-                	date: "",
-                	type: "",
-                }
-        	});
+        	var row = {
+            	name: "",
+            	weight: "",
+            	price: "",
+            	date: "",
+            	type: "",
+            }
+        	sub.addColumn(row);
         }
         
         $("#bootstrap-table").on("post-body.bs.table", function (e, args) {