@teamix/pro 1.2.19 → 1.2.20

package/lib/index.d.ts

@@ -21,5 +21,5 @@ export * from './page-container';
 export * from './page-header';
 export * from './skeleton';
 export * from './table';
-declare const version = "1.2.18";
+declare const version = "1.2.19";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, hooks, nocode, templates, utils, };

package/lib/index.js

@@ -253,5 +253,5 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 _icon.default.setConfig(_utils.default.getTeamixIconConfig());
 
 // export * from './sidebar';
-var version = '1.2.18';
+var version = '1.2.19';
 exports.version = version;

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

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

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

@@ -0,0 +1,95 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _components = require("@alicloudfe/components");
+
+var _hooks = require("@teamix/hooks");
+
+var _excluded = ["className", "onChange", "total", "totalRender", "pageSize", "current", "pageSizeList", "pageSizeSelector", "type", "onPageSizeChange"];
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+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; }
+
+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; }
+
+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 _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 _default = function _default(props) {
+  var className = props.className,
+      onChange = 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,
+      otherProps = _objectWithoutProperties(props, _excluded);
+
+  var _useResponsiveProps = (0, _hooks.useResponsiveProps)([480, 580, 680], ['mini', 'small', 'simple', 'normal']),
+      responsiveProps = _useResponsiveProps.responsiveProps,
+      paginationWrapperRef = _useResponsiveProps.ref;
+
+  var commonPaginationProps = {
+    className: className,
+    onChange: onChange,
+    total: total,
+    pageSize: pageSize,
+    current: current,
+    shape: 'arrow-only',
+    pageSizeList: pageSizeList,
+    pageSizeSelector: pageSizeSelector,
+    pageSizePosition: 'end',
+    onPageSizeChange: onPageSizeChange
+  };
+
+  var renderPagination = function renderPagination() {
+    switch (responsiveProps) {
+      case 'normal':
+        return /*#__PURE__*/_react.default.createElement(_components.Pagination, _objectSpread(_objectSpread({}, commonPaginationProps), otherProps));
+
+      case 'simple':
+        return /*#__PURE__*/_react.default.createElement(_components.Pagination, _objectSpread(_objectSpread({}, commonPaginationProps), {}, {
+          pageShowCount: 3
+        }, otherProps));
+
+      case 'small':
+        return /*#__PURE__*/_react.default.createElement(_components.Pagination, _objectSpread(_objectSpread({}, commonPaginationProps), {}, {
+          pageSizeSelector: false,
+          type: "simple"
+        }, otherProps));
+
+      case 'mini':
+        return /*#__PURE__*/_react.default.createElement(_components.Pagination, _objectSpread(_objectSpread({}, commonPaginationProps), {}, {
+          pageSizeSelector: false,
+          type: "mini"
+        }, otherProps));
+
+      default:
+        return /*#__PURE__*/_react.default.createElement(_components.Pagination, _objectSpread(_objectSpread({}, commonPaginationProps), otherProps));
+    }
+  };
+
+  return (
+    /*#__PURE__*/
+    // 用于获取翻页器响应式 ref
+    _react.default.createElement("div", {
+      ref: paginationWrapperRef,
+      className: "pagination-wrapper"
+    }, renderPagination())
+  );
+};
+
+exports.default = _default;

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

@@ -71,7 +71,8 @@ var processColumns = function processColumns(columns) {
 var FilterColumnIcon = function FilterColumnIcon(props) {
   var _props$columns = props.columns,
       columns = _props$columns === void 0 ? [] : _props$columns,
-      actionRef = props.actionRef;
+      actionRef = props.actionRef,
+      filterColumnType = props.filterColumnType;
 
   var _useState = (0, _react.useState)(true),
       _useState2 = _slicedToArray(_useState, 2),
@@ -258,7 +259,9 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
       align: "tr br"
     }, /*#__PURE__*/_react.default.createElement("div", {
       className: cls()
-    }, /*#__PURE__*/_react.default.createElement(_components.Menu, null, /*#__PURE__*/_react.default.createElement(CheckboxItem, {
+    }, /*#__PURE__*/_react.default.createElement(_components.Menu, {
+      className: cls('all-select')
+    }, /*#__PURE__*/_react.default.createElement(CheckboxItem, {
       indeterminate: indeterminate,
       checked: allVisible,
       onChange: onChangeAllColumns
@@ -271,7 +274,9 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
       type: "primary"
     }, (0, _utils.getMessage)('reset'))), /*#__PURE__*/_react.default.createElement(_components.Menu.Divider, {
       key: "divider"
-    }), newColumns.map(function (_ref9, index) {
+    })), /*#__PURE__*/_react.default.createElement(_components.Menu, {
+      className: cls('checkbox-group')
+    }, newColumns.map(function (_ref9, index) {
       var _newColumns$find;
 
       var dataIndex = _ref9.dataIndex,
@@ -366,7 +371,15 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
     }))));
   };
 
