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

package/lib/form/Filter/index2.js

@@ -1,31 +1,54 @@
 "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 = exports.SimpleFilter = exports.AdvancedFilter = void 0;
+
 var _react = _interopRequireWildcard(require("react"));
+
 var _utils = require("@teamix/utils");
+
 var _core = require("@formily/core");
+
 var _ProForm = _interopRequireDefault(require("../ProForm"));
+
 var _utils2 = require("../utils");
+
 require("./index2.scss");
+
 var _excluded = ["schema", "triggerType", "onFilter"];
+
 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 _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; }
+
 var getEventProps = function getEventProps(triggerType, onFilter) {
   var keydownEvent = {
     onSubmit: onFilter
@@ -43,11 +66,14 @@ var getEventProps = function getEventProps(triggerType, onFilter) {
 /**
  * 简单筛选
  */
+
+
 var SimpleFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
   var schema = props.schema,
-    triggerType = props.triggerType,
-    onFilter = props.onFilter,
-    otherProps = _objectWithoutProperties(props, _excluded);
+      triggerType = props.triggerType,
+      onFilter = props.onFilter,
+      otherProps = _objectWithoutProperties(props, _excluded);
+
   var prefixCls = (0, _utils.usePrefixCls)('teamix-pro-form-filter-simple');
   var simpleSchema = (0, _react.useMemo)(function () {
     return [{
@@ -84,19 +110,20 @@ SimpleFilter.defaultProps = {
 /**
  * 高级筛选
  */
+
 var AdvancedFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
   var form = (0, _react.useMemo)(function () {
     return (props === null || props === void 0 ? void 0 : props.form) || (0, _core.createForm)();
   }, []);
   var schema = props.schema,
-    triggerType = props.triggerType,
-    onFilter = props.onFilter,
-    onReset = props.onReset,
-    layout = props.layout,
-    labelAlign = props.labelAlign,
-    wrapperAlign = props.wrapperAlign,
-    labelCol = props.labelCol,
-    wrapperCol = props.wrapperCol;
+      triggerType = props.triggerType,
+      onFilter = props.onFilter,
+      onReset = props.onReset,
+      layout = props.layout,
+      labelAlign = props.labelAlign,
+      wrapperAlign = props.wrapperAlign,
+      labelCol = props.labelCol,
+      wrapperCol = props.wrapperCol;
   var prefixCls = (0, _utils.usePrefixCls)('teamix-pro-form-filter-advanced');
   var gridSchema = (0, _react.useMemo)(function () {
     return [{

package/lib/form/Filter/layout.scss

@@ -26,7 +26,7 @@ $query-filter-layout: #{$teamix-pro-form}-query-filter-layout;
     margin-bottom: 8px;
   }
   .#{$query-filter-layout}-addonAfter {
-    flex: 0 0 auto;
+    flex: 0 1 auto;
     margin-left: 8px;
   }
   .#{$query-filter-layout}-panel {

package/lib/form/Filter/useBindUrl.js

@@ -4,36 +4,54 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+
 var _hooks = require("@teamix/hooks");
+
 var _utils = require("@teamix/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; }
+
 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(bindUrl, functions, formRef) {
   // 预处理 bindUrl 参数（主要兼容 SelectGroup 组件）
   var initializeBindUrl = function initializeBindUrl(options) {
     return options ? _objectSpread(_objectSpread({}, options), {}, {
       beforeStringify: function beforeStringify(values) {
         var _Object$entries;
+
         var beforeStringify = options.beforeStringify;
+
         var newValues = _objectSpread({}, values);
+
         (_Object$entries = Object.entries(values)) === null || _Object$entries === void 0 ? void 0 : _Object$entries.forEach(function (_ref) {
           var _form$query;
+
           var _ref2 = _slicedToArray(_ref, 2),
-            key = _ref2[0],
-            value = _ref2[1];
+              key = _ref2[0],
+              value = _ref2[1];
+
           var form = formRef.current;
           var field = (_form$query = form.query(key)) === null || _form$query === void 0 ? void 0 : _form$query.take();
+
           if ((field === null || field === void 0 ? void 0 : field.component[0]) === 'SelectGroup') {
             newValues[key] = value.map(function (_ref3) {
               var key = _ref3.key,
-                value = _ref3.value;
+                  value = _ref3.value;
               return key && value ? "".concat(key, "||").concat(value === null || value === void 0 ? void 0 : value.join('|')) : '';
             });
           }
@@ -41,57 +59,71 @@ var _default = function _default(bindUrl, functions, formRef) {
         return beforeStringify ? beforeStringify(newValues) : newValues;
       }
     }) : options;
-  };
-  // 通过 useUrlState 获取 url 上的参数和 url 配置方法
+  }; // 通过 useUrlState 获取 url 上的参数和 url 配置方法
+
+
   var _ref4 = bindUrl ? (0, _hooks.useUrlState)(undefined, initializeBindUrl((0, _utils.isPlainObj)(bindUrl) ? bindUrl : {})) : [],
-    _ref5 = _slicedToArray(_ref4, 2),
-    urlState = _ref5[0],
-    setUrlState = _ref5[1];
-  // 输出配置url参数的函数
+      _ref5 = _slicedToArray(_ref4, 2),
+      urlState = _ref5[0],
+      setUrlState = _ref5[1]; // 输出配置url参数的函数
+
+
   var initializedFunctions = Object.entries(functions).reduce(function (prev, _ref6) {
     var _ref7 = _slicedToArray(_ref6, 2),
-      key = _ref7[0],
-      fun = _ref7[1];
+        key = _ref7[0],
+        fun = _ref7[1];
+
     prev[key] = function (values) {
       fun === null || fun === void 0 ? void 0 : fun(values);
       setUrlState === null || setUrlState === void 0 ? void 0 : setUrlState(values);
     };
+
     return prev;
-  }, {});
-  // 使用 url 参数配置 QueryFilter 默认值（移除非表单值，兼容数组数据，兼容 SelectGroup 组件）
+  }, {}); // 使用 url 参数配置 QueryFilter 默认值（移除非表单值，兼容数组数据，兼容 SelectGroup 组件）
+
   var setValuesByUrlState = function setValuesByUrlState(form) {
     if (urlState) {
       var _Object$entries2;
+
       (_Object$entries2 = Object.entries(urlState)) === null || _Object$entries2 === void 0 ? void 0 : _Object$entries2.forEach(function (_ref8) {
         var _form$query2;
+
         var _ref9 = _slicedToArray(_ref8, 2),
-          key = _ref9[0],
-          value = _ref9[1];
+            key = _ref9[0],
+            value = _ref9[1];
+
         var field = (_form$query2 = form.query(key)) === null || _form$query2 === void 0 ? void 0 : _form$query2.take();
+
         if (field) {
           var newValue = value;
+
           if (field.displayName === 'ArrayField') {
             newValue = [].concat((0, _utils.isUsable)(newValue) ? newValue : []);
           }
+
           if (field.component[0] === 'SelectGroup') {
             newValue = newValue.map(function (item) {
               var _item$split = item === null || item === void 0 ? void 0 : item.split('||'),
-                _item$split2 = _slicedToArray(_item$split, 2),
-                key = _item$split2[0],
-                value = _item$split2[1];
+                  _item$split2 = _slicedToArray(_item$split, 2),
+                  key = _item$split2[0],
+                  value = _item$split2[1];
+
               return {
                 key: key,
                 value: value === null || value === void 0 ? void 0 : value.split('|')
               };
             });
           }
+
           form.setValuesIn(key, newValue);
         }
       });
     }
   };
+
   return _objectSpread({
     setValuesByUrlState: setValuesByUrlState
   }, initializedFunctions);
 };
+
 exports.default = _default;

package/lib/form/Filter/useSpecialProps.js

@@ -4,30 +4,36 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+
 var _utils = require("@teamix/utils");
+
 // 获取Schema是否包含默认值、异步默认值、必选校验等
 var useSpecialProps = function useSpecialProps(props) {
   var initialValues = props.initialValues,
-    initialRequest = props.initialRequest;
+      initialRequest = props.initialRequest;
   var hasChangeDefault = !!initialValues || !!initialRequest; // 会触发onChange的默认值
+
   var hasDefault = hasChangeDefault;
   var hasRequired = false;
+
   var hasDefaultOrRule = function hasDefaultOrRule(schema) {
     schema.forEach(function (item) {
       var value = item.default,
-        required = item.required,
-        rules = item.rules,
-        dataSource = item.dataSource,
-        children = item.children;
-      // 字符串变量配置default值会触发onChange
+          required = item.required,
+          rules = item.rules,
+          dataSource = item.dataSource,
+          children = item.children; // 字符串变量配置default值会触发onChange
+
       hasChangeDefault = hasChangeDefault || !!((0, _utils.isPlainObj)(dataSource) && (0, _utils.isStr)(value) && value.indexOf('.dataSource'));
       hasDefault = hasDefault || (0, _utils.isUsable)(value);
       hasRequired = hasRequired || required || !!rules;
+
       if (children === null || children === void 0 ? void 0 : children.length) {
         hasDefaultOrRule(children);
       }
     });
   };
+
   hasDefaultOrRule(props.schema);
   return {
     hasDefault: hasDefault,
@@ -35,5 +41,6 @@ var useSpecialProps = function useSpecialProps(props) {
     hasRequired: hasRequired
   };
 };
+
 var _default = useSpecialProps;
 exports.default = _default;

package/lib/form/ProForm/customComponent.js

@@ -4,12 +4,19 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.customComponent = void 0;
+
 var _react = require("@formily/react");
+
 var _reactive = require("@formily/reactive");
+
 var _utils = require("../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 customComponent = function customComponent(component) {
   return (0, _react.connect)(component, (0, _react.mapProps)(function (props, field) {
     return _objectSpread(_objectSpread({}, props), {}, {
@@ -19,4 +26,5 @@ var customComponent = function customComponent(component) {
     });
   }, _utils.mapSize, _utils.mapStatus, _utils.mapDataSource));
 };
+
 exports.customComponent = customComponent;

package/lib/form/ProForm/index.js

@@ -1,37 +1,64 @@
 "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 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,
@@ -63,39 +90,41 @@ 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;
-  var mergedScope = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, context), globalScope), scope), {}, {
-    context: context
-  });
+      globalComponents = _ref2.components,
+      globalScope = _ref2.scope;
+
   var form = (0, _react.useMemo)(function () {
-    var nextForm = outerForm || (0, _core.createForm)({
+    return 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 prefixCls = (0, _utils.usePrefixCls)('teamix-pro-form'); // 由于Actions需要，解构context供使用。原context键名的上下文继续保留。
+
+  var mergedScope = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, context), globalScope), scope), {}, {
+    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
@@ -111,8 +140,8 @@ 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 无法监听具体变化字段
@@ -128,6 +157,7 @@ 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);
         });
       });

package/lib/form/ProForm/useAutoLayout.js

@@ -4,50 +4,67 @@ 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
           }
@@ -58,13 +75,19 @@ 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 值
+
       setAutoCol({
         labelCol: expectedCol,
         wrapperCol: wrapperCol
@@ -75,8 +98,8 @@ 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],
@@ -96,5 +119,6 @@ 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,13 +4,20 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+
+var _reactRouterDom = require("react-router-dom");
+
 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, _utils.useRealHistory)();
+    var history = (0, _reactRouterDom.useHistory)();
     var submitConfig = onSubmit;
     return function (values) {
       return (0, _utils.doCommonRequest)(_objectSpread(_objectSpread({
@@ -22,7 +29,9 @@ var useAutoSubmit = function useAutoSubmit(onSubmit, context) {
       }, context), history);
     };
   }
+
   return onSubmit;
 };
+
 var _default = useAutoSubmit;
 exports.default = _default;