@teamix/pro 1.4.24 → 1.4.27

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

@@ -131,21 +131,39 @@ var ProSidebarTree = function ProSidebarTree(props) {
   }, [dataSourceProp]); // 监听展开全部事件
 
   useUpdateEffect(function () {
+    onChangeExpandAll();
+  }, [expandAll]); // 监听展开层级事件
+
+  useUpdateEffect(function () {
+    onChangeExpandLevel();
+  }, [expandLevel]); // 监听 DataSource 变化事件
+
+  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(getAllNodeKey(dataSource));
     } else {
       setExpandedKeys([]);
     }
-  }, [expandAll]); // 监听展开层级事件
+  }; // 展开层级事件
 
-  useUpdateEffect(function () {
+
+  var onChangeExpandLevel = function onChangeExpandLevel() {
     var keys = getTreeLevelKey(dataSource, expandLevel - 1);
     setExpandedKeys(keys);
-  }, [expandLevel]); // 监听 DataSource 变化事件
+  }; // 绑定actionRef
 
-  useEffect(function () {
-    onDataSourceChange === null || onDataSourceChange === void 0 ? void 0 : onDataSourceChange(dataSource);
-  }, [dataSource]); // 绑定actionRef
 
   useActionType(actionRef, {
     setTreeNode: function setTreeNode(treeNode) {

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

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

package/es/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/es/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/es/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/es/table/components/Pagination/index.js

@@ -1,4 +1,4 @@
-var _excluded = ["className", "onChange", "total", "totalRender", "pageSize", "current", "pageSizeList", "pageSizeSelector", "onPageSizeChange", "responsivePaginationType"];
+var _excluded = ["className", "onChange", "total", "pageSize", "current", "pageSizeList", "pageSizeSelector", "onPageSizeChange", "responsivePaginationType"];
 
 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; }
 
@@ -32,7 +32,6 @@ export default (function (props) {
   var className = props.className,
       propsOnChange = props.onChange,
       total = props.total,
-      totalRender = props.totalRender,
       pageSize = props.pageSize,
       current = props.current,
       pageSizeList = props.pageSizeList,

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

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

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

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

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

@@ -1,35 +1,16 @@
-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
  */
 import { Button } from '@alicloudfe/components';
 import TeamixIcon from '@teamix/icon';
 import { usePrefixCls } from '@teamix/utils';
-import React, { useEffect, useState } from 'react';
+import React from 'react';
 import './index.scss';
 var cls = usePrefixCls('teamix-pro-table-toolbar-icon');
 
 var FullScreenIcon = function FullScreenIcon(props) {
-  var _actionRef$current3, _actionRef$current3$o;
-
-  var actionRef = props.actionRef;
-
-  var _useState = 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 () {
@@ -37,48 +18,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);
-  }; // 销毁监听函数
-
-
-  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.createElement(Button, {
     iconSize: "small",
     className: cls(),
     onClick: allScreenHandle
   }, /*#__PURE__*/React.createElement(TeamixIcon, {
     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'
+  }));
 };
 
 export default FullScreenIcon;

package/es/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/es/table/components/ToolBar/index.js

@@ -4,12 +4,28 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 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; }
+
 import { usePrefixCls } from '@teamix/utils';
-import React from 'react';
+import React, { useEffect, useRef } from 'react';
+import { Button, Balloon } from '@alicloudfe/components';
+import TeamixIcon from '@teamix/icon';
 import FullScreenIcon from './FullScreenIcon';
 import FilterColumnIcon from './FilterColumnIcon';
 import DensityIcon from './DensityIcon';
 import RefreshIcon from './RefreshIcon';
+import { useSize, useSafeState } from '@teamix/hooks';
+import debounce from 'lodash.debounce';
 import './index.scss';
 var cls = usePrefixCls('teamix-pro-table-toolbar');
 var presetToolBarMap = {
@@ -38,7 +54,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 = useRef(null); // const toolBarSize = useSize(toolBarRef);
+  // 用于获取内容宽度
+
+  var toolBarContentRef = 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 = 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 = useSafeState(),
+      _useSafeState2 = _slicedToArray(_useSafeState, 2),
+      flat = _useSafeState2[0],
+      setFlat = _useSafeState2[1]; // 监听高度，> 32px则切换形态
+
+
+  useEffect(debounce(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)) {
@@ -59,21 +114,49 @@ var ToolBar = function ToolBar(props) {
     });
   }
 
+  var renderFlatShape = function renderFlatShape() {
+    return /*#__PURE__*/React.createElement("div", {
+      className: cls('content')
+    }, toolBarList.map(function (_ref) {
+      var type = _ref.type,
+          name = _ref.name,
+          Component = _ref.component;
+      return /*#__PURE__*/React.createElement("span", {
+        className: cls('item', _defineProperty({}, name, true)),
+        key: name
+      }, type === 'preset' && /*#__PURE__*/React.createElement(Component, _objectSpread({}, props)), type === 'custom' && /*#__PURE__*/React.createElement("div", {
+        className: cls({
+          custom: true
+        })
+      }, Component));
+    }));
+  };
+
+  var renderUnFlatShape = function renderUnFlatShape() {
+    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Balloon.Tooltip, {
+      triggerType: ['click'],
+      popupProps: {
+        cache: true
+      },
+      style: {
+        padding: 8
+      },
+      trigger: /*#__PURE__*/React.createElement(Button, null, /*#__PURE__*/React.createElement(TeamixIcon, {
+        type: "more-line"
+      })),
+      align: "tr"
+    }, renderFlatShape()));
+  };
+
   return /*#__PURE__*/React.createElement("div", {
-    className: cls()
-  }, toolBarList.map(function (_ref) {
-    var type = _ref.type,
-        name = _ref.name,
-        Component = _ref.component;
-    return /*#__PURE__*/React.createElement("span", {
-      className: cls(_defineProperty({}, name, true)),
-      key: name
-    }, type === 'preset' && /*#__PURE__*/React.createElement(Component, _objectSpread({}, props)), type === 'custom' && /*#__PURE__*/React.createElement("div", {
-      className: cls({
-        custom: true
-      })
-    }, Component));
-  }));
+    className: cls('', {
+      flat: flat
+    }),
+    ref: toolBarRef
+  }, !flat && !fullScreenState ? renderUnFlatShape() : renderFlatShape(), /*#__PURE__*/React.createElement("div", {
+    className: cls('shadow'),
+    ref: toolBarContentRef
+  }, renderFlatShape()));
 };
 
 export default ToolBar;

