@teamix/pro 1.4.5 → 1.4.6

package/es/actions/dialog-form.js

@@ -29,7 +29,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 React, { useState, useEffect, createRef } from 'react';
+import React, { useState, useEffect, createRef, useMemo } from 'react';
 import { useHistory } from 'react-router-dom';
 import { Loading } from '@alicloudfe/components';
 import ProForm, { createForm } from '../form';
@@ -93,15 +93,22 @@ var DialogForm = function DialogForm(props) {
       innerFormRef = props.innerFormRef,
       _props$validateFirst = props.validateFirst,
       validateFirst = _props$validateFirst === void 0 ? true : _props$validateFirst;
-
-  var _getSchemaAndFormProp = getSchemaAndFormProps(schema, formProps),
-      formSchema = _getSchemaAndFormProp.schema,
-      others = _objectWithoutProperties(_getSchemaAndFormProp, _excluded);
-
-  var form = createForm({
-    initialValues: getTargetValue(initialValues, context),
-    validateFirst: validateFirst
-  });
+  var form = useMemo(function () {
+    return createForm({
+      initialValues: getTargetValue(initialValues, context),
+      validateFirst: validateFirst
+    });
+  }, [validateFirst, initialValues, context]);
+
+  var _useMemo = useMemo(function () {
+    return getSchemaAndFormProps(schema, formProps);
+  }, [schema, formProps]),
+      formSchema = _useMemo.schema,
+      others = _objectWithoutProperties(_useMemo, _excluded);
+
+  var otherFormProps = useMemo(function () {
+    return addContext(getTargetValue(others, context), context);
+  }, [context, JSON.stringify(others)]);
 
   var _useState = useState(false),
       _useState2 = _slicedToArray(_useState, 2),
@@ -134,7 +141,7 @@ var DialogForm = function DialogForm(props) {
   }, /*#__PURE__*/React.createElement(ProForm, _objectSpread(_objectSpread({
     form: form,
     schema: formSchema
-  }, getDefaultFormPropsByDialogSize(size)), addContext(getTargetValue(others, context), context))));
+  }, getDefaultFormPropsByDialogSize(size)), otherFormProps)));
 };
 
 export function useDialogFormAction(action, context) {

package/es/form/index.d.ts

@@ -16,8 +16,8 @@ declare const formilyReact: {
     };
     useFormDisplayValues: () => any;
     Schema: typeof originalFormilyReact.Schema;
-    FormProvider: import("react").FC<originalFormilyReact.IProviderProps>;
-    FormConsumer: import("react").FC<originalFormilyReact.IFormSpyProps>;
+    FormProvider: originalFormilyReact.ReactFC<originalFormilyReact.IProviderProps>;
+    FormConsumer: originalFormilyReact.ReactFC<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;
@@ -30,8 +30,8 @@ declare const formilyReact: {
         <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>;
-    ExpressionScope: import("react").FC<originalFormilyReact.IExpressionScopeProps>;
+    RecursionField: originalFormilyReact.ReactFC<originalFormilyReact.IRecursionFieldProps>;
+    ExpressionScope: originalFormilyReact.ReactFC<originalFormilyReact.IExpressionScopeProps>;
     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;
@@ -81,17 +81,18 @@ declare const formilyReact: {
     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>;
+    SchemaComponentsContext: import("react").Context<originalFormilyReact.SchemaReactComponents>;
     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<{
+    mapProps<T extends originalFormilyReact.JSXComponent>(...args: originalFormilyReact.IStateMapper<import("react").ComponentProps<T>>[]): (target: T) => import("react").MemoExoticComponent<originalFormilyReact.ReactFC<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<originalFormilyReact.ReactFC<{
         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>>;
+    Observer: import("react").MemoExoticComponent<originalFormilyReact.ReactFC<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>;

package/es/index.d.ts

@@ -28,5 +28,5 @@ export * from './table';
 export * from './sidebar';
 export * from './utils';
 export * from './timeline';
-declare const version = "1.4.5";
+declare const version = "1.4.6";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, TeamixIcon, hooks, nocode, templates, utils, };

package/es/index.js

@@ -31,6 +31,6 @@ export * from './table';
 export * from './sidebar';
 export * from './utils';
 export * from './timeline';
-var version = '1.4.5';
+var version = '1.4.6';
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, // ProLayout,
 ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, TeamixIcon, hooks, nocode, templates, utils };

package/es/table/components/Pagination/index.js

@@ -98,7 +98,7 @@ export default (function (props) {
           lineHeight: '18px'
         }
       }, getMessage('total', {
-        total: total
+        total: new Intl.NumberFormat().format(total)
       }))
     }, /*#__PURE__*/React.createElement("div", {
       className: prefixCls('custom-total-content')
@@ -216,7 +216,7 @@ export default (function (props) {
         return /*#__PURE__*/React.createElement(Pagination, _objectSpread(_objectSpread({}, commonPaginationProps), {}, {
           totalRender: function totalRender(total) {
             return getMessage('total', {
-              total: total
+              total: new Intl.NumberFormat().format(total)
             });
           }
         }, otherProps));
@@ -226,7 +226,7 @@ export default (function (props) {
           pageShowCount: 3,
           totalRender: function totalRender(total) {
             return getMessage('total', {
-              total: total
+              total: new Intl.NumberFormat().format(total)
             });
           }
         }, otherProps));

package/es/table/index.js

@@ -936,7 +936,7 @@ var ProTable = function ProTable(props) {
         // pageSizePosition="end"
         totalRender: function totalRender(total) {
           return getMessage('total', {
-            total: total
+            total: new Intl.NumberFormat().format(total)
           });
         },
         pageSize: pageSize,

package/lib/actions/dialog-form.js

@@ -114,15 +114,22 @@ var DialogForm = function DialogForm(props) {
       innerFormRef = props.innerFormRef,
       _props$validateFirst = props.validateFirst,
       validateFirst = _props$validateFirst === void 0 ? true : _props$validateFirst;
-
-  var _getSchemaAndFormProp = getSchemaAndFormProps(schema, formProps),
-      formSchema = _getSchemaAndFormProp.schema,
-      others = _objectWithoutProperties(_getSchemaAndFormProp, _excluded);
-
-  var form = (0, _form.createForm)({
-    initialValues: (0, _utils.getTargetValue)(initialValues, context),
-    validateFirst: validateFirst
-  });
+  var form = (0, _react.useMemo)(function () {
+    return (0, _form.createForm)({
+      initialValues: (0, _utils.getTargetValue)(initialValues, context),
+      validateFirst: validateFirst
+    });
+  }, [validateFirst, initialValues, context]);
+
+  var _useMemo = (0, _react.useMemo)(function () {
+    return getSchemaAndFormProps(schema, formProps);
+  }, [schema, formProps]),
+      formSchema = _useMemo.schema,
+      others = _objectWithoutProperties(_useMemo, _excluded);
+
+  var otherFormProps = (0, _react.useMemo)(function () {
+    return (0, _utils2.addContext)((0, _utils.getTargetValue)(others, context), context);
+  }, [context, JSON.stringify(others)]);
 
   var _useState = (0, _react.useState)(false),
       _useState2 = _slicedToArray(_useState, 2),
@@ -155,7 +162,7 @@ var DialogForm = function DialogForm(props) {
   }, /*#__PURE__*/_react.default.createElement(_form.default, _objectSpread(_objectSpread({
     form: form,
     schema: formSchema
-  }, getDefaultFormPropsByDialogSize(size)), (0, _utils2.addContext)((0, _utils.getTargetValue)(others, context), context))));
+  }, getDefaultFormPropsByDialogSize(size)), otherFormProps)));
 };
 
 function useDialogFormAction(action, context) {

package/lib/form/index.d.ts

@@ -16,8 +16,8 @@ declare const formilyReact: {
     };
     useFormDisplayValues: () => any;
     Schema: typeof originalFormilyReact.Schema;
-    FormProvider: import("react").FC<originalFormilyReact.IProviderProps>;
-    FormConsumer: import("react").FC<originalFormilyReact.IFormSpyProps>;
+    FormProvider: originalFormilyReact.ReactFC<originalFormilyReact.IProviderProps>;
+    FormConsumer: originalFormilyReact.ReactFC<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;
@@ -30,8 +30,8 @@ declare const formilyReact: {
         <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>;
-    ExpressionScope: import("react").FC<originalFormilyReact.IExpressionScopeProps>;
+    RecursionField: originalFormilyReact.ReactFC<originalFormilyReact.IRecursionFieldProps>;
+    ExpressionScope: originalFormilyReact.ReactFC<originalFormilyReact.IExpressionScopeProps>;
     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;
@@ -81,17 +81,18 @@ declare const formilyReact: {
     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>;
+    SchemaComponentsContext: import("react").Context<originalFormilyReact.SchemaReactComponents>;
     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<{
+    mapProps<T extends originalFormilyReact.JSXComponent>(...args: originalFormilyReact.IStateMapper<import("react").ComponentProps<T>>[]): (target: T) => import("react").MemoExoticComponent<originalFormilyReact.ReactFC<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<originalFormilyReact.ReactFC<{
         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>>;
+    Observer: import("react").MemoExoticComponent<originalFormilyReact.ReactFC<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>;

package/lib/index.d.ts

@@ -28,5 +28,5 @@ export * from './table';
 export * from './sidebar';
 export * from './utils';
 export * from './timeline';
-declare const version = "1.4.5";
+declare const version = "1.4.6";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, TeamixIcon, hooks, nocode, templates, utils, };

package/lib/index.js

@@ -314,5 +314,5 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 // 设置图标源
 _icon.default.setConfig(_utils.default.getTeamixIconConfig());
 
-var version = '1.4.5';
+var version = '1.4.6';
 exports.version = version;

package/lib/table/components/Pagination/index.js

@@ -115,7 +115,7 @@ var _default = function _default(props) {
           lineHeight: '18px'
         }
       }, (0, _utils.getMessage)('total', {
-        total: total
+        total: new Intl.NumberFormat().format(total)
       }))
     }, /*#__PURE__*/_react.default.createElement("div", {
       className: prefixCls('custom-total-content')
@@ -233,7 +233,7 @@ var _default = function _default(props) {
         return /*#__PURE__*/_react.default.createElement(_components.Pagination, _objectSpread(_objectSpread({}, commonPaginationProps), {}, {
           totalRender: function totalRender(total) {
             return (0, _utils.getMessage)('total', {
-              total: total
+              total: new Intl.NumberFormat().format(total)
             });
           }
         }, otherProps));
@@ -243,7 +243,7 @@ var _default = function _default(props) {
           pageShowCount: 3,
           totalRender: function totalRender(total) {
             return (0, _utils.getMessage)('total', {
-              total: total
+              total: new Intl.NumberFormat().format(total)
             });
           }
         }, otherProps));

package/lib/table/index.js

@@ -979,7 +979,7 @@ var ProTable = function ProTable(props) {
         // pageSizePosition="end"
         totalRender: function totalRender(total) {
           return (0, _utils.getMessage)('total', {
-            total: total
+            total: new Intl.NumberFormat().format(total)
           });
         },
         pageSize: pageSize,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamix/pro",
-  "version": "1.4.5",
+  "version": "1.4.6",
   "description": "TeamixPro大包",
   "keywords": [
     "aliyun",
@@ -36,17 +36,15 @@
   ],
   "private": false,
   "dependencies": {
-    "@formily/core": "2.0.15",
-    "@formily/react": "2.0.15",
-    "@teamix/formily": "2.0.15-1",
+    "@teamix/formily": "2.1.4",
     "@teamix/hooks": "^0.1.0",
     "@teamix/pop-confirm": "^1.2.4",
     "@teamix/pro-field": "^1.0.0",
     "@teamix/pro-page-container": "^1.0.0",
     "@teamix/pro-skeleton": "^1.0.0",
+    "@teamix/result": "^1.0.29",
     "@teamix/svg": "^1.0.11",
     "@teamix/utils": "^0.1.0",
-    "@teamix/result": "^1.0.29",
     "classnames": "^2.3.1",
     "lodash.clonedeep": "^4.5.0",
     "lodash.debounce": "^4.0.8",