@teamix/pro 1.2.15 → 1.2.19

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

@@ -160,7 +160,7 @@ var Filter = function Filter(props) {
   return /*#__PURE__*/_react.default.createElement(_components.Dropdown, {
     trigger: /*#__PURE__*/_react.default.createElement(_icon.default, {
       size: "small",
-      type: "filter-line",
+      type: selected.length > 0 && visible === false ? 'filter-fill' : 'filter-line',
       className: cls({
         icon: true,
         'icon-selected': selected.length > 0
@@ -169,6 +169,8 @@ var Filter = function Filter(props) {
         setVisible(!visible);
       }
     }),
+    //@ts-ignore
+    v2: true,
     triggerType: ['click'],
     align: "tl bl",
     visible: visible,
@@ -191,7 +193,7 @@ var Filter = function Filter(props) {
       btn: true
     }),
     onClick: function onClick() {
-      var _actionRef$current2, _actionRef$current2$f, _actionRef$current$ge5, _actionRef$current3, _actionRef$current3$g, _actionRef$current3$g2, _actionRef$current4, _actionRef$current5, _actionRef$current5$s, _actionRef$current6, _actionRef$current6$r, _actionRef$current7, _actionRef$current7$r, _actionRef$current8, _actionRef$current8$c;
+      var _actionRef$current2, _actionRef$current2$f, _actionRef$current$ge5, _actionRef$current3, _actionRef$current3$g, _actionRef$current3$g2, _actionRef$current4, _actionRef$current4$s;
 
       (_actionRef$current2 = actionRef.current) === null || _actionRef$current2 === void 0 ? void 0 : (_actionRef$current2$f = _actionRef$current2.filterDataSource) === null || _actionRef$current2$f === void 0 ? void 0 : _actionRef$current2$f.call(_actionRef$current2, column.dataIndex); // 先获取此列的param
 
@@ -219,24 +221,30 @@ var Filter = function Filter(props) {
         return null;
       })), [[column.dataIndex, param]]).filter(function (item) {
         return item && (item === null || item === void 0 ? void 0 : item[1]);
-      }));
-      var targetPageKey = 'currentPage';
-      var pageInfo = (_actionRef$current4 = actionRef.current) === null || _actionRef$current4 === void 0 ? void 0 : _actionRef$current4.pageInfo;
+      })); // 再设置所有的列筛选状态
 
-      if (pageInfo && (pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.targetPageKey)) {
-        targetPageKey = pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.targetPageKey;
-      } // 再设置所有的列筛选状态
-
-
-      (_actionRef$current5 = actionRef.current) === null || _actionRef$current5 === void 0 ? void 0 : (_actionRef$current5$s = _actionRef$current5.setFilterRules) === null || _actionRef$current5$s === void 0 ? void 0 : _actionRef$current5$s.call(_actionRef$current5, _objectSpread(_objectSpread({}, rules), {}, _defineProperty({}, column.dataIndex, {
+      (_actionRef$current4 = actionRef.current) === null || _actionRef$current4 === void 0 ? void 0 : (_actionRef$current4$s = _actionRef$current4.setFilterRules) === null || _actionRef$current4$s === void 0 ? void 0 : _actionRef$current4$s.call(_actionRef$current4, _objectSpread(_objectSpread({}, rules), {}, _defineProperty({}, column.dataIndex, {
         rules: selected,
         params: param
-      }))); // 发送请求
+      })));
+
+      if (selected.length > 0) {
+        var _actionRef$current5, _actionRef$current6, _actionRef$current6$r, _actionRef$current7, _actionRef$current7$r, _actionRef$current8, _actionRef$current8$c;
+
+        var targetPageKey = 'currentPage';
+        var pageInfo = (_actionRef$current5 = actionRef.current) === null || _actionRef$current5 === void 0 ? void 0 : _actionRef$current5.pageInfo;
+
+        if (pageInfo && (pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.targetPageKey)) {
+          targetPageKey = pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.targetPageKey;
+        } // 发送请求
+
+
+        (_actionRef$current6 = actionRef.current) === null || _actionRef$current6 === void 0 ? void 0 : (_actionRef$current6$r = _actionRef$current6.request) === null || _actionRef$current6$r === void 0 ? void 0 : _actionRef$current6$r.call(_actionRef$current6, _objectSpread(_objectSpread({}, params), {}, _defineProperty({}, targetPageKey, 1)));
+        (_actionRef$current7 = actionRef.current) === null || _actionRef$current7 === void 0 ? void 0 : (_actionRef$current7$r = _actionRef$current7.resetPage) === null || _actionRef$current7$r === void 0 ? void 0 : _actionRef$current7$r.call(_actionRef$current7); // 清空表格选择
 
-      (_actionRef$current6 = actionRef.current) === null || _actionRef$current6 === void 0 ? void 0 : (_actionRef$current6$r = _actionRef$current6.request) === null || _actionRef$current6$r === void 0 ? void 0 : _actionRef$current6$r.call(_actionRef$current6, _objectSpread(_objectSpread({}, params), {}, _defineProperty({}, targetPageKey, 1)));
-      (_actionRef$current7 = actionRef.current) === null || _actionRef$current7 === void 0 ? void 0 : (_actionRef$current7$r = _actionRef$current7.resetPage) === null || _actionRef$current7$r === void 0 ? void 0 : _actionRef$current7$r.call(_actionRef$current7); // 清空表格选择
+        (_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);
+      }
 
