shineout 3.9.0-beta.19 → 3.9.0-beta.20

package/cjs/index.js

@@ -522,5 +522,5 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 // 此文件由脚本自动生成，请勿直接修改。
 // This file was generated automatically by a script. Please do not modify it directly.
 var _default = exports.default = {
-  version: '3.9.0-beta.19'
+  version: '3.9.0-beta.20'
 };

package/dist/shineout.js

@@ -12400,7 +12400,7 @@ var handleStyle = function handleStyle(style) {
 };
 /* harmony default export */ var jss_style_handleStyle = (handleStyle);
 ;// CONCATENATED MODULE: ../shineout-style/src/version.ts
-/* harmony default export */ var version = ('3.9.0-beta.19');
+/* harmony default export */ var version = ('3.9.0-beta.20');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -64543,6 +64543,7 @@ var useTableLayout = function useTableLayout(props) {
 
 
 
+
 var useTableFilter = function useTableFilter(props) {
   var _useState = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(new Map()),
     _useState2 = slicedToArray_default()(_useState, 2),
@@ -64555,10 +64556,13 @@ var useTableFilter = function useTableFilter(props) {
     });
   }, [filterInfo]);
   var filteredData = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(function () {
-    var _props$data;
+    var _props$columns;
     // why use slice: props.data引用不改变会导致后续的useMemo无法重新计算
     if (activeFilters.length === 0) return (props.data || []).slice();
-    return (_props$data = props.data) === null || _props$data === void 0 ? void 0 : _props$data.filter(function (item) {
+    var columnHasChildren = (_props$columns = props.columns) === null || _props$columns === void 0 ? void 0 : _props$columns.find(function (col) {
+      return col.treeColumnsName;
+    });
+    return getFilterTree(props.data, function (item) {
       return activeFilters.every(function (key) {
         var filter = filterInfo.get(key);
         if ((filter === null || filter === void 0 ? void 0 : filter.value) === undefined) return true;
@@ -64568,7 +64572,9 @@ var useTableFilter = function useTableFilter(props) {
         }
         return true;
       });
-    });
+    }, undefined, function (node) {
+      return getKey(props.keygen, node);
+    }, columnHasChildren === null || columnHasChildren === void 0 ? void 0 : columnHasChildren.treeColumnsName, false);
   }, [activeFilters, props.data]);
   var onFilterChange = use_persist_fn(function (columnKey, value) {
     // TODO: 暂未开放reset全部筛选条件
@@ -64598,8 +64604,8 @@ var useTableFilter = function useTableFilter(props) {
   // 根据columns生成filterInfo
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
     setFilterInfo(function (prev) {
-      var _props$columns;
-      var _filterInfo = props === null || props === void 0 || (_props$columns = props.columns) === null || _props$columns === void 0 ? void 0 : _props$columns.reduce(function (acc, column, index) {
+      var _props$columns2;
+      var _filterInfo = props === null || props === void 0 || (_props$columns2 = props.columns) === null || _props$columns2 === void 0 ? void 0 : _props$columns2.reduce(function (acc, column, index) {
         var _prev$get2, _column$filter;
         if (!column.filter) return acc;
         var columnKey = typeof column.render === 'string' ? column.render : String(index);
@@ -67057,6 +67063,7 @@ function Table(props) {
     scrollWidth = _useTableLayout.scrollWidth,
     resizeFlag = _useTableLayout.resizeFlag;
   var _useTableFilter = use_table_filter({
+      keygen: props.keygen,
       data: props.data,
       columns: props.columns
     }),
@@ -74137,7 +74144,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.9.0-beta.19'
+  version: '3.9.0-beta.20'
 });
 }();
 /******/ 	return __webpack_exports__;