@teamix/pro 1.3.6 → 1.3.9

package/lib/form/ProForm/index.scss

@@ -197,14 +197,15 @@
     margin-right: 4px;
   }
 }
-// 数组类ArrayItem Icon 居中（移除，通过align:center配置）
-// .#{$form-array}-items-item-inner {
-//   .#{$css-prefix}space-item {
-//     > .#{$css-prefix}formily-icon {
-//       margin-top: 9px;
-//     }
-//   }
-// }
+// 数组类ArrayItem Icon text 居中
+.#{$form-array}-items-item-inner {
+  .#{$css-prefix}space-item {
+    > .#{$css-prefix}formily-icon.#{$css-prefix}btn-text {
+      line-height: inherit !important;
+      margin-right: 0;
+    }
+  }
+}
 
 // Editable预览态行高
 .#{$css-prefix}formily-editable-content {
@@ -212,6 +213,13 @@
 }
 
 // 折叠面板
+.#{$css-prefix}formily-collapse {
+  .#{$css-prefix}collapse-panel-title {
+    .#{$css-prefix}badge-count {
+      transform: translateX(4px);
+    }
+  }
+}
 .#{$css-prefix}formily-collapse,
 .#{$form-array}-collapse-item {
   .#{$css-prefix}collapse-panel-hidden {

package/lib/form/SchemaForm/index.js

@@ -65,8 +65,6 @@ var _fieldTypeMap = _interopRequireDefault(require("../fieldTypeMap"));
 
 var _utils = require("../utils");
 
-var _utils2 = require("@teamix/utils");
-
 var _warning = _interopRequireDefault(require("../warning"));
 
 var _excluded = ["component", "type", "name", "decorator", "decoratorProps", "dataSource", "reactions", "rules", "children", "items", "tooltip", "request", "data"];
@@ -111,16 +109,11 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
   var schema = _ref.schema,
       scope = _ref.scope,
       components = _ref.components;
