@teamix/pro 1.4.15 → 1.4.18

package/dist/pro.js

@@ -64029,7 +64029,7 @@ var FieldIcon = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().forwar
   var _useState3 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(false),
       _useState4 = _slicedToArray(_useState3, 2),
       balloonVisible = _useState4[0],
-      setBalloonVisible = _useState4[1]; // 类型 基础/混合云业务...
+      setBalloonVisible = _useState4[1]; // 类型 基础/专有云业务...
 
 
   var _useState5 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)('混合云基础图标'),
@@ -66255,7 +66255,7 @@ var FieldSearch = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().forw
     if (Array.isArray(value)) {
       var selectText = (0,_output__WEBPACK_IMPORTED_MODULE_2__/* .formatterOutput */ .h)(value[0], render, dataSource);
       var inputText = value[1];
-      return (0,_output__WEBPACK_IMPORTED_MODULE_2__/* .formatterOutput */ .h)([selectText, inputText], render);
+      return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null, selectText, ", ", (0,_output__WEBPACK_IMPORTED_MODULE_2__/* .formatterOutput */ .h)(inputText, render));
     }
 
     return (0,_output__WEBPACK_IMPORTED_MODULE_2__/* .formatterOutput */ .h)(value, render);
@@ -71153,17 +71153,101 @@ function renderArrayNodes(nodes, render) {
 /* harmony import */ var ___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(35511);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(59787);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_2__);
+var _excluded = ["className"];
+
+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 _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;
+}
+
 
 
 
 
 var Overlay = function Overlay(props) {
-  var _render$overlayTrigge;
+  var _render$overlayProps, _render$overlayTrigge;
 
   var result = props.result,
       render = props.render,
       fieldValue = props.fieldValue;
 
+  var _ref = (_render$overlayProps = render.overlayProps) !== null && _render$overlayProps !== void 0 ? _render$overlayProps : {},
+      _ref$className = _ref.className,
+      className = _ref$className === void 0 ? '' : _ref$className,
+      otherOverlayProps = _objectWithoutProperties(_ref, _excluded);
+
   var renderContent = function renderContent() {
     if ( /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_2__.isValidElement)(render.overlay)) {
       return render.overlay;
@@ -71176,15 +71260,15 @@ var Overlay = function Overlay(props) {
     });
   };
 
