From 439accf746be52561209c049c304bde8e59bd615 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= <wangiegie@gmail.com>
Date: Mon, 8 Jul 2019 13:54:28 +0800
Subject: [PATCH] =?UTF-8?q?:arrow=5Fup:=20=E4=BE=9D=E8=B5=96=E5=8D=87?=
 =?UTF-8?q?=E7=BA=A7=E3=80=82=20mybatis-plus=203.1.2=20spring=20boot=20adm?=
 =?UTF-8?q?in=202.1.6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pigx-common/pigx-common-bom/pom.xml           |  2 +-
 .../src/main/resources/template/index.vue.vm  | 23 +++----------------
 pom.xml                                       |  2 +-
 3 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/pigx-common/pigx-common-bom/pom.xml b/pigx-common/pigx-common-bom/pom.xml
index 6d99572c5..01edd456f 100644
--- a/pigx-common/pigx-common-bom/pom.xml
+++ b/pigx-common/pigx-common-bom/pom.xml
@@ -17,7 +17,7 @@
 
 	<properties>
 		<pigx.version>3.2</pigx.version>
-		<mybatis-plus.version>3.1.0</mybatis-plus.version>
+		<mybatis-plus.version>3.1.2</mybatis-plus.version>
 		<druid.version>1.1.16</druid.version>
 		<mysql.connector.version>8.0.16</mysql.connector.version>
 		<swagger.core.version>1.5.22</swagger.core.version>
diff --git a/pigx-visual/pigx-codegen/src/main/resources/template/index.vue.vm b/pigx-visual/pigx-codegen/src/main/resources/template/index.vue.vm
index e0b919242..91ab08216 100755
--- a/pigx-visual/pigx-codegen/src/main/resources/template/index.vue.vm
+++ b/pigx-visual/pigx-codegen/src/main/resources/template/index.vue.vm
@@ -43,6 +43,7 @@
         name: '${pathName}',
         data() {
             return {
+                searchForm: {},
                 tableData: [],
                 page: {
                     total: 0, // 总页数
@@ -69,7 +70,7 @@
                 fetchList(Object.assign({
                     current: page.currentPage,
                     size: page.pageSize
-                }, params)).then(response => {
+                }, params, this.searchForm )).then(response => {
                     this.tableData = response.data.data.records
                     this.page.total = response.data.data.total
                     this.tableLoading = false
@@ -95,13 +96,6 @@
                     this.getList(this.page)
                 })
             },
-            /**
-             * @title 数据更新
-             * @param row 为当前的数据
-             * @param index 为当前更新数据的行数
-             * @param done 为表单关闭函数
-             *
-             **/
             handleUpdate: function (row, index, done,loading) {
                 putObj(row).then(data => {
                     this.$message({
@@ -115,12 +109,6 @@
                     loading();
                 });
             },
-            /**
-             * @title 数据添加
-             * @param row 为当前的数据
-             * @param done 为表单关闭函数
-             *
-             **/
             handleSave: function (row, done,loading) {
                 addObj(row).then(data => {
                     this.$message({
@@ -134,15 +122,10 @@
                     loading();
                 });
             },
-            /**
-             * 搜索回调
-             */
             searchChange(form) {
+                this.searchForm = form
                 this.getList(this.page, form)
             },
-            /**
-             * 刷新回调
-             */
             refreshChange() {
                 this.getList(this.page)
             }
diff --git a/pom.xml b/pom.xml
index 253c15ddb..03f37f8e0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,7 +50,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.target>1.8</maven.compiler.target>
-		<spring-boot-admin.version>2.1.5</spring-boot-admin.version>
+		<spring-boot-admin.version>2.1.6</spring-boot-admin.version>
 		<easyexcel.version>1.1.2-beta5</easyexcel.version>
 		<hutool.version>4.5.15</hutool.version>
 		<kaptcha.version>0.0.9</kaptcha.version>