@teamix/pro 1.1.37 → 1.2.0

package/lib/form/Components/ProField/index.js

@@ -7,62 +7,56 @@ exports.default = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _core = require("@formily/core");
-
 var _react2 = require("@formily/react");
 
+var _utils = require("../../utils");
+
 var _field = _interopRequireDefault(require("../../../field"));
 
-var _utils = require("../../utils");
+var _fieldTypeMap = _interopRequireDefault(require("../../fieldTypeMap"));
 
 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); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { 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 _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."); }
 
-var patchDataSource = function patchDataSource() {
-  var dataSource = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+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); }
 
-  var removeEmptyChildren = function removeEmptyChildren(data) {
-    var result = _objectSpread({}, data);
+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; }
 
-    if (!result.children || result.children.length === 0) {
-      delete result.children;
-    } else {
-      result.children = result.children.map(removeEmptyChildren);
-    }
+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; }
 
-    return result;
-  };
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-  return dataSource.map(removeEmptyChildren);
-};
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
-var mapDataSource = function mapDataSource(props, field) {
-  var _props$dataSource;
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
-  if ((0, _core.isVoidField)(field)) {
-    return props;
-  }
+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; }
 
-  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)
-  });
+var componentBuilder = function componentBuilder(type) {
+  return (0, _react2.connect)(function (props) {
+    return /*#__PURE__*/_react.default.createElement(_field.default, _objectSpread(_objectSpread({}, props), {}, {
+      type: type
+    }));
+  }, (0, _react2.mapProps)(_utils.mapSize, _utils.mapStatus, _utils.mapDataSource, _utils.mapMode), (0, _react2.mapReadPretty)(function (props) {
+    return /*#__PURE__*/_react.default.createElement(_field.default, _objectSpread(_objectSpread({}, props), {}, {
+      mode: "read"
+    }));
+  }));
 };
 
-var mapMode = function mapMode(props, field) {
-  return _objectSpread(_objectSpread({}, props), {}, {
-    mode: (field === null || field === void 0 ? void 0 : field.readPretty) ? 'read' : 'edit'
-  });
-};
+var _default = function () {
+  var components = {};
+  Object.entries(_fieldTypeMap.default).forEach(function (_ref) {
+    var _ref2 = _slicedToArray(_ref, 2),
+        name = _ref2[0],
+        type = _ref2[1];
 
-var _default = (0, _react2.connect)(_field.default, (0, _react2.mapProps)(_utils.mapSize, _utils.mapStatus, mapDataSource, mapMode), (0, _react2.mapReadPretty)(function (props) {
-  return /*#__PURE__*/_react.default.createElement(_field.default, _objectSpread(_objectSpread({}, props), {}, {
-    mode: "read"
-  }));
-}));
+    components[name] = componentBuilder(type);
+  });
+  return components;
+}();
 
 exports.default = _default;

package/lib/form/Filter/index.js

@@ -100,7 +100,7 @@ var SimpleFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
   }, []);
   var eventProps = getEventProps(triggerType, onFilter);
   return /*#__PURE__*/_react.default.createElement(_ProForm.default, _objectSpread(_objectSpread(_objectSpread({
-    feedbackLayout: "none",
+    feedbackLayout: "popover",
     breakpoints: [],
     inset: true
   }, otherProps), eventProps), {}, {
@@ -229,7 +229,7 @@ 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({
-    feedbackLayout: "none"
+    feedbackLayout: "popover"
   }, props), eventProps), getTeamixLayout), {}, {
     form: form,
     className: (0, _classnames.default)(prefixCls, props.className),

package/lib/form/ProForm/index.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import type { IFormProps } from '../typing';
+import type { ProFormProps } from '../typing';
 import './index.scss';
-declare const ProForm: React.FC<IFormProps>;
+declare const ProForm: React.FC<ProFormProps>;
 export default ProForm;

package/lib/form/ProForm/index.js

@@ -17,8 +17,6 @@ var _reactive = require("@formily/reactive");
 
 var _formily = require("@teamix/formily");
 
-var _icon = _interopRequireDefault(require("@teamix/icon"));
-
 var _utils = require("@teamix/utils");
 
 var _SchemaForm = _interopRequireDefault(require("../SchemaForm"));
@@ -136,11 +134,7 @@ var ProForm = /*#__PURE__*/(0, _react.memo)(function (_ref) {
 });
 ProForm.defaultProps = {
   colon: false,
-  labelAlign: 'left',
-  tooltipIcon: /*#__PURE__*/_react.default.createElement(_icon.default, {
-    type: "info-circle-line",
-    size: "small"
-  })
+  labelAlign: 'left'
 };
 var _default = ProForm;
 exports.default = _default;

package/lib/form/ProForm/index.scss

@@ -109,6 +109,11 @@
   }
 }
 
