@teamix/pro 1.4.25-bugfix → 1.4.25-bugfix.2

package/es/form/ProForm/useAutoLayout.js

@@ -1,61 +1,47 @@
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
 function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
 import { useEffect, useMemo, useState } from 'react';
 import { isPlainObj, isBool, autoWidthBySpace, getWidthByCharacterMap, isStr } from '@teamix/utils';
 import { mergeArrayValue } from '../utils';
-
 var useAutoLayout = function useAutoLayout(_ref, formRef) {
   var outBreakpoints = _ref.breakpoints,
-      layout = _ref.layout,
-      labelAlign = _ref.labelAlign,
-      wrapperAlign = _ref.wrapperAlign,
-      outLabelCol = _ref.labelCol,
-      outWrapperCol = _ref.wrapperCol,
-      autoLayout = _ref.autoLayout,
-      schema = _ref.schema;
-
+    layout = _ref.layout,
+    labelAlign = _ref.labelAlign,
+    wrapperAlign = _ref.wrapperAlign,
+    outLabelCol = _ref.labelCol,
+    outWrapperCol = _ref.wrapperCol,
+    autoLayout = _ref.autoLayout,
+    schema = _ref.schema;
   var _ref2 = isPlainObj(autoLayout) ? autoLayout : {
-    autoLabel: autoLayout
-  },
-      autoLabel = _ref2.autoLabel;
-
+      autoLabel: autoLayout
+    },
+    autoLabel = _ref2.autoLabel;
   var breakpoints = useMemo(function () {
     return autoLabel ? false : outBreakpoints;
   }, []); // 当前断点不支持Col更新
-
   var _useState = useState({
-    labelCol: outLabelCol,
-    wrapperCol: outWrapperCol
-  }),
-      _useState2 = _slicedToArray(_useState, 2),
-      autoCol = _useState2[0],
-      setAutoCol = _useState2[1];
-
+      labelCol: outLabelCol,
+      wrapperCol: outWrapperCol
+    }),
+    _useState2 = _slicedToArray(_useState, 2),
+    autoCol = _useState2[0],
+    setAutoCol = _useState2[1];
   var labelCol = autoCol.labelCol,
