@teamix/pro 1.5.33 → 1.5.35

package/lib/form/Filter/AdvancedFilter.js

@@ -9,7 +9,7 @@ var _react = _interopRequireWildcard(require("react"));
 var _utils = require("@teamix/utils");
 var _ProForm = _interopRequireDefault(require("../ProForm"));
 var _utils2 = require("../utils");
-var _excluded = ["schema", "onSubmit", "onReset", "layout", "labelAlign", "wrapperAlign", "labelCol", "wrapperCol", "breakpoints", "gridProps", "forceClear"];
+var _excluded = ["schema", "onSubmit", "onReset", "layout", "labelAlign", "wrapperAlign", "labelCol", "wrapperCol", "breakpoints", "gridProps", "forceClear", "submitProps", "resetProps", "buttonGroup"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 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; }
@@ -39,9 +39,46 @@ var AdvancedFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
     breakpoints = props.breakpoints,
     gridProps = props.gridProps,
     forceClear = props.forceClear,
+    _props$submitProps = props.submitProps,
+    submitProps = _props$submitProps === void 0 ? {} : _props$submitProps,
+    _props$resetProps = props.resetProps,
+    resetProps = _props$resetProps === void 0 ? {} : _props$resetProps,
+    buttonGroup = props.buttonGroup,
     otherProps = _objectWithoutProperties(props, _excluded);
   var prefixCls = (0, _utils.usePrefixCls)('teamix-pro-form-query-filter-advanced');
   var gridSchema = (0, _react.useMemo)(function () {
+    var resetSchema = _objectSpread(_objectSpread({
+      name: 'AdvancedFilterReset',
+      component: 'Reset'
+    }, resetProps), {}, {
+      props: _objectSpread({
+        onResetValidateSuccess: onReset,
+        forceClear: !!forceClear,
+        children: (0, _utils.getMessage)('reset')
+      }, resetProps === null || resetProps === void 0 ? void 0 : resetProps.props)
+    });
+    var submitSchema = _objectSpread(_objectSpread({
+      component: 'Submit'
+    }, submitProps), {}, {
+      props: _objectSpread({
+        style: {
+          marginRight: -4
+        },
+        children: (0, _utils.getMessage)('search')
+      }, submitProps === null || submitProps === void 0 ? void 0 : submitProps.props)
+    });
+    var buttonGroupSchema = [resetSchema, submitSchema];
+    if (buttonGroup) {
+      buttonGroupSchema = buttonGroup.map(function (item) {
+        if (item === 'Submit') {
+          return submitSchema;
+        }
+        if (item === 'Reset') {
+          return resetSchema;
+        }
+        return item;
+      });
+    }
     return [{
       name: 'AdvancedFilterFormGrid',
       component: 'FormGrid',
@@ -62,23 +99,7 @@ var AdvancedFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
           props: {
             align: 'right'
           },
-          children: [{
-            name: 'AdvancedFilterReset',
-            component: 'Reset',
-            props: {
-              onResetValidateSuccess: onReset,
-              forceClear: !!forceClear,
-              children: (0, _utils.getMessage)('reset')
-            }
-          }, {
-            component: 'Submit',
-            props: {
-              style: {
-                marginRight: -4
-              },
-              children: (0, _utils.getMessage)('search')
-            }
-          }]
+          children: _toConsumableArray(buttonGroupSchema)
         }]
       }])
     }];

package/lib/form/ProForm/index.js

@@ -24,6 +24,7 @@ var _useInitialRequest = _interopRequireDefault(require("./useInitialRequest"));
 var _validate = _interopRequireDefault(require("../locales/validate"));
 require("./index.scss");
 var _FormItem = _interopRequireDefault(require("../Components/FormItem2"));
+var _SelectTable = _interopRequireDefault(require("../Components/SelectTable2"));
 var _excluded = ["form", "initialValues", "initialRequest", "scope", "context", "components", "onChange", "onChangeType", "onSubmit", "onSubmitFailed", "onInitialComplete", "className", "validateFirst", "schema", "children"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 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); }
