@teamix/pro 1.5.0-beta.1 → 1.6.0-beta.0

package/lib/form/ProForm/index.js

@@ -1,64 +1,38 @@
 "use strict";
 
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _react = _interopRequireWildcard(require("react"));
-
 var _utils = require("@teamix/utils");
-
 var _core = require("@formily/core");
-
 var _reactive = require("@formily/reactive");
-
 var _formily = require("@teamix/formily");
-
 var _components = require("@alicloudfe/components");
-
 var _ProField = _interopRequireDefault(require("../Components/ProField"));
-
+var _addCascadeEffect = _interopRequireDefault(require("./addCascadeEffect"));
 var _Editable = require("../Components/Editable");
-
 var _FormGroup = _interopRequireDefault(require("../Components/FormGroup"));
-
 var _LightFilter = _interopRequireDefault(require("../Components/LightFilter"));
-
 var _index = _interopRequireDefault(require("../Components/Text/index"));
-
 var _SchemaForm = _interopRequireDefault(require("../SchemaForm"));
-
 var _useAutoSubmit = _interopRequireDefault(require("./useAutoSubmit"));
-
 var _useAutoLayout = _interopRequireDefault(require("./useAutoLayout"));
-
 var _useInitialRequest = _interopRequireDefault(require("./useInitialRequest"));
-
 var _validate = _interopRequireDefault(require("../locales/validate"));
-
 require("./index.scss");
-
 var _excluded = ["form", "initialValues", "initialRequest", "scope", "context", "components", "onChange", "onChangeType", "onSubmit", "onSubmitFailed", "onInitialComplete", "className", "validateFirst", "schema", "children"];
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 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; }
-
 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; }
-
 (0, _core.registerValidateLocale)(_validate.default);
 var formilyComponents = {
   FormLayout: _formily.FormLayout,
@@ -90,41 +64,40 @@ var formilyComponents = {
 };
 var ProForm = /*#__PURE__*/(0, _react.memo)(function (_ref) {
   var outerForm = _ref.form,
-      initialValues = _ref.initialValues,
-      initialRequest = _ref.initialRequest,
-      scope = _ref.scope,
-      context = _ref.context,
-      components = _ref.components,
-      onChange = _ref.onChange,
-      onChangeType = _ref.onChangeType,
-      onSubmit = _ref.onSubmit,
-      onSubmitFailed = _ref.onSubmitFailed,
-      onInitialComplete = _ref.onInitialComplete,
-      className = _ref.className,
-      validateFirst = _ref.validateFirst,
-      schema = _ref.schema,
-      children = _ref.children,
-      otherProps = _objectWithoutProperties(_ref, _excluded);
-
-  var formRef = (0, _react.useRef)(); // 获取全局配置
-
+    initialValues = _ref.initialValues,
+    initialRequest = _ref.initialRequest,
+    scope = _ref.scope,
+    context = _ref.context,
+    components = _ref.components,
+    onChange = _ref.onChange,
+    onChangeType = _ref.onChangeType,
+    onSubmit = _ref.onSubmit,
+    onSubmitFailed = _ref.onSubmitFailed,
+    onInitialComplete = _ref.onInitialComplete,
+    className = _ref.className,
+    validateFirst = _ref.validateFirst,
+    schema = _ref.schema,
+    children = _ref.children,
+    otherProps = _objectWithoutProperties(_ref, _excluded);
+  var formRef = (0, _react.useRef)();
+  // 获取全局配置
   var _ref2 = (0, _utils.getGlobalConfig)('ProForm') || {},
-      globalComponents = _ref2.components,
-      globalScope = _ref2.scope;
-
+    globalComponents = _ref2.components,
+    globalScope = _ref2.scope;
+  var mergedScope = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, context), globalScope), scope), {}, {
+    context: context
+  });
   var form = (0, _react.useMemo)(function () {
-    return outerForm || (0, _core.createForm)({
+    var nextForm = outerForm || (0, _core.createForm)({
       validateFirst: validateFirst
     });
+    (0, _addCascadeEffect.default)(nextForm, schema, mergedScope);
+    return nextForm;
   }, [outerForm]);
-  var prefixCls = (0, _utils.usePrefixCls)('teamix-pro-form'); // 由于Actions需要，解构context供使用。原context键名的上下文继续保留。
-
-  var mergedScope = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, context), globalScope), scope), {}, {
-    context: context
-  });
+  var prefixCls = (0, _utils.usePrefixCls)('teamix-pro-form');
+  // 由于Actions需要，解构context供使用。原context键名的上下文继续保留。
 
   var mergedComponents = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, globalComponents), components), formilyComponents), _ProField.default);
