From 53a3d2553d81bdc12e1c8a70d0f226d43f61ae9f Mon Sep 17 00:00:00 2001
From: danranvm <danranvm@gmail.com>
Date: Tue, 10 May 2022 20:53:43 +0800
Subject: [PATCH] fix(comp: table): update style with sticky and bodered

---
 packages/components/table/demo/Bordered.md    | 14 ++++++
 packages/components/table/demo/Bordered.vue   | 46 +++++++++++++++++++
 .../components/table/demo/ColSpanRowSpan.md   |  2 +-
 .../components/table/demo/CustomAdditional.md |  2 +-
 packages/components/table/demo/HeadGroup.vue  |  2 +-
 packages/components/table/demo/Sticky.md      | 18 ++++++++
 packages/components/table/demo/Sticky.vue     | 46 +++++++++++++++++++
 packages/components/table/demo/TreeTable.md   |  2 +-
 packages/components/table/src/Table.tsx       |  2 +-
 .../components/table/src/main/FixedHolder.tsx | 26 +++++------
 .../components/table/src/main/MainTable.tsx   |  4 +-
 packages/components/table/style/border.less   | 31 ++++++++++---
 packages/components/table/style/size.less     |  8 ++++
 packages/site/src/styles/app.less             |  1 -
 14 files changed, 176 insertions(+), 28 deletions(-)
 create mode 100644 packages/components/table/demo/Bordered.md
 create mode 100644 packages/components/table/demo/Bordered.vue
 create mode 100644 packages/components/table/demo/Sticky.md
 create mode 100644 packages/components/table/demo/Sticky.vue

diff --git a/packages/components/table/demo/Bordered.md b/packages/components/table/demo/Bordered.md
new file mode 100644
index 000000000..5342625c9
--- /dev/null
+++ b/packages/components/table/demo/Bordered.md
@@ -0,0 +1,14 @@
+---
+title:
+  zh: 带边框，页头和页脚
+  en: With border, header and footer
+order: 62
+---
+
+## zh
+
+添加表格边框线，页头和页脚。
+
+## en
+
+Add border, title and footer for table.
diff --git a/packages/components/table/demo/Bordered.vue b/packages/components/table/demo/Bordered.vue
new file mode 100644
index 000000000..79b78cc8b
--- /dev/null
+++ b/packages/components/table/demo/Bordered.vue
@@ -0,0 +1,46 @@
+<template>
+  <IxTable :columns="columns" :dataSource="data" :borderless="false">
+    <template #header>
+      <IxHeader title="Table Header" suffix="setting"></IxHeader>
+    </template>
+    <template #footer>
+      <spam>This is footer</spam>
+    </template>
+  </IxTable>
+</template>
+
+<script lang="ts" setup>
+import { TableColumn } from '@idux/components/table'
+
+interface Data {
+  key: number
+  name: string
+  age: number
+  address: string
+}
+
+const columns: TableColumn<Data>[] = [
+  {
+    title: 'Name',
+    dataKey: 'name',
+  },
+  {
+    title: 'Age',
+    dataKey: 'age',
+  },
+  {
+    title: 'Address',
+    dataKey: 'address',
+  },
+]
+
+const data: Data[] = []
+for (let index = 0; index < 4; index++) {
+  data.push({
+    key: index,
+    name: `Edrward ${index}`,
+    age: 18 + index,
+    address: `London Park no. ${index}`,
+  })
+}
+</script>
diff --git a/packages/components/table/demo/ColSpanRowSpan.md b/packages/components/table/demo/ColSpanRowSpan.md
index 970768b46..1016e975b 100644
--- a/packages/components/table/demo/ColSpanRowSpan.md
+++ b/packages/components/table/demo/ColSpanRowSpan.md
@@ -2,7 +2,7 @@
 title:
   zh: 行/列合并
   en: Merge row and column
-order: 10
+order: 80
 ---
 
 ## zh
diff --git a/packages/components/table/demo/CustomAdditional.md b/packages/components/table/demo/CustomAdditional.md
index da7a81cb6..d37659af4 100644
--- a/packages/components/table/demo/CustomAdditional.md
+++ b/packages/components/table/demo/CustomAdditional.md
@@ -2,7 +2,7 @@
 title:
   zh: 斑马纹表格
   en: Striped Table
-order: 1
+order: 63
 ---
 
 ## zh
diff --git a/packages/components/table/demo/HeadGroup.vue b/packages/components/table/demo/HeadGroup.vue
index 41ac6ec84..e6e7f026c 100644
--- a/packages/components/table/demo/HeadGroup.vue
+++ b/packages/components/table/demo/HeadGroup.vue
@@ -1,5 +1,5 @@
 <template>
-  <IxTable :columns="columns" :dataSource="data" :scroll="scroll">
+  <IxTable :columns="columns" :dataSource="data" :borderless="false" :scroll="scroll">
     <template #name="{ value }">
       <a>{{ value }}</a>
     </template>
