3h1-ui 2.10.0-alpha.0 → 2.10.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/es/index.js +2 -8
- package/es/ui/src/Table/src/props.d.ts +1 -1
- package/lib/index.js +2 -8
- package/package.json +1 -1
package/es/index.js
CHANGED
|
@@ -13518,7 +13518,7 @@ function useTableScroll(propsRef, tableElRef, columnsRef, rowSelectionRef, getDa
|
|
|
13518
13518
|
return;
|
|
13519
13519
|
let paddingHeight = propsRef.value.useTableWrapper ? 20 : 10;
|
|
13520
13520
|
let paginationHeight = 10;
|
|
13521
|
-
if (
|
|
13521
|
+
if (!!isBoolean(pagination) && tableData.length !== 0) {
|
|
13522
13522
|
paginationEl = tableEl.querySelector(".ant-pagination");
|
|
13523
13523
|
if (paginationEl) {
|
|
13524
13524
|
const offsetHeight = paginationEl.offsetHeight;
|
|
@@ -13563,12 +13563,6 @@ function useTableScroll(propsRef, tableElRef, columnsRef, rowSelectionRef, getDa
|
|
|
13563
13563
|
} else {
|
|
13564
13564
|
bottomIncludeBody = getViewportOffset(headEl).bottomIncludeBody;
|
|
13565
13565
|
}
|
|
13566
|
-
console.log("bottomIncludeBody", bottomIncludeBody);
|
|
13567
|
-
console.log("resizeHeightOffset", resizeHeightOffset);
|
|
13568
|
-
console.log("paddingHeight", paddingHeight);
|
|
13569
|
-
console.log("paginationHeight", paginationHeight);
|
|
13570
|
-
console.log("footerHeight", footerHeight);
|
|
13571
|
-
console.log("headerHeight", headerHeight);
|
|
13572
13566
|
let height = bottomIncludeBody - (resizeHeightOffset || 0) - paddingHeight - paginationHeight - footerHeight - headerHeight;
|
|
13573
13567
|
height = (height > maxHeight ? maxHeight : height) ?? height;
|
|
13574
13568
|
height = Math.ceil(height);
|
|
@@ -15398,7 +15392,7 @@ const basicProps$3 = reactive({
|
|
|
15398
15392
|
bordered: propTypes.bool.def(false),
|
|
15399
15393
|
pagination: {
|
|
15400
15394
|
type: [Object, Boolean],
|
|
15401
|
-
default:
|
|
15395
|
+
default: true
|
|
15402
15396
|
},
|
|
15403
15397
|
loading: propTypes.bool,
|
|
15404
15398
|
rowClassName: {
|
|
@@ -612,7 +612,7 @@ export declare const basicProps: {
|
|
|
612
612
|
};
|
|
613
613
|
pagination: {
|
|
614
614
|
type: ((new (...args: any[]) => boolean | PaginationProps) | (() => boolean | PaginationProps)) | ((new (...args: any[]) => boolean | PaginationProps) | (() => boolean | PaginationProps))[];
|
|
615
|
-
default:
|
|
615
|
+
default: boolean;
|
|
616
616
|
};
|
|
617
617
|
loading: {
|
|
618
618
|
readonly validate: (fn: import("vue-types/dist/types").ValidatorFunction<unknown>) => import("vue-types").VueTypeValidableDef<boolean> & {
|
package/lib/index.js
CHANGED
|
@@ -13520,7 +13520,7 @@ function useTableScroll(propsRef, tableElRef, columnsRef, rowSelectionRef, getDa
|
|
|
13520
13520
|
return;
|
|
13521
13521
|
let paddingHeight = propsRef.value.useTableWrapper ? 20 : 10;
|
|
13522
13522
|
let paginationHeight = 10;
|
|
13523
|
-
if (
|
|
13523
|
+
if (!!utils.isBoolean(pagination) && tableData.length !== 0) {
|
|
13524
13524
|
paginationEl = tableEl.querySelector(".ant-pagination");
|
|
13525
13525
|
if (paginationEl) {
|
|
13526
13526
|
const offsetHeight = paginationEl.offsetHeight;
|
|
@@ -13565,12 +13565,6 @@ function useTableScroll(propsRef, tableElRef, columnsRef, rowSelectionRef, getDa
|
|
|
13565
13565
|
} else {
|
|
13566
13566
|
bottomIncludeBody = utils.getViewportOffset(headEl).bottomIncludeBody;
|
|
13567
13567
|
}
|
|
13568
|
-
console.log("bottomIncludeBody", bottomIncludeBody);
|
|
13569
|
-
console.log("resizeHeightOffset", resizeHeightOffset);
|
|
13570
|
-
console.log("paddingHeight", paddingHeight);
|
|
13571
|
-
console.log("paginationHeight", paginationHeight);
|
|
13572
|
-
console.log("footerHeight", footerHeight);
|
|
13573
|
-
console.log("headerHeight", headerHeight);
|
|
13574
13568
|
let height = bottomIncludeBody - (resizeHeightOffset || 0) - paddingHeight - paginationHeight - footerHeight - headerHeight;
|
|
13575
13569
|
height = (height > maxHeight ? maxHeight : height) ?? height;
|
|
13576
13570
|
height = Math.ceil(height);
|
|
@@ -15400,7 +15394,7 @@ const basicProps$3 = vue.reactive({
|
|
|
15400
15394
|
bordered: utils.propTypes.bool.def(false),
|
|
15401
15395
|
pagination: {
|
|
15402
15396
|
type: [Object, Boolean],
|
|
15403
|
-
default:
|
|
15397
|
+
default: true
|
|
15404
15398
|
},
|
|
15405
15399
|
loading: utils.propTypes.bool,
|
|
15406
15400
|
rowClassName: {
|