@teamix/pro 1.4.24 → 1.4.25-bugfix.2

package/es/form/SchemaForm/initializeRequest.js

@@ -1,29 +1,18 @@
 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 _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; }
-
 import { isArr } from '@teamix/utils';
 import { initializeRequestExpression } from '../utils';
-
 var initializeItem = function initializeItem(request, suffix) {
   var _initializeRequestExp = initializeRequestExpression(request, '$common', suffix),
-      expression = _initializeRequestExp.expression,
-      scope = _initializeRequestExp.scope;
-
+    expression = _initializeRequestExp.expression,
+    scope = _initializeRequestExp.scope;
   return expression ? {
     reactions: [expression],
     scope: scope
@@ -32,7 +21,6 @@ var initializeItem = function initializeItem(request, suffix) {
     scope: {}
   };
 };
-
 var initializeRequest = function initializeRequest(request, suffix) {
   if (isArr(request)) {
     return request.reduce(function (prev, current, index) {
@@ -45,8 +33,6 @@ var initializeRequest = function initializeRequest(request, suffix) {
       scope: {}
     });
   }
-
   return initializeItem(request, suffix);
 };
-
 export default initializeRequest;

package/es/form/SchemaForm/initializeRules.js

@@ -1,39 +1,24 @@
 var _excluded = ["validator"];
-
 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 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; }
-
 import { isArr } from '@teamix/utils';
 import { initializeRequestExpression } from '../utils';
-
 var initializeRule = function initializeRule(rule, suffix) {
   var _ref = rule || {},
-      validator = _ref.validator,
-      rest = _objectWithoutProperties(_ref, _excluded);
-
+    validator = _ref.validator,
+    rest = _objectWithoutProperties(_ref, _excluded);
   var _initializeRequestExp = initializeRequestExpression(validator, '$validator', suffix),
-      expression = _initializeRequestExp.expression,
-      scope = _initializeRequestExp.scope;
-
+    expression = _initializeRequestExp.expression,
+    scope = _initializeRequestExp.scope;
   return expression ? {
     scope: scope,
     rules: _objectSpread({
@@ -44,7 +29,6 @@ var initializeRule = function initializeRule(rule, suffix) {
     rules: rule
   };
 };
-
 var initializeRules = function initializeRules(rules, suffix) {
   if (isArr(rules)) {
     return rules.reduce(function (prev, current, index) {
@@ -57,8 +41,6 @@ var initializeRules = function initializeRules(rules, suffix) {
       scope: {}
     });
   }
-
   return initializeRule(rules, suffix);
 };
-
 export default initializeRules;

package/es/form/SchemaForm/initializeSelectTable.js

@@ -1,27 +1,15 @@
 var _excluded = ["name", "children", "props"];
-
 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; }
-
 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 { usePrefixCls, cls, isStr, isPlainObj, isArr } from '@teamix/utils';
 import pureGenProColumnToColumn from '../../table/utils/pureGenProColumnToColumn';
 /**
@@ -29,45 +17,36 @@ import pureGenProColumnToColumn from '../../table/utils/pureGenProColumnToColumn
  * @param value
  * @returns
  */
-
 var adapterContext = function adapterContext(value) {
   if (isStr(value)) {
     var contextReg = /^\{\{.*?\}\}$/;
-
     if (contextReg.test(value)) {
       return "\0".concat(value, "\0");
     }
-
     return value;
   }
-
   if (isPlainObj(value)) {
     var temp = {};
     Object.entries(value).forEach(function (_ref) {
       var _ref2 = _slicedToArray(_ref, 2),
-          key = _ref2[0],
-          val = _ref2[1];
-
+        key = _ref2[0],
+        val = _ref2[1];
       temp[key] = adapterContext(val);
     });
     return temp;
   }
-
   if (isArr(value)) {
     return value.map(function (item) {
       return adapterContext(item);
     });
   }
-
   return value;
 };
-
 var initializeTableColumn = function initializeTableColumn(item) {
   var name = item.name,
-      children = item.children,
-      props = item.props,
-      otherProps = _objectWithoutProperties(item, _excluded);
-
+    children = item.children,
+    props = item.props,
+    otherProps = _objectWithoutProperties(item, _excluded);
   return {
     name: name,
     component: 'SelectTable.Column',
@@ -77,23 +56,19 @@ var initializeTableColumn = function initializeTableColumn(item) {
     props: _objectSpread(_objectSpread({}, otherProps), props)
   };
 };
-
 var initialize = function initialize(item) {
   var _props$columns;
-
   var _item$children = item.children,
-      children = _item$children === void 0 ? [] : _item$children,
-      props = item.props;
+    children = _item$children === void 0 ? [] : _item$children,
+    props = item.props;
   var prefixCls = usePrefixCls('teamix-pro-form-select-table-column-tree');
   var columns = props === null || props === void 0 ? void 0 : (_props$columns = props.columns) === null || _props$columns === void 0 ? void 0 : _props$columns.map(function (value, index) {
     var column = adapterContext(value);
-
     if ((props === null || props === void 0 ? void 0 : props.isTree) && index === 0) {
       return _objectSpread(_objectSpread({}, column), {}, {
         className: cls(prefixCls(), column.className)
       });
     }
-
     return column;
   });
   return _objectSpread(_objectSpread({}, item), {}, {
@@ -105,5 +80,4 @@ var initialize = function initialize(item) {
     })
   });
 };
-
 export default initialize;

package/es/form/SchemaForm/reactions.js

@@ -1,37 +1,28 @@
 var _excluded = ["extraConfig", "onComplete"];
-
 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; }
-
-import { isFn, isPlainObj, doCommonRequest, getValueByValue } from '@teamix/utils'; // 配置请求
-
+import { isFn, isPlainObj, doCommonRequest, getValueByValue } from '@teamix/utils';
+// 配置请求
 var $request = function $request(field, context, _ref, type) {
   var _field$data;
-
   var extraConfig = _ref.extraConfig,
-      onComplete = _ref.onComplete,
-      rest = _objectWithoutProperties(_ref, _excluded);
-
+    onComplete = _ref.onComplete,
+    rest = _objectWithoutProperties(_ref, _excluded);
   var requestConfig = rest;
   var params = requestConfig.params,
-      beforeRequest = requestConfig.beforeRequest,
-      formatResult = requestConfig.formatResult,
-      onSuccess = requestConfig.onSuccess;
-  var beforeRequestResult = isFn(beforeRequest) ? beforeRequest(field, context) : {}; // 通过字段 data 的 refresh 主动触发的请求刷新
-
+    beforeRequest = requestConfig.beforeRequest,
+    formatResult = requestConfig.formatResult,
+    onSuccess = requestConfig.onSuccess;
+  var beforeRequestResult = isFn(beforeRequest) ? beforeRequest(field, context) : {};
+  // 通过字段 data 的 refresh 主动触发的请求刷新
   var refresh = (_field$data = field.data) === null || _field$data === void 0 ? void 0 : _field$data.refresh;
-  var refreshResult = isPlainObj(refresh) ? refresh : {}; // 合并请求参数
-
-  var mergedParams = _objectSpread(_objectSpread(_objectSpread({}, params), beforeRequestResult), refreshResult); // 执行通用数据请求
-
-
+  var refreshResult = isPlainObj(refresh) ? refresh : {};
+  // 合并请求参数
+  var mergedParams = _objectSpread(_objectSpread(_objectSpread({}, params), beforeRequestResult), refreshResult);
+  // 执行通用数据请求
   return doCommonRequest(_objectSpread(_objectSpread({}, requestConfig), {}, {
     params: mergedParams,
     beforeRequest: function beforeRequest() {
@@ -47,20 +38,17 @@ var $request = function $request(field, context, _ref, type) {
     field: field,
     params: mergedParams
   }));
-}; // 通用请求配置上下文
-
-
+};
+// 通用请求配置上下文
 var $common = function $common(services, context, requestConfig) {
   return function (field) {
     return services(field, context, requestConfig, 'request').then(function (res) {
       var _requestConfig$onComp;
-
       return requestConfig === null || requestConfig === void 0 ? void 0 : (_requestConfig$onComp = requestConfig.onComplete) === null || _requestConfig$onComp === void 0 ? void 0 : _requestConfig$onComp.call(requestConfig, res, field, context);
     });
   };
-}; // 配置校验
-
-
+};
+// 配置校验
 var $validator = function $validator(services, context, requestConfig) {
   return function (value, rules, _ref2) {
     var field = _ref2.field;
@@ -72,9 +60,8 @@ var $validator = function $validator(services, context, requestConfig) {
       }
     });
   };
-}; // 配置DataSource
-
-
+};
+// 配置DataSource
 var $dataSource = function $dataSource(services, context, requestConfig) {
   return function (field) {
     field.setState({
@@ -82,7 +69,6 @@ var $dataSource = function $dataSource(services, context, requestConfig) {
     });
     return services(field, context, requestConfig, 'dataSource').then(function (res) {
       var _requestConfig$extraC, _requestConfig$onComp2;
-
       var isValueInDataSource = getValueByValue(res, field.value);
       var clearResult = !isValueInDataSource && (requestConfig === null || requestConfig === void 0 ? void 0 : (_requestConfig$extraC = requestConfig.extraConfig) === null || _requestConfig$extraC === void 0 ? void 0 : _requestConfig$extraC.clearInvalidValue) !== false ? {
         value: undefined
@@ -99,5 +85,4 @@ var $dataSource = function $dataSource(services, context, requestConfig) {
     });
   };
 };
-
 export { $request, $common, $dataSource, $validator };

package/es/form/docs/ActionResponse.d.ts

@@ -2,6 +2,7 @@ import React from 'react';
 import './ActionResponse.less';
 declare type ActionResponseProps = {
     response?: React.ReactNode;
+    children?: React.ReactNode;
 };
 export declare const ActionResponse: React.FC<ActionResponseProps>;
 export {};

package/es/form/index.d.ts

@@ -32,43 +32,45 @@ declare const formilyReact: {
     };
     RecursionField: originalFormilyReact.ReactFC<originalFormilyReact.IRecursionFieldProps>;
     ExpressionScope: originalFormilyReact.ReactFC<originalFormilyReact.IExpressionScopeProps>;
+    RecordsScope: originalFormilyReact.ReactFC<originalFormilyReact.IRecordsScopeProps>;
+    RecordScope: originalFormilyReact.ReactFC<originalFormilyReact.IRecordScopeProps>;
     createSchemaField<Components extends originalFormilyReact.SchemaReactComponents>(options?: originalFormilyReact.ISchemaFieldReactFactoryOptions<Components> | undefined): {
         <Decorator extends originalFormilyReact.JSXComponent, Component extends originalFormilyReact.JSXComponent>(props: originalFormilyReact.ISchemaFieldProps<Decorator, Component, import("@formily/core").ObjectField<Decorator, Component>>): JSX.Element;
         displayName: string;
         Markup: {
-            <Decorator_1 extends originalFormilyReact.ReactComponentPath<Components, Exclude<keyof Components, "displayName" | "defaultProps" | "propTypes" | "contextTypes">>, Component_1 extends originalFormilyReact.ReactComponentPath<Components, Exclude<keyof Components, "displayName" | "defaultProps" | "propTypes" | "contextTypes">>>(props: originalFormilyReact.ISchemaMarkupFieldProps<Components, Component_1, Decorator_1>): JSX.Element;
+            <Decorator_1 extends originalFormilyReact.ReactComponentPath<Components, Exclude<keyof Components, "displayName" | "propTypes" | "contextTypes" | "defaultProps">>, Component_1 extends originalFormilyReact.ReactComponentPath<Components, Exclude<keyof Components, "displayName" | "propTypes" | "contextTypes" | "defaultProps">>>(props: originalFormilyReact.ISchemaMarkupFieldProps<Components, Component_1, Decorator_1>): JSX.Element;
             displayName: string;
         };
         String: {
-            <Decorator_2 extends originalFormilyReact.ReactComponentPath<Components, Exclude<keyof Components, "displayName" | "defaultProps" | "propTypes" | "contextTypes">>, Component_2 extends originalFormilyReact.ReactComponentPath<Components, Exclude<keyof Components, "displayName" | "defaultProps" | "propTypes" | "contextTypes">>>(props: originalFormilyReact.ISchemaTypeFieldProps<Components, Component_2, Decorator_2>): JSX.Element;
+            <Decorator_2 extends originalFormilyReact.ReactComponentPath<Components, Exclude<keyof Components, "displayName" | "propTypes" | "contextTypes" | "defaultProps">>, Component_2 extends originalFormilyReact.ReactComponentPath<Components, Exclude<keyof Components, "displayName" | "propTypes" | "contextTypes" | "defaultProps">>>(props: originalFormilyReact.ISchemaTypeFieldProps<Components, Component_2, Decorator_2>): JSX.Element;
             displayName: string;
         };
         Object: {
-            <Decorator_3 extends originalFormilyReact.ReactComponentPath<Components, Exclude<keyof Components, "displayName" | "defaultProps" | "propTypes" | "contextTypes">>, Component_3 extends originalFormilyReact.ReactComponentPath<Components, Exclude<keyof Components, "displayName" | "defaultProps" | "propTypes" | "contextTypes">>>(props: originalFormilyReact.ISchemaTypeFieldProps<Components, Component_3, Decorator_3>): JSX.Element;
+            <Decorator_3 extends originalFormilyReact.ReactComponentPath<Components, Exclude<keyof Components, "displayName" | "propTypes" | "contextTypes" | "defaultProps">>, Component_3 extends originalFormilyReact.ReactComponentPath<Components, Exclude<keyof Components, "displayName" | "propTypes" | "contextTypes" | "defaultProps">>>(props: originalFormilyReact.ISchemaTypeFieldProps<Components, Component_3, Decorator_3>): JSX.Element;
             displayName: string;
         };
         Array: {
-            <Decorator_4 extends originalFormilyReact.ReactComponentPath<Components, Exclude<keyof Components, "displayName" | "defaultProps" | "propTypes" | "contextTypes">>, Component_4 extends originalFormilyReact.ReactComponentPath<Components, Exclude<keyof Components, "displayName" | "defaultProps" | "propTypes" | "contextTypes">>>(props: originalFormilyReact.ISchemaTypeFieldProps<Components, Component_4, Decorator_4>): JSX.Element;
+            <Decorator_4 extends originalFormilyReact.ReactComponentPath<Components, Exclude<keyof Components, "displayName" | "propTypes" | "contextTypes" | "defaultProps">>, Component_4 extends originalFormilyReact.ReactComponentPath<Components, Exclude<keyof Components, "displayName" | "propTypes" | "contextTypes" | "defaultProps">>>(props: originalFormilyReact.ISchemaTypeFieldProps<Components, Component_4, Decorator_4>): JSX.Element;
             displayName: string;
         };
         Boolean: {
-            <Decorator_5 extends originalFormilyReact.ReactComponentPath<Components, Exclude<keyof Components, "displayName" | "defaultProps" | "propTypes" | "contextTypes">>, Component_5 extends originalFormilyReact.ReactComponentPath<Components, Exclude<keyof Components, "displayName" | "defaultProps" | "propTypes" | "contextTypes">>>(props: originalFormilyReact.ISchemaTypeFieldProps<Components, Component_5, Decorator_5>): JSX.Element;
+            <Decorator_5 extends originalFormilyReact.ReactComponentPath<Components, Exclude<keyof Components, "displayName" | "propTypes" | "contextTypes" | "defaultProps">>, Component_5 extends originalFormilyReact.ReactComponentPath<Components, Exclude<keyof Components, "displayName" | "propTypes" | "contextTypes" | "defaultProps">>>(props: originalFormilyReact.ISchemaTypeFieldProps<Components, Component_5, Decorator_5>): JSX.Element;
             displayName: string;
         };
         Date: {
-            <Decorator_6 extends originalFormilyReact.ReactComponentPath<Components, Exclude<keyof Components, "displayName" | "defaultProps" | "propTypes" | "contextTypes">>, Component_6 extends originalFormilyReact.ReactComponentPath<Components, Exclude<keyof Components, "displayName" | "defaultProps" | "propTypes" | "contextTypes">>>(props: originalFormilyReact.ISchemaTypeFieldProps<Components, Component_6, Decorator_6>): JSX.Element;
+            <Decorator_6 extends originalFormilyReact.ReactComponentPath<Components, Exclude<keyof Components, "displayName" | "propTypes" | "contextTypes" | "defaultProps">>, Component_6 extends originalFormilyReact.ReactComponentPath<Components, Exclude<keyof Components, "displayName" | "propTypes" | "contextTypes" | "defaultProps">>>(props: originalFormilyReact.ISchemaTypeFieldProps<Components, Component_6, Decorator_6>): JSX.Element;
             displayName: string;
         };
         DateTime: {
-            <Decorator_7 extends originalFormilyReact.ReactComponentPath<Components, Exclude<keyof Components, "displayName" | "defaultProps" | "propTypes" | "contextTypes">>, Component_7 extends originalFormilyReact.ReactComponentPath<Components, Exclude<keyof Components, "displayName" | "defaultProps" | "propTypes" | "contextTypes">>>(props: originalFormilyReact.ISchemaTypeFieldProps<Components, Component_7, Decorator_7>): JSX.Element;
+            <Decorator_7 extends originalFormilyReact.ReactComponentPath<Components, Exclude<keyof Components, "displayName" | "propTypes" | "contextTypes" | "defaultProps">>, Component_7 extends originalFormilyReact.ReactComponentPath<Components, Exclude<keyof Components, "displayName" | "propTypes" | "contextTypes" | "defaultProps">>>(props: originalFormilyReact.ISchemaTypeFieldProps<Components, Component_7, Decorator_7>): JSX.Element;
             displayName: string;
         };
         Void: {
-            <Decorator_8 extends originalFormilyReact.ReactComponentPath<Components, Exclude<keyof Components, "displayName" | "defaultProps" | "propTypes" | "contextTypes">>, Component_8 extends originalFormilyReact.ReactComponentPath<Components, Exclude<keyof Components, "displayName" | "defaultProps" | "propTypes" | "contextTypes">>>(props: originalFormilyReact.ISchemaTypeFieldProps<Components, Component_8, Decorator_8>): JSX.Element;
+            <Decorator_8 extends originalFormilyReact.ReactComponentPath<Components, Exclude<keyof Components, "displayName" | "propTypes" | "contextTypes" | "defaultProps">>, Component_8 extends originalFormilyReact.ReactComponentPath<Components, Exclude<keyof Components, "displayName" | "propTypes" | "contextTypes" | "defaultProps">>>(props: originalFormilyReact.ISchemaTypeFieldProps<Components, Component_8, Decorator_8>): JSX.Element;
             displayName: string;
         };
         Number: {
-            <Decorator_9 extends originalFormilyReact.ReactComponentPath<Components, Exclude<keyof Components, "displayName" | "defaultProps" | "propTypes" | "contextTypes">>, Component_9 extends originalFormilyReact.ReactComponentPath<Components, Exclude<keyof Components, "displayName" | "defaultProps" | "propTypes" | "contextTypes">>>(props: originalFormilyReact.ISchemaTypeFieldProps<Components, Component_9, Decorator_9>): JSX.Element;
+            <Decorator_9 extends originalFormilyReact.ReactComponentPath<Components, Exclude<keyof Components, "displayName" | "propTypes" | "contextTypes" | "defaultProps">>, Component_9 extends originalFormilyReact.ReactComponentPath<Components, Exclude<keyof Components, "displayName" | "propTypes" | "contextTypes" | "defaultProps">>>(props: originalFormilyReact.ISchemaTypeFieldProps<Components, Component_9, Decorator_9>): JSX.Element;
             displayName: string;
         };
     };
@@ -98,6 +100,7 @@ declare const formilyReact: {
     useParentForm: () => import("@formily/core").Form<any> | import("@formily/core").ObjectField<any, any>;
     useFieldSchema: () => originalFormilyReact.Schema<any, any, any, any, any, any, any, any, any>;
     useFormEffects: (effects?: ((form: import("@formily/core").Form<any>) => void) | undefined) => void;
+    useExpressionScope: () => any;
 };
 import { customComponent } from './ProForm/customComponent';
 export { formilyReact, customComponent };

package/es/form/index.js

@@ -1,9 +1,6 @@
 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; }
-
 /**
  * 导出ProForm的TS
  */
@@ -11,7 +8,6 @@ export * from './typing';
 /**
  * 使用别名导出formily相关内容
  */
-
 import * as _formilyCore from '@formily/core';
 export { _formilyCore as formilyCore };
 import * as _formilyReactive from '@formily/reactive';
@@ -21,18 +17,15 @@ export { _formilyTeamix as formilyTeamix };
 import * as originalFormilyReact from '@formily/react';
 import { useFormDisplayValues } from './ProForm/useFormDisplayValues';
 import useFieldRequest from './ProForm/useFieldRequest';
-
 var formilyReact = _objectSpread(_objectSpread({}, originalFormilyReact), {}, {
   useFieldRequest: useFieldRequest,
   useFormDisplayValues: useFormDisplayValues
 });
-
 import { customComponent } from './ProForm/customComponent';
 export { formilyReact, customComponent };
 /**
  * 导出常用formily内容
  */
-
 import { createForm, registerValidateRules as registerRules, registerValidateFormats as registerFormats, registerValidateLocale, setValidateLanguage } from '@formily/core';
 import { FormConsumer, useForm } from '@formily/react';
 import { FormDialog, FormDrawer, FormStep, FormTab, FormCollapse } from '@teamix/formily';
@@ -40,7 +33,6 @@ export { createForm, FormConsumer, FormDialog, FormDrawer, FormStep, FormTab, Fo
 /**
  * 导出 Filter 组件
  */
-
 import { QueryFilter } from './Filter';
 import { QueryFilterLayout } from './Filter/Layout';
 import { AdvancedFilter, SimpleFilter } from './Filter/index2';
@@ -48,6 +40,5 @@ export { QueryFilter, QueryFilterLayout, AdvancedFilter, SimpleFilter };
 /**
  * 导出 ProForm 组件，支持快速搭建表单
  */
-
 import ProForm from './ProForm';
 export default ProForm;

package/es/form/typing.d.ts

@@ -34,6 +34,24 @@ export interface ProFormRequestConfig extends Omit<ProFormCommonRequestConfig, '
     extraConfig?: AnyObject;
     onComplete?: (res?: any, field?: any, context?: any) => any;
 }
+export interface CascadeWhen {
+    left: string;
+    op: string;
+    right: any;
+}
+export interface Cascade {
+    when: CascadeWhen[];
+    logic?: '||' | '&&';
+    props?: any;
+    state?: any;
+    dataSourceFilter?: any[];
+    dataSourceHide?: any[];
+}
+export interface OnChange {
+    when: CascadeWhen[];
+    logic?: '||' | '&&';
+    values: any;
+}
 export interface ProFormSchemaItem {
     type?: string;
     name?: string;
@@ -61,6 +79,8 @@ export interface ProFormSchemaItem {
     default?: any;
     request?: ProFormRequestConfig | ProFormRequestConfig[];
     data?: AnyObject;
+    cascade?: Cascade[];
+    onChange?: OnChange[];
 }
 export declare type ProFormSchema = ProFormSchemaItem[];
 interface AutoLayout {
@@ -86,6 +106,7 @@ export interface ProFormProps extends Omit<IFormLayoutProps, 'breakpoints'> {
     onInitialComplete?: (form: FormType) => void;
     breakpoints?: number[] | boolean;
     autoLayout?: AutoLayout | boolean;
+    component?: any;
 }
 export interface FilterProps extends ProFormProps {
     form: FormType;
@@ -98,13 +119,14 @@ export interface FilterProps extends ProFormProps {
 export interface QueryFilterLayoutProps {
     prefixCls?: string;
     className?: string;
-    addonBefore?: ReactNode;
-    addonAfter?: ReactNode;
+    addonBefore?: ReactNode | any;
+    addonAfter?: ReactNode | any;
     inlineContent?: ReactNode;
     panelContent?: ReactNode;
     count?: number;
     expand?: boolean;
     onExpand?: (expand: boolean) => void;
+    children?: React.ReactNode;
 }
 export interface QueryFilterProps extends ProFormProps {
     /**
@@ -121,9 +143,9 @@ export interface QueryFilterProps extends ProFormProps {
     /** 是否强制清除 */
     forceClear?: boolean;
     /** 顶部筛选区前缀 */
-    addonBefore?: ReactNode;
+    addonBefore?: ReactNode | any;
     /** 顶部筛选区后缀 */
-    addonAfter?: ReactNode;
+    addonAfter?: ReactNode | any;
     /** 顶部筛选区默认筛选项 */
     defaultFilterValue?: string;
     /** 顶部筛选区筛选项配置 */

package/es/form/utils.d.ts

@@ -43,7 +43,7 @@ declare const mergeArrayValue: (arr: any[], v?: any) => any[];
  * @param suffix scope名称后缀
  * @returns 表达式和scope上下文
  */
-declare const initializeRequestExpression: (config?: any, mode?: string | undefined, suffix?: string | undefined) => {
+declare const initializeRequestExpression: (config?: any, mode?: string, suffix?: string) => {
     expression: string;
     scope: {
         [x: string]: object;