diff --git a/packages/components/table/demo/Sticky.md b/packages/components/table/demo/Sticky.md
new file mode 100644
index 000000000..baa12cbaa
--- /dev/null
+++ b/packages/components/table/demo/Sticky.md
@@ -0,0 +1,18 @@
+---
+title:
+  zh: 跟随页面固定的表头
+  en: Fixed header with the page
+order: 55
+---
+
+## zh
+
+对于长表格，需要滚动才能查看表头和滚动条，那么现在可以设置跟随页面固定表头和滚动条。
+
+> 使用 `position: sticky` 实现，如果没有生效，请检查父元素是否有元素设置了 `overflow`，具体原因请查看 [MDN](https://developer.mozilla.org/zh-CN/docs/Web/CSS/position)
+
+## en
+
+For long table，need to scroll to view the header and scroll bar，then you can now set the fixed header and scroll bar to follow the page.
+
+> Use `position: sticky` to implement, if it does not take effect, please check whether the parent element has set `overflow`, see [MDN](https://developer.mozilla.org/en-US/docs/Web/CSS/position) for specific reasons.
diff --git a/packages/components/table/demo/Sticky.vue b/packages/components/table/demo/Sticky.vue
new file mode 100644
index 000000000..9e517e981
--- /dev/null
+++ b/packages/components/table/demo/Sticky.vue
@@ -0,0 +1,46 @@
+<template>
+  <IxTable :columns="columns" :dataSource="data" :pagination="false" :scroll="scroll" sticky>
+    <template #name="{ value }">
+      <a>{{ value }}</a>
+    </template>
+  </IxTable>
+</template>
+
+<script lang="ts" setup>
+import { TableColumn } from '@idux/components/table'
+
+interface Data {
+  key: number
+  name: string
+  age: number
+  address: string
+}
+
+const columns: TableColumn<Data>[] = [
+  {
+    title: 'Name',
+    dataKey: 'name',
+    customCell: 'name',
+  },
+  {
+    title: 'Age',
+    dataKey: 'age',
+  },
+  {
+    title: 'Address',
+    dataKey: 'address',
+  },
+]
+
+const data: Data[] = []
+for (let index = 0; index < 30; index++) {
+  data.push({
+    key: index,
+    name: `Edrward ${index}`,
+    age: 18 + index,
+    address: `London Park no. ${index}`,
+  })
+}
+
+const scroll = { height: 300 }
+</script>
diff --git a/packages/components/table/demo/TreeTable.md b/packages/components/table/demo/TreeTable.md
index ca77bc6b2..ba2e272e0 100644
--- a/packages/components/table/demo/TreeTable.md
+++ b/packages/components/table/demo/TreeTable.md
@@ -2,7 +2,7 @@
 title:
   zh: 树表格
   en: Tree table
-order: 80
+order: 21
 ---
 
 ## zh
diff --git a/packages/components/table/src/Table.tsx b/packages/components/table/src/Table.tsx
index 05c97a96b..f5f5e9550 100644
--- a/packages/components/table/src/Table.tsx
+++ b/packages/components/table/src/Table.tsx
@@ -105,7 +105,7 @@ export default defineComponent({
       const header = <ɵHeader v-slots={slots} header={props.header} />
       const footer = renderFooter(slots, prefixCls)
       const [paginationTop, paginationBottom] = renderPagination(mergedPagination.value, filteredData.value, prefixCls)
-      const children = [header, paginationTop, <MainTable />, paginationBottom, footer]
+      const children = [header, paginationTop, <MainTable />, footer, paginationBottom]
       const spinProps = convertSpinProps(props.spin)
       const spinWrapper = spinProps ? <IxSpin {...spinProps}>{children}</IxSpin> : children
       return <div class={classes.value}>{spinWrapper}</div>
diff --git a/packages/components/table/src/main/FixedHolder.tsx b/packages/components/table/src/main/FixedHolder.tsx
index 15c47e08f..4bf32f895 100644
--- a/packages/components/table/src/main/FixedHolder.tsx
+++ b/packages/components/table/src/main/FixedHolder.tsx
@@ -7,23 +7,19 @@
 
 import { type CSSProperties, type Ref, computed, defineComponent, inject, onBeforeUnmount, onMounted } from 'vue'
 
-import { off, on } from '@idux/cdk/utils'
+import { convertCssPixel, off, on } from '@idux/cdk/utils'
 
 import { TABLE_TOKEN } from '../token'
 import ColGroup from './ColGroup'
 
 export default defineComponent({
-  setup(_, { slots }) {
-    const {
-      mergedPrefixCls,
-      scrollHeadRef,
-      handleScroll,
-      scrollWidth,
-      flattedData,
-      isSticky,
-      mergedSticky,
-      columnWidths,
-    } = inject(TABLE_TOKEN)!
+  props: {
+    offsetTop: { type: Number, default: undefined },
+    offsetBottom: { type: Number, default: undefined },
+  },
+  setup(props, { slots }) {
+    const { mergedPrefixCls, scrollHeadRef, handleScroll, scrollWidth, flattedData, isSticky, columnWidths } =
+      inject(TABLE_TOKEN)!
 
     useScrollEvents(scrollHeadRef, handleScroll)
 
@@ -38,11 +34,11 @@ export default defineComponent({
     })
     const style = computed<CSSProperties>(() => {
       const sticky = isSticky.value
-      const { offsetTop, offsetBottom } = mergedSticky.value
+      const { offsetTop, offsetBottom } = props
       return {
         overflow: 'hidden',
-        top: sticky ? offsetTop : undefined,
-        bottom: sticky ? offsetBottom : undefined,
+        top: sticky ? convertCssPixel(offsetTop) : undefined,
+        bottom: sticky ? convertCssPixel(offsetBottom) : undefined,
       }
     })
 
diff --git a/packages/components/table/src/main/MainTable.tsx b/packages/components/table/src/main/MainTable.tsx
index 4c44e080d..61999fc78 100644
--- a/packages/components/table/src/main/MainTable.tsx
+++ b/packages/components/table/src/main/MainTable.tsx
@@ -45,6 +45,7 @@ export default defineComponent({
       changeColumnWidth,
       flattedData,
       isSticky,
+      mergedSticky,
       scrollBodyRef,
       handleScroll,
       pingedStart,
@@ -147,8 +148,9 @@ export default defineComponent({
       const prefixCls = mergedPrefixCls.value
 
       if (scrollHeight.value || isSticky.value) {
+        const { offsetTop } = mergedSticky.value
         const tableHead = !props.headless && (
-          <FixedHolder>
+          <FixedHolder offsetTop={offsetTop}>
             <Head></Head>
           </FixedHolder>
         )
diff --git a/packages/components/table/style/border.less b/packages/components/table/style/border.less
index 39ccdebed..3ce51ffa6 100644
--- a/packages/components/table/style/border.less
+++ b/packages/components/table/style/border.less
@@ -1,21 +1,29 @@
+@table-border: @table-border-width @table-border-style @table-border-color;
+
 .@{table-prefix}:not(.@{table-prefix}-borderless) {
+  > .@{header-prefix} {
+    border: @table-border;
+    border-bottom: 0;
+  }
+
   > .@{table-prefix}-container {
+    > .@{table-prefix}-fixed-holder,
     > .@{table-prefix}-content {
-      border-left: @table-border-width @table-border-style @table-border-color;
+      border-left: @table-border;
 
-      table {
-        border-top: @table-border-width @table-border-style @table-border-color;
+      > table {
+        border-top: @table-border;
 
         > thead > tr > th,
         > tbody > tr > td,
         > tfoot > tr > th,
         > tfoot > tr > td {
-          border-right: @table-border-width @table-border-style @table-border-color;
+          border-right: @table-border;
         }
 
         > thead {
           > tr:not(:last-child) > th {
-            border-bottom: @table-border-width @table-border-style @table-border-color;
+            border-bottom: @table-border;
           }
 
           > tr > th {
@@ -29,10 +37,21 @@
         > tbody > tr,
         > tfoot > tr {
           > .@{table-prefix}-fix-end-first::after {
-            border-right: @table-border-width @table-border-style @table-border-color;
+            border-right: @table-border;
           }
         }
       }
     }
+
+    > .@{table-prefix}-fixed-holder + .@{table-prefix}-content {
+      > table {
+        border-top: none;
+      }
+    }
+  }
+
+  > .@{table-prefix}-footer {
+    border: @table-border;
+    border-top: 0;
   }
 }
diff --git a/packages/components/table/style/size.less b/packages/components/table/style/size.less
index 383683bad..771770634 100644
--- a/packages/components/table/style/size.less
+++ b/packages/components/table/style/size.less
@@ -16,6 +16,14 @@
       padding: @padding-top @padding-right @padding-bottom @padding-left;
     }
 
+    .@{header-prefix} {
+      padding: (@padding-top / 2) @padding-right (@padding-bottom / 2) @padding-left;
+    }
+
+    .@{table-prefix}-footer {
+      padding: @padding-top @padding-right @padding-bottom @padding-left;
+    }
+
     // TODO: Nest Table
   }
 }
diff --git a/packages/site/src/styles/app.less b/packages/site/src/styles/app.less
index 83878aa9f..b7771e4bb 100644
--- a/packages/site/src/styles/app.less
+++ b/packages/site/src/styles/app.less
@@ -1,7 +1,6 @@
 .root-wrapper {
   width: 100%;
   height: 100%;
-  overflow: hidden;
 }
 
 .main-wrapper {