@teamix/pro 1.1.7 → 1.1.8

package/lib/form/SchemaForm/initializeFormStep.d.ts

@@ -1,3 +1,5 @@
 import type { IFormSchemaItem } from '../typing';
-declare const initialize: (item: IFormSchemaItem) => IFormSchemaItem;
+declare const initialize: (item: IFormSchemaItem & {
+    col?: number;
+}) => IFormSchemaItem;
 export default initialize;

package/lib/form/SchemaForm/initializeFormStep.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _excluded = ["props", "children", "title"],
-    _excluded2 = ["props", "children"];
+    _excluded2 = ["col", "style"];
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
@@ -17,6 +17,13 @@ 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; }
 
+var getWidth = function getWidth(col, length) {
+  var newCol = col !== null && col !== void 0 ? col : (length + 1) * 4;
+  newCol = newCol > 24 ? 24 : newCol;
+  var width = 100 / 24 * newCol;
+  return "".concat(width, "%");
+};
+
 var initializeStepPane = function initializeStepPane(item) {
   var _item$props = item.props,
       props = _item$props === void 0 ? {} : _item$props,
@@ -38,17 +45,24 @@ var initialize = function initialize(item) {
   var _item$props2 = item.props,
       props = _item$props2 === void 0 ? {} : _item$props2,
       _item$children2 = item.children,
-      children = _item$children2 === void 0 ? [] : _item$children2,
-      otherProps = _objectWithoutProperties(item, _excluded2);
+      children = _item$children2 === void 0 ? [] : _item$children2;
 
-  return _objectSpread({
+  var col = props.col,
+      style = props.style,
+      otherProps = _objectWithoutProperties(props, _excluded2);
+
+  var width = getWidth(col, children.length);
+  return _objectSpread(_objectSpread({}, item), {}, {
     props: _objectSpread({
-      labelPlacement: 'hoz'
-    }, props),
+      labelPlacement: 'hoz',
+      style: _objectSpread({
+        width: width
+      }, style)
+    }, otherProps),
     children: children.map(function (item) {
       return initializeStepPane(item);
     })
-  }, otherProps);
+  });
 };
 
 var _default = initialize;

package/lib/form/SchemaForm/initializeProField.js

@@ -51,6 +51,8 @@ var proFieldTypeMap = {
   ColorRadio: 'colorRadio',
   IconPicker: 'icon',
   JsonInput: 'json',
+  TagPicker: 'tagFilter',
+  Range: 'range',
   Search: 'search' // Upload: 'upload',
 
 };

package/lib/form/index.d.ts

@@ -14,7 +14,8 @@ export * as formilyTeamix from '@teamix/formily';
  */
 import { createForm, registerValidateRules as registerRules, registerValidateFormats as registerFormats, registerValidateLocale, setValidateLanguage } from '@formily/core';
 import { FormConsumer } from '@formily/react';
-export { createForm, FormConsumer, registerRules, registerFormats, registerValidateLocale, setValidateLanguage, };
+import { FormDialog, FormDrawer, FormStep, FormTab, FormCollapse } from '@teamix/formily';
+export { createForm, FormConsumer, FormDialog, FormDrawer, FormStep, FormTab, FormCollapse, registerRules, registerFormats, registerValidateLocale, setValidateLanguage, };
 /**
  * 导出 Filter 组件
  */

package/lib/form/index.js

@@ -15,6 +15,11 @@ var _exportNames = {
   FormConsumer: true,
   formilyReact: true,
   formilyReactive: true,
+  FormDialog: true,
+  FormDrawer: true,
+  FormStep: true,
+  FormTab: true,
+  FormCollapse: true,
   formilyTeamix: true,
   AdvancedFilter: true,
   SimpleFilter: true,
@@ -26,12 +31,42 @@ Object.defineProperty(exports, "AdvancedFilter", {
     return _Filter.AdvancedFilter;
   }
 });
+Object.defineProperty(exports, "FormCollapse", {
+  enumerable: true,
+  get: function get() {
+    return _formilyTeamix.FormCollapse;
+  }
+});
 Object.defineProperty(exports, "FormConsumer", {
   enumerable: true,
   get: function get() {
     return _formilyReact.FormConsumer;
   }
 });