-      wrapperCol = autoCol.wrapperCol;
+    wrapperCol = autoCol.wrapperCol;
   useEffect(function () {
     /**
      * autolayout
      */
     if (autoLabel) {
       var formWidth = formRef.current.getBoundingClientRect().width; // 表单宽度
-
       var labelArray = schema.map(function (item) {
         var text = item.title;
-
         if (isStr(text)) {
           var _item$decoratorProps;
-
           if (item.required) {
             text += '一'; // 必填 + 12
           }
@@ -66,19 +52,13 @@ var useAutoLayout = function useAutoLayout(_ref, formRef) {
 
           return text;
         }
-
         return '';
       }); // 标题内容集合
-
       var labelWidthArray = getWidthByCharacterMap(labelArray); // 标题宽度集合
-
       var _autoWidthBySpace = autoWidthBySpace(labelWidthArray),
-          expectedWidth = _autoWidthBySpace.expectedWidth,
-          consoleArray = _autoWidthBySpace.consoleArray; // 智能计算预期宽度
-
-
+        expectedWidth = _autoWidthBySpace.expectedWidth,
+        consoleArray = _autoWidthBySpace.consoleArray; // 智能计算预期宽度
       var expectedCol = Math.ceil(expectedWidth / formWidth * 24); // 预期宽度转换为 Col 值
-
       setAutoCol({
         labelCol: expectedCol,
         wrapperCol: wrapperCol
@@ -89,8 +69,8 @@ var useAutoLayout = function useAutoLayout(_ref, formRef) {
         wrapperCol: outWrapperCol
       });
     }
-  }, [outLabelCol, outWrapperCol]); // Layout配置By断点（配置断点后，目前不支持 Col 更新）
-
+  }, [outLabelCol, outWrapperCol]);
+  // Layout配置By断点（配置断点后，目前不支持 Col 更新）
   var autoTeamixLayout = useMemo(function () {
     return breakpoints === true ? {
       breakpoints: [480],
@@ -110,5 +90,4 @@ var useAutoLayout = function useAutoLayout(_ref, formRef) {
   }, [breakpoints, layout, labelAlign, wrapperAlign, labelCol, wrapperCol]);
   return autoTeamixLayout;
 };
-
 export default useAutoLayout;

package/es/form/ProForm/useAutoSubmit.js

@@ -1,15 +1,12 @@
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-import { useHistory } from 'react-router-dom';
+// import { useHistory } from 'react-router-dom';
+import { useRealHistory } from '@teamix/utils';
 import { doCommonRequest, isObj } from '@teamix/utils';
-
 var useAutoSubmit = function useAutoSubmit(onSubmit, context) {
   if (isObj(onSubmit)) {
-    var history = useHistory();
+    var history = useRealHistory();
     var submitConfig = onSubmit;
     return function (values) {
       return doCommonRequest(_objectSpread(_objectSpread({
@@ -21,8 +18,6 @@ var useAutoSubmit = function useAutoSubmit(onSubmit, context) {
       }, context), history);
     };
   }
-
   return onSubmit;
 };
-
 export default useAutoSubmit;

package/es/form/ProForm/useFieldRequest.js

@@ -1,17 +1,12 @@
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 import { useField } from '@formily/react';
 export default (function () {
   var field = useField();
-
   var refresh = function refresh() {
     field.data.refresh = _objectSpread({}, field.data.refresh);
   };
-
   return {
     refresh: refresh,
     field: field

package/es/form/ProForm/useFormDisplayValues.js

@@ -1,15 +1,9 @@
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
 function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
 import { useForm } from '@formily/react';
 import { toJS } from '@formily/reactive';
 import { isArr, isPlainObj, isUsable, getValueByValue } from '@teamix/utils';
@@ -25,25 +19,22 @@ import fieldTypeMap from '../fieldTypeMap';
   };
   console.log(getDisplayValues(example));
  */
-
 var getDisplayValues = function getDisplayValues(form, values) {
   var prefix = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '';
-  var displayValues; // 拼接路径
-
+  var displayValues;
+  // 拼接路径
   var connectPath = function connectPath(path) {
     return prefix ? "".concat(prefix, ".").concat(path) : "".concat(path);
-  }; // 根据值路径获取地址
-
-
+  };
+  // 根据值路径获取地址
   var getAddress = function getAddress(path) {
     return form.indexes[path];
-  }; // 当前field
-
-
-  var field = form.query(getAddress(prefix)).take(); // 是否真实字段值（自定义组件、布局组件、自增数组组件为非真实字段）
-
-  var isFieldValue = Object.keys(fieldTypeMap).includes(field === null || field === void 0 ? void 0 : field.component[0]); // 判断值的类型，递归获取每个值在该结构中的完整路径
-
+  };
+  // 当前field
+  var field = form.query(getAddress(prefix)).take();
+  // 是否真实字段值（自定义组件、布局组件、自增数组组件为非真实字段）
+  var isFieldValue = Object.keys(fieldTypeMap).includes(field === null || field === void 0 ? void 0 : field.component[0]);
+  // 判断值的类型，递归获取每个值在该结构中的完整路径
   if (!isUsable(values)) {
     displayValues = {};
   } else if (isPlainObj(values) && !isFieldValue) {
@@ -51,9 +42,8 @@ var getDisplayValues = function getDisplayValues(form, values) {
     displayValues = {};
     Object.entries(values).forEach(function (_ref) {
       var _ref2 = _slicedToArray(_ref, 2),
-          key = _ref2[0],
-          value = _ref2[1];
-
+        key = _ref2[0],
+        value = _ref2[1];
       displayValues[key] = getDisplayValues(form, value, connectPath(key));
     });
   } else if (isArr(values) && !isFieldValue) {
@@ -66,10 +56,8 @@ var getDisplayValues = function getDisplayValues(form, values) {
     });
   } else {
     var _values$value;
-
     // 通过值的完整路径获取字段address（从form实例的indexes中），然后获取该字段的value在该字段dataSource中对应的label
     var realValue = (_values$value = values === null || values === void 0 ? void 0 : values.value) !== null && _values$value !== void 0 ? _values$value : values; // 针对单个字段的值是对象，例如Select的useDetailValue
-
     var displayValue = getValueByValue(field === null || field === void 0 ? void 0 : field.dataSource, realValue);
     displayValues = {
       title: field === null || field === void 0 ? void 0 : field.title,
@@ -78,17 +66,13 @@ var getDisplayValues = function getDisplayValues(form, values) {
       displayValue: displayValue
     };
   }
-
   return displayValues;
 };
-
 var useFormDisplayValues = function useFormDisplayValues() {
   var form = useForm();
   return getDisplayValues(form, toJS(form.values));
 };
-
 var getFormDisplayValues = function getFormDisplayValues(form) {
   return getDisplayValues(form, toJS(form.values));
 };
-
 export { useFormDisplayValues, getFormDisplayValues };

package/es/form/ProForm/useInitialRequest.js

@@ -1,15 +1,10 @@
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 import { doCommonRequest } from '@teamix/utils';
-
 var useInitialRequest = function useInitialRequest(initialRequest, context) {
   return doCommonRequest(_objectSpread({
     method: 'GET'
   }, initialRequest), context);
 };
-
 export default useInitialRequest;

package/es/form/SchemaForm/adapterComponent.js

@@ -1,7 +1,5 @@
 var _componentMap;
-
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 /**
  * Formily组件在ProForm的别名
  */
@@ -12,6 +10,5 @@ export default (function (component) {
   if (componentMap[component]) {
     return componentMap[component];
   }
-
   return component;
 });

package/es/form/SchemaForm/adapterDecorator.d.ts

@@ -2,5 +2,5 @@
  * 优先使用配置，即非 undefined
  * 未配置则按默认规则为基础组件和某些聚合组件添加FormItem
  */
-declare const _default: (decorator?: string | null | undefined, component?: any) => string | null | undefined;
+declare const _default: (decorator?: string | null, component?: any) => string | null | undefined;
 export default _default;

package/es/form/SchemaForm/adapterDecorator.js

@@ -1,15 +1,9 @@
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
 /**
  * 优先使用配置，即非 undefined
  * 未配置则按默认规则为基础组件和某些聚合组件添加FormItem
@@ -19,10 +13,8 @@ export default (function (decorator, component) {
   if (decorator !== undefined) {
     return decorator;
   }
-
   if ([].concat(_toConsumableArray(Object.keys(fieldTypeMap)), ['Upload', 'SelectTable', 'ArrayCards', 'ArrayCollapse', 'ArrayTable', 'ArrayItems']).includes(component)) {
     return 'FormItem';
   }
-
   return decorator;
 });

package/es/form/SchemaForm/adapterType.js

@@ -1,7 +1,5 @@
 var _typeMap;
-
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 /**
  * 组件的默认type类型，未指定类型为void
  */

package/es/form/SchemaForm/index.js

@@ -1,35 +1,19 @@
 var _excluded = ["type", "name", "component", "props", "decorator", "decoratorProps", "dataSource", "reactions", "rules", "children", "items", "tooltip", "request", "data"];
-
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
 function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 import React, { memo, useCallback, useRef, useMemo } from 'react';
 import { createSchemaField } from '@formily/react';
 import { cls, isUsable } from '@teamix/utils';
@@ -56,14 +40,14 @@ import { getFieldName, mapSchemaName } from '../utils';
 import warning from '../warning';
 export default /*#__PURE__*/memo(function (_ref) {
   var schema = _ref.schema,
-      scope = _ref.scope,
-      components = _ref.components;
-  var schemaScopeRef = useRef({}); // 创建 SchemaField
-
+    scope = _ref.scope,
+    components = _ref.components;
+  var schemaScopeRef = useRef({});
+  // 创建 SchemaField
   var SchemaField = useMemo(function () {
     return createSchemaField();
-  }, []); // 格式化 schema
-
+  }, []);
+  // 格式化 schema
   var formatSchema = useCallback(function (schema) {
     var parentSuffix = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
     var schemaProperties = {};
@@ -71,131 +55,113 @@ export default /*#__PURE__*/memo(function (_ref) {
       var suffix = "".concat(parentSuffix).concat(index);
       var newItem = warning(item);
       var _newItem = newItem,
-          originalComponent = _newItem.component; // 根据component的不同，初始化为内置的item
-
+        originalComponent = _newItem.component;
+      // 根据component的不同，初始化为内置的item
       if (originalComponent) {
-        if (Object.keys(fieldTypeMap).includes(originalComponent)) {// ProField接管组件
+        if (Object.keys(fieldTypeMap).includes(originalComponent)) {
+          // ProField接管组件
         } else {
           // 未接管组件，判断是否为Formily组件别名
           newItem = _objectSpread(_objectSpread({}, newItem), {}, {
             component: adapterComponent(originalComponent)
           });
-        } // 初始化高级组件 - FormButtonGroup/Subimt/Reset
-
-
+        }
+        // 初始化高级组件 - FormButtonGroup/Subimt/Reset
         if (['FormButtonGroup', 'Submit', 'Reset'].includes(originalComponent)) {
           newItem = initializeFormButton(newItem);
-        } // 初始化高级组件 - ArrayCards
-
-
+        }
+        // 初始化高级组件 - ArrayCards
         if (['ArrayCards'].includes(originalComponent)) {
           newItem = initializeArrayCards(newItem);
-        } // 初始化高级组件 - ArrayCollapse
-
-
+        }
+        // 初始化高级组件 - ArrayCollapse
         if (['ArrayCollapse'].includes(originalComponent)) {
           newItem = initializeArrayCollapse(newItem);
-        } // 初始化高级组件 - ArrayTable
-
-
+        }
+        // 初始化高级组件 - ArrayTable
         if (['ArrayTable'].includes(originalComponent)) {
           newItem = initializeArrayTable(newItem);
-        } // 初始化高级组件 - ArrayItems
-
-
+        }
+        // 初始化高级组件 - ArrayItems
         if (['ArrayItems'].includes(originalComponent)) {
           newItem = initializeArrayItems(newItem);
-        } // 初始化布局组件 - FormStep
-
-
+        }
+        // 初始化布局组件 - FormStep
         if (['FormStep'].includes(originalComponent)) {
           newItem = initializeFormStep(newItem);
-        } // 初始化布局组件 - FormGroup
-
-
+        }
+        // 初始化布局组件 - FormGroup
         if (['FormGroup'].includes(originalComponent)) {
           newItem = initializeFormGroup(newItem);
-        } // 初始化布局组件 - FormTab
-
-
+        }
+        // 初始化布局组件 - FormTab
         if (['FormTab'].includes(originalComponent)) {
           newItem = initializeFormTab(newItem);
-        } // 初始化布局组件 - FormCollapse
-
-
+        }
+        // 初始化布局组件 - FormCollapse
         if (['FormCollapse'].includes(originalComponent)) {
           newItem = initializeFormCollapse(newItem);
-        } // 初始化选择表格 - SelectTable
-
-
+        }
+        // 初始化选择表格 - SelectTable
         if (['SelectTable'].includes(originalComponent)) {
           newItem = initializeSelectTable(newItem);
         }
       }
