@teamix/pro 1.4.25 → 1.4.27

package/lib/form/typing.d.ts

@@ -34,6 +34,24 @@ export interface ProFormRequestConfig extends Omit<ProFormCommonRequestConfig, '
     extraConfig?: AnyObject;
     onComplete?: (res?: any, field?: any, context?: any) => any;
 }
+export interface CascadeWhen {
+    left: string;
+    op: string;
+    right: any;
+}
+export interface Cascade {
+    when: CascadeWhen[];
+    logic?: '||' | '&&';
+    props?: any;
+    state?: any;
+    dataSourceFilter?: any[];
+    dataSourceHide?: any[];
+}
+export interface OnChange {
+    when: CascadeWhen[];
+    logic?: '||' | '&&';
+    values: any;
+}
 export interface ProFormSchemaItem {
     type?: string;
     name?: string;
@@ -61,6 +79,8 @@ export interface ProFormSchemaItem {
     default?: any;
     request?: ProFormRequestConfig | ProFormRequestConfig[];
     data?: AnyObject;
+    cascade?: Cascade[];
+    onChange?: OnChange[];
 }
 export declare type ProFormSchema = ProFormSchemaItem[];
 interface AutoLayout {

package/lib/index.d.ts

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

package/lib/index.js

@@ -313,9 +313,10 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 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; }
 
 // 设置图标源
+// @ts-ignore
 if (!((_window = window) === null || _window === void 0 ? void 0 : _window.TEAMIXPRO_WITHOUT_ICON)) {
   _icon.default.setConfig(_utils.default.getTeamixIconConfig());
 }
 
-var version = '1.4.25';
+var version = '1.4.27';
 exports.version = version;

package/lib/sidebar/components/sidebar-container/index.js

@@ -21,7 +21,7 @@ require("./index.scss");
 
 var _icon = _interopRequireDefault(require("@teamix/icon"));
 
-var _excluded = ["children", "searchPlaceholder", "showSearch", "searchProps", "customSearch", "searchOnChange", "message", "messageProps", "customMessage", "scrollArea", "showExpandAll", "showExpandLevel", "onExpandAllChange", "onExpandLevelChange", "expandLevel", "isTree"];
+var _excluded = ["children", "searchPlaceholder", "showSearch", "searchProps", "customSearch", "searchOnChange", "message", "messageProps", "customMessage", "scrollArea", "showExpandAll", "showExpandLevel", "onExpandAllChange", "onExpandLevelChange", "expandLevel", "expandLevelState", "expandAllState", "isTree"];
 
 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); }
 
@@ -81,6 +81,10 @@ var ProSidebarContainer = function ProSidebarContainer(props) {
       onExpandLevelChange = props.onExpandLevelChange,
       _props$expandLevel = props.expandLevel,
       expandLevel = _props$expandLevel === void 0 ? 1 : _props$expandLevel,
+      _props$expandLevelSta = props.expandLevelState,
+      expandLevelStateProp = _props$expandLevelSta === void 0 ? 1 : _props$expandLevelSta,
+      _props$expandAllState = props.expandAllState,
+      expandAllStateProp = _props$expandAllState === void 0 ? false : _props$expandAllState,
       isTree = props.isTree,
       others = _objectWithoutProperties(props, _excluded);
 
@@ -114,7 +118,19 @@ var ProSidebarContainer = function ProSidebarContainer(props) {
         setTreeHeight("calc(100% - ".concat(remainHeight, "px + 16px)"));
       }
     }
