@teamix/pro 1.2.22 → 1.2.27

package/lib/table/index.js

@@ -10,6 +10,8 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _components = require("@alicloudfe/components");
 
+var _Pagination = _interopRequireDefault(require("./components/Pagination"));
+
 var _genProColumnToColumn = _interopRequireDefault(require("./utils/genProColumnToColumn"));
 
 var _utils = require("@teamix/utils");
@@ -36,8 +38,6 @@ var _form = require("../form");
 
 var _actions = require("../actions");
 
-var _lodash = _interopRequireDefault(require("lodash.debounce"));
-
 var _classnames = _interopRequireDefault(require("classnames"));
 
 var _pageContainer = _interopRequireDefault(require("../page-container"));
@@ -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", "showSkeleton", "skeletonSize", "actionRef", "dataSource", "filterDebounce", "footerSuction", "autoRefresh", "customRequest", "filterColumnType"];
+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"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -96,7 +96,9 @@ 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; }
 
 var cls = (0, _utils.baseClass)('teamix-pro-table');
-var toJS = _form.formilyReactive.toJS;
+var toJS = _form.formilyReactive.toJS; // 判断是否是 root 组织
+
+var isRoot = (0, _utils.getCookie)('organizationId') === '1';
 /**
  * 处理原生传入的 columns 以便于 选择列 方便处理
  * @param columns 原生传入的 columns
@@ -104,14 +106,24 @@ var toJS = _form.formilyReactive.toJS;
  */
 
 var processColumns = function processColumns(columns, initialColumns) {
+  var _filterColumns;
+
   var filterColumns = columns.filter(function (item) {
     return item.columnFilters !== false;
-  }); // 处理只剩一列批量选择的情况下宽度错乱问题
+  });
 
