@teamix/pro 1.4.16 → 1.4.17

package/lib/card/index.js

@@ -1,5 +1,7 @@
 "use strict";
 
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -38,7 +40,9 @@ var _tab = _interopRequireDefault(require("./tab"));
 
 require("./index.scss");
 
-var _proField = _interopRequireDefault(require("@teamix/pro-field"));
+var _proField = _interopRequireWildcard(require("@teamix/pro-field"));
+
+var _reactDom = _interopRequireDefault(require("react-dom"));
 
 var _cardContainer = require("./card-container");
 
@@ -56,6 +60,10 @@ Object.keys(_cardContainer).forEach(function (key) {
 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"];
 
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
@@ -155,9 +163,20 @@ var ProCard = function ProCard(props) {
       innerCollapseState = _React$useState2[0],
       setInnerCollapseState = _React$useState2[1];
 
+  var cardRef = _react.default.useRef(); // 表头 tooltip tags description 宽度
+
+
+  var _React$useState3 = _react.default.useState(0),
+      _React$useState4 = _slicedToArray(_React$useState3, 2),
+      headerWithoutTitleWidth = _React$useState4[0],
+      setHeaderWithoutTitleWidth = _React$useState4[1];
+
   var _formatSpacing = (0, _utils2.formatSpacing)(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;
@@ -234,7 +253,29 @@ 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.default.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';
@@ -254,9 +295,20 @@ var ProCard = function ProCard(props) {
       type: "down-fill"
     }), /*#__PURE__*/_react.default.createElement("div", {
       className: cls('title-name')
-    }, title)), !hasCollapse && /*#__PURE__*/_react.default.createElement("div", {
-      className: cls('title-name')
-    }, title), tooltip && /*#__PURE__*/_react.default.createElement("div", {
+    }, /*#__PURE__*/_react.default.createElement(_proField.default, {
+      value: title,
+      type: "text",
+      render: {
+        ellipsis: true
+      }
+    }))), !hasCollapse && /*#__PURE__*/_react.default.createElement("div", {
+      className: cls('title-name'),
+      style: {
+        maxWidth: "calc(100% - ".concat(headerWithoutTitleWidth, "px)")
+      }
+    }, /*#__PURE__*/_react.default.createElement(_proField.Ellipsis, {
+      tooltip: title
+    }, title)), tooltip && /*#__PURE__*/_react.default.createElement("div", {
       className: cls('title-tooltip')
     }, /*#__PURE__*/_react.default.createElement(_components.Balloon.Tooltip, {
       align: "t",

package/lib/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/lib/form/ProForm/index.js

@@ -126,11 +126,9 @@ var ProForm = /*#__PURE__*/(0, _react.memo)(function (_ref) {
   var mergedComponents = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, globalComponents), components), formilyComponents), _ProField.default);
 
   var onAutoSubmit = (0, _useAutoSubmit.default)(onSubmit, context);
-  console.log(otherProps);
   var autoTeamixLayout = (0, _useAutoLayout.default)(_objectSpread(_objectSpread({}, otherProps), {}, {
     schema: schema
   }), formRef);
-  console.log(autoTeamixLayout);
   (0, _react.useMemo)(function () {
     // 配置表单默认值
     if (initialValues) {

package/lib/index.d.ts

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

package/lib/index.js

@@ -317,5 +317,5 @@ if (!((_window = window) === null || _window === void 0 ? void 0 : _window.TEAMI
   _icon.default.setConfig(_utils.default.getTeamixIconConfig());
 }
 
-var version = '1.4.16';
+var version = '1.4.17';
 exports.version = version;

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

@@ -74,7 +74,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, _utils2.isHidden)(item === null || item === void 0 ? void 0 : item.hidden, (0, _utils2.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;
@@ -86,7 +92,7 @@ var ProBaseInfo = function ProBaseInfo(props) {
         loading: loading,
         value: /*#__PURE__*/_react.default.createElement(_InfoValueItem.default, {
           type: (_item$valueType = item === null || item === void 0 ? void 0 : item.valueType) !== null && _item$valueType !== void 0 ? _item$valueType : 'text',
-          value: (0, _utils2.getDataIndexValue)(item.dataIndex, (_ref = dataSource !== null && dataSource !== void 0 ? dataSource : result) !== null && _ref !== void 0 ? _ref : {}),
+          value: (0, _utils2.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/lib/info/components/headerInfo/index.js

@@ -35,13 +35,20 @@ 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 = _layout.default[(0, _utils.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 = (0, _utils2.isHidden)(item === null || item === void 0 ? void 0 : item.hidden, (0, _utils2.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;
 
@@ -69,6 +76,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/lib/info/components/tableInfo/index.js

@@ -54,7 +54,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,
@@ -94,7 +95,9 @@ var ProTableInfo = function ProTableInfo(props) {
 
   var newDataSource = (0, _react.useMemo)(function () {
     var nResult = [];
-    var columnsCopy = (0, _lodash.default)(columns); // 取当前行的数据。直到取完
+    var columnsCopy = (0, _lodash.default)(columns).filter(function (item) {
+      return !(0, _utils.isHidden)(item.hidden, (0, _utils.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/lib/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/lib/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/lib/info/utils/index.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.ProInfoGroupContext = void 0;
 exports.getDataIndexValue = getDataIndexValue;
+exports.isHidden = isHidden;
 exports.useActionType = useActionType;
 
 var _utils = require("@teamix/utils");
@@ -47,4 +48,32 @@ function getDataIndexValue(dataIndex, dataSource) {
   }
 
   return (0, _utils.getDeepValue)(dataIndex !== null && dataIndex !== void 0 ? dataIndex : '', dataSource);
+}
+/**
+ * 判断是否隐藏
+ * @param hidden
+ * @param value
+ * @param record
+ * @param context
+ */
+
+
+function isHidden(hidden, value, record, context) {
+  if (typeof hidden === 'string') {
+    return (0, _utils.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/lib/sidebar/components/tree-node/index.js

@@ -17,6 +17,8 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _proField = _interopRequireWildcard(require("@teamix/pro-field"));
 
+var _ = require("../..");
+
 var _IconAction = _interopRequireDefault(require("./components/IconAction"));
 
 var _IconSwitch = _interopRequireDefault(require("./components/IconSwitch"));
@@ -225,10 +227,14 @@ var ProSideBarTreeNode = function ProSideBarTreeNode(props) {
 
 function renderTreeNode(data) {
   return data.map(function (item) {
-    return /*#__PURE__*/_react.default.createElement(_components.Tree.Node, {
+    var _getTreeNodeProps = (0, _.getTreeNodeProps)(item),
+        nodeProps = _getTreeNodeProps.nodeProps,
+        labelProps = _getTreeNodeProps.labelProps;
+
+    return /*#__PURE__*/_react.default.createElement(_components.Tree.Node, _objectSpread({
       key: item.value,
-      label: /*#__PURE__*/_react.default.createElement(ProSideBarTreeNode, _objectSpread({}, item))
-    }, item.children && item.children.length > 0 && renderTreeNode(item.children));
+      label: /*#__PURE__*/_react.default.createElement(ProSideBarTreeNode, _objectSpread({}, labelProps))
+    }, nodeProps), item.children && item.children.length > 0 && renderTreeNode(item.children));
   });
 } // 渲染树节点 依赖 value
 
@@ -241,10 +247,14 @@ function renderTreeNodeDependenceValue(data, onBeforeRenderNodeEvent, checkedKey
       newProps = onBeforeRenderNodeEvent(item, checkedKeys, selectedKeys, allData !== null && allData !== void 0 ? allData : data);
     }
 
-    return /*#__PURE__*/_react.default.createElement(_components.Tree.Node, {
+    var _getTreeNodeProps2 = (0, _.getTreeNodeProps)(item),
+        nodeProps = _getTreeNodeProps2.nodeProps,
+        labelProps = _getTreeNodeProps2.labelProps;
+
+    return /*#__PURE__*/_react.default.createElement(_components.Tree.Node, _objectSpread({
       key: item.value,
-      label: /*#__PURE__*/_react.default.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.default.createElement(ProSideBarTreeNode, _objectSpread({}, labelProps))
+    }, nodeProps), item.children && item.children.length > 0 && renderTreeNodeDependenceValue(item.children, onBeforeRenderNodeEvent, checkedKeys, selectedKeys, allData !== null && allData !== void 0 ? allData : data));
   });
 }
 

package/lib/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/lib/sidebar/index.js

@@ -218,10 +218,10 @@ var ProSidebar = function ProSidebar(props) {
   };
 
   return /*#__PURE__*/_react.default.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.default.createElement(_sidebarContainer.default, _objectSpread(_objectSpread({
     searchOnChange: (0, _lodash.default)(function (value) {

package/lib/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/lib/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 = {