@teamix/pro 1.4.14 → 1.4.17

package/es/table/index.js

@@ -1,4 +1,4 @@
-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 _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); }
 
@@ -32,7 +32,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, { useState, useEffect, useRef } from 'react';
+import React, { useState, useEffect, useRef, useMemo } from 'react';
 import { Table, Checkbox } from '@alicloudfe/components';
 import Pagination from './components/Pagination';
 import genProColumnToColumn from './utils/genProColumnToColumn';
@@ -175,6 +175,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 = _objectWithoutProperties(props, _excluded);
 
   var targetPageKey = pageKey || globalPageKey;
@@ -316,7 +317,11 @@ var ProTable = function ProTable(props) {
   }, []); // 获取header高度，用作全屏吸底吸底高度计算以及固定body高度计算（滚动条在底部）
 
   var getHeaderHeight = function getHeaderHeight(isFullscreen, offset) {
-    var _tableDom$getElements, _tableDom$getElements2;
+    var _tableDom$getElements, _tableDom$getElements2, _document$querySelect, _document$querySelect2, _document$querySelect3;
+
+    if (!fixedTableBody) {
+      return;
+    }
 
     var tableDom = tableRef.current;
     var headerDom = tableDom === null || tableDom === void 0 ? void 0 : (_tableDom$getElements = tableDom.getElementsByClassName('teamix-pro-table-layout')) === null || _tableDom$getElements === void 0 ? void 0 : _tableDom$getElements[0];
@@ -326,8 +331,9 @@ var ProTable = function ProTable(props) {
     var tableHeaderDom = tableDom === null || tableDom === void 0 ? void 0 : (_tableDom$getElements2 = tableDom.getElementsByClassName(basePrefix('table-header-inner'))) === null || _tableDom$getElements2 === void 0 ? void 0 : _tableDom$getElements2[0];
     var pageContainerDom = document.querySelector('.teamix-pro-page-container-header');
     var teamixNavDom = document.querySelector('.teamix-nav-console');
-    var footerRowSelectionDom = document.querySelector('.teamix-pro-page-container-footer');
-    var tableBodyDom = document.querySelector('.next-table-body');
+    var footerRowSelectionDom = document.querySelector('.teamix-pro-page-container-footer'); // 这边不能直接取 next-table-body
+
+    var tableBodyDom = (_document$querySelect = document.querySelector('.teamix-pro-table')) === null || _document$querySelect === void 0 ? void 0 : (_document$querySelect2 = _document$querySelect.getElementsByTagName('table')) === null || _document$querySelect2 === void 0 ? void 0 : (_document$querySelect3 = _document$querySelect2[1]) === null || _document$querySelect3 === void 0 ? void 0 : _document$querySelect3.parentNode;
     var headerFixedTopSectionDom = document.querySelector('.teamix-pro-page-container-fixed-top');
     setTimeout(function () {
       var _headerDom$offsetHeig, _tableHeaderDom$offse;
@@ -345,9 +351,8 @@ var ProTable = function ProTable(props) {
         var teamixNavHeight = (_teamixNavDom$offsetH = teamixNavDom === null || teamixNavDom === void 0 ? void 0 : teamixNavDom.offsetHeight) !== null && _teamixNavDom$offsetH !== void 0 ? _teamixNavDom$offsetH : 0; // 1 为预留值，js无法取出精确高度，会被四舍五入
 
         var offsetHeaderHeight = headerHeight + tableHeaderHeight + pageHeaderHeight + teamixNavHeight + footerRowSelectionHeight + 16 + (offset !== null && offset !== void 0 ? offset : 0) + 1;
-        var clientTableBodyHeight = document.body.clientHeight - offsetHeaderHeight;
 
-        if (tableBodyDom.clientHeight < clientTableBodyHeight) {
+        if (tableBodyDom.clientHeight < tableBodyDom.scrollHeight) {
           setFooterSuctionState(true);
         } else {
           setFooterSuctionState(false);
@@ -405,6 +410,10 @@ var ProTable = function ProTable(props) {
 
 
   var getFooterSuctionState = function getFooterSuctionState() {
+    if (!footerSuction) {
+      return;
+    }
+
     var containerDom = document.querySelector('.teamix-pro-page-container-scroll-container');
 
     if (containerDom) {
@@ -803,7 +812,7 @@ var ProTable = function ProTable(props) {
           if (Number.isInteger(time) && time >= 1000) {
             autoRefreshTimerRef.current = setTimeout(function () {
               // 自动刷新不显示 loading
-              _request({}, true);
+              _request(requestData, true);
             }, Number(time));
           }
         });
@@ -900,8 +909,10 @@ var ProTable = function ProTable(props) {
         columns: genProColumnToColumn(filteredColumns, showSkeleton, actionRef, context),
         loading: getTableLoading(),
         className: classNames('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,
@@ -1039,8 +1050,22 @@ var ProTable = function ProTable(props) {
         className: cls('footer-right-wrapper')
       }, showSkeleton ? /*#__PURE__*/React.createElement(Skeleton.Footer.Pagination, null) : footer));
     }
-  };
+  }; // 判断是否需要吸底
 
+
+  var fixFooterState = useMemo(function () {
+    if (fullscreenState) {
+      return false;
+    }
+
+    if (fixedTableBody || footerSuction) {
+      if (footerSuctionState) {
+        return true;
+      }
+    }
+
+    return false;
+  }, [fullscreenState, fixedTableBody, footerSuction, footerSuctionState]);
   return /*#__PURE__*/React.createElement(FullScreen, {
     visible: fullscreenState,
     actionRef: actionRef
@@ -1052,7 +1077,7 @@ var ProTable = function ProTable(props) {
 
       }),
       ref: tableRef
-    }, renderTable(isFullScreen), footerSuctionState && !fullscreenState && /*#__PURE__*/React.createElement(ProPageContainer.FixedFooter, null, renderFooter()), !(footerSuctionState && !fullscreenState) && renderFooter(), fullscreenState && renderFooter());
+    }, renderTable(isFullScreen), fixFooterState && /*#__PURE__*/React.createElement(ProPageContainer.FixedFooter, null, renderFooter()), !fixFooterState && renderFooter());
   });
 };
 

