@teamix/pro 1.4.16 → 1.4.17

package/dist/pro.js

@@ -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);
@@ -75930,15 +75930,14 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 
 
 function eventHandler(action, actionContext, onTrigger) {
-  var _baseProps;
+  var _ref;
 
   var _action$trigger = action.trigger,
       trigger = _action$trigger === void 0 ? 'onClick' : _action$trigger,
       preventDefault = action.preventDefault,
       stopPropagation = action.stopPropagation,
       beforeAction = action.beforeAction;
-  var openIdentifier = action.openIdentifier;
-  var baseProps = (_baseProps = {}, _baseProps["" + trigger] = function () {
+  return _ref = {}, _ref["" + trigger] = function () {
     var _2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(e) {
       var beforeActionContext;
       return regeneratorRuntime.wrap(function _callee$(_context) {
@@ -75997,15 +75996,7 @@ function eventHandler(action, actionContext, onTrigger) {
     }
 
     return _;
-  }(), _baseProps);
-
-  if (openIdentifier) {
-    baseProps = Object.assign({}, baseProps, {
-      id: openIdentifier
-    });
-  }
-
-  return baseProps;
+  }(), _ref;
 }
 /* unused harmony default export */ var __WEBPACK_DEFAULT_EXPORT__ = ((/* unused pure expression or super */ null && (eventHandler)));
 
@@ -76408,10 +76399,9 @@ function useDialogTableAction(action, context) {
 /* harmony import */ var _utils_message__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(94891);
 /* 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_11__ = __webpack_require__(95983);
-/* harmony import */ var _teamix_hooks__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(42341);
+/* 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"],
-    _excluded2 = ["title", "content", "component", "schema", "onFinish", "dialogType", "dialogQuickShowType", "messageType", "popType", "beforeRequest", "onTrigger", "link", "beforeContent", "afterContent", "message", "footerDescription", "footerAlign", "className", "openIdentifier"];
+    _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); }
 
@@ -76433,7 +76423,6 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 
 
 
-
 function addContextForReactNode(content, context) {
   if (typeof content === 'function' && context) {
     return content(context);
@@ -76475,10 +76464,6 @@ function useDialogAction(action, actionContext, hasForm) {
   var footerDescriptionRef = (0,react__WEBPACK_IMPORTED_MODULE_0__.useRef)();
   var history = (0,react_router_dom__WEBPACK_IMPORTED_MODULE_2__.useHistory)();
 
-  var _useUrlState = (0,_teamix_hooks__WEBPACK_IMPORTED_MODULE_10__.useUrlState)(),
-      urlState = _useUrlState[0],
-      setUrlState = _useUrlState[1];
-
   var onActionStart = function onActionStart(context, e) {
     var _extends2;
 
@@ -76519,18 +76504,7 @@ function useDialogAction(action, actionContext, hasForm) {
         footerDescription = _getTargetValue.footerDescription,
         footerAlign = _getTargetValue.footerAlign,
         className = _getTargetValue.className,
-        openIdentifier = _getTargetValue.openIdentifier,
         containerOtherProps = _objectWithoutPropertiesLoose(_getTargetValue, _excluded2);
-    /**
-     *  判断是否含有 openIdentifierIdentifiy参数 ,更改对应 url
-     */
-
-
-    if (openIdentifier) {
-      setUrlState({
-        openIdentifier: openIdentifier
-      });
-    }
 
     var isDrawer = dialogType === 'drawer';
     var isPop = dialogType === 'pop';
@@ -76636,18 +76610,10 @@ function useDialogAction(action, actionContext, hasForm) {
     var dialogContext = Object.assign({}, context, {
       hide: hide
     });
-    var dialogContent = Component ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(Component, (0,_utils__WEBPACK_IMPORTED_MODULE_11__/* .addContext */ .F)(componentProps, dialogContext)) : addContextForReactNode(content, dialogContext);
+    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() {
-      setUrlState({
-        openIdentifier: undefined
-      });
       propsOnCancel && propsOnCancel(context);
-    }, _extends2.onClose = function onClose() {
-      setUrlState({
-        openIdentifier: undefined
-      });
-      hide == null ? void 0 : hide();
     }, _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"
     }, addContextForReactNode(beforeContent, dialogContext)), message && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
@@ -76733,19 +76699,10 @@ function useDrawerTableAction(action, context) {
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "T": () => (/* binding */ useDrawerAction)
 /* 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__);
-/* harmony import */ var _dialog__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(28653);
-
+/* harmony import */ var _dialog__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(28653);
 
 function useDrawerAction(action, context) {
-  (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
-    var _action$openIdentifie, _action$openIdentifie2;
-
-    var dom = document.getElementById((_action$openIdentifie = (_action$openIdentifie2 = action.openIdentifier) == null ? void 0 : _action$openIdentifie2.toString()) != null ? _action$openIdentifie : '');
-    dom == null ? void 0 : dom.click();
-  }, []);
-  return (0,_dialog__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(Object.assign({
+  return (0,_dialog__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(Object.assign({
     dialogType: 'drawer'
   }, action), context);
 }
@@ -77549,8 +77506,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__);
@@ -77570,7 +77527,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"];
 
@@ -77595,6 +77554,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) {
@@ -77670,9 +77630,18 @@ 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;
+      vertical = _formatSpacing.vertical; // useEffect(() => {
+  //   calculateHeaderWidth();
+  // }, []);
+
 
   var hasDivider = (divider || !!split) && (title || extra);
   var hasCollapse = collapsible === true || defaultCollapsed !== undefined || collapsed !== undefined;
@@ -77748,7 +77717,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';
@@ -77768,9 +77758,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",
@@ -80077,11 +80078,9 @@ var ProForm = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(function
   var mergedComponents = _extends({}, globalComponents, components, formilyComponents, _Components_ProField__WEBPACK_IMPORTED_MODULE_6__/* ["default"] */ .Z);
 
   var onAutoSubmit = (0,_useAutoSubmit__WEBPACK_IMPORTED_MODULE_12__/* ["default"] */ .Z)(onSubmit, context);
-  console.log(otherProps);
   var autoTeamixLayout = (0,_useAutoLayout__WEBPACK_IMPORTED_MODULE_13__/* ["default"] */ .Z)(_extends({}, otherProps, {
     schema: schema
   }), formRef);
-  console.log(autoTeamixLayout);
   (0,react__WEBPACK_IMPORTED_MODULE_0__.useMemo)(function () {
     // 配置表单默认值
     if (initialValues) {
@@ -82548,6 +82547,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),
@@ -82664,7 +82664,7 @@ if (!((_window = window) != null && _window.TEAMIXPRO_WITHOUT_ICON)) {
 
 
 
-var version = '1.4.16';
+var version = '1.4.17';
 
 
 /***/ }),
@@ -83311,7 +83311,13 @@ 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$span, _layout$span2, _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;
@@ -83323,7 +83329,7 @@ var ProBaseInfo = function ProBaseInfo(props) {
         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,
@@ -83389,12 +83395,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;
 
@@ -83422,6 +83435,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,
@@ -83492,7 +83506,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,
@@ -83533,7 +83548,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 = [];
@@ -83857,7 +83874,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);
@@ -83891,6 +83909,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;
+}
 
 /***/ }),
 
@@ -86271,9 +86316,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; }
@@ -86288,6 +86334,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) {
@@ -86310,7 +86357,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",
@@ -86320,20 +86367,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
@@ -86457,10 +86504,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
 
@@ -86472,10 +86523,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)));
@@ -86797,6 +86852,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),
@@ -86835,6 +86891,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,
@@ -86963,10 +87021,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) {
@@ -87028,6 +87086,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),
@@ -87036,6 +87095,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(); }
@@ -87213,19 +87276,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
@@ -87300,6 +87359,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
+  };
+}
 
 /***/ }),
 
@@ -89014,7 +89109,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(); }
 
@@ -89175,6 +89270,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;
@@ -89892,8 +89988,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,
@@ -90041,7 +90139,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) {