+// Icon
+.#{$css-prefix}formily-icon {
+  transform: translate(0, -1px);
+}
+
 // 撑满模式
 .#{$form-item-cls}-fullness {
   > .#{$form-item-cls}-control {
@@ -179,10 +184,20 @@
 
 // 数组类组件添加按钮
 .#{$css-prefix}formily-array-base-addition {
-  .teamix-icon {
+  .#{$css-prefix}formily-icon {
     margin-right: 4px;
   }
 }
+// 数组类ArrayItem Icon 居中
+.#{$css-prefix}formily-array-items-item-inner {
+  > .#{$css-prefix}box {
+    > .#{$css-prefix}space-item {
+      > .#{$css-prefix}formily-icon {
+        margin-top: 9px;
+      }
+    }
+  }
+}
 
 // Editable预览态行高
 .#{$css-prefix}formily-editable-content {
@@ -248,6 +263,9 @@
 // 高级筛选
 .#{$teamix-pro-form}-filter-advanced,
 .#{$teamix-pro-form}-filter-simple {
+  .#{$form-item-cls}-feedback-layout-popover {
+    margin-bottom: 0;
+  }
   .#{$css-prefix}date-picker2-input {
     .#{$css-prefix}input {
       width: inherit;

package/lib/form/ProForm/useFieldRequest.d.ts

@@ -0,0 +1,5 @@
+declare const _default: () => {
+    refresh: () => void;
+    field: any;
+};
+export default _default;

package/lib/form/ProForm/useFieldRequest.js

@@ -0,0 +1,37 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _react = require("@formily/react");
+
+var _utils = require("@teamix/utils");
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+var _default = function _default() {
+  var field = (0, _react.useField)();
+
+  var refresh = function refresh() {
+    if (!(0, _utils.isPlainObj)(field.data)) {
+      field.data = {
+        refresh: {}
+      };
+    } else {
+      field.data.refresh = _objectSpread({}, field.data.refresh);
+    }
+  };
+
+  return {
+    refresh: refresh,
+    field: field
+  };
+};
+
+exports.default = _default;

package/lib/form/SchemaForm/adapterDecorator.js

