tntd 3.0.0-beta.14 → 3.0.0-beta.16

package/lib/table/style/index.less

@@ -276,12 +276,11 @@
   }
 
   &-footer {
-    position: relative;
+    // position: relative;
     padding: @table-padding-vertical @table-padding-horizontal;
     color: @table-footer-color;
     background: @table-footer-bg;
     border-top: @border-width-base @border-style-base @border-color-split;
-    border-radius: 0 0 @table-border-radius-base @table-border-radius-base;
     &::before {
       position: absolute;
       top: -1px;
@@ -293,26 +292,25 @@
     }
   }
 
-  &.@{table-prefix-cls}-bordered &-footer {
-    border: @border-width-base @border-style-base @border-color-split;
-  }
+  // &.@{table-prefix-cls}-bordered &-footer {
+  //   border: @border-width-base @border-style-base @border-color-split;
+  // }
 
   &-title {
-    position: relative;
-    top: 1px;
+    // position: relative;
+    // top: 1px;
     padding: @table-padding-vertical 0;
-    border-radius: @table-border-radius-base @table-border-radius-base 0 0;
   }
 
   &.@{table-prefix-cls}-bordered &-title {
     padding-right: @table-padding-horizontal;
     padding-left: @table-padding-horizontal;
-    border: @border-width-base @border-style-base @border-color-split;
+    border-bottom: @border-width-base @border-style-base @border-color-split;
   }
 
   &-title + &-content {
-    position: relative;
-    border-radius: @table-border-radius-base @table-border-radius-base 0 0;
+    // position: relative;
+    // border-radius: @table-border-radius-base @table-border-radius-base 0 0;
 
     .@{table-prefix-cls}-bordered & {
       &,
@@ -397,41 +395,26 @@
   }
 
   &-bordered {
-    .@{table-prefix-cls}-header > table,
-    .@{table-prefix-cls}-body > table,
-    .@{table-prefix-cls}-fixed-left table,
-    .@{table-prefix-cls}-fixed-right table {
-      border: @border-width-base @border-style-base @border-color-split;
-    }
-
-    .@{table-prefix-cls}-fixed-left table {
-      .@{table-prefix-cls}-hide-cell-borders & {
-        border-right: 0;
-      }
-    }
-
-    .@{table-prefix-cls}-fixed-right table {
-      .@{table-prefix-cls}-hide-cell-borders & {
-        border-left: 0;
-      }
-    }
-
-    .@{table-prefix-cls}-body > table {
-      border-radius: @border-radius-base;
-    }
+    border: @border-width-base @border-style-base @border-color-split;
+    border-radius: @border-radius-base;
+    overflow: hidden;
+    // .@{table-prefix-cls}-header > table,
+    // .@{table-prefix-cls}-body > table,
+    // .@{table-prefix-cls}-fixed-left table,
+    // .@{table-prefix-cls}-fixed-right table {
+    //   border: @border-width-base @border-style-base @border-color-split;
+    //   border-right: 0;
+    //   border-bottom: 0;
+    // }
 
     &.@{table-prefix-cls}-empty {
       .@{table-prefix-cls}-body > table {
         border-radius: @border-radius-base @border-radius-base 0 0;
       }
       .@{table-prefix-cls}-placeholder {
-        border: @border-width-base @border-style-base @border-color-split;
-        border-top: none;
-        border-radius: 0 0 @border-radius-base @border-radius-base;
-        .@{table-prefix-cls}-has-footer & {
-          border-bottom: none;
-          border-radius: 0;
-        }
+        // border-right: @border-width-base @border-style-base @border-color-split;
+        // border-left: @border-width-base @border-style-base @border-color-split;
+        border-bottom: 0;
       }
     }
 
@@ -459,24 +442,27 @@
     .@{table-prefix-cls}-tbody > tr > td {
       border-right: @border-width-base @border-style-base @border-color-split;
       &:last-child {
-        border-right: none;
+        border-right: 0;
       }
     }
-    .@{table-prefix-cls}-tbody > tr:last-child {
-      & > td {
-        border-bottom: none;
-        &:first-child {
-          border-bottom-left-radius: @border-radius-base;
+    .@{table-prefix-cls}-fixed-left {
+      .@{table-prefix-cls}-thead > tr > th,
+      .@{table-prefix-cls}-tbody > tr > td {
+        &:last-child {
+          border-right: @border-width-base @border-style-base @border-color-split;
         }
       }
     }
-
-    .@{table-prefix-cls}-tbody > tr:last-child > td:last-child {
-      border-bottom-right-radius: @border-radius-base;
-      .@{table-prefix-cls}-has-footer & {
-        border-bottom-right-radius: 0;
+    .@{table-prefix-cls}-content:has(.@{table-prefix-cls}-fixed-right) .@{table-prefix-cls}-scroll {
+      .@{table-prefix-cls}-thead > tr > th {
+        &:last-child {
+          border-right: @border-width-base @border-style-base @border-color-split;
+        }
       }
     }
+    .@{table-prefix-cls}-tbody > tr:last-child > td {
+      border-bottom: 0;
+    }
   }
 
   &-placeholder {
@@ -488,12 +474,9 @@
     font-size: @font-size-base;
     text-align: center;
     background: @component-background;
-    // border-top: @border-width-base @border-style-base @border-color-split;
-    // border-bottom: @border-width-base @border-style-base @border-color-split;
-    border-radius: @border-radius-base;
-    .@{table-prefix-cls}-has-footer & {
-      border-radius: 0;
-    }
+    border-top: @border-width-base @border-style-base @border-color-split;
+    border-bottom: @border-width-base @border-style-base @border-color-split;
+    // border-radius: 0 0 @border-radius-base @border-radius-base;
   }
 
   &-pagination.@{ant-prefix}-pagination {

package/lib/table/table.less

@@ -24,9 +24,9 @@
     .@{table-prefix-cls}-small {
       border: none;
 
-      > .ant-table-content .ant-table-row:last-child td {
+      // > .ant-table-content .ant-table-row:last-child td {
         // border-bottom: @border-width-base @border-style-base @border-color-split;
-      }
+      // }
     }
   }
 
@@ -52,9 +52,9 @@
   }
 
   &.@{table-prefix-cls}-hide-cell-borders {
-    .@{table-prefix-cls}-thead > tr > th:not(:last-child),
-    .@{table-prefix-cls}-tbody > tr > td:not(:last-child) {
-      border-right: none;
+    .@{table-prefix-cls}-thead > tr > th,
+    .@{table-prefix-cls}-tbody > tr > td {
+      border-right: none !important;
     }
   }
   &.@{table-prefix-cls}-hide-cell-borders {
@@ -97,6 +97,7 @@
   .@{table-prefix-cls}-placeholder {
     padding-top: @table-padding-horizontal;
     padding-bottom: @table-padding-horizontal;
+    border-bottom: 0;
   }
 
   // customize the loading of table

package/lib/table/table.stories.d.ts

@@ -1,32 +1,109 @@
-import type { Meta, Story } from '@tntd/storybook-react-storykit';
-import { TableProps } from './';
-declare const _default: Meta<import("@tntd/storybook-react-storykit").Args>;
+declare namespace _default {
+    export { Table as component };
+    export const title: string;
+    export namespace parameters {
+        namespace backgrounds {
+            const _default: string;
+            export { _default as default };
+            export const values: {
+                name: string;
+                value: string;
+            }[];
+        }
+    }
+}
 export default _default;
-export declare const Empty: Story<TableProps<{
-    key: string;
-    name: string;
-    age: number;
-    address: string;
-}>>;
-export declare const Loading: Story<TableProps<{
-    key: string;
-    name: string;
-    age: number;
-    address: string;
-}>>;
-export declare const Default: Story<TableProps<{
-    key: string;
-    name: string;
-    age: number;
-    address: string;
-}>>;
-interface MockData {
-    key: string;
-    age: number;
-    address: string;
-    firstName: string;
-    lastName: string;
-    tags: string[];
+export function Empty(args: any): React.JSX.Element;
+export namespace Empty {
+    namespace args {
+        const columns: {
+            title: string;
+            dataIndex: string;
+            key: string;
+        }[];
+    }
+}
+export function Loading(args: any): React.JSX.Element;
+export namespace Loading {
+    export namespace args_1 {
+        const columns_1: {
+            title: string;
+            dataIndex: string;
+            key: string;
+        }[];
+        export { columns_1 as columns };
+        export const loading: boolean;
+    }
+    export { args_1 as args };
+}
+export function Default(args: any): React.JSX.Element;
+export namespace Default {
+    export namespace args_2 {
+        const columns_2: ({
+            title: string;
+            dataIndex: string;
+            key: string;
+            render?: undefined;
+        } | {
+            title: string;
+            dataIndex: string;
+            key: string;
+            render: (cellData: any) => React.JSX.Element;
+        })[];
+        export { columns_2 as columns };
+        export const dataSource: {
+            key: string;
+            name: string;
+            age: number;
+            address: string;
+        }[];
+        export namespace pagination {
+            const total: number;
+            const position: string;
+            const showSizeChanger: boolean;
+            const showQuickJumper: boolean;
+            function showTotal(total: any, range: any): string;
+        }
+        const loading_1: boolean;
+        export { loading_1 as loading };
+    }
+    export { args_2 as args };
+}
+export function ColumnFilter(args: any): React.JSX.Element;
+export namespace ColumnFilter {
+    export namespace args_3 {
+        const dataSource_1: {
+            key: string;
+            firstName: string;
+            lastName: string;
+            age: number;
+            address: string;
+            tags: string[];
+        }[];
+        export { dataSource_1 as dataSource };
+        export namespace pagination_1 {
+            const total_1: number;
+            export { total_1 as total };
+            const position_1: string;
+            export { position_1 as position };
+            const showSizeChanger_1: boolean;
+            export { showSizeChanger_1 as showSizeChanger };
+            const showQuickJumper_1: boolean;
+            export { showQuickJumper_1 as showQuickJumper };
+            export function showTotal_1(total: any, range: any): string;
+            export { showTotal_1 as showTotal };
+        }
+        export { pagination_1 as pagination };
+        const loading_2: boolean;
+        export { loading_2 as loading };
+    }
+    export { args_3 as args };
+}
+export function All(): React.JSX.Element;
+export namespace All {
+    const args_4: {};
+    export { args_4 as args };
 }
-export declare const ColumnFilter: Story<TableProps<MockData>>;
+import { Table } from "./table";
+import React from "react";
 //# sourceMappingURL=table.stories.d.ts.map

package/lib/table/table.stories.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"table.stories.d.ts","sourceRoot":"","sources":["../../src/table/table.stories.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,gCAAgC,CAAA;AAIjE,OAAO,EAAS,UAAU,EAAE,MAAM,IAAI,CAAA;;AAItC,wBASS;AAmBT,eAAO,MAAM,KAAK;SAfT,MAAM;UACL,MAAM;SACP,MAAM;aACF,MAAM;GAYmB,CAAA;AAsBtC,eAAO,MAAM,OAAO;SArCX,MAAM;UACL,MAAM;SACP,MAAM;aACF,MAAM;GAkCqB,CAAA;AAuBxC,eAAO,MAAM,OAAO;SA5DX,MAAM;UACL,MAAM;SACP,MAAM;aACF,MAAM;GAyDqB,CAAA;AA6CxC,UAAU,QAAQ;IAChB,GAAG,EAAE,MAAM,CAAA;IACX,GAAG,EAAE,MAAM,CAAA;IACX,OAAO,EAAE,MAAM,CAAA;IACf,SAAS,EAAE,MAAM,CAAA;IACjB,QAAQ,EAAE,MAAM,CAAA;IAChB,IAAI,EAAE,MAAM,EAAE,CAAA;CACf;AAED,eAAO,MAAM,YAAY,EAAE,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,CAuCpD,CAAA"}
+{"version":3,"file":"table.stories.d.ts","sourceRoot":"","sources":["../../src/table/table.stories.jsx"],"names":[],"mappings":";;;;;;;;;;;;;;;AAkBA,oDAQC;;;;;;;;;;AARD,sDAQC;;;;;;;;;;;;;AARD,sDAQC;;;;;;;;;;;;;;;;;;;;;;;;;;YAuFc,mDAA2D;;;;;;;AAKnE,2DAuCN;;;;;;;;;;;;;;;;;;;;;YAkCc,4DAA6D;;;;;;;;;AAKrE,yCA0UN"}