@teamix/pro 1.2.17 → 1.2.21

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,
@@ -361,12 +366,20 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
         },
         disabled: columnFiltersDisabled
       }, /*#__PURE__*/_react.default.createElement(_utils.Ellipsis, {
-        tooltip: false
+        tooltip: title
       }, title)));
     }))));
   };
 
-  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 }; }
 
@@ -103,10 +103,36 @@ var toJS = _form.formilyReactive.toJS;
  * @returns
  */
 
-var processColumns = function processColumns(columns) {
-  return columns.filter(function (item) {
+var processColumns = function processColumns(columns, initialColumns) {
+  var filterColumns = columns.filter(function (item) {
     return item.columnFilters !== false;
-  });
+  }); // 处理只剩一列批量选择的情况下宽度错乱问题
+
+  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$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$2 = initialColumns[0]) === null || _initialColumns$2 === void 0 ? void 0 : _initialColumns$2.lock) {
+        filterColumns[0].lock = initialColumns[0].lock;
+      }
+    }
+  }
+
+  return filterColumns;
 };
 /** 默认请求翻页参数 */
 
@@ -176,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;
@@ -207,7 +235,7 @@ var ProTable = function ProTable(props) {
       sort = _useState10[0],
       setSort = _useState10[1];
 
-  var _useState11 = (0, _react.useState)(requestWhenMount && propsShowSkeleton),
+  var _useState11 = (0, _react.useState)(!propsDataSource && requestWhenMount && propsShowSkeleton),
       _useState12 = _slicedToArray(_useState11, 2),
       showSkeleton = _useState12[0],
       setShowSkeleton = _useState12[1]; // 首次加载，渲染骨架屏
@@ -224,7 +252,7 @@ var ProTable = function ProTable(props) {
   var tableRef = (0, _react.useRef)(null);
   var actionRef = (0, _react.useRef)(); // 传给 table 的过滤后的 columns
 
-  var _useState15 = (0, _react.useState)(processColumns(propsColumns !== null && propsColumns !== void 0 ? propsColumns : [])),
+  var _useState15 = (0, _react.useState)(processColumns(propsColumns !== null && propsColumns !== void 0 ? propsColumns : [], propsColumns)),
       _useState16 = _slicedToArray(_useState15, 2),
       filteredColumns = _useState16[0],
       setFilteredColumns = _useState16[1];
@@ -395,10 +423,16 @@ var ProTable = function ProTable(props) {
   (0, _react.useEffect)(function () {
     var _actionRef$current, _actionRef$current$se;
 
-    var columns = processColumns(propsColumns !== null && propsColumns !== void 0 ? propsColumns : []);
+    var columns = processColumns(propsColumns !== null && propsColumns !== void 0 ? propsColumns : [], propsColumns);
     setFilteredColumns(columns);
     (_actionRef$current = actionRef.current) === null || _actionRef$current === void 0 ? void 0 : (_actionRef$current$se = _actionRef$current.setState) === null || _actionRef$current$se === void 0 ? void 0 : _actionRef$current$se.call(_actionRef$current, 'filterColumns', columns);
-  }, [propsColumns]); // 绑定 Actions
+  }, [propsColumns]); // dataSource 受控
+
+  (0, _react.useEffect)(function () {
+    if (propsDataSource) {
+      setData(propsDataSource);
+    }
+  }, [propsDataSource]); // 绑定 Actions
 
   (0, _utils2.useActionType)(actionRef, {
     fullScreen: function fullScreen() {
@@ -413,7 +447,7 @@ var ProTable = function ProTable(props) {
     setColumn: function setColumn(newColumns) {
       var _actionRef$current2, _actionRef$current2$s;
 
-      var columns = processColumns(newColumns);
+      var columns = processColumns(newColumns, propsColumns);
       setFilteredColumns(columns);
       (_actionRef$current2 = actionRef.current) === null || _actionRef$current2 === void 0 ? void 0 : (_actionRef$current2$s = _actionRef$current2.setState) === null || _actionRef$current2$s === void 0 ? void 0 : _actionRef$current2$s.call(_actionRef$current2, 'filterColumns', columns);
     },
@@ -425,6 +459,15 @@ var ProTable = function ProTable(props) {
     },
     request: function request(params) {
       if (dataFilterForm.validate()) {
+        // 如果请求中还有翻页相关信息，需要自动设置到指定页
+        if (params === null || params === void 0 ? void 0 : params[targetPageKey]) {
+          setCurrentPage(params[targetPageKey]);
+        }
+
+        if (params === null || params === void 0 ? void 0 : params[targetPageSizeKey]) {
+          setPageSize(params[targetPageSizeKey]);
+        }
+
         _request(params);
       }
     },
@@ -455,6 +498,7 @@ var ProTable = function ProTable(props) {
       targetPageSizeKey: targetPageSizeKey,
       pageSize: pageSize
     },
+    data: data,
     dataFilterForm: dataFilterForm,
     resetTableMaxBodyHeight: function resetTableMaxBodyHeight() {
       getHeaderHeight().then(function (height) {
@@ -653,10 +697,11 @@ var ProTable = function ProTable(props) {
       (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onFilter) && (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onFilter(_objectSpread({}, toJS(dataFilterForm.values))));
 
       if (dataFilterForm.validate()) {
-        setCurrentPage(1); // const { mode, schema } = propsDataFilter as ProTableDataFilterProps;
-        // TODO: 针对 inline 模式下的 search 组件做一下处理，如果空值切换下拉的时候不触发请求
-        // if (mode === 'inline') {
-        // }
+        var _actionRef$current6, _actionRef$current6$c;
+
+        // 搜索变化时，暂时先清空选择
+        (_actionRef$current6 = actionRef.current) === null || _actionRef$current6 === void 0 ? void 0 : (_actionRef$current6$c = _actionRef$current6.clearRowSelection) === null || _actionRef$current6$c === void 0 ? void 0 : _actionRef$current6$c.call(_actionRef$current6);
+        setCurrentPage(1);
 
         _request(_defineProperty({}, targetPageKey, 1));
       }
@@ -691,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,
@@ -749,15 +795,21 @@ var ProTable = function ProTable(props) {
 
   var renderFooter = function renderFooter() {
     function onChangePagination(currentPage) {
+      var _actionRef$current7, _actionRef$current7$c;
+
       var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+      // 翻页暂时先清空选择
+      (_actionRef$current7 = actionRef.current) === null || _actionRef$current7 === void 0 ? void 0 : (_actionRef$current7$c = _actionRef$current7.clearRowSelection) === null || _actionRef$current7$c === void 0 ? void 0 : _actionRef$current7$c.call(_actionRef$current7);
       setCurrentPage(currentPage);
 
       _request(_objectSpread(_defineProperty({}, targetPageKey, currentPage), params));
     }
 
     function onChangePaginationSize(currentPageSize) {
-      var _request5;
+      var _actionRef$current8, _actionRef$current8$c, _request5;
 
+      // 翻页暂时先清空选择
+      (_actionRef$current8 = actionRef.current) === null || _actionRef$current8 === void 0 ? void 0 : (_actionRef$current8$c = _actionRef$current8.clearRowSelection) === null || _actionRef$current8$c === void 0 ? void 0 : _actionRef$current8$c.call(_actionRef$current8);
       setPageSize(currentPageSize);
       setCurrentPage(1);
 
@@ -797,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
@@ -804,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

@@ -129,6 +129,7 @@ export declare type rowSelectionType = {
     onSelect?: (selected: boolean, record: any, records: Array<any>) => void;
     onSelectAll?: (selected: boolean, records: Array<any>) => void;
     selectedRowKeys?: Array<any>;
+    selectedRecords?: any[];
     mode?: 'single' | 'multiple';
     titleProps?: () => any;
     columnProps?: () => any;
@@ -177,6 +178,8 @@ export declare type ProTableActionType = {
     resetPage?: () => void;
     /** 获取数据过滤区表单实例 */
     dataFilterForm?: FormType;
+    /** 表格当前的数据 */
+    data?: any[];
 } & ProTableActionTypeMutations;
 /** action State 定义 */
 export declare type ProTableActionTypeMutations = {
@@ -232,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.17",
+  "version": "1.2.21",
   "description": "TeamixPro大包",
   "repository": "http://gitlab.alibaba-inc.com/teamix/pro",
   "author": "Velociraptor(迅猛龙)",
@@ -24,9 +24,9 @@
   "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.2",
+    "@teamix/pop-confirm": "^1.2.4",
     "@teamix/pro-field": "^1.0.0",
     "@teamix/pro-page-container": "^1.0.0",
     "@teamix/pro-skeleton": "^1.0.0",