From 77262554abc36470a816f72c7e2d206da346d4b6 Mon Sep 17 00:00:00 2001
From: richard1015 <51844712@qq.com>
Date: Mon, 30 May 2022 09:11:55 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"table=E6=94=AF=E6=8C=81=E8=87=AA?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E8=A1=A8=E5=A4=B4icon=E3=80=81=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81render=E5=85=A5=E5=8F=82=E7=AD=89=20(#1261)"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 2ad539ee0c2fe063fb9477580a3e33bb922483cc.
---
 src/packages/__VUE/table/demo.vue        | 17 ++++-------------
 src/packages/__VUE/table/index.vue       | 14 ++------------
 src/packages/__VUE/table/renderColumn.ts |  5 ++---
 3 files changed, 8 insertions(+), 28 deletions(-)

diff --git a/src/packages/__VUE/table/demo.vue b/src/packages/__VUE/table/demo.vue
index 80f2ec79f..2ad927427 100644
--- a/src/packages/__VUE/table/demo.vue
+++ b/src/packages/__VUE/table/demo.vue
@@ -22,12 +22,6 @@
     <nut-table :columns="columns3" :data="data5"> </nut-table>
     <h2>支持排序</h2>
     <nut-table :columns="columns6" :data="data6" @sorter="handleSorter"> </nut-table>
-    <h2>支持自定义表头icon</h2>
-    <nut-table :columns="columns1" :data="data1">
-      <template #icon-name>
-        <nut-icon name="people"></nut-icon>
-      </template>
-    </nut-table>
   </div>
 </template>
 
@@ -104,10 +98,7 @@ export default createDemo({
         {
           title: '姓名',
           key: 'name',
-          align: 'center',
-          render(data) {
-            return `${data.name}(${data.sex})`;
-          }
+          align: 'center'
         },
         {
           title: '性别',
@@ -191,8 +182,7 @@ export default createDemo({
           name: 'Tom',
           sex: '男',
           record: '小学',
-          render: (data) => {
-            console.log(data);
+          render: () => {
             return h(
               Button,
               {
@@ -257,7 +247,8 @@ export default createDemo({
       timer: null as number | null,
       summary: () => {
         return {
-          value: '这是总结栏'
+          value: '这是总结栏',
+          colspan: 5
         };
       }
     });
diff --git a/src/packages/__VUE/table/index.vue b/src/packages/__VUE/table/index.vue
index 7bf0fd21d..30ba6753e 100644
--- a/src/packages/__VUE/table/index.vue
+++ b/src/packages/__VUE/table/index.vue
@@ -12,12 +12,7 @@
           >
             {{ item.title }}
             <slot name="icon"></slot>
-            <slot :name="`icon-${item.key}`"></slot>
-            <nut-icon
-              v-if="!$slots.icon && !$slots[`icon-${item.key}`] && item.sorter"
-              name="down-arrow"
-              size="12px"
-            ></nut-icon>
+            <nut-icon v-if="!$slots.icon && item.sorter" name="down-arrow" size="12px"></nut-icon>
           </span>
         </view>
       </view>
@@ -30,12 +25,7 @@
             :key="value"
           >
             {{ typeof item[value] !== 'function' ? item[value] : '' }}
-            <RenderColumn :slots="item[value]" :data="item" v-if="typeof item[value] === 'function'"></RenderColumn>
-            <RenderColumn
-              :slots="getColumnItem(value).render"
-              :data="item"
-              v-else-if="typeof getColumnItem(value).render === 'function'"
-            ></RenderColumn>
+            <RenderColumn :slots="item[value]" v-if="typeof item[value] === 'function'"></RenderColumn>
           </span>
         </view>
       </view>
diff --git a/src/packages/__VUE/table/renderColumn.ts b/src/packages/__VUE/table/renderColumn.ts
index 6f109e3ea..92d92e97c 100644
--- a/src/packages/__VUE/table/renderColumn.ts
+++ b/src/packages/__VUE/table/renderColumn.ts
@@ -1,10 +1,9 @@
 import { h } from 'vue';
 export default {
   setup(props: any) {
-    return () => h(`view`, {}, props.slots(props.data));
+    return () => h(`view`, {}, props.slots());
   },
   props: {
-    slots: Object,
-    data: Object
+    slots: Object
   }
 };
-- 
GitLab