@zat-design/sisyphus-react 3.13.20-beta.2 → 3.13.20-beta.4

package/es/ProEnum/utils/index.js

@@ -1,6 +1,5 @@
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["children"];
-import { isNull, isUndefined } from 'lodash';
 /**
  * 获取枚举数据
  * @param storage
@@ -114,9 +113,10 @@ export function cacheFieldNames(fieldNames, dataSource) {
     restFieldNames = _objectWithoutProperties(fieldNames, _excluded);
   var result = {};
   Object.keys(restFieldNames).forEach(key => {
-    var value = dataSource[restFieldNames[key]] !== undefined ? dataSource[restFieldNames[key]] : dataSource[key];
-    if (!(isUndefined(value) || isNull(value))) {
-      result[key] = dataSource[restFieldNames[key]] ? dataSource[restFieldNames[key]] : dataSource[key];
+    if (![undefined, null].includes(dataSource[restFieldNames[key]])) {
+      result[key] = dataSource[restFieldNames[key]];
+    } else {
+      result[key] = dataSource[key];
     }
   });
   // 递归去对数据进行清洗

package/es/ProTable/hooks/useAntdTable.js

@@ -94,7 +94,8 @@ function useAntdTable(service, options, useRequestOptions) {
       queryBean: (_pickBy = pickBy(queryBean, item => item !== undefined)) !== null && _pickBy !== void 0 ? _pickBy : {}
     });
     if (transformParams) {
-      return transformParams(realParams, requestParams);
+      var mergedParams = _objectSpread(_objectSpread({}, realParams), requestParams);
+      return transformParams(mergedParams);
     }
     return requestParams;
   };

package/es/ProTable/propsType.d.ts

@@ -639,7 +639,7 @@ export interface ProTableRequestOptionsType<T, R> {
      * @description 在发送请求前转换参数
      * @default undefined
      */
-    transformParams?: (params: any, requestParams: any) => any;
+    transformParams?: (params: any) => any;
     /**
      * 转换响应数据
      * @description 处理服务器返回的数据

package/lib/ProEnum/utils/index.js

@@ -12,7 +12,6 @@ exports.isObject = isObject;
 exports.mergeCacheData = mergeCacheData;
 exports.setEnumData = setEnumData;
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-var _lodash = require("lodash");
 var _excluded = ["children"];
 /**
  * 获取枚举数据
@@ -127,9 +126,10 @@ function cacheFieldNames(fieldNames, dataSource) {
     restFieldNames = (0, _objectWithoutProperties2.default)(fieldNames, _excluded);
   var result = {};
   Object.keys(restFieldNames).forEach(key => {
-    var value = dataSource[restFieldNames[key]] !== undefined ? dataSource[restFieldNames[key]] : dataSource[key];
-    if (!((0, _lodash.isUndefined)(value) || (0, _lodash.isNull)(value))) {
-      result[key] = dataSource[restFieldNames[key]] ? dataSource[restFieldNames[key]] : dataSource[key];
+    if (![undefined, null].includes(dataSource[restFieldNames[key]])) {
+      result[key] = dataSource[restFieldNames[key]];
+    } else {
+      result[key] = dataSource[key];
     }
   });
   // 递归去对数据进行清洗

package/lib/ProTable/hooks/useAntdTable.js

@@ -102,7 +102,8 @@ function useAntdTable(service, options, useRequestOptions) {
       queryBean: (_pickBy = (0, _lodash.pickBy)(queryBean, item => item !== undefined)) !== null && _pickBy !== void 0 ? _pickBy : {}
     });
     if (transformParams) {
-      return transformParams(realParams, requestParams);
+      var mergedParams = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, realParams), requestParams);
+      return transformParams(mergedParams);
     }
     return requestParams;
   };

package/lib/ProTable/propsType.d.ts

@@ -639,7 +639,7 @@ export interface ProTableRequestOptionsType<T, R> {
      * @description 在发送请求前转换参数
      * @default undefined
      */
-    transformParams?: (params: any, requestParams: any) => any;
+    transformParams?: (params: any) => any;
     /**
      * 转换响应数据
      * @description 处理服务器返回的数据

package/package.json

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