+Object.defineProperty(exports, "FormDialog", {
+  enumerable: true,
+  get: function get() {
+    return _formilyTeamix.FormDialog;
+  }
+});
+Object.defineProperty(exports, "FormDrawer", {
+  enumerable: true,
+  get: function get() {
+    return _formilyTeamix.FormDrawer;
+  }
+});
+Object.defineProperty(exports, "FormStep", {
+  enumerable: true,
+  get: function get() {
+    return _formilyTeamix.FormStep;
+  }
+});
+Object.defineProperty(exports, "FormTab", {
+  enumerable: true,
+  get: function get() {
+    return _formilyTeamix.FormTab;
+  }
+});
 Object.defineProperty(exports, "QueryFilter", {
   enumerable: true,
   get: function get() {

package/lib/form/typing.d.ts

@@ -6,7 +6,7 @@ export interface anyObject {
     [propName: string]: any;
 }
 declare type FieldDisplayTypes = 'none' | 'hidden' | 'visible';
-export declare type IBaseComponent = 'Input' | 'Password' | 'TextArea' | 'NumberPicker' | 'Percent' | 'Money' | 'Select' | 'MultipleSelect' | 'TreeSelect' | 'Cascader' | 'MultipleCascader' | 'ArbitraryCascader' | 'Radio' | 'Checkbox' | 'Switch' | 'DatePicker' | 'TimePicker' | 'DateTimePicker' | 'WeekPicker' | 'MonthPicker' | 'YearPicker' | 'QuarterPicker' | 'DateRangePicker' | 'TimeRangePicker' | 'DateTimeRangePicker' | 'WeekRangePicker' | 'MonthRangePicker' | 'YearRangePicker' | 'QuarterRangePicker' | 'Transfer' | 'Upload' | 'ColorPicker' | 'ColorRadio' | 'IconPicker' | 'JsonInput';
+export declare type IBaseComponent = 'Input' | 'Password' | 'TextArea' | 'NumberPicker' | 'Percent' | 'Money' | 'Select' | 'MultipleSelect' | 'TreeSelect' | 'Cascader' | 'MultipleCascader' | 'ArbitraryCascader' | 'Radio' | 'Checkbox' | 'Switch' | 'DatePicker' | 'TimePicker' | 'DateTimePicker' | 'WeekPicker' | 'MonthPicker' | 'YearPicker' | 'QuarterPicker' | 'DateRangePicker' | 'TimeRangePicker' | 'DateTimeRangePicker' | 'WeekRangePicker' | 'MonthRangePicker' | 'YearRangePicker' | 'QuarterRangePicker' | 'Transfer' | 'Upload' | 'ColorPicker' | 'ColorRadio' | 'IconPicker' | 'JsonInput' | 'TagPicker' | 'Range' | 'Search';
 export declare type IButtonComponent = 'Submit' | 'Reset';
 export declare type IComboComponent = 'ArrayCards' | 'ArrayCards.Addition' | 'ArrayCards.Remove' | 'ArrayCards.MoveUp' | 'ArrayCards.MoveDown' | 'ArrayCards.Index' | 'ArrayCollapse' | 'ArrayCollapse.CollapsePanel' | 'ArrayCollapse.Addition' | 'ArrayCollapse.Remove' | 'ArrayCollapse.MoveUp' | 'ArrayCollapse.MoveDown' | 'ArrayCollapse.Index' | 'ArrayTable' | 'ArrayTable.Column' | 'ArrayTable.SortHandle' | 'ArrayTable.Addition' | 'ArrayTable.Remove' | 'ArrayTable.MoveDown' | 'ArrayTable.MoveUp' | 'ArrayTable.Index' | 'ArrayItems' | 'ArrayItems.Item' | 'ArrayItems.SortHandle' | 'ArrayItems.Addition' | 'ArrayItems.Remove' | 'ArrayItems.MoveDown' | 'ArrayItems.MoveUp' | 'ArrayItems.Index' | 'Editable' | 'Editable.Popover' | 'Editable.Dialog' | 'Editable.Drawer';
 export declare type ILayoutComponent = 'FormFlex' | 'FormGrid' | 'FormGroup' | 'FormGroup.GroupPanel' | 'Search' | 'Search.SearchPanel' | 'FormTab' | 'FormTab.TabPane' | 'FormStep' | 'FormStep.StepPane' | 'FormCollapse' | 'FormCollapse.CollapsePanel' | 'FormButtonGroup' | 'FormDialog' | 'FormDrawer' | 'FormDialog.Footer' | 'FormDrawer.Footer';

package/lib/index.d.ts

@@ -1,4 +1,4 @@
-import ProAction from './actions';
+import ProActions from './actions';
 import ProCard from './card';
 import ProField from './field';
 import ProForm from './form';
@@ -20,5 +20,5 @@ export * from './page-container';
 export * from './page-header';
 export * from './skeleton';
 export * from './table';
-declare const version = "1.1.6";
-export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, hooks, nocode, templates, utils, };
+declare const version = "1.1.7";
+export { version, ProActions, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, hooks, nocode, templates, utils, };

package/lib/index.js

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 var _exportNames = {
   version: true,
-  ProAction: true,
+  ProActions: true,
   ProCard: true,
   ProField: true,
   ProForm: true,
@@ -21,7 +21,7 @@ var _exportNames = {
   nocode: true,
   templates: true
 };
-Object.defineProperty(exports, "ProAction", {
+Object.defineProperty(exports, "ProActions", {
   enumerable: true,
   get: function get() {
     return _actions.default;
@@ -240,5 +240,5 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 // 设置图标源
 _icon.default.setConfig(_utils.default.getTeamixIconConfig());
 
-var version = '1.1.6';
+var version = '1.1.7';
 exports.version = version;

package/lib/nocode/index.scss

@@ -17,13 +17,10 @@
     border: 1px solid var(--color-line1-1, #eaeaea);
 
     &-component {
+      position: relative;
       padding: 20px;
       flex-grow: 1;
       border-right: 1px solid var(--color-line1-1, #eaeaea);
-
-      &>.teamix-pro-page-container {
-        padding: 0;
-      }
     }
 
     &-configurator {

package/lib/page-header/index.d.ts

@@ -1,5 +1,6 @@
 import React from 'react';
 import { IActionButton } from '../actions';
+import { ProInfoProps } from '../info';
 import './index.scss';
 export interface BreadcrumbItem {
     link?: string;
@@ -38,6 +39,7 @@ export declare type PageHeaderProps = {
     maxActions?: number;
     tags?: TagItem[];
     data?: DataItem[];
+    info?: ProInfoProps | React.ReactNode;
 } & React.HTMLAttributes<HTMLElement>;
 declare const PageHeader: React.FC<PageHeaderProps>;
 export default PageHeader;

package/lib/page-header/index.js

@@ -21,20 +21,22 @@ var _actions = require("../actions");
 
 var _skeleton = require("../skeleton");
 
+var _info = _interopRequireDefault(require("../info"));
+
 require("./index.scss");
 
-var _excluded = ["title", "description", "icon", "iconColor", "iconBackgroundType", "iconBackgroundColor", "maxActions", "goback", "operation", "extra", "image", "loading", "breadcrumb", "tags", "data", "children", "className", "style"];
+var _excluded = ["title", "description", "icon", "iconColor", "iconBackgroundType", "iconBackgroundColor", "maxActions", "goback", "operation", "extra", "image", "loading", "breadcrumb", "tags", "data", "info", "children", "className", "style"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
-
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 
 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; }
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
 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.baseClass)('teamix-pro-page-header');
@@ -158,6 +160,18 @@ var renderData = function renderData(data) {
   }));
 };
 
+var renderInfo = function renderInfo(info) {
+  // @ts-ignore
+  if (info === null || info === void 0 ? void 0 : info.columns) {
+    // @ts-ignore
+    return /*#__PURE__*/_react.default.createElement(_info.default, _objectSpread({
+      type: "header"
+    }, info));
+  }
+
+  return info;
+};
+
 var PageHeader = function PageHeader(props) {
   var title = props.title,
       description = props.description,
@@ -176,6 +190,7 @@ var PageHeader = function PageHeader(props) {
       breadcrumb = props.breadcrumb,
       tags = props.tags,
       data = props.data,
+      info = props.info,
       children = props.children,
       className = props.className,
       style = props.style,
@@ -245,7 +260,9 @@ var PageHeader = function PageHeader(props) {
     className: cls('data')
   }, renderData(data)), /*#__PURE__*/_react.default.createElement("section", {
     className: cls('operation')
-  }, !loading && renderOperations(operation, maxActions)))), children);
+  }, !loading && renderOperations(operation, maxActions)))), info && !loading && /*#__PURE__*/_react.default.createElement("section", {
+    className: (0, _classnames2.default)(cls('section'), cls('info'))
+  }, renderInfo(info)), children);
 };
 
 var _default = PageHeader;

