@teamix/pro 1.4.14 → 1.4.15

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 : breakpoints;
+  }, []); // 当前断点不支持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/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.15";
 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.15';
 exports.version = version;

package/lib/nocode/index.scss

@@ -1,4 +1,4 @@
-.teamix-nocode {
+.teamix-pro-nocode {
   &-empty {
     display: flex;
     flex-direction: column;
@@ -75,7 +75,7 @@
       right: 20px;
       bottom: 20px;
 
-      &>i {
+      & > i {
         cursor: pointer;
         color: var(--color-text1-8, #848484);
         background-color: rgba(0, 0, 0, 0.06);

package/lib/nocode/pages/playground.js

@@ -51,7 +51,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-var cls = (0, _utils.usePrefixCls)('teamix-nocode');
+var cls = (0, _utils.usePrefixCls)('teamix-pro-nocode');
 
 var PagePlayground = function PagePlayground(props) {
   var _useState = (0, _react.useState)(undefined),

package/lib/nocode/pages/renderer.js

@@ -57,7 +57,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; }
 
-var cls = (0, _utils.usePrefixCls)('teamix-nocode');
+var cls = (0, _utils.usePrefixCls)('teamix-pro-nocode');
 
 var Loading = function Loading(props) {
   return /*#__PURE__*/_react.default.createElement(_pageContainer.default, _objectSpread({

package/lib/nocode/playground.js

@@ -37,7 +37,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-var cls = (0, _utils.usePrefixCls)('teamix-nocode-playground');
+var cls = (0, _utils.usePrefixCls)('teamix-pro-nocode-playground');
 
 var PlayGroundLayout = function PlayGroundLayout(props) {
   return /*#__PURE__*/_react.default.createElement("div", {

package/lib/table/components/Layout/index.js

@@ -143,14 +143,18 @@ var Layout = function Layout(props) {
       }
     } else if (mainAction) {
       // 没传 dataFilter 但是传了 mainAction
-      return /*#__PURE__*/_react.default.createElement(_form.QueryFilterLayout, {
+      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_form.QueryFilterLayout, {
         addonBefore: renderMainAction(),
         addonAfter: renderAddonAfter()
-      });
+      }), afterDataFilter && /*#__PURE__*/_react.default.createElement("div", {
+        className: "mb8 ".concat(cls('after-data-filter-wrapper'))
+      }, afterDataFilter));
     } else {
-      return /*#__PURE__*/_react.default.createElement(_form.QueryFilterLayout, {
+      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_form.QueryFilterLayout, {
         addonAfter: renderAddonAfter()
-      });
+      }), ' ', afterDataFilter && /*#__PURE__*/_react.default.createElement("div", {
+        className: "mb8 ".concat(cls('after-data-filter-wrapper'))
+      }, afterDataFilter));
     }
   }; // 区域组合渲染
 

package/lib/table/components/QuickAction/index.js

@@ -26,7 +26,7 @@ var QuickAction = function QuickAction(props) {
       actionRef = props.actionRef,
       rowSelection = props.rowSelection; // 如果传对象的话，默认为主要文字类型的 ProActionButton
 
-  if (_typeof(quickAction) === 'object') {
+  if (_typeof(quickAction) === 'object' && (quickAction === null || quickAction === void 0 ? void 0 : quickAction.config)) {
     // 默认 context
     var defaultContext = {
       action: actionRef.current,

package/lib/table/index.js

@@ -360,7 +360,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];
@@ -370,8 +374,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;
@@ -389,9 +394,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);
@@ -449,6 +453,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) {
@@ -847,7 +855,7 @@ var ProTable = function ProTable(props) {
           if (Number.isInteger(time) && time >= 1000) {
             autoRefreshTimerRef.current = setTimeout(function () {
               // 自动刷新不显示 loading
-              _request({}, true);
+              _request(requestData, true);
             }, Number(time));
           }
         });
@@ -1083,8 +1091,22 @@ var ProTable = function ProTable(props) {
         className: cls('footer-right-wrapper')
       }, showSkeleton ? /*#__PURE__*/_react.default.createElement(_skeleton.ProSkeletonRaw.Footer.Pagination, null) : footer));
     }
-  };
+  }; // 判断是否需要吸底
 
+
+  var fixFooterState = (0, _react.useMemo)(function () {
+    if (fullscreenState) {
+      return true;
+    }
+
+    if (fixedTableBody || footerSuction) {
+      if (footerSuctionState) {
+        return true;
+      }
+    }
+
+    return false;
+  }, [fullscreenState, fixedTableBody, footerSuction, footerSuctionState]);
   return /*#__PURE__*/_react.default.createElement(_Fullscreen.default, {
     visible: fullscreenState,
     actionRef: actionRef
@@ -1096,7 +1118,7 @@ var ProTable = function ProTable(props) {
 
       }),
       ref: tableRef
-    }, renderTable(isFullScreen), footerSuctionState && !fullscreenState && /*#__PURE__*/_react.default.createElement(_pageContainer.default.FixedFooter, null, renderFooter()), !(footerSuctionState && !fullscreenState) && renderFooter(), fullscreenState && renderFooter());
+    }, renderTable(isFullScreen), fixFooterState && /*#__PURE__*/_react.default.createElement(_pageContainer.default.FixedFooter, null, renderFooter()), !fixFooterState && renderFooter());
   });
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamix/pro",
-  "version": "1.4.14",
+  "version": "1.4.15",
   "description": "TeamixPro大包",
   "keywords": [
     "aliyun",