@pisell/materials 1.0.81 → 1.0.82

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (105) hide show
  1. package/build/lowcode/assets-daily.json +11 -11
  2. package/build/lowcode/assets-dev.json +2 -2
  3. package/build/lowcode/assets-prod.json +11 -11
  4. package/build/lowcode/index.js +1 -1
  5. package/build/lowcode/meta.js +1 -1
  6. package/build/lowcode/render/default/view.js +10 -8
  7. package/build/lowcode/view.js +11 -9
  8. package/dist/umd/materials.min.css +1 -0
  9. package/dist/umd/materials.min.js +1 -0
  10. package/dist/umd/static/DotsSix.57d66266.svg +1 -0
  11. package/dist/umd/static/arrow-left.e542294f.svg +1 -0
  12. package/dist/umd/static/arrow-right.763f03e0.svg +1 -0
  13. package/dist/umd/static/filter-lines.04a54ae9.svg +1 -0
  14. package/dist/umd/static/help-circle.31c9be40.svg +1 -0
  15. package/dist/umd/static/switch-vertical-01.7ebe3ba8.svg +1 -0
  16. package/es/components/Pagination/index.d.ts +1 -1
  17. package/es/components/Pagination/index.js +3 -1
  18. package/es/components/drawer/index.js +0 -1
  19. package/es/components/filter/components/Dropdown/index.js +2 -1
  20. package/es/components/filter/components/FilterButton/index.js +1 -1
  21. package/es/components/filter/components/FilterItem/index.js +3 -2
  22. package/es/components/table/Actions/Sort/index.js +1 -1
  23. package/es/components/table/BasicTable/index.js +49 -8
  24. package/es/components/table/Table/AddFieldModal/index.js +0 -1
  25. package/es/components/table/Table/fields/index.d.ts +29 -0
  26. package/es/components/table/Table/fields/index.js +5 -2
  27. package/es/components/table/Table/fields/pSwitch/Config/index.d.ts +3 -0
  28. package/es/components/table/Table/fields/pSwitch/Config/index.js +4 -0
  29. package/es/components/table/Table/fields/pSwitch/Edit/index.d.ts +4 -0
  30. package/es/components/table/Table/fields/pSwitch/Edit/index.js +12 -0
  31. package/es/components/table/Table/fields/pSwitch/Show/index.d.ts +4 -0
  32. package/es/components/table/Table/fields/pSwitch/Show/index.js +24 -0
  33. package/es/components/table/Table/fields/pSwitch/Sort/index.d.ts +3 -0
  34. package/es/components/table/Table/fields/pSwitch/Sort/index.js +4 -0
  35. package/es/components/table/Table/fields/pSwitch/index.d.ts +14 -0
  36. package/es/components/table/Table/fields/pSwitch/index.js +17 -0
  37. package/es/components/table/Table/fields/rangePicker/Edit/index.js +0 -1
  38. package/es/components/table/Table/fields/types/index.d.ts +2 -1
  39. package/es/components/table/Table/index.js +36 -2
  40. package/es/components/table/Table/tableConfig/body/CellProvider/index.js +5 -1
  41. package/es/components/table/Table/tableConfig/body/index.d.ts +1 -0
  42. package/es/components/table/Table/tableConfig/body/index.js +2 -1
  43. package/es/components/table/Table/tableConfig/header/CellProvider/index.less +1 -1
  44. package/es/components/table/Table/tableConfig/summary/index.js +0 -1
  45. package/es/components/table/Table/utils.d.ts +1 -0
  46. package/es/components/table/Table/utils.js +70 -0
  47. package/es/components/table/TableFilter/SortIcon.d.ts +6 -0
  48. package/es/components/table/TableFilter/SortIcon.js +31 -0
  49. package/es/components/table/TableFilter/index.less +14 -0
  50. package/es/components/table/TableFilter/numberFilter.d.ts +6 -0
  51. package/es/components/table/TableFilter/numberFilter.js +97 -0
  52. package/es/components/table/TableFilter/selectFilter.d.ts +10 -0
  53. package/es/components/table/TableFilter/selectFilter.js +127 -0
  54. package/es/components/table/TableFilter/stringFilter.d.ts +6 -0
  55. package/es/components/table/TableFilter/stringFilter.js +71 -0
  56. package/es/components/table/index.js +2 -1
  57. package/es/components/table/index.less +49 -1
  58. package/es/index.d.ts +0 -1
  59. package/es/index.js +3 -1
  60. package/lib/components/Pagination/index.d.ts +1 -1
  61. package/lib/components/Pagination/index.js +6 -5
  62. package/lib/components/drawer/index.js +0 -1
  63. package/lib/components/filter/components/Dropdown/index.js +4 -3
  64. package/lib/components/filter/components/FilterButton/index.js +2 -2
  65. package/lib/components/filter/components/FilterItem/index.js +1 -1
  66. package/lib/components/table/Actions/Sort/index.js +2 -2
  67. package/lib/components/table/BasicTable/index.js +44 -8
  68. package/lib/components/table/Table/AddFieldModal/index.js +0 -1
  69. package/lib/components/table/Table/fields/index.d.ts +29 -0
  70. package/lib/components/table/Table/fields/index.js +5 -2
  71. package/lib/components/table/Table/fields/pSwitch/Config/index.d.ts +3 -0
  72. package/lib/components/table/Table/fields/pSwitch/Config/index.js +28 -0
  73. package/lib/components/table/Table/fields/pSwitch/Edit/index.d.ts +4 -0
  74. package/lib/components/table/Table/fields/pSwitch/Edit/index.js +41 -0
  75. package/lib/components/table/Table/fields/pSwitch/Show/index.d.ts +4 -0
  76. package/lib/components/table/Table/fields/pSwitch/Show/index.js +58 -0
  77. package/lib/components/table/Table/fields/pSwitch/Sort/index.d.ts +3 -0
  78. package/lib/components/table/Table/fields/pSwitch/Sort/index.js +28 -0
  79. package/lib/components/table/Table/fields/pSwitch/index.d.ts +14 -0
  80. package/lib/components/table/Table/fields/pSwitch/index.js +51 -0
  81. package/lib/components/table/Table/fields/rangePicker/Edit/index.js +0 -1
  82. package/lib/components/table/Table/fields/types/index.d.ts +2 -1
  83. package/lib/components/table/Table/index.js +27 -1
  84. package/lib/components/table/Table/tableConfig/body/CellProvider/index.js +5 -1
  85. package/lib/components/table/Table/tableConfig/body/index.d.ts +1 -0
  86. package/lib/components/table/Table/tableConfig/body/index.js +1 -0
  87. package/lib/components/table/Table/tableConfig/header/CellProvider/index.less +1 -1
  88. package/lib/components/table/Table/tableConfig/summary/index.js +0 -1
  89. package/lib/components/table/Table/utils.d.ts +1 -0
  90. package/lib/components/table/Table/utils.js +108 -0
  91. package/lib/components/table/TableFilter/SortIcon.d.ts +6 -0
  92. package/lib/components/table/TableFilter/SortIcon.js +60 -0
  93. package/lib/components/table/TableFilter/index.less +14 -0
  94. package/lib/components/table/TableFilter/numberFilter.d.ts +6 -0
  95. package/lib/components/table/TableFilter/numberFilter.js +111 -0
  96. package/lib/components/table/TableFilter/selectFilter.d.ts +10 -0
  97. package/lib/components/table/TableFilter/selectFilter.js +124 -0
  98. package/lib/components/table/TableFilter/stringFilter.d.ts +6 -0
  99. package/lib/components/table/TableFilter/stringFilter.js +97 -0
  100. package/lib/components/table/index.js +1 -1
  101. package/lib/components/table/index.less +49 -1
  102. package/lib/index.d.ts +0 -1
  103. package/lib/index.js +21 -24
  104. package/lowcode/button/meta.ts +10 -0
  105. package/package.json +1 -1