package/lib/page-header/index.scss

@@ -20,6 +20,10 @@ $prefix: 'teamix-pro-page-header';
     }
   }
 
+  .#{$prefix}-info {
+    padding-top: var(--s-2, 8px);
+  }
+
   .#{$prefix}-title {
     display: flex;
     font-size: var(--font-size-display-1, 24px);

package/lib/table/components/ToolBar/FilterColumnIcon.js

@@ -43,8 +43,9 @@ 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 CheckboxItem = _components.Menu.CheckboxItem; // const { Tooltip } = Balloon;
-
+var CheckboxItem = _components.Menu.CheckboxItem;
+var Row = _components.Grid.Row,
+    Col = _components.Grid.Col;
 var cls = (0, _utils.baseClass)('teamix-pro-table-toolbar-filter-column');
 
 var processColumns = function processColumns(columns) {
@@ -144,6 +145,13 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
       return item;
     });
     notifyTableRender(keyNewColumns);
+  }; // 修改：dialog
+
+
+  var onChangeColumnsForDialog = function onChangeColumnsForDialog() {
+    var keyNewColumns = (0, _utils2.cloneDeep)(newColumns);
+    notifyTableRender(keyNewColumns);
+    setDropdownVisible(false);
   }; // 向上
 
 
@@ -283,20 +291,71 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
     })))));
   };
 
