diff --git a/jshERP-web/src/assets/less/common.less b/jshERP-web/src/assets/less/common.less index 01e542dc..820304e3 100644 --- a/jshERP-web/src/assets/less/common.less +++ b/jshERP-web/src/assets/less/common.less @@ -41,7 +41,7 @@ margin-bottom: 12px; } /*全屏模式*/ -.ant-modal-cust-warp .fullscreen .ant-modal-body { +.ant-modal-cust-warp .fullscreen >.ant-modal-body { padding: 24px 24px 12px 24px; height: calc(100% - 200px) !important; overflow-y: auto diff --git a/jshERP-web/src/components/jeecg/JModal/index.vue b/jshERP-web/src/components/jeecg/JModal/index.vue index 255eb94e..e0f5fa2c 100644 --- a/jshERP-web/src/components/jeecg/JModal/index.vue +++ b/jshERP-web/src/components/jeecg/JModal/index.vue @@ -198,24 +198,24 @@ height: 100vh; - & .ant-modal-content { + >.ant-modal-content { height: 100vh; border-radius: 0; - & .ant-modal-body { + >.ant-modal-body { /* title 和 footer 各占 55px */ height: calc(100% - 55px - 55px); overflow: auto; } } - &.no-title, &.no-footer { + >.no-title, &.no-footer { .ant-modal-body { height: calc(100% - 55px); } } - &.no-title.no-footer { + >.no-title.no-footer { .ant-modal-body { height: 100%; }