@@ -61,7 +62,8 @@ var formilyComponents = {
   Affix: _components.Affix,
   LightFilter: _LightFilter.default,
   Text: _index.default,
-  FormItem2: _FormItem.default
+  FormItem2: _FormItem.default,
+  SelectTable2: _SelectTable.default
 };
 var ProForm = /*#__PURE__*/(0, _react.memo)(function (_ref) {
   var outerForm = _ref.form,

package/lib/form/SchemaForm/adapterDecorator.js

@@ -16,7 +16,7 @@ var _default = function _default(decorator, component) {
   if (decorator !== undefined) {
     return decorator;
   }
-  if ([].concat(_toConsumableArray(Object.keys(_fieldTypeMap.default)), ['Upload', 'SelectTable', 'ArrayCards', 'ArrayCollapse', 'ArrayTable', 'ArrayItems']).includes(component)) {
+  if ([].concat(_toConsumableArray(Object.keys(_fieldTypeMap.default)), ['Upload', 'SelectTable', 'SelectTable2', 'ArrayCards', 'ArrayCollapse', 'ArrayTable', 'ArrayItems']).includes(component)) {
     return 'FormItem';
   }
   return decorator;

package/lib/form/SchemaForm/adapterType.js

@@ -54,7 +54,8 @@ var typeMap = (_typeMap = {
   Range: 'string',
   Search: 'array',
   SelectGroup: 'array',
-  SelectTable: 'array'
+  SelectTable: 'array',
+  SelectTable2: 'array'
 }, _defineProperty(_typeMap, 'SelectTable.Column', 'string'), _defineProperty(_typeMap, "ArrayCollapse", 'array'), _defineProperty(_typeMap, "ArrayCards", 'array'), _defineProperty(_typeMap, "ArrayTable", 'array'), _defineProperty(_typeMap, "ArrayItems", 'array'), _defineProperty(_typeMap, 'Editable.Popover', 'object'), _defineProperty(_typeMap, 'Editable.Dialog', 'object'), _defineProperty(_typeMap, 'Editable.Drawer', 'object'), _typeMap);
 var _default = function _default(type, component) {
   return type || typeMap[component] || 'void';

package/lib/form/typing.d.ts

@@ -115,6 +115,12 @@ export interface FilterProps extends ProFormProps {
     activeFilterValueRef?: React.MutableRefObject<any>;
     forceClear?: boolean;
     onReset?: (payload?: any) => void;
+    /** 搜索按钮配置 */
+    submitProps?: ProFormSchemaItem;
+    /** 重置按钮配置 */
+    resetProps?: ProFormSchemaItem;
+    /** 操作区按钮组配置 */
+    buttonGroup?: (ProFormSchemaItem | 'Submit' | 'Reset')[];
 }
 export interface QueryFilterLayoutProps {
     prefixCls?: string;
@@ -164,6 +170,12 @@ export interface QueryFilterProps extends ProFormProps {
     onReset?: (payload?: any) => void;
     /** 高级筛选按钮切换 */
     onExpand?: (expand: boolean) => void;
+    /** 搜索按钮配置 */
+    submitProps?: ProFormSchemaItem;
+    /** 重置按钮配置 */
+    resetProps?: ProFormSchemaItem;
+    /** 操作区按钮组配置 */
+    buttonGroup?: (ProFormSchemaItem | 'Submit' | 'Reset')[];
 }
 /**
  * 兼容性导出

package/lib/global.scss

@@ -45,3 +45,12 @@ button.next-btn.next-medium.next-btn-normal {
 .next-tag.next-tag.next-tag.next-tag-closable.next-tag-level-normal.next-tag-closable {
   transition: color 0s;
 }
+
+// 配置dialog弹窗内容可以换行
+.next-message-content {
+  white-space: pre-wrap;
+}
+// table 锁列层级变高
+.next-table-fix-left, .next-table-fix-right  {
+  z-index: 5;
+}

package/lib/index.d.ts

@@ -30,5 +30,5 @@ export * from './sidebar';
 export * from './utils';
 export * from './timeline';
 export * from './image';
-declare const version = "1.5.33";
+declare const version = "1.5.35";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, TeamixIcon, ProImage, hooks, nocode, templates, utils, };

package/lib/index.js

@@ -299,7 +299,7 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 if (!((_window = window) === null || _window === void 0 ? void 0 : _window.TEAMIXPRO_WITHOUT_ICON)) {
   _icon.default.setConfig(_utils.default.getTeamixIconConfig());
 }
-var version = '1.5.33';
+var version = '1.5.35';
 // By TeamixTest
 exports.version = version;
 window.postMessage({

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

@@ -0,0 +1,18 @@
+/**
+ * 渲染列的逻辑函数
+ */
+import React from 'react';
+import { ProTableColumnProps, ProTableActionType } from '../../typing';
+interface ICellProps {
+    value: any;
+    item: ProTableColumnProps;
+    index: number;
+    record: any;
+    actionRef: React.MutableRefObject<ProTableActionType | undefined>;
+    /** 接收外部比如 dialog-table 传过来的 context，用于弹窗关闭等 */
+    context?: any;
+    dataTeamixSpm?: string;
+    forcedUpdate?: boolean;
+}
+declare const _default: React.MemoExoticComponent<(props: ICellProps) => JSX.Element>;
+export default _default;

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

@@ -0,0 +1,224 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _react = _interopRequireDefault(require("react"));
+var _utils = require("@teamix/utils");
+var _actions = require("../../../actions");
+var _field = _interopRequireDefault(require("../../../field"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+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; }
+/**
+ * 负责单元格的具体渲染
+ */
+var Cell = function Cell(props) {
+  var _actionSchema$actions;
+  var recordValue = props.value,
+    record = props.record,
+    index = props.index,
+    item = props.item,
+    actionRef = props.actionRef,
+    context = props.context,
+    dataTeamixSpm = props.dataTeamixSpm;
+  var _item$valueType = item.valueType,
+    valueType = _item$valueType === void 0 ? 'text' : _item$valueType,
+    render = item.render,
+    actionSchema = item.actionSchema,
+    dataIndex = item.dataIndex,
+    format = item.format;
+  var value = recordValue;
+  // return JSON.stringify(value)
+  // 如果没传 dataIndex，返回 null
+  if (!dataIndex) {
+    value = null;
+  }
+  // 处理 dataIndex 为数组的情况
+  if (Array.isArray(dataIndex)) {
+    value = dataIndex.map(function (item) {
+      return (0, _utils.getTargetValue)("{{".concat(item, "}}"), _objectSpread(_objectSpread({}, record), {}, {
+        record: record
+      }));
+    });
+  }
+  var newRender = null;
+  var newDataSource = null;
+  var itemProps = item.props;
+  // 如果 render 直接传函数
+  if (typeof render === 'function') {
+    newRender = function newRender() {
+      return render === null || render === void 0 ? void 0 : render(value, index, record);
+    };
+  } else {
+    newRender = processBuriedPoint(processRenderFunction(render, value, index, record), record, value, index, context);
+    if (valueType === 'selectGroup') {
+      newRender = _objectSpread(_objectSpread({
+        maxShowNumber: 'auto',
+        foldText: 'more',
+        editOnClick: function editOnClick() {},
+        edit: true
+      }, newRender), {}, {
+        ellipsis: false
+      });
+      itemProps = _objectSpread({
+        valueAlias: {
+          value: 'TagValue',
+          key: 'TagKey'
+        }
+      }, itemProps);
+    }
+    if ((render === null || render === void 0 ? void 0 : render.type) === 'step') {
+      newRender = _objectSpread(_objectSpread({}, newRender), {}, {
+        ellipsis: false
+      });
+    }
+  }
+  // 渲染操作组
+  if (actionSchema && ((_actionSchema$actions = actionSchema.actions) === null || _actionSchema$actions === void 0 ? void 0 : _actionSchema$actions.length)) {
+    // 默认 context
+    var defaultContext = _objectSpread({
+      value: value,
+      index: index,
+      record: record,
+      action: actionRef.current
+    }, context);
+    return /*#__PURE__*/_react.default.createElement(_actions.ProActionGroup, _objectSpread(_objectSpread({
+      type: "text"
+    }, actionSchema), {}, {
+      context: _objectSpread(_objectSpread({}, defaultContext), actionSchema.context),
+      "data-teamix-spm": dataTeamixSpm ? "".concat(dataTeamixSpm, "-columnAction") : undefined
+    }));
+  }
+  // dataSource可传函数
+  if (typeof item.dataSource === 'function') {
+    var _item$dataSource;
+    newDataSource = (_item$dataSource = item.dataSource) === null || _item$dataSource === void 0 ? void 0 : _item$dataSource.call(item, value, index, record);
+  } else {
+    var _item$dataSource2;
+    newDataSource = ((_item$dataSource2 = item.dataSource) !== null && _item$dataSource2 !== void 0 ? _item$dataSource2 : []).map(function (item) {
+      return Object.fromEntries(Object.entries(item).map(function (_ref) {
+        var _ref2 = _slicedToArray(_ref, 2),
+          k = _ref2[0],
+          v = _ref2[1];
+        return [k, (0, _utils.getTargetValue)(v, _objectSpread(_objectSpread({}, record), {}, {
+          record: record,
+          value: value,
+          index: index
+        }))];
+      }));
+    });
+  }
+  // 渲染 ProField
+  return /*#__PURE__*/_react.default.createElement(_field.default, _objectSpread({
+    type: valueType || 'text',
+    value: value,
+    render: newRender,
+    dataSource: newDataSource,
+    format: format,
+    // 预留 context 位置
+    context: context
+  }, itemProps));
+};
+/**
+ * 处理 render 配置项是函数的情况
+ * @param render ProFieldRender
+ * @param value table cell value
+ * @param index table cell index
+ * @param record table cell record
+ * @returns
+ */
+var processRenderFunction = function processRenderFunction() {
+  var render = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  var value = arguments.length > 1 ? arguments[1] : undefined;
+  var index = arguments.length > 2 ? arguments[2] : undefined;
+  var record = arguments.length > 3 ? arguments[3] : undefined;
+  // 当 ProField render 类型为 function 时。需要表格预先处理以塞入 record
+  var external = ['linkOnClick', 'link', 'value', 'renderEdit', 'descriptionRenderEdit', 'editPopConfirmProps', 'descriptionEditPopConfirmProps', 'editOnClick', 'descriptionEditOnClick', 'extra', 'prefixExtra'];
+  return Object.fromEntries(Object.entries(render).map(function (_ref3) {
+    var _ref4 = _slicedToArray(_ref3, 2),
+      k = _ref4[0],
+      v = _ref4[1];
+    if (typeof v === 'function') {
+      var _v;
+      if (external.includes(k)) {
+        return [k, function () {
+          for (var _len = arguments.length, others = new Array(_len), _key = 0; _key < _len; _key++) {
+            others[_key] = arguments[_key];
+          }
+          return v === null || v === void 0 ? void 0 : v.apply(void 0, [value, index, record].concat(others));
+        }];
+      }
+      return [k, (_v = v === null || v === void 0 ? void 0 : v(value, index, record)) !== null && _v !== void 0 ? _v : ''];
+    }
+    return [k, v];
+  }));
+};
+/**
+ * 处理 render 数据，取出 {{xxx}} 匹配值
+ * @param render ProFieldRender
+ * @param record table cell record
+ * @returns
+ */
+var processBuriedPoint = function processBuriedPoint() {
+  var render = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  var record = arguments.length > 1 ? arguments[1] : undefined;
+  var value = arguments.length > 2 ? arguments[2] : undefined;
+  var index = arguments.length > 3 ? arguments[3] : undefined;
+  var context = arguments.length > 4 ? arguments[4] : undefined;
+  return Object.fromEntries([
+  // 默认 ellipsis、descriptionEllipsis 为 true
+  // emptyText 默认为 '-'
+  ['ellipsis', true], ['descriptionEllipsis', true], ['emptyText', '-']].concat(_toConsumableArray(Object.entries(render).map(function (_ref5) {
+    var _ref6 = _slicedToArray(_ref5, 2),
+      k = _ref6[0],
+      v = _ref6[1];
+    return [k, (0, _utils.getTargetValue)(v, _objectSpread(_objectSpread({}, record), {}, {
+      record: record,
+      value: value,
+      index: index
+    }, context))];
+  }))));
+};
+var equalColumns = function equalColumns(prevProps, nextProps) {
+  var preValue = prevProps.value;
+  var nextValue = nextProps.value;
+  // columns 强制更新参数
+  if (nextProps === null || nextProps === void 0 ? void 0 : nextProps.forcedUpdate) {
+    return false;
+  }
+  // 操作列的时候强制刷新
+  if (preValue === false && nextValue === false) {
+    return false;
+  }
+  if (preValue === nextValue) {
+    return true;
+  }
+  // 针对 value 是数组类型的判断 value 是否和原来相等，相等则不渲染
+  if (Array.isArray(nextValue) && Array.isArray(preValue)) {
+    var nextValueStr = nextValue.map(function (item) {
+      return item.TagValue;
+    });
+    var preValueStr = preValue.map(function (item) {
+      return item.TagValue;
+    });
+    if (nextValueStr.toString() === preValueStr.toString()) {
+      return true;
+    }
+  }
+  return false;
+};
+var _default = /*#__PURE__*/_react.default.memo(Cell, equalColumns);
+exports.default = _default;

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

@@ -84,7 +84,6 @@ var Filter = function Filter(props) {
         });
       });
     }
-    // console.log(filters);
     return filters;
   }, [column]);
   // 点击确定回调

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

@@ -75,7 +75,7 @@ var Layout = function Layout(props) {
     }, otherProps)));
   };
   // 渲染新版 QueryFilter