-
       var _newItem2 = newItem,
-          type = _newItem2.type,
-          name = _newItem2.name,
-          component = _newItem2.component,
-          props = _newItem2.props,
-          decorator = _newItem2.decorator,
-          decoratorProps = _newItem2.decoratorProps,
-          dataSource = _newItem2.dataSource,
-          reactions = _newItem2.reactions,
-          rules = _newItem2.rules,
-          children = _newItem2.children,
-          items = _newItem2.items,
-          tooltip = _newItem2.tooltip,
-          request = _newItem2.request,
-          data = _newItem2.data,
-          otherProps = _objectWithoutProperties(_newItem2, _excluded); // 默认字段名
-
-
-      var defaultName = !name ? getFieldName(component === null || component === void 0 ? void 0 : component.replace(/\./g, ''), suffix) : name; // 默认类型
-
-      var defaultType = adapterType(type, originalComponent); // 默认装饰组件
-
-      var defaultDecorator = adapterDecorator(decorator, originalComponent); // 默认装饰组件属性
-
+        type = _newItem2.type,
+        name = _newItem2.name,
+        component = _newItem2.component,
+        props = _newItem2.props,
+        decorator = _newItem2.decorator,
+        decoratorProps = _newItem2.decoratorProps,
+        dataSource = _newItem2.dataSource,
+        reactions = _newItem2.reactions,
+        rules = _newItem2.rules,
+        children = _newItem2.children,
+        items = _newItem2.items,
+        tooltip = _newItem2.tooltip,
+        request = _newItem2.request,
+        data = _newItem2.data,
+        otherProps = _objectWithoutProperties(_newItem2, _excluded);
+      // 默认字段名
+      var defaultName = !name ? getFieldName(component === null || component === void 0 ? void 0 : component.replace(/\./g, ''), suffix) : name;
+      // 默认类型
+      var defaultType = adapterType(type, originalComponent);
+      // 默认装饰组件
+      var defaultDecorator = adapterDecorator(decorator, originalComponent);
+      // 默认装饰组件属性
       var tooltipProps = tooltip ? {
         tooltip: tooltip
       } : {};
