@teamix/pro 1.2.20 → 1.2.24

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

@@ -70,7 +70,7 @@ var Layout = function Layout(props) {
       rowSelection = props.rowSelection,
       otherProps = _objectWithoutProperties(props, _excluded);
 
-  var mode = (dataFilter === null || dataFilter === void 0 ? void 0 : dataFilter.mode) || 'inline';
+  var mode = dataFilter === null || dataFilter === void 0 ? void 0 : dataFilter.mode;
 
   var _useState = (0, _react.useState)((dataFilter === null || dataFilter === void 0 ? void 0 : dataFilter.expand) || false),
       _useState2 = _slicedToArray(_useState, 2),
@@ -129,17 +129,27 @@ var Layout = function Layout(props) {
 
 
   var renderPanelFilter = function renderPanelFilter() {
-    var _dataFilter$schema2;
+    if (dataFilter) {
+      var _dataFilter$schema2;
 
-    if (dataFilter && (dataFilter === null || dataFilter === void 0 ? void 0 : (_dataFilter$schema2 = dataFilter.schema) === null || _dataFilter$schema2 === void 0 ? void 0 : _dataFilter$schema2.length) >= 0) {
-      return /*#__PURE__*/_react.default.createElement("div", {
-        className: cls('panel-filter'),
-        style: {
-          display: expand ? 'block' : 'none'
-        }
-      }, /*#__PURE__*/_react.default.createElement(_form.AdvancedFilter, _objectSpread({
-        form: dataFilterForm
-      }, dataFilter)));
+      if ( /*#__PURE__*/(0, _react.isValidElement)(dataFilter === null || dataFilter === void 0 ? void 0 : dataFilter.content)) {
+        // 自定义渲染内容，当 `schema=[]` 时生效
+        return /*#__PURE__*/_react.default.createElement("div", {
+          className: cls('panel-filter'),
+          style: {
+            display: expand ? 'block' : 'none'
+          }
+        }, dataFilter === null || dataFilter === void 0 ? void 0 : dataFilter.content);
+      } else if ((dataFilter === null || dataFilter === void 0 ? void 0 : (_dataFilter$schema2 = dataFilter.schema) === null || _dataFilter$schema2 === void 0 ? void 0 : _dataFilter$schema2.length) >= 0) {
+        return /*#__PURE__*/_react.default.createElement("div", {
+          className: cls('panel-filter'),
+          style: {
+            display: expand ? 'block' : 'none'
+          }
+        }, /*#__PURE__*/_react.default.createElement(_form.AdvancedFilter, _objectSpread({
+          form: dataFilterForm
+        }, dataFilter)));
+      }
     }
   }; // 渲染过滤器按钮
 

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

@@ -1,3 +1,7 @@
 import { PaginationProps } from '@alicloudfe/components/types/pagination';
-declare const _default: (props: PaginationProps) => JSX.Element;
+import { responsivePaginationType } from '../../typing';
+import './index.scss';
+declare const _default: (props: PaginationProps & {
+    responsivePaginationType?: responsivePaginationType;
+}) => JSX.Element;
 export default _default;

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

@@ -1,19 +1,27 @@
 "use strict";
 
+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); }
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
 
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 
 var _components = require("@alicloudfe/components");
 
+var _utils = require("@teamix/utils");
+
 var _hooks = require("@teamix/hooks");
 
-var _excluded = ["className", "onChange", "total", "totalRender", "pageSize", "current", "pageSizeList", "pageSizeSelector", "type", "onPageSizeChange"];
+require("./index.scss");
+
+var _excluded = ["className", "onChange", "total", "totalRender", "pageSize", "current", "pageSizeList", "pageSizeSelector", "onPageSizeChange", "responsivePaginationType"];
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 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; }
 
@@ -21,61 +29,222 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
+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(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+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; }
 
