From baee00921ffcef6455925224fd7f2e9221a98303 Mon Sep 17 00:00:00 2001 From: JEECG <445654970@qq.com> Date: Mon, 7 Jul 2025 14:51:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=97=AE=E9=A2=98=EF=BC=9A?= =?UTF-8?q?=E4=BD=8E=E4=BB=A3=E7=A0=81=E5=BC=80=E5=8F=91Online=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E5=BC=80=E5=8F=91=E4=B8=BB=E5=AD=90=E8=A1=A8ERP?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=20#8532?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jeecgboot-vue3/package.json | 2 +- jeecgboot-vue3/pnpm-lock.yaml | 12 ++++++------ .../src/components/Table/src/hooks/useTableScroll.ts | 7 +++++++ 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/jeecgboot-vue3/package.json b/jeecgboot-vue3/package.json index 2c4812eda..922ba25fe 100644 --- a/jeecgboot-vue3/package.json +++ b/jeecgboot-vue3/package.json @@ -21,7 +21,7 @@ "husky:install": "husky install" }, "dependencies": { - "@jeecg/online": "3.7.4-beta", + "@jeecg/online": "3.7.4", "@jeecg/aiflow": "1.1.1", "@logicflow/core": "^2.0.10", "@logicflow/extension": "^2.0.14", diff --git a/jeecgboot-vue3/pnpm-lock.yaml b/jeecgboot-vue3/pnpm-lock.yaml index 6a1711e99..ef12711ac 100644 --- a/jeecgboot-vue3/pnpm-lock.yaml +++ b/jeecgboot-vue3/pnpm-lock.yaml @@ -21,8 +21,8 @@ importers: specifier: 1.1.1 version: 1.1.1 '@jeecg/online': - specifier: 3.7.4-beta - version: 3.7.4-beta + specifier: 3.7.4 + version: 3.7.4 '@logicflow/core': specifier: ^2.0.10 version: 2.0.16 @@ -1198,8 +1198,8 @@ packages: '@jeecg/aiflow@1.1.1': resolution: {integrity: sha512-tzX3RXsayssfmMmYFaj7fZJtGdLCZ/AuBnqEafdarIWHx/W5LqWae+o1zo0dyl/QUwMpYYjQJlKBjR8DS20Z0A==} - '@jeecg/online@3.7.4-beta': - resolution: {integrity: sha512-vzhyUikxmlJwpQFxzMexibCYAW6Vdwu4to6wkuaCAjv3DG4b2TIWGzQE/WpU2FAs8E6jBFUNnKk305SslG7XKA==, tarball: https://registry.npmmirror.com/@jeecg/online/-/online-3.7.4-beta.tgz} + '@jeecg/online@3.7.4': + resolution: {integrity: sha512-P5aWkN2GpnkLpTLSS3dxgXAAXh4JzaqBDa+QtA+J4QQnhMtVGwZBObig9rag2vU6rkBLxvggbOpmalwyfFr9fQ==} '@jest/console@29.7.0': resolution: {integrity: sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==} @@ -6264,7 +6264,7 @@ packages: vue: '>=3.0.0' vue-demi@0.14.10: - resolution: {integrity: sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==, tarball: https://registry.npmmirror.com/vue-demi/-/vue-demi-0.14.10.tgz} + resolution: {integrity: sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==} engines: {node: '>=12'} hasBin: true peerDependencies: @@ -7240,7 +7240,7 @@ snapshots: '@jeecg/aiflow@1.1.1': {} - '@jeecg/online@3.7.4-beta': {} + '@jeecg/online@3.7.4': {} '@jest/console@29.7.0': dependencies: diff --git a/jeecgboot-vue3/src/components/Table/src/hooks/useTableScroll.ts b/jeecgboot-vue3/src/components/Table/src/hooks/useTableScroll.ts index d7f1f5dc9..2fef2ed69 100644 --- a/jeecgboot-vue3/src/components/Table/src/hooks/useTableScroll.ts +++ b/jeecgboot-vue3/src/components/Table/src/hooks/useTableScroll.ts @@ -158,6 +158,13 @@ export function useTableScroll( const trHeight = lastrEl.offsetHeight; const dataHeight = trHeight * pageSize; if (tableBody && lastrEl) { + // update-begin--author:liaozhiyang---date:20250702---for:【issues/8532】online权限管理中的按钮权限第一页数据看不到 + // table是否隐藏(隐藏的table不能吸底) + const isTableBodyHide = tableBody.offsetHeight == 0 && tableBody.offsetWidth == 0; + if (isTableBodyHide) { + return; + } + // update-end--author:liaozhiyang---date:20250702---for:【issues/8532】online权限管理中的按钮权限第一页数据看不到 if (current === 1 && pageSize > unref(getDataSourceRef).length && total <= pageSize) { tableBody.style.height = `${height}px`; } else {