@teamix/pro 1.1.39 → 1.1.40

package/es/form/SchemaForm/reactions.js

@@ -4,45 +4,45 @@ 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; }
 
-import { isFn, doCommonRequest } from '@teamix/utils'; // 配置请求
+import { isFn, isPlainObj, doCommonRequest } from '@teamix/utils'; // 配置请求
 
-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 = isPlainObj(refresh) ? refresh : {};
     var beforeRequestResult = isFn(beforeRequest) ? beforeRequest(field) : {};
     return doCommonRequest(_objectSpread(_objectSpread({}, requestConfig), {}, {
-      params: _objectSpread(_objectSpread({}, requestConfig.params), beforeRequestResult),
+      params: _objectSpread(_objectSpread(_objectSpread({}, requestConfig.params), beforeRequestResult), refreshResult),
       beforeRequest: function beforeRequest() {
         return beforeRequestResult;
       },
       onSuccess: 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);
   };
 }; // 配置校验
 
 
-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
 
 
-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;
@@ -55,15 +55,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
       });
     });
   };
 };
 
-export { useRequest, useAsyncDataSource, useValidator };
+export { $request, $dataSource, $validator };

package/es/form/fieldTypeMap.d.ts

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

package/es/form/fieldTypeMap.js

@@ -0,0 +1,41 @@
+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'
+};
+export default fieldTypeMap;

package/es/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/es/form/index.js

@@ -1,3 +1,9 @@
+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; }
+
 /**
  * 导出ProForm的TS
  */
@@ -8,21 +14,28 @@ export * from './typing';
 
 import * as _formilyCore from '@formily/core';
 export { _formilyCore as formilyCore };
-import * as _formilyReact from '@formily/react';
-export { _formilyReact as formilyReact };
 import * as _formilyReactive from '@formily/reactive';
 export { _formilyReactive as formilyReactive };
 import * as _formilyTeamix from '@teamix/formily';
 export { _formilyTeamix as formilyTeamix };
+import * as originalFormilyReact from '@formily/react';
+import useFormDisplayValues from './ProForm/useFormDisplayValues';
+import useFieldRequest from './ProForm/useFieldRequest';
+
+var formilyReact = _objectSpread(_objectSpread({}, originalFormilyReact), {}, {
+  useFieldRequest: useFieldRequest,
+  useFormDisplayValues: useFormDisplayValues
+});
+
+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/es/form/schemaNameMap.js

@@ -43,5 +43,8 @@ var schemaNameMap = [{
 }, {
   formily: 'enum',
   proForm: 'dataSource'
+}, {
+  formily: 'x-data',
+  proForm: 'data'
 }];
 export default schemaNameMap;

package/es/form/typing.d.ts

@@ -2,33 +2,36 @@ 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;
@@ -40,30 +43,50 @@ export interface IFormSchemaItem {
     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/es/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, };

package/es/form/utils.js

@@ -24,6 +24,7 @@ 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; }
 
+import { isVoidField } from '@formily/core';
 import { useFormLayout, useFormShallowLayout } from '@teamix/formily';
 import { isArr, isObj, getValueByValue } from '@teamix/utils';
 import schemaNameMap from './schemaNameMap';
@@ -76,6 +77,42 @@ var mapStatus = function mapStatus(props, field) {
   });
 };
 
+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 dataSource.map(removeEmptyChildren);
+};
+
+var mapDataSource = function mapDataSource(props, field) {
+  var _props$dataSource;
+
+  if (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)
+  });
+};
+
+var mapMode = function mapMode(props, field) {
+  return _objectSpread(_objectSpread({}, props), {}, {
+    mode: (field === null || field === void 0 ? void 0 : field.readPretty) ? 'read' : 'edit'
+  });
+};
+
 var getRandomName = function getRandomName() {
   var prefix = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'name';
   return "".concat(prefix, "_").concat(Math.floor(Math.random() * Math.pow(10, 18)));
@@ -131,4 +168,4 @@ var mergeArrayValue = function mergeArrayValue(arr, v) {
   return [].concat(_toConsumableArray(arr), [v]);
 };
 
-export { getRandomName, mapSize, mapStatus, mergeArrayValue, mapSchemaName };
+export { mapSize, mapStatus, mapDataSource, mapMode, mergeArrayValue, getRandomName, mapSchemaName };

package/es/form/warning.d.ts

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

package/es/index.d.ts

@@ -21,5 +21,5 @@ export * from './page-container';
 export * from './page-header';
 export * from './skeleton';
 export * from './table';
-declare const version = "1.1.38";
+declare const version = "1.1.39";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, hooks, nocode, templates, utils, };

