From 2103731f104c4b98ef596be50ff1dd972b4f6000 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期四, 10 六月 2021 09:44:56 +0800 Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev --- ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm b/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm index ca99749..0b971b2 100644 --- a/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm +++ b/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm @@ -247,7 +247,7 @@ #end </el-form> <div slot="footer" class="dialog-footer"> - <el-button type="primary" @click="submitForm">纭� 瀹�</el-button> + <el-button :loading="buttonLoading" type="primary" @click="submitForm">纭� 瀹�</el-button> <el-button @click="cancel">鍙� 娑�</el-button> </div> </el-dialog> @@ -302,6 +302,8 @@ }, data() { return { + //鎸夐挳loading + buttonLoading: false, // 閬僵灞� loading: true, // 鏄剧ず鎼滅储鏉′欢 @@ -502,7 +504,7 @@ submitForm() { this.#[[$]]#refs["form"].validate(valid => { if (valid) { - this.loading = true; + this.buttonLoading = true; #foreach ($column in $columns) #if($column.htmlType == "checkbox") this.form.$column.javaField = this.form.${column.javaField}.join(","); @@ -510,14 +512,14 @@ #end if (this.form.${pkColumn.javaField} != null) { update${BusinessName}(this.form).then(response => { - this.loading = false; + this.buttonLoading = false; this.msgSuccess("淇敼鎴愬姛"); this.open = false; this.getList(); }); } else { add${BusinessName}(this.form).then(response => { - this.loading = false; + this.buttonLoading = false; this.msgSuccess("鏂板鎴愬姛"); this.open = false; this.getList(); @@ -539,7 +541,7 @@ this.loading = false; this.getList(); this.msgSuccess("鍒犻櫎鎴愬姛"); - }) + }).catch(() => {}); } } }; -- Gitblit v1.9.3