@teamix/pro 1.1.36 → 1.1.40

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 };

package/lib/form/SchemaForm/reactions.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.useValidator = exports.useRequest = exports.useAsyncDataSource = void 0;
+exports.$validator = exports.$request = exports.$dataSource = void 0;
 
 var _utils = require("@teamix/utils");
 
@@ -14,47 +14,47 @@ 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 useRequest = function useRequest(requestConfig) {
+var $request = function $request(requestConfig) {
   return function (field) {
-    var _field$form;
+    var _field$data;
 
+    var refresh = field === null || field === void 0 ? void 0 : (_field$data = field.data) === null || _field$data === void 0 ? void 0 : _field$data.refresh;
     var beforeRequest = requestConfig.beforeRequest,
         onSuccess = requestConfig.onSuccess;
+    var refreshResult = (0, _utils.isPlainObj)(refresh) ? refresh : {};
     var beforeRequestResult = (0, _utils.isFn)(beforeRequest) ? beforeRequest(field) : {};
     return (0, _utils.doCommonRequest)(_objectSpread(_objectSpread({}, requestConfig), {}, {
-      params: _objectSpread(_objectSpread({}, requestConfig.params), beforeRequestResult),
+      params: _objectSpread(_objectSpread(_objectSpread({}, requestConfig.params), beforeRequestResult), refreshResult),
       beforeRequest: function beforeRequest() {
         return beforeRequestResult;
       },
       onSuccess: (0, _utils.isFn)(onSuccess) ? function (res) {
         return onSuccess(res, field);
       } : onSuccess
-    }), {
-      $self: field,
-      $form: field === null || field === void 0 ? void 0 : field.form,
-      $values: field === null || field === void 0 ? void 0 : (_field$form = field.form) === null || _field$form === void 0 ? void 0 : _field$form.values
-    });
+    }), field);
   };
 }; // 配置校验
 
 
-exports.useRequest = useRequest;
+exports.$request = $request;
 