@@ -5,7 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _initializeProField = require("./initializeProField");
+var _fieldTypeMap = _interopRequireDefault(require("../fieldTypeMap"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 
@@ -24,7 +26,7 @@ var _default = function _default(decorator, component) {
     return decorator;
   }
 
-  if ([].concat(_toConsumableArray(Object.keys(_initializeProField.proFieldTypeMap)), ['Upload', 'ArrayCards', 'ArrayCollapse', 'ArrayTable', 'ArrayItems']).includes(component)) {
+  if ([].concat(_toConsumableArray(Object.keys(_fieldTypeMap.default)), ['Upload', 'ArrayCards', 'ArrayCollapse', 'ArrayTable', 'ArrayItems']).includes(component)) {
     return 'FormItem';
   }
 

package/lib/form/SchemaForm/index.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
-import type { IFormProps } from '../typing';
-declare const _default: React.MemoExoticComponent<({ schema, scope, components }: IFormProps) => JSX.Element>;
+import type { ProFormProps } from '../typing';
+declare const _default: React.MemoExoticComponent<({ schema, scope, components }: ProFormProps) => JSX.Element>;
 export default _default;

package/lib/form/SchemaForm/index.js

@@ -19,8 +19,6 @@ var _ProField = _interopRequireDefault(require("../Components/ProField"));
 
 var _Editable = require("../Components/Editable");
 
-var _Search = _interopRequireDefault(require("../Components/Search"));
-
 var _FormGroup = _interopRequireDefault(require("../Components/FormGroup"));
 
 var _QueryFilter = _interopRequireDefault(require("../Components/QueryFilter"));
@@ -41,8 +39,6 @@ var _initializeDataSource2 = _interopRequireDefault(require("./initializeDataSou
 
 var _initializeRules2 = _interopRequireDefault(require("./initializeRules"));
 
-var _initializeProField = _interopRequireWildcard(require("./initializeProField"));
-
 var _initializeArrayCards = _interopRequireDefault(require("./initializeArrayCards"));
 
 var _initializeArrayCollapse = _interopRequireDefault(require("./initializeArrayCollapse"));
@@ -61,13 +57,13 @@ var _initializeFormTab = _interopRequireDefault(require("./initializeFormTab"));
 
 var _initializeFormCollapse = _interopRequireDefault(require("./initializeFormCollapse"));
 
-var _initializeArrayIcon = _interopRequireDefault(require("./initializeArrayIcon"));
+var _fieldTypeMap = _interopRequireDefault(require("../fieldTypeMap"));
 
 var _utils = require("../utils");
 
 var _warning = _interopRequireDefault(require("../warning"));
 
-var _excluded = ["component", "type", "name", "decorator", "decoratorProps", "dataSource", "reactions", "rules", "children", "items", "tooltip", "request"];
+var _excluded = ["component", "type", "name", "decorator", "decoratorProps", "dataSource", "reactions", "rules", "children", "items", "tooltip", "request", "data"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -111,8 +107,7 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
       components = _ref.components;
   var SchemaField = (0, _react.useMemo)(function () {
     return (0, _react2.createSchemaField)({
-      components: {
-        ProField: _ProField.default,
+      components: _objectSpread(_objectSpread({}, _ProField.default), {}, {
         FormLayout: _formily.FormLayout,
         FormItem: _formily.FormItem,
         ArrayCollapse: _formily.ArrayCollapse,
@@ -134,12 +129,11 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
         EditableDrawer: _Editable.EditableDrawer,
         EditablePopover: _Editable.EditablePopover,
         FormGroup: _FormGroup.default,
-        Search: _Search.default,
         QueryFilter: _QueryFilter.default,
         Upload: _formily.Upload,
         Affix: _components.Affix,
         Text: _index.default
-      }
+      })
     });
   }, []); // 合并schema中request的scope
 
@@ -155,9 +149,7 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
           originalComponent = _newItem.component; // 根据component的不同，初始化为内置的item
 
       if (originalComponent) {
-        if (Object.keys(_initializeProField.proFieldTypeMap).includes(originalComponent)) {
-          // ProField接管组件
-          newItem = (0, _initializeProField.default)(newItem);
+        if (Object.keys(_fieldTypeMap.default).includes(originalComponent)) {// ProField接管组件
         } else {
           // 未接管组件，判断是否为Formily组件别名
           newItem = _objectSpread(_objectSpread({}, newItem), {}, {
@@ -208,11 +200,6 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
 
         if (['FormCollapse'].includes(originalComponent)) {
           newItem = (0, _initializeFormCollapse.default)(newItem);
-        } // Array组件的Icon替换
-
-
-        if (/\.(Addition|Remove|MoveUp|MoveDown|SortHandle){1}$/g.test(originalComponent)) {
-          newItem = (0, _initializeArrayIcon.default)(newItem);
         }
       }
 
@@ -230,6 +217,7 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
           items = _newItem2.items,
           tooltip = _newItem2.tooltip,
           request = _newItem2.request,
+          data = _newItem2.data,
           otherProps = _objectWithoutProperties(_newItem2, _excluded); // 默认类型
 
 
@@ -276,7 +264,8 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
         decoratorProps: defaultDecoratorProps,
         rules: defaultRules,
         reactions: defaultReactions,
-        dataSource: defaultDataSource
+        dataSource: defaultDataSource,
+        data: data
       })); // 递归子组件
 
       var recursiveProperties = (children === null || children === void 0 ? void 0 : children.length) ? {
@@ -295,13 +284,13 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
       type: 'object',
       properties: formatSchema(schema)
     };
-  }, [formatSchema, schema]); // console.log(schemaPro);
+  }, []); // console.log(schemaPro);
 
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(SchemaField, {
+  return /*#__PURE__*/_react.default.createElement(SchemaField, {
     schema: schemaPro,
     components: components,
     scope: mergedScope
-  }));
+  });
 });
 
 exports.default = _default;

package/lib/form/SchemaForm/initializeArrayCards.d.ts

@@ -1,3 +1,3 @@
-import type { IInitializeItem } from '../typing';
-declare const initialize: IInitializeItem;
+import type { ProFormInitializeItem } from '../typing';
+declare const initialize: ProFormInitializeItem;
 export default initialize;

