From 7b87d6d29e51626ec4f0df011a462c4c30745bf9 Mon Sep 17 00:00:00 2001
From: invalid w <wangjuesix@gmail.com>
Date: Fri, 20 Oct 2023 17:15:05 +0800
Subject: [PATCH] chore(BasicTable): resolve BasicTable component ts type error

---
 src/components/Table/src/BasicTable.vue            | 10 +++++-----
 src/components/Table/src/components/HeaderCell.vue | 13 +++++++------
 src/components/Table/src/hooks/useColumns.ts       |  3 ++-
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/components/Table/src/BasicTable.vue b/src/components/Table/src/BasicTable.vue
index 80e414af..62649a25 100644
--- a/src/components/Table/src/BasicTable.vue
+++ b/src/components/Table/src/BasicTable.vue
@@ -21,7 +21,7 @@
       :rowClassName="getRowClassName"
       v-show="getEmptyDataIsShowTable"
       @change="handleTableChange"
-      @resizeColumn="setColumnWidth"
+      @resize-column="setColumnWidth"
     >
       <template #[item]="data" v-for="item in Object.keys($slots)" :key="item">
         <slot :name="item" v-bind="data || {}"></slot>
@@ -177,12 +177,12 @@
         emit,
       );
 
-      function handleTableChange(...args) {
-        onTableChange.call(undefined, ...args);
-        emit('change', ...args);
+      function handleTableChange(pagination: any, filters: any, sorter: any, extra: any) {
+        onTableChange(pagination, filters, sorter);
+        emit('change', pagination, filters, sorter);
         // 解决通过useTable注册onChange时不起作用的问题
         const { onChange } = unref(getProps);
-        onChange && isFunction(onChange) && onChange.call(undefined, ...args);
+        onChange && isFunction(onChange) && onChange(pagination, filters, sorter, extra);
       }
 
       const {
diff --git a/src/components/Table/src/components/HeaderCell.vue b/src/components/Table/src/components/HeaderCell.vue
index e906beff..22ada922 100644
--- a/src/components/Table/src/components/HeaderCell.vue
+++ b/src/components/Table/src/components/HeaderCell.vue
@@ -5,6 +5,7 @@
   import BasicHelp from '/@/components/Basic/src/BasicHelp.vue';
   import EditTableHeaderCell from './EditTableHeaderIcon.vue';
   import { useDesign } from '/@/hooks/web/useDesign';
+  import { ColumnType } from 'ant-design-vue/lib/table/interface';
 
   export default defineComponent({
     name: 'TableHeaderCell',
@@ -14,22 +15,22 @@
     },
     props: {
       column: {
-        type: Object as PropType<BasicColumn>,
+        type: Object as PropType<ColumnType<any>>,
         default: () => ({}),
       },
     },
     setup(props) {
       const { prefixCls } = useDesign('basic-table-header-cell');
 
-      const getIsEdit = computed(() => !!props.column?.edit);
+      const getIsEdit = computed(() => !!(props.column as BasicColumn)?.edit);
       const getTitle = computed(() => {
-        const column = props.column;
+        const column = props.column as BasicColumn;
         if (typeof column.customHeaderRender === 'function') {
-          return column.customHeaderRender(props.column);
+          return column.customHeaderRender(column);
         }
-        return props.column?.customTitle || props.column?.title;
+        return column?.customTitle || props.column?.title;
       });
-      const getHelpMessage = computed(() => props.column?.helpMessage);
+      const getHelpMessage = computed(() => (props.column as BasicColumn)?.helpMessage);
 
       return () => {
         return (
diff --git a/src/components/Table/src/hooks/useColumns.ts b/src/components/Table/src/hooks/useColumns.ts
index f49714a8..80d946cd 100644
--- a/src/components/Table/src/hooks/useColumns.ts
+++ b/src/components/Table/src/hooks/useColumns.ts
@@ -9,6 +9,7 @@ import { isArray, isBoolean, isFunction, isMap, isString } from '/@/utils/is';
 import { cloneDeep, isEqual } from 'lodash-es';
 import { formatToDate } from '/@/utils/dateUtil';
 import { ACTION_COLUMN_FLAG, DEFAULT_ALIGN, INDEX_COLUMN_FLAG, PAGE_SIZE } from '../const';
+import { ColumnType } from 'ant-design-vue/es/table';
 
 function handleItem(item: BasicColumn, ellipsis: boolean) {
   const { key, dataIndex, children } = item;
@@ -265,7 +266,7 @@ export function useColumns(
   /**
    * 拖拽列宽修改列的宽度
    */
-  function setColumnWidth(w: number, col: BasicColumn) {
+  function setColumnWidth(w: number, col: ColumnType<BasicColumn>) {
     col.width = w;
   }