-var useValidator = function useValidator(services, onComplete) {
-  return function (value) {
-    return services(value).then(function (res) {
-      return onComplete && onComplete(res, value);
+var $validator = function $validator(services, onComplete) {
+  return function (value, rules, _ref) {
+    var field = _ref.field;
+    return services(field).then(function (res) {
+      return onComplete && onComplete(res, field);
     });
   };
 }; // 配置DataSource
 
 
-exports.useValidator = useValidator;
+exports.$validator = $validator;
 
-var useAsyncDataSource = function useAsyncDataSource(services, onComplete) {
+var $dataSource = function $dataSource(services, onComplete) {
   return function (field) {
     field.setState({
-      loading: true
+      loading: true,
+      readOnly: true
     });
     return services(field).then(function (res) {
       var _res$map;
@@ -67,15 +67,17 @@ var useAsyncDataSource = function useAsyncDataSource(services, onComplete) {
       };
       field.setState(_objectSpread({
         dataSource: res,
-        loading: false
+        loading: false,
+        readOnly: false
       }, clearValue));
       return onComplete && onComplete(res, field);
     }).catch(function () {
       field.setState({
-        loading: false
+        loading: false,
+        readOnly: false
       });
     });
   };
 };
 
-exports.useAsyncDataSource = useAsyncDataSource;
+exports.$dataSource = $dataSource;

package/lib/form/fieldTypeMap.d.ts

@@ -0,0 +1,4 @@
+declare const fieldTypeMap: {
+    [x: string]: string;
+};
+export default fieldTypeMap;

package/lib/form/fieldTypeMap.js

@@ -0,0 +1,48 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var fieldTypeMap = {
+  Input: 'text',
+  Password: 'password',
+  TextArea: 'textArea',
+  NumberPicker: 'number',
+  Percent: 'percent',
+  Money: 'money',
+  Select: 'select',
+  MultipleSelect: 'multipleSelect',
+  TreeSelect: 'treeSelect',
+  Cascader: 'cascader',
+  MultipleCascader: 'multipleCascader',
+  ArbitraryCascader: 'arbitraryCascader',
+  Radio: 'radio',
+  Checkbox: 'checkbox',
+  Switch: 'switch',
+  DatePicker: 'date',
+  TimePicker: 'time',
+  DateTimePicker: 'dateTime',
+  WeekPicker: 'dateWeek',
+  MonthPicker: 'dateMonth',
+  YearPicker: 'dateYear',
+  QuarterPicker: 'dateQuarter',
+  DateRangePicker: 'dateRange',
+  TimeRangePicker: 'timeRange',
+  DateTimeRangePicker: 'dateTimeRange',
+  WeekRangePicker: 'dateWeekRange',
+  MonthRangePicker: 'dateMonthRange',
+  YearRangePicker: 'dateYearRange',
+  QuarterRangePicker: 'dateQuarterRange',
+  Transfer: 'transfer',
+  ColorPicker: 'color',
+  ColorRadio: 'colorRadio',
+  IconPicker: 'icon',
+  JsonInput: 'json',
+  TagPicker: 'tagPicker',
+  MultipleTagPicker: 'multipleTagPicker',
+  Range: 'range',
+  Search: 'search'
+};
+var _default = fieldTypeMap;
+exports.default = _default;

package/lib/form/index.d.ts

@@ -6,17 +6,105 @@ export * from './typing';
  * 使用别名导出formily相关内容
  */
 export * as formilyCore from '@formily/core';
-export * as formilyReact from '@formily/react';
 export * as formilyReactive from '@formily/reactive';
 export * as formilyTeamix from '@teamix/formily';
+import * as originalFormilyReact from '@formily/react';
+declare const formilyReact: {
+    useFieldRequest: () => {
+        refresh: () => void;
+        field: any;
+    };
+    useFormDisplayValues: () => any;
+    Schema: typeof originalFormilyReact.Schema;
+    FormProvider: import("react").FC<originalFormilyReact.IProviderProps>;
+    FormConsumer: import("react").FC<originalFormilyReact.IFormSpyProps>;
+    ArrayField: {
+        <D extends originalFormilyReact.JSXComponent, C extends originalFormilyReact.JSXComponent>(props: originalFormilyReact.IFieldProps<D, C, import("@formily/core").ArrayField<any, any>>): JSX.Element;
+        displayName: string;
+    };
+    ObjectField: {
+        <D_1 extends originalFormilyReact.JSXComponent, C_1 extends originalFormilyReact.JSXComponent>(props: originalFormilyReact.IFieldProps<D_1, C_1, import("@formily/core").ObjectField<any, any>>): JSX.Element;
+        displayName: string;
+    };
+    VoidField: {
+        <D_2 extends originalFormilyReact.JSXComponent, C_2 extends originalFormilyReact.JSXComponent>(props: originalFormilyReact.IVoidFieldProps<D_2, C_2, import("@formily/core").VoidField<any, any, any>>): JSX.Element;
+        displayName: string;
+    };
+    RecursionField: import("react").FC<originalFormilyReact.IRecursionFieldProps>;
+    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;
+            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;
+            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;
+            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;
+            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;
+            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;
+            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;
+            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;
+            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;
+            displayName: string;
+        };
+    };
+    Field: {
+        <D_3 extends originalFormilyReact.JSXComponent, C_3 extends originalFormilyReact.JSXComponent>(props: originalFormilyReact.IFieldProps<D_3, C_3, import("@formily/core").Field<any, any, any, any>>): JSX.Element;
+        displayName: string;
+    };
+    FormContext: import("react").Context<import("@formily/core").Form<any>>;
+    FieldContext: import("react").Context<import("@formily/core").GeneralField>;
+    SchemaMarkupContext: import("react").Context<originalFormilyReact.Schema<any, any, any, any, any, any, any, any, any>>;
+    SchemaContext: import("react").Context<originalFormilyReact.Schema<any, any, any, any, any, any, any, any, any>>;
+    SchemaExpressionScopeContext: import("react").Context<any>;
+    SchemaOptionsContext: import("react").Context<originalFormilyReact.ISchemaFieldReactFactoryOptions<any>>;
+    ContextCleaner: ({ children }: {
+        children: any;
+    }) => any;
+    mapProps<T extends originalFormilyReact.JSXComponent>(...args: originalFormilyReact.IStateMapper<import("react").ComponentProps<T>>[]): (target: T) => import("react").MemoExoticComponent<import("react").FunctionComponent<any>>;
+    mapReadPretty<T_1 extends originalFormilyReact.JSXComponent, C_4 extends originalFormilyReact.JSXComponent>(component: C_4, readPrettyProps?: import("react").ComponentProps<C_4> | undefined): (target: T_1) => import("react").MemoExoticComponent<import("react").FunctionComponent<{
+        ref?: import("react").RefAttributes<any> | undefined;
+    }>>;
+    connect<T_2 extends originalFormilyReact.JSXComponent>(target: T_2, ...args: originalFormilyReact.IComponentMapper<T_2>[]): import("react").ForwardRefExoticComponent<import("react").PropsWithoutRef<Partial<import("react").ComponentProps<T_2>>> & import("react").RefAttributes<unknown>>;
+    observer: typeof originalFormilyReact.observer;
+    Observer: import("react").MemoExoticComponent<import("react").FunctionComponent<import("@formily/reactive-react").IObserverProps>>;
+    useForm: <T_3 extends object = any>() => import("@formily/core").Form<T_3>;
+    useField: <T_4 = import("@formily/core").GeneralField>() => T_4;
+    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;
+};
+export { formilyReact };
 /**
- * 导出常用formily内容，需谨慎限制
+ * 导出常用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';
-import useFormDisplayValues from './ProForm/useFormDisplayValues';
-export { createForm, FormConsumer, FormDialog, FormDrawer, FormStep, FormTab, FormCollapse, registerRules, registerFormats, registerValidateLocale, setValidateLanguage, useForm, useFormDisplayValues, };
+export { createForm, FormConsumer, FormDialog, FormDrawer, FormStep, FormTab, FormCollapse, registerRules, registerFormats, registerValidateLocale, setValidateLanguage, useForm, };
 /**
  * 导出 Filter 组件
  */

package/lib/form/index.js

@@ -6,15 +6,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 var _exportNames = {
+  formilyReact: true,
   createForm: true,
   registerRules: true,
   registerFormats: true,
   registerValidateLocale: true,
   setValidateLanguage: true,
   formilyCore: true,
-  FormConsumer: true,
-  useForm: true,
-  formilyReact: true,
   formilyReactive: true,
   FormDialog: true,
   FormDrawer: true,
@@ -22,7 +20,8 @@ var _exportNames = {
   FormTab: true,
   FormCollapse: true,
   formilyTeamix: true,
-  useFormDisplayValues: true,
+  FormConsumer: true,
+  useForm: true,
   AdvancedFilter: true,
   SimpleFilter: true,
   QueryFilter: true
@@ -42,7 +41,7 @@ Object.defineProperty(exports, "FormCollapse", {
 Object.defineProperty(exports, "FormConsumer", {
   enumerable: true,
   get: function get() {
-    return _formilyReact.FormConsumer;
+    return originalFormilyReact.FormConsumer;
   }
 });
 Object.defineProperty(exports, "FormDialog", {
@@ -115,13 +114,7 @@ Object.defineProperty(exports, "setValidateLanguage", {
 Object.defineProperty(exports, "useForm", {
   enumerable: true,
   get: function get() {
-    return _formilyReact.useForm;
-  }
-});
-Object.defineProperty(exports, "useFormDisplayValues", {
-  enumerable: true,
-  get: function get() {
-    return _useFormDisplayValues.default;
+    return originalFormilyReact.useForm;
   }
 });
 
@@ -143,10 +136,6 @@ var _formilyCore = _interopRequireWildcard(require("@formily/core"));
 
 exports.formilyCore = _formilyCore;
 
-var _formilyReact = _interopRequireWildcard(require("@formily/react"));
-
-exports.formilyReact = _formilyReact;
-
 var _formilyReactive = _interopRequireWildcard(require("@formily/reactive"));
 
 exports.formilyReactive = _formilyReactive;
@@ -155,8 +144,12 @@ var _formilyTeamix = _interopRequireWildcard(require("@teamix/formily"));
 
 exports.formilyTeamix = _formilyTeamix;
 
+var originalFormilyReact = _interopRequireWildcard(require("@formily/react"));
+
 var _useFormDisplayValues = _interopRequireDefault(require("./ProForm/useFormDisplayValues"));
 
+var _useFieldRequest = _interopRequireDefault(require("./ProForm/useFieldRequest"));
+
 var _Filter = require("./Filter");
 
 var _ProForm = _interopRequireDefault(require("./ProForm"));
@@ -167,24 +160,17 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 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; }
 
-/**
- * 导出ProForm的TS
- */
+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; }
 
-/**
- * 使用别名导出formily相关内容
- */
+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; }
 
-/**
- * 导出常用formily内容，需谨慎限制
- */
+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; }
 
-/**
- * 导出 Filter 组件
- */
+var formilyReact = _objectSpread(_objectSpread({}, originalFormilyReact), {}, {
+  useFieldRequest: _useFieldRequest.default,
+  useFormDisplayValues: _useFormDisplayValues.default
+});
 
-/**
- * 导出 ProForm 组件，支持快速搭建表单
- */
+exports.formilyReact = formilyReact;
 var _default = _ProForm.default;
 exports.default = _default;

package/lib/form/schemaNameMap.js

@@ -49,6 +49,9 @@ var schemaNameMap = [{
 }, {
   formily: 'enum',
   proForm: 'dataSource'
+}, {
+  formily: 'x-data',
+  proForm: 'data'
 }];
 var _default = schemaNameMap;
 exports.default = _default;

package/lib/form/typing.d.ts

@@ -2,68 +2,91 @@ import type { ReactNode } from 'react';
 import type { IFormFeedback, Form as FormType, FieldPatternTypes } from '@formily/core';
 import type { IFormLayoutProps } from '@teamix/formily';
 import { CommonRequestConfig } from '@teamix/utils';
-export interface anyObject {
+interface AnyObject {
     [propName: string]: any;
 }
 declare type FieldDisplayTypes = 'none' | 'hidden' | 'visible';
-export declare type IBaseComponent = 'Input' | 'Password' | 'TextArea' | 'NumberPicker' | 'Percent' | 'Money' | 'Select' | 'MultipleSelect' | 'TreeSelect' | 'Cascader' | 'MultipleCascader' | 'ArbitraryCascader' | 'Radio' | 'Checkbox' | 'Switch' | 'DatePicker' | 'TimePicker' | 'DateTimePicker' | 'WeekPicker' | 'MonthPicker' | 'YearPicker' | 'QuarterPicker' | 'DateRangePicker' | 'TimeRangePicker' | 'DateTimeRangePicker' | 'WeekRangePicker' | 'MonthRangePicker' | 'YearRangePicker' | 'QuarterRangePicker' | 'Transfer' | 'Upload' | 'ColorPicker' | 'ColorRadio' | 'IconPicker' | 'JsonInput' | 'TagPicker' | 'MultipleTagPicker' | 'Range' | 'Search';
-export declare type IButtonComponent = 'Submit' | 'Reset';
-export declare type IComboComponent = 'ArrayCards' | 'ArrayCards.Addition' | 'ArrayCards.Remove' | 'ArrayCards.MoveUp' | 'ArrayCards.MoveDown' | 'ArrayCards.Index' | 'ArrayCollapse' | 'ArrayCollapse.CollapsePanel' | 'ArrayCollapse.Addition' | 'ArrayCollapse.Remove' | 'ArrayCollapse.MoveUp' | 'ArrayCollapse.MoveDown' | 'ArrayCollapse.Index' | 'ArrayTable' | 'ArrayTable.Column' | 'ArrayTable.SortHandle' | 'ArrayTable.Addition' | 'ArrayTable.Remove' | 'ArrayTable.MoveDown' | 'ArrayTable.MoveUp' | 'ArrayTable.Index' | 'ArrayItems' | 'ArrayItems.Item' | 'ArrayItems.SortHandle' | 'ArrayItems.Addition' | 'ArrayItems.Remove' | 'ArrayItems.MoveDown' | 'ArrayItems.MoveUp' | 'ArrayItems.Index' | 'Editable' | 'Editable.Popover' | 'Editable.Dialog' | 'Editable.Drawer';
-export declare type ILayoutComponent = 'FormFlex' | 'FormGrid' | 'FormGroup' | 'FormGroup.GroupPanel' | 'Search' | 'Search.SearchPanel' | 'FormTab' | 'FormTab.TabPane' | 'FormStep' | 'FormStep.StepPane' | 'FormCollapse' | 'FormCollapse.CollapsePanel' | 'FormButtonGroup' | 'FormDialog' | 'FormDrawer' | 'FormDialog.Footer' | 'FormDrawer.Footer';
-export interface IRequestConfig extends CommonRequestConfig {
+export interface ProFormInitializeItem {
+    (item: ProFormSchemaItem, props?: any): ProFormSchemaItem;
+}
+declare type IBaseComponent = 'Input' | 'Password' | 'TextArea' | 'NumberPicker' | 'Percent' | 'Money' | 'Select' | 'MultipleSelect' | 'TreeSelect' | 'Cascader' | 'MultipleCascader' | 'ArbitraryCascader' | 'Radio' | 'Checkbox' | 'Switch' | 'DatePicker' | 'TimePicker' | 'DateTimePicker' | 'WeekPicker' | 'MonthPicker' | 'YearPicker' | 'QuarterPicker' | 'DateRangePicker' | 'TimeRangePicker' | 'DateTimeRangePicker' | 'WeekRangePicker' | 'MonthRangePicker' | 'YearRangePicker' | 'QuarterRangePicker' | 'Transfer' | 'Upload' | 'ColorPicker' | 'ColorRadio' | 'IconPicker' | 'JsonInput' | 'TagPicker' | 'MultipleTagPicker' | 'Range' | 'Search';
+declare type IButtonComponent = 'Submit' | 'Reset';
+declare type IComboComponent = 'ArrayCards' | 'ArrayCards.Addition' | 'ArrayCards.Remove' | 'ArrayCards.MoveUp' | 'ArrayCards.MoveDown' | 'ArrayCards.Index' | 'ArrayCollapse' | 'ArrayCollapse.CollapsePanel' | 'ArrayCollapse.Addition' | 'ArrayCollapse.Remove' | 'ArrayCollapse.MoveUp' | 'ArrayCollapse.MoveDown' | 'ArrayCollapse.Index' | 'ArrayTable' | 'ArrayTable.Column' | 'ArrayTable.SortHandle' | 'ArrayTable.Addition' | 'ArrayTable.Remove' | 'ArrayTable.MoveDown' | 'ArrayTable.MoveUp' | 'ArrayTable.Index' | 'ArrayItems' | 'ArrayItems.Item' | 'ArrayItems.SortHandle' | 'ArrayItems.Addition' | 'ArrayItems.Remove' | 'ArrayItems.MoveDown' | 'ArrayItems.MoveUp' | 'ArrayItems.Index' | 'Editable' | 'Editable.Popover' | 'Editable.Dialog' | 'Editable.Drawer';
+declare type ILayoutComponent = 'FormFlex' | 'FormGrid' | 'FormGroup' | 'FormGroup.GroupPanel' | 'Search' | 'Search.SearchPanel' | 'FormTab' | 'FormTab.TabPane' | 'FormStep' | 'FormStep.StepPane' | 'FormCollapse' | 'FormCollapse.CollapsePanel' | 'FormButtonGroup' | 'FormDialog' | 'FormDrawer' | 'FormDialog.Footer' | 'FormDrawer.Footer';
+export interface ProFormRequestConfig extends CommonRequestConfig {
     beforeRequest?: (field?: any) => any;
     onSuccess?: (res?: any, field?: any) => any;
     onComplete?: (res?: any, field?: any) => any;
 }
-export interface IFormSchemaItem {
+export interface ProFormSchemaItem {
     type?: string;
     name?: string;
     description?: React.ReactNode;
     title?: string;
     component?: IBaseComponent | IButtonComponent | IComboComponent | ILayoutComponent | 'ProField' | any;
-    props?: anyObject | any;
+    props?: AnyObject | any;
     decorator?: string | null;
-    decoratorProps?: anyObject;
-    dataSource?: any[] | IRequestConfig;
+    decoratorProps?: AnyObject;
+    dataSource?: any[] | string | ProFormRequestConfig;
     reactions?: any;
     rules?: any;
-    items?: IFormSchemaItem;
-    children?: IFormSchemaItem[];
+    items?: ProFormSchemaItem;
+    children?: ProFormSchemaItem[];
     content?: any;
     tooltip?: string;
     required?: boolean;
     display?: FieldDisplayTypes;
-    visible?: boolean;
-    hidden?: boolean;
-    disabled?: boolean;
-    readOnly?: boolean;
-    readPretty?: boolean;
+    visible?: boolean | string;
+    hidden?: boolean | string;
+    disabled?: boolean | string;
+    readOnly?: boolean | string;
+    readPretty?: boolean | string;
     pattern?: FieldPatternTypes;
     default?: any;
-    request?: IRequestConfig;
-}
-export declare type IFormSchema = IFormSchemaItem[];
-export interface IInitializeItem {
-    (item: IFormSchemaItem, props?: any): IFormSchemaItem;
+    request?: ProFormRequestConfig;
+    data?: AnyObject;
 }
-export interface IFormProps extends IFormLayoutProps {
+export declare type ProFormSchema = ProFormSchemaItem[];
+export interface ProFormProps extends IFormLayoutProps {
     form?: FormType | false;
-    schema: IFormSchema;
+    schema: ProFormSchema;
     scope?: any;
     components?: {
         [key: string]: React.FC | React.ComponentClass;
     };
     children?: React.ReactNode;
-    initialValues?: anyObject;
+    initialValues?: AnyObject;
     initialRequest?: CommonRequestConfig;
     previewTextPlaceholder?: ReactNode;
     onChange?: (values: any, displayValues?: any) => any;
     onSubmit?: ((values: any) => any) | CommonRequestConfig;
     onSubmitFailed?: (feedbacks: IFormFeedback[]) => void;
 }
-export interface IFilterProps extends IFormProps {
+export interface QueryFilterProps extends ProFormProps {
+    onFilter?: (values: any) => void;
+    onReset?: (payload?: any) => void;
+}
+/**
+ * 兼容性导出
+ */
+export interface IFilterProps extends ProFormProps {
     triggerType?: 'keydown' | 'change' | 'submit';
     onFilter?: (values: any) => void;
     onReset?: (payload?: any) => void;
 }
+/**
+ * @deprecated 将在未来移除，建议使用 ProFormSchemaItem 代替
+ */
+export interface IFormSchemaItem extends ProFormSchemaItem {
+}
+/**
+ * @deprecated 将在未来移除，建议使用 ProFormSchema 代替
+ */
+export interface IFormSchema extends ProFormSchema {
+}
+/**
+ * @deprecated 将在未来移除，建议使用 ProFormProps 代替
+ */
+export interface IFormProps extends ProFormProps {
+}
 export {};

package/lib/form/utils.d.ts

@@ -12,6 +12,8 @@ declare const mapSize: (props: any, field: any) => any;
  * @returns 映射后的字段属性
  */
 declare const mapStatus: (props: any, field: any) => any;
+declare const mapDataSource: (props: any, field: any) => any;
+declare const mapMode: (props: any, field: any) => any;
 /**
  * 为未配置name的字段添加随机字段名称
  * @param prefix 随机字段名称前缀，默认为name
@@ -34,4 +36,4 @@ declare const mapSchemaName: (obj: any) => any;
  * @returns 合并数组或合并其他值
  */
 declare const mergeArrayValue: (arr: any[], v?: any) => any[];
-export { getRandomName, mapSize, mapStatus, mergeArrayValue, mapSchemaName };
+export { mapSize, mapStatus, mapDataSource, mapMode, mergeArrayValue, getRandomName, mapSchemaName, };