@zat-design/sisyphus-react 3.9.8-beta.6 → 3.9.8-beta.7

package/es/ProTable/hooks/useAntdTable.js

@@ -11,7 +11,7 @@ import { useCallback, useMemo, useState } from 'react';
 import { useRequest, useSetState, useDeepCompareEffect } from 'ahooks';
 import { pickBy, isObject, merge, set, isEqual } from 'lodash';
 import { defaultPage } from '../index';
-import { isListResult } from '../utils';
+import { isListResult, removeEmptyKeys } from '../utils';
 import locale, { formatMessage } from '../../locale';
 var useDefaultOptions = function useDefaultOptions(options) {
   var _useState = useState((options === null || options === void 0 ? void 0 : options.page) || defaultPage),
@@ -219,16 +219,17 @@ function useAntdTable(service, options, useRequestOptions) {
       pageNum: 1,
       pageSize: page.pageSize
     };
+    var _values = removeEmptyKeys(values);
     onPageChange(newPage);
     setState({
-      searchValues: values,
+      searchValues: _values,
       allSelected: false,
       selectedRecords: [],
       selectedRowKeys: []
     });
     run(getTransformParams(_objectSpread(_objectSpread({
       page: newPage
-    }, extraFilter), values)));
+    }, extraFilter), _values)));
   }, [extraFilter, page.pageSize, run, getTransformParams]);
   var resetParams = useCallback(function () {
     var page = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : initPage;

package/es/ProTable/utils/index.d.ts

@@ -29,3 +29,7 @@ export declare const isListResult: (data: {
     [key: string]: any;
 }) => boolean;
 export declare const getRowKey: (rowKey: any, record: any) => any;
+/** 移除对象中的 null , undefined, '' 的key */
+export declare const removeEmptyKeys: (obj: any) => {
+    [k: string]: unknown;
+};

package/es/ProTable/utils/index.js

@@ -1,3 +1,4 @@
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { get, isEqual } from 'lodash';
 import { validate } from '@zat-design/utils';
 var isEmpty = validate.isEmpty;
@@ -70,4 +71,18 @@ export var getRowKey = function getRowKey(rowKey, record) {
     key = (_ref = typeof rowKey === 'function' ? rowKey(record) : record[rowKey]) !== null && _ref !== void 0 ? _ref : key;
   }
   return key;
+};
+/** 移除对象中的 null , undefined, '' 的key */
+export var removeEmptyKeys = function removeEmptyKeys(obj) {
+  // 使用 Object.entries() 将对象转换为键值对数组
+  var entries = Object.entries(obj);
+  // 过滤掉值为 null, undefined, 或 '' 的键值对
+  var filteredEntries = entries.filter(function (_ref2) {
+    var _ref3 = _slicedToArray(_ref2, 2),
+      key = _ref3[0],
+      value = _ref3[1];
+    return !isEmpty(value);
+  });
+  // 使用 Object.fromEntries() 将过滤后的键值对数组转换回对象
+  return Object.fromEntries(filteredEntries);
 };

package/lib/ProTable/hooks/useAntdTable.js

@@ -226,16 +226,17 @@ function useAntdTable(service, options, useRequestOptions) {
       pageNum: 1,
       pageSize: page.pageSize
     };
+    var _values = (0, _utils.removeEmptyKeys)(values);
     onPageChange(newPage);
     setState({
-      searchValues: values,
+      searchValues: _values,
       allSelected: false,
       selectedRecords: [],
       selectedRowKeys: []
     });
     run(getTransformParams((0, _objectSpread2.default)((0, _objectSpread2.default)({
       page: newPage
-    }, extraFilter), values)));
+    }, extraFilter), _values)));
   }, [extraFilter, page.pageSize, run, getTransformParams]);
   var resetParams = (0, _react.useCallback)(function () {
     var page = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : initPage;

package/lib/ProTable/utils/index.d.ts

@@ -29,3 +29,7 @@ export declare const isListResult: (data: {
     [key: string]: any;
 }) => boolean;
 export declare const getRowKey: (rowKey: any, record: any) => any;
+/** 移除对象中的 null , undefined, '' 的key */
+export declare const removeEmptyKeys: (obj: any) => {
+    [k: string]: unknown;
+};

package/lib/ProTable/utils/index.js

@@ -1,9 +1,11 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isListResult = exports.getRowKey = exports.getOriginalValue = exports.getDecimalDigits = exports.getColumnDataIndex = void 0;
+exports.removeEmptyKeys = exports.isListResult = exports.getRowKey = exports.getOriginalValue = exports.getDecimalDigits = exports.getColumnDataIndex = void 0;
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _lodash = require("lodash");
 var _utils = require("@zat-design/utils");
 var isEmpty = _utils.validate.isEmpty;
@@ -76,4 +78,18 @@ var getRowKey = exports.getRowKey = function getRowKey(rowKey, record) {
     key = (_ref = typeof rowKey === 'function' ? rowKey(record) : record[rowKey]) !== null && _ref !== void 0 ? _ref : key;
   }
   return key;
+};
+/** 移除对象中的 null , undefined, '' 的key */
+var removeEmptyKeys = exports.removeEmptyKeys = function removeEmptyKeys(obj) {
+  // 使用 Object.entries() 将对象转换为键值对数组
+  var entries = Object.entries(obj);
+  // 过滤掉值为 null, undefined, 或 '' 的键值对
+  var filteredEntries = entries.filter(function (_ref2) {
+    var _ref3 = (0, _slicedToArray2.default)(_ref2, 2),
+      key = _ref3[0],
+      value = _ref3[1];
+    return !isEmpty(value);
+  });
+  // 使用 Object.fromEntries() 将过滤后的键值对数组转换回对象
+  return Object.fromEntries(filteredEntries);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.9.8-beta.6",
+  "version": "3.9.8-beta.7",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",