package/es/index.js

@@ -25,6 +25,6 @@ export * from './page-container';
 export * from './page-header';
 export * from './skeleton';
 export * from './table';
-var version = '1.1.38';
+var version = '1.1.39';
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, // ProLayout,
 ProPageContainer, ProPageHeader, ProSkeleton, ProTable, hooks, nocode, templates, utils };

package/es/info/components/InfoGroup/index.js

@@ -1,35 +1,93 @@
-import React, { useRef } from 'react';
+var _excluded = ["children", "url", "method", "params", "formatResult", "onSuccess", "onError", "formatParams", "beforeRequest", "extendParams", "className", "compacted", "divider", "style", "backgroundColor"];
+
+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; }
+
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+
+import React, { isValidElement, useRef } from 'react';
 import { ProInfoGroupContext } from '../../utils';
 import { useSize } from '@teamix/hooks';
 import './index.scss';
+import cls from 'classnames';
+import ProInfo from '../..';
 
 var ProInfoGroup = function ProInfoGroup(props) {
   var children = props.children,
       url = props.url,
       method = props.method,
       params = props.params,
-      formatResult = props.formatResult;
+      formatResult = props.formatResult,
+      onSuccess = props.onSuccess,
+      onError = props.onError,
+      formatParams = props.formatParams,
+      beforeRequest = props.beforeRequest,
+      extendParams = props.extendParams,
+      _props$className = props.className,
+      className = _props$className === void 0 ? '' : _props$className,
+      _props$compacted = props.compacted,
+      compacted = _props$compacted === void 0 ? true : _props$compacted,
+      _props$divider = props.divider,
+      divider = _props$divider === void 0 ? true : _props$divider,
+      style = props.style,
+      _props$backgroundColo = props.backgroundColor,
+      backgroundColor = _props$backgroundColo === void 0 ? '' : _props$backgroundColo,
+      others = _objectWithoutProperties(props, _excluded);
+
   var ref = useRef();
   var size = useSize(ref);
-  return /*#__PURE__*/React.createElement(ProInfoGroupContext.Provider, {
-    value: {
-      visible: true,
-      size: size,
-      url: url,
-      method: method,
-      params: params,
-      formatResult: formatResult
+  var infoType = 'infoDom';
+
+  if (Array.isArray(children)) {
+    if ( /*#__PURE__*/isValidElement(children === null || children === void 0 ? void 0 : children[0])) {
+      infoType = 'infoDomGroup';
+    } else {
+      infoType = 'infoPropsGroup';
     }
+  }
+
+  var providerValue = {
+    visible: true,
+    size: size,
+    url: url,
+    method: method,
+    params: params,
+    formatResult: formatResult,
+    onSuccess: onSuccess,
+    onError: onError,
+    formatParams: formatParams,
+    beforeRequest: beforeRequest,
+    extendParams: extendParams
+  };
+  var proInfoClassName = cls({
+    'teamix-pro-info-group-item': true,
+    'teamix-pro-info-group-item-divider': divider
+  });
+  return /*#__PURE__*/React.createElement(ProInfoGroupContext.Provider, {
+    value: providerValue
   }, /*#__PURE__*/React.createElement("div", {
-    className: "teamix-pro-info-group",
+    className: "teamix-pro-info-group ".concat(backgroundColor, " ").concat(className),
+    style: style,
     ref: ref
-  }, Array.isArray(children) && (children === null || children === void 0 ? void 0 : children.map(function (item, index) {
+  }, infoType === 'infoDomGroup' && (children === null || children === void 0 ? void 0 : children.map(function (item, index) {
     return /*#__PURE__*/React.createElement("div", {
-      className: "teamix-pro-info-group-item",
+      className: proInfoClassName,
       key: index
     }, item);
-  })), !Array.isArray(children) && /*#__PURE__*/React.createElement("div", {
-    className: "teamix-pro-info-group-item"
+  })), infoType === 'infoPropsGroup' && (children === null || children === void 0 ? void 0 : children.map(function (item, index) {
+    return /*#__PURE__*/React.createElement("div", {
+      className: proInfoClassName,
+      key: index
+    }, /*#__PURE__*/React.createElement(ProInfo, _objectSpread({
+      compacted: compacted
+    }, item)));
+  })), infoType === 'infoDom' && /*#__PURE__*/React.createElement("div", {
+    className: proInfoClassName
   }, children)));
 };