-  var renderQueryFilter = function renderQueryFilter() {
+  var renderQueryFilter = (0, _react.useMemo)(function () {
     var _dataFilter$schema;
     if (dataFilter === null || dataFilter === void 0 ? void 0 : (_dataFilter$schema = dataFilter.schema) === null || _dataFilter$schema === void 0 ? void 0 : _dataFilter$schema.length) {
       var _dataFilter$schema2;
@@ -137,7 +137,9 @@ var Layout = function Layout(props) {
         }, afterDataFilter) : null
       }));
     }
-  };
+  }, [
+  //todo: 重复render 问题都在这里
+  dataFilter, mainAction, dataFilterFormRef, afterDataFilter]);
   // 区域组合渲染
   var renderLayout = function renderLayout() {
     if (header && mainAction) {
@@ -151,7 +153,7 @@ var Layout = function Layout(props) {
         actionRef: actionRef,
         quickAction: extra,
         rowSelection: rowSelection
-      }))), renderQueryFilter());
+      }))), renderQueryFilter);
     } else if (header && !mainAction) {
       var _dataFilter$schema3, _dataFilter$schema4;
       return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
@@ -164,14 +166,14 @@ var Layout = function Layout(props) {
         actionRef: actionRef,
         quickAction: extra,
         rowSelection: rowSelection
-      }), !(dataFilter === null || dataFilter === void 0 ? void 0 : (_dataFilter$schema3 = dataFilter.schema) === null || _dataFilter$schema3 === void 0 ? void 0 : _dataFilter$schema3.length) && renderQueryFilter())), (dataFilter === null || dataFilter === void 0 ? void 0 : (_dataFilter$schema4 = dataFilter.schema) === null || _dataFilter$schema4 === void 0 ? void 0 : _dataFilter$schema4.length) && renderQueryFilter());
+      }), !(dataFilter === null || dataFilter === void 0 ? void 0 : (_dataFilter$schema3 = dataFilter.schema) === null || _dataFilter$schema3 === void 0 ? void 0 : _dataFilter$schema3.length) && renderQueryFilter)), (dataFilter === null || dataFilter === void 0 ? void 0 : (_dataFilter$schema4 = dataFilter.schema) === null || _dataFilter$schema4 === void 0 ? void 0 : _dataFilter$schema4.length) && renderQueryFilter);
     } else if (!header && mainAction) {
-      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, renderQueryFilter());
+      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, renderQueryFilter);
     } else if (!header && !mainAction) {
       if (!dataFilterFormRef && !extra) {
         return null;
       }
-      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, renderQueryFilter());
+      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, renderQueryFilter);
     }
   };
   if ((dataFilter === null || dataFilter === void 0 ? void 0 : dataFilter.schema) || mainAction || header || extra || toolBar !== false) {

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

@@ -1,8 +1,9 @@
+import React from 'react';
 import { PaginationProps } from '@alicloudfe/components/types/pagination';
 import { responsivePaginationType } from '../../typing';
 import './index.scss';
-declare const _default: (props: PaginationProps & {
-    responsivePaginationType?: responsivePaginationType;
-    useMaxData?: boolean;
-}) => JSX.Element;
+declare const _default: React.MemoExoticComponent<(props: PaginationProps & {
+    responsivePaginationType?: responsivePaginationType | undefined;
+    useMaxData?: boolean | undefined;
+}) => JSX.Element>;
 export default _default;

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

@@ -24,13 +24,14 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 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 _default = function _default(props) {
+var ProPagination = function ProPagination(props) {
   var className = props.className,
     propsOnChange = props.onChange,
     total = props.total,
     pageSize = props.pageSize,
     current = props.current,
-    pageSizeList = props.pageSizeList,
+    _props$pageSizeList = props.pageSizeList,
+    pageSizeList = _props$pageSizeList === void 0 ? [5, 10, 20, 50, 100] : _props$pageSizeList,
     pageSizeSelector = props.pageSizeSelector,
     onPageSizeChange = props.onPageSizeChange,
     responsivePaginationType = props.responsivePaginationType,
@@ -250,4 +251,5 @@ var _default = function _default(props) {
     }, renderPagination())
   );
 };
