From 7ef216c87ea95112ea2a49e24099260e00a3d30a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=87=AF=E9=BE=99?= <502431556@qq.com>
Date: Tue, 8 Feb 2022 15:49:23 +0800
Subject: [PATCH] wip: Table component developing

---
 src/components/Table/src/Table.vue          | 8 +++-----
 src/views/Components/Table/DefaultTable.vue | 8 ++++----
 types/componentType/table.d.ts              | 8 ++++----
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/components/Table/src/Table.vue b/src/components/Table/src/Table.vue
index c7a0b44..9f88995 100644
--- a/src/components/Table/src/Table.vue
+++ b/src/components/Table/src/Table.vue
@@ -67,7 +67,7 @@ export default defineComponent({
 
     const rnderTableColumn = (columns: TableColumn[]) => {
       return (props.selection ? [renderTableSelection()] : []).concat(
-        columns.map((v, i) => {
+        columns.map((v) => {
           if (v.type === 'index') {
             return (
               <ElTableColumn
@@ -89,11 +89,9 @@ export default defineComponent({
                 prop={v.field}
               >
                 {{
-                  default: () =>
+                  default: (data: TableSlotDefault) =>
                     // @ts-ignore
-                    getSlot(slots, v.field, { row: props.data[i], field: v.field, index: i }) ||
-                    v?.formatter?.() ||
-                    props.data[i][v.field],
+                    getSlot(slots, v.field, data) || v?.formatter?.() || data.row[v.field],
                   // @ts-ignore
                   header: getSlot(slots, `${v.field}-header`)
                 }}
diff --git a/src/views/Components/Table/DefaultTable.vue b/src/views/Components/Table/DefaultTable.vue
index 30242f8..0405557 100644
--- a/src/views/Components/Table/DefaultTable.vue
+++ b/src/views/Components/Table/DefaultTable.vue
@@ -77,7 +77,7 @@ const getTableList = async () => {
 
 getTableList()
 
-const acitonFn = (data: TableColumnDefault) => {
+const acitonFn = (data: TableSlotDefault) => {
   console.log(data)
 }
 </script>
@@ -86,9 +86,9 @@ const acitonFn = (data: TableColumnDefault) => {
   <ContentWrap :title="t('tableDemo.table')" :message="t('tableDemo.tableDes')">
     <Table :columns="columns" :data="tableDataList" :loading="loading">
       <template #action="data">
-        <ElButton @click="acitonFn(data as TableColumnDefault)">{{
-          t('tableDemo.action')
-        }}</ElButton>
+        <ElButton type="primary" @click="acitonFn(data as TableSlotDefault)">
+          {{ t('tableDemo.action') }}
+        </ElButton>
       </template>
     </Table>
   </ContentWrap>
diff --git a/types/componentType/table.d.ts b/types/componentType/table.d.ts
index f503a27..23f471a 100644
--- a/types/componentType/table.d.ts
+++ b/types/componentType/table.d.ts
@@ -3,8 +3,8 @@ declare type TableColumn = {
   label?: string
 } & Recordable
 
-declare type TableColumnDefault = {
+declare type TableSlotDefault = {
   row: Recordable
-  field: string
-  index: number
-}
+  column: TableColumn
+  $index: number
+} & Recordable