github
/
jeecg-boot
mirror of https://github.com/jeecgboot/jeecg-boot
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

修复问题：低代码开发Online表单开发主子表ERP显示问题 #8532

dependabot/maven/jeecg-boot/commons-fileupload-commons-fileupload-1.6.0
JEECG 2025-07-07 14:51:33 +08:00
parent e00b25af42
commit baee00921f
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jeecgboot-vue3/package.json
View File

@ -21,7 +21,7 @@
"husky:install": "husky install" "husky:install": "husky install"
}, },
"dependencies": { "dependencies": {
"@jeecg/online": "3.7.4-beta", "@jeecg/online": "3.7.4",
"@jeecg/aiflow": "1.1.1", "@jeecg/aiflow": "1.1.1",
"@logicflow/core": "^2.0.10", "@logicflow/core": "^2.0.10",
"@logicflow/extension": "^2.0.14", "@logicflow/extension": "^2.0.14",

12
jeecgboot-vue3/pnpm-lock.yaml
View File

@ -21,8 +21,8 @@ importers:
specifier: 1.1.1 specifier: 1.1.1
version: 1.1.1 version: 1.1.1
'@jeecg/online': '@jeecg/online':
specifier: 3.7.4-beta specifier: 3.7.4
version: 3.7.4-beta version: 3.7.4
'@logicflow/core': '@logicflow/core':
specifier: ^2.0.10 specifier: ^2.0.10
version: 2.0.16 version: 2.0.16
@ -1198,8 +1198,8 @@ packages:
'@jeecg/aiflow@1.1.1': '@jeecg/aiflow@1.1.1':
resolution: {integrity: sha512-tzX3RXsayssfmMmYFaj7fZJtGdLCZ/AuBnqEafdarIWHx/W5LqWae+o1zo0dyl/QUwMpYYjQJlKBjR8DS20Z0A==} resolution: {integrity: sha512-tzX3RXsayssfmMmYFaj7fZJtGdLCZ/AuBnqEafdarIWHx/W5LqWae+o1zo0dyl/QUwMpYYjQJlKBjR8DS20Z0A==}
'@jeecg/online@3.7.4-beta': '@jeecg/online@3.7.4':
resolution: {integrity: sha512-vzhyUikxmlJwpQFxzMexibCYAW6Vdwu4to6wkuaCAjv3DG4b2TIWGzQE/WpU2FAs8E6jBFUNnKk305SslG7XKA==, tarball: https://registry.npmmirror.com/@jeecg/online/-/online-3.7.4-beta.tgz} resolution: {integrity: sha512-P5aWkN2GpnkLpTLSS3dxgXAAXh4JzaqBDa+QtA+J4QQnhMtVGwZBObig9rag2vU6rkBLxvggbOpmalwyfFr9fQ==}
'@jest/console@29.7.0': '@jest/console@29.7.0':
resolution: {integrity: sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==} resolution: {integrity: sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==}
@ -6264,7 +6264,7 @@ packages:
vue: '>=3.0.0' vue: '>=3.0.0'
vue-demi@0.14.10: 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'} engines: {node: '>=12'}
hasBin: true hasBin: true
peerDependencies: peerDependencies:
@ -7240,7 +7240,7 @@ snapshots:
'@jeecg/aiflow@1.1.1': {} '@jeecg/aiflow@1.1.1': {}
'@jeecg/online@3.7.4-beta': {} '@jeecg/online@3.7.4': {}
'@jest/console@29.7.0': '@jest/console@29.7.0':
dependencies: dependencies:

7
jeecgboot-vue3/src/components/Table/src/hooks/useTableScroll.ts
View File

@ -158,6 +158,13 @@ export function useTableScroll(
const trHeight = lastrEl.offsetHeight; const trHeight = lastrEl.offsetHeight;
const dataHeight = trHeight * pageSize; const dataHeight = trHeight * pageSize;
if (tableBody && lastrEl) { 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) { if (current === 1 && pageSize > unref(getDataSourceRef).length && total <= pageSize) {
tableBody.style.height = `${height}px`; tableBody.style.height = `${height}px`;
} else { } else {