-
   var onAutoSubmit = (0, _useAutoSubmit.default)(onSubmit, context);
   var autoTeamixLayout = (0, _useAutoLayout.default)(_objectSpread(_objectSpread({}, otherProps), {}, {
     schema: schema
@@ -140,8 +113,9 @@ var ProForm = /*#__PURE__*/(0, _react.memo)(function (_ref) {
         onInitialComplete === null || onInitialComplete === void 0 ? void 0 : onInitialComplete(form);
       });
     }
-  }, []); // 添加 onChange 事件
+  }, []);
 
+  // 添加 onChange 事件
   (0, _react.useMemo)(function () {
     if (onChangeType === 'form') {
       // 使用 onFormValuesChange 无法监听具体变化字段
@@ -157,7 +131,6 @@ var ProForm = /*#__PURE__*/(0, _react.memo)(function (_ref) {
       form.addEffects('onChangeByFieldValueChange', function () {
         (0, _core.onFieldValueChange)('*', function (field, form) {
           var _field$props;
-
           onChange === null || onChange === void 0 ? void 0 : onChange((0, _reactive.toJS)(form.values), (0, _reactive.toJS)(field.value), (_field$props = field.props) === null || _field$props === void 0 ? void 0 : _field$props.name);
         });
       });
@@ -167,9 +140,9 @@ var ProForm = /*#__PURE__*/(0, _react.memo)(function (_ref) {
     // 配置国际化
     (0, _core.setValidateLanguage)((0, _utils.getLanguage)() || 'zh-cn');
   }, []);
-  return /*#__PURE__*/_react.default.createElement(_formily.Form, _objectSpread(_objectSpread(_objectSpread({
+  return /*#__PURE__*/_react.default.createElement(_formily.Form, _extends({
     className: (0, _utils.cls)(prefixCls(), className)
-  }, otherProps), autoTeamixLayout), {}, {
+  }, otherProps, autoTeamixLayout, {
     form: form,
     onAutoSubmit: onAutoSubmit,
     onAutoSubmitFailed: onSubmitFailed

package/lib/form/ProForm/useAutoLayout.js

@@ -4,67 +4,50 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _react = require("react");
-
 var _utils = require("@teamix/utils");
-
 var _utils2 = require("../utils");
-
 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; }
-
 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 = (0, _utils.isPlainObj)(autoLayout) ? autoLayout : {
-    autoLabel: autoLayout
-  },
-      autoLabel = _ref2.autoLabel;
-
+      autoLabel: autoLayout
+    },
+    autoLabel = _ref2.autoLabel;
   var breakpoints = (0, _react.useMemo)(function () {
     return autoLabel ? false : outBreakpoints;
   }, []); // 当前断点不支持Col更新
-
   var _useState = (0, _react.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;
   (0, _react.useEffect)(function () {
     /**
      * autolayout
      */
     if (autoLabel) {
       var formWidth = formRef.current.getBoundingClientRect().width; // 表单宽度
-
       var labelArray = schema.map(function (item) {
         var text = item.title;
-
         if ((0, _utils.isStr)(text)) {
           var _item$decoratorProps;
-
           if (item.required) {
             text += '一'; // 必填 + 12
           }
@@ -75,16 +58,13 @@ var useAutoLayout = function useAutoLayout(_ref, formRef) {
 
           return text;
         }
-
         return '';
       }); // 标题内容集合
-
       var labelWidthArray = (0, _utils.getWidthByCharacterMap)(labelArray); // 标题宽度集合
 
       var _autoWidthBySpace = (0, _utils.autoWidthBySpace)(labelWidthArray),
-          expectedWidth = _autoWidthBySpace.expectedWidth,
-          consoleArray = _autoWidthBySpace.consoleArray; // 智能计算预期宽度
-
+        expectedWidth = _autoWidthBySpace.expectedWidth,
+        consoleArray = _autoWidthBySpace.consoleArray; // 智能计算预期宽度
 
       var expectedCol = Math.ceil(expectedWidth / formWidth * 24); // 预期宽度转换为 Col 值
 
@@ -98,8 +78,9 @@ var useAutoLayout = function useAutoLayout(_ref, formRef) {
         wrapperCol: outWrapperCol
       });
     }
-  }, [outLabelCol, outWrapperCol]); // Layout配置By断点（配置断点后，目前不支持 Col 更新）
+  }, [outLabelCol, outWrapperCol]);
 
+  // Layout配置By断点（配置断点后，目前不支持 Col 更新）
   var autoTeamixLayout = (0, _react.useMemo)(function () {
     return breakpoints === true ? {
       breakpoints: [480],
@@ -119,6 +100,5 @@ var useAutoLayout = function useAutoLayout(_ref, formRef) {
   }, [breakpoints, layout, labelAlign, wrapperAlign, labelCol, wrapperCol]);
   return autoTeamixLayout;
 };
-
 var _default = useAutoLayout;
 exports.default = _default;

package/lib/form/ProForm/useAutoSubmit.js

@@ -4,20 +4,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
-var _reactRouterDom = require("react-router-dom");
-
+var _router = require("@teamix/router");
 var _utils = require("@teamix/utils");
-
 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; }
-
 var useAutoSubmit = function useAutoSubmit(onSubmit, context) {
   if ((0, _utils.isObj)(onSubmit)) {
-    var history = (0, _reactRouterDom.useHistory)();
+    var navigate = (0, _router.useNavigate)();
     var submitConfig = onSubmit;
     return function (values) {
       return (0, _utils.doCommonRequest)(_objectSpread(_objectSpread({
@@ -26,12 +20,10 @@ var useAutoSubmit = function useAutoSubmit(onSubmit, context) {
         params: _objectSpread(_objectSpread({}, values), submitConfig.params || {})
       }), _objectSpread({
         fields: values
-      }, context), history);
+      }, context), navigate);
     };
   }
-
   return onSubmit;
 };
-
 var _default = useAutoSubmit;
 exports.default = _default;

package/lib/form/ProForm/useFieldRequest.js

@@ -4,26 +4,18 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _react = require("@formily/react");
-
 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; }
-
 var _default = function _default() {
   var field = (0, _react.useField)();
-
   var refresh = function refresh() {
     field.data.refresh = _objectSpread({}, field.data.refresh);
   };
-
   return {
     refresh: refresh,
     field: field
   };
 };
-
 exports.default = _default;

package/lib/form/ProForm/useFormDisplayValues.js

@@ -4,29 +4,17 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.useFormDisplayValues = exports.getFormDisplayValues = void 0;
-
 var _react = require("@formily/react");
-
 var _reactive = require("@formily/reactive");
-
 var _utils = require("@teamix/utils");
-
 var _fieldTypeMap = _interopRequireDefault(require("../fieldTypeMap"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 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; }
-
 /**
  * 获取表单值的可显示值
  * @returns 如果某字段有dataSource，则返回value对应label
@@ -40,22 +28,21 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
  */
 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.default).includes(field === null || field === void 0 ? void 0 : field.component[0]); // 判断值的类型，递归获取每个值在该结构中的完整路径
+  };
+  // 当前field
+  var field = form.query(getAddress(prefix)).take();
+  // 是否真实字段值（自定义组件、布局组件、自增数组组件为非真实字段）
+  var isFieldValue = Object.keys(_fieldTypeMap.default).includes(field === null || field === void 0 ? void 0 : field.component[0]);
 
+  // 判断值的类型，递归获取每个值在该结构中的完整路径
   if (!(0, _utils.isUsable)(values)) {
     displayValues = {};
   } else if ((0, _utils.isPlainObj)(values) && !isFieldValue) {
@@ -63,9 +50,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 ((0, _utils.isArr)(values) && !isFieldValue) {
@@ -78,10 +64,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 = (0, _utils.getValueByValue)(field === null || field === void 0 ? void 0 : field.dataSource, realValue);
     displayValues = {
       title: field === null || field === void 0 ? void 0 : field.title,
@@ -90,19 +74,14 @@ var getDisplayValues = function getDisplayValues(form, values) {
       displayValue: displayValue
     };
   }
-
   return displayValues;
 };
-
 var useFormDisplayValues = function useFormDisplayValues() {
   var form = (0, _react.useForm)();
   return getDisplayValues(form, (0, _reactive.toJS)(form.values));
 };
-
 exports.useFormDisplayValues = useFormDisplayValues;
-
 var getFormDisplayValues = function getFormDisplayValues(form) {
   return getDisplayValues(form, (0, _reactive.toJS)(form.values));
 };
-
 exports.getFormDisplayValues = getFormDisplayValues;

package/lib/form/ProForm/useInitialRequest.js

@@ -4,20 +4,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _utils = require("@teamix/utils");
-
 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; }
-
 var useInitialRequest = function useInitialRequest(initialRequest, context) {
   return (0, _utils.doCommonRequest)(_objectSpread({
     method: 'GET'
   }, initialRequest), context);
 };
-
 var _default = useInitialRequest;
 exports.default = _default;

package/lib/form/SchemaForm/adapterComponent.js

@@ -4,24 +4,19 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 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的别名
  */
+
 var componentMap = (_componentMap = {
   FormFlex: 'Space'
 }, _defineProperty(_componentMap, 'Editable.Dialog', 'EditableDialog'), _defineProperty(_componentMap, 'Editable.Drawer', 'EditableDrawer'), _defineProperty(_componentMap, 'Editable.Popover', 'EditablePopover'), _defineProperty(_componentMap, 'FormDrawer.Footer', 'FormDrawerFooter'), _defineProperty(_componentMap, 'FormDialog.Footer', 'FormDialogFooter'), _componentMap);
-
 var _default = function _default(component) {
   if (componentMap[component]) {
     return componentMap[component];
   }
-
   return component;
 };
-
 exports.default = _default;

package/lib/form/SchemaForm/adapterDecorator.js

@@ -4,33 +4,21 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _fieldTypeMap = _interopRequireDefault(require("../fieldTypeMap"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 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; }
-
 var _default = function _default(decorator, component) {
   if (decorator !== undefined) {
     return decorator;
   }
-
   if ([].concat(_toConsumableArray(Object.keys(_fieldTypeMap.default)), ['Upload', 'SelectTable', 'ArrayCards', 'ArrayCollapse', 'ArrayTable', 'ArrayItems']).includes(component)) {
     return 'FormItem';
   }
-
   return decorator;
 };
-
 exports.default = _default;

package/lib/form/SchemaForm/adapterType.js

@@ -4,14 +4,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 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
  */
+
 var typeMap = (_typeMap = {
   Input: 'string',
   Password: 'string',
@@ -56,9 +54,7 @@ var typeMap = (_typeMap = {
   SelectGroup: 'array',
   SelectTable: 'array'
 }, _defineProperty(_typeMap, 'SelectTable.Column', 'string'), _defineProperty(_typeMap, "ArrayCollapse", 'array'), _defineProperty(_typeMap, "ArrayCards", 'array'), _defineProperty(_typeMap, "ArrayTable", 'array'), _defineProperty(_typeMap, "ArrayItems", 'array'), _defineProperty(_typeMap, 'Editable.Popover', 'object'), _defineProperty(_typeMap, 'Editable.Dialog', 'object'), _defineProperty(_typeMap, 'Editable.Drawer', 'object'), _typeMap);
-
 var _default = function _default(type, component) {
   return type || typeMap[component] || 'void';
 };
-
 exports.default = _default;