From 2beada4c5b6d529b985c680a4672fa7e9a0587df Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期二, 11 三月 2025 11:27:01 +0800
Subject: [PATCH] 一些更改
---
src/hooks/web/useContentHeight.ts | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/hooks/web/useContentHeight.ts b/src/hooks/web/useContentHeight.ts
index 558cd51..5c122dd 100644
--- a/src/hooks/web/useContentHeight.ts
+++ b/src/hooks/web/useContentHeight.ts
@@ -1,8 +1,8 @@
-import { ComputedRef, isRef, nextTick, Ref, ref, unref, watch } from 'vue';
+import { useLayoutHeight } from '@/layouts/default/content/useContentViewHeight';
+import { getViewportOffset } from '@/utils/domUtils';
+import { isNumber, isString } from '@/utils/is';
import { onMountedOrActivated, useWindowSizeFn } from '@vben/hooks';
-import { useLayoutHeight } from '/@/layouts/default/content/useContentViewHeight';
-import { getViewportOffset } from '/@/utils/domUtils';
-import { isNumber, isString } from '/@/utils/is';
+import { ComputedRef, isRef, nextTick, Ref, ref, unref, watch } from 'vue';
export interface CompensationHeight {
// 浣跨敤 layout Footer 楂樺害浣滀负鍒ゆ柇琛ュ伩楂樺害鐨勬潯浠�
@@ -20,7 +20,7 @@
* @param flag 鐢ㄤ簬寮�鍚绠楃殑鍝嶅簲寮忔爣璇�
* @param anchorRef 閿氱偣缁勪欢 Ref<ElRef | ComponentRef>
* @param subtractHeightRefs 寰呭噺鍘婚珮搴︾殑缁勪欢鍒楄〃 Ref<ElRef | ComponentRef>
- * @param substractSpaceRefs 寰呭噺鍘荤┖闂茬┖闂�(margins/paddings)鐨勭粍浠跺垪琛� Ref<ElRef | ComponentRef>
+ * @param subtractSpaceRefs 寰呭噺鍘荤┖闂茬┖闂�(margins/paddings)鐨勭粍浠跺垪琛� Ref<ElRef | ComponentRef>
* @param offsetHeightRef 璁＄畻鍋忕Щ鐨勫搷搴斿紡楂樺害锛岃绠楅珮搴︽椂灏嗙洿鎺ュ噺鍘绘鍊�
* @param upwardSpace 鍚戜笂閫掑綊鍑忓幓绌洪棽绌洪棿鐨� 灞傜骇 鎴� 鐩村埌鎸囧畾class涓烘 鏁板�间负2浠ｈ〃鍚戜笂閫掑綊涓ゆ|鏁板�间负ant-layout琛ㄧず鍚戜笂閫掑綊鐩村埌纰拌.ant-layout涓烘
* @returns 鍝嶅簲寮忛珮搴�
@@ -29,7 +29,7 @@
flag: ComputedRef<Boolean>,
anchorRef: Ref,
subtractHeightRefs: Ref[],
- substractSpaceRefs: Ref[],
+ subtractSpaceRefs: Ref[],
upwardSpace: Ref<Upward> | ComputedRef<Upward> | Upward = 0,
offsetHeightRef: Ref<number> = ref(0),
) {
@@ -100,16 +100,16 @@
}
const { bottomIncludeBody } = getViewportOffset(anchorEl);
- // substract elements height
- let substractHeight = 0;
+ // subtract elements height
+ let subtractHeight = 0;
subtractHeightRefs.forEach((item) => {
- substractHeight += getEl(unref(item))?.offsetHeight ?? 0;
+ subtractHeight += getEl(unref(item))?.offsetHeight ?? 0;
});
// subtract margins / paddings
- let substractSpaceHeight = calcSubtractSpace(anchorEl) ?? 0;
- substractSpaceRefs.forEach((item) => {
- substractSpaceHeight += calcSubtractSpace(getEl(unref(item)));
+ let subtractSpaceHeight = calcSubtractSpace(anchorEl) ?? 0;
+ subtractSpaceRefs.forEach((item) => {
+ subtractSpaceHeight += calcSubtractSpace(getEl(unref(item)));
});
// upwardSpace
@@ -144,8 +144,8 @@
bottomIncludeBody -
unref(layoutFooterHeightRef) -
unref(offsetHeightRef) -
- substractHeight -
- substractSpaceHeight -
+ subtractHeight -
+ subtractSpaceHeight -
upwardSpaceHeight;
// compensation height
--
Gitblit v1.9.3