@teamix/pro 1.4.15 → 1.4.18

package/es/actions/dialog.d.ts

@@ -29,6 +29,8 @@ export interface DialogAction extends Omit<RequestAction, 'url'>, Omit<QuickShow
     onOk?: any;
     /** 点击取消自定义回调函数  */
     onCancel?: any;
+    /** 隐藏footer区域  */
+    hideFooter?: boolean;
 }
 export declare function useDialogAction(action: DialogAction, actionContext?: any, hasForm?: boolean): {
     [x: string]: (e: React.MouseEvent<HTMLElement, MouseEvent>) => Promise<void>;

package/es/actions/dialog.js

@@ -1,4 +1,4 @@
-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 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; }
@@ -99,6 +99,7 @@ export function useDialogAction(action, actionContext, hasForm) {
         onError = action.onError,
         propsOnOk = action.onOk,
         propsOnCancel = action.onCancel,
+        hideFooter = action.hideFooter,
         others = _objectWithoutProperties(action, _excluded);
 
     var _getTargetValue = getTargetValue(others, context),
@@ -229,7 +230,7 @@ export function useDialogAction(action, actionContext, hasForm) {
     });
     var dialogContent = Component ? /*#__PURE__*/React.createElement(Component, _objectSpread({}, addContext(componentProps, dialogContext))) : addContextForReactNode(content, dialogContext);
 
