From 329c95196e5803e1472f0c7bda087f6771b2789f Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 02 六月 2021 17:15:20 +0800
Subject: [PATCH] update 更新测试案例

---
 sql/test.sql                                           |    4 ++--
 ruoyi-ui/src/views/demo/demo/index.vue                 |    9 ++++++++-
 ruoyi-ui/src/views/demo/tree/index.vue                 |    9 ++++++++-
 ruoyi-generator/src/main/resources/vm/vue/index.vue.vm |    4 ++--
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm b/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
index c011449..1c87a46 100644
--- a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
+++ b/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
@@ -556,7 +556,7 @@
     submitForm() {
       this.#[[$]]#refs["form"].validate(valid => {
         if (valid) {
-            this.loading = true;
+          this.loading = true;
 #foreach ($column in $columns)
 #if($column.htmlType == "checkbox")
           this.form.$column.javaField = this.form.${column.javaField}.join(",");
@@ -590,7 +590,7 @@
           confirmButtonText: "纭畾",
           cancelButtonText: "鍙栨秷",
           type: "warning"
-        }).then(()=> {
+        }).then(() => {
           this.loading = true;
           return del${BusinessName}(${pkColumn.javaField}s);
         }).then(() => {
diff --git a/ruoyi-ui/src/views/demo/demo/index.vue b/ruoyi-ui/src/views/demo/demo/index.vue
index b831ad9..c884b38 100644
--- a/ruoyi-ui/src/views/demo/demo/index.vue
+++ b/ruoyi-ui/src/views/demo/demo/index.vue
@@ -277,9 +277,11 @@
     },
     /** 淇敼鎸夐挳鎿嶄綔 */
     handleUpdate(row) {
+      this.loading = true;
       this.reset();
       const id = row.id || this.ids
       getDemo(id).then(response => {
+        this.loading = false;
         this.form = response.data;
         this.open = true;
         this.title = "淇敼娴嬭瘯鍗曡〃";
@@ -289,14 +291,17 @@
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          this.loading = true;
           if (this.form.id != null) {
             updateDemo(this.form).then(response => {
+              this.loading = false;
               this.msgSuccess("淇敼鎴愬姛");
               this.open = false;
               this.getList();
             });
           } else {
             addDemo(this.form).then(response => {
+              this.loading = false;
               this.msgSuccess("鏂板鎴愬姛");
               this.open = false;
               this.getList();
@@ -312,9 +317,11 @@
         confirmButtonText: "纭畾",
         cancelButtonText: "鍙栨秷",
         type: "warning"
-      }).then(function() {
+      }).then(() => {
+        this.loading = true;
         return delDemo(ids);
       }).then(() => {
+        this.loading = false;
         this.getList();
         this.msgSuccess("鍒犻櫎鎴愬姛");
       })
diff --git a/ruoyi-ui/src/views/demo/tree/index.vue b/ruoyi-ui/src/views/demo/tree/index.vue
index ddf7677..b65b2bd 100644
--- a/ruoyi-ui/src/views/demo/tree/index.vue
+++ b/ruoyi-ui/src/views/demo/tree/index.vue
@@ -233,12 +233,14 @@
     },
     /** 淇敼鎸夐挳鎿嶄綔 */
     handleUpdate(row) {
+      this.loading = true;
       this.reset();
       this.getTreeselect();
       if (row != null) {
         this.form.parentId = row.id;
       }
       getTree(row.id).then(response => {
+        this.loading = false;
         this.form = response.data;
         this.open = true;
         this.title = "淇敼娴嬭瘯鏍戣〃";
@@ -248,14 +250,17 @@
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          this.loading = true;
           if (this.form.id != null) {
             updateTree(this.form).then(response => {
+              this.loading = false;
               this.msgSuccess("淇敼鎴愬姛");
               this.open = false;
               this.getList();
             });
           } else {
             addTree(this.form).then(response => {
+              this.loading = false;
               this.msgSuccess("鏂板鎴愬姛");
               this.open = false;
               this.getList();
@@ -270,9 +275,11 @@
         confirmButtonText: "纭畾",
         cancelButtonText: "鍙栨秷",
         type: "warning"
-      }).then(function() {
+      }).then(() => {
+        this.loading = true;
         return delTree(row.id);
       }).then(() => {
+        this.loading = false;
         this.getList();
         this.msgSuccess("鍒犻櫎鎴愬姛");
       })
diff --git a/sql/test.sql b/sql/test.sql
index b7003ce2..601360a 100644
--- a/sql/test.sql
+++ b/sql/test.sql
@@ -12,7 +12,7 @@
     create_by   varchar(64) NULL DEFAULT NULL COMMENT '鍒涘缓浜�',
     update_time datetime(0) NULL DEFAULT NULL COMMENT '鏇存柊鏃堕棿',
     update_by   varchar(64) NULL DEFAULT NULL COMMENT '鏇存柊浜�',
-    del_flag    int(0) NULL DEFAULT NULL COMMENT '鍒犻櫎鏍囧織',
+    del_flag    int(0) NULL DEFAULT 0 COMMENT '鍒犻櫎鏍囧織',
     PRIMARY KEY (id) USING BTREE
 ) ENGINE = InnoDB COMMENT = '娴嬭瘯鍗曡〃';
 
@@ -29,7 +29,7 @@
     create_by   varchar(64) NULL DEFAULT NULL COMMENT '鍒涘缓浜�',
     update_time datetime(0) NULL DEFAULT NULL COMMENT '鏇存柊鏃堕棿',
     update_by   varchar(64) NULL DEFAULT NULL COMMENT '鏇存柊浜�',
-    del_flag    int(0) NULL DEFAULT NULL COMMENT '鍒犻櫎鏍囧織',
+    del_flag    int(0) NULL DEFAULT 0 COMMENT '鍒犻櫎鏍囧織',
     PRIMARY KEY (id) USING BTREE
 ) ENGINE = InnoDB COMMENT = '娴嬭瘯鏍戣〃';
 

--
Gitblit v1.9.3