-
-      var defaultDecoratorProps = _objectSpread(_objectSpread({}, tooltipProps), decoratorProps); // 初始化request
-
-
+      var defaultDecoratorProps = _objectSpread(_objectSpread({}, tooltipProps), decoratorProps);
+      // 初始化request
       var _initializeRequest = initializeRequest(request, "".concat(suffix, "r")),
-          requestReactions = _initializeRequest.reactions,
-          requestScope = _initializeRequest.scope; // 初始化dataSource
-
-
+        requestReactions = _initializeRequest.reactions,
+        requestScope = _initializeRequest.scope;
+      // 初始化dataSource
       var _initializeDataSource = initializeDataSource(dataSource, "".concat(suffix, "d")),
-          defaultDataSource = _initializeDataSource.dataSource,
-          dataSourceReactions = _initializeDataSource.reactions,
-          dataSourceScope = _initializeDataSource.scope,
-          dataSourceData = _initializeDataSource.data,
-          dataSourceProps = _initializeDataSource.props; // 初始化rules validator
-
-
+        defaultDataSource = _initializeDataSource.dataSource,
+        dataSourceReactions = _initializeDataSource.reactions,
+        dataSourceScope = _initializeDataSource.scope,
+        dataSourceData = _initializeDataSource.data,
+        dataSourceProps = _initializeDataSource.props;
+      // 初始化rules validator
       var _initializeRules = initializeRules(rules, "".concat(suffix, "v")),