+var _default = /*#__PURE__*/_react.default.memo(ProPagination);
 exports.default = _default;

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

@@ -0,0 +1,7 @@
+import { EmptyContentProps } from '@teamix/pro-field';
+import { TableProps } from '@alicloudfe/components/types/table';
+export interface ITableContentProps extends TableProps {
+    emptyProps?: EmptyContentProps;
+}
+declare const TableContent: (props: ITableContentProps) => JSX.Element;
+export default TableContent;

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

@@ -0,0 +1,34 @@
+"use strict";
+
+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); }
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _react = _interopRequireWildcard(require("react"));
+var _components = require("@alicloudfe/components");
+var _proField = require("@teamix/pro-field");
+var _getTableSortIcons = _interopRequireDefault(require("../../utils/getTableSortIcons"));
+var _excluded = ["emptyProps"];
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+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; }
+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 TableContent = function TableContent(props) {
+  var emptyProps = props.emptyProps,
+    rest = _objectWithoutProperties(props, _excluded);
+  var memorizedEmptyContent = (0, _react.useMemo)(function () {
+    return /*#__PURE__*/_react.default.createElement(_proField.EmptyContent, _objectSpread({}, emptyProps));
+  }, [emptyProps]);
+  var memorizedGetTableSortIcons = (0, _react.useMemo)(_getTableSortIcons.default, []);
+  return /*#__PURE__*/_react.default.createElement(_components.Table.StickyLock, _objectSpread({
+    sortIcons: memorizedGetTableSortIcons,
+    emptyContent: memorizedEmptyContent
+  }, rest));
+};
+var _default = TableContent;
+exports.default = _default;

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

