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 ca997497..f1247aba 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 @@ -302,6 +302,8 @@ export default { }, data() { return { + //按钮loading + buttonLoading: false, // 遮罩层 loading: true, // 显示搜索条件 @@ -502,7 +504,7 @@ export default { 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 @@ export default { #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(); 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 1c87a465..9f58575b 100644 --- a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm +++ b/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm @@ -301,7 +301,7 @@ #end @@ -353,6 +353,8 @@ export default { }, data() { return { + //按钮loading + buttonLoading: false, // 遮罩层 loading: true, // 导出遮罩层 @@ -556,7 +558,7 @@ export default { 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(","); @@ -567,14 +569,14 @@ export default { #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(); diff --git a/ruoyi-ui/src/views/demo/demo/index.vue b/ruoyi-ui/src/views/demo/demo/index.vue index c884b38f..48fa3681 100644 --- a/ruoyi-ui/src/views/demo/demo/index.vue +++ b/ruoyi-ui/src/views/demo/demo/index.vue @@ -152,7 +152,7 @@ @@ -168,6 +168,8 @@ export default { }, data() { return { + //按钮loading + buttonLoading: false, // 遮罩层 loading: true, // 导出遮罩层 @@ -291,17 +293,17 @@ export default { submitForm() { this.$refs["form"].validate(valid => { if (valid) { - this.loading = true; + this.buttonLoading = true; if (this.form.id != null) { updateDemo(this.form).then(response => { - this.loading = false; + this.buttonLoading = false; this.msgSuccess("修改成功"); this.open = false; this.getList(); }); } else { addDemo(this.form).then(response => { - this.loading = false; + this.buttonLoading = false; this.msgSuccess("新增成功"); this.open = false; this.getList(); diff --git a/ruoyi-ui/src/views/demo/tree/index.vue b/ruoyi-ui/src/views/demo/tree/index.vue index b65b2bd5..afe96c4a 100644 --- a/ruoyi-ui/src/views/demo/tree/index.vue +++ b/ruoyi-ui/src/views/demo/tree/index.vue @@ -102,7 +102,7 @@ @@ -121,6 +121,8 @@ export default { }, data() { return { + //按钮loading + buttonLoading: false, // 遮罩层 loading: true, // 显示搜索条件 @@ -250,17 +252,17 @@ export default { submitForm() { this.$refs["form"].validate(valid => { if (valid) { - this.loading = true; + this.buttonLoading = true; if (this.form.id != null) { updateTree(this.form).then(response => { - this.loading = false; + this.buttonLoading = false; this.msgSuccess("修改成功"); this.open = false; this.getList(); }); } else { addTree(this.form).then(response => { - this.loading = false; + this.buttonLoading = false; this.msgSuccess("新增成功"); this.open = false; this.getList();