@@ -0,0 +1 @@
1
+ <svg width="24" height="24" fill="currentColor" xmlns="http://www.w3.org/2000/svg"><path d="M8 13a1 1 0 1 0 0-2 1 1 0 0 0 0 2ZM8 6a1 1 0 1 0 0-2 1 1 0 0 0 0 2ZM8 20a1 1 0 1 0 0-2 1 1 0 0 0 0 2ZM16 13a1 1 0 1 0 0-2 1 1 0 0 0 0 2ZM16 6a1 1 0 1 0 0-2 1 1 0 0 0 0 2ZM16 20a1 1 0 1 0 0-2 1 1 0 0 0 0 2Z" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/></svg>
@@ -0,0 +1 @@
1
+ <svg width="24" height="24" fill="currentColor" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M12.707 4.293a1 1 0 0 1 0 1.414L7.414 11H19a1 1 0 1 1 0 2H7.414l5.293 5.293a1 1 0 0 1-1.414 1.414l-7-7a1 1 0 0 1 0-1.414l7-7a1 1 0 0 1 1.414 0Z"/></svg>
@@ -0,0 +1 @@
1
+ <svg width="24" height="24" fill="currentColor" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M11.293 4.293a1 1 0 0 1 1.414 0l7 7a1 1 0 0 1 0 1.414l-7 7a1 1 0 0 1-1.414-1.414L16.586 13H5a1 1 0 1 1 0-2h11.586l-5.293-5.293a1 1 0 0 1 0-1.414Z"/></svg>
@@ -0,0 +1 @@
1
+ <svg width="24" height="24" fill="currentColor" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M2 6a1 1 0 0 1 1-1h18a1 1 0 1 1 0 2H3a1 1 0 0 1-1-1Zm3 6a1 1 0 0 1 1-1h12a1 1 0 1 1 0 2H6a1 1 0 0 1-1-1Zm3 6a1 1 0 0 1 1-1h6a1 1 0 1 1 0 2H9a1 1 0 0 1-1-1Z"/></svg>
@@ -0,0 +1 @@
1
+ <svg width="24" height="24" fill="currentColor" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M12 3a9 9 0 1 0 0 18 9 9 0 0 0 0-18ZM1 12C1 5.925 5.925 1 12 1s11 4.925 11 11-4.925 11-11 11S1 18.075 1 12Zm11.258-3.976a2 2 0 0 0-2.225 1.308 1 1 0 1 1-1.886-.664 4 4 0 0 1 7.773 1.333c0 1.53-1.135 2.54-1.945 3.081a8.044 8.044 0 0 1-1.686.848l-.035.013-.011.003-.004.002h-.002L11.92 13l.316.949a1 1 0 0 1-.633-1.897l.016-.006.074-.027a6.051 6.051 0 0 0 1.172-.6c.69-.46 1.055-.95 1.055-1.419v-.001a2 2 0 0 0-1.662-1.975ZM11 17a1 1 0 0 1 1-1h.01a1 1 0 1 1 0 2H12a1 1 0 0 1-1-1Z"/></svg>
@@ -0,0 +1 @@
1
+ <svg width="24" height="24" fill="currentColor" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M6.293 3.293a1 1 0 0 1 1.414 0l4 4a1 1 0 0 1-1.414 1.414L8 6.414V20a1 1 0 1 1-2 0V6.414L3.707 8.707a1 1 0 0 1-1.414-1.414l4-4ZM16 17.586V4a1 1 0 1 1 2 0v13.586l2.293-2.293a1 1 0 0 1 1.414 1.414l-4 4a1 1 0 0 1-1.414 0l-4-4a1 1 0 0 1 1.414-1.414L16 17.586Z"/></svg>
@@ -5,7 +5,7 @@ export declare const paginationConfig: {
5
5
  className: string;
6
6
  defaultCurrent: number;
7
7
  showTotal: (total: number, range: [number, number]) => string;
8
- itemRender: (page: number, type: "page" | "next" | "prev" | "jump-prev" | "jump-next", element: React.ReactNode) => React.ReactNode;
8
+ itemRender: (page: number, type: "next" | "page" | "prev" | "jump-prev" | "jump-next", element: React.ReactNode) => React.ReactNode;
9
9
  responsive: boolean;
10
10
  size: string;
11
11
  };
