@teamix/pro 1.3.2 → 1.3.5

package/es/form/docs/ActionResponse.js

@@ -0,0 +1,11 @@
+import React from 'react';
+import './ActionResponse.less';
+export var ActionResponse = function ActionResponse(props) {
+  return /*#__PURE__*/React.createElement("div", {
+    className: "as-wrapper"
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "as-actions"
+  }, props.children), props.response && /*#__PURE__*/React.createElement("div", {
+    className: "as-response"
+  }, "Response\uFF1A", props.response));
+};

package/es/form/docs/ActionResponse.less

@@ -0,0 +1,25 @@
+.as-wrapper {
+  .as-actions {
+    & button {
+      margin-right: 5px;
+      background-color: #fff;
+      border: 2px solid #d4bbbb;
+      border-radius: 6px;
+      outline: none;
+      padding: 8px 20px;
+      cursor: pointer;
+      transition: all 0.15s ease-in-out;
+      &:hover {
+        border: 2px solid #9db8f3;
+      }
+    }
+  }
+
+  .as-response {
+    border: 2px dashed #f0bdbd;
+    font-size: 14px;
+    border-radius: 6px;
+    padding: 8px 20px;
+    margin-top: 10px;
+  }
+}

package/es/form/index.d.ts

@@ -31,6 +31,7 @@ declare const formilyReact: {
         displayName: string;
     };
     RecursionField: import("react").FC<originalFormilyReact.IRecursionFieldProps>;
