@pisell/materials 2.2.11 → 2.2.13

package/es/components/sort/index.d.ts

@@ -1,5 +1,5 @@
-import React from "react";
-import { SortListProps } from "./types";
-import "./index.less";
+import React from 'react';
+import { SortListProps } from './types';
+import './index.less';
 declare const Sort: React.FC<SortListProps>;
 export default Sort;

package/es/components/sort/index.js

@@ -2,16 +2,16 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 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; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 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); }
-import React, { useMemo } from "react";
-import { Button, Dropdown, Popover } from "antd";
-import classNames from "classnames";
-import { CheckOutlined } from "@ant-design/icons";
-import SwitchVertical01 from "@pisell/icon/es/SwitchVertical01";
+import React, { useMemo } from 'react';
+import { Button, Dropdown, Popover } from 'antd';
+import classNames from 'classnames';
+import { CheckOutlined } from '@ant-design/icons';
+import SwitchVertical01 from '@pisell/icon/es/SwitchVertical01';
 import { isMobile } from "../../utils/platform";
 import { getText } from "../../locales";
 import InlineMenu from "./components/InlineMenu";
 import "./index.less";
-var prefix = "pisell-lowcode-";
+var prefix = 'pisell-lowcode-';
 var Label = function Label(_ref) {
   var content = _ref.content;
   return /*#__PURE__*/React.createElement("div", {
@@ -21,53 +21,53 @@ var Label = function Label(_ref) {
 var sortChildrenMap = {
   date: function date(key, isLocal) {
     return [{
-      key: "".concat(key, ":desc").concat(isLocal ? ":date" : ""),
+      key: "".concat(key, ":asc").concat(isLocal ? ':date' : ''),
       label: /*#__PURE__*/React.createElement(Label, {
-        content: getText("sort-oldest-to-newest")
+        content: getText('sort-oldest-to-newest')
       })
     }, {
-      key: "".concat(key, ":asc").concat(isLocal ? ":date" : ""),
+      key: "".concat(key, ":desc").concat(isLocal ? ':date' : ''),
       label: /*#__PURE__*/React.createElement(Label, {
-        content: getText("sort-newest-to-oldest")
+        content: getText('sort-newest-to-oldest')
       })
     }];
   },
   time: function time(key, isLocal) {
     return [{
-      key: "".concat(key, ":desc").concat(isLocal ? ":time" : ""),
+      key: "".concat(key, ":desc").concat(isLocal ? ':time' : ''),
       label: /*#__PURE__*/React.createElement(Label, {
-        content: getText("sort-from-morning-to-night")
+        content: getText('sort-from-morning-to-night')
       })
     }, {
-      key: "".concat(key, ":asc").concat(isLocal ? ":time" : ""),
+      key: "".concat(key, ":asc").concat(isLocal ? ':time' : ''),
       label: /*#__PURE__*/React.createElement(Label, {
-        content: getText("sort-from-evening-to-morning")
+        content: getText('sort-from-evening-to-morning')
       })
     }];
   },
   string: function string(key, isLocal) {
     return [{
-      key: "".concat(key, ":asc").concat(isLocal ? ":string" : ""),
+      key: "".concat(key, ":asc").concat(isLocal ? ':string' : ''),
       label: /*#__PURE__*/React.createElement(Label, {
-        content: getText("sort-a-z")
+        content: getText('sort-a-z')
       })
     }, {
-      key: "".concat(key, ":desc").concat(isLocal ? ":string" : ""),
+      key: "".concat(key, ":desc").concat(isLocal ? ':string' : ''),
       label: /*#__PURE__*/React.createElement(Label, {
-        content: getText("sort-z-a")
+        content: getText('sort-z-a')
       })
     }];
   },
   number: function number(key, isLocal) {
     return [{
-      key: "".concat(key, ":asc").concat(isLocal ? ":number" : ""),
+      key: "".concat(key, ":asc").concat(isLocal ? ':number' : ''),
       label: /*#__PURE__*/React.createElement(Label, {
-        content: getText("sort-0-9")
+        content: getText('sort-0-9')
       })
     }, {
-      key: "".concat(key, ":desc").concat(isLocal ? ":number" : ""),
+      key: "".concat(key, ":desc").concat(isLocal ? ':number' : ''),
       label: /*#__PURE__*/React.createElement(Label, {
-        content: getText("sort-9-0")
+        content: getText('sort-9-0')
       })
     }];
   }
@@ -89,14 +89,14 @@ var Sort = function Sort(_ref2) {
         children: sortChildrenMap[d.type](d.name, !!(d !== null && d !== void 0 && d.localFilter)),
         popupClassName: "".concat(prefix, "sort-sub-menu-popup-wrap"),
         // 增加显示隐藏配置
-        className: "".concat(d.isHidden ? "".concat(prefix, "sort-menu-wrap-hide") : "")
+        className: "".concat(d.isHidden ? "".concat(prefix, "sort-menu-wrap-hide") : '')
       };
     });
   }, [list, localPagination]);
   var onClick = function onClick(detail) {
     var _detail$keyPath, _detail$keyPath2;
     if (((_detail$keyPath = detail.keyPath) === null || _detail$keyPath === void 0 ? void 0 : _detail$keyPath[0]) === value) {
-      onChange === null || onChange === void 0 ? void 0 : onChange("", detail);
+      onChange === null || onChange === void 0 ? void 0 : onChange('', detail);
       return;
     }
     onChange === null || onChange === void 0 ? void 0 : onChange(detail === null || detail === void 0 ? void 0 : (_detail$keyPath2 = detail.keyPath) === null || _detail$keyPath2 === void 0 ? void 0 : _detail$keyPath2[0], detail);
@@ -108,12 +108,12 @@ var Sort = function Sort(_ref2) {
       style: style,
       className: classNames(_defineProperty({}, "".concat(prefix, "sort-button-active"), !!value)),
       size: "large"
-    }, isMobileBool ? null : getText("sort-button-text"));
+    }, isMobileBool ? null : getText('sort-button-text'));
   }, [button, style, value, isMobileBool]);
   var content = useMemo(function () {
     return /*#__PURE__*/React.createElement(InlineMenu, {
       items: sortItems,
-      value: value || "",
+      value: value || '',
       onChange: onChange
     });
   }, [value, sortItems, onChange]);
