@teamix/pro 1.4.13 → 1.4.16

package/lib/actions/base.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="react" />
 import { MaybePromise } from '@teamix/utils';
+import { DialogAction } from './dialog';
 export interface BaseAction {
     /** 事件触发方式，默认是 onClick */
     trigger?: string;
@@ -18,7 +19,7 @@ export interface BaseAction {
     /** 事件开始执行完毕的回调函数 */
     onFinish?: (params?: any) => any;
 }
-export declare function eventHandler(action: BaseAction, actionContext: any, onTrigger: (context: any, e: React.MouseEvent<HTMLElement>) => void): {
+export declare function eventHandler(action: BaseAction & DialogAction, actionContext: any, onTrigger: (context: any, e: React.MouseEvent<HTMLElement>) => void): {
     [x: string]: (e: React.MouseEvent<HTMLElement>) => Promise<void>;
 };
 export default eventHandler;

package/lib/actions/base.js

@@ -20,7 +20,9 @@ function eventHandler(action, actionContext, onTrigger) {
       preventDefault = action.preventDefault,
       stopPropagation = action.stopPropagation,
       beforeAction = action.beforeAction;
-  return _defineProperty({}, "".concat(trigger), function () {
+  var openIdentifier = action.openIdentifier;
+
+  var baseProps = _defineProperty({}, "".concat(trigger), function () {
     var _2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(e) {
       var _action$onTrigger;
 
@@ -82,6 +84,14 @@ function eventHandler(action, actionContext, onTrigger) {
 
     return _;
   }());
+
+  if (openIdentifier) {
+    baseProps = Object.assign({}, baseProps, {
+      id: openIdentifier
+    });
+  }
+
+  return baseProps;
 }
 
 var _default = eventHandler;

package/lib/actions/dialog.d.ts

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

package/lib/actions/dialog.js

@@ -30,8 +30,10 @@ var _request = require("./request");
 
 var _utils2 = require("./utils");
 
+var _hooks = require("@teamix/hooks");
+
 var _excluded = ["trigger", "url", "customRequest", "method", "params", "data", "extendParams", "successMsg", "errorMsg", "formatParams", "formatResult", "onSuccess", "onError", "onOk", "onCancel"],
-    _excluded2 = ["title", "content", "component", "schema", "onFinish", "dialogType", "dialogQuickShowType", "messageType", "popType", "beforeRequest", "onTrigger", "link", "beforeContent", "afterContent", "message", "footerDescription", "footerAlign", "className"];
+    _excluded2 = ["title", "content", "component", "schema", "onFinish", "dialogType", "dialogQuickShowType", "messageType", "popType", "beforeRequest", "onTrigger", "link", "beforeContent", "afterContent", "message", "footerDescription", "footerAlign", "className", "openIdentifier"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -107,6 +109,11 @@ function useDialogAction(action, actionContext, hasForm) {
   var footerDescriptionRef = (0, _react.useRef)();
   var history = (0, _reactRouterDom.useHistory)();
 
+  var _useUrlState = (0, _hooks.useUrlState)(),
+      _useUrlState2 = _slicedToArray(_useUrlState, 2),
+      urlState = _useUrlState2[0],
+      setUrlState = _useUrlState2[1];
+
   var onActionStart = function onActionStart(context, e) {
     var _objectSpread2;
 
@@ -147,7 +154,18 @@ function useDialogAction(action, actionContext, hasForm) {
         footerDescription = _getTargetValue.footerDescription,
         footerAlign = _getTargetValue.footerAlign,
         className = _getTargetValue.className,
+        openIdentifier = _getTargetValue.openIdentifier,
         containerOtherProps = _objectWithoutProperties(_getTargetValue, _excluded2);
+    /**
+     *  判断是否含有 openIdentifierIdentifiy参数 ,更改对应 url
+     */
+
+
+    if (openIdentifier) {
+      setUrlState({
+        openIdentifier: openIdentifier
+      });
+    }
 
     var isDrawer = dialogType === 'drawer';
     var isPop = dialogType === 'pop';
@@ -256,7 +274,15 @@ function useDialogAction(action, actionContext, hasForm) {
     var dialogContent = Component ? /*#__PURE__*/_react.default.createElement(Component, _objectSpread({}, (0, _utils2.addContext)(componentProps, dialogContext))) : addContextForReactNode(content, dialogContext);
 
     var quickShowProps = _objectSpread(_objectSpread((_objectSpread2 = {}, _defineProperty(_objectSpread2, "".concat(isPop ? 'onConfirm' : 'onOk'), onOk), _defineProperty(_objectSpread2, "onCancel", function onCancel() {
+      setUrlState({
+        openIdentifier: undefined
+      });
       propsOnCancel && propsOnCancel(context);
+    }), _defineProperty(_objectSpread2, "onClose", function onClose() {
+      setUrlState({
+        openIdentifier: undefined
+      });
+      hide === null || hide === void 0 ? void 0 : hide();
     }), _defineProperty(_objectSpread2, "title", addContextForReactNode(title, dialogContext)), _defineProperty(_objectSpread2, "content", /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, beforeContent && /*#__PURE__*/_react.default.createElement("div", {
       className: "teamix-pro-dialog-before-content"
     }, addContextForReactNode(beforeContent, dialogContext)), message && /*#__PURE__*/_react.default.createElement("div", {

package/lib/actions/drawer.js

@@ -6,11 +6,19 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 exports.useDrawerAction = useDrawerAction;
 
+var _react = require("react");
+
 var _dialog = _interopRequireDefault(require("./dialog"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function useDrawerAction(action, context) {
+  (0, _react.useEffect)(function () {
+    var _action$openIdentifie, _action$openIdentifie2;
+
+    var dom = document.getElementById((_action$openIdentifie = (_action$openIdentifie2 = action.openIdentifier) === null || _action$openIdentifie2 === void 0 ? void 0 : _action$openIdentifie2.toString()) !== null && _action$openIdentifie !== void 0 ? _action$openIdentifie : '');
+    dom === null || dom === void 0 ? void 0 : dom.click();
+  }, []);
   return (0, _dialog.default)(Object.assign({
     dialogType: 'drawer'
   }, action), context);

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,12 @@ 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);
+  console.log(otherProps);
+  var autoTeamixLayout = (0, _useAutoLayout.default)(_objectSpread(_objectSpread({}, otherProps), {}, {
+    schema: schema
+  }), formRef);
+  console.log(autoTeamixLayout);
   (0, _react.useMemo)(function () {
     // 配置表单默认值
     if (initialValues) {
@@ -189,7 +171,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 +179,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.13";
+declare const version = "1.4.16";
 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.13';
+var version = '1.4.16';
 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,20 @@ 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()
-      });
+        addonAfter: renderAddonAfter(),
+        children: afterDataFilter ? /*#__PURE__*/_react.default.createElement("div", {
+          className: "mb8 ".concat(cls('after-data-filter-wrapper'))
+        }, afterDataFilter) : null
+      }));
     } else {
-      return /*#__PURE__*/_react.default.createElement(_form.QueryFilterLayout, {
-        addonAfter: renderAddonAfter()
-      });
+      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_form.QueryFilterLayout, {
+        addonAfter: renderAddonAfter(),
+        children: afterDataFilter ? /*#__PURE__*/_react.default.createElement("div", {
+          className: "mb8 ".concat(cls('after-data-filter-wrapper'))
+        }, afterDataFilter) : null
+      }));
     }
   }; // 区域组合渲染
 

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());
   });
 };