From e920dffa823fe22c167d909f6dc412754985d9c9 Mon Sep 17 00:00:00 2001 From: lingdeng <1024721228@qq.com> Date: Sun, 17 Apr 2022 12:24:09 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20el-dialog=20=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E7=82=B9=E5=87=BB=E9=81=AE=E7=85=A7=E4=B8=BA=E4=B8=8D?= =?UTF-8?q?=E5=85=B3=E9=97=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/main.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ruoyi-ui/src/main.js b/ruoyi-ui/src/main.js index 1e0144f40..5556cf521 100644 --- a/ruoyi-ui/src/main.js +++ b/ruoyi-ui/src/main.js @@ -73,6 +73,10 @@ DictData.install() * please remove it before going online! ! ! */ + +// 修改 el-dialog 默认点击遮照为不关闭 +Element.Dialog.props.closeOnClickModal.default = false + Vue.use(Element, { size: Cookies.get('size') || 'medium' // set element-ui default size }) From 8db4190c7a26a3e18aa65b5173cbea49009cf0cf Mon Sep 17 00:00:00 2001 From: lingdeng <1024721228@qq.com> Date: Sun, 17 Apr 2022 12:46:22 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=94=9F=E6=88=90=E4=BB=A3=E7=A0=81=20el-d?= =?UTF-8?q?ialog=20=E5=BC=B9=E7=AA=97=E5=86=85=E5=AE=B9=E8=BF=87=E5=A4=9A?= =?UTF-8?q?=E6=BB=9A=E5=8A=A8=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/vm/vue/index-tree.vue.vm | 22 +++++++++++++++++- .../src/main/resources/vm/vue/index.vue.vm | 23 ++++++++++++++++++- .../resources/vm/vue/v3/index-tree.vue.vm | 22 +++++++++++++++++- .../src/main/resources/vm/vue/v3/index.vue.vm | 23 ++++++++++++++++++- 4 files changed, 86 insertions(+), 4 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 ac0c2b2c8..8126f8d95 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 @@ -165,7 +165,7 @@ - + #foreach($column in $columns) #set($field=$column.javaField) @@ -511,3 +511,23 @@ export default { } }; + + 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 7a597f389..29926da5f 100644 --- a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm +++ b/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm @@ -180,7 +180,7 @@ /> - + #foreach($column in $columns) #set($field=$column.javaField) @@ -607,3 +607,24 @@ export default { } }; + + + diff --git a/ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm b/ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm index 6776687d9..d1664e733 100644 --- a/ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm +++ b/ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm @@ -159,7 +159,7 @@ - + #foreach($column in $columns) #set($field=$column.javaField) @@ -492,3 +492,23 @@ function handleDelete(row) { getList(); + + diff --git a/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm b/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm index 6c9cdd612..643d61f2a 100644 --- a/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm +++ b/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm @@ -173,7 +173,7 @@ /> - + #foreach($column in $columns) #set($field=$column.javaField) @@ -604,3 +604,24 @@ function handleExport() { getList(); + + + From 3f49466c1d2efdfceb6d504763001fe7eb1f895b Mon Sep 17 00:00:00 2001 From: lingdeng <1024721228@qq.com> Date: Sun, 17 Apr 2022 12:49:18 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=94=9F=E6=88=90=E4=BB=A3=E7=A0=81=20el-d?= =?UTF-8?q?ialog=20=E6=8F=90=E7=A4=BA=E6=A0=A1=E9=AA=8C=E8=A7=84=E5=88=99?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/vm/vue/index-tree.vue.vm | 9 ++++++++- ruoyi-generator/src/main/resources/vm/vue/index.vue.vm | 9 ++++++++- .../src/main/resources/vm/vue/v3/index-tree.vue.vm | 9 ++++++++- .../src/main/resources/vm/vue/v3/index.vue.vm | 9 ++++++++- 4 files changed, 32 insertions(+), 4 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 8126f8d95..753cd25e5 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 @@ -467,7 +467,7 @@ export default { }, /** 提交按钮 */ submitForm() { - this.#[[$]]#refs["form"].validate(valid => { + this.#[[$]]#refs["form"].validate((valid, obj) => { if (valid) { this.buttonLoading = true; #foreach ($column in $columns) @@ -492,6 +492,13 @@ export default { this.buttonLoading = false; }); } + } else { + const a = []; + for (let key in obj) { + a.push(obj[key][0].message); + } + this.$modal.msgError(a[0]); + return false; } }); }, 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 29926da5f..d7eed7575 100644 --- a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm +++ b/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm @@ -520,7 +520,7 @@ export default { }, /** 提交按钮 */ submitForm() { - this.#[[$]]#refs["form"].validate(valid => { + this.#[[$]]#refs["form"].validate((valid, obj) => { if (valid) { this.buttonLoading = true; #foreach ($column in $columns) @@ -548,6 +548,13 @@ export default { this.buttonLoading = false; }); } + } else { + const a = []; + for (let key in obj) { + a.push(obj[key][0].message); + } + this.$modal.msgError(a[0]); + return false; } }); }, diff --git a/ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm b/ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm index d1664e733..2192f4be2 100644 --- a/ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm +++ b/ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm @@ -447,7 +447,7 @@ async function handleUpdate(row) { /** 提交按钮 */ function submitForm() { - proxy.#[[$]]#refs["${businessName}Ref"].validate(valid => { + proxy.#[[$]]#refs["${businessName}Ref"].validate((valid, obj) => { if (valid) { buttonLoading.value = true; #foreach ($column in $columns) @@ -472,6 +472,13 @@ function submitForm() { buttonLoading.value = false; }); } + } else { + const a = []; + for (let key in obj) { + a.push(obj[key][0].message); + } + this.$modal.msgError(a[0]); + return false; } }); } diff --git a/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm b/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm index 643d61f2a..6615b376c 100644 --- a/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm +++ b/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm @@ -511,7 +511,7 @@ function handleUpdate(row) { /** 提交按钮 */ function submitForm() { - proxy.#[[$]]#refs["${businessName}Ref"].validate(valid => { + proxy.#[[$]]#refs["${businessName}Ref"].validate((valid, obj) => { if (valid) { buttonLoading.value = true; #foreach ($column in $columns) @@ -539,6 +539,13 @@ function submitForm() { buttonLoading.value = false; }); } + } else { + const a = []; + for (let key in obj) { + a.push(obj[key][0].message); + } + this.$modal.msgError(a[0]); + return false; } }); }