@@ -9,7 +9,9 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
9
9
  function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
10
10
  function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
11
11
  import React, { useEffect, useMemo, useState } from "react";
12
- import { ArrowLeft, ArrowRight } from "@pisell/icon";
12
+ // import { ArrowLeft, ArrowRight } from "@pisell/icon/es";
13
+ import ArrowRight from "@pisell/icon/es/ArrowRight";
14
+ import ArrowLeft from "@pisell/icon/es/ArrowLeft";
13
15
  import { Pagination as OriginPagination } from "antd";
14
16
  import classNames from "classnames";
15
17
  import { useResponsive } from "../../hooks";
@@ -7,7 +7,6 @@ var Drawer = function Drawer(props) {
7
7
  // 低代码编辑态中强制显示,将控制权交给引擎侧
8
8
  innerProps.open = true;
9
9
  }
10
- console.log(props, 'Drawer props', innerProps);
11
10
  return /*#__PURE__*/React.createElement(OriginalDrawer, _extends({}, props, innerProps));
12
11
  };
13
12
  export default Drawer;
@@ -1,6 +1,7 @@
1
1
  function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
2
2
  import React, { useCallback, useMemo } from "react";
3
- import { DotsSix, HelpCircle } from "@pisell/icon";
3
+ import DotsSix from "@pisell/icon/es/DotsSix";
4
+ import HelpCircle from "@pisell/icon/es/HelpCircle";
4
5
  import "./index.less";
5
6
  import FilterItem from "../FilterItem";
6
7
  import { Tooltip } from "antd";
@@ -1,7 +1,7 @@
1
1
  import React, { useMemo, useRef } from "react";
2
2
  import { Button, Popover } from "antd";
3
3
  import Dropdown from "../Dropdown";
