@teamix/pro 1.3.0 → 1.3.1

package/es/actions/dialog-form.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { ProFormProps, ProFormSchema } from '../form';
+import { ProFormProps, ProFormSchema, ProFormType } from '../form';
 import { RequestAction } from './request';
 import { DialogAction } from './dialog';
 export interface DialogFormAction extends DialogAction {
@@ -12,9 +12,14 @@ export interface DialogFormAction extends DialogAction {
     /**
      * @deprecated 建议使用 schema 配置 ProFormProps 代替
      */
-    formProps?: Omit<ProFormProps, 'schema'>;
-    /** 同时支持两种配置方式，如果想完整定制表单，可使用完整的表单配置项 ProFormProps，否则可以只配置 ProFormSchema */
-    schema: ProFormSchema | ProFormProps;
+    formProps?: Omit<ProFormProps, 'schema' | 'form'>;
+    /** 同时支持两种配置方式:
+     * 如果想完整定制表单，可使用完整的表单配置项 ProFormProps，但不可以传 form 字段，可以通过 formRef 获取内部 form 实例。
+     * 否则可以只配置 ProFormSchema
+     */
+    schema: ProFormSchema | Omit<ProFormProps, 'form'>;
+    /** 外部传来的 formRef，用于获取内置 form 实例 */
+    formRef?: React.MutableRefObject<ProFormType | undefined>;
 }
 export declare function useDialogFormAction(action: DialogFormAction, context?: any): {
     [x: string]: (e: React.MouseEvent<HTMLElement, MouseEvent>) => Promise<void>;

package/es/actions/dialog-form.js

@@ -1,5 +1,5 @@
 var _excluded = ["schema"],
-    _excluded2 = ["schema", "useFieldValuesForRequest", "initialValues", "initialRequest", "formProps", "size", "onFinish", "beforeRequest"];
+    _excluded2 = ["schema", "useFieldValuesForRequest", "initialValues", "initialRequest", "formProps", "size", "onFinish", "beforeRequest", "formRef"];
 
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 
@@ -89,7 +89,8 @@ var DialogForm = function DialogForm(props) {
       schema = props.schema,
       formProps = props.formProps,
       context = props.context,
-      formRef = props.formRef;
+      formRef = props.formRef,
+      innerFormRef = props.innerFormRef;
 
   var _getSchemaAndFormProp = getSchemaAndFormProps(schema, formProps),
       formSchema = _getSchemaAndFormProp.schema,
@@ -106,7 +107,11 @@ var DialogForm = function DialogForm(props) {
 
   var history = useHistory();
   useEffect(function () {
-    formRef.current = form;
+    if (formRef) {
+      formRef.current = form;
+    }
+
+    innerFormRef.current = form;
 
     if (initialRequest) {
       setLoading(true);
@@ -141,9 +146,10 @@ export function useDialogFormAction(action, context) {
       size = _action$size === void 0 ? 'small' : _action$size,
       _onFinish = action.onFinish,
       propsBeforeRequest = action.beforeRequest,
+      propsFormRef = action.formRef,
       others = _objectWithoutProperties(action, _excluded2);
 
-  var formRef = /*#__PURE__*/createRef();
+  var innerFormRef = /*#__PURE__*/createRef();
   return useDialogAction(Object.assign({
     size: size,
     closeable: true,
@@ -157,13 +163,14 @@ export function useDialogFormAction(action, context) {
         context: contentContext
       };
       return /*#__PURE__*/React.createElement(DialogForm, _objectSpread({
-        formRef: formRef
+        innerFormRef: innerFormRef,
+        formRef: propsFormRef
       }, dialogFormProps));
     },
     extendParams: useFieldValuesForRequest ? '{{fields}}' : undefined,
     beforeRequest: function beforeRequest(context) {
       return new Promise(function (resolve, reject) {
-        formRef.current.validate().then( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+        innerFormRef.current.validate().then( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
           var beforeRequestContext, requestContext;
           return regeneratorRuntime.wrap(function _callee$(_context) {
             while (1) {
@@ -199,7 +206,7 @@ export function useDialogFormAction(action, context) {
 
                 case 13:
                   requestContext = Object.assign({
-                    fields: formRef.current.values
+                    fields: innerFormRef.current.values
                   }, _typeof(beforeRequestContext) === 'object' ? beforeRequestContext : {});
                   resolve(requestContext);
 
@@ -215,9 +222,9 @@ export function useDialogFormAction(action, context) {
       });
     },
     onFinish: function onFinish() {
-      var _formRef$current;
+      var _innerFormRef$current;
 
-      _onFinish && _onFinish((_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : _formRef$current.values);
+      _onFinish && _onFinish((_innerFormRef$current = innerFormRef.current) === null || _innerFormRef$current === void 0 ? void 0 : _innerFormRef$current.values);
     }
   }, others), context);
 }

package/es/form/SchemaForm/index.js

@@ -106,10 +106,10 @@ export default /*#__PURE__*/memo(function (_ref) {
   }, [scope]); // 格式化 schema
 
   var formatSchema = useCallback(function (schema) {
-    var suffix = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
+    var parentSuffix = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
     var schemaProperties = {};
     schema === null || schema === void 0 ? void 0 : schema.forEach(function (item, index) {
-      suffix = "".concat(suffix).concat(index);
+      var suffix = "".concat(parentSuffix).concat(index);
       var newItem = warning(item);
       var _newItem = newItem,
           originalComponent = _newItem.component; // 根据component的不同，初始化为内置的item

package/es/form/typing.d.ts

@@ -10,6 +10,10 @@ declare type FieldDisplayTypes = 'none' | 'hidden' | 'visible';
 export interface ProFormInitializeItem {
     (item: ProFormSchemaItem, props?: any): ProFormSchemaItem;
 }
+/**
+ * ProForm 实例类型
+ */
+export declare type ProFormType = FormType;
 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' | 'SelectGroup';
 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';

package/es/index.d.ts

@@ -24,5 +24,5 @@ export * from './skeleton';
 export * from './table';
 export * from './utils';
 export * from './timeline';
-declare const version = "1.3.0";
+declare const version = "1.3.1";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProTimeline, hooks, nocode, templates, utils, };

package/es/index.js

@@ -30,7 +30,7 @@ export * from './table';
 export * from './utils'; // export * from './sidebar';
 
 export * from './timeline';
-var version = '1.3.0';
+var version = '1.3.1';
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, // ProLayout,
 ProPageContainer, ProPageHeader, ProSkeleton, ProTable, // ProSidebar,
 ProTimeline, hooks, nocode, templates, utils };

package/es/page-header/index.js

@@ -70,7 +70,11 @@ var getColorAndStyle = function getColorAndStyle(color, backgroundColor, backgro
   var isBgColorPresetColor = isPresetColor(backgroundColor);
   var className = classnames((_classnames = {}, _defineProperty(_classnames, "".concat(getColorClassName(color)), isColorPresetColor), _defineProperty(_classnames, "".concat(getBackgroundColorClassName(backgroundColor)), isBgColorPresetColor), _defineProperty(_classnames, "".concat(cls("bg-type-".concat(backgroundType))), !!backgroundType), _classnames));
   var styleColor = isColorPresetColor ? getColor(color) : color;
-  var styleBgColor = isBgColorPresetColor ? getColor(color) : backgroundColor;
+  var styleBgColor = isBgColorPresetColor ? getColor(backgroundColor) : backgroundColor; // debugger;
+  // console.log('color', color);
+  // console.log('backgroundColor', backgroundColor);
+  // console.log('styleBgColor', styleBgColor);
+
   var style = {
     color: styleColor,
     backgroundColor: styleBgColor

package/es/table/index.js

@@ -1,4 +1,4 @@
-var _excluded = ["header", "className", "tableClassName", "mainAction", "extra", "dataFilter", "toolBar", "columns", "useRowSelection", "rowSelection", "onChangeRowSelection", "getRowSelection", "primaryKey", "footerAction", "footer", "url", "pageKey", "pageSizeKey", "method", "params", "formatSort", "formatParams", "formatResult", "requestWhenMount", "showPagination", "pageSizeList", "responsivePaginationType", "showSkeleton", "skeletonSize", "actionRef", "dataSource", "filterDebounce", "footerSuction", "autoRefresh", "customRequest", "filterColumnType", "defaultFilterParams"];
+var _excluded = ["header", "className", "tableClassName", "mainAction", "extra", "dataFilter", "toolBar", "columns", "useRowSelection", "rowSelection", "onChangeRowSelection", "getRowSelection", "primaryKey", "footerAction", "footer", "url", "pageKey", "pageSizeKey", "method", "params", "formatSort", "formatParams", "formatResult", "requestWhenMount", "showPagination", "pageSizeList", "responsivePaginationType", "showSkeleton", "skeletonSize", "actionRef", "dataSource", "filterDebounce", "footerSuction", "autoRefresh", "customRequest", "filterColumnType", "defaultFilterParams", "reserveSelectedRecords"];
 
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 
@@ -176,6 +176,8 @@ var ProTable = function ProTable(props) {
       _props$filterColumnTy = props.filterColumnType,
       filterColumnType = _props$filterColumnTy === void 0 ? 'auto' : _props$filterColumnTy,
       defaultFilterParams = props.defaultFilterParams,
+      _props$reserveSelecte = props.reserveSelectedRecords,
+      reserveSelectedRecords = _props$reserveSelecte === void 0 ? false : _props$reserveSelecte,
       otherProps = _objectWithoutProperties(props, _excluded);
 
   var targetPageKey = pageKey || globalPageKey;
@@ -339,7 +341,7 @@ var ProTable = function ProTable(props) {
         result = propsRowSelection.getProps(record, index);
       }
 
-      if (showSkeleton) {
+      if (showSkeleton && result) {
         result.disabled = true;
       }
 
@@ -860,21 +862,30 @@ var ProTable = function ProTable(props) {
 
   var renderFooter = function renderFooter() {
     function onChangePagination(currentPage) {
-      var _actionRef$current7, _actionRef$current7$c;
-
       var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-      // 翻页暂时先清空选择
-      (_actionRef$current7 = actionRef.current) === null || _actionRef$current7 === void 0 ? void 0 : (_actionRef$current7$c = _actionRef$current7.clearRowSelection) === null || _actionRef$current7$c === void 0 ? void 0 : _actionRef$current7$c.call(_actionRef$current7);
+
+      // 翻页默认清空选择
+      if (!reserveSelectedRecords) {
+        var _actionRef$current7, _actionRef$current7$c;
+
+        (_actionRef$current7 = actionRef.current) === null || _actionRef$current7 === void 0 ? void 0 : (_actionRef$current7$c = _actionRef$current7.clearRowSelection) === null || _actionRef$current7$c === void 0 ? void 0 : _actionRef$current7$c.call(_actionRef$current7);
+      }
+
       setCurrentPage(currentPage);
 
       _request(_objectSpread(_defineProperty({}, targetPageKey, currentPage), params));
     }
 
     function onChangePaginationSize(currentPageSize) {
-      var _actionRef$current8, _actionRef$current8$c, _request5;
+      var _request5;
+
+      // 翻页默认清空选择
+      if (!reserveSelectedRecords) {
+        var _actionRef$current8, _actionRef$current8$c;
+
+        (_actionRef$current8 = actionRef.current) === null || _actionRef$current8 === void 0 ? void 0 : (_actionRef$current8$c = _actionRef$current8.clearRowSelection) === null || _actionRef$current8$c === void 0 ? void 0 : _actionRef$current8$c.call(_actionRef$current8);
+      }
 
-      // 翻页暂时先清空选择
-      (_actionRef$current8 = actionRef.current) === null || _actionRef$current8 === void 0 ? void 0 : (_actionRef$current8$c = _actionRef$current8.clearRowSelection) === null || _actionRef$current8$c === void 0 ? void 0 : _actionRef$current8$c.call(_actionRef$current8);
       setPageSize(currentPageSize);
       setCurrentPage(1);
 

package/es/table/index.scss

@@ -118,4 +118,10 @@ $fullscreenPadding: 24px;
 
 .mb8 {
   margin-bottom: 8px;
+}
+
+.next-table {
+  .next-formily-item .next-form-preview {
+    line-height: unset;
+  }
 }

package/es/table/typing.d.ts

@@ -3,13 +3,12 @@
  */
 import { ColumnProps, TableProps } from '@alicloudfe/components/types/table';
 import { ProFieldType, ProFieldRenderProps, ProFieldDataSourceItem } from '../field';
-import { QueryFilterProps } from '../form';
+import { QueryFilterProps, ProFormType } from '../form';
 import { ProActionGroupProps, ProActionButtonProps } from '../actions';
 import { PaginationProps } from '@alicloudfe/components/types/pagination';
 import { HeaderProps as ProTableHeaderProps } from '@teamix/utils';
 import { Method } from 'axios';
 import React from 'react';
-import type { Form as FormType } from '@formily/core';
 declare type IFieldRenderProps = keyof ProFieldRenderProps;
 /** 列record函数 */
 declare type ProTableCellFunProp = (value: any, index: number, record: any, ...others: any) => any;
@@ -102,7 +101,7 @@ export declare type ProTableProps = {
     /** 内置 rowSelection 变化时的回调 */
     onChangeRowSelection?: (selectedRowKeys: string[]) => void;
     /** 获取内置 rowSelection */
-    getRowSelection?: (rowSelection: rowSelectionType) => void;
+    getRowSelection?: (rowSelection: innerRowSelectionType) => void;
     /** 表格底部（左侧）配置 */
     footerAction?: ProActionGroupProps | React.ReactNode;
     /** 表格底部（右层）配置 */
@@ -130,6 +129,8 @@ export declare type ProTableProps = {
         data: any[];
         total?: number;
     }>;
+    /** 翻页时是否保留之前批量选择数据 */
+    reserveSelectedRecords?: boolean;
     /** 默认漏斗过滤条件 */
     defaultFilterParams?: {
         [key: string]: any[] | any;
@@ -189,11 +190,11 @@ export declare type ProTableActionType = {
     /** 重置翻页器为1，不发送请求 */
     resetPage?: () => void;
     /** 获取数据过滤区表单实例 */
-    dataFilterForm?: FormType;
+    dataFilterForm?: ProFormType;
     /** 用于在 mount 的时候获取到表单 ref */
-    dataFilterFormRef?: React.MutableRefObject<FormType>;
-    normalDataFilterForm?: FormType;
-    fullscreenDataFilterForm?: FormType;
+    dataFilterFormRef?: React.MutableRefObject<ProFormType>;
+    normalDataFilterForm?: ProFormType;
+    fullscreenDataFilterForm?: ProFormType;
     filterEnableRef?: any;
     /** 表格当前的数据 */
     data?: any[];

package/lib/actions/dialog-form.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { ProFormProps, ProFormSchema } from '../form';
+import { ProFormProps, ProFormSchema, ProFormType } from '../form';
 import { RequestAction } from './request';
 import { DialogAction } from './dialog';
 export interface DialogFormAction extends DialogAction {
@@ -12,9 +12,14 @@ export interface DialogFormAction extends DialogAction {
     /**
      * @deprecated 建议使用 schema 配置 ProFormProps 代替
      */
-    formProps?: Omit<ProFormProps, 'schema'>;
-    /** 同时支持两种配置方式，如果想完整定制表单，可使用完整的表单配置项 ProFormProps，否则可以只配置 ProFormSchema */
-    schema: ProFormSchema | ProFormProps;
+    formProps?: Omit<ProFormProps, 'schema' | 'form'>;
+    /** 同时支持两种配置方式:
+     * 如果想完整定制表单，可使用完整的表单配置项 ProFormProps，但不可以传 form 字段，可以通过 formRef 获取内部 form 实例。
+     * 否则可以只配置 ProFormSchema
+     */
+    schema: ProFormSchema | Omit<ProFormProps, 'form'>;
+    /** 外部传来的 formRef，用于获取内置 form 实例 */
+    formRef?: React.MutableRefObject<ProFormType | undefined>;
 }
 export declare function useDialogFormAction(action: DialogFormAction, context?: any): {
     [x: string]: (e: React.MouseEvent<HTMLElement, MouseEvent>) => Promise<void>;

package/lib/actions/dialog-form.js

@@ -23,7 +23,7 @@ var _dialog = _interopRequireDefault(require("./dialog"));
 var _utils2 = require("./utils");
 
 var _excluded = ["schema"],
-    _excluded2 = ["schema", "useFieldValuesForRequest", "initialValues", "initialRequest", "formProps", "size", "onFinish", "beforeRequest"];
+    _excluded2 = ["schema", "useFieldValuesForRequest", "initialValues", "initialRequest", "formProps", "size", "onFinish", "beforeRequest", "formRef"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -110,7 +110,8 @@ var DialogForm = function DialogForm(props) {
       schema = props.schema,
       formProps = props.formProps,
       context = props.context,
-      formRef = props.formRef;
+      formRef = props.formRef,
+      innerFormRef = props.innerFormRef;
 
   var _getSchemaAndFormProp = getSchemaAndFormProps(schema, formProps),
       formSchema = _getSchemaAndFormProp.schema,
@@ -127,7 +128,11 @@ var DialogForm = function DialogForm(props) {
 
   var history = (0, _reactRouterDom.useHistory)();
   (0, _react.useEffect)(function () {
-    formRef.current = form;
+    if (formRef) {
+      formRef.current = form;
+    }
+
+    innerFormRef.current = form;
 
     if (initialRequest) {
       setLoading(true);
@@ -162,9 +167,10 @@ function useDialogFormAction(action, context) {
       size = _action$size === void 0 ? 'small' : _action$size,
       _onFinish = action.onFinish,
       propsBeforeRequest = action.beforeRequest,
+      propsFormRef = action.formRef,
       others = _objectWithoutProperties(action, _excluded2);
 
-  var formRef = /*#__PURE__*/(0, _react.createRef)();
+  var innerFormRef = /*#__PURE__*/(0, _react.createRef)();
   return (0, _dialog.default)(Object.assign({
     size: size,
     closeable: true,
@@ -178,13 +184,14 @@ function useDialogFormAction(action, context) {
         context: contentContext
       };
       return /*#__PURE__*/_react.default.createElement(DialogForm, _objectSpread({
-        formRef: formRef
+        innerFormRef: innerFormRef,
+        formRef: propsFormRef
       }, dialogFormProps));
     },
     extendParams: useFieldValuesForRequest ? '{{fields}}' : undefined,
     beforeRequest: function beforeRequest(context) {
       return new Promise(function (resolve, reject) {
-        formRef.current.validate().then( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+        innerFormRef.current.validate().then( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
           var beforeRequestContext, requestContext;
           return regeneratorRuntime.wrap(function _callee$(_context) {
             while (1) {
@@ -220,7 +227,7 @@ function useDialogFormAction(action, context) {
 
                 case 13:
                   requestContext = Object.assign({
-                    fields: formRef.current.values
+                    fields: innerFormRef.current.values
                   }, _typeof(beforeRequestContext) === 'object' ? beforeRequestContext : {});
                   resolve(requestContext);
 
@@ -236,9 +243,9 @@ function useDialogFormAction(action, context) {
       });
     },
     onFinish: function onFinish() {
-      var _formRef$current;
+      var _innerFormRef$current;
 
-      _onFinish && _onFinish((_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : _formRef$current.values);
+      _onFinish && _onFinish((_innerFormRef$current = innerFormRef.current) === null || _innerFormRef$current === void 0 ? void 0 : _innerFormRef$current.values);
     }
   }, others), context);
 }

package/lib/form/SchemaForm/index.js

@@ -150,10 +150,10 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
   }, [scope]); // 格式化 schema
 
   var formatSchema = (0, _react.useCallback)(function (schema) {
-    var suffix = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
+    var parentSuffix = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
     var schemaProperties = {};
     schema === null || schema === void 0 ? void 0 : schema.forEach(function (item, index) {
-      suffix = "".concat(suffix).concat(index);
+      var suffix = "".concat(parentSuffix).concat(index);
       var newItem = (0, _warning.default)(item);
       var _newItem = newItem,
           originalComponent = _newItem.component; // 根据component的不同，初始化为内置的item

package/lib/form/typing.d.ts

@@ -10,6 +10,10 @@ declare type FieldDisplayTypes = 'none' | 'hidden' | 'visible';
 export interface ProFormInitializeItem {
     (item: ProFormSchemaItem, props?: any): ProFormSchemaItem;
 }
+/**
+ * ProForm 实例类型
+ */
+export declare type ProFormType = FormType;
 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' | 'SelectGroup';
 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';

package/lib/index.d.ts

@@ -24,5 +24,5 @@ export * from './skeleton';
 export * from './table';
 export * from './utils';
 export * from './timeline';
-declare const version = "1.3.0";
+declare const version = "1.3.1";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProTimeline, hooks, nocode, templates, utils, };

package/lib/index.js

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

package/lib/page-header/index.js

@@ -89,7 +89,11 @@ var getColorAndStyle = function getColorAndStyle(color, backgroundColor, backgro
   var isBgColorPresetColor = (0, _utils.isPresetColor)(backgroundColor);
   var className = (0, _classnames2.default)((_classnames = {}, _defineProperty(_classnames, "".concat((0, _utils.getColorClassName)(color)), isColorPresetColor), _defineProperty(_classnames, "".concat((0, _utils.getBackgroundColorClassName)(backgroundColor)), isBgColorPresetColor), _defineProperty(_classnames, "".concat(cls("bg-type-".concat(backgroundType))), !!backgroundType), _classnames));
   var styleColor = isColorPresetColor ? (0, _utils.getColor)(color) : color;
-  var styleBgColor = isBgColorPresetColor ? (0, _utils.getColor)(color) : backgroundColor;
+  var styleBgColor = isBgColorPresetColor ? (0, _utils.getColor)(backgroundColor) : backgroundColor; // debugger;
+  // console.log('color', color);
+  // console.log('backgroundColor', backgroundColor);
+  // console.log('styleBgColor', styleBgColor);
+
   var style = {
     color: styleColor,
     backgroundColor: styleBgColor

package/lib/table/index.js

@@ -55,7 +55,7 @@ Object.keys(_typing).forEach(function (key) {
     }
   });
 });
-var _excluded = ["header", "className", "tableClassName", "mainAction", "extra", "dataFilter", "toolBar", "columns", "useRowSelection", "rowSelection", "onChangeRowSelection", "getRowSelection", "primaryKey", "footerAction", "footer", "url", "pageKey", "pageSizeKey", "method", "params", "formatSort", "formatParams", "formatResult", "requestWhenMount", "showPagination", "pageSizeList", "responsivePaginationType", "showSkeleton", "skeletonSize", "actionRef", "dataSource", "filterDebounce", "footerSuction", "autoRefresh", "customRequest", "filterColumnType", "defaultFilterParams"];
+var _excluded = ["header", "className", "tableClassName", "mainAction", "extra", "dataFilter", "toolBar", "columns", "useRowSelection", "rowSelection", "onChangeRowSelection", "getRowSelection", "primaryKey", "footerAction", "footer", "url", "pageKey", "pageSizeKey", "method", "params", "formatSort", "formatParams", "formatResult", "requestWhenMount", "showPagination", "pageSizeList", "responsivePaginationType", "showSkeleton", "skeletonSize", "actionRef", "dataSource", "filterDebounce", "footerSuction", "autoRefresh", "customRequest", "filterColumnType", "defaultFilterParams", "reserveSelectedRecords"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -220,6 +220,8 @@ var ProTable = function ProTable(props) {
       _props$filterColumnTy = props.filterColumnType,
       filterColumnType = _props$filterColumnTy === void 0 ? 'auto' : _props$filterColumnTy,
       defaultFilterParams = props.defaultFilterParams,
+      _props$reserveSelecte = props.reserveSelectedRecords,
+      reserveSelectedRecords = _props$reserveSelecte === void 0 ? false : _props$reserveSelecte,
       otherProps = _objectWithoutProperties(props, _excluded);
 
   var targetPageKey = pageKey || globalPageKey;
@@ -383,7 +385,7 @@ var ProTable = function ProTable(props) {
         result = propsRowSelection.getProps(record, index);
       }
 
-      if (showSkeleton) {
+      if (showSkeleton && result) {
         result.disabled = true;
       }
 
@@ -904,21 +906,30 @@ var ProTable = function ProTable(props) {
 
   var renderFooter = function renderFooter() {
     function onChangePagination(currentPage) {
-      var _actionRef$current7, _actionRef$current7$c;
-
       var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-      // 翻页暂时先清空选择
-      (_actionRef$current7 = actionRef.current) === null || _actionRef$current7 === void 0 ? void 0 : (_actionRef$current7$c = _actionRef$current7.clearRowSelection) === null || _actionRef$current7$c === void 0 ? void 0 : _actionRef$current7$c.call(_actionRef$current7);
+
+      // 翻页默认清空选择
+      if (!reserveSelectedRecords) {
+        var _actionRef$current7, _actionRef$current7$c;
+
+        (_actionRef$current7 = actionRef.current) === null || _actionRef$current7 === void 0 ? void 0 : (_actionRef$current7$c = _actionRef$current7.clearRowSelection) === null || _actionRef$current7$c === void 0 ? void 0 : _actionRef$current7$c.call(_actionRef$current7);
+      }
+
       setCurrentPage(currentPage);
 
       _request(_objectSpread(_defineProperty({}, targetPageKey, currentPage), params));
     }
 
     function onChangePaginationSize(currentPageSize) {
-      var _actionRef$current8, _actionRef$current8$c, _request5;
+      var _request5;
+
+      // 翻页默认清空选择
+      if (!reserveSelectedRecords) {
+        var _actionRef$current8, _actionRef$current8$c;
+
+        (_actionRef$current8 = actionRef.current) === null || _actionRef$current8 === void 0 ? void 0 : (_actionRef$current8$c = _actionRef$current8.clearRowSelection) === null || _actionRef$current8$c === void 0 ? void 0 : _actionRef$current8$c.call(_actionRef$current8);
+      }
 
-      // 翻页暂时先清空选择
-      (_actionRef$current8 = actionRef.current) === null || _actionRef$current8 === void 0 ? void 0 : (_actionRef$current8$c = _actionRef$current8.clearRowSelection) === null || _actionRef$current8$c === void 0 ? void 0 : _actionRef$current8$c.call(_actionRef$current8);
       setPageSize(currentPageSize);
       setCurrentPage(1);
 

package/lib/table/index.scss

@@ -118,4 +118,10 @@ $fullscreenPadding: 24px;
 
 .mb8 {
   margin-bottom: 8px;
+}
+
+.next-table {
+  .next-formily-item .next-form-preview {
+    line-height: unset;
+  }
 }

package/lib/table/typing.d.ts

@@ -3,13 +3,12 @@
  */
 import { ColumnProps, TableProps } from '@alicloudfe/components/types/table';
 import { ProFieldType, ProFieldRenderProps, ProFieldDataSourceItem } from '../field';
-import { QueryFilterProps } from '../form';
+import { QueryFilterProps, ProFormType } from '../form';
 import { ProActionGroupProps, ProActionButtonProps } from '../actions';
 import { PaginationProps } from '@alicloudfe/components/types/pagination';
 import { HeaderProps as ProTableHeaderProps } from '@teamix/utils';
 import { Method } from 'axios';
 import React from 'react';
-import type { Form as FormType } from '@formily/core';
 declare type IFieldRenderProps = keyof ProFieldRenderProps;
 /** 列record函数 */
 declare type ProTableCellFunProp = (value: any, index: number, record: any, ...others: any) => any;
@@ -102,7 +101,7 @@ export declare type ProTableProps = {
     /** 内置 rowSelection 变化时的回调 */
     onChangeRowSelection?: (selectedRowKeys: string[]) => void;
     /** 获取内置 rowSelection */
-    getRowSelection?: (rowSelection: rowSelectionType) => void;
+    getRowSelection?: (rowSelection: innerRowSelectionType) => void;
     /** 表格底部（左侧）配置 */
     footerAction?: ProActionGroupProps | React.ReactNode;
     /** 表格底部（右层）配置 */
@@ -130,6 +129,8 @@ export declare type ProTableProps = {
         data: any[];
         total?: number;
     }>;
+    /** 翻页时是否保留之前批量选择数据 */
+    reserveSelectedRecords?: boolean;
     /** 默认漏斗过滤条件 */
     defaultFilterParams?: {
         [key: string]: any[] | any;
@@ -189,11 +190,11 @@ export declare type ProTableActionType = {
     /** 重置翻页器为1，不发送请求 */
     resetPage?: () => void;
     /** 获取数据过滤区表单实例 */
-    dataFilterForm?: FormType;
+    dataFilterForm?: ProFormType;
     /** 用于在 mount 的时候获取到表单 ref */
-    dataFilterFormRef?: React.MutableRefObject<FormType>;
-    normalDataFilterForm?: FormType;
-    fullscreenDataFilterForm?: FormType;
+    dataFilterFormRef?: React.MutableRefObject<ProFormType>;
+    normalDataFilterForm?: ProFormType;
+    fullscreenDataFilterForm?: ProFormType;
     filterEnableRef?: any;
     /** 表格当前的数据 */
     data?: any[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamix/pro",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "TeamixPro大包",
   "repository": "http://gitlab.alibaba-inc.com/teamix/pro",
   "author": "Velociraptor(迅猛龙)",