@teamix/pro 1.5.3 → 1.5.4-beta.1

package/lib/form/SchemaForm/initializeSelectTable.js

@@ -4,37 +4,21 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _utils = require("@teamix/utils");
-
 var _pureGenProColumnToColumn = _interopRequireDefault(require("../../table/utils/pureGenProColumnToColumn"));
-
 var _excluded = ["name", "children", "props"];
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 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; }
-
 /**
  * 将可被 ProForm 识别的上下文转换为仅被 ProTable 识别的上下文
  * @param value
@@ -43,41 +27,33 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 var adapterContext = function adapterContext(value) {
   if ((0, _utils.isStr)(value)) {
     var contextReg = /^\{\{.*?\}\}$/;
-
     if (contextReg.test(value)) {
       return "\0".concat(value, "\0");
     }
-
     return value;
   }
-
   if ((0, _utils.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 ((0, _utils.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',
@@ -87,23 +63,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 = (0, _utils.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: (0, _utils.cls)(prefixCls(), column.className)
       });
     }
-
     return column;
   });
   return _objectSpread(_objectSpread({}, item), {}, {
@@ -115,6 +87,5 @@ var initialize = function initialize(item) {
     })
   });
 };
-
 var _default = initialize;
 exports.default = _default;

package/lib/form/SchemaForm/reactions.js

@@ -4,42 +4,31 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.$validator = exports.$request = exports.$dataSource = exports.$common = void 0;
-
 var _utils = require("@teamix/utils");
-
 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; }
-
 // 配置请求
 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 = (0, _utils.isFn)(beforeRequest) ? beforeRequest(field, context) : {}; // 通过字段 data 的 refresh 主动触发的请求刷新
-
+    beforeRequest = requestConfig.beforeRequest,
+    formatResult = requestConfig.formatResult,
+    onSuccess = requestConfig.onSuccess;
+  var beforeRequestResult = (0, _utils.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 = (0, _utils.isPlainObj)(refresh) ? refresh : {}; // 合并请求参数
-
-  var mergedParams = _objectSpread(_objectSpread(_objectSpread({}, params), beforeRequestResult), refreshResult); // 执行通用数据请求
-
-
+  var refreshResult = (0, _utils.isPlainObj)(refresh) ? refresh : {};
+  // 合并请求参数
+  var mergedParams = _objectSpread(_objectSpread(_objectSpread({}, params), beforeRequestResult), refreshResult);
+  // 执行通用数据请求
   return (0, _utils.doCommonRequest)(_objectSpread(_objectSpread({}, requestConfig), {}, {
     params: mergedParams,
     beforeRequest: function beforeRequest() {
@@ -55,24 +44,19 @@ var $request = function $request(field, context, _ref, type) {
     field: field,
     params: mergedParams
   }));
-}; // 通用请求配置上下文
-
-
+};
+// 通用请求配置上下文
 exports.$request = $request;
-
 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);
     });
   };
-}; // 配置校验
-
-
+};
+// 配置校验
 exports.$common = $common;
-
 var $validator = function $validator(services, context, requestConfig) {
   return function (value, rules, _ref2) {
     var field = _ref2.field;
@@ -84,11 +68,9 @@ var $validator = function $validator(services, context, requestConfig) {
       }
     });
   };
-}; // 配置DataSource
-
-
+};
+// 配置DataSource
 exports.$validator = $validator;
-
 var $dataSource = function $dataSource(services, context, requestConfig) {
   return function (field) {
     field.setState({
@@ -96,7 +78,6 @@ var $dataSource = function $dataSource(services, context, requestConfig) {
     });
     return services(field, context, requestConfig, 'dataSource').then(function (res) {
       var _requestConfig$extraC, _requestConfig$onComp2;
-
       var isValueInDataSource = (0, _utils.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
@@ -113,5 +94,4 @@ var $dataSource = function $dataSource(services, context, requestConfig) {
     });
   };
 };
-
 exports.$dataSource = $dataSource;

package/lib/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/lib/form/docs/ActionResponse.js

@@ -4,13 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ActionResponse = void 0;
-
 var _react = _interopRequireDefault(require("react"));
-
 require("./ActionResponse.less");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 var ActionResponse = function ActionResponse(props) {
   return /*#__PURE__*/_react.default.createElement("div", {
     className: "as-wrapper"
@@ -20,5 +16,4 @@ var ActionResponse = function ActionResponse(props) {
     className: "as-response"
   }, "Response\uFF1A", props.response));
 };