@@ -34,7 +34,11 @@ var Row = _components.Grid.Row,
 var cls = (0, _utils.usePrefixCls)('teamix-pro-table-toolbar-filter-column');
 var processColumns = function processColumns(columns) {
   var _getGlobalConfig;
+  var filterColumns = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
   var globalFilterColumns = (_getGlobalConfig = (0, _utils.getGlobalConfig)('ProTable')) === null || _getGlobalConfig === void 0 ? void 0 : _getGlobalConfig.filterColumns;
+  var filterColumnsKey = filterColumns.map(function (item) {
+    return item === null || item === void 0 ? void 0 : item.dataIndex;
+  });
   // hidden 为 true 时不展示
   columns = columns.filter(function (item) {
     return (item === null || item === void 0 ? void 0 : item.hidden) !== true && (!globalFilterColumns || globalFilterColumns(item));
@@ -44,11 +48,14 @@ var processColumns = function processColumns(columns) {
       return item;
     }
     return _objectSpread(_objectSpread({}, item), {}, {
-      columnFilters: true
+      columnFilters: filterColumnsKey.findIndex(function (key) {
+        return item.dataIndex === key;
+      }) >= 0 ? true : false
     });
   });
 };
 var FilterColumnIcon = function FilterColumnIcon(props) {
+  var _actionRef$current, _actionRef$current3;
   var _props$columns = props.columns,
     columns = _props$columns === void 0 ? [] : _props$columns,
     actionRef = props.actionRef,
@@ -61,7 +68,7 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     indeterminate = _useState4[0],
     setIndeterminate = _useState4[1];
-  var _useState5 = (0, _react.useState)(processColumns(columns)),
+  var _useState5 = (0, _react.useState)(processColumns(columns, (_actionRef$current = actionRef.current) === null || _actionRef$current === void 0 ? void 0 : _actionRef$current.filterColumns)),
     _useState6 = _slicedToArray(_useState5, 2),
     newColumns = _useState6[0],
     setNewColumns = _useState6[1];
@@ -107,8 +114,9 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
     };
   });
   (0, _react.useEffect)(function () {
-    setNewColumns(processColumns(columns));
-  }, [columns]);
+    var _actionRef$current2;
+    setNewColumns(processColumns(columns, (_actionRef$current2 = actionRef.current) === null || _actionRef$current2 === void 0 ? void 0 : _actionRef$current2.filterColumns));
+  }, [columns, (_actionRef$current3 = actionRef.current) === null || _actionRef$current3 === void 0 ? void 0 : _actionRef$current3.filterColumns]);
   // 全选
   var onChangeAllColumns = function onChangeAllColumns(check) {
     setAllVisible(check);
@@ -200,10 +208,10 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
   };
   // 通知表格渲染
   var notifyTableRender = function notifyTableRender(columns) {
-    var _actionRef$current, _actionRef$current$se;
+    var _actionRef$current4, _actionRef$current4$s;
     calculateSelectAllState(columns);
     setNewColumns(columns);
-    (_actionRef$current = actionRef.current) === null || _actionRef$current === void 0 ? void 0 : (_actionRef$current$se = _actionRef$current.setColumn) === null || _actionRef$current$se === void 0 ? void 0 : _actionRef$current$se.call(_actionRef$current, columns, false);
+    (_actionRef$current4 = actionRef.current) === null || _actionRef$current4 === void 0 ? void 0 : (_actionRef$current4$s = _actionRef$current4.setColumn) === null || _actionRef$current4$s === void 0 ? void 0 : _actionRef$current4$s.call(_actionRef$current4, columns, false);
   };
   // 计算全选状态
   var calculateSelectAllState = function calculateSelectAllState(columns) {