opensource/RuoYi-Vue-Plus
2
0
Fork 1
mirror of https://gitee.com/dromara/RuoYi-Vue-Plus.git synced 2026-09-20 10:13:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Pre Merge pull request !168 from lingdeng/dev

Browse Source
This commit is contained in:
lingdeng 2022-04-17 13:51:53 +00:00 committed by Gitee
commit 032add2577
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
5 changed files with 122 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -165,7 +165,7 @@
</el-table> </el-table>
<!-- 添加或修改${functionName}对话框 --> <!-- 添加或修改${functionName}对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" class="roll-dialog" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
#foreach($column in $columns) #foreach($column in $columns)
#set($field=$column.javaField) #set($field=$column.javaField)
@ -467,7 +467,7 @@ export default {
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm() { submitForm() {
this.#[[$]]#refs["form"].validate(valid => { this.#[[$]]#refs["form"].validate((valid, obj) => {
if (valid) { if (valid) {
this.buttonLoading = true; this.buttonLoading = true;
#foreach ($column in $columns) #foreach ($column in $columns)
@ -492,6 +492,13 @@ export default {
this.buttonLoading = false; this.buttonLoading = false;
}); });
} }
} else {
const a = [];
for (let key in obj) {
a.push(obj[key][0].message);
}
this.$modal.msgError(a[0]);
return false;
} }
}); });
}, },
@ -511,3 +518,23 @@ export default {
} }
}; };
</script> </script>
<style lang="scss" scoped>
.roll-dialog {
display: flex;
justify-content: center;
align-items: Center;
overflow: hidden;
::v-deep .el-dialog {
margin: 0 auto !important;
width: 60%;
height: 90vh;
overflow: hidden;
.el-dialog__body {
overflow: hidden;
overflow-y: auto;
height: calc(90vh - 140px);
}
}
}
</style>

32
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
View File

@ -180,7 +180,7 @@
/> />
<!-- 添加或修改${functionName}对话框 --> <!-- 添加或修改${functionName}对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" class="roll-dialog" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
#foreach($column in $columns) #foreach($column in $columns)
#set($field=$column.javaField) #set($field=$column.javaField)
@ -520,7 +520,7 @@ export default {
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm() { submitForm() {
this.#[[$]]#refs["form"].validate(valid => { this.#[[$]]#refs["form"].validate((valid, obj) => {
if (valid) { if (valid) {
this.buttonLoading = true; this.buttonLoading = true;
#foreach ($column in $columns) #foreach ($column in $columns)
@ -548,6 +548,13 @@ export default {
this.buttonLoading = false; this.buttonLoading = false;
}); });
} }
} else {
const a = [];
for (let key in obj) {
a.push(obj[key][0].message);
}
this.$modal.msgError(a[0]);
return false;
} }
}); });
}, },
@ -607,3 +614,24 @@ export default {
} }
}; };
</script> </script>
<style lang="scss" scoped>
.roll-dialog {
display: flex;
justify-content: center;
align-items: Center;
overflow: hidden;
::v-deep .el-dialog {
margin: 0 auto !important;
width: 60%;
height: 90vh;
overflow: hidden;
.el-dialog__body {
overflow: hidden;
overflow-y: auto;
height: calc(90vh - 140px);
}
}
}
</style>

31
ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm
View File

@ -159,7 +159,7 @@
</el-table> </el-table>
<!-- 添加或修改${functionName}对话框 --> <!-- 添加或修改${functionName}对话框 -->
<el-dialog :title="title" v-model="open" width="500px" append-to-body> <el-dialog :title="title" v-model="open" class="roll-dialog" append-to-body>
<el-form ref="${businessName}Ref" :model="form" :rules="rules" label-width="80px"> <el-form ref="${businessName}Ref" :model="form" :rules="rules" label-width="80px">
#foreach($column in $columns) #foreach($column in $columns)
#set($field=$column.javaField) #set($field=$column.javaField)
@ -447,7 +447,7 @@ async function handleUpdate(row) {
/** 提交按钮 */ /** 提交按钮 */
function submitForm() { function submitForm() {
proxy.#[[$]]#refs["${businessName}Ref"].validate(valid => { proxy.#[[$]]#refs["${businessName}Ref"].validate((valid, obj) => {
if (valid) { if (valid) {
buttonLoading.value = true; buttonLoading.value = true;
#foreach ($column in $columns) #foreach ($column in $columns)
@ -472,6 +472,13 @@ function submitForm() {
buttonLoading.value = false; buttonLoading.value = false;
}); });
} }
} else {
const a = [];
for (let key in obj) {
a.push(obj[key][0].message);
}
this.$modal.msgError(a[0]);
return false;
} }
}); });
} }
@ -492,3 +499,23 @@ function handleDelete(row) {
getList(); getList();
</script> </script>
<style lang="scss" scoped>
.roll-dialog {
display: flex;
justify-content: center;
align-items: Center;
overflow: hidden;
::v-deep .el-dialog {
margin: 0 auto !important;
width: 60%;
height: 90vh;
overflow: hidden;
.el-dialog__body {
overflow: hidden;
overflow-y: auto;
height: calc(90vh - 140px);
}
}
}
</style>

32
ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm
View File

@ -173,7 +173,7 @@
/> />
<!-- 添加或修改${functionName}对话框 --> <!-- 添加或修改${functionName}对话框 -->
<el-dialog :title="title" v-model="open" width="500px" append-to-body> <el-dialog :title="title" v-model="open" class="roll-dialog" append-to-body>
<el-form ref="${businessName}Ref" :model="form" :rules="rules" label-width="80px"> <el-form ref="${businessName}Ref" :model="form" :rules="rules" label-width="80px">
#foreach($column in $columns) #foreach($column in $columns)
#set($field=$column.javaField) #set($field=$column.javaField)
@ -511,7 +511,7 @@ function handleUpdate(row) {
/** 提交按钮 */ /** 提交按钮 */
function submitForm() { function submitForm() {
proxy.#[[$]]#refs["${businessName}Ref"].validate(valid => { proxy.#[[$]]#refs["${businessName}Ref"].validate((valid, obj) => {
if (valid) { if (valid) {
buttonLoading.value = true; buttonLoading.value = true;
#foreach ($column in $columns) #foreach ($column in $columns)
@ -539,6 +539,13 @@ function submitForm() {
buttonLoading.value = false; buttonLoading.value = false;
}); });
} }
} else {
const a = [];
for (let key in obj) {
a.push(obj[key][0].message);
}
this.$modal.msgError(a[0]);
return false;
} }
}); });
} }
@ -604,3 +611,24 @@ function handleExport() {
getList(); getList();
</script> </script>
<style lang="scss" scoped>
.roll-dialog {
display: flex;
justify-content: center;
align-items: Center;
overflow: hidden;
::v-deep .el-dialog {
margin: 0 auto !important;
width: 60%;
height: 90vh;
overflow: hidden;
.el-dialog__body {
overflow: hidden;
overflow-y: auto;
height: calc(90vh - 140px);
}
}
}
</style>

4
ruoyi-ui/src/main.js
View File

@ -73,6 +73,10 @@ DictData.install()
* please remove it before going online! ! ! * please remove it before going online! ! !
*/ */
// 修改 el-dialog 默认点击遮照为不关闭
Element.Dialog.props.closeOnClickModal.default = false
Vue.use(Element, { Vue.use(Element, {
size: Cookies.get('size') || 'medium' // set element-ui default size size: Cookies.get('size') || 'medium' // set element-ui default size
}) })