package/lib/form/SchemaForm/initializeArrayCollapse.d.ts

@@ -1,3 +1,3 @@
-import type { IInitializeItem } from '../typing';
-declare const initialize: IInitializeItem;
+import type { ProFormInitializeItem } from '../typing';
+declare const initialize: ProFormInitializeItem;
 export default initialize;

package/lib/form/SchemaForm/initializeArrayItems.d.ts

@@ -1,3 +1,3 @@
-import type { IInitializeItem } from '../typing';
-declare const initialize: IInitializeItem;
+import type { ProFormInitializeItem } from '../typing';
+declare const initialize: ProFormInitializeItem;
 export default initialize;

package/lib/form/SchemaForm/initializeArrayTable.d.ts

@@ -1,3 +1,3 @@
-import type { IInitializeItem } from '../typing';
-declare const initialize: IInitializeItem;
+import type { ProFormInitializeItem } from '../typing';
+declare const initialize: ProFormInitializeItem;
 export default initialize;

package/lib/form/SchemaForm/initializeDataSource.d.ts

@@ -1,6 +1,6 @@
-import type { IRequestConfig } from '../';
+import type { ProFormRequestConfig } from '../';
 interface IInitializeDataSource {
-    (requestConfig?: any[] | IRequestConfig): {
+    (requestConfig?: ProFormRequestConfig | any): {
         dataSource?: any[];
         reactions: any[];
         scope: {

package/lib/form/SchemaForm/initializeDataSource.js

@@ -7,7 +7,7 @@ exports.default = void 0;
 
 var _utils = require("@teamix/utils");
 
-var _reactions = require("../SchemaForm/reactions");
+var _reactions = require("./reactions");
 
 var _utils2 = require("../utils");
 
@@ -22,7 +22,7 @@ var initializeDataSource = function initializeDataSource(dataSource) {
     var dataSourceScopeName = (0, _utils2.getRandomName)('$dataSource');
     return {
       reactions: ["{{".concat(dataSourceScopeName, "(").concat(requestScopeName, ",").concat(requestConfig.onComplete, ")}}")],
-      scope: (_scope = {}, _defineProperty(_scope, requestScopeName, (0, _reactions.useRequest)(requestConfig)), _defineProperty(_scope, dataSourceScopeName, _reactions.useAsyncDataSource), _scope)
+      scope: (_scope = {}, _defineProperty(_scope, requestScopeName, (0, _reactions.$request)(requestConfig)), _defineProperty(_scope, dataSourceScopeName, _reactions.$dataSource), _scope)
     };
   }
 

package/lib/form/SchemaForm/initializeFormButton.d.ts

@@ -1,3 +1,3 @@
-import type { IInitializeItem } from '../typing';
-declare const initialize: IInitializeItem;
+import type { ProFormInitializeItem } from '../typing';
+declare const initialize: ProFormInitializeItem;
 export default initialize;

package/lib/form/SchemaForm/initializeFormCollapse.d.ts

@@ -1,3 +1,3 @@
-import type { IInitializeItem } from '../typing';
-declare const initialize: IInitializeItem;
+import type { ProFormInitializeItem } from '../typing';
+declare const initialize: ProFormInitializeItem;
 export default initialize;

package/lib/form/SchemaForm/initializeFormGroup.d.ts

@@ -1,3 +1,3 @@
-import type { IFormSchemaItem } from '../typing';
-declare const initialize: (item: IFormSchemaItem) => IFormSchemaItem;
+import type { ProFormSchemaItem } from '../typing';
+declare const initialize: (item: ProFormSchemaItem) => ProFormSchemaItem;
 export default initialize;

package/lib/form/SchemaForm/initializeFormStep.d.ts

@@ -1,5 +1,5 @@
-import type { IFormSchemaItem } from '../typing';
-declare const initialize: (item: IFormSchemaItem & {
+import type { ProFormSchemaItem } from '../typing';
+declare const initialize: (item: ProFormSchemaItem & {
     col?: number;
-}) => IFormSchemaItem;
+}) => ProFormSchemaItem;
 export default initialize;

package/lib/form/SchemaForm/initializeFormTab.d.ts

@@ -1,3 +1,3 @@
-import type { IFormSchemaItem } from '../typing';
-declare const initialize: (item: IFormSchemaItem) => IFormSchemaItem;
+import type { ProFormSchemaItem } from '../typing';
+declare const initialize: (item: ProFormSchemaItem) => ProFormSchemaItem;
 export default initialize;

package/lib/form/SchemaForm/initializeRequest.d.ts

@@ -1,6 +1,6 @@
-import type { IRequestConfig } from '../';
+import type { ProFormRequestConfig } from '../';
 interface IInitializeRequest {
-    (requestConfig?: IRequestConfig): {
+    (requestConfig?: ProFormRequestConfig): {
         reactions: any[];
         scope: {
             [x: string]: any;

package/lib/form/SchemaForm/initializeRequest.js

@@ -16,7 +16,7 @@ var initializeRequest = function initializeRequest(requestConfig) {
     var requestScopeName = (0, _utils.getRandomName)('$request');
     return {
       reactions: ["{{".concat(requestScopeName, "}}")],
-      scope: _defineProperty({}, requestScopeName, (0, _reactions.useRequest)(requestConfig))
+      scope: _defineProperty({}, requestScopeName, (0, _reactions.$request)(requestConfig))
     };
   }
 

package/lib/form/SchemaForm/initializeRules.js

@@ -13,6 +13,18 @@ var _utils2 = require("../utils");
 
 var _reactions2 = require("./reactions");
 
+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); if (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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
@@ -20,24 +32,40 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 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 initializeRules = function initializeRules(rules) {
-  if ((0, _utils.isPlainObj)(rules === null || rules === void 0 ? void 0 : rules.validator)) {
-    var _scope;
+  var initializeValidator = function initializeValidator(rule) {
+    if ((0, _utils.isPlainObj)(rule === null || rule === void 0 ? void 0 : rule.validator)) {
+      var _scope;
+
+      var validator = rule.validator;
+      var requestScopeName = (0, _utils2.getRandomName)('$request');
+      var validatorScopeName = (0, _utils2.getRandomName)('$validator');
+      return {
+        rules: _objectSpread(_objectSpread({}, rule), {}, {
+          validator: "{{".concat(validatorScopeName, "(").concat(requestScopeName, ",").concat(validator.onComplete, ")}}")
+        }),
+        scope: (_scope = {}, _defineProperty(_scope, requestScopeName, (0, _reactions.$request)(validator)), _defineProperty(_scope, validatorScopeName, _reactions2.$validator), _scope)
+      };
+    }
 
-    var validator = rules.validator;
-    var requestScopeName = (0, _utils2.getRandomName)('$request');
-    var validatorScopeName = (0, _utils2.getRandomName)('$validator');
     return {
-      rules: _objectSpread(_objectSpread({}, rules), {}, {
-        validator: "{{".concat(validatorScopeName, "(").concat(requestScopeName, ",").concat(validator.onComplete, ")}}")
-      }),
-      scope: (_scope = {}, _defineProperty(_scope, requestScopeName, (0, _reactions.useRequest)(validator)), _defineProperty(_scope, validatorScopeName, _reactions2.useValidator), _scope)
+      rules: rule,
+      scope: {}
     };
+  };
+
+  if ((0, _utils.isArr)(rules)) {
+    return rules.reduce(function (prev, current) {
+      var result = initializeValidator(current);
+      prev.rules = [].concat(_toConsumableArray(prev.rules), [result.rules]);
+      prev.scope = _objectSpread(_objectSpread({}, prev.scope), result.scope);
+      return prev;
+    }, {
+      rules: [],
+      scope: {}
+    });
   }
 
-  return {
-    rules: rules,
-    scope: []
-  };
+  return initializeValidator(rules);
 };
 
 var _default = initializeRules;

package/lib/form/SchemaForm/reactions.d.ts

@@ -1,5 +1,5 @@
-import type { IRequestConfig } from '../typing';
-declare const useRequest: (requestConfig: IRequestConfig) => (field: any) => Promise<unknown>;
-declare const useValidator: (services: any, onComplete?: any) => (value: any) => any;
-declare const useAsyncDataSource: (services: any, onComplete?: any) => (field: any) => any;
-export { useRequest, useAsyncDataSource, useValidator };
+import type { ProFormRequestConfig } from '../typing';
+declare const $request: (requestConfig: ProFormRequestConfig) => (field: any) => Promise<unknown>;
+declare const $validator: (services: any, onComplete?: any) => (value: any, rules: any, { field }: any) => any;
+declare const $dataSource: (services: any, onComplete?: any) => (field: any) => any;
+export { $request, $dataSource, $validator };