+    ExpressionScope: import("react").FC<originalFormilyReact.IExpressionScopeProps>;
     createSchemaField<Components extends originalFormilyReact.SchemaReactComponents>(options?: originalFormilyReact.ISchemaFieldReactFactoryOptions<Components> | undefined): {
         <Decorator extends originalFormilyReact.JSXComponent, Component extends originalFormilyReact.JSXComponent>(props: originalFormilyReact.ISchemaFieldProps<Decorator, Component, import("@formily/core").ObjectField<Decorator, Component>>): JSX.Element;
         displayName: string;

package/es/form/typing.d.ts

@@ -14,14 +14,16 @@ export interface ProFormInitializeItem {
  * ProForm 实例类型
  */
 export declare type ProFormType = FormType;
-declare type IBaseComponent = 'Input' | 'Password' | 'TextArea' | 'NumberPicker' | 'Percent' | 'Money' | 'Select' | 'MultipleSelect' | 'TreeSelect' | 'Cascader' | 'MultipleCascader' | 'ArbitraryCascader' | 'Radio' | 'Checkbox' | 'Switch' | 'DatePicker' | 'TimePicker' | 'DateTimePicker' | 'WeekPicker' | 'MonthPicker' | 'YearPicker' | 'QuarterPicker' | 'DateRangePicker' | 'TimeRangePicker' | 'DateTimeRangePicker' | 'WeekRangePicker' | 'MonthRangePicker' | 'YearRangePicker' | 'QuarterRangePicker' | 'Transfer' | 'Upload' | 'ColorPicker' | 'ColorRadio' | 'IconPicker' | 'JsonInput' | 'TagPicker' | 'MultipleTagPicker' | 'Range' | 'Search' | 'SelectGroup';
+declare type IBaseComponent = 'Input' | 'Password' | 'TextArea' | 'NumberPicker' | 'Percent' | 'Money' | 'Select' | 'MultipleSelect' | 'TreeSelect' | 'Cascader' | 'MultipleCascader' | 'ArbitraryCascader' | 'Radio' | 'Checkbox' | 'Switch' | 'DatePicker' | 'TimePicker' | 'DateTimePicker' | 'WeekPicker' | 'MonthPicker' | 'YearPicker' | 'QuarterPicker' | 'DateRangePicker' | 'TimeRangePicker' | 'DateTimeRangePicker' | 'WeekRangePicker' | 'MonthRangePicker' | 'YearRangePicker' | 'QuarterRangePicker' | 'Transfer' | 'Upload' | 'ColorPicker' | 'ColorRadio' | 'IconPicker' | 'JsonInput' | 'TagPicker' | 'MultipleTagPicker' | 'Range' | 'Search' | 'SelectGroup' | 'SelectTable' | 'SelectTable.Column';
 declare type IButtonComponent = 'Submit' | 'Reset';
 declare type IComboComponent = 'ArrayCards' | 'ArrayCards.Addition' | 'ArrayCards.Remove' | 'ArrayCards.MoveUp' | 'ArrayCards.MoveDown' | 'ArrayCards.Index' | 'ArrayCollapse' | 'ArrayCollapse.CollapsePanel' | 'ArrayCollapse.Addition' | 'ArrayCollapse.Remove' | 'ArrayCollapse.MoveUp' | 'ArrayCollapse.MoveDown' | 'ArrayCollapse.Index' | 'ArrayTable' | 'ArrayTable.Column' | 'ArrayTable.SortHandle' | 'ArrayTable.Addition' | 'ArrayTable.Remove' | 'ArrayTable.MoveDown' | 'ArrayTable.MoveUp' | 'ArrayTable.Index' | 'ArrayItems' | 'ArrayItems.Item' | 'ArrayItems.SortHandle' | 'ArrayItems.Addition' | 'ArrayItems.Remove' | 'ArrayItems.MoveDown' | 'ArrayItems.MoveUp' | 'ArrayItems.Index' | 'Editable' | 'Editable.Popover' | 'Editable.Dialog' | 'Editable.Drawer';
 declare type ILayoutComponent = 'FormFlex' | 'FormGrid' | 'FormGroup' | 'FormGroup.GroupPanel' | 'Search' | 'Search.SearchPanel' | 'FormTab' | 'FormTab.TabPane' | 'FormStep' | 'FormStep.StepPane' | 'FormCollapse' | 'FormCollapse.CollapsePanel' | 'FormButtonGroup' | 'FormDialog' | 'FormDrawer' | 'FormDialog.Footer' | 'FormDrawer.Footer';
 export interface ProFormRequestConfig extends CommonRequestConfig {
     beforeRequest?: (field?: any, context?: any) => any;
+    formatResult?: (res?: any, field?: any, context?: any) => any;
     onSuccess?: (res?: any, field?: any, context?: any) => any;
     onComplete?: (res?: any, field?: any, context?: any) => any;
+    extraConfig?: AnyObject;
 }
 export interface ProFormSchemaItem {
     type?: string;
@@ -72,6 +74,7 @@ export interface ProFormProps extends IFormLayoutProps {
 export interface FilterProps extends ProFormProps {
     form: FormType;
     defaultFilterValue?: string;
+    filterValues?: string[];
     activeFilterValueRef?: React.MutableRefObject<any>;
     forceClear?: boolean;
     onReset?: (payload?: any) => void;
@@ -106,6 +109,8 @@ export interface QueryFilterProps extends ProFormProps {
     addonAfter?: ReactNode;
     /** 顶部筛选区默认筛选项 */
     defaultFilterValue?: string;
+    /** 顶部筛选区筛选项配置 */
+    filterValues?: string[];
     /** 透出内部表单实例 */
     formRef?: React.MutableRefObject<any>;
     /** onChange事件的防抖时间 */

package/es/form/utils.js

@@ -55,6 +55,8 @@ var mapSize = function mapSize(props, field) {
 
 
 var mapStatus = function mapStatus(props, field) {
+  var _field$data;
+
   var takeStatus = function takeStatus() {
     var _field$warnings, _field$decoratorProps, _field$decoratorProps2;
 
@@ -72,9 +74,16 @@ var mapStatus = function mapStatus(props, field) {
     return state;
   };
 
-  return _objectSpread(_objectSpread({}, props), {}, {
-    state: takeState(props.state) || takeStatus()
-  });
+  var state = takeState(props.state) || takeStatus();
+  var result = {
+    state: state
+  }; // 当组件处于loading状态时，仅可读不可写。
+
+  if (state === 'loading' && ((_field$data = field.data) === null || _field$data === void 0 ? void 0 : _field$data.readOnlyOnLoading)) {
+    result.readOnly = true;
+  }
+
+  return _objectSpread(_objectSpread({}, props), result);
 };
 
 var patchDataSource = function patchDataSource() {
@@ -92,7 +101,7 @@ var patchDataSource = function patchDataSource() {
     return result;
   };
 
-  return dataSource.map(removeEmptyChildren);
+  return isArr(dataSource) ? dataSource.map(removeEmptyChildren) : [];
 };
 
 var mapDataSource = function mapDataSource(props, field) {

package/es/index.d.ts

@@ -9,6 +9,7 @@ import ProPageHeader from './page-header';
 import ProTable from './table';
 import ProSkeleton from './skeleton';
 import utils from './utils';
+import ProSidebar from './sidebar';
 import { ProTimeline } from './timeline';
 import * as nocode from './nocode';
 import * as templates from './templates';
@@ -22,7 +23,8 @@ export * from './page-container';
 export * from './page-header';
 export * from './skeleton';
 export * from './table';
+export * from './sidebar';
 export * from './utils';
 export * from './timeline';
-declare const version = "1.3.2";
-export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProTimeline, hooks, nocode, templates, utils, };
+declare const version = "1.3.5";
+export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, hooks, nocode, templates, utils, };

package/es/index.js

@@ -9,8 +9,8 @@ import ProPageContainer from './page-container';
 import ProPageHeader from './page-header';
 import ProTable from './table';
 import ProSkeleton from './skeleton';
-import utils from './utils'; // import ProSidebar from './sidebar'
-
+import utils from './utils';
+import ProSidebar from './sidebar';
 import { ProTimeline } from './timeline';
 import * as nocode from './nocode';
 import * as templates from './templates';
@@ -27,10 +27,10 @@ export * from './page-container';
 export * from './page-header';
 export * from './skeleton';
 export * from './table';
+export * from './sidebar';
 export * from './utils'; // export * from './sidebar';
 
 export * from './timeline';
-var version = '1.3.2';
+var version = '1.3.5';
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, // ProLayout,
-ProPageContainer, ProPageHeader, ProSkeleton, ProTable, // ProSidebar,
-ProTimeline, hooks, nocode, templates, utils };
+ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, hooks, nocode, templates, utils };

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

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

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

@@ -17,6 +17,9 @@ $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;

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

@@ -5,7 +5,7 @@ import './index.scss';
 import { getLayout } from '../../utils/utils';
 import defaultLayoutMap from '../../utils/layout';
 import InfoValueItem from '../InfoValueItem';
-import { getDataIndexValue } from '../../utils';
+import { getDataIndexValue, isLastRow } from '../../utils';
 var Row = Grid.Row,
     Col = Grid.Col;
 
@@ -65,6 +65,7 @@ var ProBaseInfo = function ProBaseInfo(props) {
       }, /*#__PURE__*/React.createElement(ProInfoItem, {
         label: (_item$title = item === null || item === void 0 ? void 0 : item.title) !== null && _item$title !== void 0 ? _item$title : '',
         loading: loading,
+        _isLastRow: !!isLastRow(columns.length, layoutSpan, index),
         value: /*#__PURE__*/React.createElement(InfoValueItem, {
           type: (_item$valueType = item === null || item === void 0 ? void 0 : item.valueType) !== null && _item$valueType !== void 0 ? _item$valueType : 'text',
           value: getDataIndexValue(item.dataIndex, (_ref = dataSource !== null && dataSource !== void 0 ? dataSource : result) !== null && _ref !== void 0 ? _ref : {}),

package/es/info/typing.d.ts

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

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

@@ -10,3 +10,11 @@ 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/es/info/utils/index.js

@@ -30,4 +30,31 @@ export function getDataIndexValue(dataIndex, dataSource) {
   }
 
   return getDeepValue(dataIndex !== null && dataIndex !== void 0 ? dataIndex : '', dataSource);
-}
+}
+/**
+ * 是否是最后一样的元素
+ * @param columnsLength
+ * @param layoutSpan
+ * @params itemIndex
+ * @returns
+ */
+
+export 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);
+};

package/es/page-header/index.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import { ItemProps } from '@alicloudfe/components/types/breadcrumb';
-import { LinkPath, ProTagItem } from '@teamix/utils';
+import { LinkPath, ProTagItem, CapsuleTabType } from '@teamix/utils';
 import { ProActionGroupProps } from '../actions';
 import { ProInfoProps } from '../info';
 import './index.scss';
@@ -48,6 +48,8 @@ export declare type ProPageHeaderProps = {
     data?: ProPageHeaderDataItem[];
     /** 底部详情 */
     info?: ProInfoProps | React.ReactNode;
+    /** 切换 tabs */
+    tabs?: CapsuleTabType;
 } & Omit<React.HTMLAttributes<HTMLElement>, 'title'>;
 declare const ProPageHeader: React.FC<ProPageHeaderProps>;
 export default ProPageHeader;

package/es/page-header/index.js

@@ -1,6 +1,6 @@
 var _excluded = ["text", "children"],
     _excluded2 = ["color", "title", "num", "className"],
-    _excluded3 = ["title", "description", "icon", "iconColor", "iconBackgroundType", "iconBackgroundColor", "goback", "operation", "extra", "image", "loading", "breadcrumb", "tags", "data", "info", "children", "className", "style"];
+    _excluded3 = ["title", "description", "icon", "iconColor", "iconBackgroundType", "iconBackgroundColor", "goback", "operation", "extra", "image", "loading", "breadcrumb", "tags", "data", "info", "children", "className", "style", "tabs"];
 
 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; }
 
@@ -17,7 +17,7 @@ import { useHistory } from 'react-router-dom';
 import classnames from 'classnames';
 import TeamixIcon from '@teamix/icon';
 import { Breadcrumb } from '@alicloudfe/components';
-import { baseClass, goToLink, renderTags, isPresetColor, getColor, getColorClassName, getBackgroundColorClassName } from '@teamix/utils';
+import { baseClass, goToLink, renderTags, isPresetColor, getColor, getColorClassName, getBackgroundColorClassName, CapsuleTab } from '@teamix/utils';
 import { ProActionGroup } from '../actions';
 import { ProSkeletonRaw } from '../skeleton';
 import ProInfo from '../info';
@@ -123,6 +123,14 @@ var renderInfo = function renderInfo(info) {
   return info;
 };
 
+var renderTabs = function renderTabs(tabs) {
+  if (tabs) {
+    return /*#__PURE__*/React.createElement(CapsuleTab, _objectSpread({}, tabs));
+  }
+
+  return null;
+};
+
 var ProPageHeader = function ProPageHeader(props) {
   var title = props.title,
       description = props.description,
@@ -143,6 +151,7 @@ var ProPageHeader = function ProPageHeader(props) {
       children = props.children,
       className = props.className,
       style = props.style,
+      tabs = props.tabs,
       others = _objectWithoutProperties(props, _excluded3);
 
   var history = useHistory();
@@ -191,7 +200,7 @@ var ProPageHeader = function ProPageHeader(props) {
       size: "large"
     }) : /*#__PURE__*/React.createElement(React.Fragment, null, icon)), /*#__PURE__*/React.createElement("span", {
       className: cls('title-name')
-    }, title), renderTags(tags, 'large'));
+    }, title), renderTags(tags, 'large'), renderTabs(tabs !== null && tabs !== void 0 ? tabs : {}));
   };
 
   return /*#__PURE__*/React.createElement("header", _objectSpread({

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

@@ -1,4 +1,12 @@
-var _excluded = ["children", "searchPlaceholder", "showSearch", "searchProps", "customSearch", "searchOnChange", "message", "messageProps", "customMessage"];
+var _excluded = ["children", "searchPlaceholder", "showSearch", "searchProps", "customSearch", "searchOnChange", "message", "messageProps", "customMessage", "scrollArea", "showExpandAll", "showExpandLevel", "onExpandAllChange", "onExpandLevelChange", "expandLevel", "isTree"];
+
+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 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; }
 
@@ -6,16 +14,29 @@ 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; }
+
 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; }
 