4
- import { FilterLines } from "@pisell/icon";
4
+ import FilterLines from "@pisell/icon/es/FilterLines";
5
5
  var Filter = function Filter(_ref) {
6
6
  var _ref$list = _ref.list,
7
7
  list = _ref$list === void 0 ? [] : _ref$list,
@@ -1,3 +1,4 @@
1
+ function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
1
2
  import React, { useMemo } from "react";
2
3
  import { Form } from "antd";
3
4
  import { fieldMaps } from "../../../table/Table/fields";
@@ -11,9 +12,9 @@ var FilterItem = function FilterItem(props) {
11
12
  var _fieldMaps;
12
13
  return (_fieldMaps = fieldMaps[type]) === null || _fieldMaps === void 0 ? void 0 : _fieldMaps.edit;
13
14
  }, [type]);
14
- return /*#__PURE__*/React.createElement(Form.Item, {
15
+ return /*#__PURE__*/React.createElement(Form.Item, _extends({
15
16
  label: label,
16
17
  name: name
17
- }, /*#__PURE__*/React.createElement(Com, other));
18
+ }, (other === null || other === void 0 ? void 0 : other.formItemProps) || {}), /*#__PURE__*/React.createElement(Com, other));
18
19
  };
19
20
  export default FilterItem;
@@ -1,6 +1,6 @@
1
1
  import React, { useMemo } from "react";
2
2
  import { Button, Dropdown } from "antd";