-          defaultRules = _initializeRules.rules,
-          rulesScope = _initializeRules.scope; // 合并reactions，初始化reactions
-
-
-      var defaultReactions = initializeReactions(reactions, [].concat(_toConsumableArray(requestReactions), _toConsumableArray(dataSourceReactions))); // 合并scope
-
+        defaultRules = _initializeRules.rules,
+        rulesScope = _initializeRules.scope;
+      // 合并reactions，初始化reactions
+      var defaultReactions = initializeReactions(reactions, [].concat(_toConsumableArray(requestReactions), _toConsumableArray(dataSourceReactions)));
+      // 合并scope
       Object.entries(_objectSpread(_objectSpread(_objectSpread({}, requestScope), dataSourceScope), rulesScope)).map(function (_ref2) {
         var _ref3 = _slicedToArray(_ref2, 2),
-            k = _ref3[0],
-            v = _ref3[1];
-
+          k = _ref3[0],
+          v = _ref3[1];
         schemaScopeRef.current[k] = v;
-      }); // 合并字段属性
-
+      });
+      // 合并字段属性
       var defaultProps = _objectSpread(_objectSpread(_objectSpread({}, props), dataSourceProps), {}, {
         className: cls(props === null || props === void 0 ? void 0 : props.className, dataSourceProps === null || dataSourceProps === void 0 ? void 0 : dataSourceProps.className)
       });
-
       var formatParam = mapSchemaName(_objectSpread(_objectSpread({}, otherProps), {}, {
         type: defaultType,
         component: component,
@@ -208,15 +174,15 @@ export default /*#__PURE__*/memo(function (_ref) {
         data: _objectSpread(_objectSpread(_objectSpread({}, data), dataSourceData), {}, {
           __placeholder: true
         })
-      })); // 递归子组件
-
+      }));
+      // 递归子组件
       var recursiveProperties = (children === null || children === void 0 ? void 0 : children.length) ? {
         properties: formatSchema(children, suffix)
-      } : {}; // 递归items（类似子组件，会先由各initialize方法格式化为固定形式，type不同不统一处理）
+      } : {};
+      // 递归items（类似子组件，会先由各initialize方法格式化为固定形式，type不同不统一处理）
       // 例如：[{ name: 'items', type: 'object', children: items }]
-
-      var recursiveItems = items ? formatSchema([items], suffix) : {}; // 配置组件属性
-
+      var recursiveItems = items ? formatSchema([items], suffix) : {};
+      // 配置组件属性
       if (isUsable(item)) {
         schemaProperties[defaultName] = _objectSpread(_objectSpread(_objectSpread({}, formatParam), recursiveProperties), recursiveItems);
       }
@@ -229,14 +195,12 @@ export default /*#__PURE__*/memo(function (_ref) {
       properties: formatSchema(schema)
     };
   }, [schema]);
-
   var mergedScope = _objectSpread(_objectSpread({}, scope), {}, {
     $request: $request,
     $common: $common,
     $dataSource: $dataSource,
     $validator: $validator
   }, schemaScopeRef.current);
-
   return /*#__PURE__*/React.createElement(SchemaField, {
     schema: formilySchema,
     components: components,