-  if (newColumns.length > 10) {
+  if (filterColumnType === 'dialog') {
+    return renderDialog();
+  }
+
+  if (filterColumnType === 'dropdown') {
+    return renderDropdown();
+  }
+
+  if (newColumns.length >= 20) {
     return renderDialog();
   }
 

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

@@ -18,8 +18,6 @@
 // FilterColumn
 .teamix-pro-table-toolbar-filter-column {
   min-width: 180px;
-  max-height: 350px;
-  overflow: auto;
   box-shadow: var(--popup-local-shadow, 0px 6px 24px 0px rgba(0, 0, 0, 0.1));
   background: var(--menu-background);
   &-reset {
@@ -76,6 +74,14 @@
     align-items: center;
   }
 }
+.teamix-pro-table-toolbar-filter-column-all-select.teamix-pro-table-toolbar-filter-column-all-select {
+  padding-bottom: 0;
+}
+.teamix-pro-table-toolbar-filter-column-checkbox-group.teamix-pro-table-toolbar-filter-column-checkbox-group {
+  padding-top: 0;
+  max-height: 310px;
+  overflow: auto;
+}
 
 // fullscreen
 .teamix-pro-table-full-screen {

package/lib/table/index.js

@@ -55,7 +55,7 @@ Object.keys(_typing).forEach(function (key) {
     }
   });
 });
-var _excluded = ["header", "className", "tableClassName", "mainAction", "extra", "dataFilter", "toolBar", "columns", "useRowSelection", "rowSelection", "onChangeRowSelection", "getRowSelection", "primaryKey", "footerAction", "footer", "url", "pageKey", "pageSizeKey", "method", "params", "formatSort", "formatParams", "formatResult", "requestWhenMount", "showPagination", "pageSizeList", "showSkeleton", "skeletonSize", "actionRef", "dataSource", "filterDebounce", "footerSuction", "autoRefresh", "customRequest"];
+var _excluded = ["header", "className", "tableClassName", "mainAction", "extra", "dataFilter", "toolBar", "columns", "useRowSelection", "rowSelection", "onChangeRowSelection", "getRowSelection", "primaryKey", "footerAction", "footer", "url", "pageKey", "pageSizeKey", "method", "params", "formatSort", "formatParams", "formatResult", "requestWhenMount", "showPagination", "pageSizeList", "showSkeleton", "skeletonSize", "actionRef", "dataSource", "filterDebounce", "footerSuction", "autoRefresh", "customRequest", "filterColumnType"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -108,25 +108,27 @@ var processColumns = function processColumns(columns, initialColumns) {
     return item.columnFilters !== false;
   }); // 处理只剩一列批量选择的情况下宽度错乱问题
 
