From 3943a9f618b372b50e094dc23ce2744211e9d7b8 Mon Sep 17 00:00:00 2001
From: smallchill <smallchill@163.com>
Date: Fri, 17 Apr 2020 20:52:36 +0800
Subject: [PATCH] =?UTF-8?q?:arrow=5Fup:=20=E5=8D=87=E7=BA=A7=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E4=BE=9D=E8=B5=96=EF=BC=8C=E4=BC=98=E5=8C=96=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E7=94=9F=E6=88=90=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 blade-core-boot/pom.xml                       |  2 +-
 .../resources/templates/saber/crud.vue.vm     | 20 +++++++++++--------
 blade-core-transaction/pom.xml                |  7 +------
 pom.xml                                       |  6 +++---
 4 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/blade-core-boot/pom.xml b/blade-core-boot/pom.xml
index d64f807..0c33a36 100644
--- a/blade-core-boot/pom.xml
+++ b/blade-core-boot/pom.xml
@@ -88,7 +88,7 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>druid-spring-boot-starter</artifactId>
-            <version>1.1.18</version>
+            <version>1.1.22</version>
         </dependency>
         <!-- MySQL -->
         <dependency>
diff --git a/blade-core-develop/src/main/resources/templates/saber/crud.vue.vm b/blade-core-develop/src/main/resources/templates/saber/crud.vue.vm
index 319a467..693fa02 100644
--- a/blade-core-develop/src/main/resources/templates/saber/crud.vue.vm
+++ b/blade-core-develop/src/main/resources/templates/saber/crud.vue.vm
@@ -47,6 +47,10 @@
         },
         selectionList: [],
         option: {
+          height: 'auto',
+          calcHeight: 80,
+          searchShow: true,
+          searchMenuSpan: 6,
           tip: false,
           border: true,
           index: true,
@@ -90,30 +94,30 @@
       }
     },
     methods: {
-      rowSave(row, loading, done) {
+      rowSave(row, done, loading) {
         add(row).then(() => {
-          loading();
+          done();
           this.onLoad(this.page);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
         }, error => {
-          done();
-          console.log(error);
+          window.console.log(error);
+          loading();
         });
       },
-      rowUpdate(row, index, loading, done) {
+      rowUpdate(row, index, done, loading) {
         update(row).then(() => {
-          loading();
+          done();
           this.onLoad(this.page);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
         }, error => {
-          done();
-          console.log(error);
+          window.console.log(error);
+          loading();
         });
       },
       rowDel(row) {
diff --git a/blade-core-transaction/pom.xml b/blade-core-transaction/pom.xml
index 058f335..7324d01 100644
--- a/blade-core-transaction/pom.xml
+++ b/blade-core-transaction/pom.xml
@@ -28,14 +28,9 @@
         <!-- Seata-->
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-alibaba-seata</artifactId>
+            <artifactId>spring-cloud-starter-alibaba-seata</artifactId>
             <version>${alibaba.cloud.version}</version>
         </dependency>
-        <dependency>
-            <groupId>io.seata</groupId>
-            <artifactId>seata-spring-boot-starter</artifactId>
-            <version>${alibaba.seata.version}</version>
-        </dependency>
     </dependencies>
 
 </project>
diff --git a/pom.xml b/pom.xml
index 5f521d2..7b0b300 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,11 +48,11 @@
         <disruptor.version>3.4.2</disruptor.version>
         <spring.boot.admin.version>2.2.2</spring.boot.admin.version>
         <mica.auto.version>1.1.0</mica.auto.version>
-        <alibaba.cloud.version>2.2.0.RELEASE</alibaba.cloud.version>
+        <alibaba.cloud.version>2.2.1.RELEASE</alibaba.cloud.version>
         <alibaba.seata.version>1.1.0</alibaba.seata.version>
 
-        <spring.boot.version>2.2.5.RELEASE</spring.boot.version>
-        <spring.cloud.version>Hoxton.SR2</spring.cloud.version>
+        <spring.boot.version>2.2.6.RELEASE</spring.boot.version>
+        <spring.cloud.version>Hoxton.SR3</spring.cloud.version>
         <spring.platform.version>Cairo-SR8</spring.platform.version>
 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>