@teamix/pro 1.4.24 → 1.4.25

package/es/actions/dialog.d.ts

@@ -31,6 +31,8 @@ export interface DialogAction extends Omit<RequestAction, 'url'>, Omit<QuickShow
     onCancel?: any;
     /** 隐藏footer区域  */
     hideFooter?: boolean;
+    /** 支持通过传函数自定义底部按钮 */
+    footer?: any;
 }
 export declare function useDialogAction(action: DialogAction, actionContext?: any, hasForm?: boolean): {
     [x: string]: (e: React.MouseEvent<HTMLElement, MouseEvent>) => Promise<void>;

package/es/actions/dialog.js

@@ -1,5 +1,5 @@
 var _excluded = ["trigger", "url", "customRequest", "method", "params", "data", "extendParams", "successMsg", "errorMsg", "formatParams", "formatResult", "onSuccess", "onError", "onOk", "onCancel", "hideFooter"],
-    _excluded2 = ["title", "content", "component", "schema", "onFinish", "dialogType", "dialogQuickShowType", "messageType", "popType", "beforeRequest", "onTrigger", "link", "beforeContent", "afterContent", "message", "footerDescription", "footerAlign", "className"];
+    _excluded2 = ["title", "content", "component", "schema", "onFinish", "dialogType", "dialogQuickShowType", "messageType", "popType", "beforeRequest", "onTrigger", "link", "beforeContent", "afterContent", "message", "footerDescription", "footerAlign", "footer", "className"];
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
@@ -121,6 +121,7 @@ export function useDialogAction(action, actionContext, hasForm) {
         message = _getTargetValue.message,
         footerDescription = _getTargetValue.footerDescription,
         footerAlign = _getTargetValue.footerAlign,
+        footer = _getTargetValue.footer,
         className = _getTargetValue.className,
         containerOtherProps = _objectWithoutProperties(_getTargetValue, _excluded2);
 
@@ -244,7 +245,7 @@ export function useDialogAction(action, actionContext, hasForm) {
       className: classnames('teamix-pro-dialog-footer-description', getFooterAlignClass(isDrawer, footerAlign))
     }, renderDialogFooterDescription(footerDescription)))), _defineProperty(_objectSpread2, "footerAlign", footerAlign), _defineProperty(_objectSpread2, "className", classnames('teamix-pro-action-dialog', {
       'has-footer-description': !!footerDescription
-    })), _objectSpread2), containerProps), containerOtherProps); // TODO Drawer 基础组件未支持此配置，日后支持，并修改onOk、onCancel写法
+    })), _defineProperty(_objectSpread2, "footer", addContextForReactNode(footer, dialogContext)), _objectSpread2), containerProps), containerOtherProps); // TODO Drawer 基础组件未支持此配置，日后支持，并修改onOk、onCancel写法
 
 
     if ((!dialogType || dialogType === 'dialog') && hideFooter) {

package/es/form/Filter/AdvancedFilter.js

@@ -22,7 +22,7 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 
 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, { memo, useMemo } from 'react';
+import React, { memo, useEffect, useMemo } from 'react';
 import { usePrefixCls, getMessage, cls, isBool } from '@teamix/utils';
 import ProForm from '../ProForm';
 import { mergeArrayValue } from '../utils';
@@ -47,7 +47,7 @@ var AdvancedFilter = /*#__PURE__*/memo(function (props) {
   var prefixCls = usePrefixCls('teamix-pro-form-query-filter-advanced');
   var gridSchema = useMemo(function () {
     return [{
-      name: 'FormGrid',
+      name: 'AdvancedFilterFormGrid',
       component: 'FormGrid',
       props: _objectSpread({
         breakpoints: [480, 720, 990, 1200, Infinity],
@@ -67,6 +67,7 @@ var AdvancedFilter = /*#__PURE__*/memo(function (props) {
             align: 'right'
           },
           children: [{
+            name: 'AdvancedFilterReset',
             component: 'Reset',
             props: {
               onResetValidateSuccess: onReset,
@@ -86,6 +87,11 @@ var AdvancedFilter = /*#__PURE__*/memo(function (props) {
       }])
     }];
   }, [schema, onReset]);
+  useEffect(function () {
+    var _otherProps$form;
+
+    otherProps === null || otherProps === void 0 ? void 0 : (_otherProps$form = otherProps.form) === null || _otherProps$form === void 0 ? void 0 : _otherProps$form.clearFormGraph('AdvancedFilterReset');
+  }, [onReset]);
   var getTeamixLayout = useMemo(function () {
     return breakpoints === true ? {
       breakpoints: [990],

package/es/form/ProForm/index.scss

@@ -376,3 +376,36 @@
     }
   }
 }
+
+// inset 内嵌模式描述文案和校验样式修改
+.#{$form-item-cls}-inset {
+  // 描述+校验
+  &.#{$form-item-cls}-feedback-has-text.#{$form-item-cls}-extra-wrap {
+    margin-bottom: 42px;
+    .#{$form-item-cls}-error-help {
+      position: absolute;
+      left: 0px;
+    }
+    .#{$form-item-cls}-extra {
+      position: absolute;
+      bottom: -40px;
+      left: 0px;
+    }
+  }
+  // 描述
+  &.#{$form-item-cls}-extra-wrap {
+    margin-bottom: 40px;
+    .#{$form-item-cls}-extra {
+      position: absolute;
+      left: 0px;
+    }
+  }
+  // 校验
+  &.#{$form-item-cls}-feedback-has-text {
+    margin-bottom: 40px;
+    .#{$form-item-cls}-error-help {
+      position: absolute;
+      left: 0px;
+    }
+  }
+}