-    var quickShowProps = _objectSpread(_objectSpread((_objectSpread2 = {}, _defineProperty(_objectSpread2, "".concat(isPop ? 'onConfirm' : 'onOk'), onOk), _defineProperty(_objectSpread2, "onCancel", function onCancel() {
+    var quickShowProps = _objectSpread(_objectSpread((_objectSpread2 = {}, _defineProperty(_objectSpread2, "".concat(isPop ? 'onConfirm' : 'onOk'), hideFooter && !isPop && isDrawer ? false : onOk), _defineProperty(_objectSpread2, "onCancel", hideFooter && !isPop && isDrawer ? false : function () {
       propsOnCancel && propsOnCancel(context);
     }), _defineProperty(_objectSpread2, "title", addContextForReactNode(title, dialogContext)), _defineProperty(_objectSpread2, "content", /*#__PURE__*/React.createElement(React.Fragment, null, beforeContent && /*#__PURE__*/React.createElement("div", {
       className: "teamix-pro-dialog-before-content"
@@ -243,7 +244,12 @@ export function useDialogAction(action, actionContext, hasForm) {
       className: classnames('teamix-pro-dialog-footer-description', getFooterAlignClass(isDrawer, footerAlign))
     }, renderDialogFooterDescription(footerDescription)))), _defineProperty(_objectSpread2, "footerAlign", footerAlign), _defineProperty(_objectSpread2, "className", classnames('teamix-pro-action-dialog', {
       'has-footer-description': !!footerDescription
-    })), _objectSpread2), containerProps), containerOtherProps);
+    })), _objectSpread2), 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 () {};

package/es/card/index.js

@@ -23,7 +23,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 React from 'react';
+import React, { useEffect } from 'react';
 import classnames from 'classnames';
 import Result from '@teamix/result';
 import { Card as BasicCard, Balloon } from '@alicloudfe/components';
@@ -38,7 +38,8 @@ import ProCardDivider from './divider';
 import ProCardSelectable from './selectable';
 import ProCardTab from './tab';
 import './index.scss';
-import ProField from '@teamix/pro-field';
+import ProField, { Ellipsis } from '@teamix/pro-field';
+import ReactDOM from 'react-dom';
 export * from './card-container';
 var cls = usePrefixCls('teamix-pro-card');
 
@@ -115,10 +116,20 @@ export var ProCard = function ProCard(props) {
       innerCollapseState = _React$useState2[0],
       setInnerCollapseState = _React$useState2[1];
 
+  var cardRef = React.useRef(); // 表头 tooltip tags description 宽度
+
+  var _React$useState3 = React.useState(0),
+      _React$useState4 = _slicedToArray(_React$useState3, 2),
+      headerWithoutTitleWidth = _React$useState4[0],
+      setHeaderWithoutTitleWidth = _React$useState4[1];
+
   var _formatSpacing = formatSpacing(spacing),
       horizonal = _formatSpacing.horizonal,
       vertical = _formatSpacing.vertical;
 
+  useEffect(function () {
+    calculateHeaderWidth();
+  }, []);
   var hasDivider = (divider || !!split) && (title || extra);
   var hasCollapse = collapsible === true || defaultCollapsed !== undefined || collapsed !== undefined;
   var collapseState = collapsed !== undefined ? collapsed : innerCollapseState;
@@ -193,7 +204,28 @@ export var ProCard = function ProCard(props) {
     marginBottom: -vertical
   } : {};
 
-  var cardContentStyle = _objectSpread(_objectSpread({}, cardContentMargin), contentStyle);
+  var cardContentStyle = _objectSpread(_objectSpread({}, cardContentMargin), contentStyle); // 计算宽度
+
+
+  var calculateHeaderWidth = function calculateHeaderWidth() {
+    if (cardRef === null || cardRef === void 0 ? void 0 : cardRef.current) {
+      var _tooltipDom$clientWid, _tagsDom$clientWidth, _descriptionDom$clien;
+
+      var cardDom = ReactDOM.findDOMNode(cardRef.current);
+      var headerDom = cardDom === null || cardDom === void 0 ? void 0 : cardDom.querySelector('.teamix-pro-card-title');
+      var tooltipDom = headerDom === null || headerDom === void 0 ? void 0 : headerDom.querySelector('.teamix-pro-card-title-tooltip');
+      var tagsDom = headerDom === null || headerDom === void 0 ? void 0 : headerDom.querySelector('.teamix-pro-tags');
+      var descriptionDom = headerDom === null || headerDom === void 0 ? void 0 : headerDom.querySelector('.teamix-pro-card-title-description');
+      var widthList = [(_tooltipDom$clientWid = tooltipDom === null || tooltipDom === void 0 ? void 0 : tooltipDom.clientWidth) !== null && _tooltipDom$clientWid !== void 0 ? _tooltipDom$clientWid : 0, (_tagsDom$clientWidth = tagsDom === null || tagsDom === void 0 ? void 0 : tagsDom.clientWidth) !== null && _tagsDom$clientWidth !== void 0 ? _tagsDom$clientWidth : 0, (_descriptionDom$clien = descriptionDom === null || descriptionDom === void 0 ? void 0 : descriptionDom.clientWidth) !== null && _descriptionDom$clien !== void 0 ? _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';
@@ -213,9 +245,20 @@ export var ProCard = function ProCard(props) {
       type: "down-fill"
     }), /*#__PURE__*/React.createElement("div", {
       className: cls('title-name')
-    }, title)), !hasCollapse && /*#__PURE__*/React.createElement("div", {
-      className: cls('title-name')
-    }, title), tooltip && /*#__PURE__*/React.createElement("div", {
+    }, /*#__PURE__*/React.createElement(ProField, {
+      value: title,
+      type: "text",
+      render: {
+        ellipsis: true
+      }
+    }))), !hasCollapse && /*#__PURE__*/React.createElement("div", {
+      className: cls('title-name'),
+      style: {
+        maxWidth: "calc(100% - ".concat(headerWithoutTitleWidth, "px)")
+      }
+    }, /*#__PURE__*/React.createElement(Ellipsis, {
+      tooltip: title
+    }, title)), tooltip && /*#__PURE__*/React.createElement("div", {
       className: cls('title-tooltip')
     }, /*#__PURE__*/React.createElement(Balloon.Tooltip, {
       align: "t",
@@ -235,7 +278,9 @@ export 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.createElement(BasicCard.Media, {
     component: "img",
     src: image

package/es/card/index.scss

@@ -40,6 +40,13 @@
     }
   }
 
+  .next-card-header-titles {
+    padding-right: 8px;
+  }
+  .next-card-header-extra {
+    margin-top: 2px;
+  }
+
   &-title {
     display: flex;
     align-items: center;
@@ -80,6 +87,7 @@
 
     &-description {
       font-size: 12px;
+      min-width: 40px;
     }
   }
 

package/es/form/ProForm/index.scss

@@ -338,8 +338,15 @@
 }
 
 // ArrayTable
-.#{$form-array}-table-status-select {
-  display: none;
+.#{$form-array}-table {
+  &-status-select {
+    display: none;
+  }
+  .#{$css-prefix}formily-item:not(.#{$form-item-cls}-feedback-layout-popover) {
+    .#{$form-item-cls}-help {
+      z-index: 2 !important;
+    }
+  }
 }
 
 // SelectTable

package/es/form/ProForm/useAutoLayout.js

@@ -30,7 +30,7 @@ var useAutoLayout = function useAutoLayout(_ref, formRef) {
       autoLabel = _ref2.autoLabel;
 
   var breakpoints = useMemo(function () {
-    return autoLabel ? false : breakpoints;
+    return autoLabel ? false : outBreakpoints;
   }, []); // 当前断点不支持Col更新
 
   var _useState = useState({

package/es/form/SchemaForm/initializeArrayTable.js

@@ -1,4 +1,5 @@
-var _excluded = ["title", "decoratorProps"];
+var _excluded = ["title", "decoratorProps"],
+    _excluded2 = ["title", "dataIndex", "cell", "htmlTitle", "sortable", "width", "align", "alignHeader", "filters", "filterMode", "filterMenuProps", "lock", "resizable", "colSpan"];
 
 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; }
 
@@ -12,15 +13,49 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 
 var initializeColumn = function initializeColumn(item) {
   var title = item.title,
-      decoratorProps = item.decoratorProps,
-      children = _objectWithoutProperties(item, _excluded);
+      _item$decoratorProps = item.decoratorProps,
+      decoratorProps = _item$decoratorProps === void 0 ? {} : _item$decoratorProps,
+      children = _objectWithoutProperties(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 = _objectWithoutProperties(decoratorProps, _excluded2);
+
+  var columnProperties = {
+    title: title !== null && title !== void 0 ? 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: _objectSpread(_objectSpread({}, decoratorProps), {}, {
-      title: title
-    }),
-    children: [_objectSpread({}, children)]
+    props: columnProperties,
+    children: [_objectSpread(_objectSpread({}, children), {}, {
+      decoratorProps: formItemDecoratorProps
+    })]
   };
 };
 

package/es/form/typing.d.ts

@@ -1,5 +1,5 @@
 import type { ReactNode } from 'react';
-import type { IFormFeedback, Form as FormType, FieldPatternTypes } from '@formily/core';
+import type { IFormFeedback as InnerFormFeedback, Form as FormType, FieldPatternTypes } from '@formily/core';
 import type { IFormLayoutProps } from '@teamix/formily';
 import type { CommonRequestConfig } from '@teamix/utils';
 import type { UrlStateOptions } from '@teamix/hooks';
@@ -15,6 +15,10 @@ export interface ProFormInitializeItem {
  * ProForm 实例类型
  */
 export declare type ProFormType = FormType;
+/**
+ * ProForm 反馈类型
+ */
+export declare type IFormFeedback = InnerFormFeedback;
 declare type IBaseComponent = 'Input' | 'Password' | 'TextArea' | 'NumberPicker' | 'Percent' | 'Money' | 'Select' | 'MultipleSelect' | 'TreeSelect' | 'Cascader' | 'MultipleCascader' | 'ArbitraryCascader' | 'Radio' | 'Checkbox' | 'Switch' | 'DatePicker' | 'TimePicker' | 'DateTimePicker' | 'WeekPicker' | 'MonthPicker' | 'YearPicker' | 'QuarterPicker' | 'DateRangePicker' | 'TimeRangePicker' | 'DateTimeRangePicker' | 'WeekRangePicker' | 'MonthRangePicker' | 'YearRangePicker' | 'QuarterRangePicker' | 'Transfer' | 'Upload' | 'ColorPicker' | 'ColorRadio' | 'IconPicker' | 'JsonInput' | 'TagPicker' | 'MultipleTagPicker' | 'Range' | 'Search' | 'SelectGroup' | 'SelectTable' | 'SelectTable.Column';
 declare type IButtonComponent = 'Submit' | 'Reset';
 declare type IComboComponent = 'ArrayCards' | 'ArrayCards.Addition' | 'ArrayCards.Remove' | 'ArrayCards.MoveUp' | 'ArrayCards.MoveDown' | 'ArrayCards.Index' | 'ArrayCollapse' | 'ArrayCollapse.CollapsePanel' | 'ArrayCollapse.Addition' | 'ArrayCollapse.Remove' | 'ArrayCollapse.MoveUp' | 'ArrayCollapse.MoveDown' | 'ArrayCollapse.Index' | 'ArrayTable' | 'ArrayTable.Column' | 'ArrayTable.SortHandle' | 'ArrayTable.Addition' | 'ArrayTable.Remove' | 'ArrayTable.MoveDown' | 'ArrayTable.MoveUp' | 'ArrayTable.Index' | 'ArrayItems' | 'ArrayItems.Item' | 'ArrayItems.SortHandle' | 'ArrayItems.Addition' | 'ArrayItems.Remove' | 'ArrayItems.MoveDown' | 'ArrayItems.MoveUp' | 'ArrayItems.Index' | 'Editable' | 'Editable.Popover' | 'Editable.Dialog' | 'Editable.Drawer';

package/es/index.d.ts

@@ -28,5 +28,5 @@ export * from './table';
 export * from './sidebar';
 export * from './utils';
 export * from './timeline';
-declare const version = "1.4.15";
+declare const version = "1.4.18";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, TeamixIcon, hooks, nocode, templates, utils, };

package/es/index.js

@@ -36,6 +36,6 @@ export * from './table';
 export * from './sidebar';
 export * from './utils';
 export * from './timeline';
-var version = '1.4.15';
+var version = '1.4.18';
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, // ProLayout,
 ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, TeamixIcon, hooks, nocode, templates, utils };

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

@@ -5,7 +5,7 @@ import './index.scss';
 import { getLayout } from '../../utils/utils';
 import defaultLayoutMap from '../../utils/layout';
 import InfoValueItem from '../InfoValueItem';
-import { getDataIndexValue } from '../../utils';
+import { getDataIndexValue, isHidden } from '../../utils';
 var Row = Grid.Row,
     Col = Grid.Col;
 
@@ -38,16 +38,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 || layout === void 0 ? void 0 : layout.span) !== null && _layout$span !== void 0 ? _layout$span : 24 / defaultLayout.span > colspan) ? colspan : (_layout$span2 = layout === null || layout === void 0 ? void 0 : layout.span) !== null && _layout$span2 !== void 0 ? _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);
@@ -55,19 +58,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 = isHidden(item === null || item === void 0 ? void 0 : item.hidden, getDataIndexValue(item.dataIndex, (_ref = dataSource !== null && dataSource !== void 0 ? dataSource : result) !== null && _ref !== void 0 ? _ref : {}), (_ref2 = dataSource !== null && dataSource !== void 0 ? dataSource : result) !== null && _ref2 !== void 0 ? _ref2 : {}, context);
+
+      if (hidden) {
+        return;
+      }
 
-      var span = item.colSpan ? defaultLayout.span * item.colSpan : defaultLayout.span;
-      var layoutSpan = item.colSpan ? ((_layout$span = layout === null || layout === void 0 ? void 0 : layout.span) !== null && _layout$span !== void 0 ? _layout$span : span) * item.colSpan : (_layout$span2 = layout === null || layout === void 0 ? void 0 : layout.span) !== null && _layout$span2 !== void 0 ? _layout$span2 : span;
+      var span = item.colSpan ? defaultLayout.span : defaultLayout.span;
+      var layoutSpan = item.colSpan ? ((_layout$span3 = layout === null || layout === void 0 ? void 0 : layout.span) !== null && _layout$span3 !== void 0 ? _layout$span3 : span) * item.colSpan : (_layout$span4 = layout === null || layout === void 0 ? void 0 : layout.span) !== null && _layout$span4 !== void 0 ? _layout$span4 : span;
       return /*#__PURE__*/React.createElement(Col, {
-        span: layoutSpan,
+        span: layoutSpan > 24 ? 24 : layoutSpan,
         key: index
       }, /*#__PURE__*/React.createElement(ProInfoItem, {
         label: (_item$title = item === null || item === void 0 ? void 0 : item.title) !== null && _item$title !== void 0 ? _item$title : '',
         loading: loading,
         value: /*#__PURE__*/React.createElement(InfoValueItem, {
           type: (_item$valueType = item === null || item === void 0 ? void 0 : item.valueType) !== null && _item$valueType !== void 0 ? _item$valueType : 'text',
-          value: getDataIndexValue(item.dataIndex, (_ref = dataSource !== null && dataSource !== void 0 ? dataSource : result) !== null && _ref !== void 0 ? _ref : {}),
+          value: getDataIndexValue(item.dataIndex, (_ref3 = dataSource !== null && dataSource !== void 0 ? dataSource : result) !== null && _ref3 !== void 0 ? _ref3 : {}),
           render: item.render,
           dataSource: item.dataSource,
           infoItem: item,

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

@@ -5,7 +5,7 @@ import './index.scss';
 import defaultLayoutMap from '../../utils/layout';
 import { getLayout } from '../../utils/utils';
 import InfoValueItem from '../InfoValueItem';
-import { getDataIndexValue } from '../../utils';
+import { getDataIndexValue, isHidden } from '../../utils';
 var Row = Grid.Row,
     Col = Grid.Col;
 
@@ -18,12 +18,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 = defaultLayoutMap[getLayout((_size$width = size === null || size === void 0 ? void 0 : size.width) !== null && _size$width !== void 0 ? _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 = isHidden(item === null || item === void 0 ? void 0 : item.hidden, getDataIndexValue(item.dataIndex, (_ref = dataSource !== null && dataSource !== void 0 ? dataSource : result) !== null && _ref !== void 0 ? _ref : {}), (_ref2 = dataSource !== null && dataSource !== void 0 ? dataSource : result) !== null && _ref2 !== void 0 ? _ref2 : {}, context);
+
+      if (hidden) {
+        return;
+      }
 
       var span = 24;
 
@@ -51,6 +58,7 @@ var ProHeaderInfo = function ProHeaderInfo(props) {
           infoItem: item,
           record: dataSource !== null && dataSource !== void 0 ? dataSource : result,
           actionRef: actionRef,
+          context: context,
           props: item.props
         }),
         headerInfoLayout: layout !== null && layout !== void 0 ? layout : defaultLayout,

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

@@ -23,7 +23,7 @@ import './index.scss';
 import { LabelIconTip } from '../../../field';
 import InfoValueItem from '../InfoValueItem';
 import { ProSkeletonRaw } from '../../..';
-import { getDataIndexValue } from '../../utils';
+import { getDataIndexValue, isHidden } from '../../utils';
 import cloneDeep from 'lodash.clonedeep';
 
 var ProTableInfo = function ProTableInfo(props) {
@@ -33,7 +33,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 _layout$colNum = layout.colNum,
       colNum = _layout$colNum === void 0 ? 2 : _layout$colNum,
       _layout$labelGutter = layout.labelGutter,
@@ -73,7 +74,9 @@ var ProTableInfo = function ProTableInfo(props) {
 
   var newDataSource = useMemo(function () {
     var nResult = [];
-    var columnsCopy = cloneDeep(columns); // 取当前行的数据。直到取完
+    var columnsCopy = cloneDeep(columns).filter(function (item) {
+      return !isHidden(item.hidden, getDataIndexValue(item.dataIndex, dataSource !== null && dataSource !== void 0 ? dataSource : result), dataSource !== null && dataSource !== void 0 ? dataSource : result, context);
+    }); // 取当前行的数据。直到取完
 
     while (columnsCopy.length > 0) {
       var filterColumns = [];

package/es/info/typing.d.ts

@@ -98,6 +98,8 @@ export interface ProInfoColumnsProps {
     props?: any;
     /** 对齐方式 **/
     alignItems?: 'center' | 'flex-start' | 'flex-end' | string;
+    /** 是否隐藏 **/
+    hidden?: boolean | ProInfoCellFunProp | string;
 }
 export declare type ProInfoActionType = {
     /** 刷新Info */

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

@@ -10,3 +10,11 @@ export declare const ProInfoGroupContext: React.Context<ProInfoGroupContextProps
  * @returns
  */
 export declare function getDataIndexValue(dataIndex: ProInfoColumnsProps['dataIndex'], dataSource: object): any;
+/**
+ * 判断是否隐藏
+ * @param hidden
+ * @param value
+ * @param record
+ * @param context
+ */
+export declare function isHidden(hidden: ProInfoColumnsProps['hidden'], value: any, record: any, context: any): any;

package/es/info/utils/index.js

@@ -4,7 +4,7 @@ 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; }
 
-import { getDeepValue } from '@teamix/utils';
+import { getDeepValue, getTargetValue } from '@teamix/utils';
 import React from 'react';
 export function useActionType(ref, action) {
   // 合并自定义事件
@@ -30,4 +30,31 @@ export function getDataIndexValue(dataIndex, dataSource) {
   }
 
   return getDeepValue(dataIndex !== null && dataIndex !== void 0 ? dataIndex : '', dataSource);
+}
+/**
+ * 判断是否隐藏
+ * @param hidden
+ * @param value
+ * @param record
+ * @param context
+ */
+
+export function isHidden(hidden, value, record, context) {
+  if (typeof hidden === 'string') {
+    return getTargetValue(hidden, _objectSpread(_objectSpread({}, record), {}, {
+      record: record,
+      value: value,
+      context: context
+    }));
+  }
+
+  if (typeof hidden === 'boolean') {
+    return hidden;
+  }
+
+  if (typeof hidden === 'function') {
+    return hidden === null || hidden === void 0 ? void 0 : hidden(value, record);
+  }
+
+  return false;
 }

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

@@ -29,6 +29,7 @@ import { ProActionGroup } from '../../../actions';
 import { usePrefixCls } from '@teamix/utils';
 import React, { isValidElement, useState } from 'react';
 import ProField, { renderTags } from '@teamix/pro-field';
+import { getTreeNodeProps } from '../..';
 import ProIconAction from './components/IconAction';
 import ProIconSwitch from './components/IconSwitch';
 import ProHoverTooltip from './components/HoverTooltip';
@@ -201,10 +202,14 @@ var ProSideBarTreeNode = function ProSideBarTreeNode(props) {
 
 export function renderTreeNode(data) {
   return data.map(function (item) {
-    return /*#__PURE__*/React.createElement(Tree.Node, {
+    var _getTreeNodeProps = getTreeNodeProps(item),
+        nodeProps = _getTreeNodeProps.nodeProps,
+        labelProps = _getTreeNodeProps.labelProps;
+
+    return /*#__PURE__*/React.createElement(Tree.Node, _objectSpread({
       key: item.value,
-      label: /*#__PURE__*/React.createElement(ProSideBarTreeNode, _objectSpread({}, item))
-    }, item.children && item.children.length > 0 && renderTreeNode(item.children));
+      label: /*#__PURE__*/React.createElement(ProSideBarTreeNode, _objectSpread({}, labelProps))
+    }, nodeProps), item.children && item.children.length > 0 && renderTreeNode(item.children));
   });
 } // 渲染树节点 依赖 value
 
@@ -216,10 +221,14 @@ export function renderTreeNodeDependenceValue(data, onBeforeRenderNodeEvent, che
       newProps = onBeforeRenderNodeEvent(item, checkedKeys, selectedKeys, allData !== null && allData !== void 0 ? allData : data);
     }
 
-    return /*#__PURE__*/React.createElement(Tree.Node, {
+    var _getTreeNodeProps2 = getTreeNodeProps(item),
+        nodeProps = _getTreeNodeProps2.nodeProps,
+        labelProps = _getTreeNodeProps2.labelProps;
+
+    return /*#__PURE__*/React.createElement(Tree.Node, _objectSpread({
       key: item.value,
-      label: /*#__PURE__*/React.createElement(ProSideBarTreeNode, _objectSpread({}, newProps))
-    }, item.children && item.children.length > 0 && renderTreeNodeDependenceValue(item.children, onBeforeRenderNodeEvent, checkedKeys, selectedKeys, allData !== null && allData !== void 0 ? allData : data));
+      label: /*#__PURE__*/React.createElement(ProSideBarTreeNode, _objectSpread({}, labelProps))
+    }, nodeProps), item.children && item.children.length > 0 && renderTreeNodeDependenceValue(item.children, onBeforeRenderNodeEvent, checkedKeys, selectedKeys, allData !== null && allData !== void 0 ? allData : data));
   });
 }
 export default ProSideBarTreeNode;

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

@@ -50,9 +50,13 @@
       font-weight: unset;
     }
   }
-  .next-tree.next-node-block .next-tree-node-inner{
-    padding: 6px 0px 6px 4px !important;
-    margin: 0 0 4px 0px;
-    border-radius: 2px;
+}
+.teamix-pro-sidebar-deep-1 {
+  .teamix-pro-sidebar-tree {
+    .next-tree.next-node-block .next-tree-node-inner{
+      padding: 6px 0px 6px 4px !important;
+      margin: 0 0 4px 0px;
+      border-radius: 2px;
+    }
   }
-}
+}

package/es/sidebar/index.js

@@ -169,10 +169,10 @@ var ProSidebar = function ProSidebar(props) {
   };
 
   return /*#__PURE__*/React.createElement("div", {
-    className: "".concat(cls({
+    className: "".concat(cls(_defineProperty({
       '': true,
       'scroll-tree': scrollArea === 'tree'
-    }), " ").concat(className),
+    }, "deep-".concat(expandLevel), true)), " ").concat(className),
     style: style
   }, /*#__PURE__*/React.createElement(ProSidebarContainer, _objectSpread(_objectSpread({
     searchOnChange: debounce(function (value) {

package/es/sidebar/index.scss

@@ -11,7 +11,8 @@
     .teamix-pro-sidebar-container,
     .teamix-pro-card,
     .next-card-content-container,
-    .teamix-pro-card-content {
+    .teamix-pro-card-content,
+    .teamix-pro-card-box{
       height: 100%;
     }
     .teamix-pro-sidebar-container-context {
@@ -24,3 +25,14 @@
     color: unset;
   }
 }
+.teamix-pro-page-container-sidebar {
+  .teamix-pro-sidebar {
+    .teamix-pro-sidebar-container {
+      .next-card-header.next-card-header {
+        padding-top: 0;
+      }
+    }
+  }
+}
+
+

package/es/sidebar/typing.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import { MessageProps } from '@alifd/next/types/message';
-import { TreeProps } from '@alifd/next/types/tree';
+import { NodeProps, TreeProps } from '@alifd/next/types/tree';
 import { CommonRequestConfig } from '@teamix/utils';
 import { ProTagItem } from '../field';
 import { ProActionConfig, ProCardProps, ProFieldProps, ProFieldRenderProps, ProFieldType } from '..';
@@ -48,7 +48,9 @@ export declare type ProSidebarDataSourceItem = {
     render?: ProFieldRenderProps;
     /** ProField 的其他配置项 */
     fieldProps?: ProFieldProps;
-};
+    /** TreeNode 的其他配置项 */
+    treeNodeProps?: ProFieldProps;
+} & NodeProps;
 /** 单项 extra 配置项 */
 export declare type ProSidebarExtraProps = React.ReactNode | (ProSidebarExtraPropsItem | React.ReactNode)[];
 export declare type ProSidebarExtraPropsItem = {