-  return renderDropdown(); // <Tooltip
-  //   trigger={renderDropdown()}
-  //   align={fullscreen ? 'b' : 't'}
-  //   popupProps={{
-  //     offset: fullscreen ? [5, 20] : [5, -18],
-  //     animation: { in: 'fadeIn', out: 'fadeOut' },
-  //     visible: tooltipVisible && !dropdownVisible,
-  //     onVisibleChange: (state) => {
-  //       setTooltipVisible(state);
-  //     },
-  //   }}
-  // >
-  //   {getMessage('customColumnSetting')}
-  // </Tooltip>
+  var renderDialog = function renderDialog() {
+    // 对话框关闭
+    var dialogOnClose = function dialogOnClose() {
+      setDropdownVisible(false);
+    };
+
+    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_components.Button, {
+      iconSize: "small",
+      className: "teamix-pro-table-toolbar-icon",
+      onClick: function onClick() {
+        setDropdownVisible(!dropdownVisible);
+      }
+    }, /*#__PURE__*/_react.default.createElement(_icon.default, {
+      size: "small",
+      type: "set-line"
+    })), /*#__PURE__*/_react.default.createElement(_components.Dialog, {
+      title: (0, _utils.getMessage)('customColumnSetting'),
+      visible: dropdownVisible,
+      onOk: onChangeColumnsForDialog,
+      onCancel: dialogOnClose,
+      onClose: dialogOnClose,
+      style: {
+        width: '440px'
+      }
+    }, /*#__PURE__*/_react.default.createElement(Row, {
+      gutter: 20,
+      wrap: true,
+      className: cls('row')
+    }, newColumns.map(function (item, index) {
+      var _newColumns$find2;
+
+      var dataIndex = item.dataIndex,
+          title = item.title,
+          columnFiltersDisabled = item.columnFiltersDisabled;
+      return /*#__PURE__*/_react.default.createElement(Col, {
+        span: 8,
+        key: index,
+        className: cls('col')
+      }, /*#__PURE__*/_react.default.createElement(_components.Checkbox, {
+        checked: (_newColumns$find2 = newColumns.find(function (_ref5) {
+          var key = _ref5.dataIndex;
+          return key === dataIndex;
+        })) === null || _newColumns$find2 === void 0 ? void 0 : _newColumns$find2.columnFilters,
+        onChange: function onChange(check) {
+          var columnsList = (0, _utils2.cloneDeep)(newColumns).map(function (item) {
+            if (item.dataIndex === dataIndex) {
+              item.columnFilters = check;
+            }
+
+            return item;
+          });
+          setNewColumns(columnsList);
+        },
+        disabled: columnFiltersDisabled
+      }, /*#__PURE__*/_react.default.createElement(_utils.Ellipsis, {
+        tooltip: false
+      }, title)));
+    }))));
+  };
+
+  if (newColumns.length > 10) {
+    return renderDialog();
+  }
+
+  return renderDropdown();
 };
 
 var _default = FilterColumnIcon;

