tntd 3.0.0-beta.1 → 3.0.0-beta.10

package/lib/table/hooks/use-column-setting.js

@@ -1,23 +1,39 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.useColumnSetting = void 0;
-const hooks_1 = require("@stellaris/hooks");
-const react_1 = require("react");
-const useColumnSetting = (columns, storageKey) => {
-    const [columnSetting, setColumnSetting] = (0, hooks_1.useLocalStorageMayEmpty)(storageKey, []);
-    const displayColumns = (0, react_1.useMemo)(() => {
-        if (!columnSetting || columnSetting.length === 0) {
-            return columns;
-        }
-        return columns
-            .filter((column) => columnSetting.some((setting) => setting.key === column.key))
-            .sort((a, b) => {
-            const aIndex = columnSetting.find((setting) => setting.key === a.key);
-            const bIndex = columnSetting.find((setting) => setting.key === b.key);
-            return ((aIndex === null || aIndex === void 0 ? void 0 : aIndex.order) || 0) - ((bIndex === null || bIndex === void 0 ? void 0 : bIndex.order) || 0);
-        });
-    }, [columnSetting, columns]);
-    return [displayColumns, columnSetting, setColumnSetting];
-};
-exports.useColumnSetting = useColumnSetting;
-//# sourceMappingURL=use-column-setting.js.map
+var _hooks = require("@stellaris/hooks");
+var _react = require("react");
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+var useColumnSetting = exports.useColumnSetting = function useColumnSetting(columns, storageKey) {
+  var _useLocalStorageMayEm = (0, _hooks.useLocalStorageMayEmpty)(storageKey, []),
+    _useLocalStorageMayEm2 = _slicedToArray(_useLocalStorageMayEm, 2),
+    columnSetting = _useLocalStorageMayEm2[0],
+    setColumnSetting = _useLocalStorageMayEm2[1];
+  var displayColumns = (0, _react.useMemo)(function () {
+    if (!columnSetting || columnSetting.length === 0) {
+      return columns;
+    }
+    return columns.filter(function (column) {
+      return columnSetting.some(function (setting) {
+        return setting.key === column.key;
+      });
+    }).sort(function (a, b) {
+      var aIndex = columnSetting.find(function (setting) {
+        return setting.key === a.key;
+      });
+      var bIndex = columnSetting.find(function (setting) {
+        return setting.key === b.key;
+      });
+      return ((aIndex === null || aIndex === void 0 ? void 0 : aIndex.order) || 0) - ((bIndex === null || bIndex === void 0 ? void 0 : bIndex.order) || 0);
+    });
+  }, [columnSetting, columns]);
+  return [displayColumns, columnSetting, setColumnSetting];
+};