-  if (filterColumns === null || filterColumns === void 0 ? void 0 : filterColumns.length) {
-    var _initialColumns$;
+  if (isRoot) {
+    // root 组织下不显示标签管理
+    filterColumns = filterColumns.filter(function (item) {
+      return item.valueType !== 'selectGroup';
+    });
+  } // 处理只剩一列批量选择的情况下宽度错乱问题
+
+
+  if ((_filterColumns = filterColumns) === null || _filterColumns === void 0 ? void 0 : _filterColumns.length) {
+    var _filterColumns2, _initialColumns$;
 
-    if ((filterColumns === null || filterColumns === void 0 ? void 0 : filterColumns.length) === 1) {
+    if (((_filterColumns2 = filterColumns) === null || _filterColumns2 === void 0 ? void 0 : _filterColumns2.length) === 1) {
       var _filterColumns$, _filterColumns$2;
 
       if ((_filterColumns$ = filterColumns[0]) === null || _filterColumns$ === void 0 ? void 0 : _filterColumns$.width) {
@@ -189,6 +201,7 @@ var ProTable = function ProTable(props) {
       showPagination = _props$showPagination === void 0 ? true : _props$showPagination,
       _props$pageSizeList = props.pageSizeList,
       pageSizeList = _props$pageSizeList === void 0 ? [5, 10, 20, 50, 100] : _props$pageSizeList,
+      responsivePaginationType = props.responsivePaginationType,
       _props$showSkeleton = props.showSkeleton,
       propsShowSkeleton = _props$showSkeleton === void 0 ? true : _props$showSkeleton,
       _props$skeletonSize = props.skeletonSize,
@@ -206,6 +219,7 @@ var ProTable = function ProTable(props) {
       customRequest = props.customRequest,
       _props$filterColumnTy = props.filterColumnType,
       filterColumnType = _props$filterColumnTy === void 0 ? 'auto' : _props$filterColumnTy,
+      defaultFilterParams = props.defaultFilterParams,
       otherProps = _objectWithoutProperties(props, _excluded);
 
   var targetPageKey = pageKey || globalPageKey;
@@ -249,10 +263,8 @@ var ProTable = function ProTable(props) {
   var _useState13 = (0, _react.useState)(true),
       _useState14 = _slicedToArray(_useState13, 2),
       customTableLoading = _useState14[0],
-      setCustomTableLoading = _useState14[1]; // 用于存放 Search 组件之前值的 ref
+      setCustomTableLoading = _useState14[1];
 
-
-  var searchValueRef = (0, _react.useRef)('');
   var tableRef = (0, _react.useRef)(null);
   var actionRef = (0, _react.useRef)(); // 传给 table 的过滤后的 columns
 
@@ -302,19 +314,22 @@ var ProTable = function ProTable(props) {
   var _useState23 = (0, _react.useState)(false),
       _useState24 = _slicedToArray(_useState23, 2),
       fullscreenState = _useState24[0],
-      setFullscreenState = _useState24[1]; // 整个内容区是否超过一屏。用于表格在非全屏模式下的吸底
+      setFullscreenState = _useState24[1]; // 非全屏状态下的
+
 
+  var normalDataFilterFormRef = (0, _react.useRef)();
+  var fullscreenDataFilterFormRef = (0, _react.useRef)();
+  var normalDataFilterForm = normalDataFilterFormRef.current;
+  var fullscreenDataFilterForm = fullscreenDataFilterFormRef.current; // 传给 QueryFilter 的 formRef
+
+  var dataFilterFormRef = fullscreenState ? normalDataFilterFormRef : fullscreenDataFilterFormRef;
+  var dataFilterForm = dataFilterFormRef.current; // 整个内容区是否超过一屏。用于表格在非全屏模式下的吸底
 
   var _useState25 = (0, _react.useState)(false),
       _useState26 = _slicedToArray(_useState25, 2),
       footerSuctionState = _useState26[0],
-      setFooterSuctionState = _useState26[1];
-  /** 筛选区域 form */
-
+      setFooterSuctionState = _useState26[1]; // TODO 获取内容区是否超出一屏（暂时仅支持全家桶）
 
-  var dataFilterForm = (0, _react.useMemo)(function () {
-    return (0, _form.createForm)();
-  }, []); // TODO 获取内容区是否超出一屏（暂时仅支持全家桶）
 
   var getFooterSuctionState = function getFooterSuctionState() {
     var containerDom = document.querySelector('.teamix-pro-page-container-scroll-container');
@@ -467,18 +482,16 @@ var ProTable = function ProTable(props) {
       return _request(params);
     },
     request: function request(params) {
-      if (dataFilterForm.validate()) {
-        // 如果请求中还有翻页相关信息，需要自动设置到指定页
-        if (params === null || params === void 0 ? void 0 : params[targetPageKey]) {
-          setCurrentPage(params[targetPageKey]);
-        }
-
-        if (params === null || params === void 0 ? void 0 : params[targetPageSizeKey]) {
-          setPageSize(params[targetPageSizeKey]);
-        }
+      // 如果请求中还有翻页相关信息，需要自动设置到指定页
+      if (params === null || params === void 0 ? void 0 : params[targetPageKey]) {
+        setCurrentPage(params[targetPageKey]);
+      }
 
-        _request(params);
+      if (params === null || params === void 0 ? void 0 : params[targetPageSizeKey]) {
+        setPageSize(params[targetPageSizeKey]);
       }
+
+      _request(params);
     },
     reset: function reset() {
       var _actionRef$current3, _actionRef$current3$s;
@@ -486,7 +499,7 @@ var ProTable = function ProTable(props) {
       (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onReset) && (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onReset()); // 清空列过滤参数
 
       (_actionRef$current3 = actionRef.current) === null || _actionRef$current3 === void 0 ? void 0 : (_actionRef$current3$s = _actionRef$current3.setFilterRules) === null || _actionRef$current3$s === void 0 ? void 0 : _actionRef$current3$s.call(_actionRef$current3, {});
-      dataFilterForm.reset();
+      dataFilterForm === null || dataFilterForm === void 0 ? void 0 : dataFilterForm.reset();
       setCurrentPage(1);
 
       _request(_defineProperty({}, targetPageKey, 1));
@@ -509,6 +522,8 @@ var ProTable = function ProTable(props) {
     },
     data: data,
     dataFilterForm: dataFilterForm,
+    normalDataFilterForm: normalDataFilterForm,
+    fullscreenDataFilterForm: fullscreenDataFilterForm,
     resetTableMaxBodyHeight: function resetTableMaxBodyHeight() {
       getHeaderHeight().then(function (height) {
         setHeaderHeight(height);
@@ -611,7 +626,7 @@ var ProTable = function ProTable(props) {
 
     var sortParams = targetFormatSort(sort); // 筛选区请求参数
 
-    var dataFilterParams = toJS(dataFilterForm.values); // 列过滤请求参数
+    var dataFilterParams = toJS(dataFilterForm === null || dataFilterForm === void 0 ? void 0 : dataFilterForm.values); // 列过滤请求参数
 
     var columnsFilterParams = (_actionRef$current$ge = (_actionRef$current4 = actionRef.current) === null || _actionRef$current4 === void 0 ? void 0 : (_actionRef$current4$g = _actionRef$current4.getFilterRules) === null || _actionRef$current4$g === void 0 ? void 0 : _actionRef$current4$g.call(_actionRef$current4)) !== null && _actionRef$current$ge !== void 0 ? _actionRef$current$ge : {}; // 格式化后的请求参数
 
@@ -674,15 +689,10 @@ var ProTable = function ProTable(props) {
     }
 
     if (requestWhenMount) {
-      _request();
-    }
-
-    var searchName = getSearchName();
+      // 在请求发送之前 处理漏斗默认数据
+      (0, _utils2.processDefaultFilter)(propsColumns, actionRef, defaultFilterParams);
 
-    if (searchName) {
-      // 如果有初始值，需要赋值
-      var initialValues = toJS(dataFilterForm.initialValues);
-      searchValueRef.current = initialValues[searchName][1];
+      _request();
     }
 
     return function () {
@@ -704,62 +714,25 @@ var ProTable = function ProTable(props) {
     setSort(nextSort);
 
     _request(targetFormatSort(nextSort));
-  } // 找到 Search 组件对应的 name
-
-
-  var getSearchName = function getSearchName() {
-    var _dataFilter$schema;
-
-    if ((dataFilter === null || dataFilter === void 0 ? void 0 : dataFilter.schema) && ((_dataFilter$schema = dataFilter.schema) === null || _dataFilter$schema === void 0 ? void 0 : _dataFilter$schema.length) > 0) {
-      var searchSchema = dataFilter.schema.find(function (item) {
-        return item.component === 'Search';
-      });
-
-      if (searchSchema) {
-        var searchName = searchSchema.name;
-        return searchName;
-      }
-    }
-  }; // 处理 dataFilter 中的 onFilter、onReset
+  } // 处理 dataFilter 中的 onFilter、onReset
 
 
   var dataFilter = _objectSpread(_objectSpread({
     mode: 'inline'
   }, propsDataFilter), {}, {
-    onFilter: (0, _lodash.default)(function (values) {
-      (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onFilter) && (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onFilter(values));
-
-      if (dataFilterForm.validate()) {
-        var _actionRef$current5, _actionRef$current5$c;
-
-        /**
-         * 针对 inline 模式下的 Search 组件做特殊处理
-         * 当切换条件且输入内容为空的时候，类似[a, ''] => [b, ''] 不触发请求
-         */
-        if (dataFilter.mode === 'inline') {
-          var searchName = getSearchName();
+    onFilter: function onFilter(values) {
+      var _actionRef$current5, _actionRef$current5$c;
 
-          if (searchName) {
-            var searchValue = values[searchName][1];
+      (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onFilter) && (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onFilter(values)); // 搜索变化时，暂时先清空选择
 
-            if (searchValue === (searchValueRef === null || searchValueRef === void 0 ? void 0 : searchValueRef.current)) {
-              return;
-            }
-
-            searchValueRef.current = searchValue;
-          }
-        } // 搜索变化时，暂时先清空选择
-
-
-        (_actionRef$current5 = actionRef.current) === null || _actionRef$current5 === void 0 ? void 0 : (_actionRef$current5$c = _actionRef$current5.clearRowSelection) === null || _actionRef$current5$c === void 0 ? void 0 : _actionRef$current5$c.call(_actionRef$current5);
-        setCurrentPage(1);
+      (_actionRef$current5 = actionRef.current) === null || _actionRef$current5 === void 0 ? void 0 : (_actionRef$current5$c = _actionRef$current5.clearRowSelection) === null || _actionRef$current5$c === void 0 ? void 0 : _actionRef$current5$c.call(_actionRef$current5);
+      setCurrentPage(1);
 
-        _request(_defineProperty({}, targetPageKey, 1));
-      }
-    }, filterDebounce),
+      _request(_defineProperty({}, targetPageKey, 1));
+    },
     onReset: function onReset() {
       (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onReset) && (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onReset());
-      dataFilterForm.reset();
+      dataFilterForm === null || dataFilterForm === void 0 ? void 0 : dataFilterForm.reset();
       setCurrentPage(1);
 
       _request(_defineProperty({}, targetPageKey, 1));
@@ -774,7 +747,7 @@ var ProTable = function ProTable(props) {
     }
   };
 
-  var renderTable = function renderTable() {
+  var renderTable = function renderTable(isFullScreen) {
     if (propsColumns) {
       return /*#__PURE__*/_react.default.createElement("div", {
         className: (0, _classnames.default)('teamix-pro-table-container', className)
@@ -786,7 +759,7 @@ var ProTable = function ProTable(props) {
         actionRef: actionRef,
         columns: propsColumns,
         dataFilter: dataFilter,
-        dataFilterForm: dataFilterForm,
+        dataFilterFormRef: isFullScreen ? fullscreenDataFilterFormRef : normalDataFilterFormRef,
         rowSelection: rowSelection,
         filterColumnType: filterColumnType
       }), /*#__PURE__*/_react.default.createElement(_components.Table.StickyLock, _objectSpread({
@@ -828,7 +801,7 @@ var ProTable = function ProTable(props) {
 
       var targetActions = footerAction.actions.map(function (action) {
         return _objectSpread(_objectSpread({}, action), {}, {
-          disabled: action.disabled || selectedCount === 0
+          disabled: (action === null || action === void 0 ? void 0 : action.disabled) || selectedCount === 0
         });
       });
 
@@ -894,14 +867,15 @@ var ProTable = function ProTable(props) {
         })
       }, renderRowSelection(), /*#__PURE__*/_react.default.createElement("div", {
         className: cls('footer-right-wrapper')
-      }, showSkeleton ? /*#__PURE__*/_react.default.createElement(_skeleton.ProSkeletonRaw.Footer.Pagination, null) : /*#__PURE__*/_react.default.createElement(_components.Pagination, _objectSpread({
+      }, showSkeleton ? /*#__PURE__*/_react.default.createElement(_skeleton.ProSkeletonRaw.Footer.Pagination, null) : /*#__PURE__*/_react.default.createElement(_Pagination.default, _objectSpread({
         className: cls('pagination'),
         onChange: function onChange(number) {
           return onChangePagination(number);
         },
         total: total,
-        shape: "arrow-only",
-        pageSizePosition: "end",
+        responsivePaginationType: responsivePaginationType,
+        // shape="arrow-only"
+        // pageSizePosition="end"
         totalRender: function totalRender(total) {
           return (0, _utils.getMessage)('total', {
             total: total
@@ -930,14 +904,16 @@ var ProTable = function ProTable(props) {
   return /*#__PURE__*/_react.default.createElement(_Fullscreen.default, {
     visible: fullscreenState,
     actionRef: actionRef
-  }, /*#__PURE__*/_react.default.createElement("div", {
-    className: cls({
-      '': true,
-      fullscreen: fullscreenState // 'footer-suction': footerSuctionState && footerSuction,
-
-    }),
-    ref: tableRef
-  }, renderTable(), footerSuctionState && footerSuction && !fullscreenState && /*#__PURE__*/_react.default.createElement(_pageContainer.default.FixedFooter, null, renderFooter()), !(footerSuctionState && footerSuction) && !fullscreenState && renderFooter(), fullscreenState && renderFooter()));
+  }, function (isFullScreen) {
+    return /*#__PURE__*/_react.default.createElement("div", {
+      className: cls({
+        '': true,
+        fullscreen: fullscreenState // 'footer-suction': footerSuctionState && footerSuction,
+
+      }),
+      ref: tableRef
+    }, renderTable(isFullScreen), footerSuctionState && footerSuction && !fullscreenState && /*#__PURE__*/_react.default.createElement(_pageContainer.default.FixedFooter, null, renderFooter()), !(footerSuctionState && footerSuction) && !fullscreenState && renderFooter(), fullscreenState && renderFooter());
+  });
 };
 
 var _default = ProTable;

package/lib/table/index.scss

@@ -40,11 +40,6 @@ $fullscreenPadding: 24px;
     justify-content: flex-end;
     width: 100%;
   }
-  .teamix-pro-pagination-wrapper {
-    display: flex;
-    justify-content: flex-end;
-    width: 100%;
-  }
   &-footer-action {
     margin-left: 16px;
   }
@@ -114,4 +109,9 @@ $fullscreenPadding: 24px;
 
 .next-table-empty {
   --table-empty-padding: 48px;
+}
+
+// 后面在基础组件里面覆盖
+.next-table.next-table td .next-table-cell-wrapper {
+  text-overflow: unset;
 }

package/lib/table/typing.d.ts

@@ -3,7 +3,7 @@
  */
 import { ColumnProps, TableProps } from '@alicloudfe/components/types/table';
 import { ProFieldType, ProFieldRenderProps, ProFieldDataSourceItem } from '../field';
-import { IFilterProps } from '../form';
+import { QueryFilterProps } from '../form';
 import { ProActionGroupProps, ProActionButtonProps } from '../actions';
 import { PaginationProps } from '@alicloudfe/components/types/pagination';
 import { HeaderProps as ProTableHeaderProps } from '@teamix/utils';
@@ -22,6 +22,7 @@ declare type TDataService = {
     /** 表格数据 */
     data?: any;
 };
+export declare type responsivePaginationType = 'mini' | 'small' | 'simple' | 'normal';
 export declare type ProTableColumnProps = {
     /**
      * 会在 title 之后展示一个 icon，hover 之后提示一些信息
@@ -55,6 +56,8 @@ export declare type ProTableColumnProps = {
     dataIndex?: string | string[];
     /** 指定 valueType 为日期时间格式时，可以格式化日期时间 */
     format?: string;
+    /** ProField 其他配置项 */
+    props?: any;
 } & Omit<ColumnProps, 'filters' | 'dataIndex' | 'filtersMode'>;
 export declare type ProColumnProps = ProTableColumnProps;
 export declare type ProTableProps = {
@@ -92,6 +95,8 @@ export declare type ProTableProps = {
     paginationProps?: PaginationProps;
     /** 是否显示翻页器  */
     showPagination?: boolean;
+    /** 手动指定响应式翻页器的 type */
+    responsivePaginationType?: responsivePaginationType;
     /** 是否使用内置的 rowSelection */
     useRowSelection?: boolean;
     /** 内置 rowSelection 变化时的回调 */
@@ -102,7 +107,10 @@ export declare type ProTableProps = {
     footerAction?: ProActionGroupProps | React.ReactNode;
     /** 表格底部（右层）配置 */
     footer?: React.ReactNode;
-    /** 筛选区自动搜索的防抖时间（毫秒） */
+    /**
+     * @deprecated 已废弃 建议用 dataFilter 中的 filterDebounce 代替
+     * 筛选区自动搜索的防抖时间（毫秒）
+     */
     filterDebounce?: number;
     /** ProTable action 的引用，便于手动触发一些方法  */
     actionRef?: React.MutableRefObject<ProTableActionType | undefined>;
@@ -122,6 +130,10 @@ export declare type ProTableProps = {
         data: any[];
         total?: number;
     }>;
+    /** 默认漏斗过滤条件 */
+    defaultFilterParams?: {
+        [key: string]: any[] | any;
+    };
 } & Omit<TableProps, 'columns'> & ProTableTopAreaProps;
 export declare type rowSelectionType = {
     getProps?: (record: any, index: number) => any;
@@ -178,6 +190,8 @@ export declare type ProTableActionType = {
     resetPage?: () => void;
     /** 获取数据过滤区表单实例 */
     dataFilterForm?: FormType;
+    normalDataFilterForm?: FormType;
+    fullscreenDataFilterForm?: FormType;
     /** 表格当前的数据 */
     data?: any[];
 } & ProTableActionTypeMutations;
@@ -212,17 +226,12 @@ export declare type ProTableActionTypeState = {
     [key: string]: any;
 };
 export declare type ProTableDataFilterProps = {
-    /** 展示形式 */
-    mode?: 'inline' | 'panel';
-    /** mode='panel' 时是否默认展开 */
-    expand?: boolean;
-    /** 搜索时是否传入值为undefined的参数，默认不传 */
     searchUndefined?: boolean;
     /** 搜索时是否传入值为空字符串的参数，默认不传 */
     searchEmptyString?: boolean;
     /** 自定义内容 */
     content?: React.ReactNode;
-} & IFilterProps;
+} & QueryFilterProps;
 export declare type dataFilterProps = ProTableDataFilterProps;
 export declare type ProTableTopAreaProps = {
     /** 标题区 */
@@ -235,8 +244,8 @@ export declare type ProTableTopAreaProps = {
     extra?: ProActionButtonProps | React.ReactNode | React.ReactNode[];
     /** 数据过滤区 */
     dataFilter?: ProTableDataFilterProps;
-    /** 数据过滤区 form 表单模型 */
-    dataFilterForm?: FormType;
+    /** 传给 QueryFilter 的 formRef */
+    dataFilterFormRef?: any;
     /** 排序、筛选列展示状态 */
     filterColumnType?: 'dialog' | 'dropdown' | 'auto';
 };

package/lib/table/utils/columnRender.js

@@ -145,7 +145,8 @@ var renderCell = function renderCell(value, item, index, record, actionRef) {
   }
 
   var newRender = null;
-  var newDataSource = null; // 如果 render 直接传函数
+  var newDataSource = null;
+  var props = item.props; // 如果 render 直接传函数
 
   if (typeof render === 'function') {
     newRender = function newRender() {
@@ -153,6 +154,23 @@ var renderCell = function renderCell(value, item, index, record, actionRef) {
     };
   } else {
     newRender = processBuriedPoint(processRenderFunction(render, value, index, record), record, value, index);
+
+    if (valueType === 'selectGroup') {
+      newRender = _objectSpread(_objectSpread({
+        maxShowNumber: 1,
+        foldText: 'more',
+        editOnClick: function editOnClick() {},
+        edit: true
+      }, newRender), {}, {
+        ellipsis: false
+      });
+      props = _objectSpread({
+        valueAlias: {
+          value: 'TagValue',
+          key: 'TagKey'
+        }
+      }, props);
+    }
   } // 渲染操作组
 
 
@@ -195,13 +213,13 @@ var renderCell = function renderCell(value, item, index, record, actionRef) {
   } // 渲染 ProField
 
 
-  return /*#__PURE__*/_react.default.createElement(_field.default, {
+  return /*#__PURE__*/_react.default.createElement(_field.default, _objectSpread({
     type: valueType || 'text',
     value: value,
     render: newRender,
     dataSource: newDataSource,
     format: format
-  });
+  }, props));
 };
 /**
  * 处理 render 配置项是函数的情况

package/lib/table/utils/index.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="react" />
 import { ProTableActionType } from '../typing';
+import { ProTableProps, ProTableColumnProps } from '..';
 export declare function initActionRef(): void;
 /** table 组件内监听 不对外暴露 */
 export declare function on(fun: any, key: string): void;
@@ -9,3 +10,9 @@ export declare function off(key: string): void;
 export declare function emit(key: string, ...args: any): void;
 export declare function useActionType<T>(ref: React.MutableRefObject<ProTableActionType | undefined>, action: ProTableActionType): void;
 export declare function cloneDeep<T>(obj: T): T;
+/**
+ * 处理默认过滤参数
+ * @param columns
+ * @param ref
+ */
+export declare function processDefaultFilter(columns: ProTableColumnProps[], ref: React.MutableRefObject<ProTableActionType | undefined>, defaultFilterParams: ProTableProps['defaultFilterParams']): void;

package/lib/table/utils/index.js

@@ -8,6 +8,7 @@ exports.emit = emit;
 exports.initActionRef = initActionRef;
 exports.off = off;
 exports.on = on;
+exports.processDefaultFilter = processDefaultFilter;
 exports.useActionType = useActionType;
 
 var _lodash = _interopRequireDefault(require("lodash.clonedeep"));
@@ -193,4 +194,41 @@ function useActionType(ref, action) {
 
 function cloneDeep(obj) {
   return (0, _lodash.default)(obj);
+}
+/**
+ * 处理默认过滤参数
+ * @param columns
+ * @param ref
+ */
+
+
+function processDefaultFilter(columns, ref, defaultFilterParams) {
+  columns.forEach(function (column) {
+    var _column$dataIndex$toS, _column$dataIndex;
+
+    var defaultRules = defaultFilterParams === null || defaultFilterParams === void 0 ? void 0 : defaultFilterParams[(_column$dataIndex$toS = column === null || column === void 0 ? void 0 : (_column$dataIndex = column.dataIndex) === null || _column$dataIndex === void 0 ? void 0 : _column$dataIndex.toString()) !== null && _column$dataIndex$toS !== void 0 ? _column$dataIndex$toS : ''];
+
+    if (defaultRules) {
+      var _ref$current$getState, _ref$current, _ref$current$getState2, _ref$current$getState3, _ref$current2, _ref$current2$setFilt;
+
+      var params = '';
+      var rules = [];
+
+      if (Array.isArray(defaultRules)) {
+        params = defaultRules.join(',');
+        rules = defaultRules;
+      } else {
+        params = defaultRules;
+        rules = [defaultRules];
+      } // 需要带上其他所有的信息
+
+
+      var otherRules = (_ref$current$getState = (_ref$current = ref.current) === null || _ref$current === void 0 ? void 0 : (_ref$current$getState2 = _ref$current.getState) === null || _ref$current$getState2 === void 0 ? void 0 : (_ref$current$getState3 = _ref$current$getState2.call(_ref$current)) === null || _ref$current$getState3 === void 0 ? void 0 : _ref$current$getState3.filterRules) !== null && _ref$current$getState !== void 0 ? _ref$current$getState : {}; // 再设置所有的列筛选状态
+
+      (_ref$current2 = ref.current) === null || _ref$current2 === void 0 ? void 0 : (_ref$current2$setFilt = _ref$current2.setFilterRules) === null || _ref$current2$setFilt === void 0 ? void 0 : _ref$current2$setFilt.call(_ref$current2, _objectSpread(_objectSpread({}, otherRules), {}, _defineProperty({}, column.dataIndex, {
+        rules: rules,
+        params: params
+      })));
+    }
+  });
 }

package/lib/utils/index.d.ts

@@ -1,2 +1,3 @@
 import * as utils from '@teamix/utils';
+export * from '@teamix/utils';
 export default utils;

package/lib/utils/index.js

@@ -5,10 +5,23 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+var _exportNames = {};
 exports.default = void 0;
 
 var utils = _interopRequireWildcard(require("@teamix/utils"));
 
+Object.keys(utils).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === utils[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return utils[key];
+    }
+  });
+});
+
 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); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamix/pro",
-  "version": "1.2.22",
+  "version": "1.2.27",
   "description": "TeamixPro大包",
   "repository": "http://gitlab.alibaba-inc.com/teamix/pro",
   "author": "Velociraptor(迅猛龙)",
@@ -22,9 +22,9 @@
   ],
   "private": false,
   "dependencies": {
-    "@formily/core": "2.0.5",
-    "@formily/react": "2.0.5",
-    "@teamix/formily": "2.0.5-2",
+    "@formily/core": "2.0.8",
+    "@formily/react": "2.0.8",
+    "@teamix/formily": "2.0.8",
     "@teamix/hooks": "^0.1.0",
     "@teamix/pop-confirm": "^1.2.4",
     "@teamix/pro-field": "^1.0.0",