package/es/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/es/table/index.js

@@ -1,4 +1,4 @@
-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 _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); }
 
@@ -142,6 +142,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,
@@ -682,7 +683,8 @@ var ProTable = function ProTable(props) {
   }, {
     // 使用 request 方法代替 fetch
     requestMethod: function requestMethod(params) {
-      return utilResquest(params);
+      // 支持使用 requestConfig 自定义请求配置
+      return utilResquest(_objectSpread(_objectSpread({}, params), requestConfig));
     },
     manual: true,
     onSuccess: function onSuccess(result) {
@@ -862,6 +864,7 @@ var ProTable = function ProTable(props) {
 
       (_actionRef$current6 = actionRef.current) === null || _actionRef$current6 === void 0 ? void 0 : (_actionRef$current6$c = _actionRef$current6.clearRowSelection) === null || _actionRef$current6$c === void 0 ? void 0 : _actionRef$current6$c.call(_actionRef$current6);
       setCurrentPage(1);
+      console.log('currentPageSize1', pageSize);
 
       _request(_defineProperty({}, targetPageKey, 1), false, values);
     },
@@ -871,6 +874,7 @@ var ProTable = function ProTable(props) {
       (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onReset) && (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onReset());
       (_dataFilterFormRef$cu3 = dataFilterFormRef.current) === null || _dataFilterFormRef$cu3 === void 0 ? void 0 : _dataFilterFormRef$cu3.reset();
       setCurrentPage(1);
+      console.log('currentPageSize2', pageSize);
 
       _request(_defineProperty({}, targetPageKey, 1), false, values);
     }
@@ -902,7 +906,8 @@ var ProTable = function ProTable(props) {
         afterDataFilter: afterDataFilter,
         dataFilterFormRef: isFullScreen ? fullscreenDataFilterFormRef : normalDataFilterFormRef,
         rowSelection: rowSelection,
-        filterColumnType: filterColumnType
+        filterColumnType: filterColumnType,
+        fullScreenState: isFullScreen
       }), /*#__PURE__*/React.createElement(Table.StickyLock, _objectSpread({
         hasBorder: false,
         dataSource: showSkeleton ? skeletonDataSource : data || props.dataSource,
@@ -1008,13 +1013,24 @@ var ProTable = function ProTable(props) {
             count: selectedCount
           })));
         }