package/lib/table/hooks/use-column-setting.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-column-setting.js","sourceRoot":"","sources":["../../../src/table/hooks/use-column-setting.ts"],"names":[],"mappings":";;;AAAA,4CAA0D;AAG1D,iCAA+B;AAwBxB,MAAM,gBAAgB,GAAG,CAC9B,OAAyB,EACzB,UAAmB,EAKnB,EAAE;IACF,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,IAAA,+BAAuB,EAAkB,UAAU,EAAE,EAAE,CAAC,CAAA;IAClG,MAAM,cAAc,GAAG,IAAA,eAAO,EAAC,GAAG,EAAE;QAClC,IAAI,CAAC,aAAa,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE;YAChD,OAAO,OAAO,CAAA;SACf;QAED,OAAO,OAAO;aACX,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,KAAK,MAAM,CAAC,GAAG,CAAC,CAAC;aAC/E,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;YACb,MAAM,MAAM,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC,CAAA;YACrE,MAAM,MAAM,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC,CAAA;YAErE,OAAO,CAAC,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,KAAI,CAAC,CAAC,GAAG,CAAC,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,KAAI,CAAC,CAAC,CAAA;QACpD,CAAC,CAAC,CAAA;IACN,CAAC,EAAE,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC,CAAA;IAE5B,OAAO,CAAC,cAAc,EAAE,aAAa,EAAE,gBAAgB,CAAC,CAAA;AAC1D,CAAC,CAAA;AAzBY,QAAA,gBAAgB,oBAyB5B","sourcesContent":["import { useLocalStorageMayEmpty } from '@stellaris/hooks'\nimport type { ColumnProps as AntdColumnProps } from 'antd/es/table'\nimport type { Dispatch, SetStateAction } from 'react'\nimport { useMemo } from 'react'\n\nexport interface ColumnSetting {\n  key: string\n  order: number\n  enable: boolean\n}\n\nexport type ColumnProps<T> = AntdColumnProps<T> & {\n  placement?:\n    | 'top'\n    | 'left'\n    | 'right'\n    | 'bottom'\n    | 'topLeft'\n    | 'topRight'\n    | 'bottomLeft'\n    | 'bottomRight'\n    | 'leftTop'\n    | 'leftBottom'\n    | 'rightTop'\n    | 'rightBottom'\n}\n\nexport const useColumnSetting = <T>(\n  columns: ColumnProps<T>[],\n  storageKey?: string\n): [\n  ColumnProps<T>[],\n  ColumnSetting[] | undefined,\n  Dispatch<SetStateAction<ColumnSetting[] | undefined>>\n] => {\n  const [columnSetting, setColumnSetting] = useLocalStorageMayEmpty<ColumnSetting[]>(storageKey, [])\n  const displayColumns = useMemo(() => {\n    if (!columnSetting || columnSetting.length === 0) {\n      return columns\n    }\n\n    return columns\n      .filter((column) => columnSetting.some((setting) => setting.key === column.key))\n      .sort((a, b) => {\n        const aIndex = columnSetting.find((setting) => setting.key === a.key)\n        const bIndex = columnSetting.find((setting) => setting.key === b.key)\n\n        return (aIndex?.order || 0) - (bIndex?.order || 0)\n      })\n  }, [columnSetting, columns])\n\n  return [displayColumns, columnSetting, setColumnSetting]\n}\n"]}
+{"version":3,"file":"use-column-setting.js","sourceRoot":"","sources":["../../../src/table/hooks/use-column-setting.ts"],"names":[],"mappings":";;;AAAA,4CAA0D;AAG1D,iCAA+B;AAwBxB,MAAM,gBAAgB,GAAG,CAC9B,OAAyB,EACzB,UAAmB,EAKnB,EAAE;IACF,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,IAAA,+BAAuB,EAAkB,UAAU,EAAE,EAAE,CAAC,CAAA;IAClG,MAAM,cAAc,GAAG,IAAA,eAAO,EAAC,GAAG,EAAE;QAClC,IAAI,CAAC,aAAa,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE;YAChD,OAAO,OAAO,CAAA;SACf;QAED,OAAO,OAAO;aACX,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,KAAK,MAAM,CAAC,GAAG,CAAC,CAAC;aAC/E,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;YACb,MAAM,MAAM,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC,CAAA;YACrE,MAAM,MAAM,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC,CAAA;YAErE,OAAO,CAAC,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,KAAI,CAAC,CAAC,GAAG,CAAC,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,KAAI,CAAC,CAAC,CAAA;QACpD,CAAC,CAAC,CAAA;IACN,CAAC,EAAE,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC,CAAA;IAE5B,OAAO,CAAC,cAAc,EAAE,aAAa,EAAE,gBAAgB,CAAC,CAAA;AAC1D,CAAC,CAAA;AAzBY,QAAA,gBAAgB,oBAyB5B","sourcesContent":["import { useLocalStorageMayEmpty } from '@stellaris/hooks'\nimport type { ColumnProps as AntdColumnProps } from 'antd/lib/table'\nimport type { Dispatch, SetStateAction } from 'react'\nimport { useMemo } from 'react'\n\nexport interface ColumnSetting {\n  key: string\n  order: number\n  enable: boolean\n}\n\nexport type ColumnProps<T> = AntdColumnProps<T> & {\n  placement?:\n    | 'top'\n    | 'left'\n    | 'right'\n    | 'bottom'\n    | 'topLeft'\n    | 'topRight'\n    | 'bottomLeft'\n    | 'bottomRight'\n    | 'leftTop'\n    | 'leftBottom'\n    | 'rightTop'\n    | 'rightBottom'\n}\n\nexport const useColumnSetting = <T>(\n  columns: ColumnProps<T>[],\n  storageKey?: string\n): [\n  ColumnProps<T>[],\n  ColumnSetting[] | undefined,\n  Dispatch<SetStateAction<ColumnSetting[] | undefined>>\n] => {\n  const [columnSetting, setColumnSetting] = useLocalStorageMayEmpty<ColumnSetting[]>(storageKey, [])\n  const displayColumns = useMemo(() => {\n    if (!columnSetting || columnSetting.length === 0) {\n      return columns\n    }\n\n    return columns\n      .filter((column) => columnSetting.some((setting) => setting.key === column.key))\n      .sort((a, b) => {\n        const aIndex = columnSetting.find((setting) => setting.key === a.key)\n        const bIndex = columnSetting.find((setting) => setting.key === b.key)\n\n        return (aIndex?.order || 0) - (bIndex?.order || 0)\n      })\n  }, [columnSetting, columns])\n\n  return [displayColumns, columnSetting, setColumnSetting]\n}\n"]}