package/lib/table/components/ToolBar/index.scss

@@ -66,8 +66,18 @@
       }
     }
   }
+
+  
+}
+.teamix-pro-table-toolbar-filter-column-col {
+  height: 28px;
+  .next-checkbox-wrapper {
+    display: flex;
+    align-items: center;
+  }
 }
 
+
 // fullscreen
 .teamix-pro-table-full-screen {
   width: 100vw;

package/lib/table/index.js

@@ -63,10 +63,7 @@ Object.keys(_typing).forEach(function (key) {
     }
   });
 });
-
-var _ahooks = require("ahooks");
-
-var _excluded = ["header", "className", "tableClassName", "mainAction", "quickAction", "dataFilter", "toolBar", "columns", "useRowSelection", "rowSelection", "onChangeRowSelection", "getRowSelection", "primaryKey", "footerAction", "url", "pageKey", "pageSizeKey", "method", "params", "formatSort", "formatParams", "formatResult", "requestWhenMount", "showPagination", "pageSizeList", "showSkeleton", "skeletonSize", "actionRef", "dataSource", "filterDebounce", "footerSuction"];
+var _excluded = ["header", "className", "tableClassName", "mainAction", "quickAction", "dataFilter", "toolBar", "columns", "useRowSelection", "rowSelection", "onChangeRowSelection", "getRowSelection", "primaryKey", "footerAction", "url", "pageKey", "pageSizeKey", "method", "params", "formatSort", "formatParams", "formatResult", "requestWhenMount", "showPagination", "pageSizeList", "showSkeleton", "skeletonSize", "actionRef", "dataSource", "filterDebounce", "footerSuction", "autoRefresh"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -106,6 +103,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 { useSize } from 'ahooks';
 var cls = (0, _utils.baseClass)('teamix-pro-table');
 var toJS = _form.formilyReactive.toJS;
 /**
@@ -181,6 +179,10 @@ var ProTable = function ProTable(props) {
       filterDebounce = _props$filterDebounce === void 0 ? 300 : _props$filterDebounce,
       _props$footerSuction = props.footerSuction,
       footerSuction = _props$footerSuction === void 0 ? false : _props$footerSuction,
+      _props$autoRefresh = props.autoRefresh,
+      autoRefresh = _props$autoRefresh === void 0 ? function () {
+    return false;
+  } : _props$autoRefresh,
       otherProps = _objectWithoutProperties(props, _excluded);
 
   var targetPageKey = pageKey || globalPageKey;
@@ -231,9 +233,16 @@ var ProTable = function ProTable(props) {
   var _useState15 = (0, _react.useState)('medium'),
       _useState16 = _slicedToArray(_useState15, 2),
       size = _useState16[0],
-      _setSize = _useState16[1]; // 获取header高度，用作全屏吸底吸顶高度计算
+      _setSize = _useState16[1];
+
+  var _useState17 = (0, _react.useState)(true),
+      _useState18 = _slicedToArray(_useState17, 2),
+      showLoading = _useState18[0],
+      setShowLoading = _useState18[1]; // 存储定时器 id
 
 
+  var autoRefreshTimerRef = (0, _react.useRef)(); // 获取header高度，用作全屏吸底吸顶高度计算
+
   var getHeaderHeight = function getHeaderHeight() {
     var _tableDom$getElements, _tableDom$getElements2;
 
@@ -253,30 +262,30 @@ var ProTable = function ProTable(props) {
   }; // header 区域高度。用作全屏计算吸顶吸底高度。默认不做计算
 
 
-  var _useState17 = (0, _react.useState)(0),
-      _useState18 = _slicedToArray(_useState17, 2),
-      headerHeight = _useState18[0],
-      setHeaderHeight = _useState18[1]; // 全屏显示 className
-
-
-  var _useState19 = (0, _react.useState)(false),
+  var _useState19 = (0, _react.useState)(0),
       _useState20 = _slicedToArray(_useState19, 2),
-      fullscreenState = _useState20[0],
-      setFullscreenState = _useState20[1]; // 父元素位置。用作非全屏模式下的吸底
+      headerHeight = _useState20[0],
+      setHeaderHeight = _useState20[1]; // 全屏显示 className
 
 
-  var _useState21 = (0, _react.useState)(),
+  var _useState21 = (0, _react.useState)(false),
       _useState22 = _slicedToArray(_useState21, 2),
-      parentPosition = _useState22[0],
-      setParentPosition = _useState22[1];
+      fullscreenState = _useState22[0],
+      setFullscreenState = _useState22[1]; // 父元素位置。用作非全屏模式下的吸底
+
+
+  var _useState23 = (0, _react.useState)(),
+      _useState24 = _slicedToArray(_useState23, 2),
+      parentPosition = _useState24[0],
+      setParentPosition = _useState24[1];
   /** 筛选区域 form */
 
 
   var dataFilterForm = (0, _react.useMemo)(function () {
     return (0, _form.createForm)();
   }, []); // 获取表格大小
-
-  var tableSize = (0, _ahooks.useSize)(tableRef); // 获取父元素位置
+  // const tableSize = useSize(tableRef);
+  // 获取父元素位置
 
   var getParentPosition = function getParentPosition() {
     // 暂时仅支持使用全家桶
@@ -290,12 +299,12 @@ var ProTable = function ProTable(props) {
       });
     }
   }; // 监听表格大小动态改变吸底footer大小