+      } else if (footerAction) {
+        if (showSkeleton) {
+          return /*#__PURE__*/React.createElement("div", {
+            className: cls('footer-left-wrapper')
+          }, /*#__PURE__*/React.createElement(Skeleton.Footer.Operation, null));
+        } else {
+          return /*#__PURE__*/React.createElement("div", {
+            className: cls('footer-left-wrapper')
+          }, footerAction && renderFooterAction());
+        }
       }
     }
 
     if (showPagination) {
       return /*#__PURE__*/React.createElement("div", {
         className: cls('footer', {
-          'footer-has-rowSelection': rowSelection
+          'footer-has-rowSelection': rowSelection,
+          'footer-has-action': footerAction
         })
       }, renderRowSelection(), /*#__PURE__*/React.createElement("div", {
         className: cls('footer-right-wrapper')

package/es/table/index.scss

@@ -16,7 +16,7 @@ $fullscreenPadding: 24px;
     box-shadow: var(--shadow-1-up);
     background: var(--color-fill1-1);
   }
-  &-footer-has-rowSelection {
+  &-footer-has-rowSelection, &-footer-has-action {
     display: flex;
     align-items: center;
     padding: 8px 0;

package/es/table/typing.d.ts

@@ -7,7 +7,7 @@ import { QueryFilterProps, ProFormType } from '../form';
 import { ProActionGroupProps, ProActionButtonProps } from '../actions';
 import { PaginationProps } from '@alicloudfe/components/types/pagination';
 import { HeaderProps as ProTableHeaderProps } from '../field';
-import { Method } from 'axios';
+import { Method, AxiosRequestConfig } from 'axios';
 import React from 'react';
 declare type IFieldRenderProps = keyof ProFieldRenderProps;
 /** 列record函数 */
@@ -86,6 +86,8 @@ export declare type ProTableProps = {
     onSuccess?: (res: any) => void;
     /** 内部请求失败时的回调 */
     onError?: (error: Error) => void;
+    /** 自定义的请求配置 */
+    requestConfig?: AxiosRequestConfig;
     /** 翻页页数的请求参数名  */
     pageKey?: string;
     /** 翻页器页数对应字段 */
@@ -274,6 +276,7 @@ export declare type ProTableLayoutProps = {
     actionRef: React.MutableRefObject<ProTableActionType | undefined>;
     columns?: ProTableColumnProps[];
     rowSelection?: innerRowSelectionType | rowSelectionType;
+    fullScreenState?: boolean;
 } & ProTableTopAreaProps;
 /** columns 列过滤 */
 export declare type ProTableColumnsFilterItemProps = {

package/lib/actions/dialog.d.ts

@@ -31,6 +31,8 @@ export interface DialogAction extends Omit<RequestAction, 'url'>, Omit<QuickShow
     onCancel?: any;
     /** 隐藏footer区域  */
     hideFooter?: boolean;
+    /** 支持通过传函数自定义底部按钮 */
+    footer?: any;
 }
 export declare function useDialogAction(action: DialogAction, actionContext?: any, hasForm?: boolean): {
     [x: string]: (e: React.MouseEvent<HTMLElement, MouseEvent>) => Promise<void>;

package/lib/actions/dialog.js

@@ -31,7 +31,7 @@ var _request = require("./request");
 var _utils2 = require("./utils");
 
 var _excluded = ["trigger", "url", "customRequest", "method", "params", "data", "extendParams", "successMsg", "errorMsg", "formatParams", "formatResult", "onSuccess", "onError", "onOk", "onCancel", "hideFooter"],
-    _excluded2 = ["title", "content", "component", "schema", "onFinish", "dialogType", "dialogQuickShowType", "messageType", "popType", "beforeRequest", "onTrigger", "link", "beforeContent", "afterContent", "message", "footerDescription", "footerAlign", "className"];
+    _excluded2 = ["title", "content", "component", "schema", "onFinish", "dialogType", "dialogQuickShowType", "messageType", "popType", "beforeRequest", "onTrigger", "link", "beforeContent", "afterContent", "message", "footerDescription", "footerAlign", "footer", "className"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -147,6 +147,7 @@ function useDialogAction(action, actionContext, hasForm) {
         message = _getTargetValue.message,
         footerDescription = _getTargetValue.footerDescription,
         footerAlign = _getTargetValue.footerAlign,
+        footer = _getTargetValue.footer,
         className = _getTargetValue.className,
         containerOtherProps = _objectWithoutProperties(_getTargetValue, _excluded2);
 
@@ -270,7 +271,7 @@ function useDialogAction(action, actionContext, hasForm) {
       className: (0, _classnames.default)('teamix-pro-dialog-footer-description', getFooterAlignClass(isDrawer, footerAlign))
     }, renderDialogFooterDescription(footerDescription)))), _defineProperty(_objectSpread2, "footerAlign", footerAlign), _defineProperty(_objectSpread2, "className", (0, _classnames.default)('teamix-pro-action-dialog', {
       'has-footer-description': !!footerDescription
-    })), _objectSpread2), containerProps), containerOtherProps); // TODO Drawer 基础组件未支持此配置，日后支持，并修改onOk、onCancel写法
+    })), _defineProperty(_objectSpread2, "footer", addContextForReactNode(footer, dialogContext)), _objectSpread2), containerProps), containerOtherProps); // TODO Drawer 基础组件未支持此配置，日后支持，并修改onOk、onCancel写法
 
 
     if ((!dialogType || dialogType === 'dialog') && hideFooter) {

package/lib/card/index.js

@@ -271,9 +271,9 @@ var ProCard = function ProCard(props) {
       });
       var width = widthList.reduce(function (acc, cur) {
         return acc + cur;
-      }, 0) + widthList.length * 8; // 无法取出精准宽度，减去1作为阈值
+      }, 0) + widthList.length * 8; // 无法取出精准宽度，减去1作为阈值 10为右padding
 