@@ -123,11 +123,11 @@ var Sort = function Sort(_ref2) {
       content: content,
       arrow: false,
       overlayClassName: "".concat(prefix, "mobile-sort-overlay"),
-      trigger: ["click"]
+      trigger: ['click']
     }, btnContent);
   }
   return /*#__PURE__*/React.createElement(Dropdown, {
-    trigger: ["click"],
+    trigger: ['click'],
     placement: placement,
     menu: {
       items: sortItems,

package/es/components/table/BasicTable/index.d.ts

@@ -1,4 +1,4 @@
-import { TableProps } from "antd";
-import React from "react";
+import { TableProps } from 'antd';
+import React from 'react';
 declare const BasicTable: (props: TableProps<any>) => React.JSX.Element;
 export default BasicTable;

package/es/components/table/BasicTable/index.js

@@ -14,13 +14,13 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 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; }
 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; }
-import { Table, Form } from "antd";
-import React, { useState, useMemo, useCallback, useEffect } from "react";
+import { Table, Form } from 'antd';
+import React, { useState, useMemo, useCallback, useEffect } from 'react';
 import { FormPagination } from "../../Pagination";
 import { calcFilterSort } from "../Table/utils";
 import { useSharedState } from "../../../hooks";
 import { Context } from "../model";
-import { isArr } from "@pisell/utils";
+import { isArr } from '@pisell/utils';
 var BasicTable = function BasicTable(props) {
   var _pagination$pageSizeO;
   var dataSource = props.dataSource,
@@ -37,14 +37,14 @@ var BasicTable = function BasicTable(props) {
     sort = _useState4[0],
     setSort = _useState4[1];
   var form = Form.useFormInstance();
-  var formPagination = Form.useWatch("pagination", {
+  var formPagination = Form.useWatch('pagination', {
     form: form,
     preserve: true
   }) || {
     page: 1,
     size: 10
   };
-  var group = Form.useWatch("group_by", {
+  var group = Form.useWatch('group_by', {
     form: form,
     preserve: true
   });
@@ -84,6 +84,7 @@ var BasicTable = function BasicTable(props) {
       total: _total
     };
   }, [localPagination, dataSource, formPagination === null || formPagination === void 0 ? void 0 : formPagination.page, formPagination === null || formPagination === void 0 ? void 0 : formPagination.size, filter, sort, other.columns]);
+  console.log(pagination, 'wh8888');
 
   // 总数
   var total = useMemo(function () {
@@ -99,19 +100,19 @@ var BasicTable = function BasicTable(props) {
     var _expandedRowKeys = [];
     _dataSource === null || _dataSource === void 0 ? void 0 : (_dataSource$list = _dataSource.list) === null || _dataSource$list === void 0 ? void 0 : _dataSource$list.forEach(function (item) {
       if (item.__is_group) {
-        _expandedRowKeys.push(item["__rowKey"]);
+        _expandedRowKeys.push(item['__rowKey']);
       }
     });
     return _expandedRowKeys;
   }, [_dataSource === null || _dataSource === void 0 ? void 0 : _dataSource.list]);
   useEffect(function () {
     dispatch({
-      type: "setCurrentDataSource",
+      type: 'setCurrentDataSource',
       payload: (_dataSource === null || _dataSource === void 0 ? void 0 : _dataSource.list) || []
     });
   }, [_dataSource === null || _dataSource === void 0 ? void 0 : _dataSource.list]);
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Table, _extends({
-    key: defaultExpandedRowKeys.join("-")
+    key: defaultExpandedRowKeys.join('-')
   }, other, {
     // 开启分组条件后关闭行选择功能
     rowSelection: isGroup ? false : other === null || other === void 0 ? void 0 : other.rowSelection,
@@ -132,13 +133,13 @@ var BasicTable = function BasicTable(props) {
       return _objectSpread(_objectSpread({}, (other === null || other === void 0 ? void 0 : (_other$onRow = other.onRow) === null || _other$onRow === void 0 ? void 0 : _other$onRow.call(other, record, index)) || {}), {}, {
         __is_group: record.__is_group,
         __is_drag_sort: other.dragSort,
-        className: record.__is_group ? "pisell-lowcode-table-group-row-wrap" : ""
+        className: record.__is_group ? 'pisell-lowcode-table-group-row-wrap' : ''
       });
     },
     expandable: {
       defaultExpandAllRows: true
     }
-  })), total > ((pagination === null || pagination === void 0 ? void 0 : pagination.pageSize) || (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, {
+  })), total > ((pagination === null || pagination === void 0 ? void 0 : pagination.pageSize) || (pagination === null || pagination === void 0 ? void 0 : (_pagination$pageSizeO = pagination.pageSizeOptions) === null || _pagination$pageSizeO === void 0 ? void 0 : _pagination$pageSizeO[0]) || 10) || pagination !== null && pagination !== void 0 && pagination.showPagination && total > 10 ? /*#__PURE__*/React.createElement(Form.Item, {
     name: "pagination"
   }, /*#__PURE__*/React.createElement(FormPagination, _extends({}, pagination, {
     showTotal: _showTotal,

package/es/components/table/Table/utils.js

@@ -181,7 +181,7 @@ export var sortDataSource = function sortDataSource(dataSource, sortObj) {
       }
       // 对比日期排序
       if (sortType === "date") {
-        if (sortValue === "asc") {
+        if (sortValue !== "asc") {
           return new Date(bValue).getTime() - new Date(aValue).getTime();
         }
         return new Date(aValue).getTime() - new Date(bValue).getTime();

package/lib/components/sort/index.d.ts

@@ -1,5 +1,5 @@
-import React from "react";
-import { SortListProps } from "./types";
-import "./index.less";
+import React from 'react';
+import { SortListProps } from './types';
+import './index.less';
 declare const Sort: React.FC<SortListProps>;
 export default Sort;

package/lib/components/sort/index.js

@@ -48,11 +48,11 @@ var Label = ({ content }) => {
 var sortChildrenMap = {
   date: (key, isLocal) => [
     {
-      key: `${key}:desc${isLocal ? ":date" : ""}`,
+      key: `${key}:asc${isLocal ? ":date" : ""}`,
       label: /* @__PURE__ */ import_react.default.createElement(Label, { content: (0, import_locales.getText)("sort-oldest-to-newest") })
     },
     {
-      key: `${key}:asc${isLocal ? ":date" : ""}`,
+      key: `${key}:desc${isLocal ? ":date" : ""}`,
       label: /* @__PURE__ */ import_react.default.createElement(Label, { content: (0, import_locales.getText)("sort-newest-to-oldest") })
     }
   ],

package/lib/components/table/BasicTable/index.d.ts

@@ -1,4 +1,4 @@
-import { TableProps } from "antd";
-import React from "react";
+import { TableProps } from 'antd';
+import React from 'react';
 declare const BasicTable: (props: TableProps<any>) => React.JSX.Element;
 export default BasicTable;

package/lib/components/table/BasicTable/index.js

@@ -45,7 +45,10 @@ var BasicTable = (props) => {
   const [filter, setFilter] = (0, import_react.useState)();
   const [sort, setSort] = (0, import_react.useState)();
   const form = import_antd.Form.useFormInstance();
-  const formPagination = import_antd.Form.useWatch("pagination", { form, preserve: true }) || {
+  const formPagination = import_antd.Form.useWatch("pagination", {
+    form,
+    preserve: true
+  }) || {
     page: 1,
     size: 10
   };
@@ -90,6 +93,7 @@ var BasicTable = (props) => {
     sort,
     other.columns
   ]);
+  console.log(pagination, "wh8888");
   const total = (0, import_react.useMemo)(() => {
     if (localPagination) {
       return (_dataSource == null ? void 0 : _dataSource.total) || 0;
@@ -144,7 +148,7 @@ var BasicTable = (props) => {
         defaultExpandAllRows: true
       }
     }
-  ), total > ((pagination == null ? void 0 : pagination.pageSize) || ((_a = pagination == null ? void 0 : pagination.pageSizeOptions) == null ? void 0 : _a[0]) || 10) ? /* @__PURE__ */ import_react.default.createElement(import_antd.Form.Item, { name: "pagination" }, /* @__PURE__ */ import_react.default.createElement(
+  ), total > ((pagination == null ? void 0 : pagination.pageSize) || ((_a = pagination == null ? void 0 : pagination.pageSizeOptions) == null ? void 0 : _a[0]) || 10) || (pagination == null ? void 0 : pagination.showPagination) && total > 10 ? /* @__PURE__ */ import_react.default.createElement(import_antd.Form.Item, { name: "pagination" }, /* @__PURE__ */ import_react.default.createElement(
     import_Pagination.FormPagination,
     {
       ...pagination,

package/lib/components/table/Table/utils.js

@@ -193,7 +193,7 @@ var sortDataSource = (dataSource, sortObj) => {
         return bValue == null ? void 0 : bValue.localeCompare(aValue);
       }
       if (sortType2 === "date") {
-        if (sortValue === "asc") {
+        if (sortValue !== "asc") {
           return new Date(bValue).getTime() - new Date(aValue).getTime();
         }
         return new Date(aValue).getTime() - new Date(bValue).getTime();

package/lowcode/table/meta.ts

@@ -932,6 +932,20 @@ export default {
             value: 'target => !!target.getProps().getPropValue("pagination")',
           },
         },
+        {
+          name: "pagination.showPagination",
+          title: {
+            label: "始终显示分页",
+            tip: "pagination.showPagination | 当前数据总数大于10 则始终显示分页器",
+          },
+          propType: "bool",
+          setter: "BoolSetter",
+          defaultValue: false,
+          condition: {
+            type: "JSFunction",
+            value: 'target => !!target.getProps().getPropValue("pagination")',
+          },
+        },
         {
           name: "pagination.showTotal",
           title: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/materials",
-  "version": "2.2.11",
+  "version": "2.2.13",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -61,9 +61,9 @@
     "react-window": "^1.8.10",
     "react-virtualized-auto-sizer": "^1.0.20",
     "crypto-js": "^4.2.0",
-    "@pisell/utils": "1.0.25",
-    "@pisell/date-picker": "1.0.87",
-    "@pisell/icon": "0.0.11"
+    "@pisell/utils": "1.0.27",
+    "@pisell/icon": "0.0.11",
+    "@pisell/date-picker": "1.0.92"
   },
   "peerDependencies": {
     "react": "^18.0.0",