-
-  // 获取全局配置
-  var _ref2 = (0, _utils2.getGlobalConfig)('ProForm') || {},
-      globalComponents = _ref2.components,
-      globalScope = _ref2.scope; // 创建 SchemaField
-
+  var schemaScopeRef = (0, _react.useRef)({}); // 创建 SchemaField，添加内置组件
 
   var SchemaField = (0, _react.useMemo)(function () {
     return (0, _react2.createSchemaField)({
-      components: _objectSpread(_objectSpread(_objectSpread({}, globalComponents), _ProField.default), {}, {
+      components: _objectSpread(_objectSpread({}, _ProField.default), {}, {
         FormLayout: _formily.FormLayout,
         FormItem: _formily.FormItem,
         ArrayCollapse: _formily.ArrayCollapse,
@@ -149,16 +142,7 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
         Text: _index.default
       })
     });
-  }, []); // 合并 schema 中 request 的 scope
-
-  var mergedScope = (0, _react.useMemo)(function () {
-    return _objectSpread(_objectSpread(_objectSpread({}, globalScope), scope), {}, {
-      $request: _reactions.$request,
-      $common: _reactions.$common,
-      $dataSource: _reactions.$dataSource,
-      $validator: _reactions.$validator
-    });
-  }, [scope]); // 格式化 schema
+  }, []); // 格式化 schema
 
   var formatSchema = (0, _react.useCallback)(function (schema) {
     var parentSuffix = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
@@ -277,12 +261,12 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
 
       var defaultReactions = (0, _initializeReactions.default)(reactions, [].concat(_toConsumableArray(requestReactions), _toConsumableArray(dataSourceReactions))); // 合并scope
 
-      Object.entries(_objectSpread(_objectSpread(_objectSpread({}, requestScope), dataSourceScope), rulesScope)).map(function (_ref3) {
-        var _ref4 = _slicedToArray(_ref3, 2),
-            k = _ref4[0],
-            v = _ref4[1];
+      Object.entries(_objectSpread(_objectSpread(_objectSpread({}, requestScope), dataSourceScope), rulesScope)).map(function (_ref2) {
+        var _ref3 = _slicedToArray(_ref2, 2),
+            k = _ref3[0],
+            v = _ref3[1];
 
-        mergedScope[k] = v;
+        schemaScopeRef.current[k] = v;
       });
       var formatParam = (0, _utils.mapSchemaName)(_objectSpread(_objectSpread({}, otherProps), {}, {
         type: defaultType,
@@ -307,13 +291,20 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
       schemaProperties[name] = _objectSpread(_objectSpread(_objectSpread({}, formatParam), recursiveProperties), recursiveItems);
     });
     return schemaProperties;
-  }, [mergedScope]);
+  }, []);
   var formilySchema = (0, _react.useMemo)(function () {
     return {
       type: 'object',
       properties: formatSchema(schema)
     };
-  }, [schema]); // console.log(formilySchema);
+  }, [schema]);
+
+  var mergedScope = _objectSpread(_objectSpread({}, scope), {}, {
+    $request: _reactions.$request,
+    $common: _reactions.$common,
+    $dataSource: _reactions.$dataSource,
+    $validator: _reactions.$validator
+  }, schemaScopeRef.current);
 
   return /*#__PURE__*/_react.default.createElement(SchemaField, {
     schema: formilySchema,

package/lib/form/SchemaForm/reactions.js

@@ -37,7 +37,7 @@ var $request = function $request(field, _ref, context, type) {
   // 触发所有配置的请求
 
   var refresh = (_field$data = field.data) === null || _field$data === void 0 ? void 0 : _field$data.refresh;
-  var refreshResult = (0, _utils.isPureObj)(refresh) ? refresh : {};
+  var refreshResult = (0, _utils.isPlainObj)(refresh) ? refresh : {};
   return (0, _utils.doCommonRequest)(_objectSpread(_objectSpread({}, requestConfig), {}, {
     params: _objectSpread(_objectSpread(_objectSpread({}, params), beforeRequestResult), refreshResult),
     beforeRequest: function beforeRequest() {

package/lib/form/typing.d.ts

@@ -66,6 +66,7 @@ export interface ProFormProps extends IFormLayoutProps {
     initialValues?: AnyObject;
     initialRequest?: ProFormRequestConfig;
     previewTextPlaceholder?: ReactNode;
+    validateFirst?: boolean;
     onChange?: (values: any, fieldValue?: any, fieldName?: any) => any;
     onSubmit?: ((values: any) => any) | CommonRequestConfig;
     onSubmitFailed?: (feedbacks: IFormFeedback[]) => void;

package/lib/index.d.ts

@@ -26,5 +26,5 @@ export * from './table';
 export * from './sidebar';
 export * from './utils';
 export * from './timeline';
-declare const version = "1.3.6";
+declare const version = "1.3.9";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, hooks, nocode, templates, utils, };

package/lib/index.js

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

package/lib/info/components/ProInfoItem/index.js

@@ -28,17 +28,13 @@ var ProInfoItem = function ProInfoItem(prop) {
       headerInfoLayout = prop.headerInfoLayout,
       loading = prop.loading,
       tooltip = prop.tooltip,
-      tooltipIcon = prop.tooltipIcon,
-      _isLastRow = prop._isLastRow;
+      tooltipIcon = prop.tooltipIcon;
 
   if (baseInfoLayout) {
     var labelCol = baseInfoLayout.labelCol,
         wrapperCol = baseInfoLayout.wrapperCol;
     return /*#__PURE__*/_react.default.createElement("div", {
-      className: cls({
-        '': true,
-        isLastRow: _isLastRow
-      })
+      className: cls('')
     }, /*#__PURE__*/_react.default.createElement(Row, {
       gutter: 10,
       className: cls('base-row')

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

@@ -17,10 +17,6 @@ $item-padding-bottom: 8px;
 .teamix-pro-field-info-form-item {
   width: 100%;
   padding-bottom: $item-padding-bottom;
-  &-isLastRow{
-    padding-bottom: unset;
-  }
-
   &-header-row {
     display: flex;
     align-items: center;

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

@@ -45,23 +45,33 @@ var ProBaseInfo = function ProBaseInfo(props) {
     var formItemLayout = JSON.parse(JSON.stringify(defaultLayout.formItemLayout)); // 自定义布局
 
     if (layout) {
-      var _layout$labelCol, _layout$wrapperCol;
+      var _layout$labelCol, _layout$wrapperCol, _layout$span;
 
       var labelCol = (_layout$labelCol = layout === null || layout === void 0 ? void 0 : layout.labelCol) !== null && _layout$labelCol !== void 0 ? _layout$labelCol : defaultLayout.formItemLayout.labelCol;
       var wrapperCol = (_layout$wrapperCol = layout === null || layout === void 0 ? void 0 : layout.wrapperCol) !== null && _layout$wrapperCol !== void 0 ? _layout$wrapperCol : defaultLayout.formItemLayout.wrapperCol;
+      var span = (_layout$span = layout === null || layout === void 0 ? void 0 : layout.span) !== null && _layout$span !== void 0 ? _layout$span : defaultLayout.span;
+
+      if ((layout === null || layout === void 0 ? void 0 : layout.colNum) && layout.colNum > 0 && layout.colNum <= 4) {
+        span = 24 / layout.colNum;
+      }
+
+      formItemLayout.span = span;
       formItemLayout.labelCol = labelCol;
       formItemLayout.wrapperCol = wrapperCol;
     }
 
+    var newSpan = formItemLayout.span;
     var newLabelSpan = formItemLayout.labelCol.span;
     var newWrapperSpan = formItemLayout.wrapperCol.span; // 计算合并列情况。label与wrapper需要重新计算
 
     if (colspan) {
+      newSpan = newSpan * (colspan !== null && colspan !== void 0 ? colspan : 1);
       newLabelSpan = newLabelSpan / colspan;
       newWrapperSpan = newWrapperSpan + (formItemLayout.labelCol.span - newLabelSpan);
     }
 
     var newFormItemLayout = {
+      span: newSpan,
       labelCol: {
         span: newLabelSpan
       },
@@ -74,17 +84,14 @@ var ProBaseInfo = function ProBaseInfo(props) {
 
   var renderContent = function renderContent() {
     return columns.map(function (item, index) {
-      var _layout$span, _layout$span2, _item$title, _item$valueType, _ref, _item$colSpan;
+      var _getFormItemLayout, _item$colSpan, _item$title, _item$valueType, _ref, _item$colSpan2;
 
-      var span = item.colSpan ? defaultLayout.span * item.colSpan : defaultLayout.span;
-      var layoutSpan = item.colSpan ? ((_layout$span = layout === null || layout === void 0 ? void 0 : layout.span) !== null && _layout$span !== void 0 ? _layout$span : span) * item.colSpan : (_layout$span2 = layout === null || layout === void 0 ? void 0 : layout.span) !== null && _layout$span2 !== void 0 ? _layout$span2 : span;
       return /*#__PURE__*/_react.default.createElement(Col, {
-        span: layoutSpan,
+        span: (_getFormItemLayout = getFormItemLayout((_item$colSpan = item === null || item === void 0 ? void 0 : item.colSpan) !== null && _item$colSpan !== void 0 ? _item$colSpan : 0)) === null || _getFormItemLayout === void 0 ? void 0 : _getFormItemLayout.span,
         key: index
       }, /*#__PURE__*/_react.default.createElement(_ProInfoItem.default, {
         label: (_item$title = item === null || item === void 0 ? void 0 : item.title) !== null && _item$title !== void 0 ? _item$title : '',
         loading: loading,
-        _isLastRow: !!(0, _utils2.isLastRow)(columns.length, layoutSpan, index),
         value: /*#__PURE__*/_react.default.createElement(_InfoValueItem.default, {
           type: (_item$valueType = item === null || item === void 0 ? void 0 : item.valueType) !== null && _item$valueType !== void 0 ? _item$valueType : 'text',
           value: (0, _utils2.getDataIndexValue)(item.dataIndex, (_ref = dataSource !== null && dataSource !== void 0 ? dataSource : result) !== null && _ref !== void 0 ? _ref : {}),
@@ -96,7 +103,7 @@ var ProBaseInfo = function ProBaseInfo(props) {
           context: context,
           props: item.props
         }),
-        baseInfoLayout: getFormItemLayout((_item$colSpan = item === null || item === void 0 ? void 0 : item.colSpan) !== null && _item$colSpan !== void 0 ? _item$colSpan : 0),
+        baseInfoLayout: getFormItemLayout((_item$colSpan2 = item === null || item === void 0 ? void 0 : item.colSpan) !== null && _item$colSpan2 !== void 0 ? _item$colSpan2 : 0),
         tooltip: item.tooltip,
         tooltipIcon: item.tooltipIcon
       }));

package/lib/info/typing.d.ts

@@ -113,8 +113,6 @@ export declare type IProProInfoItem = {
     headerInfoLayout?: ProHeaderInfoLayoutProps;
     /** loading 状态 */
     loading?: boolean;
-    /** isLastRow 是否是最后一行的元素 */
-    _isLastRow?: boolean;
 } & Pick<ProInfoColumnsProps, 'tooltip' | 'tooltipIcon'>;
 /** header info 定义 */
 export declare type IProHeaderInfo = {
@@ -137,6 +135,7 @@ export declare type ProInfoProps = {
 export declare type IProHeaderInfoItem = {};
 export declare type BaseInfoLayoutProps = ProBaseInfoLayoutProps;
 export declare type ProBaseInfoLayoutProps = {
+    colNum?: number;
     span?: number;
     labelCol?: {
         span: number;

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

@@ -10,11 +10,3 @@ export declare const ProInfoGroupContext: React.Context<ProInfoGroupContextProps
  * @returns
  */
 export declare function getDataIndexValue(dataIndex: ProInfoColumnsProps['dataIndex'], dataSource: object): any;
-/**
- * 是否是最后一样的元素
- * @param columnsLength
- * @param layoutSpan
- * @params itemIndex
- * @returns
- */
-export declare const isLastRow: (columnsLength: number, layoutSpan: number, itemIndex: number) => boolean | undefined;

package/lib/info/utils/index.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.ProInfoGroupContext = void 0;
 exports.getDataIndexValue = getDataIndexValue;
-exports.isLastRow = void 0;
 exports.useActionType = useActionType;
 
 var _utils = require("@teamix/utils");
@@ -48,34 +47,4 @@ function getDataIndexValue(dataIndex, dataSource) {
   }
 
   return (0, _utils.getDeepValue)(dataIndex !== null && dataIndex !== void 0 ? dataIndex : '', dataSource);
-}
-/**
- * 是否是最后一样的元素
- * @param columnsLength
- * @param layoutSpan
- * @params itemIndex
- * @returns
- */
-
-
-var isLastRow = function isLastRow(columnsLength, layoutSpan, itemIndex) {
-  if (!columnsLength || !layoutSpan) return;
-  var lastRowColumnsIndexList = [];
-  var rowCount = 24 / layoutSpan;
-
-  if (columnsLength % rowCount === 0) {
-    while (rowCount--) {
-      lastRowColumnsIndexList.push(columnsLength--);
-    }
-  } else {
-    var lastRowCount = columnsLength % rowCount;
-
-    while (lastRowCount--) {
-      lastRowColumnsIndexList.push(columnsLength--);
-    }
-  }
-
-  return lastRowColumnsIndexList.includes(itemIndex + 1);
-};
-
-exports.isLastRow = isLastRow;
+}

package/lib/sidebar/components/tree/index.js

@@ -13,8 +13,6 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _treeNode = require("../tree-node");
 
-var _lodash = require("lodash");
-
 require("./index.scss");
 
 require("../tree-node/index.scss");
@@ -25,7 +23,7 @@ var _hooks = require("@teamix/hooks");
 
 var _actionRef = require("../../utils/action-ref");
 
-var _lodash2 = _interopRequireDefault(require("lodash.clonedeep"));
+var _lodash = _interopRequireDefault(require("lodash.clonedeep"));
 
 var _excluded = ["dataSource", "selectedKeys", "checkedKeys", "defaultExpandedKeys", "defaultExpandAll", "expandedKeys", "onSelect", "onCheck", "isNodeBlock", "searchKey", "actionRef", "onBeforeRenderNodeEvent", "beforeRenderNode", "className", "expandAll", "onDataSourceChange", "expandLevel"];
 
@@ -95,7 +93,7 @@ var ProSidebarTree = function ProSidebarTree(props) {
 
 
   var processDataSource = function processDataSource(dataSource) {
-    var newDataSource = (0, _lodash2.default)(dataSource);
+    var newDataSource = (0, _lodash.default)(dataSource);
 
     if (beforeRenderNode) {
       (0, _utils2.loop)(newDataSource, function (item, level) {
@@ -145,7 +143,11 @@ var ProSidebarTree = function ProSidebarTree(props) {
 
   (0, _react.useEffect)(function () {
     setDefaultExpandedKeys();
-  }, []); // 更新外部传入的 dataSource
+  }, []); // 监听 selectedKeys，用于受控
+
+  (0, _react.useEffect)(function () {
+    setSelectedKeys(selectedKeysProp);
+  }, [selectedKeysProp]); // 更新外部传入的 dataSource
 
   (0, _hooks.useUpdateEffect)(function () {
     setDataSource(processDataSource(dataSourceProp !== null && dataSourceProp !== void 0 ? dataSourceProp : []));
@@ -170,7 +172,7 @@ var ProSidebarTree = function ProSidebarTree(props) {
 
   (0, _actionRef.useActionType)(actionRef, {
     setTreeNode: function setTreeNode(treeNode) {
-      var newDataSource = (0, _lodash2.default)(dataSource); // TODO 此处可做性能优化
+      var newDataSource = (0, _lodash.default)(dataSource); // TODO 此处可做性能优化
 
       (0, _utils2.loop)(newDataSource, function (item) {
         if (item.value === treeNode.value) {
@@ -235,7 +237,7 @@ var ProSidebarTree = function ProSidebarTree(props) {
   }; // 过滤
 
 
-  var filterDataSource = (0, _lodash.debounce)(function (value) {
+  var filterDataSource = function filterDataSource(value) {
     var searchDataSource = processDataSource(dataSourceProp !== null && dataSourceProp !== void 0 ? dataSourceProp : []);
     var expandedKeys = [];
 
@@ -247,21 +249,22 @@ var ProSidebarTree = function ProSidebarTree(props) {
       return;
     }
 
-    (0, _utils2.loop)(searchDataSource, function (item) {
+    var _filterTreeData = (0, _utils2.filterTreeData)(searchDataSource, function (node) {
+      var _node$label;
+
+      return ((_node$label = node === null || node === void 0 ? void 0 : node.label) !== null && _node$label !== void 0 ? _node$label : '').includes(value);
+    }),
+        filterTreeValue = _filterTreeData.filterTreeValue;
+
+    (0, _utils2.loop)(filterTreeValue, function (item) {
       hasSearchValue(value, item) && expandedKeys.push(String(item['value']));
     }, {
       children: 'children'
     });
-    setExpandedKeys([].concat(expandedKeys));
     setMatchedKeys(matchedKeys);
     handleExpand(expandedKeys);
-    var filterDataSource = (0, _utils2.findNodeWithPath)(searchDataSource, function (node) {
-      var _node$label;
-
-      return ((_node$label = node === null || node === void 0 ? void 0 : node.label) !== null && _node$label !== void 0 ? _node$label : '').includes(value);
-    });
-    setDataSource(filterDataSource);
-  }, 100);
+    setDataSource(filterTreeValue);
+  };
 
   var filterTreeNode = function filterTreeNode(node) {
     return matchedKeys && matchedKeys.indexOf(node.props.eventKey) > -1;

package/lib/sidebar/components/tree-node/components/IconSwitch/index.js

@@ -53,7 +53,7 @@ var ProIconSwitch = function ProIconSwitch(props) {
       setVisible = _useState2[1];
 
   (0, _react.useEffect)(function () {
-    setVisible(visibleProp !== null && visibleProp !== void 0 ? visibleProp : false);
+    setVisible(visibleProp !== null && visibleProp !== void 0 ? visibleProp : true);
   }, [visibleProp]); // 点击操作
 
   var clickHandle = function clickHandle(e, state) {

package/lib/sidebar/index.js

@@ -22,6 +22,8 @@ var _ = require("..");
 
 var _actionRef = require("./utils/action-ref");
 
+var _lodash = _interopRequireDefault(require("lodash.debounce"));
+
 var _typing = require("./typing");
 
 Object.keys(_typing).forEach(function (key) {
@@ -88,7 +90,7 @@ var ProSidebar = function ProSidebar(props) {
       _props$className = props.className,
       className = _props$className === void 0 ? '' : _props$className,
       style = props.style,
-      _searchOnChange = props.searchOnChange,
+      searchOnChange = props.searchOnChange,
       _props$showSearch = props.showSearch,
       showSearch = _props$showSearch === void 0 ? true : _props$showSearch,
       onSelect = props.onSelect,
@@ -222,12 +224,12 @@ var ProSidebar = function ProSidebar(props) {
     }), " ").concat(className),
     style: style
   }, /*#__PURE__*/_react.default.createElement(_sidebarContainer.default, _objectSpread(_objectSpread({
-    searchOnChange: function searchOnChange(value) {
+    searchOnChange: (0, _lodash.default)(function (value) {
       if (showSearch) {
-        _searchOnChange === null || _searchOnChange === void 0 ? void 0 : _searchOnChange(value);
+        searchOnChange === null || searchOnChange === void 0 ? void 0 : searchOnChange(value);
         setSearchKey(value);
       }
-    },
+    }, 300),
     onExpandAllChange: onExpandAllChange,
     onExpandLevelChange: onExpandLevelChange,
     showSearch: showSearch,

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

@@ -69,3 +69,15 @@ export declare function getTreeLevelKey(data: any[], level: number, aliasMap?: {
     key: string;
     children: string;
 }): any[];
+/**
+ * 深度遍历并查找节点（展开查找到的字节点路径）
+ * @param nodes 数据
+ * @param predicate 条件
+ * @param aliasMap 标识
+ * @returns
+ */
+export declare function filterTreeData<T>(nodes: any[], predicate: (node: T) => boolean, aliasMap?: {
+    children: string;
+}): {
+    filterTreeValue: T[];
+};

package/lib/sidebar/utils/index.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.filterTreeData = filterTreeData;
 exports.findNodeWithPath = findNodeWithPath;
 exports.findNodeWithoutPath = findNodeWithoutPath;
 exports.getAllNodeKey = getAllNodeKey;
@@ -11,6 +12,8 @@ exports.getTreeLevelKey = getTreeLevelKey;
 exports.getTreeNodeLevel = getTreeNodeLevel;
 exports.loop = loop;
 
+function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+
 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; }
@@ -244,4 +247,61 @@ function getTreeLevelKey(data, level, aliasMap) {
     children: children
   });
   return result;
+}
+/**
+ * 深度遍历并查找节点（展开查找到的字节点路径）
+ * @param nodes 数据
+ * @param predicate 条件
+ * @param aliasMap 标识
+ * @returns
+ */
+
+
+function filterTreeData(nodes, predicate, aliasMap) {
+  if (!(nodes && nodes.length)) {
+    return {
+      filterTreeValue: []
+    };
+  }
+
+  var _ref8 = aliasMap !== null && aliasMap !== void 0 ? aliasMap : {},
+      _ref8$children = _ref8.children,
+      children = _ref8$children === void 0 ? 'children' : _ref8$children;
+
+  var filterTreeValue = [];
+
+  var _iterator2 = _createForOfIteratorHelper(nodes),
+      _step2;
+
+  try {
+    for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+      var node = _step2.value;
+
+      var others = _extends({}, node);
+
+      if (predicate(node)) {
+        var _node$children3;
+
+        filterTreeValue.push(_objectSpread(_objectSpread({}, others), {}, {
+          children: filterTreeData((_node$children3 = node[children]) !== null && _node$children3 !== void 0 ? _node$children3 : [], predicate, aliasMap).filterTreeValue
+        }));
+      } else {
+        var subs = filterTreeData(node[children], predicate, aliasMap);
+
+        if (subs && subs.filterTreeValue.length) {
+          filterTreeValue.push(_objectSpread(_objectSpread({}, others), {}, {
+            children: subs.filterTreeValue
+          }));
+        }
+      }
+    }
+  } catch (err) {
+    _iterator2.e(err);
+  } finally {
+    _iterator2.f();
+  }
+
+  return {
+    filterTreeValue: filterTreeValue
+  };
 }

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

@@ -178,7 +178,7 @@ var _default = function _default(props) {
     return /*#__PURE__*/_react.default.createElement("div", {
       className: cls('custom-jumper')
     }, /*#__PURE__*/_react.default.createElement(_components.Button, {
-      className: "next-prev next-pagination-item",
+      className: "".concat((0, _utils.usePrefixCls)(), "prev ").concat((0, _utils.usePrefixCls)(), "pagination-item"),
       onClick: handlePrevClick,
       disabled: Number(currentPage) <= 1
     }, /*#__PURE__*/_react.default.createElement(_components.Icon, {
@@ -200,7 +200,7 @@ var _default = function _default(props) {
         marginRight: 4
       }
     }, "/"), getTotalPage(total, pageSize)), /*#__PURE__*/_react.default.createElement(_components.Button, {
-      className: "next-next next-pagination-item",
+      className: "".concat((0, _utils.usePrefixCls)(), "next ").concat((0, _utils.usePrefixCls)(), "pagination-item"),
       onClick: handleNextClick,
       //@ts-ignore
       disabled: total && Number(currentPage) >= getTotalPage(total, pageSize)
@@ -218,7 +218,7 @@ var _default = function _default(props) {
         }, otherProps));
       } else {
         return /*#__PURE__*/_react.default.createElement("div", {
-          className: "".concat(cls('custom-mini-pagination'), "  next-pagination")
+          className: "".concat(cls('custom-mini-pagination'), "  ").concat((0, _utils.usePrefixCls)(), "pagination")
         }, customTotalRender(total), customJumpRender());
       }
     }

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

@@ -64,8 +64,12 @@ var processColumns = function processColumns(columns) {
     columns = columns.filter(function (item) {
       return item.valueType !== 'selectGroup';
     });
-  }
+  } // hidden 为 true 时不展示
+
 
+  columns = columns.filter(function (item) {
+    return (item === null || item === void 0 ? void 0 : item.hidden) !== true;
+  });
   return columns.map(function (item) {
     if (item.columnFilters === false) {
       return item;

package/lib/table/index.js

@@ -109,7 +109,7 @@ var processColumns = function processColumns(columns, initialColumns) {
   var _filterColumns;
 
   var filterColumns = columns.filter(function (item) {
-    return item.columnFilters !== false;
+    return item.columnFilters !== false && (item === null || item === void 0 ? void 0 : item.hidden) !== true;
   });
 
   if (isRoot) {
@@ -313,7 +313,7 @@ var ProTable = function ProTable(props) {
 
     var tableDom = tableRef.current;
     var headerDom = tableDom === null || tableDom === void 0 ? void 0 : (_tableDom$getElements = tableDom.getElementsByClassName('teamix-pro-table-layout')) === null || _tableDom$getElements === void 0 ? void 0 : _tableDom$getElements[0];
-    var tableHeaderDom = tableDom === null || tableDom === void 0 ? void 0 : (_tableDom$getElements2 = tableDom.getElementsByClassName('next-table-header-inner')) === null || _tableDom$getElements2 === void 0 ? void 0 : _tableDom$getElements2[0];
+    var tableHeaderDom = tableDom === null || tableDom === void 0 ? void 0 : (_tableDom$getElements2 = tableDom.getElementsByClassName("".concat((0, _utils.usePrefixCls)(), "table-header-inner"))) === null || _tableDom$getElements2 === void 0 ? void 0 : _tableDom$getElements2[0];
     return new Promise(function (resolve) {
       setTimeout(function () {
         var _headerDom$offsetHeig, _tableHeaderDom$offse;
@@ -736,6 +736,11 @@ var ProTable = function ProTable(props) {
             setTotal(total || (data === null || data === void 0 ? void 0 : data.length));
             setShowSkeleton(false);
             setCustomTableLoading(false);
+          } // 重新计算是否需要吸底
+
+
+          if (footerSuction) {
+            getFooterSuctionState();
           }
         });
       } else {
@@ -794,7 +799,7 @@ var ProTable = function ProTable(props) {
     onInit: function onInit(values) {
       // 表单初始化请求处理
       (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onInit) && (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onInit(values));
-      !fullscreenState && _request({}, false, values);
+      !fullscreenState && requestWhenMount && _request({}, false, values);
       return true;
     },
     onFilter: function onFilter(values) {

package/lib/table/typing.d.ts

@@ -33,7 +33,9 @@ export declare type ProTableColumnProps = {
     tooltipIcon?: React.ReactNode;
     /** 对应 ProField 里面的 type */
     valueType?: ProFieldType;
-    /** 【列配置】是否默认隐藏列 */
+    /** 是否隐藏表格列，列配置也不显示 */
+    hidden?: boolean;
+    /** 【列配置】是否默认隐藏表格列，但列配置显示 */
     columnFilters?: boolean;
     /** 【列配置】是否禁用隐藏列 */
     columnFiltersDisabled?: boolean;