-      (_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);
       setVisible(false);
     }
   }, (0, _utils.getMessage)('ok')), /*#__PURE__*/_react.default.createElement(_components.Button, {
@@ -254,7 +262,25 @@ var Filter = function Filter(props) {
         rules: [],
         params: ''
       })));
-      (_actionRef$current11 = actionRef.current) === null || _actionRef$current11 === void 0 ? void 0 : (_actionRef$current11$ = _actionRef$current11.filterDataSource) === null || _actionRef$current11$ === void 0 ? void 0 : _actionRef$current11$.call(_actionRef$current11, column.dataIndex); // setVisible(!visible);
+      (_actionRef$current11 = actionRef.current) === null || _actionRef$current11 === void 0 ? void 0 : (_actionRef$current11$ = _actionRef$current11.filterDataSource) === null || _actionRef$current11$ === void 0 ? void 0 : _actionRef$current11$.call(_actionRef$current11, column.dataIndex);
+
+      if (selected.length > 0) {
+        var _actionRef$current12, _actionRef$current13, _actionRef$current13$, _actionRef$current14, _actionRef$current14$, _actionRef$current15, _actionRef$current15$;
+
+        var targetPageKey = 'currentPage';
+        var pageInfo = (_actionRef$current12 = actionRef.current) === null || _actionRef$current12 === void 0 ? void 0 : _actionRef$current12.pageInfo;
+
+        if (pageInfo && (pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.targetPageKey)) {
+          targetPageKey = pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.targetPageKey;
+        } // 发送请求
+
+
+        (_actionRef$current13 = actionRef.current) === null || _actionRef$current13 === void 0 ? void 0 : (_actionRef$current13$ = _actionRef$current13.request) === null || _actionRef$current13$ === void 0 ? void 0 : _actionRef$current13$.call(_actionRef$current13, _defineProperty({}, targetPageKey, 1));
+        (_actionRef$current14 = actionRef.current) === null || _actionRef$current14 === void 0 ? void 0 : (_actionRef$current14$ = _actionRef$current14.resetPage) === null || _actionRef$current14$ === void 0 ? void 0 : _actionRef$current14$.call(_actionRef$current14); // 清空表格选择
+
+        (_actionRef$current15 = actionRef.current) === null || _actionRef$current15 === void 0 ? void 0 : (_actionRef$current15$ = _actionRef$current15.clearRowSelection) === null || _actionRef$current15$ === void 0 ? void 0 : _actionRef$current15$.call(_actionRef$current15);
+      } // setVisible(!visible);
+
     }
   }, (0, _utils.getMessage)('reset'))))));
 };

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

@@ -361,7 +361,7 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
         },
         disabled: columnFiltersDisabled
       }, /*#__PURE__*/_react.default.createElement(_utils.Ellipsis, {
-        tooltip: false
+        tooltip: title
       }, title)));
     }))));
   };

package/lib/table/index.js

@@ -103,10 +103,34 @@ 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) && (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;
 };
 /** 默认请求翻页参数 */
 
@@ -207,7 +231,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 +248,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 +419,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 +443,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 +455,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);
       }
     },
@@ -442,6 +481,7 @@ var ProTable = function ProTable(props) {
     resetPage: function resetPage() {
       setCurrentPage(1);
     },
+    rowSelection: rowSelection,
     clearRowSelection: function clearRowSelection() {
       rowSelectionHook.setSelectedRowKeys([]);
       rowSelectionHook.setSelectedRecords([]);
@@ -454,6 +494,7 @@ var ProTable = function ProTable(props) {
       targetPageSizeKey: targetPageSizeKey,
       pageSize: pageSize
     },
+    data: data,
     dataFilterForm: dataFilterForm,
     resetTableMaxBodyHeight: function resetTableMaxBodyHeight() {
       getHeaderHeight().then(function (height) {
@@ -652,10 +693,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));
       }
@@ -748,15 +790,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);
 

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;
@@ -154,6 +155,8 @@ export declare type ProTableActionType = {
     request?: (params?: any) => void;
     /** 重置表格 */
     reset?: () => void;
+    /** 表格选择相关属性 */
+    rowSelection?: innerRowSelectionType | rowSelectionType;
     /** 清空表格选择 */
     clearRowSelection?: () => void;
     /** 过滤 DataSource */
@@ -175,6 +178,8 @@ export declare type ProTableActionType = {
     resetPage?: () => void;
     /** 获取数据过滤区表单实例 */
     dataFilterForm?: FormType;
+    /** 表格当前的数据 */
+    data?: any[];
 } & ProTableActionTypeMutations;
 /** action State 定义 */
 export declare type ProTableActionTypeMutations = {

package/lib/table/utils/columnRender.js

@@ -106,7 +106,7 @@ var renderColumnsTitle = function renderColumnsTitle(item, actionRef) {
   };
 
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_utils.LabelIconTip, {
-    label: getItemLabel(),
+    label: item.title,
     tooltip: item.tooltip,
     icon: item.tooltipIcon
   }), item.filters && /*#__PURE__*/_react.default.createElement(_Filter.default, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamix/pro",
-  "version": "1.2.15",
+  "version": "1.2.19",
   "description": "TeamixPro大包",
   "repository": "http://gitlab.alibaba-inc.com/teamix/pro",
   "author": "Velociraptor(迅猛龙)",
@@ -26,7 +26,7 @@
     "@formily/react": "2.0.5",
     "@teamix/formily": "2.0.5-1",
     "@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",