-
 exports.ActionResponse = ActionResponse;

package/lib/form/index.d.ts

@@ -38,39 +38,39 @@ declare const formilyReact: {
         <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;
         };
     };

package/lib/form/index.js

@@ -1,7 +1,6 @@
 "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
 });
@@ -131,9 +130,7 @@ Object.defineProperty(exports, "useForm", {
     return originalFormilyReact.useForm;
   }
 });
-
 var _typing = require("./typing");
-
 Object.keys(_typing).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
@@ -145,52 +142,30 @@ Object.keys(_typing).forEach(function (key) {
     }
   });
 });
-
 var _formilyCore = _interopRequireWildcard(require("@formily/core"));
-
 exports.formilyCore = _formilyCore;
-
 var _formilyReactive = _interopRequireWildcard(require("@formily/reactive"));
-
 exports.formilyReactive = _formilyReactive;
-
 var _formilyTeamix = _interopRequireWildcard(require("@teamix/formily"));
-
 exports.formilyTeamix = _formilyTeamix;
-
 var originalFormilyReact = _interopRequireWildcard(require("@formily/react"));
-
 var _useFormDisplayValues = require("./ProForm/useFormDisplayValues");
-
 var _useFieldRequest = _interopRequireDefault(require("./ProForm/useFieldRequest"));
-
 var _customComponent = require("./ProForm/customComponent");
-
 var _Filter = require("./Filter");
-
 var _Layout = require("./Filter/Layout");
-
 var _index = require("./Filter/index2");
-
 var _ProForm = _interopRequireDefault(require("./ProForm"));
-
 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; }
-
 var formilyReact = _objectSpread(_objectSpread({}, originalFormilyReact), {}, {
   useFieldRequest: _useFieldRequest.default,
   useFormDisplayValues: _useFormDisplayValues.useFormDisplayValues
 });
-
 exports.formilyReact = formilyReact;
 var _default = _ProForm.default;
 exports.default = _default;

package/lib/form/typing.d.ts

