@teamix/pro 1.5.41 → 1.5.43

package/es/index.d.ts

@@ -30,5 +30,5 @@ export * from './sidebar';
 export * from './utils';
 export * from './timeline';
 export * from './image';
-declare const version = "1.5.41";
+declare const version = "1.5.43";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, TeamixIcon, ProImage, hooks, nocode, templates, utils, };

package/es/index.js

@@ -37,7 +37,7 @@ export * from './sidebar';
 export * from './utils';
 export * from './timeline';
 export * from './image';
-var version = '1.5.41';
+var version = '1.5.43';
 // By TeamixTest
 window.postMessage({
   source: 'teamix-test-devtools',

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

@@ -23,20 +23,22 @@ var CheckboxItem = Menu.CheckboxItem;
 var cls = usePrefixCls('teamix-pro-table-toolbar-filter');
 var RadioItem = Menu.RadioItem;
 var Filter = function Filter(props) {
-  var _urlState$split, _urlState, _urlState$split2;
+  var _ref3, _urlState$split, _urlState, _urlState$split2;
   var column = props.column,
     actionRef = props.actionRef,
     switchCardView = props.switchCardView,
     bindUrlProps = props.bindUrlProps,
     bindUrl = props.bindUrl;
   var _column$filtersWidth = column.filtersWidth,
-    filtersWidth = _column$filtersWidth === void 0 ? 130 : _column$filtersWidth;
+    filtersWidth = _column$filtersWidth === void 0 ? 130 : _column$filtersWidth,
+    _column$defaultFilter = column.defaultFilterSelectedKeys,
+    defaultFilterSelectedKeys = _column$defaultFilter === void 0 ? [] : _column$defaultFilter;
   var _ref = bindUrl ? useUrlState() : [],
     _ref2 = _slicedToArray(_ref, 2),
     urlState = _ref2[0],
     setUrlState = _ref2[1];
   // 选中过滤项
-  var _useState = useState((_urlState$split = urlState === null || urlState === void 0 ? void 0 : (_urlState = urlState["filter".concat(column === null || column === void 0 ? void 0 : column.dataIndex)]) === null || _urlState === void 0 ? void 0 : (_urlState$split2 = _urlState.split) === null || _urlState$split2 === void 0 ? void 0 : _urlState$split2.call(_urlState, ',')) !== null && _urlState$split !== void 0 ? _urlState$split : []),
+  var _useState = useState((_ref3 = (_urlState$split = urlState === null || urlState === void 0 ? void 0 : (_urlState = urlState["filter".concat(column === null || column === void 0 ? void 0 : column.dataIndex)]) === null || _urlState === void 0 ? void 0 : (_urlState$split2 = _urlState.split) === null || _urlState$split2 === void 0 ? void 0 : _urlState$split2.call(_urlState, ',')) !== null && _urlState$split !== void 0 ? _urlState$split : defaultFilterSelectedKeys) !== null && _ref3 !== void 0 ? _ref3 : []),
     _useState2 = _slicedToArray(_useState, 2),
     selected = _useState2[0],
     setSelected = _useState2[1];
@@ -61,11 +63,11 @@ var Filter = function Filter(props) {
     var filters = column.dataSource;
     // 转换 valueEnum 为 options
     if (!Array.isArray(column.dataSource)) {
-      filters = Object.entries(column.dataSource).map(function (_ref3) {
+      filters = Object.entries(column.dataSource).map(function (_ref4) {
         var _nv$label, _nv$color;
-        var _ref4 = _slicedToArray(_ref3, 2),
-          k = _ref4[0],
-          v = _ref4[1];
+        var _ref5 = _slicedToArray(_ref4, 2),
+          k = _ref5[0],
+          v = _ref5[1];
         var nv = v;
         return _objectSpread(_objectSpread({
           value: k
@@ -145,10 +147,10 @@ var Filter = function Filter(props) {
   };
   // 渲染单选
   var renderSingle = function renderSingle() {
-    return filters === null || filters === void 0 ? void 0 : filters.map(function (_ref5) {
+    return filters === null || filters === void 0 ? void 0 : filters.map(function (_ref6) {
       var _value$toString;
-      var label = _ref5.label,
-        value = _ref5.value;
+      var label = _ref6.label,
+        value = _ref6.value;
       var valueStr = (_value$toString = value === null || value === void 0 ? void 0 : value.toString()) !== null && _value$toString !== void 0 ? _value$toString : '';
       return /*#__PURE__*/React.createElement(RadioItem, {
         id: valueStr,
@@ -168,10 +170,10 @@ var Filter = function Filter(props) {
   };
   // 渲染多选
   var renderMultiple = function renderMultiple() {
-    return filters === null || filters === void 0 ? void 0 : filters.map(function (_ref6) {
+    return filters === null || filters === void 0 ? void 0 : filters.map(function (_ref7) {
       var _value$toString2;
-      var label = _ref6.label,
-        value = _ref6.value;
+      var label = _ref7.label,
+        value = _ref7.value;
       var valueStr = (_value$toString2 = value === null || value === void 0 ? void 0 : value.toString()) !== null && _value$toString2 !== void 0 ? _value$toString2 : '';
       return /*#__PURE__*/React.createElement(CheckboxItem, {
         key: valueStr,

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

@@ -124,11 +124,12 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
   // 重置
   var restColumns = function restColumns(e) {
     e.stopPropagation();
-    var keyNewColumns = processColumns(columns).map(function (item) {
+    var selectColumns = columns.map(function (item) {
       return _objectSpread(_objectSpread({}, item), {}, {
         columnFilters: (item === null || item === void 0 ? void 0 : item.columnFilters) === undefined ? true : item === null || item === void 0 ? void 0 : item.columnFilters
       });
     });
+    var keyNewColumns = processColumns(columns, selectColumns);
     notifyTableRender(keyNewColumns);
   };
   // 修改

package/es/table/typing.d.ts

@@ -56,6 +56,8 @@ export declare type ProTableColumnProps = {
     filters?: boolean | ProTableColumnsFilterItemProps[];
     /** 表头的过滤菜单项过滤方式 single 单选 multiple 多选 */
     filtersMode?: 'single' | 'multiple';
+    /** 表头的过滤菜单项默认值 */
+    defaultFilterSelectedKeys?: string[];
     /** 表头的过滤菜单项在搜索之前的参数操作 */
     beforeFilter?: (rules: string[]) => string;
     /** 表头的过滤菜单宽度 */

package/es/table/utils/useTableSelection.js

@@ -42,8 +42,9 @@ function useTableSelection() {
     var _config$selectedRowKe;
     setSelectedRowKeys((_config$selectedRowKe = config === null || config === void 0 ? void 0 : config.selectedRowKeys) !== null && _config$selectedRowKe !== void 0 ? _config$selectedRowKe : []);
   }, [config.selectedRowKeys]);
-  function _onChange(value, records) {
+  function _onChange(value, records, checked, record) {
     if (primaryKey) {
+      var _config$onSelect;
       var newValue = value.filter(function (v) {
         return !selectedRowKeys.includes(v);
       });
@@ -69,8 +70,11 @@ function useTableSelection() {
         });
       }
       setSelectedRecords(nextSelectedRecords);
+      config === null || config === void 0 ? void 0 : (_config$onSelect = config.onSelect) === null || _config$onSelect === void 0 ? void 0 : _config$onSelect.call(config, checked, record, nextSelectedRecords);
     } else {
+      var _config$onSelect2;
       setSelectedRecords(records);
+      config === null || config === void 0 ? void 0 : (_config$onSelect2 = config.onSelect) === null || _config$onSelect2 === void 0 ? void 0 : _config$onSelect2.call(config, checked, record, records);
     }
     setSelectedRowKeys(value);
     if (config.onChange) {
@@ -84,14 +88,12 @@ function useTableSelection() {
     return /*#__PURE__*/React.createElement(Checkbox, _objectSpread({
       checked: selectedRowKeys.includes(primaryKey),
       onChange: function onChange(checked) {
-        var _config$onSelect;
-        config === null || config === void 0 ? void 0 : (_config$onSelect = config.onSelect) === null || _config$onSelect === void 0 ? void 0 : _config$onSelect.call(config, checked, record, records);
         if (checked) {
-          _onChange === null || _onChange === void 0 ? void 0 : _onChange([].concat(_toConsumableArray(selectedRowKeys), [primaryKey]), [record]);
+          _onChange === null || _onChange === void 0 ? void 0 : _onChange([].concat(_toConsumableArray(selectedRowKeys), [primaryKey]), [record], checked, record);
         } else {
           _onChange === null || _onChange === void 0 ? void 0 : _onChange(selectedRowKeys.filter(function (item) {
             return item !== primaryKey;
-          }), [record]);
+          }), [record], checked, record);
         }
       }
     }, others));

package/lib/index.d.ts

@@ -30,5 +30,5 @@ export * from './sidebar';
 export * from './utils';
 export * from './timeline';
 export * from './image';
-declare const version = "1.5.41";
+declare const version = "1.5.43";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, TeamixIcon, ProImage, hooks, nocode, templates, utils, };

package/lib/index.js

@@ -299,7 +299,7 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 if (!((_window = window) === null || _window === void 0 ? void 0 : _window.TEAMIXPRO_WITHOUT_ICON)) {
   _icon.default.setConfig(_utils.default.getTeamixIconConfig());
 }
-var version = '1.5.41';
+var version = '1.5.43';
 // By TeamixTest
 exports.version = version;
 window.postMessage({

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

@@ -32,20 +32,22 @@ var CheckboxItem = _components.Menu.CheckboxItem;
 var cls = (0, _utils.usePrefixCls)('teamix-pro-table-toolbar-filter');
 var RadioItem = _components.Menu.RadioItem;
 var Filter = function Filter(props) {
-  var _urlState$split, _urlState, _urlState$split2;
+  var _ref3, _urlState$split, _urlState, _urlState$split2;
   var column = props.column,
     actionRef = props.actionRef,
     switchCardView = props.switchCardView,
     bindUrlProps = props.bindUrlProps,
     bindUrl = props.bindUrl;
   var _column$filtersWidth = column.filtersWidth,
-    filtersWidth = _column$filtersWidth === void 0 ? 130 : _column$filtersWidth;
+    filtersWidth = _column$filtersWidth === void 0 ? 130 : _column$filtersWidth,
+    _column$defaultFilter = column.defaultFilterSelectedKeys,
+    defaultFilterSelectedKeys = _column$defaultFilter === void 0 ? [] : _column$defaultFilter;
   var _ref = bindUrl ? (0, _hooks.useUrlState)() : [],
     _ref2 = _slicedToArray(_ref, 2),
     urlState = _ref2[0],
     setUrlState = _ref2[1];
   // 选中过滤项
-  var _useState = (0, _react.useState)((_urlState$split = urlState === null || urlState === void 0 ? void 0 : (_urlState = urlState["filter".concat(column === null || column === void 0 ? void 0 : column.dataIndex)]) === null || _urlState === void 0 ? void 0 : (_urlState$split2 = _urlState.split) === null || _urlState$split2 === void 0 ? void 0 : _urlState$split2.call(_urlState, ',')) !== null && _urlState$split !== void 0 ? _urlState$split : []),
+  var _useState = (0, _react.useState)((_ref3 = (_urlState$split = urlState === null || urlState === void 0 ? void 0 : (_urlState = urlState["filter".concat(column === null || column === void 0 ? void 0 : column.dataIndex)]) === null || _urlState === void 0 ? void 0 : (_urlState$split2 = _urlState.split) === null || _urlState$split2 === void 0 ? void 0 : _urlState$split2.call(_urlState, ',')) !== null && _urlState$split !== void 0 ? _urlState$split : defaultFilterSelectedKeys) !== null && _ref3 !== void 0 ? _ref3 : []),
     _useState2 = _slicedToArray(_useState, 2),
     selected = _useState2[0],
     setSelected = _useState2[1];
@@ -70,11 +72,11 @@ var Filter = function Filter(props) {
     var filters = column.dataSource;
     // 转换 valueEnum 为 options
     if (!Array.isArray(column.dataSource)) {
-      filters = Object.entries(column.dataSource).map(function (_ref3) {
+      filters = Object.entries(column.dataSource).map(function (_ref4) {
         var _nv$label, _nv$color;
-        var _ref4 = _slicedToArray(_ref3, 2),
-          k = _ref4[0],
-          v = _ref4[1];
+        var _ref5 = _slicedToArray(_ref4, 2),
+          k = _ref5[0],
+          v = _ref5[1];
         var nv = v;
         return _objectSpread(_objectSpread({
           value: k
@@ -154,10 +156,10 @@ var Filter = function Filter(props) {
   };
   // 渲染单选
   var renderSingle = function renderSingle() {
-    return filters === null || filters === void 0 ? void 0 : filters.map(function (_ref5) {
+    return filters === null || filters === void 0 ? void 0 : filters.map(function (_ref6) {
       var _value$toString;
-      var label = _ref5.label,
-        value = _ref5.value;
+      var label = _ref6.label,
+        value = _ref6.value;
       var valueStr = (_value$toString = value === null || value === void 0 ? void 0 : value.toString()) !== null && _value$toString !== void 0 ? _value$toString : '';
       return /*#__PURE__*/_react.default.createElement(RadioItem, {
         id: valueStr,
@@ -177,10 +179,10 @@ var Filter = function Filter(props) {
   };
   // 渲染多选
   var renderMultiple = function renderMultiple() {
-    return filters === null || filters === void 0 ? void 0 : filters.map(function (_ref6) {
+    return filters === null || filters === void 0 ? void 0 : filters.map(function (_ref7) {
       var _value$toString2;
-      var label = _ref6.label,
-        value = _ref6.value;
+      var label = _ref7.label,
+        value = _ref7.value;
       var valueStr = (_value$toString2 = value === null || value === void 0 ? void 0 : value.toString()) !== null && _value$toString2 !== void 0 ? _value$toString2 : '';
       return /*#__PURE__*/_react.default.createElement(CheckboxItem, {
         key: valueStr,

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

@@ -131,11 +131,12 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
   // 重置
   var restColumns = function restColumns(e) {
     e.stopPropagation();
-    var keyNewColumns = processColumns(columns).map(function (item) {
+    var selectColumns = columns.map(function (item) {
       return _objectSpread(_objectSpread({}, item), {}, {
         columnFilters: (item === null || item === void 0 ? void 0 : item.columnFilters) === undefined ? true : item === null || item === void 0 ? void 0 : item.columnFilters
       });
     });
+    var keyNewColumns = processColumns(columns, selectColumns);
     notifyTableRender(keyNewColumns);
   };
   // 修改

package/lib/table/typing.d.ts

@@ -56,6 +56,8 @@ export declare type ProTableColumnProps = {
     filters?: boolean | ProTableColumnsFilterItemProps[];
     /** 表头的过滤菜单项过滤方式 single 单选 multiple 多选 */
     filtersMode?: 'single' | 'multiple';
+    /** 表头的过滤菜单项默认值 */
+    defaultFilterSelectedKeys?: string[];
     /** 表头的过滤菜单项在搜索之前的参数操作 */
     beforeFilter?: (rules: string[]) => string;
     /** 表头的过滤菜单宽度 */

package/lib/table/utils/useTableSelection.js

@@ -47,8 +47,9 @@ function useTableSelection() {
     var _config$selectedRowKe;
     setSelectedRowKeys((_config$selectedRowKe = config === null || config === void 0 ? void 0 : config.selectedRowKeys) !== null && _config$selectedRowKe !== void 0 ? _config$selectedRowKe : []);
   }, [config.selectedRowKeys]);
-  function _onChange(value, records) {
+  function _onChange(value, records, checked, record) {
     if (primaryKey) {
+      var _config$onSelect;
       var newValue = value.filter(function (v) {
         return !selectedRowKeys.includes(v);
       });
@@ -74,8 +75,11 @@ function useTableSelection() {
         });
       }
       setSelectedRecords(nextSelectedRecords);
+      config === null || config === void 0 ? void 0 : (_config$onSelect = config.onSelect) === null || _config$onSelect === void 0 ? void 0 : _config$onSelect.call(config, checked, record, nextSelectedRecords);
     } else {
+      var _config$onSelect2;
       setSelectedRecords(records);
+      config === null || config === void 0 ? void 0 : (_config$onSelect2 = config.onSelect) === null || _config$onSelect2 === void 0 ? void 0 : _config$onSelect2.call(config, checked, record, records);
     }
     setSelectedRowKeys(value);
     if (config.onChange) {
@@ -89,14 +93,12 @@ function useTableSelection() {
     return /*#__PURE__*/_react.default.createElement(_components.Checkbox, _objectSpread({
       checked: selectedRowKeys.includes(primaryKey),
       onChange: function onChange(checked) {
-        var _config$onSelect;
-        config === null || config === void 0 ? void 0 : (_config$onSelect = config.onSelect) === null || _config$onSelect === void 0 ? void 0 : _config$onSelect.call(config, checked, record, records);
         if (checked) {
-          _onChange === null || _onChange === void 0 ? void 0 : _onChange([].concat(_toConsumableArray(selectedRowKeys), [primaryKey]), [record]);
+          _onChange === null || _onChange === void 0 ? void 0 : _onChange([].concat(_toConsumableArray(selectedRowKeys), [primaryKey]), [record], checked, record);
         } else {
           _onChange === null || _onChange === void 0 ? void 0 : _onChange(selectedRowKeys.filter(function (item) {
             return item !== primaryKey;
-          }), [record]);
+          }), [record], checked, record);
         }
       }
     }, others));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamix/pro",
-  "version": "1.5.41",
+  "version": "1.5.43",
   "description": "TeamixPro大包",
   "keywords": [
     "aliyun",