@ant-design/pro-components 3.0.0-beta.1 → 3.0.0-beta.3

package/lib/utils/transformKeySubmitValue/index.js

@@ -1,121 +1,142 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// src/utils/transformKeySubmitValue/index.ts
-var transformKeySubmitValue_exports = {};
-__export(transformKeySubmitValue_exports, {
-  isPlainObj: () => isPlainObj,
-  transformKeySubmitValue: () => transformKeySubmitValue
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(transformKeySubmitValue_exports);
-var import_get = __toESM(require("rc-util/lib/utils/get"));
-var import_react = __toESM(require("react"));
-var import_isNil = require("../isNil");
+exports.isPlainObj = isPlainObj;
+exports.transformKeySubmitValue = void 0;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _createForOfIteratorHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/createForOfIteratorHelper"));
+var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
+var _util = require("@rc-component/util");
+var _react = _interopRequireDefault(require("react"));
+var _isNil = require("../isNil");
+/**
+ * 判断一个值是否为普通对象（可以被遍历的对象）
+ * 暂时还不支持 Set 和 Map 结构
+ *
+ * @param itemValue - 要检查的值
+ * @returns 如果是普通对象返回 true，否则返回 false
+ */
 function isPlainObj(itemValue) {
-  if (typeof itemValue !== "object") {
+  // 如果不是对象类型，直接返回 false
+  if ((0, _typeof2.default)(itemValue) !== 'object') {
     return false;
   }
+
+  // Null 也要处理，不然 omit 空值会失效
   if (itemValue === null) {
     return true;
   }
-  if (import_react.default.isValidElement(itemValue))
-    return false;
-  if (itemValue.constructor === RegExp)
-    return false;
-  if (itemValue instanceof Map)
-    return false;
-  if (itemValue instanceof Set)
-    return false;
-  if (itemValue instanceof HTMLElement)
-    return false;
-  if (itemValue instanceof Blob)
-    return false;
-  if (itemValue instanceof File)
-    return false;
-  if (Array.isArray(itemValue))
-    return false;
+
+  // 排除各种特殊对象类型
+  if ( /*#__PURE__*/_react.default.isValidElement(itemValue)) return false;
+  if (itemValue.constructor === RegExp) return false;
+  if (itemValue instanceof Map) return false;
+  if (itemValue instanceof Set) return false;
+  if (itemValue instanceof HTMLElement) return false;
+  if (itemValue instanceof Blob) return false;
+  if (itemValue instanceof File) return false;
+  if (Array.isArray(itemValue)) return false;
   return true;
 }
+
+/**
+ * 将点号路径字符串转换为路径数组
+ * 例如: 'users.0.name' => ['users', 0, 'name']
+ *
+ * @param dotPath - 点号分隔的路径字符串
+ * @returns 路径数组，数字会被转换为数字类型
+ */
 function parseDotPath(dotPath) {
-  return dotPath.split(".").map((segment) => {
+  return dotPath.split('.').map(function (segment) {
+    // 如果是纯数字，转换为数字类型用于数组索引
     return /^\d+$/.test(segment) ? parseInt(segment, 10) : segment;
   });
 }
+
+/**
+ * 过滤掉空值的转换配置
+ *
+ * @param dataFormatMapRaw - 原始转换配置
+ * @returns 过滤后的转换配置
+ */
 function filterNilTransforms(dataFormatMapRaw) {
-  const filtered = {};
-  for (const key in dataFormatMapRaw) {
-    const value = dataFormatMapRaw[key];
-    if (!(0, import_isNil.isNil)(value)) {
+  var filtered = {};
+  for (var key in dataFormatMapRaw) {
+    var value = dataFormatMapRaw[key];
+    if (!(0, _isNil.isNil)(value)) {
       filtered[key] = value;
     }
   }
   return filtered;
 }
+
+/**
+ * 将转换配置分为点号路径格式和传统嵌套对象格式
+ *
+ * @param dataFormatMapRaw - 原始转换配置
+ * @returns 包含两种格式转换配置的对象
+ */
 function separateTransformFormats(dataFormatMapRaw) {
-  const dotPathTransforms = {};
-  const objectTransforms = {};
-  for (const key in dataFormatMapRaw) {
-    const value = dataFormatMapRaw[key];
-    if ((0, import_isNil.isNil)(value))
-      continue;
-    if (key.includes(".")) {
+  var dotPathTransforms = {};
+  var objectTransforms = {};
+  for (var key in dataFormatMapRaw) {
+    var value = dataFormatMapRaw[key];
+    if ((0, _isNil.isNil)(value)) continue;
+    if (key.includes('.')) {
       dotPathTransforms[key] = value;
     } else {
       objectTransforms[key] = value;
     }
   }
-  return { dotPathTransforms, objectTransforms };
+  return {
+    dotPathTransforms: dotPathTransforms,
+    objectTransforms: objectTransforms
+  };
 }
+
+/**
+ * 处理点号路径格式的转换
+ * 例如: 'users.0.name' => 转换 users[0].name 的值
+ *
+ * @param result - 要转换的数据对象
+ * @param dotPathTransforms - 点号路径转换配置
+ */
 function processDotPathTransforms(result, dotPathTransforms) {
-  for (const dotPath in dotPathTransforms) {
-    const transform = dotPathTransforms[dotPath];
-    if (typeof transform !== "function")
-      continue;
-    const pathArray = parseDotPath(dotPath);
-    const currentValue = (0, import_get.default)(result, pathArray);
-    if (currentValue === void 0)
-      continue;
-    const transformed = transform(currentValue, pathArray.map(String), result);
-    if (typeof transformed === "object" && transformed !== null && !Array.isArray(transformed)) {
-      const parentPath = pathArray.slice(0, -1);
-      const parentObj = parentPath.length > 0 ? (0, import_get.default)(result, parentPath) : result;
-      if (parentObj && typeof parentObj === "object") {
-        const keyToDelete = pathArray[pathArray.length - 1];
+  for (var dotPath in dotPathTransforms) {
+    var transform = dotPathTransforms[dotPath];
+    if (typeof transform !== 'function') continue;
+
+    // 将点号路径转换为数组路径
+    var pathArray = parseDotPath(dotPath);
+
+    // 获取要转换的值
+    var currentValue = (0, _util.get)(result, pathArray);
+    if (currentValue === undefined) continue;
+
+    // 执行转换
+    var transformed = transform(currentValue, pathArray.map(String), result);
+    if ((0, _typeof2.default)(transformed) === 'object' && transformed !== null && !Array.isArray(transformed)) {
+      // 如果返回对象，删除原键并将对象的键值对合并到父级
+      var parentPath = pathArray.slice(0, -1);
+      var parentObj = parentPath.length > 0 ? (0, _util.get)(result, parentPath) : result;
+      if (parentObj && (0, _typeof2.default)(parentObj) === 'object') {
+        var keyToDelete = pathArray[pathArray.length - 1];
         delete parentObj[keyToDelete];
         Object.assign(parentObj, transformed);
       }
     } else {
-      let current = result;
-      for (let i = 0; i < pathArray.length - 1; i++) {
-        const key = pathArray[i];
-        if (current[key] === void 0) {
-          const nextKey = pathArray[i + 1];
-          current[key] = typeof nextKey === "number" ? [] : {};
+      // 如果返回原始值，直接替换
+      // 手动设置嵌套路径的值，确保数组索引正确处理
+      var current = result;
+      for (var i = 0; i < pathArray.length - 1; i++) {
+        var key = pathArray[i];
+        if (current[key] === undefined) {
+          // 如果下一个键是数字，创建数组，否则创建对象
+          var nextKey = pathArray[i + 1];
+          current[key] = typeof nextKey === 'number' ? [] : {};
         }
         current = current[key];
       }
@@ -123,108 +144,189 @@ function processDotPathTransforms(result, dotPathTransforms) {
     }
   }
 }
+
+/**
+ * 在嵌套转换配置中查找转换函数
+ *
+ * @param currentTransforms - 当前转换配置
+ * @param parentsKey - 父级路径
+ * @param entityKey - 当前实体键
+ * @returns 找到的转换函数或 undefined
+ */
 function findNestedTransformFunction(currentTransforms, parentsKey, entityKey) {
-  let nestedTransforms = currentTransforms;
-  for (const parentKey of parentsKey) {
-    const parentKeyStr = String(parentKey);
-    if (nestedTransforms && typeof nestedTransforms[parentKeyStr] === "object") {
-      nestedTransforms = nestedTransforms[parentKeyStr];
-    } else {
-      nestedTransforms = null;
-      break;
+  var nestedTransforms = currentTransforms;
+  var _iterator = (0, _createForOfIteratorHelper2.default)(parentsKey),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var parentKey = _step.value;
+      var parentKeyStr = String(parentKey);
+      if (nestedTransforms && (0, _typeof2.default)(nestedTransforms[parentKeyStr]) === 'object') {
+        nestedTransforms = nestedTransforms[parentKeyStr];
+      } else {
+        nestedTransforms = null;
+        break;
+      }
     }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
   }
-  if (nestedTransforms && typeof nestedTransforms[entityKey] === "function") {
+  if (nestedTransforms && typeof nestedTransforms[entityKey] === 'function') {
     return nestedTransforms[entityKey];
   }
-  return void 0;
+  return undefined;
 }
+
+/**
+ * 检查路径是否包含数组索引
+ *
+ * @param parentsKey - 父级路径数组
+ * @returns 如果包含数组索引返回 true
+ */
 function isInArrayPath(parentsKey) {
-  return parentsKey.some((key) => !isNaN(Number(key)));
+  return parentsKey.some(function (key) {
+    return !isNaN(Number(key));
+  });
 }
+
+/**
+ * 递归处理嵌套对象转换（传统格式）
+ *
+ * @param tempValues - 要处理的值
+ * @param parentsKey - 父级路径
+ * @param currentTransforms - 当前转换配置
+ * @param rootMergeObjects - 存储需要在根级别合并的对象
+ * @returns 处理后的结果
+ */
 function processNestedObjectTransforms(tempValues, parentsKey, currentTransforms, rootMergeObjects) {
-  const isArrayValues = Array.isArray(tempValues);
-  let tempResult = isArrayValues ? [] : {};
-  if (tempValues == null || tempValues === void 0) {
+  var isArrayValues = Array.isArray(tempValues);
+  var tempResult = isArrayValues ? [] : {};
+  if (tempValues == null || tempValues === undefined) {
     return tempResult;
   }
-  const keysToProcess = isArrayValues ? tempValues.map((_, index) => index.toString()) : Object.keys(tempValues);
-  for (const entityKey of keysToProcess) {
-    const key = parentsKey ? [...parentsKey, entityKey] : [entityKey];
-    const itemValue = tempValues[entityKey];
-    let transformFunction = currentTransforms[entityKey];
-    if (!transformFunction && parentsKey) {
-      transformFunction = findNestedTransformFunction(
-        currentTransforms,
-        parentsKey,
-        entityKey
-      );
-    }
-    if (transformFunction && typeof transformFunction === "function") {
-      const transformed = transformFunction(itemValue, entityKey, tempValues);
-      if (typeof transformed === "object" && transformed !== null && !Array.isArray(transformed)) {
-        const isInArray = parentsKey ? isInArrayPath(parentsKey) : false;
-        if (isInArray) {
-          Object.assign(tempResult, transformed);
+
+  // 确定要处理的键
+  var keysToProcess = isArrayValues ? tempValues.map(function (_, index) {
+    return index.toString();
+  }) : Object.keys(tempValues);
+  var _iterator2 = (0, _createForOfIteratorHelper2.default)(keysToProcess),
+    _step2;
+  try {
+    for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+      var entityKey = _step2.value;
+      var key = parentsKey ? [].concat((0, _toConsumableArray2.default)(parentsKey), [entityKey]) : [entityKey];
+      var itemValue = tempValues[entityKey];
+
+      // 查找转换函数
+      var transformFunction = currentTransforms[entityKey];
+
+      // 如果没找到并且是嵌套路径，尝试在嵌套对象中查找
+      if (!transformFunction && parentsKey) {
+        transformFunction = findNestedTransformFunction(currentTransforms, parentsKey, entityKey);
+      }
+      if (transformFunction && typeof transformFunction === 'function') {
+        // 执行转换
+        var transformed = transformFunction(itemValue, entityKey, tempValues);
+        if ((0, _typeof2.default)(transformed) === 'object' && transformed !== null && !Array.isArray(transformed)) {
+          // 检查当前项是否在数组中
+          var isInArray = parentsKey ? isInArrayPath(parentsKey) : false;
+          if (isInArray) {
+            // 如果是数组元素内的转换，直接合并到当前结果
+            Object.assign(tempResult, transformed);
+          } else {
+            // 如果不是数组元素，将其存储到 rootMergeObjects 以便在根级别合并
+            rootMergeObjects.push(transformed);
+          }
         } else {
-          rootMergeObjects.push(transformed);
+          // 如果返回原始值，用新键替换
+          tempResult[entityKey] = transformed;
         }
-      } else {
-        tempResult[entityKey] = transformed;
-      }
-    } else if (isPlainObj(itemValue) && !(0, import_isNil.isNil)(itemValue)) {
-      const nestedTransforms = currentTransforms[entityKey];
-      if (nestedTransforms && typeof nestedTransforms === "object") {
-        const nested = processNestedObjectTransforms(
-          itemValue,
-          key,
-          nestedTransforms,
-          rootMergeObjects
-        );
-        const hasRemainingContent = Object.keys(nested).length > 0;
-        if (hasRemainingContent) {
-          tempResult[entityKey] = nested;
+      } else if (isPlainObj(itemValue) && !(0, _isNil.isNil)(itemValue)) {
+        // 递归处理嵌套对象（但跳过 null 值）
+        var nestedTransforms = currentTransforms[entityKey];
+        if (nestedTransforms && (0, _typeof2.default)(nestedTransforms) === 'object') {
+          // 如果当前键有嵌套转换配置，传递嵌套配置
+          var nested = processNestedObjectTransforms(itemValue, key, nestedTransforms, rootMergeObjects);
+          // 检查是否有任何子属性被转换为对象（会被添加到 rootMergeObjects）
+          // 如果 nested 为空或只包含被转换的属性，我们不保留这个对象
+          var hasRemainingContent = Object.keys(nested).length > 0;
+          if (hasRemainingContent) {
+            tempResult[entityKey] = nested;
+          }
+        } else {
+          // 否则继续使用当前转换配置递归
+          var _nested = processNestedObjectTransforms(itemValue, key, currentTransforms, rootMergeObjects);
+          tempResult[entityKey] = _nested;
         }
-      } else {
-        const nested = processNestedObjectTransforms(
-          itemValue,
-          key,
-          currentTransforms,
-          rootMergeObjects
-        );
-        tempResult[entityKey] = nested;
+      } else if (!(0, _isNil.isNil)(itemValue)) {
+        // 保留非 null/undefined 原始值
+        tempResult[entityKey] = itemValue;
       }
-    } else if (!(0, import_isNil.isNil)(itemValue)) {
-      tempResult[entityKey] = itemValue;
     }
+  } catch (err) {
+    _iterator2.e(err);
+  } finally {
+    _iterator2.f();
   }
   return tempResult;
 }
-var transformKeySubmitValue = (values, dataFormatMapRaw) => {
-  const dataFormatMap = filterNilTransforms(dataFormatMapRaw);
+
+/**
+ * 转换提交值中的键名
+ * 支持两种格式的转换配置：
+ * 1. 点号路径格式：'users.0.name' => 转换嵌套路径的值
+ * 2. 传统嵌套对象格式：{ users: { 0: { name: transformFn } } }
+ *
+ * @param values - 要转换的值对象
+ * @param dataFormatMapRaw - 转换配置映射
+ * @returns 转换后的值对象
+ */
+var transformKeySubmitValue = exports.transformKeySubmitValue = function transformKeySubmitValue(values, dataFormatMapRaw) {
+  // 过滤掉空值的转换配置
+  var dataFormatMap = filterNilTransforms(dataFormatMapRaw);
+
+  // 如果没有有效的转换配置，直接返回原值
   if (Object.keys(dataFormatMap).length < 1) {
     return values;
   }
-  if (typeof window === "undefined") {
+
+  // 在服务端环境下直接返回原值
+  if (typeof window === 'undefined') {
     return values;
   }
-  if (typeof values !== "object" || (0, import_isNil.isNil)(values) || values instanceof Blob) {
+
+  // 如果 value 是 string | null | Array | Blob 类型其中之一，直接返回
+  // 形如 {key: [File, File]} 的表单字段当进行第二次递归时会导致其直接越过 typeof value !== 'object' 这一判断
+  // https://github.com/ant-design/pro-components/issues/2071
+  if ((0, _typeof2.default)(values) !== 'object' || (0, _isNil.isNil)(values) || values instanceof Blob) {
     return values;
   }
-  let result = JSON.parse(JSON.stringify(values));
-  const { dotPathTransforms, objectTransforms } = separateTransformFormats(dataFormatMapRaw);
+
+  // 创建一个深拷贝来避免修改原始数据
+  var result = JSON.parse(JSON.stringify(values));
+
+  // 分别处理不同格式的转换配置
+  var _separateTransformFor = separateTransformFormats(dataFormatMapRaw),
+    dotPathTransforms = _separateTransformFor.dotPathTransforms,
+    objectTransforms = _separateTransformFor.objectTransforms;
+
+  // 处理点号路径格式的转换（如 'users.0.name'）
   processDotPathTransforms(result, dotPathTransforms);
-  const rootMergeObjects = [];
+
+  // 存储需要在根级别合并的对象
+  var rootMergeObjects = [];
+
+  // 处理传统的嵌套对象格式转换（向后兼容）
   if (Object.keys(objectTransforms).length > 0) {
-    result = processNestedObjectTransforms(
-      result,
-      void 0,
-      objectTransforms,
-      rootMergeObjects
-    );
+    result = processNestedObjectTransforms(result, undefined, objectTransforms, rootMergeObjects);
   }
-  for (const obj of rootMergeObjects) {
+
+  // 将所有根级别合并对象合并到最终结果
+  for (var _i = 0, _rootMergeObjects = rootMergeObjects; _i < _rootMergeObjects.length; _i++) {
+    var obj = _rootMergeObjects[_i];
     Object.assign(result, obj);
   }
   return result;
-};
+};

package/lib/utils/typing.js

@@ -1,17 +1,5 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+"use strict";
 
-// src/utils/typing.ts
-var typing_exports = {};
-module.exports = __toCommonJS(typing_exports);
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});