!66 修复 按钮loading卡死的问题

Merge pull request !66 from Nguyendream/N/A

ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm

@@ -300,8 +300,8 @@ export default {
   },
   data() {
     return {
-	  //按钮loading
-	  buttonLoading: false,
+      // 按钮loading
+      buttonLoading: false,
       // 遮罩层
       loading: true,
       // 显示搜索条件
@@ -510,17 +510,19 @@ export default {
 #end
           if (this.form.${pkColumn.javaField} != null) {
             update${BusinessName}(this.form).then(response => {
-			  this.buttonLoading = false;
               this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
             });
           } else {
             add${BusinessName}(this.form).then(response => {
-			  this.buttonLoading = false;
               this.msgSuccess("新增成功");
               this.open = false;
               this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
             });
           }
         }

ruoyi-generator/src/main/resources/vm/vue/index.vue.vm

@@ -351,8 +351,8 @@ export default {
   },
   data() {
     return {
-	  //按钮loading
-	  buttonLoading: false,
+      // 按钮loading
+      buttonLoading: false,
       // 遮罩层
       loading: true,
       // 导出遮罩层
@@ -567,17 +567,19 @@ export default {
 #end
           if (this.form.${pkColumn.javaField} != null) {
             update${BusinessName}(this.form).then(response => {
-              this.buttonLoading = false;
               this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
             });
           } else {
             add${BusinessName}(this.form).then(response => {
-              this.buttonLoading = false;
               this.msgSuccess("新增成功");
               this.open = false;
               this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
             });
           }
         }