@teamix/pro 1.3.0 → 1.3.3

package/lib/form/SchemaForm/initializeSelectTable.js

@@ -0,0 +1,45 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _excluded = ["name", "title", "children"];
+
+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; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : 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; }
+
+var initializeTableColumn = function initializeTableColumn(item) {
+  var name = item.name,
+      title = item.title,
+      children = item.children,
+      otherProps = _objectWithoutProperties(item, _excluded);
+
+  return {
+    name: name,
+    title: title,
+    component: 'SelectTable.Column',
+    children: children,
+    props: _objectSpread({}, otherProps)
+  };
+};
+
+var initialize = function initialize(item) {
+  var _item$children = item.children,
+      children = _item$children === void 0 ? [] : _item$children;
+  return _objectSpread(_objectSpread({}, item), {}, {
+    children: children.map(function (item) {
+      return initializeTableColumn(item);
+    })
+  });
+};
+
+var _default = initialize;
+exports.default = _default;

package/lib/form/SchemaForm/reactions.d.ts

@@ -2,5 +2,5 @@ import type { ProFormRequestConfig } from '../typing';
 declare const $request: (field: any, requestConfig: ProFormRequestConfig, context: any, type: 'request' | 'validator' | 'dataSource') => Promise<unknown>;
 declare const $common: (services: any, requestConfig: ProFormRequestConfig, context: any) => (field: any) => any;
 declare const $validator: (services: any, requestConfig: ProFormRequestConfig, context: any) => (value: any, rules: any, { field }: any) => any;
-declare const $dataSource: (services: any, requestConfig: ProFormRequestConfig, context: any, readPretty: any) => (field: any) => any;
+declare const $dataSource: (services: any, requestConfig: ProFormRequestConfig, context: any) => (field: any) => any;
 export { $request, $common, $dataSource, $validator };

package/lib/form/SchemaForm/reactions.js

