From 4fcfc5e26d26a25d108c441c69627ef0362d2efa Mon Sep 17 00:00:00 2001
From: Eiinu <eiinu@qq.com>
Date: Mon, 18 Dec 2023 17:02:10 +0800
Subject: [PATCH] chore(table): improve type def (#2762)

---
 src/packages/__VUE/table/common.ts      | 110 ------------------------
 src/packages/__VUE/table/index.taro.vue |  10 +--
 src/packages/__VUE/table/types.ts       |   4 +-
 3 files changed, 7 insertions(+), 117 deletions(-)
 delete mode 100644 src/packages/__VUE/table/common.ts

diff --git a/src/packages/__VUE/table/common.ts b/src/packages/__VUE/table/common.ts
deleted file mode 100644
index 0037375a53..0000000000
--- a/src/packages/__VUE/table/common.ts
+++ /dev/null
@@ -1,110 +0,0 @@
-import { computed, PropType, reactive, toRefs, watch } from 'vue';
-import RenderColumn from './renderColumn';
-import { DownArrow } from '@nutui/icons-vue';
-import { TableColumns } from './types';
-
-export const component = (componentName: string, translate: Function) => {
-  return {
-    components: {
-      RenderColumn,
-      DownArrow
-    },
-    props: {
-      bordered: {
-        type: Boolean,
-        default: true
-      },
-      columns: {
-        type: Array as PropType<TableColumns[]>,
-        default: () => {
-          return [];
-        }
-      },
-      data: {
-        type: Object,
-        default: () => {
-          return {};
-        }
-      },
-      summary: {
-        type: Function,
-        default: null
-      },
-      striped: {
-        type: Boolean,
-        default: false
-      }
-    },
-    emits: ['sorter'],
-    setup(props: any, { emit }: any) {
-      const state = reactive({
-        curData: props.data
-      });
-      const classes = computed(() => {
-        const prefixCls = componentName;
-        return {
-          [prefixCls]: true
-        };
-      });
-
-      const cellClasses = (item: TableColumns) => {
-        return {
-          'nut-table__main__head__tr--border': props.bordered,
-          [`nut-table__main__head__tr--align${item.align ? item.align : ''}`]: true
-        };
-      };
-
-      const stylehead = (item: TableColumns) => {
-        return item.stylehead ? item.stylehead : '';
-      };
-      const stylecolumn = (item: TableColumns) => {
-        return item.stylecolumn ? item.stylecolumn : '';
-      };
-
-      const getColumnItem = (value: string): TableColumns => {
-        return props.columns.filter((item: TableColumns) => item.key === value)[0];
-      };
-      const getColumnItemStyle = (value: string) => {
-        const style = props.columns.filter((item: TableColumns) => item.key === value);
-        return style[0].stylecolumn ? style[0].stylecolumn : '';
-      };
-      const handleSorterClick = (item: TableColumns) => {
-        if (item.sorter) {
-          emit('sorter', item);
-          state.curData =
-            typeof item.sorter === 'function'
-              ? state.curData.sort(item.sorter)
-              : item.sorter === 'default'
-              ? state.curData.sort()
-              : state.curData;
-        }
-      };
-
-      const sortDataItem = () => {
-        return props.columns.map((columns: TableColumns) => {
-          return [columns.key, columns.render];
-        });
-      };
-
-      watch(
-        () => props.data,
-        (val) => {
-          state.curData = val.slice();
-        }
-      );
-
-      return {
-        ...toRefs(state),
-        classes,
-        cellClasses,
-        getColumnItem,
-        getColumnItemStyle,
-        handleSorterClick,
-        sortDataItem,
-        translate,
-        stylehead,
-        stylecolumn
-      };
-    }
-  };
-};
diff --git a/src/packages/__VUE/table/index.taro.vue b/src/packages/__VUE/table/index.taro.vue
index 537bdbc8e1..f3ba25ca16 100644
--- a/src/packages/__VUE/table/index.taro.vue
+++ b/src/packages/__VUE/table/index.taro.vue
@@ -38,15 +38,15 @@
         </view>
       </view>
     </view>
-    <view v-if="summary" class="nut-table__summary">
-      <span class="nut-table__summary__text" v-html="summary().value"></span>
-    </view>
     <view v-if="!curData.length" class="nut-table__nodata">
       <div class="nut-table__nodata" :class="{ 'nut-table__nodata--border': bordered }">
         <slot name="nodata"></slot>
         <div v-if="!$slots.nodata" class="nut-table__nodata__text"> {{ translate('noData') }} </div>
       </div>
     </view>
+    <view v-if="summary" class="nut-table__summary">
+      <span class="nut-table__summary__text" v-html="summary().value"></span>
+    </view>
   </view>
 </template>
 <script lang="ts">
@@ -123,8 +123,8 @@ export default create({
           typeof item.sorter === 'function'
             ? state.curData.sort(item.sorter)
             : item.sorter === 'default'
-            ? state.curData.sort()
-            : state.curData;
+              ? state.curData.sort()
+              : state.curData;
       }
     };
 
diff --git a/src/packages/__VUE/table/types.ts b/src/packages/__VUE/table/types.ts
index 1f2d82fd61..e93978dcb2 100644
--- a/src/packages/__VUE/table/types.ts
+++ b/src/packages/__VUE/table/types.ts
@@ -5,8 +5,8 @@ export interface TableColumns {
   align?: string;
   stylehead?: string;
   stylecolumn?: string;
-  sorter?: Function;
-  render?: (rowData?: object, rowIndex?: number) => VNodeChild | string | VNode;
+  sorter?: Function | 'default';
+  render?: (rowData?: any, rowIndex?: number) => VNodeChild | string | VNode;
 }
 
 export interface TableProps {