-  }, []); // 渲染搜索区域
+  }, []);
+  (0, _react.useEffect)(function () {
+    setExpandLevelState(expandLevelStateProp);
+    setTimeout(function () {
+      onExpandLevelChange === null || onExpandLevelChange === void 0 ? void 0 : onExpandLevelChange(expandLevelStateProp);
+    });
+  }, [expandLevelStateProp]);
+  (0, _react.useEffect)(function () {
+    setExpandAllState(expandAllStateProp);
+    setTimeout(function () {
+      onExpandAllChange === null || onExpandAllChange === void 0 ? void 0 : onExpandAllChange(expandAllStateProp);
+    });
+  }, [expandAllStateProp]); // 渲染搜索区域
 
   var renderSearch = function renderSearch() {
     if (customSearch || showSearch) {

package/lib/sidebar/components/sidebar-container/index.scss

@@ -1,12 +1,13 @@
 .teamix-pro-sidebar-container {
   min-width: 180px;
-  .teamix-pro-card.compacted >.next-card-header{
+
+  .teamix-pro-card.compacted > .next-card-header {
     padding: 16px 0px;
     margin: 0;
-    
+
   }
 
-  .next-card .next-card-header-extra{
+  .next-card .next-card-header-extra {
     margin-top: 2px;
   }
 
@@ -27,38 +28,44 @@
   }
 
 
-  &.teamix-pro-sidebar-container &-context{
-    overflow-y: hidden;
-    
-    &:hover{
+  &.teamix-pro-sidebar-container &-context {
+    //overflow-y: hidden;
+
+    &:hover {
       overflow-y: auto;
     }
+
+    .next-tree-switcher.next-noop-line.next-noop-line-noroot {
+      flex-shrink: 0;
+    }
+
   }
 
 
-  &-not-is-tree{
+  &-not-is-tree {
 
-    .teamix-pro-card.compacted >.next-card-header{
+    .teamix-pro-card.compacted > .next-card-header {
       padding: 16px 8px;
       margin: 0;
     }
-    .teamix-pro-sidebar-container-context{
+
+    .teamix-pro-sidebar-container-context {
       padding: 0;
     }
 
-    .teamix-pro-sidebar-container-search{
+    .teamix-pro-sidebar-container-search {
       padding: 0 8px;
     }
 
-    .teamix-pro-sidebar-container-search-has-message{
+    .teamix-pro-sidebar-container-search-has-message {
       padding: 0 8px;
     }
 
-    .teamix-pro-sidebar-container-notice{
+    .teamix-pro-sidebar-container-notice {
       padding: 0 8px;
     }
 
-    .teamix-pro-sidebar-container-fold{
+    .teamix-pro-sidebar-container-fold {
       padding: 0 8px;
     }
 

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

@@ -154,21 +154,39 @@ var ProSidebarTree = function ProSidebarTree(props) {
   }, [dataSourceProp]); // 监听展开全部事件
 
   (0, _hooks.useUpdateEffect)(function () {
+    onChangeExpandAll();
+  }, [expandAll]); // 监听展开层级事件
+
+  (0, _hooks.useUpdateEffect)(function () {
+    onChangeExpandLevel();
+  }, [expandLevel]); // 监听 DataSource 变化事件
+
+  (0, _react.useEffect)(function () {
+    onDataSourceChange === null || onDataSourceChange === void 0 ? void 0 : onDataSourceChange(dataSource); // 更新层级状态
+
+    if (expandAll) {
+      onChangeExpandAll();
+    }
+
+    if (expandLevel > 1) {
+      onChangeExpandLevel();
+    }
+  }, [dataSource]); // 展开全部事件
+
+  var onChangeExpandAll = function onChangeExpandAll() {
     if (expandAll) {
       setExpandedKeys((0, _utils2.getAllNodeKey)(dataSource));
     } else {
       setExpandedKeys([]);
     }
-  }, [expandAll]); // 监听展开层级事件
+  }; // 展开层级事件
 
-  (0, _hooks.useUpdateEffect)(function () {
+
+  var onChangeExpandLevel = function onChangeExpandLevel() {
     var keys = (0, _utils2.getTreeLevelKey)(dataSource, expandLevel - 1);
     setExpandedKeys(keys);
-  }, [expandLevel]); // 监听 DataSource 变化事件
+  }; // 绑定actionRef
 
-  (0, _react.useEffect)(function () {
-    onDataSourceChange === null || onDataSourceChange === void 0 ? void 0 : onDataSourceChange(dataSource);
-  }, [dataSource]); // 绑定actionRef
 
   (0, _actionRef.useActionType)(actionRef, {
     setTreeNode: function setTreeNode(treeNode) {

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

@@ -247,7 +247,7 @@ function renderTreeNodeDependenceValue(data, onBeforeRenderNodeEvent, checkedKey
       newProps = onBeforeRenderNodeEvent(item, checkedKeys, selectedKeys, allData !== null && allData !== void 0 ? allData : data);
     }
 
-    var _getTreeNodeProps2 = (0, _.getTreeNodeProps)(item),
+    var _getTreeNodeProps2 = (0, _.getTreeNodeProps)(newProps),
         nodeProps = _getTreeNodeProps2.nodeProps,
         labelProps = _getTreeNodeProps2.labelProps;
 

package/lib/sidebar/components/tree-node/index.scss

@@ -50,6 +50,12 @@
       font-weight: unset;
     }
   }
+  // 选中图标变色
+  .next-tree-node-inner.next-selected {
+    .teamix-icon.teamix-pro-filed-output-prefix-icon {
+      color: var(--color-brand1-6) !important;
+    }
+  }
 }
 .teamix-pro-sidebar-deep-1 {
   .teamix-pro-sidebar-tree {

package/lib/sidebar/typing.d.ts

@@ -88,6 +88,8 @@ export declare type ProSidebarContainerProps = {
     scrollArea?: 'all' | 'tree';
     /** 是否显示展开全部 */
     showExpandAll?: boolean;
+    /** 展开全部 状态 */
+    expandAllState?: boolean;
     /** 是否显示展开层级 */
     showExpandLevel?: boolean;
     /** 展开全部变化回调 */
@@ -96,6 +98,8 @@ export declare type ProSidebarContainerProps = {
     onExpandLevelChange?: (state: number) => void;
     /** 展开层级 层级 */
     expandLevel?: number;
+    /** 展开层级 当前所展示层级 */
+    expandLevelState?: number;
     /** 列表 or tree */
     isTree?: boolean;
 } & ProCardProps;

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

@@ -1,7 +1,7 @@
 $prefix: 'teamix-pro-table-layout';
 
 .theme-hybridcloud-dark {
-  --panel-filter-bg: #1f1f1f;
+  --panel-filter-bg: #141414;
 }
 
 .#{$prefix} {

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

@@ -94,6 +94,7 @@ var DensityIcon = function DensityIcon(props) {
         size: "small",
         type: "space-line"
       })),
+      followTrigger: true,
       visible: dropdownVisible,
       onVisibleChange: function onVisibleChange(state) {
         setTooltipVisible(false);

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

@@ -284,6 +284,8 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
         setTooltipVisible(false);
         setDropdownVisible(state);
       },
+      followTrigger: true,
+      cache: true,
       triggerType: ['click'],
       align: "tr br"
     }, /*#__PURE__*/_react.default.createElement("div", {

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

@@ -1,7 +1,5 @@
 "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
 });
@@ -13,40 +11,20 @@ var _icon = _interopRequireDefault(require("@teamix/icon"));
 
 var _utils = require("@teamix/utils");
 
-var _react = _interopRequireWildcard(require("react"));
+var _react = _interopRequireDefault(require("react"));
 
 require("./index.scss");
 
-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 _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-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; }
-
+/**
+ * 全屏展示 Icon
+ */
 var cls = (0, _utils.usePrefixCls)('teamix-pro-table-toolbar-icon');
 
 var FullScreenIcon = function FullScreenIcon(props) {
-  var _actionRef$current3, _actionRef$current3$o;
-
-  var actionRef = props.actionRef;
-
-  var _useState = (0, _react.useState)(false),
-      _useState2 = _slicedToArray(_useState, 2),
-      fullscreen = _useState2[0],
-      setFullscreen = _useState2[1]; // 点击全屏
-
+  var actionRef = props.actionRef,
+      fullScreenState = props.fullScreenState; // 点击全屏
 
   var allScreenHandle = function allScreenHandle() {
     setTimeout(function () {
@@ -54,48 +32,16 @@ var FullScreenIcon = function FullScreenIcon(props) {
 
       (_actionRef$current = actionRef.current) === null || _actionRef$current === void 0 ? void 0 : (_actionRef$current$fu = _actionRef$current.fullScreen) === null || _actionRef$current$fu === void 0 ? void 0 : _actionRef$current$fu.call(_actionRef$current);
     }, 0);
-  }; // 销毁监听函数
-
-
-  (0, _react.useEffect)(function () {
-    return function () {
-      var _actionRef$current2, _actionRef$current2$o;
-
-      (_actionRef$current2 = actionRef.current) === null || _actionRef$current2 === void 0 ? void 0 : (_actionRef$current2$o = _actionRef$current2.off) === null || _actionRef$current2$o === void 0 ? void 0 : _actionRef$current2$o.call(_actionRef$current2, 'fullscreenIcon');
-    };
-  }, []); // 监听全屏变化
+  };
 
-  (_actionRef$current3 = actionRef.current) === null || _actionRef$current3 === void 0 ? void 0 : (_actionRef$current3$o = _actionRef$current3.on) === null || _actionRef$current3$o === void 0 ? void 0 : _actionRef$current3$o.call(_actionRef$current3, function (state) {
-    // console.log('dataFilterForm', actionRef.current?.dataFilterForm);
-    setFullscreen(state); // actionRef.current?.dataFilterForm?.setValues(formValues);
-  }, 'fullScreenState', 'fullscreenIcon');
   return /*#__PURE__*/_react.default.createElement(_components.Button, {
     iconSize: "small",
     className: cls(),
     onClick: allScreenHandle
   }, /*#__PURE__*/_react.default.createElement(_icon.default, {
     size: "small",
-    type: fullscreen ? 'close-line' : 'full-screen-line'
-  })) // <Balloon.Tooltip
-  //   trigger={
-  //     <Button iconSize="small" className={cls()} onClick={allScreenHandle}>
-  //       <TeamixIcon
-  //         size="small"
-  //         type={fullscreen ? 'close-line' : 'full-screen-line'}
-  //       />
-  //     </Button>
-  //   }
-  //   align={fullscreen ? 'b' : 't'}
-  //   popupProps={{
-  //     visible: visible,
-  //     onVisibleChange: (state) => {
-  //       setVisible(state);
-  //     },
-  //   }}
-  // >
-  //   {getMessage('fullScreen')}
-  // </Balloon.Tooltip>
-  ;
+    type: fullScreenState ? 'close-line' : 'full-screen-line'
+  }));
 };
 
 var _default = FullScreenIcon;

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

@@ -1,5 +1,5 @@
 import React from 'react';
-import './index.scss';
 import { ProTableLayoutProps } from '../../typing';
+import './index.scss';
 declare const ToolBar: React.FC<ProTableLayoutProps>;
 export default ToolBar;

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

@@ -1,5 +1,7 @@
 "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
 });
@@ -7,7 +9,11 @@ exports.default = void 0;
 
 var _utils = require("@teamix/utils");
 
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
+
+var _components = require("@alicloudfe/components");
+
+var _icon = _interopRequireDefault(require("@teamix/icon"));
 
 var _FullScreenIcon = _interopRequireDefault(require("./FullScreenIcon"));
 
@@ -17,16 +23,36 @@ var _DensityIcon = _interopRequireDefault(require("./DensityIcon"));
 
 var _RefreshIcon = _interopRequireDefault(require("./RefreshIcon"));
 
+var _hooks = require("@teamix/hooks");
+
+var _lodash = _interopRequireDefault(require("lodash.debounce"));
+
 require("./index.scss");
 
 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 _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; }
+
 var cls = (0, _utils.usePrefixCls)('teamix-pro-table-toolbar');
 var presetToolBarMap = {
   refresh: _RefreshIcon.default,
@@ -54,7 +80,46 @@ var presetToolBar = [{
 }];
 
 var ToolBar = function ToolBar(props) {
-  var toolBar = props.toolBar;
+  var _toolBarRef$current, _toolBarRef$current$p, _toolBarRef$current$p2;
+
+  var toolBar = props.toolBar,
+      fullScreenState = props.fullScreenState;
+  var toolBarRef = (0, _react.useRef)(null); // const toolBarSize = useSize(toolBarRef);
+  // 用于获取内容宽度
+
+  var toolBarContentRef = (0, _react.useRef)(null); // '.teamix-pro-form-query-filter-layout-inline' 元素
+
+  var layoutInlineDom = (_toolBarRef$current = toolBarRef.current) === null || _toolBarRef$current === void 0 ? void 0 : (_toolBarRef$current$p = _toolBarRef$current.parentElement) === null || _toolBarRef$current$p === void 0 ? void 0 : (_toolBarRef$current$p2 = _toolBarRef$current$p.parentElement) === null || _toolBarRef$current$p2 === void 0 ? void 0 : _toolBarRef$current$p2.parentElement; // 监听它的尺寸变化
+
+  var layoutInlineSize = (0, _hooks.useSize)(layoutInlineDom); // '.teamix-pro-form-query-filter-layout-left' 元素
+
+  var layoutLeftDom = layoutInlineDom === null || layoutInlineDom === void 0 ? void 0 : layoutInlineDom.firstElementChild;
+  var leftWidth = layoutLeftDom === null || layoutLeftDom === void 0 ? void 0 : layoutLeftDom.clientWidth; // 展示形式，是否平铺
+
+  var _useSafeState = (0, _hooks.useSafeState)(),
+      _useSafeState2 = _slicedToArray(_useSafeState, 2),
+      flat = _useSafeState2[0],
+      setFlat = _useSafeState2[1]; // 监听高度，> 32px则切换形态
+
+
+  (0, _react.useEffect)((0, _lodash.default)(function () {
+    // console.log(
+    //   layoutInlineSize?.width,
+    //   leftWidth,
+    //   toolBarContentRef.current?.clientWidth,
+    // );
+    if ((layoutInlineSize === null || layoutInlineSize === void 0 ? void 0 : layoutInlineSize.width) && leftWidth && toolBarContentRef.current) {
+      var _toolBarContentRef$cu;
+
+      var width = layoutInlineSize.width; // console.log('layoutInlineSize-width', width);
+
+      if (width - leftWidth <= ((_toolBarContentRef$cu = toolBarContentRef.current) === null || _toolBarContentRef$cu === void 0 ? void 0 : _toolBarContentRef$cu.clientWidth) + 8) {
+        setFlat(false);
+      } else {
+        setFlat(true);
+      }
+    }
+  }, 300));
   var toolBarList = toolBar !== false ? presetToolBar : [];
 
   if (Array.isArray(toolBar)) {
@@ -75,21 +140,49 @@ var ToolBar = function ToolBar(props) {
     });
   }
 
+  var renderFlatShape = function renderFlatShape() {
+    return /*#__PURE__*/_react.default.createElement("div", {
+      className: cls('content')
+    }, toolBarList.map(function (_ref) {
+      var type = _ref.type,
+          name = _ref.name,
+          Component = _ref.component;
+      return /*#__PURE__*/_react.default.createElement("span", {
+        className: cls('item', _defineProperty({}, name, true)),
+        key: name
+      }, type === 'preset' && /*#__PURE__*/_react.default.createElement(Component, _objectSpread({}, props)), type === 'custom' && /*#__PURE__*/_react.default.createElement("div", {
+        className: cls({
+          custom: true
+        })
+      }, Component));
+    }));
+  };
+
+  var renderUnFlatShape = function renderUnFlatShape() {
+    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_components.Balloon.Tooltip, {
+      triggerType: ['click'],
+      popupProps: {
+        cache: true
+      },
+      style: {
+        padding: 8
+      },
+      trigger: /*#__PURE__*/_react.default.createElement(_components.Button, null, /*#__PURE__*/_react.default.createElement(_icon.default, {
+        type: "more-line"
+      })),
+      align: "tr"
+    }, renderFlatShape()));
+  };
+
   return /*#__PURE__*/_react.default.createElement("div", {
-    className: cls()
-  }, toolBarList.map(function (_ref) {
-    var type = _ref.type,
-        name = _ref.name,
-        Component = _ref.component;
-    return /*#__PURE__*/_react.default.createElement("span", {
-      className: cls(_defineProperty({}, name, true)),
-      key: name
-    }, type === 'preset' && /*#__PURE__*/_react.default.createElement(Component, _objectSpread({}, props)), type === 'custom' && /*#__PURE__*/_react.default.createElement("div", {
-      className: cls({
-        custom: true
-      })
-    }, Component));
-  }));
+    className: cls('', {
+      flat: flat
+    }),
+    ref: toolBarRef
+  }, !flat && !fullScreenState ? renderUnFlatShape() : renderFlatShape(), /*#__PURE__*/_react.default.createElement("div", {
+    className: cls('shadow'),
+    ref: toolBarContentRef
+  }, renderFlatShape()));
 };
 
 var _default = ToolBar;

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

