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 @@
com.alibaba
druid-spring-boot-starter
- 1.1.18
+ 1.1.22
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 @@
com.alibaba.cloud
- spring-cloud-alibaba-seata
+ spring-cloud-starter-alibaba-seata
${alibaba.cloud.version}
-
- io.seata
- seata-spring-boot-starter
- ${alibaba.seata.version}
-
diff --git a/pom.xml b/pom.xml
index 5f521d2..7b0b300 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,11 +48,11 @@
3.4.2
2.2.2
1.1.0
- 2.2.0.RELEASE
+ 2.2.1.RELEASE
1.1.0
- 2.2.5.RELEASE
- Hoxton.SR2
+ 2.2.6.RELEASE
+ Hoxton.SR3
Cairo-SR8
UTF-8