-      setHeaderWithoutTitleWidth(width - 1);
+      setHeaderWithoutTitleWidth(width - 1 + 10);
     }
   };
 

package/lib/form/Filter/AdvancedFilter.js

@@ -65,7 +65,7 @@ var AdvancedFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
   var prefixCls = (0, _utils.usePrefixCls)('teamix-pro-form-query-filter-advanced');
   var gridSchema = (0, _react.useMemo)(function () {
     return [{
-      name: 'FormGrid',
+      name: 'AdvancedFilterFormGrid',
       component: 'FormGrid',
       props: _objectSpread({
         breakpoints: [480, 720, 990, 1200, Infinity],
@@ -85,6 +85,7 @@ var AdvancedFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
             align: 'right'
           },
           children: [{
+            name: 'AdvancedFilterReset',
             component: 'Reset',
             props: {
               onResetValidateSuccess: onReset,
@@ -104,6 +105,11 @@ var AdvancedFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
       }])
     }];
   }, [schema, onReset]);
+  (0, _react.useEffect)(function () {
+    var _otherProps$form;
+
+    otherProps === null || otherProps === void 0 ? void 0 : (_otherProps$form = otherProps.form) === null || _otherProps$form === void 0 ? void 0 : _otherProps$form.clearFormGraph('AdvancedFilterReset');
+  }, [onReset]);
   var getTeamixLayout = (0, _react.useMemo)(function () {
     return breakpoints === true ? {
       breakpoints: [990],

package/lib/form/Filter/layout.scss

@@ -26,7 +26,7 @@ $query-filter-layout: #{$teamix-pro-form}-query-filter-layout;
     margin-bottom: 8px;
   }
   .#{$query-filter-layout}-addonAfter {
-    flex: 0 1 auto;
+    flex: 0 0 auto;
     margin-left: 8px;
   }
   .#{$query-filter-layout}-panel {

package/lib/form/ProForm/addCascadeEffect.d.ts

@@ -0,0 +1,2 @@
+declare const _default: (form: any, schema: any, scope: any) => void;
+export default _default;