@teamix/pro 1.2.21 → 1.2.22

package/es/table/index.js

@@ -40,7 +40,7 @@ import { baseClass, useRequest, request as utilResquest, getDeepValue, getMessag
 import { ProSkeletonRaw as Skeleton } from '../skeleton';
 import './index.scss';
 import Layout from './components/Layout';
-import { useActionType } from './utils';
+import { emit, initActionRef, useActionType } from './utils';
 import getTableProps from './utils/getTableProps';
 import getTableSortIcons from './utils/getTableSortIcons';
 import useTableSelection from './utils/useTableSelection';
@@ -66,6 +66,8 @@ var processColumns = function processColumns(columns, initialColumns) {
   }); // 处理只剩一列批量选择的情况下宽度错乱问题
 
   if (filterColumns === null || filterColumns === void 0 ? void 0 : filterColumns.length) {
+    var _initialColumns$;
+
     if ((filterColumns === null || filterColumns === void 0 ? void 0 : filterColumns.length) === 1) {
       var _filterColumns$, _filterColumns$2;
 
@@ -76,14 +78,14 @@ var processColumns = function processColumns(columns, initialColumns) {
       if ((_filterColumns$2 = filterColumns[0]) === null || _filterColumns$2 === void 0 ? void 0 : _filterColumns$2.lock) {
         filterColumns[0].lock = false;
       }
-    } else {
-      var _initialColumns$, _initialColumns$2;
+    } else if (((_initialColumns$ = initialColumns[0]) === null || _initialColumns$ === void 0 ? void 0 : _initialColumns$.columnFilters) !== false) {
+      var _initialColumns$2, _initialColumns$3;
 
-      if ((_initialColumns$ = initialColumns[0]) === null || _initialColumns$ === void 0 ? void 0 : _initialColumns$.width) {
+      if ((_initialColumns$2 = initialColumns[0]) === null || _initialColumns$2 === void 0 ? void 0 : _initialColumns$2.width) {
         filterColumns[0].width = initialColumns[0].width;
       }
 
-      if ((_initialColumns$2 = initialColumns[0]) === null || _initialColumns$2 === void 0 ? void 0 : _initialColumns$2.lock) {
+      if ((_initialColumns$3 = initialColumns[0]) === null || _initialColumns$3 === void 0 ? void 0 : _initialColumns$3.lock) {
         filterColumns[0].lock = initialColumns[0].lock;
       }
     }
@@ -204,8 +206,10 @@ var ProTable = function ProTable(props) {
   var _useState13 = useState(true),
       _useState14 = _slicedToArray(_useState13, 2),
       customTableLoading = _useState14[0],
-      setCustomTableLoading = _useState14[1];
+      setCustomTableLoading = _useState14[1]; // 用于存放 Search 组件之前值的 ref
+
 
+  var searchValueRef = useRef('');
   var tableRef = useRef(null);
   var actionRef = useRef(); // 传给 table 的过滤后的 columns
 
@@ -404,9 +408,14 @@ var ProTable = function ProTable(props) {
     setColumn: function setColumn(newColumns) {
       var _actionRef$current2, _actionRef$current2$s;
 
+      var update = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
       var columns = processColumns(newColumns, propsColumns);
       setFilteredColumns(columns);
       (_actionRef$current2 = actionRef.current) === null || _actionRef$current2 === void 0 ? void 0 : (_actionRef$current2$s = _actionRef$current2.setState) === null || _actionRef$current2$s === void 0 ? void 0 : _actionRef$current2$s.call(_actionRef$current2, 'filterColumns', columns);
+
+      if (update) {
+        emit('refreshFilterState', newColumns);
+      }
     },
     setSize: function setSize(mode) {
       _setSize(mode);
@@ -610,10 +619,8 @@ var ProTable = function ProTable(props) {
   }
 
   useEffect(function () {
-    var _actionRef$current5, _actionRef$current5$i;
-
-    // 初始化 state 状态
-    actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current5 = actionRef.current) === null || _actionRef$current5 === void 0 ? void 0 : (_actionRef$current5$i = _actionRef$current5.initState) === null || _actionRef$current5$i === void 0 ? void 0 : _actionRef$current5$i.call(_actionRef$current5); // 监听 浏览器变化 更吸底状态
+    // 初始化 actionRef state、callback 此时 actionRef 已初始化完成
+    initActionRef(); // 监听 浏览器变化 更吸底状态
 
     if (footerSuction) {
       getFooterSuctionState();
@@ -627,6 +634,14 @@ var ProTable = function ProTable(props) {
       _request();
     }
 
+    var searchName = getSearchName();
+
+    if (searchName) {
+      // 如果有初始值，需要赋值
+      var initialValues = toJS(dataFilterForm.initialValues);
+      searchValueRef.current = initialValues[searchName][1];
+    }
+
     return function () {
       if (autoRefreshTimerRef.current) {
         clearTimeout(autoRefreshTimerRef.current);
@@ -646,18 +661,54 @@ var ProTable = function ProTable(props) {
     setSort(nextSort);
 
     _request(targetFormatSort(nextSort));
-  } // 处理 dataFilter 中的 onFilter、onReset
+  } // 找到 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
 
 
-  var dataFilter = _objectSpread(_objectSpread({}, propsDataFilter), {}, {
-    onFilter: debounce(function () {
-      (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onFilter) && (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onFilter(_objectSpread({}, toJS(dataFilterForm.values))));
+  var dataFilter = _objectSpread(_objectSpread({
+    mode: 'inline'
+  }, propsDataFilter), {}, {
+    onFilter: debounce(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$current6, _actionRef$current6$c;
+        var _actionRef$current5, _actionRef$current5$c;
+
+        /**
+         * 针对 inline 模式下的 Search 组件做特殊处理
+         * 当切换条件且输入内容为空的时候，类似[a, ''] => [b, ''] 不触发请求
+         */
+        if (dataFilter.mode === 'inline') {
+          var searchName = getSearchName();
+
+          if (searchName) {
+            var searchValue = values[searchName][1];
 
-        // 搜索变化时，暂时先清空选择
-        (_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);
+            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);
 
         _request(_defineProperty({}, targetPageKey, 1));
@@ -752,21 +803,21 @@ var ProTable = function ProTable(props) {
 
   var renderFooter = function renderFooter() {
     function onChangePagination(currentPage) {
-      var _actionRef$current7, _actionRef$current7$c;
+      var _actionRef$current6, _actionRef$current6$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);
+      (_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(currentPage);
 
       _request(_objectSpread(_defineProperty({}, targetPageKey, currentPage), params));
     }
 
     function onChangePaginationSize(currentPageSize) {
-      var _actionRef$current8, _actionRef$current8$c, _request5;
+      var _actionRef$current7, _actionRef$current7$c, _request5;
 
       // 翻页暂时先清空选择
-      (_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$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);
       setPageSize(currentPageSize);
       setCurrentPage(1);
 

package/es/table/index.scss

@@ -40,7 +40,7 @@ $fullscreenPadding: 24px;
     justify-content: flex-end;
     width: 100%;
   }
-  .pagination-wrapper {
+  .teamix-pro-pagination-wrapper {
     display: flex;
     justify-content: flex-end;
     width: 100%;

package/es/table/typing.d.ts

@@ -12,7 +12,7 @@ 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) => any;
+declare type ProTableCellFunProp = (value: any, index: number, record: any, ...others: any) => any;
 declare type ITableCellRender = {
     [key in IFieldRenderProps]?: ProFieldRenderProps[key] | ProTableCellFunProp;
 } | ((...other: any) => React.ReactNode);
@@ -146,7 +146,7 @@ export declare type ProTableActionType = {
     /** 全屏展示 */
     fullScreen?: () => boolean;
     /** 设置显示列 */
-    setColumn?: (newColumns: ProColumnProps[]) => void;
+    setColumn?: (newColumns: ProColumnProps[], update?: boolean) => void;
     /** 设置表格大小 */
     setSize?: (mode: 'small' | 'medium') => void;
     /** 刷新表格 */
@@ -220,6 +220,8 @@ export declare type ProTableDataFilterProps = {
     searchUndefined?: boolean;
     /** 搜索时是否传入值为空字符串的参数，默认不传 */
     searchEmptyString?: boolean;
+    /** 自定义内容 */
+    content?: React.ReactNode;
 } & IFilterProps;
 export declare type dataFilterProps = ProTableDataFilterProps;
 export declare type ProTableTopAreaProps = {

package/es/table/utils/columnRender.js

@@ -204,7 +204,8 @@ var processRenderFunction = function processRenderFunction() {
   var value = arguments.length > 1 ? arguments[1] : undefined;
   var index = arguments.length > 2 ? arguments[2] : undefined;
   var record = arguments.length > 3 ? arguments[3] : undefined;
-  var external = ['linkOnClick', 'link', 'value'];
+  // 当 ProField render 类型为 function 时。需要表格预先处理以塞入 record
+  var external = ['linkOnClick', 'link', 'value', 'renderEdit', 'descriptionRenderEdit', 'editPopConfirmProps', 'descriptionEditPopConfirmProps', 'editOnClick', 'descriptionEditOnClick'];
   return Object.fromEntries(Object.entries(render).map(function (_ref3) {
     var _ref4 = _slicedToArray(_ref3, 2),
         k = _ref4[0],

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

@@ -1,4 +1,11 @@
 /// <reference types="react" />
 import { ProTableActionType } from '../typing';
+export declare function initActionRef(): void;
+/** table 组件内监听 不对外暴露 */
+export declare function on(fun: any, key: string): void;
+/** table 组件内销毁监听 不对外暴露 */
+export declare function off(key: string): void;
+/** table 组件内触发事件 不对外暴露 */
+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;

package/es/table/utils/index.js

@@ -16,7 +16,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-import cloneDeepLodash from 'lodash.clonedeep'; // 组件内全局状态
+import cloneDeepLodash from 'lodash.clonedeep'; // 组件内全局状态 每次初始化 ActionRef 会重新深拷贝对象
 
 var state = {
   fullScreenState: false,
@@ -24,12 +24,16 @@ var state = {
   filterColumns: []
 };
 
-var _initState = cloneDeepLodash(state); // 组件内全局监听事件
+var _initState = cloneDeepLodash(state); // state监听事件 每次初始化 ActionRef 会重新深拷贝对象
 
 
 var callback = {
   fullScreenState: {}
-}; // 组件内对全局状态的更改
+};
+var initCallback = cloneDeepLodash(callback); // 所有 ProTable 组件公用一套组件内事件转发机制
+
+var tableCallback = {}; // 组件内监听事件
+// 组件内对全局状态的更改
 
 var mutations = {
   getState: function getState() {
@@ -129,8 +133,38 @@ var useOn = function useOn(state) {
       }
     });
   }
-};
+}; // 初始化 actionRef
+
+
+export function initActionRef() {
+  state = cloneDeepLodash(_initState);
+  callback = cloneDeepLodash(initCallback);
+}
+/** table 组件内监听 不对外暴露 */
+
+export function on(fun, key) {
+  tableCallback[key] = fun;
+}
+/** table 组件内销毁监听 不对外暴露 */
 
+export function off(key) {
+  if (tableCallback[key]) {
+    delete tableCallback[key];
+  }
+}
+/** table 组件内触发事件 不对外暴露 */
+
+export function emit(key) {
+  var fun = tableCallback[key];
+
+  if (fun) {
+    for (var _len2 = arguments.length, args = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
+      args[_key2 - 1] = arguments[_key2];
+    }
+
+    fun.apply(void 0, args);
+  }
+}
 export function useActionType(ref, action) {
   // 合并自定义事件
   var userAction = _objectSpread(_objectSpread({}, action), mutations);

package/lib/actions/dialog.js

@@ -187,45 +187,34 @@ function useDialogAction(action, actionContext) {
             while (1) {
               switch (_context.prev = _context.next) {
                 case 0:
-                  if (!link) {
-                    _context.next = 5;
-                    break;
-                  }
-
-                  (0, _utils.goToLink)(link, history);
-                  onFinish && onFinish();
-                  resolve(true);
-                  return _context.abrupt("return");
-
-                case 5:
                   setLoading(true);
                   footerDescriptionValues = Object.assign({}, footerDescriptionRef === null || footerDescriptionRef === void 0 ? void 0 : (_footerDescriptionRef = footerDescriptionRef.current) === null || _footerDescriptionRef === void 0 ? void 0 : _footerDescriptionRef.values);
-                  _context.prev = 7;
+                  _context.prev = 2;
                   requestContext = Object.assign({
                     footer: footerDescriptionValues
                   }, context);
-                  _context.next = 11;
+                  _context.next = 6;
                   return (0, _request.doRequest)(action, requestContext, history, footerDescriptionValues);
 
-                case 11:
+                case 6:
                   onFinish && onFinish();
                   resolve(true);
-                  _context.next = 20;
+                  _context.next = 15;
                   break;
 
-                case 15:
-                  _context.prev = 15;
-                  _context.t0 = _context["catch"](7);
+                case 10:
+                  _context.prev = 10;
+                  _context.t0 = _context["catch"](2);
                   setLoading(false);
                   resolve(false);
                   return _context.abrupt("return");
 
-                case 20:
+                case 15:
                 case "end":
                   return _context.stop();
               }
             }
-          }, _callee, null, [[7, 15]]);
+          }, _callee, null, [[2, 10]]);
         }));
 
         return function (_x) {

package/lib/actions/index.d.ts

@@ -46,11 +46,21 @@ export interface ProActionMenuButtonProps extends MenuButtonProps {
 export declare const ProActionMenuButton: (props: ProActionMenuButtonProps) => JSX.Element;
 export declare type ProActionProps = ProActionButtonProps | ProActionMenuButtonProps;
 export declare type ProActionGroupProps = {
+    /** 操作组类型：按钮、文字按钮 */
     type?: 'button' | 'text';
+    /** 上下文 */
     context?: any;
+    /** 操作项配置 */
     actions: ProActionProps[];
+    /** 操作按钮最长数量，超出后折叠，默认为4 */
     max?: number;
+    /**
+     * @deprecated 建议使用 more 代替
+     */
     moreText?: string;
+    /** 更多按钮的配置，只有在actions数量超过max时才有效 */
+    more?: string | ProActionButtonProps;
+    /** 是否有分割线，只有type="text"时生效，默认有分割线 */
     divider?: boolean;
 } & React.HTMLAttributes<HTMLElement>;
 export declare function ProActionGroup(props: ProActionGroupProps): JSX.Element;

package/lib/actions/index.js

@@ -60,7 +60,7 @@ var _excluded = ["type"],
     _excluded5 = ["context", "text"],
     _excluded6 = ["key", "actions"],
     _excluded7 = ["key", "config"],
-    _excluded8 = ["type", "divider", "max", "moreText", "context", "actions", "className"];
+    _excluded8 = ["type", "divider", "max", "moreText", "more", "context", "actions", "className"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -329,25 +329,19 @@ function renderCommonActionButton(button, context, isTypeText) {
   return /*#__PURE__*/_react.default.createElement(ProActionMenuButton, _objectSpread({}, buttonProps));
 }
 
-function getDefaultMoreButton(type, moreText) {
-  if (type === 'button') {
-    return {
-      label: moreText || (0, _utils.getMessage)('more')
-    };
-  }
-
-  if (moreText) {
-    return {
-      label: moreText
-    };
-  }
-
-  return {
+function getDefaultMoreButton(type, more) {
+  var moreConfig = typeof more === 'string' ? {
+    children: more
+  } : more;
+  var defaultConfig = type === 'button' ? {
+    children: (0, _utils.getMessage)('more')
+  } : {
     icon: 'more-line',
     // iconSize: 'small',
     autoWidth: false,
     className: 'teamix-pro-actions-text-menu-btn-no-arrow'
   };
+  return Object.assign(defaultConfig, moreConfig);
 }
 
 var MAX_ACTTIONS = 4;
@@ -392,6 +386,7 @@ function ProActionGroup(props) {
       _props$max = props.max,
       max = _props$max === void 0 ? MAX_ACTTIONS : _props$max,
       moreText = props.moreText,
+      more = props.more,
       context = props.context,
       _props$actions = props.actions,
       actions = _props$actions === void 0 ? [] : _props$actions,
@@ -404,7 +399,7 @@ function ProActionGroup(props) {
   }).filter(function (action) {
     return action.visible !== false;
   });
-  var formatedActions = formatGroupActions(filteredActions, max, getDefaultMoreButton(type, moreText));
+  var formatedActions = formatGroupActions(filteredActions, max, getDefaultMoreButton(type, more || moreText));
   return /*#__PURE__*/_react.default.createElement("div", _objectSpread({
     className: (0, _classnames.default)('teamix-pro-actions', "teamix-pro-actions-type-".concat(type), className, {
       'teamix-pro-actions-divider': type === 'button' ? false : divider

package/lib/form/Filter/AdvancedFilter.js

@@ -72,6 +72,7 @@ var AdvancedFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
       props: {
         breakpoints: [480, 720, 990, 1200, Infinity],
         maxColumns: [1, 2, 3, 3, 4],
+        maxWidth: [480, 360, 330, 330, 300],
         columnGap: 16,
         rowGap: 12
       },

package/lib/form/ProForm/index.scss

@@ -186,13 +186,13 @@
 }
 
 // 数组类组件添加按钮
-.#{$css-prefix}formily-array-base-addition {
+.#{$form-array}-base-addition {
   .#{$css-prefix}formily-icon {
     margin-right: 4px;
   }
 }
 // 数组类ArrayItem Icon 居中
-.#{$css-prefix}formily-array-items-item-inner {
+.#{$form-array}-items-item-inner {
   > .#{$css-prefix}box {
     > .#{$css-prefix}space-item {
       > .#{$css-prefix}formily-icon {
@@ -209,7 +209,7 @@
 
 // 折叠面板
 .#{$css-prefix}formily-collapse,
-.#{$css-prefix}formily-array-collapse-item {
+.#{$form-array}-collapse-item {
   .#{$css-prefix}collapse-panel-hidden {
     .#{$css-prefix}collapse-panel-content {
       padding-top: 4px;
@@ -261,7 +261,7 @@
 }
 
 // ArrayItems
-.#{$css-prefix}formily-array-items {
+.#{$form-array}-items {
   .#{$css-prefix}formily-grid-layout {
     > div:last-child {
       display: flex;
@@ -269,8 +269,39 @@
       align-items: center;
     }
   }
-  .#{$css-prefix}formily-array-base-remove {
-    cursor: pointer;
+}
+.#{$form-array}-base-remove,
+.#{$form-array}-base-addition,
+.#{$form-array}-base-move-down,
+.#{$form-array}-base-move-up,
+.#{$form-array}-base-sort-handle,
+.form-array-base-icon {
+  color: var(--color-fill1-6, #848484);
+  &:hover {
+    color: var(--color-brand1-6, #0064c8);
+  }
+}
+.form-array-base-icon {
+  cursor: pointer;
+}
+
+// ArrayCard
+.#{$form-array}-cards-item {
+  .#{$css-prefix}card-head {
+    padding: 16px 20px;
+    background-color: var(--color-fill1-2, #f7f7f7);
+    .#{$css-prefix}card-head-main {
+      margin-top: 0;
+      border-bottom: 0;
+      height: 22px;
+      line-height: 22px;
+      .#{$css-prefix}card-title {
+        padding-left: 0;
+        &::before {
+          display: none;
+        }
+      }
+    }
   }
 }
 

package/lib/form/global.scss

@@ -1,6 +1,7 @@
 @import '~@alicloudfe/components/lib/common-var.scss';
 
 $form-item-cls: #{$css-prefix}formily-item;
+$form-array: #{$css-prefix}formily-array;
 $teamix-pro-form: teamix-pro-form;
 $teamix-pro-field: teamix-pro-field;
 

package/lib/index.d.ts

@@ -21,5 +21,5 @@ export * from './page-container';
 export * from './page-header';
 export * from './skeleton';
 export * from './table';
-declare const version = "1.2.20";
+declare const version = "1.2.21";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, hooks, nocode, templates, utils, };

package/lib/index.js

@@ -253,5 +253,5 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 _icon.default.setConfig(_utils.default.getTeamixIconConfig());
 
 // export * from './sidebar';
-var version = '1.2.20';
+var version = '1.2.21';
 exports.version = version;

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

@@ -70,7 +70,7 @@ var Layout = function Layout(props) {
       rowSelection = props.rowSelection,
       otherProps = _objectWithoutProperties(props, _excluded);
 
-  var mode = (dataFilter === null || dataFilter === void 0 ? void 0 : dataFilter.mode) || 'inline';
+  var mode = dataFilter === null || dataFilter === void 0 ? void 0 : dataFilter.mode;
 
   var _useState = (0, _react.useState)((dataFilter === null || dataFilter === void 0 ? void 0 : dataFilter.expand) || false),
       _useState2 = _slicedToArray(_useState, 2),
@@ -129,17 +129,26 @@ var Layout = function Layout(props) {
 
 
   var renderPanelFilter = function renderPanelFilter() {
-    var _dataFilter$schema2;
+    if (dataFilter) {
+      var _dataFilter$schema2;
 
-    if (dataFilter && (dataFilter === null || dataFilter === void 0 ? void 0 : (_dataFilter$schema2 = dataFilter.schema) === null || _dataFilter$schema2 === void 0 ? void 0 : _dataFilter$schema2.length) >= 0) {
-      return /*#__PURE__*/_react.default.createElement("div", {
-        className: cls('panel-filter'),
-        style: {
-          display: expand ? 'block' : 'none'
-        }
-      }, /*#__PURE__*/_react.default.createElement(_form.AdvancedFilter, _objectSpread({
-        form: dataFilterForm
-      }, dataFilter)));
+      if ( /*#__PURE__*/(0, _react.isValidElement)(dataFilter === null || dataFilter === void 0 ? void 0 : dataFilter.content)) {
+        return /*#__PURE__*/_react.default.createElement("div", {
+          className: cls('panel-filter'),
+          style: {
+            display: expand ? 'block' : 'none'
+          }
+        }, dataFilter === null || dataFilter === void 0 ? void 0 : dataFilter.content);
+      } else if ((dataFilter === null || dataFilter === void 0 ? void 0 : (_dataFilter$schema2 = dataFilter.schema) === null || _dataFilter$schema2 === void 0 ? void 0 : _dataFilter$schema2.length) >= 0) {
+        return /*#__PURE__*/_react.default.createElement("div", {
+          className: cls('panel-filter'),
+          style: {
+            display: expand ? 'block' : 'none'
+          }
+        }, /*#__PURE__*/_react.default.createElement(_form.AdvancedFilter, _objectSpread({
+          form: dataFilterForm
+        }, dataFilter)));
+      }
     }
   }; // 渲染过滤器按钮
 

package/lib/table/components/Pagination/index.d.ts

@@ -1,3 +1,4 @@
 import { PaginationProps } from '@alicloudfe/components/types/pagination';
+import './index.scss';
 declare const _default: (props: PaginationProps) => JSX.Element;
 export default _default;