diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/index.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/index.vue.vm index 95f7d66a2..c84a510ac 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/index.vue.vm +++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/index.vue.vm @@ -96,7 +96,7 @@ @pagination="getList"/> - + #foreach($column in $columns) #if ($column.createOperation || $column.updateOperation) diff --git a/yudao-ui-admin/src/assets/styles/ruoyi.scss b/yudao-ui-admin/src/assets/styles/ruoyi.scss index 4c2bde64d..0eae565df 100644 --- a/yudao-ui-admin/src/assets/styles/ruoyi.scss +++ b/yudao-ui-admin/src/assets/styles/ruoyi.scss @@ -71,6 +71,16 @@ padding: 10px 20px 0; } +.el-dialog{ + display: flex; + flex-direction: column; + max-width: calc(100% - 30px); + max-height: calc(100% - 70px); + .el-dialog__body { + overflow: auto; + } +} + .el-table { .el-table__header-wrapper, .el-table__fixed-header-wrapper { th { diff --git a/yudao-ui-admin/src/main.js b/yudao-ui-admin/src/main.js index 680b14585..01504a75e 100644 --- a/yudao-ui-admin/src/main.js +++ b/yudao-ui-admin/src/main.js @@ -70,6 +70,10 @@ console.log(request) Vue.prototype.$axios = request import '@/styles/index.scss' +// 默认点击背景不关闭弹窗 +import ElementUI from 'element-ui' +ElementUI.Dialog.props.closeOnClickModal.default = false + /** * If you don't want to use mock-server * you want to use MockJs for mock api