package/lib/table/index.js

@@ -1,22 +1,22 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+var _exportNames = {};
+exports["default"] = void 0;
 require("./style");
-const table_1 = require("./table");
+var _table = require("./table");
+Object.keys(_table).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _table[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _table[key];
+    }
+  });
+});
 require("./table.less");
-__exportStar(require("./table"), exports);
-exports.default = table_1.Table;
-//# sourceMappingURL=index.js.map
+var _default = exports["default"] = _table.Table;

package/lib/table/style/index.js

@@ -1,13 +1,10 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+
 require("../../style/index.less");
 require("./index.less");
-// style dependencies
-// deps-lint-skip: menu
 require("../../empty/style");
 require("../../radio/style");
 require("../../checkbox/style");
 require("../../dropdown/style");
 require("../../spin/style");
-require("../../pagination/style");
-//# sourceMappingURL=index.js.map
+require("../../pagination/style");

package/lib/table/style/index.less

@@ -95,7 +95,7 @@
         .@{table-prefix-cls}-column-sorter-up,
         .@{table-prefix-cls}-column-sorter-down {
           .iconfont-size-under-12px(11px);
-
+          font-size: 12px !important;
           display: block;
           height: 1em;
           line-height: 1em;
@@ -237,8 +237,7 @@
         box-shadow: 0px 0px 5px -5px rgba(0, 0, 0, 0.05), 0px 0px 25px 0px rgba(0, 0, 0, 0.1);
         position: relative;
         > td {
-          // background: @table-row-hover-bg;
-          background-color: #fff;
+          background: @table-row-hover-bg;
         }
       }
     }
@@ -253,8 +252,7 @@
     //     box-shadow: 0px 0px 5px -5px rgba(0, 0, 0, 0.05), 0px 0px 25px 0px rgba(0, 0, 0, 0.1);
     //     position: relative;
     //     > td {
-    //       // background: @table-row-hover-bg;
-    //       background-color: #fff;
+    //       background: @table-row-hover-bg;
     //     }
     //   }
     // }
@@ -404,8 +402,18 @@
     .@{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}-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 {
@@ -413,9 +421,17 @@
     }
 
     &.@{table-prefix-cls}-empty {
+      .@{table-prefix-cls}-body > table {
+        border-radius: @border-radius-base @border-radius-base 0 0;
+      }
       .@{table-prefix-cls}-placeholder {
-        border-right: @border-width-base @border-style-base @border-color-split;
-        border-left: @border-width-base @border-style-base @border-color-split;
+        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;
+        }
       }
     }
 
@@ -442,6 +458,9 @@
     .@{table-prefix-cls}-thead > tr > th,
     .@{table-prefix-cls}-tbody > tr > td {
       border-right: @border-width-base @border-style-base @border-color-split;
+      &:last-child {
+        border-right: none;
+      }
     }
     .@{table-prefix-cls}-tbody > tr:last-child {
       & > td {
@@ -469,9 +488,12 @@
     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: 0 0 @border-radius-base @border-radius-base;
+    // 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;
+    }
   }
 
   &-pagination.@{ant-prefix}-pagination {

package/lib/table/style/size.less

@@ -120,7 +120,7 @@
   }
 
   &.@{table-prefix-cls}-bordered {
-    border-right: 0;
+    // border-right: 0;
 
     .@{table-prefix-cls}-title {
       border: 0;
@@ -128,9 +128,9 @@
       border-bottom: @border-width-base @border-style-base @border-color-split;
     }
 
-    .@{table-prefix-cls}-content {
-      border-right: @border-width-base @border-style-base @border-color-split;
-    }
+    // .@{table-prefix-cls}-content {
+    //   border-right: @border-width-base @border-style-base @border-color-split;
+    // }
 
     .@{table-prefix-cls}-footer {
       border: 0;

package/lib/table/table.d.ts

@@ -1,6 +1,6 @@
-import type { TableProps as AntdTableProps } from 'antd/es/table';
-import Column from 'antd/es/table/Column';
-import ColumnGroup from 'antd/es/table/ColumnGroup';
+import type { TableProps as AntdTableProps } from 'antd/lib/table';
+import Column from 'antd/lib/table/Column';
+import ColumnGroup from 'antd/lib/table/ColumnGroup';
 import React from 'react';
 export declare type TableProps<T> = Omit<AntdTableProps<T>, 'locale'> & {
     storageKey?: string;