@@ -2,20 +2,40 @@
   width: 100%;
   text-align: right;
   margin-bottom: 8px;
+  &-flat {
+    margin-left: 8px;
+  }
+  &-item {
+    display: inline-block;
+    &:not(:first-child) {
+      margin-left: 8px;
+    }
+  }
+  &-content {
+    display: flex;
+  }
+  &-shadow {
+    visibility: hidden;
+    pointer-events: none;
+    opacity: 0;
+    height: 0px;
+    position: absolute;
+    z-index: -1;
+    overflow: hidden;
+  }
 }
 .teamix-pro-table-toolbar-custom {
   display: inline-block;
-  margin-left: 8px;
 }
 
 // FullScreen
 .teamix-pro-table-toolbar-icon {
-  margin-left: 8px;
   i {
     color: var(--color-fill1-6, #848484);
   }
 }
 
+
 // FilterColumn
 .teamix-pro-table-toolbar-filter-column {
   min-width: 180px;

package/lib/table/index.js

@@ -55,7 +55,7 @@ Object.keys(_typing).forEach(function (key) {
     }
   });
 });
-var _excluded = ["header", "className", "tableClassName", "mainAction", "extra", "dataFilter", "afterDataFilter", "toolBar", "columns", "useRowSelection", "rowSelection", "onChangeRowSelection", "getRowSelection", "primaryKey", "footerAction", "footer", "url", "pageKey", "pageSizeKey", "method", "params", "formatSort", "formatParams", "formatResult", "requestWhenMount", "showPagination", "pageSizeList", "responsivePaginationType", "showSkeleton", "skeletonSize", "actionRef", "dataSource", "filterDebounce", "footerSuction", "autoRefresh", "customRequest", "filterColumnType", "defaultFilterParams", "reserveSelectedRecords", "size", "disableSelectAll", "context", "fixedTableBody", "isTree"];
+var _excluded = ["header", "className", "tableClassName", "mainAction", "extra", "dataFilter", "afterDataFilter", "toolBar", "columns", "useRowSelection", "rowSelection", "onChangeRowSelection", "getRowSelection", "primaryKey", "footerAction", "footer", "url", "pageKey", "pageSizeKey", "method", "params", "formatSort", "formatParams", "formatResult", "requestConfig", "requestWhenMount", "showPagination", "pageSizeList", "responsivePaginationType", "showSkeleton", "skeletonSize", "actionRef", "dataSource", "filterDebounce", "footerSuction", "autoRefresh", "customRequest", "filterColumnType", "defaultFilterParams", "reserveSelectedRecords", "size", "disableSelectAll", "context", "fixedTableBody", "isTree"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -186,6 +186,7 @@ var ProTable = function ProTable(props) {
     return params;
   } : _props$formatParams,
       formatResult = props.formatResult,
+      requestConfig = props.requestConfig,
       _props$requestWhenMou = props.requestWhenMount,
       requestWhenMount = _props$requestWhenMou === void 0 ? true : _props$requestWhenMou,
       _props$showPagination = props.showPagination,
@@ -726,7 +727,8 @@ var ProTable = function ProTable(props) {
   }, {
     // 使用 request 方法代替 fetch
     requestMethod: function requestMethod(params) {
-      return (0, _utils.request)(params);
+      // 支持使用 requestConfig 自定义请求配置
+      return (0, _utils.request)(_objectSpread(_objectSpread({}, params), requestConfig));
     },
     manual: true,
     onSuccess: function onSuccess(result) {
@@ -948,7 +950,8 @@ var ProTable = function ProTable(props) {
         afterDataFilter: afterDataFilter,
         dataFilterFormRef: isFullScreen ? fullscreenDataFilterFormRef : normalDataFilterFormRef,
         rowSelection: rowSelection,
-        filterColumnType: filterColumnType
+        filterColumnType: filterColumnType,
+        fullScreenState: isFullScreen
       }), /*#__PURE__*/_react.default.createElement(_components.Table.StickyLock, _objectSpread({
         hasBorder: false,
         dataSource: showSkeleton ? skeletonDataSource : data || props.dataSource,