package/es/form/index.d.ts

@@ -32,6 +32,8 @@ declare const formilyReact: {
     };
     RecursionField: originalFormilyReact.ReactFC<originalFormilyReact.IRecursionFieldProps>;
     ExpressionScope: originalFormilyReact.ReactFC<originalFormilyReact.IExpressionScopeProps>;
+    RecordsScope: originalFormilyReact.ReactFC<originalFormilyReact.IRecordsScopeProps>;
+    RecordScope: originalFormilyReact.ReactFC<originalFormilyReact.IRecordScopeProps>;
     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;
@@ -98,6 +100,7 @@ declare const formilyReact: {
     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;
+    useExpressionScope: () => any;
 };
 import { customComponent } from './ProForm/customComponent';
 export { formilyReact, customComponent };

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.24";
+declare const version = "1.4.25";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, TeamixIcon, hooks, nocode, templates, utils, };

package/es/index.js

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

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

@@ -67,7 +67,18 @@ var InfoValueItem = function InfoValueItem(props) {
       successMessage = _infoItem$successMess === void 0 ? 'success' : _infoItem$successMess,
       actions = infoItem.actions,
       extra = infoItem.extra,
-      valueType = infoItem.valueType; // 获取处理过的 render
+      valueType = infoItem.valueType,
+      _infoItem$editProForm = infoItem.editProFormProps,
+      editProFormProps = _infoItem$editProForm === void 0 ? {} : _infoItem$editProForm; // 获取配置
+
+  var getInfoItemProps = function getInfoItemProps(prop) {
+    if (typeof prop === 'function') {
+      return prop === null || prop === void 0 ? void 0 : prop(value, record);
+    }
+
+    return prop;
+  }; // 获取处理过的 render
+
 
   var getRender = function getRender() {
     var _processRenderFunctio;
@@ -225,10 +236,10 @@ var InfoValueItem = function InfoValueItem(props) {
   }; // 重写编辑逻辑替代field原有逻辑
 
 
-  if (isEdit) {
+  if (getInfoItemProps(isEdit)) {
     // 渲染表单
     var renderContent = function renderContent() {
-      return /*#__PURE__*/React.createElement(ProForm, {
+      return /*#__PURE__*/React.createElement(ProForm, _objectSpread({
         schema: [{
           name: dataIndex,
           component: 'Input',
@@ -236,7 +247,7 @@ var InfoValueItem = function InfoValueItem(props) {
           default: value
         }],
         form: dataFilterForm
-      });
+      }, getInfoItemProps(editProFormProps)));
     }; // 表单提交
 
 

package/es/info/typing.d.ts

@@ -4,6 +4,7 @@ import { Method } from 'axios';
 import React from 'react';
 import { CommonRequestConfig } from '@teamix/utils';
 import { ProCardProps } from '../card';
+import { ProFormProps } from '../form';
 /** 列record函数 */
 declare type ProInfoCellFunProp = (value: any, record: any) => any;
 declare type FieldRenderProps = keyof ProFieldRenderProps;
@@ -77,7 +78,7 @@ export interface ProInfoColumnsProps {
     /** 合并行 */
     colSpan?: number;
     /** 是否可被编辑 */
-    isEdit?: boolean;
+    isEdit?: boolean | ProInfoCellFunProp;
     /** 点击确定的回调函数 */
     editOnOk?: (form: any, e: React.MouseEvent) => void | Promise<any>;
     /** 点击取消的回调函数 */
@@ -88,6 +89,8 @@ export interface ProInfoColumnsProps {
     editMethod?: Method;
     /** 如需自定义调用参数格式，则可以设定此值在请求前对 params 进行自定义，如果返回false则可以阻止请求 */
     editFormatParams?: (params: any, record: any) => typeof params;
+    /** edit ProForm 配置 */
+    editProFormProps?: ProFormProps | ProInfoCellFunProp;
     /** 编辑请求成功提示文案 */
     successMessage?: string;
     /** 列 actions 配置 */

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

@@ -1,4 +1,4 @@
-var _excluded = ["className", "onChange", "total", "totalRender", "pageSize", "current", "pageSizeList", "pageSizeSelector", "onPageSizeChange", "responsivePaginationType"];
+var _excluded = ["className", "onChange", "total", "pageSize", "current", "pageSizeList", "pageSizeSelector", "onPageSizeChange", "responsivePaginationType"];
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
@@ -32,7 +32,6 @@ export default (function (props) {
   var className = props.className,
       propsOnChange = props.onChange,
       total = props.total,
-      totalRender = props.totalRender,
       pageSize = props.pageSize,
       current = props.current,
       pageSizeList = props.pageSizeList,

package/es/table/index.js

@@ -862,6 +862,7 @@ var ProTable = function ProTable(props) {
 
       (_actionRef$current6 = actionRef.current) === null || _actionRef$current6 === void 0 ? void 0 : (_actionRef$current6$c = _actionRef$current6.clearRowSelection) === null || _actionRef$current6$c === void 0 ? void 0 : _actionRef$current6$c.call(_actionRef$current6);
       setCurrentPage(1);
+      console.log('currentPageSize1', pageSize);
 
       _request(_defineProperty({}, targetPageKey, 1), false, values);
     },
@@ -871,6 +872,7 @@ var ProTable = function ProTable(props) {
       (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onReset) && (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onReset());
       (_dataFilterFormRef$cu3 = dataFilterFormRef.current) === null || _dataFilterFormRef$cu3 === void 0 ? void 0 : _dataFilterFormRef$cu3.reset();
       setCurrentPage(1);
+      console.log('currentPageSize2', pageSize);
 
       _request(_defineProperty({}, targetPageKey, 1), false, values);
     }
@@ -1008,13 +1010,24 @@ var ProTable = function ProTable(props) {
             count: selectedCount
           })));
         }
+      } else if (footerAction) {
+        if (showSkeleton) {
+          return /*#__PURE__*/React.createElement("div", {
+            className: cls('footer-left-wrapper')
+          }, /*#__PURE__*/React.createElement(Skeleton.Footer.Operation, null));
+        } else {
+          return /*#__PURE__*/React.createElement("div", {
+            className: cls('footer-left-wrapper')
+          }, footerAction && renderFooterAction());
+        }
       }
     }
 
     if (showPagination) {
       return /*#__PURE__*/React.createElement("div", {
         className: cls('footer', {
-          'footer-has-rowSelection': rowSelection
+          'footer-has-rowSelection': rowSelection,
+          'footer-has-action': footerAction
         })
       }, renderRowSelection(), /*#__PURE__*/React.createElement("div", {
         className: cls('footer-right-wrapper')

package/es/table/index.scss

@@ -16,7 +16,7 @@ $fullscreenPadding: 24px;
     box-shadow: var(--shadow-1-up);
     background: var(--color-fill1-1);
   }
-  &-footer-has-rowSelection {
+  &-footer-has-rowSelection, &-footer-has-action {
     display: flex;
     align-items: center;
     padding: 8px 0;

package/lib/actions/dialog.d.ts

@@ -31,6 +31,8 @@ export interface DialogAction extends Omit<RequestAction, 'url'>, Omit<QuickShow
     onCancel?: any;
     /** 隐藏footer区域  */
     hideFooter?: boolean;
+    /** 支持通过传函数自定义底部按钮 */
+    footer?: any;
 }
 export declare function useDialogAction(action: DialogAction, actionContext?: any, hasForm?: boolean): {
     [x: string]: (e: React.MouseEvent<HTMLElement, MouseEvent>) => Promise<void>;

package/lib/actions/dialog.js

@@ -31,7 +31,7 @@ var _request = require("./request");
 var _utils2 = require("./utils");
 
 var _excluded = ["trigger", "url", "customRequest", "method", "params", "data", "extendParams", "successMsg", "errorMsg", "formatParams", "formatResult", "onSuccess", "onError", "onOk", "onCancel", "hideFooter"],
-    _excluded2 = ["title", "content", "component", "schema", "onFinish", "dialogType", "dialogQuickShowType", "messageType", "popType", "beforeRequest", "onTrigger", "link", "beforeContent", "afterContent", "message", "footerDescription", "footerAlign", "className"];
+    _excluded2 = ["title", "content", "component", "schema", "onFinish", "dialogType", "dialogQuickShowType", "messageType", "popType", "beforeRequest", "onTrigger", "link", "beforeContent", "afterContent", "message", "footerDescription", "footerAlign", "footer", "className"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -147,6 +147,7 @@ function useDialogAction(action, actionContext, hasForm) {
         message = _getTargetValue.message,
         footerDescription = _getTargetValue.footerDescription,
         footerAlign = _getTargetValue.footerAlign,
+        footer = _getTargetValue.footer,
         className = _getTargetValue.className,
         containerOtherProps = _objectWithoutProperties(_getTargetValue, _excluded2);
 
@@ -270,7 +271,7 @@ function useDialogAction(action, actionContext, hasForm) {
       className: (0, _classnames.default)('teamix-pro-dialog-footer-description', getFooterAlignClass(isDrawer, footerAlign))
     }, renderDialogFooterDescription(footerDescription)))), _defineProperty(_objectSpread2, "footerAlign", footerAlign), _defineProperty(_objectSpread2, "className", (0, _classnames.default)('teamix-pro-action-dialog', {
       'has-footer-description': !!footerDescription
-    })), _objectSpread2), containerProps), containerOtherProps); // TODO Drawer 基础组件未支持此配置，日后支持，并修改onOk、onCancel写法
+    })), _defineProperty(_objectSpread2, "footer", addContextForReactNode(footer, dialogContext)), _objectSpread2), containerProps), containerOtherProps); // TODO Drawer 基础组件未支持此配置，日后支持，并修改onOk、onCancel写法
 
 
     if ((!dialogType || dialogType === 'dialog') && hideFooter) {

package/lib/form/Filter/AdvancedFilter.js

@@ -65,7 +65,7 @@ var AdvancedFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
   var prefixCls = (0, _utils.usePrefixCls)('teamix-pro-form-query-filter-advanced');
   var gridSchema = (0, _react.useMemo)(function () {
     return [{
-      name: 'FormGrid',
+      name: 'AdvancedFilterFormGrid',
       component: 'FormGrid',
       props: _objectSpread({
         breakpoints: [480, 720, 990, 1200, Infinity],
@@ -85,6 +85,7 @@ var AdvancedFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
             align: 'right'
           },
           children: [{
+            name: 'AdvancedFilterReset',
             component: 'Reset',
             props: {
               onResetValidateSuccess: onReset,
@@ -104,6 +105,11 @@ var AdvancedFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
       }])
     }];
   }, [schema, onReset]);
+  (0, _react.useEffect)(function () {
+    var _otherProps$form;
+
+    otherProps === null || otherProps === void 0 ? void 0 : (_otherProps$form = otherProps.form) === null || _otherProps$form === void 0 ? void 0 : _otherProps$form.clearFormGraph('AdvancedFilterReset');
+  }, [onReset]);
   var getTeamixLayout = (0, _react.useMemo)(function () {
     return breakpoints === true ? {
       breakpoints: [990],

package/lib/form/ProForm/index.scss

@@ -376,3 +376,36 @@
     }
   }
 }
+
+// inset 内嵌模式描述文案和校验样式修改
+.#{$form-item-cls}-inset {
+  // 描述+校验
+  &.#{$form-item-cls}-feedback-has-text.#{$form-item-cls}-extra-wrap {
+    margin-bottom: 42px;
+    .#{$form-item-cls}-error-help {
+      position: absolute;
+      left: 0px;
+    }
+    .#{$form-item-cls}-extra {
+      position: absolute;
+      bottom: -40px;
+      left: 0px;
+    }
+  }
+  // 描述
+  &.#{$form-item-cls}-extra-wrap {
+    margin-bottom: 40px;
+    .#{$form-item-cls}-extra {
+      position: absolute;
+      left: 0px;
+    }
+  }
+  // 校验
+  &.#{$form-item-cls}-feedback-has-text {
+    margin-bottom: 40px;
+    .#{$form-item-cls}-error-help {
+      position: absolute;
+      left: 0px;
+    }
+  }
+}