package/es/table/index.scss

@@ -140,3 +140,11 @@ $fullscreenPadding: 24px;
     color: var(--color-brand1-5);
   }
 }
+.teamix-pro-tree-table {
+  .next-table-cell.first {
+    .next-table-cell-wrapper {
+      display: flex;
+      align-items: center;
+    }
+  }
+}

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

@@ -31,17 +31,17 @@ var _index = _interopRequireDefault(require("../Components/Text/index"));
 
 var _SchemaForm = _interopRequireDefault(require("../SchemaForm"));
 
-var _utils2 = require("../utils");
-
 var _useAutoSubmit = _interopRequireDefault(require("./useAutoSubmit"));
 
+var _useAutoLayout = _interopRequireDefault(require("./useAutoLayout"));
+
 var _useInitialRequest = _interopRequireDefault(require("./useInitialRequest"));
 
 var _validate = _interopRequireDefault(require("../locales/validate"));
 
 require("./index.scss");
 
-var _excluded = ["form", "initialValues", "initialRequest", "scope", "context", "components", "layout", "labelAlign", "wrapperAlign", "labelCol", "wrapperCol", "breakpoints", "onChange", "onChangeType", "onSubmit", "onSubmitFailed", "onInitialComplete", "className", "validateFirst", "schema", "children"];
+var _excluded = ["form", "initialValues", "initialRequest", "scope", "context", "components", "onChange", "onChangeType", "onSubmit", "onSubmitFailed", "onInitialComplete", "className", "validateFirst", "schema", "children"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -95,12 +95,6 @@ var ProForm = /*#__PURE__*/(0, _react.memo)(function (_ref) {
       scope = _ref.scope,
       context = _ref.context,
       components = _ref.components,
-      layout = _ref.layout,
-      labelAlign = _ref.labelAlign,
-      wrapperAlign = _ref.wrapperAlign,
-      labelCol = _ref.labelCol,
-      wrapperCol = _ref.wrapperCol,
-      breakpoints = _ref.breakpoints,
       onChange = _ref.onChange,
       onChangeType = _ref.onChangeType,
       onSubmit = _ref.onSubmit,
@@ -112,7 +106,8 @@ var ProForm = /*#__PURE__*/(0, _react.memo)(function (_ref) {
       children = _ref.children,
       otherProps = _objectWithoutProperties(_ref, _excluded);
 
-  // 获取全局配置
+  var formRef = (0, _react.useRef)(); // 获取全局配置
+
   var _ref2 = (0, _utils.getGlobalConfig)('ProForm') || {},
       globalComponents = _ref2.components,
       globalScope = _ref2.scope;
@@ -130,25 +125,10 @@ 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); // todo 需要formily支持断点下的属性更新
-
-  var getTeamixLayout = (0, _react.useMemo)(function () {
-    return breakpoints === true ? {
-      breakpoints: [480],
-      layout: (0, _utils2.mergeArrayValue)(['vertical'], layout),
-      labelAlign: (0, _utils2.mergeArrayValue)(['left'], labelAlign),
-      wrapperAlign: (0, _utils2.mergeArrayValue)(['left'], wrapperAlign),
-      labelCol: (0, _utils2.mergeArrayValue)([24], labelCol),
-      wrapperCol: (0, _utils2.mergeArrayValue)([24], wrapperCol)
-    } : {
-      breakpoints: (0, _utils.isBool)(breakpoints) ? undefined : breakpoints,
-      layout: layout,
-      labelAlign: labelAlign,
-      wrapperAlign: wrapperAlign,
-      labelCol: labelCol,
-      wrapperCol: wrapperCol
-    };
-  }, [breakpoints, layout, labelAlign, wrapperAlign, labelCol, wrapperCol]);
+  var onAutoSubmit = (0, _useAutoSubmit.default)(onSubmit, context);
+  var autoTeamixLayout = (0, _useAutoLayout.default)(_objectSpread(_objectSpread({}, otherProps), {}, {
+    schema: schema
+  }), formRef);
   (0, _react.useMemo)(function () {
     // 配置表单默认值
     if (initialValues) {
@@ -189,7 +169,7 @@ var ProForm = /*#__PURE__*/(0, _react.memo)(function (_ref) {
   }, []);
   return /*#__PURE__*/_react.default.createElement(_formily.Form, _objectSpread(_objectSpread(_objectSpread({
     className: (0, _utils.cls)(prefixCls(), className)
-  }, otherProps), getTeamixLayout), {}, {
+  }, otherProps), autoTeamixLayout), {}, {
     form: form,
     onAutoSubmit: onAutoSubmit,
     onAutoSubmitFailed: onSubmitFailed
@@ -197,7 +177,9 @@ var ProForm = /*#__PURE__*/(0, _react.memo)(function (_ref) {
     schema: schema,
     scope: mergedScope,
     components: mergedComponents
-  }) : null, children);
+  }) : null, /*#__PURE__*/_react.default.createElement("div", {
+    ref: formRef
+  }), children);
 });
 ProForm.defaultProps = {
   colon: false,

package/lib/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/lib/form/ProForm/useAutoLayout.d.ts

@@ -0,0 +1,9 @@
+declare const useAutoLayout: ({ breakpoints: outBreakpoints, layout, labelAlign, wrapperAlign, labelCol: outLabelCol, wrapperCol: outWrapperCol, autoLayout, schema, }: any, formRef: any) => {
+    breakpoints: any;
+    layout: any;
+    labelAlign: any;
+    wrapperAlign: any;
+    labelCol: any;
+    wrapperCol: any;
+};
+export default useAutoLayout;

package/lib/form/ProForm/useAutoLayout.js

@@ -0,0 +1,124 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _react = require("react");
+
+var _utils = require("@teamix/utils");
+
+var _utils2 = require("../utils");
+
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+var useAutoLayout = function useAutoLayout(_ref, formRef) {
+  var outBreakpoints = _ref.breakpoints,
+      layout = _ref.layout,
+      labelAlign = _ref.labelAlign,
+      wrapperAlign = _ref.wrapperAlign,
+      outLabelCol = _ref.labelCol,
+      outWrapperCol = _ref.wrapperCol,
+      autoLayout = _ref.autoLayout,
+      schema = _ref.schema;
+
+  var _ref2 = (0, _utils.isPlainObj)(autoLayout) ? autoLayout : {
+    autoLabel: autoLayout
+  },
+      autoLabel = _ref2.autoLabel;
+
+  var breakpoints = (0, _react.useMemo)(function () {
+    return autoLabel ? false : outBreakpoints;
+  }, []); // 当前断点不支持Col更新
+
+  var _useState = (0, _react.useState)({
+    labelCol: outLabelCol,
+    wrapperCol: outWrapperCol
+  }),
+      _useState2 = _slicedToArray(_useState, 2),
+      autoCol = _useState2[0],
+      setAutoCol = _useState2[1];
+
+  var labelCol = autoCol.labelCol,
+      wrapperCol = autoCol.wrapperCol;
+  (0, _react.useEffect)(function () {
+    /**
+     * autolayout
+     */
+    if (autoLabel) {
+      var formWidth = formRef.current.getBoundingClientRect().width; // 表单宽度
+
+      var labelArray = schema.map(function (item) {
+        var text = item.title;
+
+        if ((0, _utils.isStr)(text)) {
+          var _item$decoratorProps;
+
+          if (item.required) {
+            text += '一'; // 必填 + 12
+          }
+
+          if ((_item$decoratorProps = item.decoratorProps) === null || _item$decoratorProps === void 0 ? void 0 : _item$decoratorProps.tooltip) {
+            text += '一'; // 提示 + 18
+          }
+
+          return text;
+        }
+
+        return '';
+      }); // 标题内容集合
+
+      var labelWidthArray = (0, _utils.getWidthByCharacterMap)(labelArray); // 标题宽度集合
+
+      var _autoWidthBySpace = (0, _utils.autoWidthBySpace)(labelWidthArray),
+          expectedWidth = _autoWidthBySpace.expectedWidth,
+          consoleArray = _autoWidthBySpace.consoleArray; // 智能计算预期宽度
+
+
+      var expectedCol = Math.ceil(expectedWidth / formWidth * 24); // 预期宽度转换为 Col 值
+
+      setAutoCol({
+        labelCol: expectedCol,
+        wrapperCol: wrapperCol
+      });
+    } else {
+      setAutoCol({
+        labelCol: outLabelCol,
+        wrapperCol: outWrapperCol
+      });
+    }
+  }, [outLabelCol, outWrapperCol]); // Layout配置By断点（配置断点后，目前不支持 Col 更新）
+
+  var autoTeamixLayout = (0, _react.useMemo)(function () {
+    return breakpoints === true ? {
+      breakpoints: [480],
+      layout: (0, _utils2.mergeArrayValue)(['vertical'], layout),
+      labelAlign: (0, _utils2.mergeArrayValue)(['left'], labelAlign),
+      wrapperAlign: (0, _utils2.mergeArrayValue)(['left'], wrapperAlign),
+      labelCol: (0, _utils2.mergeArrayValue)([24], labelCol),
+      wrapperCol: (0, _utils2.mergeArrayValue)([24], wrapperCol)
+    } : {
+      breakpoints: (0, _utils.isBool)(breakpoints) ? undefined : breakpoints,
+      layout: layout,
+      labelAlign: labelAlign,
+      wrapperAlign: wrapperAlign,
+      labelCol: labelCol,
+      wrapperCol: wrapperCol
+    };
+  }, [breakpoints, layout, labelAlign, wrapperAlign, labelCol, wrapperCol]);
+  return autoTeamixLayout;
+};
+
+var _default = useAutoLayout;
+exports.default = _default;

package/lib/form/SchemaForm/initializeArrayTable.js

@@ -4,7 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-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; }
 
@@ -18,15 +19,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/lib/form/typing.d.ts

@@ -59,6 +59,9 @@ export interface ProFormSchemaItem {
     data?: AnyObject;
 }
 export declare type ProFormSchema = ProFormSchemaItem[];
+interface AutoLayout {
+    autoLabel?: boolean;
+}
 export interface ProFormProps extends Omit<IFormLayoutProps, 'breakpoints'> {
     form?: FormType | false;
     schema?: ProFormSchema;
@@ -78,6 +81,7 @@ export interface ProFormProps extends Omit<IFormLayoutProps, 'breakpoints'> {
     onSubmitFailed?: (feedbacks: IFormFeedback[]) => void;
     onInitialComplete?: (form: FormType) => void;
     breakpoints?: number[] | boolean;
+    autoLayout?: AutoLayout | boolean;
 }
 export interface FilterProps extends ProFormProps {
     form: FormType;

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.14";
+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.14';
+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,