-  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_2___default().createElement(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_0__.Balloon, {
-    className: "teamix-pro-field-output-overlay",
+  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_2___default().createElement(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_0__.Balloon, _objectSpread({
+    className: "teamix-pro-field-output-overlay ".concat(className),
     trigger: /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_2___default().createElement("div", {
       className: "teamix-pro-field-output-overlay-trigger"
     }, result),
     triggerType: (_render$overlayTrigge = render.overlayTriggerType) !== null && _render$overlayTrigge !== void 0 ? _render$overlayTrigge : 'hover',
     closable: false,
     needAdjust: true
-  }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_2___default().createElement("div", {
+  }, otherOverlayProps), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_2___default().createElement("div", {
     className: "teamix-pro-field-output-overlay-content"
   }, renderContent()));
 };
@@ -74224,7 +74308,8 @@ ProPageContainer.Tab = _tab__WEBPACK_IMPORTED_MODULE_6__/* ["default"] */ .Z;
 /* harmony import */ var _alicloudfe_components__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_2__);
 /* harmony import */ var _index__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(20701);
 var _excluded = ["key", "path"],
-    _excluded2 = ["activeKey", "children"];
+    _excluded2 = ["activeKey", "children"],
+    _excluded3 = ["children"];
 
 function ownKeys(object, enumerableOnly) {
   var keys = Object.keys(object);
@@ -74353,12 +74438,16 @@ var ProPageContainerTab = function ProPageContainerTab(props) {
       var items = []; // 此处不能用 React.Children.map，会改变 element 的 key
 
       react__WEBPACK_IMPORTED_MODULE_0___default().Children.forEach(children, function (element) {
-        var _element$props;
+        var _element$props2;
 
-        items.push( /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_2__.Tab.Item, {
-          title: element === null || element === void 0 ? void 0 : (_element$props = element.props) === null || _element$props === void 0 ? void 0 : _element$props.title,
+        var _element$props = element.props,
+            children = _element$props.children,
+            others = _objectWithoutProperties(_element$props, _excluded3);
+
+        items.push( /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_2__.Tab.Item, _objectSpread({
+          title: element === null || element === void 0 ? void 0 : (_element$props2 = element.props) === null || _element$props2 === void 0 ? void 0 : _element$props2.title,
           key: element === null || element === void 0 ? void 0 : element.key
-        }));
+        }, others)));
       });
       registerSwitch( /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_2__.Tab, _objectSpread({
         activeKey: activeKey
@@ -74373,9 +74462,9 @@ var ProPageContainerTab = function ProPageContainerTab(props) {
   if (registerSwitch) {
     var content = react__WEBPACK_IMPORTED_MODULE_0___default().Children.map(children, function (element) {
       if ((element === null || element === void 0 ? void 0 : element.key) === activeKey) {
-        var _element$props2;
+        var _element$props3;
 
-        return element === null || element === void 0 ? void 0 : (_element$props2 = element.props) === null || _element$props2 === void 0 ? void 0 : _element$props2.children;
+        return element === null || element === void 0 ? void 0 : (_element$props3 = element.props) === null || _element$props3 === void 0 ? void 0 : _element$props3.children;
       }
 
       return null;
@@ -76400,7 +76489,7 @@ function useDialogTableAction(action, context) {
 /* harmony import */ var _base__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(54842);
 /* harmony import */ var _request__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(67096);
 /* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(95983);
-var _excluded = ["trigger", "url", "customRequest", "method", "params", "data", "extendParams", "successMsg", "errorMsg", "formatParams", "formatResult", "onSuccess", "onError", "onOk", "onCancel"],
+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"];
 
 function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
@@ -76482,6 +76571,7 @@ function useDialogAction(action, actionContext, hasForm) {
         onError = action.onError,
         propsOnOk = action.onOk,
         propsOnCancel = action.onCancel,
+        hideFooter = action.hideFooter,
         others = _objectWithoutPropertiesLoose(action, _excluded);
 
     var _getTargetValue = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_5__.getTargetValue)(others, context),
@@ -76612,7 +76702,7 @@ function useDialogAction(action, actionContext, hasForm) {
     });
     var dialogContent = Component ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(Component, (0,_utils__WEBPACK_IMPORTED_MODULE_10__/* .addContext */ .F)(componentProps, dialogContext)) : addContextForReactNode(content, dialogContext);
 
-    var quickShowProps = _extends((_extends2 = {}, _extends2["" + (isPop ? 'onConfirm' : 'onOk')] = onOk, _extends2.onCancel = function onCancel() {
+    var quickShowProps = _extends((_extends2 = {}, _extends2["" + (isPop ? 'onConfirm' : 'onOk')] = hideFooter && !isPop && isDrawer ? false : onOk, _extends2.onCancel = hideFooter && !isPop && isDrawer ? false : function () {
       propsOnCancel && propsOnCancel(context);
     }, _extends2.title = addContextForReactNode(title, dialogContext), _extends2.content = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null, beforeContent && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
       className: "teamix-pro-dialog-before-content"
@@ -76626,7 +76716,12 @@ function useDialogAction(action, actionContext, hasForm) {
       className: classnames__WEBPACK_IMPORTED_MODULE_1___default()('teamix-pro-dialog-footer-description', getFooterAlignClass(isDrawer, footerAlign))
     }, renderDialogFooterDescription(footerDescription))), _extends2.footerAlign = footerAlign, _extends2.className = classnames__WEBPACK_IMPORTED_MODULE_1___default()('teamix-pro-action-dialog', {
       'has-footer-description': !!footerDescription
-    }), _extends2), containerProps, containerOtherProps);
+    }), _extends2), containerProps, containerOtherProps); // TODO Drawer 基础组件未支持此配置，日后支持，并修改onOk、onCancel写法
+
+
+    if (!dialogType || dialogType === 'dialog') {
+      quickShowProps['footer'] = !hideFooter;
+    }
 
     var ret = container.show(quickShowProps);
     store.hide = ret ? ret.hide || ret.close : function () {};
@@ -77506,8 +77601,8 @@ ProCardDivider.isProCardDivider = true;
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "QW": () => (/* binding */ ProCard),
 /* harmony export */   "ZP": () => (__WEBPACK_DEFAULT_EXPORT__),
-/* harmony export */   "_L": () => (/* reexport safe */ _card_container__WEBPACK_IMPORTED_MODULE_15__._),
-/* harmony export */   "l0": () => (/* reexport safe */ _card_container__WEBPACK_IMPORTED_MODULE_15__.l)
+/* harmony export */   "_L": () => (/* reexport safe */ _card_container__WEBPACK_IMPORTED_MODULE_16__._),
+/* harmony export */   "l0": () => (/* reexport safe */ _card_container__WEBPACK_IMPORTED_MODULE_16__.l)
 /* harmony export */ });
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(59787);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_0__);
@@ -77527,7 +77622,9 @@ ProCardDivider.isProCardDivider = true;
 /* harmony import */ var _selectable__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(80617);
 /* harmony import */ var _tab__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(56904);
 /* harmony import */ var _teamix_pro_field__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(35511);
-/* harmony import */ var _card_container__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(18110);
+/* harmony import */ var react_dom__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(55156);
+/* harmony import */ var react_dom__WEBPACK_IMPORTED_MODULE_15___default = /*#__PURE__*/__webpack_require__.n(react_dom__WEBPACK_IMPORTED_MODULE_15__);
+/* harmony import */ var _card_container__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(18110);
 var _excluded = ["context"],
     _excluded2 = ["children", "title", "subTitle", "tooltip", "tooltipIcon", "tags", "description", "extra", "actions", "message", "style", "className", "image", "hoveredShadow", "divider", "bordered", "compacted", "centered", "loading", "contentLoading", "empty", "borderColor", "backgroundColor", "contentClassName", "contentStyle", "direction", "wrap", "spacing", "split", "collapsible", "defaultCollapsed", "collapsed", "onCollapse", "context"];
 
@@ -77552,6 +77649,7 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 
 
 
+
 var cls = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_5__.usePrefixCls)('teamix-pro-card');
 
 var renderActionGroup = function renderActionGroup(extra, context) {
@@ -77627,10 +77725,19 @@ var ProCard = function ProCard(props) {
       innerCollapseState = _React$useState[0],
       setInnerCollapseState = _React$useState[1];
 
+  var cardRef = react__WEBPACK_IMPORTED_MODULE_0___default().useRef(); // 表头 tooltip tags description 宽度
+
+  var _React$useState2 = react__WEBPACK_IMPORTED_MODULE_0___default().useState(0),
+      headerWithoutTitleWidth = _React$useState2[0],
+      setHeaderWithoutTitleWidth = _React$useState2[1];
+
   var _formatSpacing = (0,_utils__WEBPACK_IMPORTED_MODULE_10__/* .formatSpacing */ .A)(spacing),
       horizonal = _formatSpacing.horizonal,
       vertical = _formatSpacing.vertical;
 
+  (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
+    calculateHeaderWidth();
+  }, []);
   var hasDivider = (divider || !!split) && (title || extra);
   var hasCollapse = collapsible === true || defaultCollapsed !== undefined || collapsed !== undefined;
   var collapseState = collapsed !== undefined ? collapsed : innerCollapseState;
@@ -77705,7 +77812,28 @@ var ProCard = function ProCard(props) {
     marginBottom: -vertical
   } : {};
 
-  var cardContentStyle = _extends({}, cardContentMargin, contentStyle);
+  var cardContentStyle = _extends({}, cardContentMargin, contentStyle); // 计算宽度
+
+
+  var calculateHeaderWidth = function calculateHeaderWidth() {
+    if (cardRef != null && cardRef.current) {
+      var _tooltipDom$clientWid, _tagsDom$clientWidth, _descriptionDom$clien;
+
+      var cardDom = react_dom__WEBPACK_IMPORTED_MODULE_15___default().findDOMNode(cardRef.current);
+      var headerDom = cardDom == null ? void 0 : cardDom.querySelector('.teamix-pro-card-title');
+      var tooltipDom = headerDom == null ? void 0 : headerDom.querySelector('.teamix-pro-card-title-tooltip');
+      var tagsDom = headerDom == null ? void 0 : headerDom.querySelector('.teamix-pro-tags');
+      var descriptionDom = headerDom == null ? void 0 : headerDom.querySelector('.teamix-pro-card-title-description');
+      var widthList = [(_tooltipDom$clientWid = tooltipDom == null ? void 0 : tooltipDom.clientWidth) != null ? _tooltipDom$clientWid : 0, (_tagsDom$clientWidth = tagsDom == null ? void 0 : tagsDom.clientWidth) != null ? _tagsDom$clientWidth : 0, (_descriptionDom$clien = descriptionDom == null ? void 0 : descriptionDom.clientWidth) != null ? _descriptionDom$clien : 0].filter(function (item) {
+        return item;
+      });
+      var width = widthList.reduce(function (acc, cur) {
+        return acc + cur;
+      }, 0) + widthList.length * 8; // 无法取出精准宽度，减去1作为阈值
+
+      setHeaderWithoutTitleWidth(width - 1);
+    }
+  };
 
   var renderTitle = function renderTitle() {
     var icon = tooltipIcon || 'info-circle-line';
@@ -77725,9 +77853,20 @@ var ProCard = function ProCard(props) {
       type: "down-fill"
     }), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
       className: cls('title-name')
-    }, title)), !hasCollapse && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
-      className: cls('title-name')
-    }, title), tooltip && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
+    }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_teamix_pro_field__WEBPACK_IMPORTED_MODULE_14__/* ["default"] */ .ZP, {
+      value: title,
+      type: "text",
+      render: {
+        ellipsis: true
+      }
+    }))), !hasCollapse && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
+      className: cls('title-name'),
+      style: {
+        maxWidth: "calc(100% - " + headerWithoutTitleWidth + "px)"
+      }
+    }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_teamix_pro_field__WEBPACK_IMPORTED_MODULE_14__/* .Ellipsis */ .mH, {
+      tooltip: title
+    }, title)), tooltip && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
       className: cls('title-tooltip')
     }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_3__.Balloon.Tooltip, {
       align: "t",
@@ -77747,7 +77886,9 @@ var ProCard = function ProCard(props) {
     free: true,
     className: cardClassName,
     style: style,
-    actions: renderActionGroup(actions, context)
+    actions: renderActionGroup(actions, context) // @ts-ignore
+    ,
+    ref: cardRef
   }, others), !loading && image && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_3__.Card.Media, {
     component: "img",
     src: image
@@ -80130,7 +80271,7 @@ var useAutoLayout = function useAutoLayout(_ref, formRef) {
       autoLabel = _ref2.autoLabel;
 
   var breakpoints = (0,react__WEBPACK_IMPORTED_MODULE_0__.useMemo)(function () {
-    return autoLabel ? false : breakpoints;
+    return autoLabel ? false : outBreakpoints;
   }, []); // 当前断点不支持Col更新
 
   var _useState = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)({
@@ -80901,7 +81042,8 @@ var initialize = function initialize(item) {
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "Z": () => (__WEBPACK_DEFAULT_EXPORT__)
 /* harmony export */ });
-var _excluded = ["title", "decoratorProps"];
+var _excluded = ["title", "decoratorProps"],
+    _excluded2 = ["title", "dataIndex", "cell", "htmlTitle", "sortable", "width", "align", "alignHeader", "filters", "filterMode", "filterMenuProps", "lock", "resizable", "colSpan"];
 
 function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
@@ -80909,16 +81051,49 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 
 var initializeColumn = function initializeColumn(item) {
   var title = item.title,
-      decoratorProps = item.decoratorProps,
-      children = _objectWithoutPropertiesLoose(item, _excluded);
-
+      _item$decoratorProps = item.decoratorProps,
+      decoratorProps = _item$decoratorProps === void 0 ? {} : _item$decoratorProps,
+      children = _objectWithoutPropertiesLoose(item, _excluded); // 将Table.Column属性和组件FormItem属性通过decoratorProps统一传入，再分别赋值
+
+
+  var columnTitle = decoratorProps.title,
+      dataIndex = decoratorProps.dataIndex,
+      cell = decoratorProps.cell,
+      htmlTitle = decoratorProps.htmlTitle,
+      sortable = decoratorProps.sortable,
+      width = decoratorProps.width,
+      align = decoratorProps.align,
+      alignHeader = decoratorProps.alignHeader,
+      filters = decoratorProps.filters,
+      filterMode = decoratorProps.filterMode,
+      filterMenuProps = decoratorProps.filterMenuProps,
+      lock = decoratorProps.lock,
+      resizable = decoratorProps.resizable,
+      colSpan = decoratorProps.colSpan,
+      formItemDecoratorProps = _objectWithoutPropertiesLoose(decoratorProps, _excluded2);
+
+  var columnProperties = {
+    title: title != null ? title : columnTitle,
+    dataIndex: dataIndex,
+    cell: cell,
+    htmlTitle: htmlTitle,
+    sortable: sortable,
+    width: width,
+    align: align,
+    alignHeader: alignHeader,
+    filters: filters,
+    filterMode: filterMode,
+    filterMenuProps: filterMenuProps,
+    lock: lock,
+    resizable: resizable,
+    colSpan: colSpan
+  };
   return {
     component: 'ArrayTable.Column',
-    props: _extends({}, decoratorProps, {
-      // 将ArrayTable.Column理解为decorator，传入decoratorProps作为component的props
-      title: title
-    }),
-    children: [_extends({}, children)]
+    props: columnProperties,
+    children: [_extends({}, children, {
+      decoratorProps: formItemDecoratorProps
+    })]
   };
 };
 
@@ -82469,6 +82644,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   "getTreeLevel": () => (/* reexport safe */ _sidebar__WEBPACK_IMPORTED_MODULE_11__.zr),
 /* harmony export */   "getTreeLevelKey": () => (/* reexport safe */ _sidebar__WEBPACK_IMPORTED_MODULE_11__.Ch),
 /* harmony export */   "getTreeNodeLevel": () => (/* reexport safe */ _sidebar__WEBPACK_IMPORTED_MODULE_11__.vk),
+/* harmony export */   "getTreeNodeProps": () => (/* reexport safe */ _sidebar__WEBPACK_IMPORTED_MODULE_11__.H8),
 /* harmony export */   "getType": () => (/* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_10__.oL),
 /* harmony export */   "getValidValues": () => (/* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_10__.Cc),
 /* harmony export */   "getValueByValue": () => (/* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_10__.BN),
@@ -82585,7 +82761,7 @@ if (!((_window = window) != null && _window.TEAMIXPRO_WITHOUT_ICON)) {
 
 
 
-var version = '1.4.15';
+var version = '1.4.18';
 
 
 /***/ }),
@@ -83215,16 +83391,19 @@ var ProBaseInfo = function ProBaseInfo(props) {
     var newWrapperSpan = formItemLayout.wrapperCol.span; // 计算合并列情况。label与wrapper需要重新计算
 
     if (colspan) {
-      newLabelSpan = newLabelSpan / colspan;
+      var _layout$span, _layout$span2;
+
+      var realColspan = ((_layout$span = layout == null ? void 0 : layout.span) != null ? _layout$span : 24 / defaultLayout.span > colspan) ? colspan : (_layout$span2 = layout == null ? void 0 : layout.span) != null ? _layout$span2 : 24 / defaultLayout.span;
+      newLabelSpan = newLabelSpan / realColspan;
       newWrapperSpan = newWrapperSpan + (formItemLayout.labelCol.span - newLabelSpan);
     }
 
     var newFormItemLayout = {
       labelCol: {
-        span: newLabelSpan
+        span: newLabelSpan.toFixed()
       },
       wrapperCol: {
-        span: newWrapperSpan
+        span: newWrapperSpan.toFixed()
       }
     };
     return Object.assign(formItemLayout, newFormItemLayout);
@@ -83232,19 +83411,25 @@ var ProBaseInfo = function ProBaseInfo(props) {
 
   var renderContent = function renderContent() {
     return columns.map(function (item, index) {
-      var _layout$span, _layout$span2, _item$title, _item$valueType, _ref, _item$colSpan;
+      var _ref, _ref2, _layout$span3, _layout$span4, _item$title, _item$valueType, _ref3, _item$colSpan;
+
+      var hidden = (0,_utils__WEBPACK_IMPORTED_MODULE_5__/* .isHidden */ .xj)(item == null ? void 0 : item.hidden, (0,_utils__WEBPACK_IMPORTED_MODULE_5__/* .getDataIndexValue */ .vc)(item.dataIndex, (_ref = dataSource != null ? dataSource : result) != null ? _ref : {}), (_ref2 = dataSource != null ? dataSource : result) != null ? _ref2 : {}, context);
+
+      if (hidden) {
+        return;
+      }
 
-      var span = item.colSpan ? defaultLayout.span * item.colSpan : defaultLayout.span;
-      var layoutSpan = item.colSpan ? ((_layout$span = layout == null ? void 0 : layout.span) != null ? _layout$span : span) * item.colSpan : (_layout$span2 = layout == null ? void 0 : layout.span) != null ? _layout$span2 : span;
+      var span = item.colSpan ? defaultLayout.span : defaultLayout.span;
+      var layoutSpan = item.colSpan ? ((_layout$span3 = layout == null ? void 0 : layout.span) != null ? _layout$span3 : span) * item.colSpan : (_layout$span4 = layout == null ? void 0 : layout.span) != null ? _layout$span4 : span;
       return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().createElement(Col, {
-        span: layoutSpan,
+        span: layoutSpan > 24 ? 24 : layoutSpan,
         key: index
       }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().createElement(_ProInfoItem__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z, {
         label: (_item$title = item == null ? void 0 : item.title) != null ? _item$title : '',
         loading: loading,
         value: /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().createElement(_InfoValueItem__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z, {
           type: (_item$valueType = item == null ? void 0 : item.valueType) != null ? _item$valueType : 'text',
-          value: (0,_utils__WEBPACK_IMPORTED_MODULE_5__/* .getDataIndexValue */ .vc)(item.dataIndex, (_ref = dataSource != null ? dataSource : result) != null ? _ref : {}),
+          value: (0,_utils__WEBPACK_IMPORTED_MODULE_5__/* .getDataIndexValue */ .vc)(item.dataIndex, (_ref3 = dataSource != null ? dataSource : result) != null ? _ref3 : {}),
           render: item.render,
           dataSource: item.dataSource,
           infoItem: item,
@@ -83310,12 +83495,19 @@ var ProHeaderInfo = function ProHeaderInfo(props) {
       loading = props.loading,
       result = props.result,
       actionRef = props.actionRef,
-      size = props.size;
+      size = props.size,
+      context = props.context;
   var defaultLayout = _utils_layout__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z[(0,_utils_utils__WEBPACK_IMPORTED_MODULE_6__/* .getLayout */ .G)((_size$width = size == null ? void 0 : size.width) != null ? _size$width : 0)];
 
   var renderContent = function renderContent() {
     return columns.map(function (item, index) {
-      var _item$title, _item$valueType;
+      var _ref, _ref2, _item$title, _item$valueType;
+
+      var hidden = (0,_utils__WEBPACK_IMPORTED_MODULE_5__/* .isHidden */ .xj)(item == null ? void 0 : item.hidden, (0,_utils__WEBPACK_IMPORTED_MODULE_5__/* .getDataIndexValue */ .vc)(item.dataIndex, (_ref = dataSource != null ? dataSource : result) != null ? _ref : {}), (_ref2 = dataSource != null ? dataSource : result) != null ? _ref2 : {}, context);
+
+      if (hidden) {
+        return;
+      }
 
       var span = 24;
 
@@ -83343,6 +83535,7 @@ var ProHeaderInfo = function ProHeaderInfo(props) {
           infoItem: item,
           record: dataSource != null ? dataSource : result,
           actionRef: actionRef,
+          context: context,
           props: item.props
         }),
         headerInfoLayout: layout != null ? layout : defaultLayout,
@@ -83413,7 +83606,8 @@ var ProTableInfo = function ProTableInfo(props) {
       layout = _props$layout === void 0 ? {} : _props$layout,
       loading = props.loading,
       result = props.result,
-      actionRef = props.actionRef;
+      actionRef = props.actionRef,
+      context = props.context;
   var _ref = layout,
       _ref$colNum = _ref.colNum,
       colNum = _ref$colNum === void 0 ? 2 : _ref$colNum,
@@ -83454,7 +83648,9 @@ var ProTableInfo = function ProTableInfo(props) {
 
   var newDataSource = (0,react__WEBPACK_IMPORTED_MODULE_0__.useMemo)(function () {
     var nResult = [];
-    var columnsCopy = lodash_clonedeep__WEBPACK_IMPORTED_MODULE_6___default()(columns); // 取当前行的数据。直到取完
+    var columnsCopy = lodash_clonedeep__WEBPACK_IMPORTED_MODULE_6___default()(columns).filter(function (item) {
+      return !(0,_utils__WEBPACK_IMPORTED_MODULE_5__/* .isHidden */ .xj)(item.hidden, (0,_utils__WEBPACK_IMPORTED_MODULE_5__/* .getDataIndexValue */ .vc)(item.dataIndex, dataSource != null ? dataSource : result), dataSource != null ? dataSource : result, context);
+    }); // 取当前行的数据。直到取完
 
     while (columnsCopy.length > 0) {
       var filterColumns = [];
@@ -83778,7 +83974,8 @@ ProInfo.ProInfoGroup = _components_InfoGroup__WEBPACK_IMPORTED_MODULE_4__/* ["de
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "TH": () => (/* binding */ ProInfoGroupContext),
 /* harmony export */   "tx": () => (/* binding */ useActionType),
-/* harmony export */   "vc": () => (/* binding */ getDataIndexValue)
+/* harmony export */   "vc": () => (/* binding */ getDataIndexValue),
+/* harmony export */   "xj": () => (/* binding */ isHidden)
 /* harmony export */ });
 /* harmony import */ var _teamix_utils__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(80653);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(59787);
@@ -83812,6 +84009,33 @@ function getDataIndexValue(dataIndex, dataSource) {
 
   return (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_0__.getDeepValue)(dataIndex != null ? dataIndex : '', dataSource);
 }
+/**
+ * 判断是否隐藏
+ * @param hidden
+ * @param value
+ * @param record
+ * @param context
+ */
+
+function isHidden(hidden, value, record, context) {
+  if (typeof hidden === 'string') {
+    return (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_0__.getTargetValue)(hidden, _extends({}, record, {
+      record: record,
+      value: value,
+      context: context
+    }));
+  }
+
+  if (typeof hidden === 'boolean') {
+    return hidden;
+  }
+
+  if (typeof hidden === 'function') {
+    return hidden == null ? void 0 : hidden(value, record);
+  }
+
+  return false;
+}
 
 /***/ }),
 
@@ -86192,9 +86416,10 @@ var ProIconSwitch = function ProIconSwitch(props) {
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(59787);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_3__);
 /* harmony import */ var _teamix_pro_field__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(35511);
-/* harmony import */ var _components_IconAction__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(88653);
-/* harmony import */ var _components_IconSwitch__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(16786);
-/* harmony import */ var _components_HoverTooltip__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(13753);
+/* harmony import */ var ___WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(1975);
+/* harmony import */ var _components_IconAction__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(88653);
+/* harmony import */ var _components_IconSwitch__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(16786);
+/* harmony import */ var _components_HoverTooltip__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(13753);
 var _excluded = ["type", "action", "props"];
 
 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; }
@@ -86209,6 +86434,7 @@ function _extends() { _extends = Object.assign || function (target) { for (var i
 
 
 
+
 var cls = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_2__.usePrefixCls)('teamix-pro-sidebar-tree');
 
 var ProSideBarTreeNode = function ProSideBarTreeNode(props) {
@@ -86231,7 +86457,7 @@ var ProSideBarTreeNode = function ProSideBarTreeNode(props) {
         hover = _ref$hover === void 0 ? true : _ref$hover;
 
     if (type === 'action') {
-      return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default().createElement(_components_HoverTooltip__WEBPACK_IMPORTED_MODULE_7__/* ["default"] */ .Z, {
+      return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default().createElement(_components_HoverTooltip__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .Z, {
         visible: !hover || extraVisible,
         trigger: /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default().createElement(_actions__WEBPACK_IMPORTED_MODULE_1__/* .ProActionGroup */ .d5, _extends({
           type: "text",
@@ -86241,20 +86467,20 @@ var ProSideBarTreeNode = function ProSideBarTreeNode(props) {
     }
 
     if (type === 'iconSwitch') {
-      return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default().createElement(_components_IconSwitch__WEBPACK_IMPORTED_MODULE_6__/* ["default"] */ .Z, _extends({
+      return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default().createElement(_components_IconSwitch__WEBPACK_IMPORTED_MODULE_7__/* ["default"] */ .Z, _extends({
         tooltipVisible: !hover || extraVisible
       }, props));
     }
 
     if (type === 'iconAction') {
-      return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default().createElement(_components_IconAction__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z, _extends({
+      return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default().createElement(_components_IconAction__WEBPACK_IMPORTED_MODULE_6__/* ["default"] */ .Z, _extends({
         visible: !hover || extraVisible,
         action: action
       }, props));
     }
 
     if (type === 'custom') {
-      return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default().createElement(_components_HoverTooltip__WEBPACK_IMPORTED_MODULE_7__/* ["default"] */ .Z, {
+      return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default().createElement(_components_HoverTooltip__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .Z, {
         className: cls('extra-custom'),
         visible: !hover || extraVisible,
         trigger: others.trigger
@@ -86378,10 +86604,14 @@ var ProSideBarTreeNode = function ProSideBarTreeNode(props) {
 
 function renderTreeNode(data) {
   return data.map(function (item) {
-    return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default().createElement(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_0__.Tree.Node, {
+    var _getTreeNodeProps = (0,___WEBPACK_IMPORTED_MODULE_5__/* .getTreeNodeProps */ .H8)(item),
+        nodeProps = _getTreeNodeProps.nodeProps,
+        labelProps = _getTreeNodeProps.labelProps;
+
+    return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default().createElement(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_0__.Tree.Node, _extends({
       key: item.value,
-      label: /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default().createElement(ProSideBarTreeNode, item)
-    }, item.children && item.children.length > 0 && renderTreeNode(item.children));
+      label: /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default().createElement(ProSideBarTreeNode, labelProps)
+    }, nodeProps), item.children && item.children.length > 0 && renderTreeNode(item.children));
   });
 } // 渲染树节点 依赖 value
 
@@ -86393,10 +86623,14 @@ function renderTreeNodeDependenceValue(data, onBeforeRenderNodeEvent, checkedKey
       newProps = onBeforeRenderNodeEvent(item, checkedKeys, selectedKeys, allData != null ? allData : data);
     }
 
-    return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default().createElement(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_0__.Tree.Node, {
+    var _getTreeNodeProps2 = (0,___WEBPACK_IMPORTED_MODULE_5__/* .getTreeNodeProps */ .H8)(item),
+        nodeProps = _getTreeNodeProps2.nodeProps,
+        labelProps = _getTreeNodeProps2.labelProps;
+
+    return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default().createElement(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_0__.Tree.Node, _extends({
       key: item.value,
-      label: /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default().createElement(ProSideBarTreeNode, newProps)
-    }, item.children && item.children.length > 0 && renderTreeNodeDependenceValue(item.children, onBeforeRenderNodeEvent, checkedKeys, selectedKeys, allData != null ? allData : data));
+      label: /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default().createElement(ProSideBarTreeNode, labelProps)
+    }, nodeProps), item.children && item.children.length > 0 && renderTreeNodeDependenceValue(item.children, onBeforeRenderNodeEvent, checkedKeys, selectedKeys, allData != null ? allData : data));
   });
 }
 /* unused harmony default export */ var __WEBPACK_DEFAULT_EXPORT__ = ((/* unused pure expression or super */ null && (ProSideBarTreeNode)));
@@ -86718,6 +86952,7 @@ var ProSidebarTree = function ProSidebarTree(props) {
 "use strict";
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "Ch": () => (/* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_6__.Ch),
+/* harmony export */   "H8": () => (/* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_6__.H8),
 /* harmony export */   "N4": () => (/* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_6__.N4),
 /* harmony export */   "VX": () => (/* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_6__.VX),
 /* harmony export */   "Y2": () => (/* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_6__.Y2),
@@ -86756,6 +86991,8 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 var cls = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_1__.usePrefixCls)('teamix-pro-sidebar');
 
 var ProSidebar = function ProSidebar(props) {
+  var _cls;
+
   var selectedKeys = props.selectedKeys,
       checkedKeys = props.checkedKeys,
       dataSourceProp = props.dataSource,
@@ -86884,10 +87121,10 @@ var ProSidebar = function ProSidebar(props) {
   };
 
   return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
-    className: cls({
+    className: cls((_cls = {
       '': true,
       'scroll-tree': scrollArea === 'tree'
-    }) + " " + className,
+    }, _cls["deep-" + expandLevel] = true, _cls)) + " " + className,
     style: style
   }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_components_sidebar_container__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z, _extends({
     searchOnChange: lodash_debounce__WEBPACK_IMPORTED_MODULE_5___default()(function (value) {
@@ -86949,6 +87186,7 @@ function useActionType(ref, action) {
 "use strict";
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "Ch": () => (/* binding */ getTreeLevelKey),
+/* harmony export */   "H8": () => (/* binding */ getTreeNodeProps),
 /* harmony export */   "N4": () => (/* binding */ findNodeWithPath),
 /* harmony export */   "VX": () => (/* binding */ loop),
 /* harmony export */   "Y2": () => (/* binding */ findNodeWithoutPath),
@@ -86957,6 +87195,10 @@ function useActionType(ref, action) {
 /* harmony export */   "vk": () => (/* binding */ getTreeNodeLevel),
 /* harmony export */   "zr": () => (/* binding */ getTreeLevel)
 /* harmony export */ });
+var _excluded = ["selectable", "checkable", "editable", "draggable", "disabled", "checkboxDisabled", "isLeaf", "treeNodeProps"];
+
+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; }
+
 function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
@@ -87134,19 +87376,15 @@ function getTreeLevel(data, aliasMap) {
       _ref6$children = _ref6.children,
       children = _ref6$children === void 0 ? 'children' : _ref6$children;
 
-  var result = 1;
+  var result = 0;
   loop(data, function (item, level) {
     if (result < level) {
       result = level;
     }
-
-    if ('children' in item) {
-      result += 1;
-    }
   }, {
     children: children
   });
-  return result;
+  return result + 1;
 }
 /**
  * 获取树层级对应的所有 key
@@ -87221,6 +87459,42 @@ function filterTreeData(nodes, predicate, aliasMap) {
     filterTreeValue: filterTreeValue
   };
 }
+/**
+ * 获取TreeNodeProps
+ * @param item
+ */
+
+function getTreeNodeProps(item) {
+  var selectable = item.selectable,
+      checkable = item.checkable,
+      editable = item.editable,
+      draggable = item.draggable,
+      disabled = item.disabled,
+      checkboxDisabled = item.checkboxDisabled,
+      isLeaf = item.isLeaf,
+      _item$treeNodeProps = item.treeNodeProps,
+      treeNodeProps = _item$treeNodeProps === void 0 ? {} : _item$treeNodeProps,
+      others = _objectWithoutPropertiesLoose(item, _excluded);
+
+  var nodeProps = _extends({
+    selectable: selectable,
+    checkable: checkable,
+    editable: editable,
+    draggable: draggable,
+    disabled: disabled,
+    checkboxDisabled: checkboxDisabled,
+    isLeaf: isLeaf
+  }, treeNodeProps);
+
+  return {
+    nodeProps: Object.fromEntries(Object.entries(nodeProps).filter(function (_ref9) {
+      var _ = _ref9[0],
+          v = _ref9[1];
+      return v !== undefined;
+    })),
+    labelProps: others
+  };
+}
 
 /***/ }),
 
@@ -87644,16 +87918,18 @@ var Layout = function Layout(props) {
       // 没传 dataFilter 但是传了 mainAction
       return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_form__WEBPACK_IMPORTED_MODULE_4__/* .QueryFilterLayout */ .rx, {
         addonBefore: renderMainAction(),
-        addonAfter: renderAddonAfter()
-      }), afterDataFilter && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
-        className: "mb8 " + cls('after-data-filter-wrapper')
-      }, afterDataFilter));
+        addonAfter: renderAddonAfter(),
+        children: afterDataFilter ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
+          className: "mb8 " + cls('after-data-filter-wrapper')
+        }, afterDataFilter) : null
+      }));
     } else {
       return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_form__WEBPACK_IMPORTED_MODULE_4__/* .QueryFilterLayout */ .rx, {
-        addonAfter: renderAddonAfter()
-      }), ' ', afterDataFilter && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
-        className: "mb8 " + cls('after-data-filter-wrapper')
-      }, afterDataFilter));
+        addonAfter: renderAddonAfter(),
+        children: afterDataFilter ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
+          className: "mb8 " + cls('after-data-filter-wrapper')
+        }, afterDataFilter) : null
+      }));
     }
   }; // 区域组合渲染
 
@@ -87684,7 +87960,7 @@ var Layout = function Layout(props) {
         actionRef: actionRef,
         quickAction: extra,
         rowSelection: rowSelection
-      }), !(dataFilter != null && (_dataFilter$schema3 = dataFilter.schema) != null && _dataFilter$schema3.length) && renderQueryFilter())), (dataFilter == null ? void 0 : (_dataFilter$schema4 = dataFilter.schema) == null ? void 0 : _dataFilter$schema4.length) && renderQueryFilter());
+      }), !(dataFilter != null && (_dataFilter$schema3 = dataFilter.schema) != null && _dataFilter$schema3.length) && !afterDataFilter && renderQueryFilter())), (dataFilter == null ? void 0 : (_dataFilter$schema4 = dataFilter.schema) == null ? void 0 : _dataFilter$schema4.length) > 0 || afterDataFilter && renderQueryFilter());
     } else if (!header && mainAction) {
       return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null, renderQueryFilter());
     } else if (!header && !mainAction) {
@@ -88933,7 +89209,7 @@ var ToolBar = function ToolBar(props) {
 /* harmony import */ var _page_container__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(2781);
 /* harmony import */ var lodash_debounce__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(39339);
 /* harmony import */ var lodash_debounce__WEBPACK_IMPORTED_MODULE_15___default = /*#__PURE__*/__webpack_require__.n(lodash_debounce__WEBPACK_IMPORTED_MODULE_15__);
-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"];
+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"];
 
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 
@@ -89094,6 +89370,7 @@ var ProTable = function ProTable(props) {
       context = props.context,
       _props$fixedTableBody = props.fixedTableBody,
       fixedTableBody = _props$fixedTableBody === void 0 ? false : _props$fixedTableBody,
+      isTree = props.isTree,
       otherProps = _objectWithoutPropertiesLoose(props, _excluded);
 
   var targetPageKey = pageKey || globalPageKey;
@@ -89811,8 +90088,10 @@ var ProTable = function ProTable(props) {
         columns: (0,_utils_genProColumnToColumn__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(filteredColumns, showSkeleton, actionRef, context),
         loading: getTableLoading(),
         className: classnames__WEBPACK_IMPORTED_MODULE_13___default()('teamix-pro-table', tableClassName, {
-          'with-row-select': rowSelection
+          'with-row-select': rowSelection,
+          'teamix-pro-tree-table': isTree
         }),
+        isTree: isTree,
         size: size,
         onSort: onSort,
         sort: sort,
@@ -89960,7 +90239,7 @@ var ProTable = function ProTable(props) {
 
   var fixFooterState = (0,react__WEBPACK_IMPORTED_MODULE_0__.useMemo)(function () {
     if (fullscreenState) {
-      return true;
+      return false;
     }
 
     if (fixedTableBody || footerSuction) {
@@ -92622,7 +92901,7 @@ var lightCategoryColor = {
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "Z": () => (__WEBPACK_DEFAULT_EXPORT__)
 /* harmony export */ });
-// 混合云暗色主题图表配置
+// 专有云暗色主题图表配置
 var chartDarkTheme = {
   category_12: [],
   linear_10: ['#307ac9', '#285585', '#203041', '#2c67a7', '#244263', '#1e2630', '#2e71b8', '#2a5e96', '#264c74', '#223952'],
@@ -92694,7 +92973,7 @@ var chartDarkTheme = {
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "Z": () => (__WEBPACK_DEFAULT_EXPORT__)
 /* harmony export */ });
-// 混合云亮色主题图表配置
+// 专有云亮色主题图表配置
 var chartLightTheme = {
   category_12: [],
   linear_10: ['#297acc', '#75aae0', '#cee1f5', '#4d91d6', '#a0c5eb', '#e6f0fa', '#3b85d1', '#609edb', '#8ab7e6', '#b6d3f0'],