From c6e48c1c43985c95dfb15b52f8b52eaf9a7613d1 Mon Sep 17 00:00:00 2001 From: zhangdaiscott <zhangdaiscott@163.com> Date: Fri, 14 Oct 2022 13:47:24 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E5=8D=95=E8=AF=84=E8=AE=BA=E5=8C=BA?= =?UTF-8?q?=E5=9F=9F=E5=8A=9F=E8=83=BD=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Modal/src/BasicModal.vue | 27 +++++-------------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/src/components/Modal/src/BasicModal.vue b/src/components/Modal/src/BasicModal.vue index 87dd1c5..ee4328f 100644 --- a/src/components/Modal/src/BasicModal.vue +++ b/src/components/Modal/src/BasicModal.vue @@ -17,7 +17,7 @@ </template> <!-- update-begin-author:taoyan date:2022-7-18 for: modal弹窗 支持评论 slot --> - <a-row v-if="getProps.enableComment" class="jeecg-modal-wrapper"> + <a-row class="jeecg-modal-wrapper"> <a-col :span="24-commentSpan" class="jeecg-modal-content"> <ModalWrapper :useWrapper="getProps.useWrapper" @@ -36,31 +36,14 @@ <slot></slot> </ModalWrapper> </a-col> - + <a-col :span="commentSpan" class="jeecg-comment-outer"> <slot name="comment"></slot> </a-col> - + </a-row> - <ModalWrapper - v-else - :useWrapper="getProps.useWrapper" - :footerOffset="wrapperFooterOffset" - :fullScreen="fullScreenRef" - ref="modalWrapperRef" - :loading="getProps.loading" - :loading-tip="getProps.loadingTip" - :minHeight="getProps.minHeight" - :height="getWrapperHeight" - :visible="visibleRef" - :modalFooterHeight="footer !== undefined && !footer ? 0 : undefined" - v-bind="omit(getProps.wrapperProps, 'visible', 'height', 'modalFooterHeight')" - @ext-height="handleExtHeight" - @height-change="handleHeightChange"> - <slot></slot> - </ModalWrapper> <!-- update-end-author:taoyan date:2022-7-18 for: modal弹窗 支持评论 slot --> - + <template #[item]="data" v-for="item in Object.keys(omit($slots, 'default'))"> <slot :name="item" v-bind="data || {}"></slot> </template> @@ -282,4 +265,4 @@ .jeecg-modal-content { height: 100%; } -</style> +</style> \ No newline at end of file