@teamix/pro 1.3.4 → 1.3.7

package/es/actions/dialog-form.d.ts

@@ -20,6 +20,8 @@ export interface DialogFormAction extends DialogAction {
     schema: ProFormSchema | Omit<ProFormProps, 'form'>;
     /** 外部传来的 formRef，用于获取内置 form 实例 */
     formRef?: React.MutableRefObject<ProFormType | undefined>;
+    /** 是否开启懒惰校验，只校验第一个非法规则，默认开启 */
+    validateFirst?: boolean;
 }
 export declare function useDialogFormAction(action: DialogFormAction, context?: any): {
     [x: string]: (e: React.MouseEvent<HTMLElement, MouseEvent>) => Promise<void>;

package/es/actions/dialog-form.js

@@ -90,14 +90,17 @@ var DialogForm = function DialogForm(props) {
       formProps = props.formProps,
       context = props.context,
       formRef = props.formRef,
-      innerFormRef = props.innerFormRef;
+      innerFormRef = props.innerFormRef,
+      _props$validateFirst = props.validateFirst,
+      validateFirst = _props$validateFirst === void 0 ? true : _props$validateFirst;
 
   var _getSchemaAndFormProp = getSchemaAndFormProps(schema, formProps),
       formSchema = _getSchemaAndFormProp.schema,
       others = _objectWithoutProperties(_getSchemaAndFormProp, _excluded);
 
   var form = createForm({
-    initialValues: getTargetValue(initialValues, context)
+    initialValues: getTargetValue(initialValues, context),
+    validateFirst: validateFirst
   });
 
   var _useState = useState(false),

package/es/actions/index.d.ts

@@ -1,6 +1,7 @@
-import React from 'react';
+import React, { ReactNode } from 'react';
 import { ButtonProps } from '@alicloudfe/components/types/button';
 import { MenuButtonProps } from '@alicloudfe/components/types/menu-button';
+import { TooltipProps } from '@alicloudfe/components/types/balloon';
 import { LinkAction } from './link';
 import { RequestAction } from './request';
 import { DialogAction } from './dialog';
@@ -29,7 +30,10 @@ export declare function useAction(config?: ProActionConfig, context?: any): any;
 export interface ProActionButtonProps extends ProActionCommonProps, ButtonProps {
     config?: ProActionConfig;
     disabled?: any;
+    tooltip?: ReactNode;
+    disabledTooltip?: ReactNode;
     icon?: string;
+    tooltipProps?: TooltipProps;
     onClick?: (event: React.MouseEvent<Element, MouseEvent>, context?: any) => void;
 }
 export declare const ProActionButton: (props: ProActionButtonProps) => JSX.Element;

package/es/actions/index.js

@@ -1,5 +1,5 @@
 var _excluded = ["type"],
-    _excluded2 = ["config", "icon", "iconSize", "type", "context", "children", "visible", "onClick"],
+    _excluded2 = ["config", "icon", "iconSize", "type", "context", "children", "visible", "disabled", "onClick", "tooltip", "disabledTooltip", "tooltipProps"],
     _excluded3 = ["loading"],
     _excluded4 = ["icon", "iconSize", "label", "actions", "children", "context", "type", "className", "noArrow"],
     _excluded5 = ["context", "text"],
@@ -31,9 +31,9 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 
 import React from 'react';
 import cls from 'classnames';
-import { Button, MenuButton, Menu, Divider } from '@alicloudfe/components';
+import { Button, MenuButton, Menu, Divider, Balloon } from '@alicloudfe/components';
 import Icon from '@teamix/icon';
-import { getTargetValue, getMessage } from '@teamix/utils';
+import { getTargetValue, getMessage, usePrefixCls } from '@teamix/utils';
 import { useLinkAction } from './link';
 import { useRequestAction } from './request';
 import { useDialogAction } from './dialog';
@@ -165,18 +165,39 @@ export var ProActionButton = function ProActionButton(props) {
       context = props.context,
       children = props.children,
       visible = props.visible,
+      disabled = props.disabled,
       _onClick = props.onClick,
+      tooltip = props.tooltip,
+      disabledTooltip = props.disabledTooltip,
+      tooltipProps = props.tooltipProps,
       others = _objectWithoutProperties(props, _excluded2);
 
   var actionProps = useAction(config, context);
-  var buttonProps = _onClick ? _objectSpread(_objectSpread(_objectSpread({}, actionProps), others), {}, {
+  var buttonProps = _onClick ? _objectSpread(_objectSpread(_objectSpread({
+    disabled: disabled
+  }, actionProps), others), {}, {
     onClick: function onClick(e) {
       return _onClick(e, context);
     }
-  }) : _objectSpread(_objectSpread({}, actionProps), others);
-  return /*#__PURE__*/React.createElement(Button, _objectSpread({
+  }) : _objectSpread(_objectSpread({
+    disabled: disabled
+  }, actionProps), others);
+  var content = /*#__PURE__*/React.createElement(Button, _objectSpread({
     type: type
   }, buttonProps), buttonContent(children, icon, iconSize, context));
+
+  var baseToolTipProps = _objectSpread({
+    triggerType: 'hover',
+    align: 't',
+    trigger: content
+  }, tooltipProps);
+
+  if (tooltip || disabledTooltip) {
+    var showToolTip = disabled ? disabledTooltip : tooltip;
+    content = /*#__PURE__*/React.createElement(Balloon.Tooltip, _objectSpread({}, baseToolTipProps), showToolTip);
+  }
+
+  return content;
 };
 
 var ProActionMenuButtonItem = function ProActionMenuButtonItem(props) {
@@ -202,9 +223,7 @@ var ProActionMenuButtonItem = function ProActionMenuButtonItem(props) {
     }
   }) : _objectSpread({}, menuItemProps);
   return /*#__PURE__*/React.createElement("div", _objectSpread({
-    className: cls('teamix-pro-action-menu-item', 'next-menu-item', {
-      'next-disabled': disabled
-    })
+    className: cls('teamix-pro-action-menu-item', "".concat(usePrefixCls(), "menu-item"), _defineProperty({}, "".concat(usePrefixCls(), "disabled"), disabled))
   }, buttonProps), buttonContent(children, icon, undefined, context));
 };
 
@@ -363,6 +382,8 @@ function getActionConfig(action, index, context) {
       key: getKey(index, _key),
       actions: actions.map(function (a, j) {
         return getActionConfig(a, j, context);
+      }).filter(function (action) {
+        return action.visible !== false;
       })
     }, getTargetValue(_others, context));
   }

package/es/card/index.d.ts

@@ -90,7 +90,7 @@ export declare const ProCard: {
     Selectable: {
         (props: import("./selectable").ProCardSelectableProps): JSX.Element;
         defaultProps: {
-            hoveredShadow: boolean; /** 标签组 */
+            hoveredShadow: boolean;
         };
         isProCard: boolean;
     };

package/es/card/index.js

@@ -37,6 +37,7 @@ import ProCardDivider from './divider';
 import ProCardSelectable from './selectable';
 import ProCardTab from './tab';
 import './index.scss';
+import ProField from '@teamix/pro-field';
 export * from './card-container';
 var cls = baseClass('teamix-pro-card');
 
@@ -219,7 +220,14 @@ export var ProCard = function ProCard(props) {
       trigger: tooltipTrigger
     }, tooltip)), tags && renderTags(tags, 'small'), description && /*#__PURE__*/React.createElement("div", {
       className: cls('title-description')
-    }, description));
+    }, /*#__PURE__*/React.createElement(ProField, {
+      value: description,
+      type: "text",
+      render: {
+        ellipsis: true,
+        tooltip: description
+      }
+    })));
   };
 
   return /*#__PURE__*/React.createElement(BasicCard, _objectSpread({

package/es/card/index.scss

@@ -52,6 +52,10 @@
       }
     }
 
+    &-name{
+      flex-shrink: 0;
+    }
+
     &-collapse {
       cursor: pointer;
 

package/es/form/Filter/useSpecialProps.js

@@ -1,4 +1,4 @@
-import { isUsable, isStr, isPureObj } from '@teamix/utils'; // 获取Schema是否包含默认值、异步默认值、必选校验等
+import { isUsable, isStr, isPlainObj } from '@teamix/utils'; // 获取Schema是否包含默认值、异步默认值、必选校验等
 
 var useSpecialProps = function useSpecialProps(props) {
   var initialValues = props.initialValues,
@@ -16,7 +16,7 @@ var useSpecialProps = function useSpecialProps(props) {
           dataSource = item.dataSource,
           children = item.children; // 字符串变量配置default值会触发onChange
 
-      hasChangeDefault = hasChangeDefault || !!(isPureObj(dataSource) && isStr(value) && value.indexOf('.dataSource'));
+      hasChangeDefault = hasChangeDefault || !!(isPlainObj(dataSource) && isStr(value) && value.indexOf('.dataSource'));
       hasDefault = hasDefault || isUsable(value);
       hasRequired = hasRequired || required || !!rules;
 

package/es/form/ProForm/index.js

@@ -1,4 +1,4 @@
-var _excluded = ["form", "initialValues", "initialRequest", "schema", "scope", "context", "components", "children", "layout", "labelAlign", "wrapperAlign", "labelCol", "wrapperCol", "breakpoints", "onChange", "onSubmit", "onSubmitFailed", "onInitialComplete", "className"];
+var _excluded = ["form", "initialValues", "initialRequest", "schema", "scope", "context", "components", "children", "layout", "labelAlign", "wrapperAlign", "labelCol", "wrapperCol", "breakpoints", "onChange", "onSubmit", "onSubmitFailed", "onInitialComplete", "className", "validateFirst"];
 
 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; }
 
@@ -43,11 +43,12 @@ var ProForm = /*#__PURE__*/memo(function (_ref) {
       onSubmitFailed = _ref.onSubmitFailed,
       onInitialComplete = _ref.onInitialComplete,
       className = _ref.className,
+      validateFirst = _ref.validateFirst,
       otherProps = _objectWithoutProperties(_ref, _excluded);
 
   var form = useMemo(function () {
     return outerForm || createForm({
-      validateFirst: true
+      validateFirst: validateFirst
     });
   }, []);
   var prefixCls = usePrefixCls('', {
@@ -119,6 +120,7 @@ var ProForm = /*#__PURE__*/memo(function (_ref) {
 });
 ProForm.defaultProps = {
   colon: false,
-  labelAlign: 'left'
+  labelAlign: 'left',
+  validateFirst: true
 };
 export default ProForm;

package/es/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/es/form/SchemaForm/reactions.js

@@ -10,7 +10,7 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 
 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 { isFn, isPureObj, doCommonRequest, getValueByValue } from '@teamix/utils'; // 配置请求
+import { isFn, isPlainObj, doCommonRequest, getValueByValue } from '@teamix/utils'; // 配置请求
 
 var $request = function $request(field, _ref, context, type) {
   var _field$data;
@@ -29,7 +29,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 = isPureObj(refresh) ? refresh : {};
+  var refreshResult = isPlainObj(refresh) ? refresh : {};
   return doCommonRequest(_objectSpread(_objectSpread({}, requestConfig), {}, {
     params: _objectSpread(_objectSpread(_objectSpread({}, params), beforeRequestResult), refreshResult),
     beforeRequest: function beforeRequest() {

package/es/form/docs/ActionResponse.d.ts

@@ -0,0 +1,7 @@
+import React from 'react';
+import './ActionResponse.less';
+declare type ActionResponseProps = {
+    response?: React.ReactNode;
+};
+export declare const ActionResponse: React.FC<ActionResponseProps>;
+export {};

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

@@ -91,7 +91,7 @@ declare const formilyReact: {
     }>>;
     connect<T_2 extends originalFormilyReact.JSXComponent>(target: T_2, ...args: originalFormilyReact.IComponentMapper<T_2>[]): import("react").ForwardRefExoticComponent<import("react").PropsWithoutRef<Partial<import("react").ComponentProps<T_2>>> & import("react").RefAttributes<unknown>>;
     observer: typeof originalFormilyReact.observer;
-    Observer: import("react").MemoExoticComponent<import("react").FunctionComponent<import("_@formily_reactive-react@2.0.11@@formily/reactive-react").IObserverProps>>;
+    Observer: import("react").MemoExoticComponent<import("react").FunctionComponent<import("@formily/reactive-react").IObserverProps>>;
     useForm: <T_3 extends object = any>() => import("@formily/core").Form<T_3>;
     useField: <T_4 = import("@formily/core").GeneralField>() => T_4;
     useParentForm: () => import("@formily/core").Form<any> | import("@formily/core").ObjectField<any, any>;

package/es/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/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.4";
-export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProTimeline, hooks, nocode, templates, utils, };
+declare const version = "1.3.7";
+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.4';
+var version = '1.3.7';
 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

@@ -20,7 +20,7 @@ var ProInfoItem = function ProInfoItem(prop) {
     var labelCol = baseInfoLayout.labelCol,
         wrapperCol = baseInfoLayout.wrapperCol;
     return /*#__PURE__*/React.createElement("div", {
-      className: cls()
+      className: cls('')
     }, /*#__PURE__*/React.createElement(Row, {
       gutter: 10,
       className: cls('base-row')

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

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

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

@@ -1,6 +1,3 @@
-$item-padding-bottom: -8px;
-// /** 消除 baseInfo 被其他组件包裹后没有居中的问题*/
 .teamix-pro-info {
   width: 100%;
-  margin-bottom: $item-padding-bottom;
 }

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)));
 };