+  // useEffect(() => {
+  //   getParentPosition();
+  // }, [tableSize]);
+  // rowSelection 相关
 
 
-  (0, _react.useEffect)(function () {
-    getParentPosition();
-  }, [tableSize]); // rowSelection 相关
-
   var rowSelectionHook = (0, _useTableSelection.default)(_objectSpread(_objectSpread({}, propsRowSelection), {}, {
     onChange: onChangeRowSelection
   }), primaryKey);
@@ -407,6 +416,25 @@ var ProTable = function ProTable(props) {
 
   if (propsActionRef) {
     propsActionRef.current = actionRef.current;
+  }
+
+  function onFormatResult(next) {
+    var _next$data;
+
+    props.onFormatResult && props.onFormatResult(next);
+    var time = autoRefresh ? autoRefresh(next.data) : false;
+
+    if (Number.isInteger(time) && time >= 1000) {
+      autoRefreshTimerRef.current = setTimeout(function () {
+        // 自动刷新不显示 loading
+        _request({}, true);
+      }, Number(time));
+    } // 设置 dataSource、total
+
+
+    setData(next.data || []);
+    setTotal(next.total || ((_next$data = next.data) === null || _next$data === void 0 ? void 0 : _next$data.length));
+    setShowSkeleton(false);
   } // 请求表格数据工具函数
 
 
@@ -437,16 +465,6 @@ var ProTable = function ProTable(props) {
         }
       }
 