+var cls = (0, _utils.baseClass)('teamix-pro-pagination');
+
 var _default = function _default(props) {
   var className = props.className,
-      onChange = props.onChange,
+      propsOnChange = props.onChange,
       total = props.total,
       totalRender = props.totalRender,
       pageSize = props.pageSize,
       current = props.current,
       pageSizeList = props.pageSizeList,
       pageSizeSelector = props.pageSizeSelector,
-      type = props.type,
       onPageSizeChange = props.onPageSizeChange,
+      responsivePaginationType = props.responsivePaginationType,
       otherProps = _objectWithoutProperties(props, _excluded);
 
-  var _useResponsiveProps = (0, _hooks.useResponsiveProps)([480, 580, 680], ['mini', 'small', 'simple', 'normal']),
+  var _useResponsiveProps = (0, _hooks.useResponsiveProps)([480, 590, 700], ['mini', 'small', 'simple', 'normal']),
       responsiveProps = _useResponsiveProps.responsiveProps,
       paginationWrapperRef = _useResponsiveProps.ref;
 
+  var _useState = (0, _react.useState)(false),
+      _useState2 = _slicedToArray(_useState, 2),
+      visible = _useState2[0],
+      setVisible = _useState2[1];
+
+  var _useState3 = (0, _react.useState)(current),
+      _useState4 = _slicedToArray(_useState3, 2),
+      currentPage = _useState4[0],
+      setCurrentPage = _useState4[1];
+
   var commonPaginationProps = {
     className: className,
-    onChange: onChange,
+    onChange: propsOnChange,
     total: total,
     pageSize: pageSize,
-    current: current,
     shape: 'arrow-only',
     pageSizeList: pageSizeList,
     pageSizeSelector: pageSizeSelector,
     pageSizePosition: 'end',
     onPageSizeChange: onPageSizeChange
+  }; // 自定义总数，用于 small、mini
+
+  var customTotalRender = function customTotalRender(total) {
+    return /*#__PURE__*/_react.default.createElement(_components.Balloon, {
+      visible: visible,
+      closable: false,
+      onVisibleChange: function onVisibleChange(visible) {
+        return setVisible(visible);
+      },
+      align: "t",
+      // triggerType="click"
+      trigger: /*#__PURE__*/_react.default.createElement(_components.Button, {
+        text: true,
+        onMouseEnter: function onMouseEnter() {
+          return setVisible(true);
+        }
+      }, (0, _utils.getMessage)('total', {
+        total: total
+      }))
+    }, /*#__PURE__*/_react.default.createElement("div", {
+      className: cls('custom-total-content')
+    }, /*#__PURE__*/_react.default.createElement("div", {
+      className: "title"
+    }, (0, _utils.getMessage)('pageSize')), /*#__PURE__*/_react.default.createElement(_components.Select, {
+      className: cls('custom-page-size-selector'),
+      dataSource: pageSizeList,
+      defaultValue: pageSize,
+      followTrigger: true,
+      menuProps: {
+        hasSelectedIcon: false
+      },
+      onChange: function onChange(value) {
+        setVisible(false);
+        setCurrentPage(1);
+        onPageSizeChange === null || onPageSizeChange === void 0 ? void 0 : onPageSizeChange(value);
+      }
+    })));
+  }; // 获取页总数
+
+
+  function getTotalPage(total, currentPageSize) {
+    var totalPage = Math.ceil(total / currentPageSize);
+    return totalPage <= 0 ? 1 : totalPage;
+  } // 自定义翻页，用于 mini
+
+
+  var customJumpRender = function customJumpRender() {
+    var handleInputChange = function handleInputChange(value, e) {
+      setCurrentPage(value);
+    }; // 回车触发跳转
+
+
+    var handleJump = function handleJump(e) {
+      var totalPage = getTotalPage(total, pageSize);
+      var value = Number(currentPage);
+
+      if (isNaN(value)) {
+        value = '';
+      } else if (value < 1) {
+        value = 1;
+      } else if (value > totalPage) {
+        value = totalPage;
+      }
+
+      if (value && value !== current) {
+        setCurrentPage(value);
+        propsOnChange === null || propsOnChange === void 0 ? void 0 : propsOnChange(value, e);
+      }
+    };
+
+    var handlePrevClick = function handlePrevClick(e) {
+      setCurrentPage(currentPage - 1);
+      propsOnChange === null || propsOnChange === void 0 ? void 0 : propsOnChange(currentPage - 1, e);
+    };
+
+    var handleNextClick = function handleNextClick(e) {
+      setCurrentPage(currentPage + 1);
+      propsOnChange === null || propsOnChange === void 0 ? void 0 : propsOnChange(currentPage + 1, e);
+    };
+
+    return /*#__PURE__*/_react.default.createElement("div", {
+      className: cls('custom-jumper')
+    }, /*#__PURE__*/_react.default.createElement(_components.Button, {
+      className: "next-prev next-pagination-item",
+      onClick: handlePrevClick,
+      disabled: Number(currentPage) <= 1
+    }, /*#__PURE__*/_react.default.createElement(_components.Icon, {
+      size: "small",
+      type: "arrow-left"
+    })), /*#__PURE__*/_react.default.createElement(_components.Input, {
+      className: "jump-input",
+      value: currentPage,
+      onChange: handleInputChange,
+      onKeyDown: function onKeyDown(e) {
+        if (e.keyCode === 13) {
+          handleJump(e);
+        }
+      }
+    }), /*#__PURE__*/_react.default.createElement("div", {
+      className: "total"
+    }, /*#__PURE__*/_react.default.createElement("span", {
+      style: {
+        marginRight: 4
+      }
+    }, "/"), getTotalPage(total, pageSize)), /*#__PURE__*/_react.default.createElement(_components.Button, {
+      className: "next-next next-pagination-item",
+      onClick: handleNextClick,
+      //@ts-ignore
+      disabled: total && Number(currentPage) >= getTotalPage(total, pageSize)
+    }, /*#__PURE__*/_react.default.createElement(_components.Icon, {
+      size: "small",
+      type: "arrow-right"
+    })));
+  };
+
+  var renderMiniPagination = function renderMiniPagination() {
+    if (total && pageSize) {
+      if (total / pageSize <= 2) {
+        return /*#__PURE__*/_react.default.createElement(_components.Pagination, _objectSpread(_objectSpread({}, commonPaginationProps), {}, {
+          type: "simple"
+        }, otherProps));
+      } else {
+        return /*#__PURE__*/_react.default.createElement("div", {
+          className: "".concat(cls('custom-mini-pagination'), "  next-pagination")
+        }, customTotalRender(total), customJumpRender());
+      }
+    }
   };
 
   var renderPagination = function renderPagination() {
-    switch (responsiveProps) {
+    switch (responsivePaginationType || responsiveProps) {
       case 'normal':
-        return /*#__PURE__*/_react.default.createElement(_components.Pagination, _objectSpread(_objectSpread({}, commonPaginationProps), otherProps));
+        return /*#__PURE__*/_react.default.createElement(_components.Pagination, _objectSpread(_objectSpread({}, commonPaginationProps), {}, {
+          totalRender: function totalRender(total) {
+            return (0, _utils.getMessage)('total', {
+              total: total
+            });
+          }
+        }, otherProps));
 
       case 'simple':
         return /*#__PURE__*/_react.default.createElement(_components.Pagination, _objectSpread(_objectSpread({}, commonPaginationProps), {}, {
-          pageShowCount: 3
+          pageShowCount: 3,
+          totalRender: function totalRender(total) {
+            return (0, _utils.getMessage)('total', {
+              total: total
+            });
+          }
         }, otherProps));
 
       case 'small':
         return /*#__PURE__*/_react.default.createElement(_components.Pagination, _objectSpread(_objectSpread({}, commonPaginationProps), {}, {
+          pageShowCount: 3,
           pageSizeSelector: false,
-          type: "simple"
+          totalRender: function totalRender(total) {
+            return customTotalRender(total);
+          }
         }, otherProps));
 
       case 'mini':
-        return /*#__PURE__*/_react.default.createElement(_components.Pagination, _objectSpread(_objectSpread({}, commonPaginationProps), {}, {
-          pageSizeSelector: false,
-          type: "mini"
-        }, otherProps));
+        return renderMiniPagination();
 
       default:
         return /*#__PURE__*/_react.default.createElement(_components.Pagination, _objectSpread(_objectSpread({}, commonPaginationProps), otherProps));
@@ -87,7 +256,7 @@ var _default = function _default(props) {
     // 用于获取翻页器响应式 ref
     _react.default.createElement("div", {
       ref: paginationWrapperRef,
-      className: "pagination-wrapper"
+      className: cls('wrapper')
     }, renderPagination())
   );
 };

package/lib/table/components/Pagination/index.scss

@@ -0,0 +1,55 @@
+$prefix: 'teamix-pro-pagination';
+
+.#{$prefix} {
+  &-wrapper {
+    display: flex;
+    justify-content: flex-end;
+    width: 100%;
+  }
+  &-custom-total {
+    &-content {
+      display: flex;
+      align-items: center;
+      .next-menu {
+        min-width: 56px !important;
+        .next-menu-item.next-select-menu-item {
+          padding: 0 8px !important;
+        }
+      }
+    }
+  }
+  &-custom-mini-pagination {
+    display: flex;
+    align-items: center;
+  }
+  &-custom-jumper {
+    display: flex;
+    align-items: center;
+    .jump-input {
+      width: 36px;
+      input {
+        padding: 0 3px;
+        text-align: center;
+        line-height: 30px;
+      }
+    }
+    .total {
+      margin-left: 8px;
+      margin-right: 4px;
+      color: var(--color-text1-2);
+    }
+    .next-prev {
+      margin-left: 8px;
+      margin-right: 4px;
+    }
+    .next-pagination-item:disabled i {
+      color: var(--btn-pure-normal-color-disabled, #CCCCCC) !important;
+    }
+  }
+  &-custom-page-size-selector.next-select-trigger {
+    min-width: 56px;
+    .next-select-inner {
+      min-width: 56px;
+    }
+  }
+}

package/lib/table/components/ToolBar/FilterColumnIcon.js

@@ -102,6 +102,26 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
       dropdownVisible = _useState10[0],
       setDropdownVisible = _useState10[1];
 
+  (0, _react.useEffect)(function () {
+    _utils2.on === null || _utils2.on === void 0 ? void 0 : (0, _utils2.on)(function (stateFilterColumns) {
+      if (stateFilterColumns && stateFilterColumns.length > 0) {
+        var showDataIndex = stateFilterColumns.map(function (item) {
+          return item.dataIndex;
+        });
+        var stateColumns = (0, _utils2.cloneDeep)(processColumns(columns)).map(function (item) {
+          if (!showDataIndex.includes(item.dataIndex)) {
+            item.columnFilters = false;
+          }
+
+          return item;
+        });
+        setNewColumns(stateColumns);
+      }
+    }, 'refreshFilterState');
+    return function () {
+      (0, _utils2.off)('refreshFilterState');
+    };
+  });
   (0, _react.useEffect)(function () {
     setNewColumns(processColumns(columns));
   }, [columns]); // 全选
@@ -213,7 +233,7 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
 
     calculateSelectAllState(columns);
     setNewColumns(columns);
-    (_actionRef$current = actionRef.current) === null || _actionRef$current === void 0 ? void 0 : (_actionRef$current$se = _actionRef$current.setColumn) === null || _actionRef$current$se === void 0 ? void 0 : _actionRef$current$se.call(_actionRef$current, columns);
+    (_actionRef$current = actionRef.current) === null || _actionRef$current === void 0 ? void 0 : (_actionRef$current$se = _actionRef$current.setColumn) === null || _actionRef$current$se === void 0 ? void 0 : _actionRef$current$se.call(_actionRef$current, columns, false);
   }; // 计算全选状态
 
 
@@ -334,7 +354,8 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
       onOk: onChangeColumnsForDialog,
       onCancel: dialogOnClose,
       onClose: dialogOnClose,
-      width: 480
+      width: 480,
+      className: cls('dialog')
     }, /*#__PURE__*/_react.default.createElement(Row, {
       gutter: 20,
       wrap: true,

package/lib/table/components/ToolBar/index.scss

@@ -20,6 +20,12 @@
   min-width: 180px;
   box-shadow: var(--popup-local-shadow, 0px 6px 24px 0px rgba(0, 0, 0, 0.1));
   background: var(--menu-background);
+
+  &-dialog {
+    .next-checkbox-label {
+      line-height: var(--checkbox-size,16px);
+    }
+  }
   &-reset {
     position: absolute;
     right: 16px;
@@ -38,7 +44,6 @@
         visibility: visible;
         cursor: pointer;
       }
-
     }
   }
   .next-menu-item-text {
@@ -94,7 +99,7 @@
   background-color: var(--balloon-tooltip-color-bg, #292929);
   border-color: var(--balloon-tooltip-color-border, transparent);
   box-shadow: var(--balloon-tooltip-shadow, none);
-  color: var(--balloon-tooltip-color, #FFFFFF);
+  color: var(--balloon-tooltip-color, #ffffff);
   display: flex;
   align-items: center;
   height: 36px;
@@ -105,7 +110,7 @@
     display: none;
   }
   .next-message-content {
-    color: var(--balloon-tooltip-color, #FFFFFF);
+    color: var(--balloon-tooltip-color, #ffffff);
     padding: 0;
   }
   .teamix-pro-table-full-screen-message-esc {
@@ -114,7 +119,7 @@
     padding: 0 2px;
     position: relative;
     // box-shadow: inset 0 0 1px 1px var(--color-fill1-1);
-    border: 1px solid var(--balloon-tooltip-color, #FFFFFF);
+    border: 1px solid var(--balloon-tooltip-color, #ffffff);
     display: inline-block;
     line-height: 1;
     &-title {