From fe2718402c2719d4e6123ffcb468e8b5aaf9795c Mon Sep 17 00:00:00 2001 From: ibiz_zhf <1204297681@qq.com> Date: Tue, 16 Dec 2025 16:05:25 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E6=A8=A1=E6=80=81=E6=A1=86?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=98=BE=E7=A4=BA=E5=85=B3=E9=97=AD=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E3=80=81=E5=B9=B6=E4=B8=94=E7=82=B9=E5=87=BB=E9=81=AE?= =?UTF-8?q?=E7=BD=A9=E5=90=8E=E5=85=B3=E9=97=AD=E6=A8=A1=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/util/app-modal/app-modal-component.tsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/util/app-modal/app-modal-component.tsx b/src/util/app-modal/app-modal-component.tsx index 01ebe18b..cd98d624 100644 --- a/src/util/app-modal/app-modal-component.tsx +++ b/src/util/app-modal/app-modal-component.tsx @@ -56,8 +56,8 @@ export const AppModalComponent = defineComponent({ const options = ref({ footerHide: true, modalClass: '', - // 是否显示弹框关闭按钮,默认不显示 - showClose: false, + // 是否显示弹框关闭按钮,默认显示 + showClose: true, // 是否显示遮罩,默认显示 overlay: true, }); @@ -136,6 +136,7 @@ export const AppModalComponent = defineComponent({ ]} style={this.customStyle} overlay={this.options.overlay} + close-on-click-overlay={true} before-close={this.onBeforeClose} {...this.options} > -- Gitee From 7431082ef13e1102c66d909fff4c43bf9a724e03 Mon Sep 17 00:00:00 2001 From: ibiz_zhf <1204297681@qq.com> Date: Tue, 16 Dec 2025 16:11:10 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E7=A7=BB=E5=8A=A8=E7=AB=AF?= =?UTF-8?q?=E5=A4=9A=E6=95=B0=E6=8D=AE=E9=83=A8=E4=BB=B6=E3=80=81=E5=8D=A1?= =?UTF-8?q?=E7=89=87=E5=8F=AA=E5=AD=98=E5=9C=A8=E4=B8=80=E9=A1=B5=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=97=B6=E4=B8=8D=E6=98=BE=E7=A4=BA=E6=88=91=E5=B7=B2?= =?UTF-8?q?=E7=BB=8F=E5=88=B0=E5=BA=95=E5=95=A6=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 2 ++ src/util/list-util/list-render-util.tsx | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a5678e1d..20e71bcc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,8 @@ - 优化搜索栏、工具栏、分页导航面板、向导面板部件样式,规范其样式变量 - 更新数值编辑框,步进器,分页侧边栏样式 - 更新轮播图,视频播放器组件注释 +- 模态框默认显示关闭按钮、并且点击遮罩后关闭模态 +- 移动端多数据部件、卡片只存在一页数据时不显示我已经到底啦提示 ### Fixed diff --git a/src/util/list-util/list-render-util.tsx b/src/util/list-util/list-render-util.tsx index a535588c..8549de33 100644 --- a/src/util/list-util/list-render-util.tsx +++ b/src/util/list-util/list-render-util.tsx @@ -260,7 +260,11 @@ export function useListRender( offset={50} finished={isLodeFinished.value} loading-text={ibiz.i18n.t('control.common.loadMore')} - finished-text={ibiz.i18n.t('control.common.loadFinish')} + finished-text={ + c.state.totalPages === 1 + ? '' + : ibiz.i18n.t('control.common.loadFinish') + } error-text={ibiz.i18n.t('control.common.loadError')} onLoad={() => c.loadMore()} > -- Gitee