-  if ((filterColumns === null || filterColumns === void 0 ? void 0 : filterColumns.length) && (filterColumns === null || filterColumns === void 0 ? void 0 : filterColumns.length) === 1) {
-    var _filterColumns$, _filterColumns$2;
+  if (filterColumns === null || filterColumns === void 0 ? void 0 : filterColumns.length) {
+    if ((filterColumns === null || filterColumns === void 0 ? void 0 : filterColumns.length) === 1) {
+      var _filterColumns$, _filterColumns$2;
 
-    if ((_filterColumns$ = filterColumns[0]) === null || _filterColumns$ === void 0 ? void 0 : _filterColumns$.width) {
-      delete filterColumns[0].width;
-    }
+      if ((_filterColumns$ = filterColumns[0]) === null || _filterColumns$ === void 0 ? void 0 : _filterColumns$.width) {
+        delete filterColumns[0].width;
+      }
 
-    if ((_filterColumns$2 = filterColumns[0]) === null || _filterColumns$2 === void 0 ? void 0 : _filterColumns$2.lock) {
-      filterColumns[0].lock = false;
-    }
-  } else {
-    var _initialColumns$, _initialColumns$2;
+      if ((_filterColumns$2 = filterColumns[0]) === null || _filterColumns$2 === void 0 ? void 0 : _filterColumns$2.lock) {
+        filterColumns[0].lock = false;
+      }
+    } else {
+      var _initialColumns$, _initialColumns$2;
 
-    if ((_initialColumns$ = initialColumns[0]) === null || _initialColumns$ === void 0 ? void 0 : _initialColumns$.width) {
-      filterColumns[0].width = initialColumns[0].width;
-    }
+      if ((_initialColumns$ = initialColumns[0]) === null || _initialColumns$ === void 0 ? void 0 : _initialColumns$.width) {
+        filterColumns[0].width = initialColumns[0].width;
+      }
 
-    if ((_initialColumns$2 = initialColumns[0]) === null || _initialColumns$2 === void 0 ? void 0 : _initialColumns$2.lock) {
-      filterColumns[0].lock = initialColumns[0].lock;
+      if ((_initialColumns$2 = initialColumns[0]) === null || _initialColumns$2 === void 0 ? void 0 : _initialColumns$2.lock) {
+        filterColumns[0].lock = initialColumns[0].lock;
+      }
     }
   }
 
@@ -200,6 +202,8 @@ var ProTable = function ProTable(props) {
     return false;
   } : _props$autoRefresh,
       customRequest = props.customRequest,
+      _props$filterColumnTy = props.filterColumnType,
+      filterColumnType = _props$filterColumnTy === void 0 ? 'auto' : _props$filterColumnTy,
       otherProps = _objectWithoutProperties(props, _excluded);
 
   var targetPageKey = pageKey || globalPageKey;
@@ -732,7 +736,8 @@ var ProTable = function ProTable(props) {
         columns: propsColumns,
         dataFilter: dataFilter,
         dataFilterForm: dataFilterForm,
-        rowSelection: rowSelection
+        rowSelection: rowSelection,
+        filterColumnType: filterColumnType
       }), /*#__PURE__*/_react.default.createElement(_components.Table.StickyLock, _objectSpread({
         hasBorder: false,
         dataSource: showSkeleton ? skeletonDataSource : data || props.dataSource,
@@ -844,6 +849,8 @@ var ProTable = function ProTable(props) {
           return onChangePagination(number);
         },
         total: total,
+        shape: "arrow-only",
+        pageSizePosition: "end",
         totalRender: function totalRender(total) {
           return (0, _utils.getMessage)('total', {
             total: total
@@ -851,10 +858,8 @@ var ProTable = function ProTable(props) {
         },
         pageSize: pageSize,
         current: currentPage,
-        shape: "arrow-only",
         pageSizeList: pageSizeList,
         pageSizeSelector: total > (props.pageSize || 10) * 2 ? 'dropdown' : false,
-        pageSizePosition: "end",
         type: total / pageSize <= 2 ? 'simple' : 'normal',
         onPageSizeChange: function onPageSizeChange(number) {
           return onChangePaginationSize(number);

package/lib/table/index.scss

@@ -32,12 +32,18 @@ $fullscreenPadding: 24px;
   }
   &-footer-left-wrapper {
     display: flex;
-    flex: 1;
+    flex-shrink: 0;
     align-items: center;
   }
   &-footer-right-wrapper {
     display: flex;
     justify-content: flex-end;
+    width: 100%;
+  }
+  .pagination-wrapper {
+    display: flex;
+    justify-content: flex-end;
+    width: 100%;
   }
   &-footer-action {
     margin-left: 16px;

package/lib/table/typing.d.ts

@@ -235,6 +235,8 @@ export declare type ProTableTopAreaProps = {
     dataFilter?: ProTableDataFilterProps;
     /** 数据过滤区 form 表单模型 */
     dataFilterForm?: FormType;
+    /** 排序、筛选列展示状态 */
+    filterColumnType?: 'dialog' | 'dropdown' | 'auto';
 };
 /** 单个工具栏 */
 export declare type ProTableToolBarItem = React.ReactNode | 'refresh' | 'density' | 'filterColumn' | 'fullscreen';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamix/pro",
-  "version": "1.2.19",
+  "version": "1.2.20",
   "description": "TeamixPro大包",
   "repository": "http://gitlab.alibaba-inc.com/teamix/pro",
   "author": "Velociraptor(迅猛龙)",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@formily/core": "2.0.5",
     "@formily/react": "2.0.5",
-    "@teamix/formily": "2.0.5-1",
+    "@teamix/formily": "2.0.5-2",
     "@teamix/hooks": "^0.1.0",
     "@teamix/pop-confirm": "^1.2.4",
     "@teamix/pro-field": "^1.0.0",