package/lib/form/index.d.ts

@@ -32,6 +32,8 @@ declare const formilyReact: {
     };
     RecursionField: originalFormilyReact.ReactFC<originalFormilyReact.IRecursionFieldProps>;
     ExpressionScope: originalFormilyReact.ReactFC<originalFormilyReact.IExpressionScopeProps>;
+    RecordsScope: originalFormilyReact.ReactFC<originalFormilyReact.IRecordsScopeProps>;
+    RecordScope: originalFormilyReact.ReactFC<originalFormilyReact.IRecordScopeProps>;
     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;
@@ -98,6 +100,7 @@ declare const formilyReact: {
     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;
+    useExpressionScope: () => any;
 };
 import { customComponent } from './ProForm/customComponent';
 export { formilyReact, customComponent };

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.24";
+declare const version = "1.4.25";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, TeamixIcon, hooks, nocode, templates, utils, };

package/lib/index.js

@@ -317,5 +317,5 @@ if (!((_window = window) === null || _window === void 0 ? void 0 : _window.TEAMI
   _icon.default.setConfig(_utils.default.getTeamixIconConfig());
 }
 
-var version = '1.4.24';
+var version = '1.4.25';
 exports.version = version;

package/lib/info/components/InfoValueItem/index.js

@@ -91,7 +91,18 @@ var InfoValueItem = function InfoValueItem(props) {
       successMessage = _infoItem$successMess === void 0 ? 'success' : _infoItem$successMess,
       actions = infoItem.actions,
       extra = infoItem.extra,
-      valueType = infoItem.valueType; // 获取处理过的 render
+      valueType = infoItem.valueType,
+      _infoItem$editProForm = infoItem.editProFormProps,
+      editProFormProps = _infoItem$editProForm === void 0 ? {} : _infoItem$editProForm; // 获取配置
+
+  var getInfoItemProps = function getInfoItemProps(prop) {
+    if (typeof prop === 'function') {
+      return prop === null || prop === void 0 ? void 0 : prop(value, record);
+    }
+
+    return prop;
+  }; // 获取处理过的 render
+
 
   var getRender = function getRender() {
     var _processRenderFunctio;
@@ -249,10 +260,10 @@ var InfoValueItem = function InfoValueItem(props) {
   }; // 重写编辑逻辑替代field原有逻辑
 
 
-  if (isEdit) {
+  if (getInfoItemProps(isEdit)) {
     // 渲染表单
     var renderContent = function renderContent() {
-      return /*#__PURE__*/_react.default.createElement(_form.default, {
+      return /*#__PURE__*/_react.default.createElement(_form.default, _objectSpread({
         schema: [{
           name: dataIndex,
           component: 'Input',
@@ -260,7 +271,7 @@ var InfoValueItem = function InfoValueItem(props) {
           default: value
         }],
         form: dataFilterForm
-      });
+      }, getInfoItemProps(editProFormProps)));
     }; // 表单提交
 
 

package/lib/info/typing.d.ts

@@ -4,6 +4,7 @@ import { Method } from 'axios';
 import React from 'react';
 import { CommonRequestConfig } from '@teamix/utils';
 import { ProCardProps } from '../card';
+import { ProFormProps } from '../form';
 /** 列record函数 */
 declare type ProInfoCellFunProp = (value: any, record: any) => any;
 declare type FieldRenderProps = keyof ProFieldRenderProps;
@@ -77,7 +78,7 @@ export interface ProInfoColumnsProps {
     /** 合并行 */
     colSpan?: number;
     /** 是否可被编辑 */
-    isEdit?: boolean;
+    isEdit?: boolean | ProInfoCellFunProp;
     /** 点击确定的回调函数 */
     editOnOk?: (form: any, e: React.MouseEvent) => void | Promise<any>;
     /** 点击取消的回调函数 */
@@ -88,6 +89,8 @@ export interface ProInfoColumnsProps {
     editMethod?: Method;
     /** 如需自定义调用参数格式，则可以设定此值在请求前对 params 进行自定义，如果返回false则可以阻止请求 */
     editFormatParams?: (params: any, record: any) => typeof params;
+    /** edit ProForm 配置 */
+    editProFormProps?: ProFormProps | ProInfoCellFunProp;
     /** 编辑请求成功提示文案 */
     successMessage?: string;
     /** 列 actions 配置 */

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

@@ -17,7 +17,7 @@ var _hooks = require("@teamix/hooks");
 
 require("./index.scss");
 
-var _excluded = ["className", "onChange", "total", "totalRender", "pageSize", "current", "pageSizeList", "pageSizeSelector", "onPageSizeChange", "responsivePaginationType"];
+var _excluded = ["className", "onChange", "total", "pageSize", "current", "pageSizeList", "pageSizeSelector", "onPageSizeChange", "responsivePaginationType"];
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
@@ -49,7 +49,6 @@ var _default = function _default(props) {
   var className = props.className,
       propsOnChange = props.onChange,
       total = props.total,
-      totalRender = props.totalRender,
       pageSize = props.pageSize,
       current = props.current,
       pageSizeList = props.pageSizeList,

package/lib/table/index.js

@@ -906,6 +906,7 @@ var ProTable = function ProTable(props) {
 
       (_actionRef$current6 = actionRef.current) === null || _actionRef$current6 === void 0 ? void 0 : (_actionRef$current6$c = _actionRef$current6.clearRowSelection) === null || _actionRef$current6$c === void 0 ? void 0 : _actionRef$current6$c.call(_actionRef$current6);
       setCurrentPage(1);
+      console.log('currentPageSize1', pageSize);
 
       _request(_defineProperty({}, targetPageKey, 1), false, values);
     },
@@ -915,6 +916,7 @@ var ProTable = function ProTable(props) {
       (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onReset) && (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onReset());
       (_dataFilterFormRef$cu3 = dataFilterFormRef.current) === null || _dataFilterFormRef$cu3 === void 0 ? void 0 : _dataFilterFormRef$cu3.reset();
       setCurrentPage(1);
+      console.log('currentPageSize2', pageSize);
 
       _request(_defineProperty({}, targetPageKey, 1), false, values);
     }
@@ -1052,13 +1054,24 @@ var ProTable = function ProTable(props) {
             count: selectedCount
           })));
         }
+      } else if (footerAction) {
+        if (showSkeleton) {
+          return /*#__PURE__*/_react.default.createElement("div", {
+            className: cls('footer-left-wrapper')
+          }, /*#__PURE__*/_react.default.createElement(_skeleton.ProSkeletonRaw.Footer.Operation, null));
+        } else {
+          return /*#__PURE__*/_react.default.createElement("div", {
+            className: cls('footer-left-wrapper')
+          }, footerAction && renderFooterAction());
+        }
       }
     }
 
     if (showPagination) {
       return /*#__PURE__*/_react.default.createElement("div", {
         className: cls('footer', {
-          'footer-has-rowSelection': rowSelection
+          'footer-has-rowSelection': rowSelection,
+          'footer-has-action': footerAction
         })
       }, renderRowSelection(), /*#__PURE__*/_react.default.createElement("div", {
         className: cls('footer-right-wrapper')

package/lib/table/index.scss

@@ -16,7 +16,7 @@ $fullscreenPadding: 24px;
     box-shadow: var(--shadow-1-up);
     background: var(--color-fill1-1);
   }
-  &-footer-has-rowSelection {
+  &-footer-has-rowSelection, &-footer-has-action {
     display: flex;
     align-items: center;
     padding: 8px 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamix/pro",
-  "version": "1.4.24",
+  "version": "1.4.25",
   "description": "TeamixPro大包",
   "keywords": [
     "aliyun",
@@ -36,7 +36,7 @@
   ],
   "private": false,
   "dependencies": {
-    "@teamix/formily": "2.1.4",
+    "@teamix/formily": "2.2.4",
     "@teamix/hooks": "^0.1.0",
     "@teamix/pop-confirm": "^1.2.4",
     "@teamix/pro-field": "^1.0.0",