@zat-design/sisyphus-react 3.13.5-beta.3 → 3.13.6-beta.1

package/es/ProEnum/utils/index.js

@@ -9,7 +9,7 @@ import { isNull, isUndefined } from 'lodash';
  * @returns
  */
 export function getEnumData(storage, cacheKey, baseEnumStorage) {
-  if (baseEnumStorage) {
+  if (baseEnumStorage && window.localStorage.getItem(cacheKey)) {
     return baseEnumStorage;
   }
   if (storage === 'localStorage') {

package/es/ProTable/hooks/useAntdTable.js

@@ -26,18 +26,18 @@ var useDefaultOptions = function useDefaultOptions(options) {
 };
 var previousSearchValues = null;
 function useAntdTable(service, options, useRequestOptions) {
-  var _locale$ProTable2, _locale$ProTable3, _locale$ProTable4, _locale$ProTable5, _result$params;
+  var _locale$ProTable2, _locale$ProTable3, _locale$ProTable4, _locale$ProTable5, _result$params, _form$getFieldsValue3;
   var _useSetState = useSetState({
       data: [],
       total: 0,
       selectedRecords: [],
       selectedRowKeys: [],
-      searchValues: undefined,
       extraFilter: {
         filters: undefined,
         sorter: undefined
       },
-      allSelected: false
+      allSelected: false,
+      searchValues: {}
     }),
     _useSetState2 = _slicedToArray(_useSetState, 2),
     _useSetState2$ = _useSetState2[0],
@@ -45,9 +45,9 @@ function useAntdTable(service, options, useRequestOptions) {
     total = _useSetState2$.total,
     selectedRecords = _useSetState2$.selectedRecords,
     selectedRowKeys = _useSetState2$.selectedRowKeys,
-    searchValues = _useSetState2$.searchValues,
     extraFilter = _useSetState2$.extraFilter,
     allSelected = _useSetState2$.allSelected,
+    searchValues = _useSetState2$.searchValues,
     setState = _useSetState2[1];
   var _useDefaultOptions = useDefaultOptions(options),
     form = _useDefaultOptions.form,
@@ -204,11 +204,12 @@ function useAntdTable(service, options, useRequestOptions) {
     }
     var newValues = (_form$getFieldsValue = form.getFieldsValue()) !== null && _form$getFieldsValue !== void 0 ? _form$getFieldsValue : {};
     var nextValues = removeEmptyKeys(newValues);
-    run(getTransformParams(_objectSpread(_objectSpread(_objectSpread({
+    run(getTransformParams(_objectSpread(_objectSpread({
       page: page
-    }, searchValues), nextValues), extraFilter)));
-  }, [allSelected, searchValues, extraFilter, data, getTransformParams]);
+    }, nextValues), extraFilter)));
+  }, [allSelected, extraFilter, data, getTransformParams]);
   var handleTableChange = useCallback(function (pagination, filters, sorter, extra) {
+    var _form$getFieldsValue2;
     // 跳过分页改变，使用pagination的onChange
     if (extra.action === 'paginate') {
       return;
@@ -226,13 +227,14 @@ function useAntdTable(service, options, useRequestOptions) {
         sorter: sorter
       }
     });
+    var _values = (_form$getFieldsValue2 = form === null || form === void 0 ? void 0 : form.getFieldsValue()) !== null && _form$getFieldsValue2 !== void 0 ? _form$getFieldsValue2 : {};
     run(getTransformParams(_objectSpread(_objectSpread({
       page: page
-    }, searchValues), {}, {
+    }, _values), {}, {
       filters: filters,
       sorter: sorter
     })));
-  }, [allSelected, searchValues, getTransformParams]);
+  }, [allSelected, getTransformParams]);
   var onSearch = useCallback(function (values) {
     var newPage = {
       pageNum: 1,
@@ -259,7 +261,7 @@ function useAntdTable(service, options, useRequestOptions) {
   }, [extraFilter, page.pageSize, previousPage, getTransformParams]);
   var resetParams = useCallback(function (page) {
     setState({
-      searchValues: undefined,
+      searchValues: {},
       allSelected: false,
       selectedRecords: [],
       selectedRowKeys: [],
@@ -473,10 +475,11 @@ function useAntdTable(service, options, useRequestOptions) {
     onChange: handlePageChange
   };
   var useAntdTableProps = _objectSpread(_objectSpread({}, result), {}, {
+    form: form,
     data: data,
     params: (result === null || result === void 0 ? void 0 : (_result$params = result.params) === null || _result$params === void 0 ? void 0 : _result$params[0]) || {},
     rowSelection: rowSelection,
-    searchValues: searchValues,
+    searchValues: (_form$getFieldsValue3 = form === null || form === void 0 ? void 0 : form.getFieldsValue()) !== null && _form$getFieldsValue3 !== void 0 ? _form$getFieldsValue3 : {},
     allSelected: allSelected,
     selectedTip: selectedTip,
     selectedRowKeys: selectedRowKeys,

package/es/ProTable/propsType.d.ts

@@ -579,7 +579,7 @@ export interface ProTableRequestOptionsType<T, R> {
      * @description 用于获取和设置表单值
      * @default undefined
      */
-    form?: FormInstance;
+    form: FormInstance;
     /**
      * 重置时是否重新查询
      * @description 控制表单重置后是否自动发起查询
@@ -735,12 +735,6 @@ export interface ProTableUseAntdTableType<I, R> {
      * @default []
      */
     selectedRowKeys: Key[];
-    /**
-    * 搜索值
-    * @description 当前表单的搜索条件
-    * @default undefined
-    */
-    searchValues: I;
     /**
      * 额外过滤条件
      * @description 表单之外的额外过滤条件

package/es/ProTable/utils/index.js

@@ -75,27 +75,23 @@ export var getRowKey = function getRowKey(rowKey, record) {
 /** 移除对象中的 null , undefined, '' 的key */
 export var removeEmptyKeys = function removeEmptyKeys(obj) {
   if (!obj) return {};
-  // 使用 Object.entries() 将对象转换为键值对数组
-  var entries = Object.entries(obj);
-  // 过滤掉值为 null, undefined, 或 '' 的键值对
-  var filteredEntries = entries.filter(function (_ref2) {
+  // 一次遍历完成所有处理
+  return Object.fromEntries(Object.entries(obj).filter(function (_ref2) {
     var _ref3 = _slicedToArray(_ref2, 2),
-      key = _ref3[0],
+      _ = _ref3[0],
       value = _ref3[1];
-    return !isEmpty(value);
-  });
-  // 使用 Object.fromEntries() 将过滤后的键值对数组转换回对象
-  var nextObj = Object.fromEntries(filteredEntries);
-  // 空对象的移除出去
-  Object.keys(nextObj).forEach(function (key) {
-    var _Object$values;
-    if (nextObj[key] && _typeof(nextObj[key]) === 'object' && ((_Object$values = Object.values(nextObj[key])) === null || _Object$values === void 0 ? void 0 : _Object$values.every(function (item) {
-      return [null, undefined, ''].includes(item);
-    }))) {
-      nextObj[key] = undefined;
+    // 过滤空值
+    if (value === null || value === undefined || value === '') {
+      return false;
     }
-  });
-  return nextObj;
+    // 检查是否是全空对象
+    if (value && _typeof(value) === 'object' && !Array.isArray(value)) {
+      return !Object.values(value).every(function (item) {
+        return item === null || item === undefined || item === '';
+      });
+    }
+    return true;
+  }));
 };
 /** 判断是有值的对象 */
 export var isNonEmptyObject = function isNonEmptyObject(obj) {

package/lib/ProEnum/utils/index.js

@@ -22,7 +22,7 @@ var _excluded = ["children"];
  * @returns
  */
 function getEnumData(storage, cacheKey, baseEnumStorage) {
-  if (baseEnumStorage) {
+  if (baseEnumStorage && window.localStorage.getItem(cacheKey)) {
     return baseEnumStorage;
   }
   if (storage === 'localStorage') {

package/lib/ProTable/hooks/useAntdTable.js

@@ -33,18 +33,18 @@ var useDefaultOptions = function useDefaultOptions(options) {
 };
 var previousSearchValues = null;
 function useAntdTable(service, options, useRequestOptions) {
-  var _locale$ProTable2, _locale$ProTable3, _locale$ProTable4, _locale$ProTable5, _result$params;
+  var _locale$ProTable2, _locale$ProTable3, _locale$ProTable4, _locale$ProTable5, _result$params, _form$getFieldsValue3;
   var _useSetState = (0, _ahooks.useSetState)({
       data: [],
       total: 0,
       selectedRecords: [],
       selectedRowKeys: [],
-      searchValues: undefined,
       extraFilter: {
         filters: undefined,
         sorter: undefined
       },
-      allSelected: false
+      allSelected: false,
+      searchValues: {}
     }),
     _useSetState2 = (0, _slicedToArray2.default)(_useSetState, 2),
     _useSetState2$ = _useSetState2[0],
@@ -52,9 +52,9 @@ function useAntdTable(service, options, useRequestOptions) {
     total = _useSetState2$.total,
     selectedRecords = _useSetState2$.selectedRecords,
     selectedRowKeys = _useSetState2$.selectedRowKeys,
-    searchValues = _useSetState2$.searchValues,
     extraFilter = _useSetState2$.extraFilter,
     allSelected = _useSetState2$.allSelected,
+    searchValues = _useSetState2$.searchValues,
     setState = _useSetState2[1];
   var _useDefaultOptions = useDefaultOptions(options),
     form = _useDefaultOptions.form,
@@ -211,11 +211,12 @@ function useAntdTable(service, options, useRequestOptions) {
     }
     var newValues = (_form$getFieldsValue = form.getFieldsValue()) !== null && _form$getFieldsValue !== void 0 ? _form$getFieldsValue : {};
     var nextValues = (0, _utils.removeEmptyKeys)(newValues);
-    run(getTransformParams((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
+    run(getTransformParams((0, _objectSpread2.default)((0, _objectSpread2.default)({
       page: page
-    }, searchValues), nextValues), extraFilter)));
-  }, [allSelected, searchValues, extraFilter, data, getTransformParams]);
+    }, nextValues), extraFilter)));
+  }, [allSelected, extraFilter, data, getTransformParams]);
   var handleTableChange = (0, _react.useCallback)(function (pagination, filters, sorter, extra) {
+    var _form$getFieldsValue2;
     // 跳过分页改变，使用pagination的onChange
     if (extra.action === 'paginate') {
       return;
@@ -233,13 +234,14 @@ function useAntdTable(service, options, useRequestOptions) {
         sorter: sorter
       }
     });
+    var _values = (_form$getFieldsValue2 = form === null || form === void 0 ? void 0 : form.getFieldsValue()) !== null && _form$getFieldsValue2 !== void 0 ? _form$getFieldsValue2 : {};
     run(getTransformParams((0, _objectSpread2.default)((0, _objectSpread2.default)({
       page: page
-    }, searchValues), {}, {
+    }, _values), {}, {
       filters: filters,
       sorter: sorter
     })));
-  }, [allSelected, searchValues, getTransformParams]);
+  }, [allSelected, getTransformParams]);
   var onSearch = (0, _react.useCallback)(function (values) {
     var newPage = {
       pageNum: 1,
@@ -266,7 +268,7 @@ function useAntdTable(service, options, useRequestOptions) {
   }, [extraFilter, page.pageSize, previousPage, getTransformParams]);
   var resetParams = (0, _react.useCallback)(function (page) {
     setState({
-      searchValues: undefined,
+      searchValues: {},
       allSelected: false,
       selectedRecords: [],
       selectedRowKeys: [],
@@ -480,10 +482,11 @@ function useAntdTable(service, options, useRequestOptions) {
     onChange: handlePageChange
   };
   var useAntdTableProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, result), {}, {
+    form: form,
     data: data,
     params: (result === null || result === void 0 ? void 0 : (_result$params = result.params) === null || _result$params === void 0 ? void 0 : _result$params[0]) || {},
     rowSelection: rowSelection,
-    searchValues: searchValues,
+    searchValues: (_form$getFieldsValue3 = form === null || form === void 0 ? void 0 : form.getFieldsValue()) !== null && _form$getFieldsValue3 !== void 0 ? _form$getFieldsValue3 : {},
     allSelected: allSelected,
     selectedTip: selectedTip,
     selectedRowKeys: selectedRowKeys,

package/lib/ProTable/propsType.d.ts

@@ -579,7 +579,7 @@ export interface ProTableRequestOptionsType<T, R> {
      * @description 用于获取和设置表单值
      * @default undefined
      */
-    form?: FormInstance;
+    form: FormInstance;
     /**
      * 重置时是否重新查询
      * @description 控制表单重置后是否自动发起查询
@@ -735,12 +735,6 @@ export interface ProTableUseAntdTableType<I, R> {
      * @default []
      */
     selectedRowKeys: Key[];
-    /**
-    * 搜索值
-    * @description 当前表单的搜索条件
-    * @default undefined
-    */
-    searchValues: I;
     /**
      * 额外过滤条件
      * @description 表单之外的额外过滤条件

package/lib/ProTable/utils/index.js

@@ -82,27 +82,23 @@ var getRowKey = exports.getRowKey = function getRowKey(rowKey, record) {
 /** 移除对象中的 null , undefined, '' 的key */
 var removeEmptyKeys = exports.removeEmptyKeys = function removeEmptyKeys(obj) {
   if (!obj) return {};
-  // 使用 Object.entries() 将对象转换为键值对数组
-  var entries = Object.entries(obj);
-  // 过滤掉值为 null, undefined, 或 '' 的键值对
-  var filteredEntries = entries.filter(function (_ref2) {
+  // 一次遍历完成所有处理
+  return Object.fromEntries(Object.entries(obj).filter(function (_ref2) {
     var _ref3 = (0, _slicedToArray2.default)(_ref2, 2),
-      key = _ref3[0],
+      _ = _ref3[0],
       value = _ref3[1];
-    return !isEmpty(value);
-  });
-  // 使用 Object.fromEntries() 将过滤后的键值对数组转换回对象
-  var nextObj = Object.fromEntries(filteredEntries);
-  // 空对象的移除出去
-  Object.keys(nextObj).forEach(function (key) {
-    var _Object$values;
-    if (nextObj[key] && (0, _typeof2.default)(nextObj[key]) === 'object' && ((_Object$values = Object.values(nextObj[key])) === null || _Object$values === void 0 ? void 0 : _Object$values.every(function (item) {
-      return [null, undefined, ''].includes(item);
-    }))) {
-      nextObj[key] = undefined;
+    // 过滤空值
+    if (value === null || value === undefined || value === '') {
+      return false;
     }
-  });
-  return nextObj;
+    // 检查是否是全空对象
+    if (value && (0, _typeof2.default)(value) === 'object' && !Array.isArray(value)) {
+      return !Object.values(value).every(function (item) {
+        return item === null || item === undefined || item === '';
+      });
+    }
+    return true;
+  }));
 };
 /** 判断是有值的对象 */
 var isNonEmptyObject = exports.isNonEmptyObject = function isNonEmptyObject(obj) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.13.5-beta.3",
+  "version": "3.13.6-beta.1",
   "license": "MIT",
   "main": "lib/index.js",
   "module": "es/index.js",