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

package/lib/form/Filter/index2.js

@@ -1,54 +1,32 @@
 "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 _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 _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
@@ -63,17 +41,16 @@ var getEventProps = function getEventProps(triggerType, onFilter) {
   };
   return eventMap[triggerType];
 };
+
 /**
  * 简单筛选
  */
-
-
 var SimpleFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
-  var schema = props.schema,
-      triggerType = props.triggerType,
-      onFilter = props.onFilter,
-      otherProps = _objectWithoutProperties(props, _excluded);
-
+  var _ref = props,
+    schema = _ref.schema,
+    triggerType = _ref.triggerType,
+    onFilter = _ref.onFilter,
+    otherProps = _objectWithoutProperties(_ref, _excluded);
   var prefixCls = (0, _utils.usePrefixCls)('teamix-pro-form-filter-simple');
   var simpleSchema = (0, _react.useMemo)(function () {
     return [{
@@ -94,11 +71,11 @@ var SimpleFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
     }];
   }, [schema, triggerType]);
   var eventProps = getEventProps(triggerType, onFilter);
-  return /*#__PURE__*/_react.default.createElement(_ProForm.default, _objectSpread(_objectSpread(_objectSpread({
+  return /*#__PURE__*/_react.default.createElement(_ProForm.default, _extends({
     feedbackLayout: "popover",
     breakpoints: [],
     inset: true
-  }, otherProps), eventProps), {}, {
+  }, otherProps, eventProps, {
     className: (0, _utils.cls)(prefixCls(), props.className),
     schema: simpleSchema
   }));
@@ -107,23 +84,24 @@ exports.SimpleFilter = SimpleFilter;
 SimpleFilter.defaultProps = {
   triggerType: 'change'
 };
+
 /**
  * 高级筛选
  */
-
 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;
+  var _ref2 = props,
+    schema = _ref2.schema,
+    triggerType = _ref2.triggerType,
+    onFilter = _ref2.onFilter,
+    onReset = _ref2.onReset,
+    layout = _ref2.layout,
+    labelAlign = _ref2.labelAlign,
+    wrapperAlign = _ref2.wrapperAlign,
+    labelCol = _ref2.labelCol,
+    wrapperCol = _ref2.wrapperCol;
   var prefixCls = (0, _utils.usePrefixCls)('teamix-pro-form-filter-advanced');
   var gridSchema = (0, _react.useMemo)(function () {
     return [{
@@ -180,9 +158,9 @@ var AdvancedFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
     };
   }, [layout, labelAlign, wrapperAlign, labelCol, wrapperCol]);
   var eventProps = getEventProps(triggerType, onFilter);
-  return /*#__PURE__*/_react.default.createElement(_ProForm.default, _objectSpread(_objectSpread(_objectSpread(_objectSpread({
+  return /*#__PURE__*/_react.default.createElement(_ProForm.default, _extends({
     feedbackLayout: "popover"
-  }, props), eventProps), getTeamixLayout), {}, {
+  }, props, eventProps, getTeamixLayout, {
     form: form,
     className: (0, _utils.cls)(prefixCls(), props.className),
     schema: gridSchema,

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 1 auto;
+    flex: 0 0 auto;
     margin-left: 8px;
   }
   .#{$query-filter-layout}-panel {

package/lib/form/Filter/useBindUrl.js

@@ -4,54 +4,36 @@ 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('|')) : '';
             });
           }
@@ -59,71 +41,60 @@ 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,36 +4,30 @@ 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,
@@ -41,6 +35,5 @@ var useSpecialProps = function useSpecialProps(props) {
     hasRequired: hasRequired
   };
 };
-
 var _default = useSpecialProps;
 exports.default = _default;

package/lib/form/ProForm/addCascadeEffect.js

@@ -0,0 +1,210 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _core = require("@formily/core");
+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 OP_MAPS = {
+  '*': function _() {
+    return true;
+  },
+  '=': function _(l, r) {
+    return l === r;
+  },
+  '==': function _(l, r) {
+    return l === r;
+  },
+  '!': function _(l, r) {
+    return l !== r;
+  },
+  '!=': function _(l, r) {
+    return l != r;
+  },
+  '>': function _(l, r) {
+    return l > r;
+  },
+  '<': function _(l, r) {
+    return l < r;
+  },
+  '>=': function _(l, r) {
+    return l >= r;
+  },
+  '<=': function _(l, r) {
+    return l <= r;
+  },
+  ied: function ied(l, r) {
+    if (Array.isArray(l) || typeof l === 'string' && r) {
+      return l.includes(r);
+    } else {
+      return false;
+    }
+  },
+  eed: function eed(l, r) {
+    if (Array.isArray(l) || typeof l === 'string' && r) {
+      return !l.includes(r);
+    } else {
+      return true;
+    }
+  },
+  i: function i(l, r) {
+    if (Array.isArray(r) || typeof r === 'string' && l) {
+      return r.includes(l);
+    } else {
+      return false;
+    }
+  },
+  e: function e(l, r) {
+    if (Array.isArray(r) || typeof r === 'string' && l) {
+      return !r.includes(l);
+    } else {
+      return true;
+    }
+  },
+  isEmpty: function isEmpty(l, r) {
+    return l === null || l === undefined || l === '' || Array.isArray(l) && l.length === 0;
+  },
+  notEmpty: function notEmpty(l, r) {
+    return l !== null && l !== undefined && l !== '' && (!Array.isArray(l) || l.length !== 0);
+  }
+};
+var getParsedValue = function getParsedValue(value, scope) {
+  if (typeof value === 'string' && value.startsWith('${') && value.endsWith('}')) {
+    return scope.$form.getValuesIn(value.slice(2, value.length - 1));
+  } else if (typeof value === 'string' && value.startsWith('{{') && value.endsWith('}}')) {
+    var code = value.slice(2, value.length - 2);
+    try {
+      return new Function("with(this){ return ".concat(code, " }")).call(scope);
+    } catch (e) {
+      return undefined;
+    }
+  } else {
+    return value;
+  }
+};
+var bingo = function bingo(bingoItem, scope) {
+  var _bingoItem$when = bingoItem.when,
+    when = _bingoItem$when === void 0 ? [] : _bingoItem$when,
+    _bingoItem$logic = bingoItem.logic,
+    logic = _bingoItem$logic === void 0 ? '&&' : _bingoItem$logic;
+  var result = logic === '&&';
+  when.forEach(function (_ref) {
+    var left = _ref.left,
+      op = _ref.op,
+      right = _ref.right;
+    var leftValue = scope.$form.getValuesIn(left);
+    var rightValue = getParsedValue(right, scope);
+    var itemResult = OP_MAPS[op](leftValue, rightValue);
+    if (logic === '&&') {
+      result = result && itemResult;
+    } else {
+      result = result || itemResult;
+    }
+  });
+  return result;
+};
+var loopAddFieldEffect = function loopAddFieldEffect(schema, form, scope) {
+  if (Array.isArray(schema)) {
+    schema === null || schema === void 0 ? void 0 : schema.forEach(function (item) {
+      if (item.name) {
+        var _item$cascade, _item$onChange;
+        (_item$cascade = item.cascade) === null || _item$cascade === void 0 ? void 0 : _item$cascade.forEach(function (cascade) {
+          (0, _core.onFieldReact)(item.name, function (field) {
+            var contextScope = _objectSpread(_objectSpread({}, scope), {}, {
+              $form: form,
+              $self: field,
+              $values: form.values
+            });
+            var _cascade$state = cascade.state,
+              state = _cascade$state === void 0 ? {} : _cascade$state,
+              _cascade$props = cascade.props,
+              props = _cascade$props === void 0 ? {} : _cascade$props,
+              dataSourceFilter = cascade.dataSourceFilter,
+              dataSourceHide = cascade.dataSourceHide;
+            if (bingo(cascade, contextScope)) {
+              if (dataSourceFilter || dataSourceHide) {
+                var sourceDataSource = field.getState()._sourceDataSource;
+                if (!sourceDataSource) {
+                  var dataSource = field.getState().dataSource;
+                  field.setState({
+                    _sourceDataSource: dataSource
+                  });
+                  sourceDataSource = dataSource;
+                }
+                if (sourceDataSource) {
+                  var nextDataSource = sourceDataSource.filter(function (item) {
+                    if (Array.isArray(dataSourceFilter)) {
+                      return dataSourceFilter.includes(item.value);
+                    }
+                    if (Array.isArray(dataSourceHide)) {
+                      return !dataSourceFilter.includes(item.value);
+                    }
+                  });
+                  field.setDataSource(nextDataSource);
+                  var value = field.getState().value;
+                  if (!nextDataSource.some(function (item) {
+                    return item.value === value;
+                  })) {
+                    field.setValue(undefined);
+                  }
+                }
+              }
+              var nextState = {};
+              Object.keys(state).forEach(function (stateKey) {
+                nextState[stateKey] = getParsedValue(state[stateKey], contextScope);
+              });
+              field.setState(nextState);
+              var nextProps = {};
+              Object.keys(props).forEach(function (propsKey) {
+                nextProps[propsKey] = getParsedValue(props[propsKey], contextScope);
+              });
+              field.setComponentProps(nextProps);
+            } else {
+              var formState = form.getState();
+              if (dataSourceFilter || dataSourceHide) {
+                var _sourceDataSource = field.getState()._sourceDataSource;
+                _sourceDataSource && field.setDataSource(_sourceDataSource);
+              }
+              var _nextState = {};
+              Object.keys(state).forEach(function (stateKey) {
+                _nextState[stateKey] = stateKey in item ? item[stateKey] : formState[stateKey];
+              });
+              field.setState(_nextState);
+              var _nextProps = {};
+              Object.keys(props).forEach(function (propsKey) {
+                _nextProps[propsKey] = item.props ? item.props[propsKey] : undefined;
+              });
+              field.setComponentProps(_nextProps);
+            }
+          });
+        });
+        (_item$onChange = item.onChange) === null || _item$onChange === void 0 ? void 0 : _item$onChange.forEach(function (onChange) {
+          (0, _core.onFieldValueChange)(item.name, function (field) {
+            var contextScope = _objectSpread(_objectSpread({}, scope), {}, {
+              $form: form,
+              $self: field,
+              $values: form.values
+            });
+            var values = onChange.values;
+            if (bingo(onChange, contextScope)) {
+              Object.keys(values).forEach(function (valuesKey) {
+                form.setValuesIn(valuesKey, getParsedValue(values[valuesKey], contextScope));
+              });
+            }
+          });
+        });
+      } else if (item.children) {
+        loopAddFieldEffect(item.children, form, scope);
+      }
+    });
+  }
+};
+var _default = function _default(form, schema, scope) {
+  form.addEffects('cascade', function () {
+    loopAddFieldEffect(schema, form, scope);
+  });
+};
+exports.default = _default;

package/lib/form/ProForm/customComponent.js

@@ -4,19 +4,12 @@ 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), {}, {
@@ -26,5 +19,4 @@ var customComponent = function customComponent(component) {
     });
   }, _utils.mapSize, _utils.mapStatus, _utils.mapDataSource));
 };
-
 exports.customComponent = customComponent;