@ditari/bsui 1.1.40 → 1.1.42

package/src/table/Table.tsx

@@ -2,6 +2,8 @@ import {
   computed,
   defineComponent,
   nextTick,
+  onBeforeUnmount,
+  onDeactivated,
   PropType,
   reactive,
   ref,
@@ -143,6 +145,7 @@ const DXTable = defineComponent({
       const antTableBodyRef = ref<any>(null);
       // 计算高度
       const playHeight = (height: number) => {
+        console.log("okk");
         try {
           const tableEl = tableRef?.value?.$el;
           const headerHeight = useEleHeight(
@@ -184,6 +187,8 @@ const DXTable = defineComponent({
       //     });
       //   }
       // });
+
+      let playTimeout: any = null;
       watch(
         () => props.height,
         (val) => {
@@ -193,15 +198,26 @@ const DXTable = defineComponent({
                 playHeight(props.height);
               } else {
                 // 必须在组件挂载成功后 执行计算高度 否则无法正确获取元素的高度
-                setTimeout(() => {
+                playTimeout = setTimeout(() => {
                   playHeight(props.height);
                   // 如果表格头有很多列的情况下，获取到的头部高度不对，需要延迟执行获取高度方法
                 }, 100);
               }
             });
           }
+        },
+        {
+          immediate: true
         }
       );
+
+      onBeforeUnmount(() => {
+        playTimeout && clearTimeout(playTimeout);
+      });
+      onDeactivated(() => {
+        playTimeout && clearTimeout(playTimeout);
+      });
+
       // 监听分页组件
       const onPageChange = (page: number, size: number) => {
         onChange ? onChange({ page: page === 0 ? 1 : page, size }) : null;
@@ -311,6 +327,9 @@ const DXTable = defineComponent({
           } else {
             rowSelection.value = undefined;
           }
+        },
+        {
+          immediate: true
         }
       );