-      function onFormatResult(next) {
-        var _next$data;
-
-        props.onFormatResult && props.onFormatResult(next); // 设置 dataSource、total
-
-        setData(next.data || []);
-        setTotal(next.total || ((_next$data = next.data) === null || _next$data === void 0 ? void 0 : _next$data.length));
-        setShowSkeleton(false);
-      }
-
       if (nextData instanceof Promise) {
         nextData.then(function (res) {
           onFormatResult(res);
@@ -468,10 +486,12 @@ var ProTable = function ProTable(props) {
     }
   }); // 请求函数
 
-  function _request(params) {
+  function _request(params, noLoading) {
     var _actionRef$current, _actionRef$current$se, _objectSpread2;
 
-    // 请求前需要优先清空列过滤条件
+    var nextShowLoading = !noLoading;
+    nextShowLoading !== showLoading && setShowLoading(nextShowLoading); // 请求前需要优先清空列过滤条件
+
     (_actionRef$current = actionRef.current) === null || _actionRef$current === void 0 ? void 0 : (_actionRef$current$se = _actionRef$current.setFilterRules) === null || _actionRef$current$se === void 0 ? void 0 : _actionRef$current$se.call(_actionRef$current, {});
     var sortParams = targetFormatSort(sort); // 筛选区请求参数
 
@@ -480,7 +500,11 @@ var ProTable = function ProTable(props) {
     var requestData = formatParams(_objectSpread(_objectSpread({}, !showPagination ? _objectSpread(_objectSpread(_objectSpread({}, dataFilterParams), propsParams), sortParams) : _objectSpread(_objectSpread(_objectSpread((_objectSpread2 = {}, _defineProperty(_objectSpread2, targetPageKey, currentPage), _defineProperty(_objectSpread2, targetPageSizeKey, pageSize), _objectSpread2), dataFilterParams), propsParams), sortParams)), params));
 
     if (requestData) {
-      // console.log('requestData', requestData);
+      if (autoRefreshTimerRef.current) {
+        clearTimeout(autoRefreshTimerRef.current);
+        autoRefreshTimerRef.current = null;
+      }
+
       getData.run(requestData);
     }
   }
@@ -489,6 +513,12 @@ var ProTable = function ProTable(props) {
     if (requestWhenMount) {
       _request();
     }
+
+    return function () {
+      if (autoRefreshTimerRef.current) {
+        clearTimeout(autoRefreshTimerRef.current);
+      }
+    };
   }, []);
 
   function onSort(dataIndex, order) {
@@ -534,7 +564,7 @@ var ProTable = function ProTable(props) {
         hasBorder: false,
         dataSource: showSkeleton ? skeletonDataSource : data || props.dataSource,
         columns: (0, _genProColumnToColumn.default)(filteredColumns, showSkeleton, actionRef),
-        loading: !showSkeleton && (getData.loading || props.loading),
+        loading: showLoading && !showSkeleton && (getData.loading || props.loading),
         className: (0, _classnames.default)('teamix-pro-table', tableClassName, {
           'with-row-select': rowSelection
         }),

package/lib/table/typing.d.ts

@@ -103,8 +103,10 @@ export declare type ProTableProps = {
     skeletonSize?: number;
     /** 表格主题 className */
     tableClassName?: string;
-    /** 非全屏模式下是否吸底 默认状态下取用 ProPageContainer 作为参照物。如果传入了Dom，则取用Dom作为参照物 */
+    /** 非全屏模式下是否吸底 默认状态下取用 ProPageContainer 作为参照物。如果传入了 Dom，则取用 Dom 作为参照物 */
     footerSuction?: boolean | Element;
+    /** 当满足条件时开启自动刷新，返回值为自动刷新间隔时间，如果返回 0 或 false 则停止自动刷新，每次触发翻页、搜索都将重置时间 */
+    autoRefresh?: (dataSource: any[]) => number | boolean;
 } & Omit<TableProps, 'columns'> & ProTableTopAreaProps;
 export declare type rowSelectionType = {
     getProps?: (record: any, index: number) => any;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamix/pro",
-  "version": "1.1.7",
+  "version": "1.1.8",
   "description": "TeamixPro大包",
   "repository": "http://gitlab.alibaba-inc.com/teamix/pro",
   "author": "Velociraptor(迅猛龙)",