@@ -17,21 +17,26 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 var $request = function $request(field, requestConfig, context, type) {
   var _field$data;
 
-  var beforeRequest = requestConfig.beforeRequest,
+  var params = requestConfig.params,
+      beforeRequest = requestConfig.beforeRequest,
+      formatResult = requestConfig.formatResult,
       onSuccess = requestConfig.onSuccess;
   var beforeRequestResult = (0, _utils.isFn)(beforeRequest) ? beforeRequest(field, context) : {};
   /**
-   * // 主动触发的请求刷新
+   * 主动触发的请求刷新
    */
   // 触发所有配置的请求
 
   var refresh = (_field$data = field.data) === null || _field$data === void 0 ? void 0 : _field$data.refresh;
   var refreshResult = (0, _utils.isPureObj)(refresh) ? refresh : {};
   return (0, _utils.doCommonRequest)(_objectSpread(_objectSpread({}, requestConfig), {}, {
-    params: _objectSpread(_objectSpread(_objectSpread({}, requestConfig.params), beforeRequestResult), refreshResult),
+    params: _objectSpread(_objectSpread(_objectSpread({}, params), beforeRequestResult), refreshResult),
     beforeRequest: function beforeRequest() {
       return beforeRequestResult;
     },
+    formatResult: (0, _utils.isFn)(formatResult) ? function (res) {
+      return formatResult(res, field, context);
+    } : formatResult,
     onSuccess: (0, _utils.isFn)(onSuccess) ? function (res) {
       return onSuccess(res, field, context);
     } : onSuccess
@@ -44,7 +49,9 @@ exports.$request = $request;
 var $common = function $common(services, requestConfig, context) {
   return function (field) {
     return services(field, requestConfig, context, 'request').then(function (res) {
-      return requestConfig.onComplete && requestConfig.onComplete(res, field, context);
+      var _requestConfig$onComp;
+
+      return (_requestConfig$onComp = requestConfig.onComplete) === null || _requestConfig$onComp === void 0 ? void 0 : _requestConfig$onComp.call(requestConfig, res, field, context);
     });
   };
 }; // 配置校验
@@ -56,7 +63,9 @@ var $validator = function $validator(services, requestConfig, context) {
   return function (value, rules, _ref) {
     var field = _ref.field;
     return services(field, requestConfig, context, 'validator').then(function (res) {
-      return requestConfig.onComplete && requestConfig.onComplete(res, field, context);
+      var _requestConfig$onComp2;
+
+      return (_requestConfig$onComp2 = requestConfig.onComplete) === null || _requestConfig$onComp2 === void 0 ? void 0 : _requestConfig$onComp2.call(requestConfig, res, field, context);
     });
   };
 }; // 配置DataSource
@@ -64,41 +73,27 @@ var $validator = function $validator(services, requestConfig, context) {
 
 exports.$validator = $validator;
 
-var $dataSource = function $dataSource(services, requestConfig, context, readPretty) {
+var $dataSource = function $dataSource(services, requestConfig, context) {
   return function (field) {
-    if (!readPretty) {
-      field.setState({
-        loading: true,
-        readOnly: true
-      });
-    }
-
+    field.setState({
+      loading: true
+    });
     return services(field, requestConfig, context, 'dataSource').then(function (res) {
+      var _requestConfig$onComp3;
+
       var isValueInDataSource = (0, _utils.getValueByValue)(res, field.value);
       var clearValue = isValueInDataSource ? {} : {
         value: undefined
       };
-
-      if (!readPretty) {
-        field.setState(_objectSpread({
-          dataSource: res,
-          loading: false,
-          readOnly: false
-        }, clearValue));
-      } else {
-        field.setState({
-          dataSource: res
-        });
-      }
-
-      return requestConfig.onComplete && requestConfig.onComplete(res, field, context);
+      field.setState(_objectSpread({
+        dataSource: res,
+        loading: false
+      }, clearValue));
+      return (_requestConfig$onComp3 = requestConfig.onComplete) === null || _requestConfig$onComp3 === void 0 ? void 0 : _requestConfig$onComp3.call(requestConfig, res, field, context);
     }).catch(function () {
-      if (!readPretty) {
-        field.setState({
-          loading: false,
-          readOnly: false
-        });
-      }
+      field.setState({
+        loading: false
+      });
     });
   };
 };

package/lib/form/fieldTypeMap.d.ts

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

package/lib/form/fieldTypeMap.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.timePicker2TypeArray = exports.default = exports.datePicker2TypeArray = void 0;
 var fieldTypeMap = {
   Input: 'text',
   Password: 'password',
@@ -46,5 +46,9 @@ var fieldTypeMap = {
   Search: 'search',
   SelectGroup: 'selectGroup'
 };
+var datePicker2TypeArray = ['DatePicker', 'DateTimePicker', 'WeekPicker', 'MonthPicker', 'YearPicker', 'QuarterPicker', 'DateRangePicker', 'DateTimeRangePicker', 'WeekRangePicker', 'MonthRangePicker', 'YearRangePicker', 'QuarterRangePicker'];
+exports.datePicker2TypeArray = datePicker2TypeArray;
+var timePicker2TypeArray = ['TimePicker', 'TimeRangePicker'];
+exports.timePicker2TypeArray = timePicker2TypeArray;
 var _default = fieldTypeMap;
 exports.default = _default;

package/lib/form/typing.d.ts

@@ -10,12 +10,17 @@ declare type FieldDisplayTypes = 'none' | 'hidden' | 'visible';
 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' | 'SelectGroup';
+/**
+ * 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' | 'SelectTable' | 'SelectTable.Column';
 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, context?: any) => any;
+    formatResult?: (res?: any, field?: any, context?: any) => any;
     onSuccess?: (res?: any, field?: any, context?: any) => any;
     onComplete?: (res?: any, field?: any, context?: any) => any;
 }
@@ -68,6 +73,7 @@ export interface ProFormProps extends IFormLayoutProps {
 export interface FilterProps extends ProFormProps {
     form: FormType;
     defaultFilterValue?: string;
+    filterValues?: string[];
     activeFilterValueRef?: React.MutableRefObject<any>;
     forceClear?: boolean;
     onReset?: (payload?: any) => void;
@@ -102,6 +108,8 @@ export interface QueryFilterProps extends ProFormProps {
     addonAfter?: ReactNode;
     /** 顶部筛选区默认筛选项 */
     defaultFilterValue?: string;
+    /** 顶部筛选区筛选项配置 */
+    filterValues?: string[];
     /** 透出内部表单实例 */
     formRef?: React.MutableRefObject<any>;
     /** onChange事件的防抖时间 */

package/lib/form/utils.js

@@ -86,9 +86,16 @@ var mapStatus = function mapStatus(props, field) {
     return state;
   };
 
-  return _objectSpread(_objectSpread({}, props), {}, {
-    state: takeState(props.state) || takeStatus()
-  });
+  var state = takeState(props.state) || takeStatus();
+  var result = {
+    state: state
+  }; // 当组件处于loading状态时，仅可读不可写。
+
+  if (state === 'loading') {
+    result.readOnly = true;
+  }
+
+  return _objectSpread(_objectSpread({}, props), result);
 };
 
 exports.mapStatus = mapStatus;
@@ -108,7 +115,7 @@ var patchDataSource = function patchDataSource() {
     return result;
   };
 
-  return dataSource.map(removeEmptyChildren);
+  return (0, _utils.isArr)(dataSource) ? dataSource.map(removeEmptyChildren) : [];
 };
 
 var mapDataSource = function mapDataSource(props, field) {

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.3";
 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.3';
 exports.version = version;

package/lib/info/components/baseInfo/index.scss

@@ -1,3 +1,6 @@
+$item-padding-bottom: -8px;
+// /** 消除 baseInfo 被其他组件包裹后没有居中的问题*/
 .teamix-pro-info {
   width: 100%;
+  margin-bottom: $item-padding-bottom;
 }

package/lib/page-header/index.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import { ItemProps } from '@alicloudfe/components/types/breadcrumb';
-import { LinkPath, ProTagItem } from '@teamix/utils';
+import { LinkPath, ProTagItem, CapsuleTabType } from '@teamix/utils';
 import { ProActionGroupProps } from '../actions';
 import { ProInfoProps } from '../info';
 import './index.scss';
@@ -48,6 +48,8 @@ export declare type ProPageHeaderProps = {
     data?: ProPageHeaderDataItem[];
     /** 底部详情 */
     info?: ProInfoProps | React.ReactNode;
+    /** 切换 tabs */
+    tabs?: CapsuleTabType;
 } & Omit<React.HTMLAttributes<HTMLElement>, 'title'>;
 declare const ProPageHeader: React.FC<ProPageHeaderProps>;
 export default ProPageHeader;

package/lib/page-header/index.js

@@ -27,7 +27,7 @@ require("./index.scss");
 
 var _excluded = ["text", "children"],
     _excluded2 = ["color", "title", "num", "className"],
-    _excluded3 = ["title", "description", "icon", "iconColor", "iconBackgroundType", "iconBackgroundColor", "goback", "operation", "extra", "image", "loading", "breadcrumb", "tags", "data", "info", "children", "className", "style"];
+    _excluded3 = ["title", "description", "icon", "iconColor", "iconBackgroundType", "iconBackgroundColor", "goback", "operation", "extra", "image", "loading", "breadcrumb", "tags", "data", "info", "children", "className", "style", "tabs"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -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
@@ -138,6 +142,14 @@ var renderInfo = function renderInfo(info) {
   return info;
 };
 
+var renderTabs = function renderTabs(tabs) {
+  if (tabs) {
+    return /*#__PURE__*/_react.default.createElement(_utils.CapsuleTab, _objectSpread({}, tabs));
+  }
+
+  return null;
+};
+
 var ProPageHeader = function ProPageHeader(props) {
   var title = props.title,
       description = props.description,
@@ -158,6 +170,7 @@ var ProPageHeader = function ProPageHeader(props) {
       children = props.children,
       className = props.className,
       style = props.style,
+      tabs = props.tabs,
       others = _objectWithoutProperties(props, _excluded3);
 
   var history = (0, _reactRouterDom.useHistory)();
@@ -206,7 +219,7 @@ var ProPageHeader = function ProPageHeader(props) {
       size: "large"
     }) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, icon)), /*#__PURE__*/_react.default.createElement("span", {
       className: cls('title-name')
-    }, title), (0, _utils.renderTags)(tags, 'large'));
+    }, title), (0, _utils.renderTags)(tags, 'large'), renderTabs(tabs !== null && tabs !== void 0 ? tabs : {}));
   };
 
   return /*#__PURE__*/_react.default.createElement("header", _objectSpread({

package/lib/table/components/ToolBar/DensityIcon.js

@@ -39,9 +39,11 @@ var RadioItem = _components.Menu.RadioItem;
 var cls = (0, _utils.baseClass)('teamix-pro-table-toolbar-icon');
 
 var DensityIcon = function DensityIcon(props) {
+  var _actionRef$current;
+
   var actionRef = props.actionRef;
 
-  var _useState = (0, _react.useState)('medium'),
+  var _useState = (0, _react.useState)(((_actionRef$current = actionRef.current) === null || _actionRef$current === void 0 ? void 0 : _actionRef$current.size) || 'medium'),
       _useState2 = _slicedToArray(_useState, 2),
       size = _useState2[0],
       setSize = _useState2[1]; // const [fullscreen, setFullscreen] = useState<boolean>(false);
@@ -61,10 +63,10 @@ var DensityIcon = function DensityIcon(props) {
 
 
   var radioOnchange = function radioOnchange(mode) {
-    var _actionRef$current, _actionRef$current$se;
+    var _actionRef$current2, _actionRef$current2$s;
 
     setSize(mode);
-    (_actionRef$current = actionRef.current) === null || _actionRef$current === void 0 ? void 0 : (_actionRef$current$se = _actionRef$current.setSize) === null || _actionRef$current$se === void 0 ? void 0 : _actionRef$current$se.call(_actionRef$current, mode);
+    (_actionRef$current2 = actionRef.current) === null || _actionRef$current2 === void 0 ? void 0 : (_actionRef$current2$s = _actionRef$current2.setSize) === null || _actionRef$current2$s === void 0 ? void 0 : _actionRef$current2$s.call(_actionRef$current2, mode);
   }; // // 销毁监听函数
   // useEffect(() => {
   //   return () => {

package/lib/table/components/ToolBar/FilterColumnIcon.js

@@ -54,9 +54,18 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 var CheckboxItem = _components.Menu.CheckboxItem;
 var Row = _components.Grid.Row,
     Col = _components.Grid.Col;
-var cls = (0, _utils.baseClass)('teamix-pro-table-toolbar-filter-column');
+var cls = (0, _utils.baseClass)('teamix-pro-table-toolbar-filter-column'); // 判断是否是 root 组织
+
+var isRoot = (0, _utils.getCookie)('organizationId') === '1';
 
 var processColumns = function processColumns(columns) {
+  if (isRoot) {
+    // root 组织下不显示标签管理
+    columns = columns.filter(function (item) {
+      return item.valueType !== 'selectGroup';
+    });
+  }
+
   return columns.map(function (item) {
     if (item.columnFilters === false) {
       return item;
@@ -313,7 +322,7 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
           return onChangeColumns(check, dataIndex);
         },
         disabled: columnFiltersDisabled
-      }, title, !lock && /*#__PURE__*/_react.default.createElement("div", {
+      }, title, !lock && !columnFiltersDisabled && /*#__PURE__*/_react.default.createElement("div", {
         className: cls({
           sort: true
         })

package/lib/table/components/ToolBar/index.scss

@@ -27,9 +27,9 @@
       line-height: var(--checkbox-size,16px);
     }
   }
-  &-reset {
+  &-reset.next-btn {
     position: absolute;
-    right: 16px;
+    right: 0px;
     top: 6px;
   }
   // .next-menu {
@@ -59,7 +59,7 @@
     .teamix-pro-table-toolbar-filter-column-sort {
       visibility: hidden;
       position: absolute;
-      right: 16px;
+      right: 0px;
       top: 0;
       color: var(--color-text1-7);
       i {

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", "size", "disableSelectAll"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -220,6 +220,11 @@ 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,
+      _props$size = props.size,
+      propsSize = _props$size === void 0 ? 'medium' : _props$size,
+      disableSelectAll = props.disableSelectAll,
       otherProps = _objectWithoutProperties(props, _excluded);
 
   var targetPageKey = pageKey || globalPageKey;
@@ -273,7 +278,7 @@ var ProTable = function ProTable(props) {
       filteredColumns = _useState16[0],
       setFilteredColumns = _useState16[1];
 
-  var _useState17 = (0, _react.useState)('medium'),
+  var _useState17 = (0, _react.useState)(propsSize),
       _useState18 = _slicedToArray(_useState17, 2),
       size = _useState18[0],
       _setSize = _useState18[1];
@@ -383,7 +388,7 @@ var ProTable = function ProTable(props) {
         result = propsRowSelection.getProps(record, index);
       }
 
-      if (showSkeleton) {
+      if (showSkeleton && result) {
         result.disabled = true;
       }
 
@@ -396,7 +401,7 @@ var ProTable = function ProTable(props) {
         result = propsRowSelection.titleProps();
       }
 
-      if (showSkeleton) {
+      if (showSkeleton || disableSelectAll) {
         result.disabled = true;
       }
 
@@ -431,7 +436,7 @@ var ProTable = function ProTable(props) {
       return selectedRowKeys.includes(k);
     });
     return {
-      disabled: showLoading && !showSkeleton && (getData.loading || props.loading),
+      disabled: disableSelectAll || showLoading && !showSkeleton && (getData.loading || props.loading),
       onChange: function onChange(check) {
         if (check) {
           var result = selectedRowKeys.concat([]);
@@ -535,6 +540,7 @@ var ProTable = function ProTable(props) {
         (0, _utils2.emit)('refreshFilterState', newColumns);
       }
     },
+    size: size,
     setSize: function setSize(mode) {
       _setSize(mode);
     },
@@ -904,21 +910,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,20 @@ $fullscreenPadding: 24px;
 
 .mb8 {
   margin-bottom: 8px;
+}
+
+.next-table {
+  .next-form-preview.next-form-preview {
+    line-height: unset;
+  }
+  &-row {
+    .teamix-pro-field.teamix-pro-field-text .next-form-preview {
+      color: var(--table-row-color);
+    }
+  }
+  &-row.hovered {
+    .teamix-pro-field.teamix-pro-field-text .next-form-preview {
+      color: var(--table-row-hover-color);
+    }
+  }
 }

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,10 +129,14 @@ export declare type ProTableProps = {
         data: any[];
         total?: number;
     }>;
+    /** 翻页时是否保留之前批量选择数据 */
+    reserveSelectedRecords?: boolean;
     /** 默认漏斗过滤条件 */
     defaultFilterParams?: {
         [key: string]: any[] | any;
     };
+    /** 禁用掉批量选择中的全选 */
+    disableSelectAll?: boolean;
 } & Omit<TableProps, 'columns'> & ProTableTopAreaProps;
 export declare type rowSelectionType = {
     getProps?: (record: any, index: number) => any;
@@ -159,6 +162,8 @@ export declare type ProTableActionType = {
     fullScreen?: () => boolean;
     /** 设置显示列 */
     setColumn?: (newColumns: ProColumnProps[], update?: boolean) => void;
+    /** 表格尺寸 */
+    size?: 'small' | 'medium';
     /** 设置表格大小 */
     setSize?: (mode: 'small' | 'medium') => void;
     /** 刷新表格 */
@@ -189,11 +194,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/table/utils/columnRender.js

@@ -171,6 +171,12 @@ var renderCell = function renderCell(value, item, index, record, actionRef) {
         }
       }, props);
     }
+
+    if ((render === null || render === void 0 ? void 0 : render.type) === 'step') {
+      newRender = _objectSpread(_objectSpread({}, newRender), {}, {
+        ellipsis: false
+      });
+    }
   } // 渲染操作组