3
- import { SwitchVertical01 } from "@pisell/icon";
3
+ import SwitchVertical01 from "@pisell/icon/es/SwitchVertical01";
4
4
  var sortChildrenMap = {
5
5
  date: function date(key) {
6
6
  return [{
@@ -1,35 +1,63 @@
1
+ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
1
2
  var _excluded = ["dataSource", "pagination", "value"];
2
3
  function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
4
+ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
5
+ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
6
+ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
7
+ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
8
+ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
9
+ function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
10
+ 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."); }
11
+ 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); }
12
+ 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; }
13
+ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
14
+ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
3
15
  function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
4
16
  function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
5
17
  import { Table, Form } from "antd";
6
- import React, { useMemo, useCallback } from "react";
18
+ import React, { useState, useMemo, useCallback } from "react";
7
19
  import { FormPagination } from "../../Pagination";
20
+ import { calcFilterSort } from "../Table/utils";
8
21
  var BasicTable = function BasicTable(props) {
9
22
  var _pagination$pageSizeO;
10
23
  var dataSource = props.dataSource,
11
24
  pagination = props.pagination,
12
25
  value = props.value,
13
26
  other = _objectWithoutProperties(props, _excluded);
27
+ var _useState = useState(),
28
+ _useState2 = _slicedToArray(_useState, 2),
29
+ filter = _useState2[0],
30
+ setFilter = _useState2[1];
31
+ var _useState3 = useState(),
32
+ _useState4 = _slicedToArray(_useState3, 2),
33
+ sort = _useState4[0],
34
+ setSort = _useState4[1];
14
35
  var form = Form.useFormInstance();
15
36
  var formPagination = Form.useWatch("pagination", form) || {
16
37
  page: 1,
17
38
  size: 10
18
39
  };
19
- var showTotal = pagination.showTotal;
40
+ var showTotal = pagination.showTotal,
41
+ localPagination = pagination.localPagination;
20
42
  var _showTotal = useCallback(function (total, range) {
21
- var _size = formPagination.size;
43
+ var _size = formPagination.size || 10;
22
44
  return showTotal(total, range, _size);
23
45
  }, [showTotal, formPagination === null || formPagination === void 0 ? void 0 : formPagination.page, formPagination === null || formPagination === void 0 ? void 0 : formPagination.size]);
24
46
 
25
47
  // 分割数据源
26
48
  var _dataSource = useMemo(function () {
27
49
  var _page = formPagination.page;
28
- var _size = formPagination.size;
50
+ var _size = formPagination.size || 10;
29
51
  var list = [];
30
52
  var _total = total;
31
- if (dataSource.length > _size) {
32
- list = dataSource;
53
+ if (localPagination) {
54
+ // 这里本地前端过滤筛选
55
+ list = calcFilterSort({
56
+ dataSource: dataSource,
57
+ columns: other.columns,
58
+ sort: sort,
59
+ filter: filter
60
+ });
33
61
  _total = list.length;
34
62
  list = list.slice((_page - 1) * _size, _page * _size);
35
63
  } else {
@@ -39,13 +67,26 @@ var BasicTable = function BasicTable(props) {
39
67
  list: list,
40
68
  total: _total
41
69
  };
42
- }, [dataSource, formPagination === null || formPagination === void 0 ? void 0 : formPagination.page, formPagination === null || formPagination === void 0 ? void 0 : formPagination.size]);
70
+ }, [localPagination, dataSource, formPagination === null || formPagination === void 0 ? void 0 : formPagination.page, formPagination === null || formPagination === void 0 ? void 0 : formPagination.size, filter, sort, other.columns]);
43
71
 
44
72
  // 总数
45
73
  var total = useMemo(function () {
74
+ // 如果dataSource.length > 当前分页时为前端分页处理 此时total优先取_dataSource中total
75
+ if (dataSource.length > formPagination.size) {
76
+ return (_dataSource === null || _dataSource === void 0 ? void 0 : _dataSource.total) || 0;
77
+ }
46
78
  return (pagination === null || pagination === void 0 ? void 0 : pagination.total) || (_dataSource === null || _dataSource === void 0 ? void 0 : _dataSource.total) || 0;
47
- }, [dataSource, pagination]);
79
+ }, [_dataSource, pagination]);
48
80
  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Table, _extends({}, other, {
81
+ onChange: function onChange(pagination, filters, sorter) {
82
+ form.setFieldsValue({
83
+ pagination: _objectSpread(_objectSpread({}, formPagination), {}, {
84
+ page: 1
85
+ })
86
+ });
87
+ setFilter(filters);
88
+ setSort(sorter);
89
+ },
49
90
  pagination: false,
50
91
  dataSource: _dataSource === null || _dataSource === void 0 ? void 0 : _dataSource.list
51
92
  })), total > ((pagination === null || pagination === void 0 ? void 0 : (_pagination$pageSizeO = pagination.pageSizeOptions) === null || _pagination$pageSizeO === void 0 ? void 0 : _pagination$pageSizeO[0]) || 10) ? /*#__PURE__*/React.createElement(Form.Item, {
@@ -39,7 +39,6 @@ var AddFieldModal = function AddFieldModal() {
39
39
  openModal = _useState4[0],
40
40
  setOpenModal = _useState4[1];
41
41
  var addField = function addField(values) {
42
- console.log(values);
43
42
  var field_name = values.field_name;
44
43
  if (defaultColumns.find(function (d) {
45
44
  return d.dataIndex === field_name;
@@ -96,6 +96,18 @@ export declare const fieldMaps: {
96
96
  sort: () => JSX.Element;
97
97
  show: (props: import("./types").FieldPropsType) => JSX.Element;
98
98
  };
99
+ pSwitch: {
100
+ field: {
101
+ field_icon: string;
102
+ field_name: string;
103
+ field_type: string;
104
+ default_value: boolean;
105
+ };
106
+ config: () => JSX.Element;
107
+ edit: import("react").ForwardRefExoticComponent<Omit<import("./types").EditPropsType, "ref"> & import("react").RefAttributes<any>>;
108
+ sort: () => JSX.Element;
109
+ show: (props: import("./types").FieldPropsType) => JSX.Element;
110
+ };
99
111
  };
100
112
  export declare const fieldList: ({
101
113
  field_icon: string;
@@ -137,6 +149,11 @@ export declare const fieldList: ({
137
149
  field_name: string;
138
150
  field_type: string;
139
151
  default_value: string;
152
+ } | {
153
+ field_icon: string;
154
+ field_name: string;
155
+ field_type: string;
156
+ default_value: boolean;
140
157
  })[];
141
158
  export declare const getFieldByType: (type: string) => {
142
159
  field: {
@@ -247,5 +264,17 @@ declare const _default: {
247
264
  sort: () => JSX.Element;
248
265
  show: (props: import("./types").FieldPropsType) => JSX.Element;
249
266
  };
267
+ pSwitch: {
268
+ field: {
269
+ field_icon: string;
270
+ field_name: string;
271
+ field_type: string;
272
+ default_value: boolean;
273
+ };
274
+ config: () => JSX.Element;
275
+ edit: import("react").ForwardRefExoticComponent<Omit<import("./types").EditPropsType, "ref"> & import("react").RefAttributes<any>>;
276
+ sort: () => JSX.Element;
277
+ show: (props: import("./types").FieldPropsType) => JSX.Element;
278
+ };
250
279
  };
251
280
  export default _default;
@@ -6,6 +6,7 @@ import text from "./text";
6
6
  import image from "./image";
7
7
  import rangePicker from "./rangePicker";
8
8
  import search from "./search";
9
+ import pSwitch from "./pSwitch";
9
10
  export var fieldMaps = {
10
11
  text: text,
11
12
  link: link,
@@ -14,7 +15,8 @@ export var fieldMaps = {
14
15
  select: select,
15
16
  image: image,
16
17
  rangePicker: rangePicker,
17
- search: search
18
+ search: search,
19
+ pSwitch: pSwitch
18
20
  };
19
21
  export var fieldList = Object.values(fieldMaps).map(function (d) {
20
22
  return d.field;
@@ -30,5 +32,6 @@ export default {
30
32
  select: select,
31
33
  image: image,
32
34
  rangePicker: rangePicker,
33
- search: search
35
+ search: search,
36
+ pSwitch: pSwitch
34
37
  };
@@ -0,0 +1,3 @@
1
+ /// <reference types="react" />
2
+ declare const Config: () => JSX.Element;
3
+ export default Config;
@@ -0,0 +1,4 @@
1
+ var Config = function Config() {
2
+ return /*#__PURE__*/React.createElement("div", null);
3
+ };
4
+ export default Config;
@@ -0,0 +1,4 @@
1
+ import { EditPropsType } from "../../types";
2
+ import React from "react";
3
+ declare const _default: React.ForwardRefExoticComponent<Omit<EditPropsType, "ref"> & React.RefAttributes<any>>;
4
+ export default _default;
@@ -0,0 +1,12 @@
1
+ import { forwardRef } from "react";
2
+ import React from "react";
3
+ var Edit = function Edit(props, ref) {
4
+ var value = props.value,
5
+ onChange = props.onChange,
6
+ onPressEnter = props.onPressEnter,
7
+ onBlur = props.onBlur,
8
+ style = props.style,
9
+ bordered = props.bordered;
10
+ return /*#__PURE__*/React.createElement(React.Fragment, null);
11
+ };
12
+ export default /*#__PURE__*/forwardRef(Edit);
@@ -0,0 +1,4 @@
1
+ /// <reference types="react" />
2
+ import { FieldPropsType } from "../../types";
3
+ declare const Show: (props: FieldPropsType) => JSX.Element;
4
+ export default Show;
@@ -0,0 +1,24 @@
1
+ var _excluded = ["title", "editable", "dataIndex", "field_type", "record", "handleSave", "onChange"];
2
+ function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
3
+ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
4
+ import { Switch } from "antd";
5
+ import React from "react";
6
+ var Show = function Show(props) {
7
+ var title = props.title,
8
+ editable = props.editable,
9
+ dataIndex = props.dataIndex,
10
+ field_type = props.field_type,
11
+ record = props.record,
12
+ handleSave = props.handleSave,
13
+ _onChange = props.onChange,
14
+ restProps = _objectWithoutProperties(props, _excluded);
15
+ return /*#__PURE__*/React.createElement("div", {
16
+ className: ""
17
+ }, /*#__PURE__*/React.createElement(Switch, {
18
+ checked: record[dataIndex],
19
+ onChange: function onChange(e) {
20
+ _onChange && _onChange(e, record);
21
+ }
22
+ }));
23
+ };
24
+ export default Show;
@@ -0,0 +1,3 @@
1
+ /// <reference types="react" />
2
+ declare const Sort: () => JSX.Element;
3
+ export default Sort;
@@ -0,0 +1,4 @@
1
+ var Sort = function Sort() {
2
+ return /*#__PURE__*/React.createElement("div", null);
3
+ };
4
+ export default Sort;
@@ -0,0 +1,14 @@
1
+ /// <reference types="react" />
2
+ declare const _default: {
3
+ field: {
4
+ field_icon: string;
5
+ field_name: string;
6
+ field_type: string;
7
+ default_value: boolean;
8
+ };
9
+ config: () => JSX.Element;
10
+ edit: import("react").ForwardRefExoticComponent<Omit<import("../types").EditPropsType, "ref"> & import("react").RefAttributes<any>>;
11
+ sort: () => JSX.Element;
12
+ show: (props: import("../types").FieldPropsType) => JSX.Element;
13
+ };
14
+ export default _default;
@@ -0,0 +1,17 @@
1
+ import Config from "./Config";
2
+ import Edit from "./Edit";
3
+ import Show from "./Show";
4
+ import Sort from "./Sort";
5
+ var field = {
6
+ field_icon: "pi-a-Property3Singlelinetext",
7
+ field_name: "Switch",
8
+ field_type: "pSwitch",
9
+ default_value: false
10
+ };
11
+ export default {
12
+ field: field,
13
+ config: Config,
14
+ edit: Edit,
15
+ sort: Sort,
16
+ show: Show
17
+ };
@@ -71,7 +71,6 @@ var Edit = function Edit(props, ref) {
71
71
  }
72
72
  return true;
73
73
  }, [showTime]);
74
- console.log(dayjsVal, 'dayjsVal');
75
74
  return /*#__PURE__*/React.createElement(RangePicker, _extends({}, others, {
76
75
  format: format,
77
76
  showTime: _showTime,
@@ -10,8 +10,9 @@ export declare type FieldPropsType = {
10
10
  label: string;
11
11
  }[];
12
12
  handleSave: () => void;
13
+ onChange: (value: any, record: any) => void;
13
14
  };
14
- export declare type FieldType = 'text' | 'image';
15
+ export declare type FieldType = "text" | "image";
15
16
  export declare type EditPropsType = {
16
17
  value: any;
17
18
  onChange: (v: any) => void;
@@ -23,6 +23,10 @@ import SortRow from "./tableConfig/SortRow";
23
23
  import Body from "./tableConfig/body";
24
24
  import Header from "./tableConfig/header";
25
25
  import { paginationConfig } from "../../Pagination";
26
+ import getColumnStringProps from "../TableFilter/stringFilter";
27
+ import getColumnNumberProps from "../TableFilter/numberFilter";
28
+ import getColumnSelectProps from "../TableFilter/selectFilter";
29
+ import SortIcon from "../TableFilter/SortIcon";
26
30
  var GridViewTable = function GridViewTable(_ref) {
27
31
  var tableProps = _ref.tableProps;
28
32
  var responsive = useResponsive();
@@ -58,6 +62,7 @@ var GridViewTable = function GridViewTable(_ref) {
58
62
  };
59
63
  var columns = useMemo(function () {
60
64
  return defaultColumns.map(function (col, index) {
65
+ var _col$filters;
61
66
  if (!col.editable) {
62
67
  return col;
63
68
  }
@@ -67,9 +72,38 @@ var GridViewTable = function GridViewTable(_ref) {
67
72
  title: col.title,
68
73
  field_type: col.field_type,
69
74
  lock: col.lock,
70
- width: col.width || 0
75
+ width: col.width || 0,
76
+ render: col.render
71
77
  };
72
- return _objectSpread(_objectSpread({}, col), {}, {
78
+ var filterObj = {};
79
+
80
+ // 开启默认筛选后根据字段类型渲染表头筛选
81
+ if (col.defaultFilters) {
82
+ if (col.field_type === "number") {
83
+ filterObj = getColumnNumberProps({
84
+ dataIndex: col.dataIndex
85
+ });
86
+ }
87
+ if (col.field_type === "text") {
88
+ filterObj = getColumnStringProps({
89
+ dataIndex: col.dataIndex
90
+ });
91
+ }
92
+ }
93
+
94
+ // 表头的筛选菜单项
95
+ if (((_col$filters = col.filters) === null || _col$filters === void 0 ? void 0 : _col$filters.length) > 0) {
96
+ filterObj = _objectSpread(_objectSpread({}, getColumnSelectProps({
97
+ dataIndex: col.dataIndex,
98
+ filters: col.filters
99
+ })), {}, {
100
+ filters: col.filters
101
+ });
102
+ }
103
+ return _objectSpread(_objectSpread(_objectSpread({}, col), filterObj), {}, {
104
+ sortIcon: function sortIcon(props) {
105
+ return /*#__PURE__*/React.createElement(SortIcon, props);
106
+ },
73
107
  onCell: function onCell(record) {
74
108
  return _objectSpread(_objectSpread({
75
109
  record: record
@@ -29,7 +29,11 @@ var CellProvider = function CellProvider(props) {
29
29
  dataIndex = props.dataIndex,
30
30
  field_type = props.field_type,
31
31
  record = props.record,
32
- handleSave = props.handleSave;
32
+ handleSave = props.handleSave,
33
+ render = props.render;
34
+ if (render) {
35
+ return children;
36
+ }
33
37
  var _useState = useState(false),
34
38
  _useState2 = _slicedToArray(_useState, 2),
35
39
  editing = _useState2[0],
@@ -22,6 +22,7 @@ interface EditableCellProps {
22
22
  handleSave: (record: Item) => void;
23
23
  className?: string;
24
24
  lock?: any;
25
+ render?: any;
25
26
  }
26
27
  declare const _default: {
27
28
  Row: React.FC<RowProps>;
@@ -1,5 +1,5 @@
1
1
  var _excluded = ["index"],
2
- _excluded2 = ["title", "editable", "children", "dataIndex", "field_type", "record", "handleSave", "lock"];
2
+ _excluded2 = ["title", "editable", "children", "dataIndex", "field_type", "record", "handleSave", "lock", "render"];
3
3
  function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
4
4
  function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
5
5
  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."); }
@@ -37,6 +37,7 @@ var EditableCell = function EditableCell(props) {
37
37
  record = props.record,
38
38
  handleSave = props.handleSave,
39
39
  lock = props.lock,
40
+ render = props.render,
40
41
  restProps = _objectWithoutProperties(props, _excluded2);
41
42
  return /*#__PURE__*/React.createElement("td", _extends({}, restProps, {
42
43
  className: classNames(restProps.className, "ant-table-cell", "materials-grid-table-cell")
@@ -15,7 +15,7 @@
15
15
  font-weight: 600;
16
16
  font-size: 14px;
17
17
  color: #1B1B1B;
18
- overflow: hidden;
18
+ //overflow: hidden;
19
19
  text-overflow: ellipsis;
20
20
  white-space: nowrap;
21
21
  word-break: break-all;
@@ -1,7 +1,6 @@
1
1
  import { Table } from "antd";
2
2
  import React from "react";
3
3
  var summary = function summary(props) {
4
- console.log("summary", props);
5
4
  return /*#__PURE__*/React.createElement(Table.Summary, {
6
5
  fixed: true
7
6
  }, /*#__PURE__*/React.createElement(Table.Summary.Row, null, /*#__PURE__*/React.createElement(Table.Summary.Cell, {
@@ -0,0 +1 @@
1
+ export declare const calcFilterSort: ({ dataSource, filter, sort, columns }: any) => any;
@@ -0,0 +1,70 @@
1
+ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
2
+ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
3
+ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
4
+ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
5
+ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
6
+ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
7
+ import dayjs from "dayjs";
8
+ var transColumnsMap = function transColumnsMap(columns) {
9
+ return columns.reduce(function (p, c) {
10
+ return _objectSpread(_objectSpread({}, p), {}, _defineProperty({}, c.dataIndex, c));
11
+ }, {});
12
+ };
13
+ var filterFnMap = {
14
+ text: function text(value, record, dataIndex) {
15
+ var _record$dataIndex;
16
+ return (_record$dataIndex = record[dataIndex]) === null || _record$dataIndex === void 0 ? void 0 : _record$dataIndex.toString().toLowerCase().includes(value.toLowerCase());
17
+ },
18
+ number: function number(value, record, dataIndex) {
19
+ return record[dataIndex] >= value.min && record[dataIndex] <= value.max;
20
+ },
21
+ filters: function filters(value, record, dataIndex) {
22
+ var _record$dataIndex2;
23
+ return value.map(function (item) {
24
+ return item.toLowerCase();
25
+ }).includes((_record$dataIndex2 = record[dataIndex]) === null || _record$dataIndex2 === void 0 ? void 0 : _record$dataIndex2.toString().toLowerCase());
26
+ }
27
+ };
28
+ var sorter = function sorter(item) {
29
+ return function (a, b) {
30
+ if (item.field_type === "date") {
31
+ return dayjs(a[item.dataIndex]).valueOf() - dayjs(b[item.dataIndex]).valueOf();
32
+ }
33
+ return a[item.dataIndex] - b[item.dataIndex];
34
+ };
35
+ };
36
+ export var calcFilterSort = function calcFilterSort(_ref) {
37
+ var dataSource = _ref.dataSource,
38
+ filter = _ref.filter,
39
+ sort = _ref.sort,
40
+ columns = _ref.columns;
41
+ var columnMap = transColumnsMap(columns);
42
+ var newDataSource = dataSource.filter(function (item) {
43
+ return Object.keys(filter || {}).every(function (f) {
44
+ var _filter$f, _columnDetail$filters;
45
+ if (!((_filter$f = filter[f]) !== null && _filter$f !== void 0 && _filter$f.length)) return true;
46
+ var columnDetail = columnMap[f];
47
+ if (((_columnDetail$filters = columnDetail.filters) === null || _columnDetail$filters === void 0 ? void 0 : _columnDetail$filters.length) > 0) {
48
+ return filterFnMap["filters"](filter[f][0], item, columnDetail.dataIndex);
49
+ }
50
+ if (columnDetail.field_type === "text") {
51
+ return filterFnMap[columnDetail.field_type](filter[f][0], item, columnDetail.dataIndex);
52
+ } else if (columnDetail.field_type === "number") {
53
+ return filterFnMap[columnDetail.field_type](filter[f][0], item, columnDetail.dataIndex);
54
+ }
55
+ return true;
56
+ });
57
+ });
58
+ if (sort !== null && sort !== void 0 && sort.order) {
59
+ newDataSource.sort(function (a, b) {
60
+ var order = sort.order;
61
+ if (order === "descend") {
62
+ return sorter(sort.column)(b, a);
63
+ }
64
+ if (order === "ascend") {
65
+ return sorter(sort.column)(a, b);
66
+ }
67
+ });
68
+ }
69
+ return newDataSource;
70
+ };
@@ -0,0 +1,6 @@
1
+ /// <reference types="react" />
2
+ interface SortIconProps {
3
+ sortOrder: null | "ascend" | "descend";
4
+ }
5
+ declare const SortIcon: (props: SortIconProps) => JSX.Element;
6
+ export default SortIcon;