-import { Message } from '@alicloudfe/components';
+import { Button, MenuButton, Message } from '@alicloudfe/components';
 import { ProCard } from '../../../card';
 import ProField from '@teamix/pro-field';
 import { baseClass } from '@teamix/utils';
-import React from 'react';
+import React, { useEffect, useRef, useState } from 'react';
 import './index.scss';
+import TeamixIcon from '@teamix/icon';
 var cls = baseClass('teamix-pro-sidebar-container');
 
 var ProSidebarContainer = function ProSidebarContainer(props) {
@@ -31,8 +52,47 @@ var ProSidebarContainer = function ProSidebarContainer(props) {
       _props$messageProps = props.messageProps,
       messageProps = _props$messageProps === void 0 ? {} : _props$messageProps,
       customMessage = props.customMessage,
-      others = _objectWithoutProperties(props, _excluded); // 渲染搜索区域
+      scrollArea = props.scrollArea,
+      showExpandAll = props.showExpandAll,
+      showExpandLevel = props.showExpandLevel,
+      onExpandAllChange = props.onExpandAllChange,
+      onExpandLevelChange = props.onExpandLevelChange,
+      _props$expandLevel = props.expandLevel,
+      expandLevel = _props$expandLevel === void 0 ? 1 : _props$expandLevel,
+      isTree = props.isTree,
+      others = _objectWithoutProperties(props, _excluded);
+
+  var ref = useRef();
+
+  var _useState = useState('auto'),
+      _useState2 = _slicedToArray(_useState, 2),
+      treeHeight = _useState2[0],
+      setTreeHeight = _useState2[1]; // 展开全部状态
+
 
+  var _useState3 = useState(false),
+      _useState4 = _slicedToArray(_useState3, 2),
+      expandAllState = _useState4[0],
+      setExpandAllState = _useState4[1]; // 展开层级状态
+
+
+  var _useState5 = useState(1),
+      _useState6 = _slicedToArray(_useState5, 2),
+      expandLevelState = _useState6[0],
+      setExpandLevelState = _useState6[1];
+
+  useEffect(function () {
+    // 设置滚动区域
+    if (scrollArea === 'tree') {
+      var _ref$current$offsetTo, _ref$current;
+
+      var remainHeight = (_ref$current$offsetTo = ref === null || ref === void 0 ? void 0 : (_ref$current = ref.current) === null || _ref$current === void 0 ? void 0 : _ref$current.offsetTop) !== null && _ref$current$offsetTo !== void 0 ? _ref$current$offsetTo : 0 + 40;
+
+      if (remainHeight > 0) {
+        setTreeHeight("calc(100% - ".concat(remainHeight, "px + 16px)"));
+      }
+    }
+  }, []); // 渲染搜索区域
 
   var renderSearch = function renderSearch() {
     if (customSearch || showSearch) {
@@ -55,22 +115,67 @@ var ProSidebarContainer = function ProSidebarContainer(props) {
     if (message || customMessage) {
       return /*#__PURE__*/React.createElement("div", {
         className: cls('notice')
-      }, message && /*#__PURE__*/React.createElement(Message, _objectSpread({
+      }, message && /*#__PURE__*/React.createElement(Message, _objectSpread(_objectSpread({
         type: "notice",
         closeable: true
-      }, messageProps), message), !!customMessage && customMessage);
+      }, messageProps), {}, {
+        onClose: function onClose() {
+          var _ref$current$offsetTo2, _ref$current2;
+
+          var remainHeight = (_ref$current$offsetTo2 = ref === null || ref === void 0 ? void 0 : (_ref$current2 = ref.current) === null || _ref$current2 === void 0 ? void 0 : _ref$current2.offsetTop) !== null && _ref$current$offsetTo2 !== void 0 ? _ref$current$offsetTo2 : 0 + 40;
+          setTreeHeight("calc(100% - ".concat(remainHeight, "px + 56px)"));
+        }
+      }), message), !!customMessage && customMessage);
     }
 
     return null;
+  }; // 渲染折叠区
+
+
+  var renderFold = function renderFold() {
+    if (showExpandAll || showExpandLevel) {
+      return /*#__PURE__*/React.createElement("div", {
+        className: cls('fold')
+      }, showExpandAll && /*#__PURE__*/React.createElement(Button, {
+        type: "primary",
+        text: true,
+        onClick: function onClick() {
+          var visible = !expandAllState;
+          setExpandAllState(visible);
+          onExpandAllChange === null || onExpandAllChange === void 0 ? void 0 : onExpandAllChange(visible);
+        }
+      }, /*#__PURE__*/React.createElement(TeamixIcon, {
+        type: expandAllState ? 'menu-unfold-line' : 'menu-fold-line'
+      }), expandAllState ? '全部收起' : '全部展开'), showExpandLevel && /*#__PURE__*/React.createElement(MenuButton, {
+        text: true,
+        type: "secondary",
+        label: "\u5C55\u793A".concat(expandLevelState, "\u7EA7"),
+        onItemClick: function onItemClick(key) {
+          setExpandLevelState(key);
+          onExpandLevelChange === null || onExpandLevelChange === void 0 ? void 0 : onExpandLevelChange(key);
+        }
+      }, _toConsumableArray(new Array(expandLevel)).fill(1).map(function (item, index) {
+        return /*#__PURE__*/React.createElement(MenuButton.Item, {
+          key: index + 1
+        }, "\u5C55\u793A", index + 1, "\u7EA7");
+      })));
+    }
   };
 
   return /*#__PURE__*/React.createElement("div", {
-    className: cls()
+    className: cls({
+      '': true,
+      'not-is-tree': !isTree
+    })
   }, /*#__PURE__*/React.createElement(ProCard, _objectSpread({
     bordered: false,
     compacted: true
-  }, others), renderSearch(), renderNotice(), /*#__PURE__*/React.createElement("div", {
-    className: cls('context')
+  }, others), renderSearch(), renderNotice(), renderFold(), /*#__PURE__*/React.createElement("div", {
+    className: cls('context'),
+    ref: ref,
+    style: {
+      height: treeHeight
+    }
   }, children)));
 };
 

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

@@ -1,18 +1,66 @@
 .teamix-pro-sidebar-container {
   min-width: 180px;
+  .teamix-pro-card.compacted >.next-card-header{
+    padding: 16px 0px;
+    margin: 0;
+    
+  }
+
+  .next-card .next-card-header-extra{
+    margin-top: 2px;
+  }
 
   &-search {
-    margin-bottom: 8px;
+    margin-bottom: var(--s-2);
   }
 
   &-search-has-message {
-    margin-bottom: 4px;
+    margin-bottom: var(--s-1);
   }
 
   &-notice {
-    margin-bottom: 4px;
+    margin-bottom: var(--s-1);
+  }
+
+  &-fold {
+    margin-bottom: var(--s-1);
+  }
+
+
+  &.teamix-pro-sidebar-container &-context{
+    overflow-y: hidden;
+    
+    &:hover{
+      overflow-y: auto;
+    }
   }
 
-  &-context {
+
+  &-not-is-tree{
+
+    .teamix-pro-card.compacted >.next-card-header{
+      padding: 16px 8px;
+      margin: 0;
+    }
+    .teamix-pro-sidebar-container-context{
+      padding: 0;
+    }
+
+    .teamix-pro-sidebar-container-search{
+      padding: 0 8px;
+    }
+
+    .teamix-pro-sidebar-container-search-has-message{
+      padding: 0 8px;
+    }
+
+    .teamix-pro-sidebar-container-notice{
+      padding: 0 8px;
+    }
+
+    .teamix-pro-sidebar-container-fold{
+      padding: 0 8px;
+    }
+
   }
-}
+}

package/es/sidebar/components/tree/index.d.ts

@@ -1,4 +1,6 @@
 import React from 'react';
 import { ProSidebarTreeProps } from '../../typing';
+import './index.scss';
+import '../tree-node/index.scss';
 declare const ProSidebarTree: React.FC<ProSidebarTreeProps>;
 export default ProSidebarTree;