@@ -106,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;
@@ -118,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 {
     /**
@@ -141,9 +143,9 @@ export interface QueryFilterProps extends ProFormProps {
     /** 是否强制清除 */
     forceClear?: boolean;
     /** 顶部筛选区前缀 */
-    addonBefore?: ReactNode;
+    addonBefore?: ReactNode | any;
     /** 顶部筛选区后缀 */
-    addonAfter?: ReactNode;
+    addonAfter?: ReactNode | any;
     /** 顶部筛选区默认筛选项 */
     defaultFilterValue?: string;
     /** 顶部筛选区筛选项配置 */

package/lib/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;

package/lib/form/utils.js

@@ -4,43 +4,24 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.mergeArrayValue = exports.mapStatus = exports.mapSize = exports.mapSchemaName = exports.mapMode = exports.mapDataSource = exports.initializeRequestExpression = exports.getFieldName = void 0;
-
 var _core = require("@formily/core");
-
 var _formily = require("@teamix/formily");
-
 var _utils = require("@teamix/utils");
-
 var _schemaNameMap = _interopRequireDefault(require("./schemaNameMap"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
 function _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 _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; }
-
 /**
  * 映射字段size，主要是default转medium
  * @param props component的props
@@ -49,11 +30,9 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
  */
 var mapSize = function mapSize(props, field) {
   var layout = _objectSpread(_objectSpread({}, (0, _formily.useFormShallowLayout)()), (0, _formily.useFormLayout)());
-
   var takeSize = function takeSize() {
     return layout.size === 'default' ? 'medium' : layout.size;
   };
-
   return _objectSpread(_objectSpread({}, props), {}, {
     size: props.size || takeSize()
   });
@@ -64,84 +43,62 @@ var mapSize = function mapSize(props, field) {
  * @param field 当前字段实例
  * @returns 映射后的字段属性
  */
-
-
 exports.mapSize = mapSize;
-
 var mapStatus = function mapStatus(props, field) {
   var _field$data;
-
   var takeStatus = function takeStatus() {
     var _field$warnings, _field$decoratorProps, _field$decoratorProps2;
-
     if (!field) return;
     if (field['loading'] || field['validating']) return 'loading';
     if (field['invalid']) return 'error';
     if ((_field$warnings = field['warnings']) === null || _field$warnings === void 0 ? void 0 : _field$warnings.length) return 'warning';
     if (((_field$decoratorProps = field.decoratorProps) === null || _field$decoratorProps === void 0 ? void 0 : _field$decoratorProps.feedbackStatus) === 'pending') return 'loading'; // 新增
-
     return (_field$decoratorProps2 = field.decoratorProps) === null || _field$decoratorProps2 === void 0 ? void 0 : _field$decoratorProps2.feedbackStatus;
   };
-
   var takeState = function takeState(state) {
     if (state === 'validating' || state === 'pending') return 'loading';
     return state;
   };
-
   var state = takeState(props.state) || takeStatus();
   var result = {
     state: state
-  }; // 当组件处于loading状态时，仅可读不可写。
-
+  };
+  // 当组件处于loading状态时，仅可读不可写。
   if (state === 'loading' && ((_field$data = field.data) === null || _field$data === void 0 ? void 0 : _field$data.readOnlyOnLoading)) {
     result.readOnly = true;
   }
-
   return _objectSpread(_objectSpread({}, props), result);
 };
-
 exports.mapStatus = mapStatus;
-
 var patchDataSource = function patchDataSource() {
   var dataSource = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-
   var removeEmptyChildren = function removeEmptyChildren(data) {
     var result = _objectSpread({}, data);
-
     if (!result.children || result.children.length === 0) {
       delete result.children;
     } else {
       result.children = result.children.map(removeEmptyChildren);
     }
-
     return result;
   };
-
   return (0, _utils.isArr)(dataSource) ? dataSource.map(removeEmptyChildren) : [];
 };
-
 var mapDataSource = function mapDataSource(props, field) {
   var _props$dataSource;
-
   if ((0, _core.isVoidField)(field)) {
     return props;
   }
-
   return _objectSpread(_objectSpread({}, props), {}, {
     dataSource: patchDataSource((_props$dataSource = props.dataSource) !== null && _props$dataSource !== void 0 ? _props$dataSource : field === null || field === void 0 ? void 0 : field.dataSource)
   });
 };
-
 exports.mapDataSource = mapDataSource;
-
 var mapMode = function mapMode(props, field) {
   return _objectSpread(_objectSpread({}, props), {}, {
     mode: (field === null || field === void 0 ? void 0 : field.readPretty) ? 'read' : 'edit'
   });
 };
-
 exports.mapMode = mapMode;
-
 var getFieldName = function getFieldName() {
   var prefix = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'FieldName';
   var suffix = arguments.length > 1 ? arguments[1] : undefined;
@@ -152,22 +109,17 @@ var getFieldName = function getFieldName() {
  * @param obj
  * @returns
  */
-
-
 exports.getFieldName = getFieldName;
-
 var mapSchemaName = function mapSchemaName(obj) {
   var temp = {};
   Object.entries(obj).map(function (_ref) {
     var _ref2 = _slicedToArray(_ref, 2),
-        key = _ref2[0],
-        value = _ref2[1];
-
+      key = _ref2[0],
+      value = _ref2[1];
     var newKey = (0, _utils.getValueByValue)(_schemaNameMap.default, key, {
       inputKey: 'proForm',
       outputKey: 'formily'
     }) || key;
-
     if (value !== undefined && value !== null) {
       if ((0, _utils.isArr)(value)) {
         if (value.length) {
@@ -190,15 +142,11 @@ var mapSchemaName = function mapSchemaName(obj) {
  * @param v 数组或其他
  * @returns 合并数组或合并其他值
  */
-
-
 exports.mapSchemaName = mapSchemaName;
-
 var mergeArrayValue = function mergeArrayValue(arr, v) {
   if ((0, _utils.isArr)(v)) {
     return [].concat(_toConsumableArray(arr), _toConsumableArray(v));
   }
-
   return [].concat(_toConsumableArray(arr), [v]);
 };
 /**
@@ -207,10 +155,7 @@ var mergeArrayValue = function mergeArrayValue(arr, v) {
  * @param suffix scope名称后缀
  * @returns 表达式和scope上下文
  */
-
-
 exports.mergeArrayValue = mergeArrayValue;
-
 var initializeRequestExpression = function initializeRequestExpression(config, mode, suffix) {
   if ((0, _utils.isPlainObj)(config)) {
     var requestConfigName = "$requestConfig_".concat(suffix);
@@ -219,8 +164,6 @@ var initializeRequestExpression = function initializeRequestExpression(config, m
       scope: _defineProperty({}, requestConfigName, config)
     };
   }
-
   return {};
 };
-
 exports.initializeRequestExpression = initializeRequestExpression;