From d7c8ff16100712121563e8c8965e3bbcbfb79838 Mon Sep 17 00:00:00 2001 From: ajaxzheng <894103554@qq.com> Date: Tue, 17 Jun 2025 14:39:34 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix(pager):=20=E9=99=90=E5=88=B6=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E7=BB=84=E4=BB=B6=E7=9A=84=20size=20=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=E5=80=BC=E4=B8=BA=20'mini'=20=E6=88=96=E7=A9=BA?= =?UTF-8?q?=E5=AD=97=E7=AC=A6=E4=B8=B2=EF=BC=8C=E9=98=B2=E6=AD=A2=E8=AD=A6?= =?UTF-8?q?=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/vue/src/grid/src/pager/src/methods.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/vue/src/grid/src/pager/src/methods.ts b/packages/vue/src/grid/src/pager/src/methods.ts index b4fe8c71ce..ae48e64fc2 100644 --- a/packages/vue/src/grid/src/pager/src/methods.ts +++ b/packages/vue/src/grid/src/pager/src/methods.ts @@ -45,7 +45,8 @@ export default { pager.component = pager.component || (fetchData && fetchData.api ? Pager : null) res = h(hooks.toRaw(pager.component), { props: { - size: vSize, + // 只允许 'mini' 或 '',否则传空字符串,防止分页组件报警告 + size: ['mini', ''].includes(vSize) ? vSize : '', // 兼容 grid 的 size 传递 loading: loading || tableLoading, isBeforePageChange: _vm.isBeforePageChange || _vm.showSaveMsg, accurateJumper: _vm.autoLoad, From 98d887f84e997fc3e19b12986b2d4911b82f9681 Mon Sep 17 00:00:00 2001 From: ajaxzheng <894103554@qq.com> Date: Tue, 17 Jun 2025 14:45:57 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix(pager):=20=E6=9B=B4=E6=96=B0=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E7=BB=84=E4=BB=B6=E7=9A=84=20size=20=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=E9=80=BB=E8=BE=91=EF=BC=8C=E6=94=AF=E6=8C=81=20'small?= =?UTF-8?q?'=20=E5=92=8C=20'mini'=EF=BC=8C=E5=B9=B6=E5=9C=A8=20size=20?= =?UTF-8?q?=E4=B8=BA=20'medium'=20=E6=97=B6=E4=BC=A0=E9=80=92=E7=A9=BA?= =?UTF-8?q?=E5=AD=97=E7=AC=A6=E4=B8=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/vue/src/grid/src/pager/src/methods.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/vue/src/grid/src/pager/src/methods.ts b/packages/vue/src/grid/src/pager/src/methods.ts index ae48e64fc2..7118dce088 100644 --- a/packages/vue/src/grid/src/pager/src/methods.ts +++ b/packages/vue/src/grid/src/pager/src/methods.ts @@ -45,8 +45,8 @@ export default { pager.component = pager.component || (fetchData && fetchData.api ? Pager : null) res = h(hooks.toRaw(pager.component), { props: { - // 只允许 'mini' 或 '',否则传空字符串,防止分页组件报警告 - size: ['mini', ''].includes(vSize) ? vSize : '', // 兼容 grid 的 size 传递 + // tiny-grid 的 size 为 small/mini 时,pager 传 mini;为 medium 时,pager 传空字符串 + size: vSize === 'medium' ? '' : ['small', 'mini'].includes(vSize) ? 'mini' : '', // 兼容 grid 的 size 传递 loading: loading || tableLoading, isBeforePageChange: _vm.isBeforePageChange || _vm.showSaveMsg, accurateJumper: _vm.autoLoad,