From 8197ef78a3f6aee7d4fe0d76c7ca11a1bf9514e0 Mon Sep 17 00:00:00 2001 From: jishenghua <752718920@qq.com> Date: Sun, 3 Nov 2024 17:16:09 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=85=A8=E5=B1=8F=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=E7=BC=96=E8=BE=91=E7=95=8C=E9=9D=A2=E5=90=8E=EF=BC=8C?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E5=86=85=E9=83=A8=E5=BC=B9=E7=AA=97=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jshERP-web/src/assets/less/common.less | 2 +- jshERP-web/src/components/jeecg/JModal/index.vue | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/jshERP-web/src/assets/less/common.less b/jshERP-web/src/assets/less/common.less index 01e542dcf..820304e3a 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 255eb94e2..e0f5fa2cc 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%; }