@teamix/pro 1.5.11-beta.1 → 1.5.11

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

@@ -1,5 +1,6 @@
 "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
 });
@@ -7,43 +8,179 @@ exports.default = void 0;
 var _components = require("@alicloudfe/components");
 var _icon = _interopRequireDefault(require("@teamix/icon"));
 var _utils = require("@teamix/utils");
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
+var _utils2 = require("../../utils");
 require("./index.scss");
+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(); }
+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 cls = (0, _utils.usePrefixCls)('teamix-pro-table-toolbar-icon');
 var LayoutIcon = function LayoutIcon(props) {
-  var actionRef = props.actionRef;
-  // const [fullscreen, setFullscreen] = useState<boolean>(false);
-  // // 销毁监听函数
-  // useEffect(() => {
-  //   return () => {
-  //     actionRef.current?.off?.('refreshIcon');
-  //   };
-  // }, []);
-  // // 监听全屏变化
-  // actionRef.current?.on?.(
-  //   (state: boolean) => {
-  //     setFullscreen(state);
-  //   },
-  //   'fullScreenState',
-  //   'refreshIcon',
-  // );
+  var _autoRefreshProps$dat;
+  var actionRef = props.actionRef,
+    autoRefresh = props.autoRefresh,
+    autoRefreshProps = props.autoRefreshProps;
+  var autoRefreshRadio = (_autoRefreshProps$dat = autoRefreshProps === null || autoRefreshProps === void 0 ? void 0 : autoRefreshProps.dataSource) !== null && _autoRefreshProps$dat !== void 0 ? _autoRefreshProps$dat : [{
+    label: '每 1 分钟',
+    value: 60000
+  }, {
+    label: '每 3 分钟',
+    value: 180000
+  }, {
+    label: '每 5 分钟',
+    value: 300000
+  }];
+  // dropdown 开关
+  var _useState = (0, _react.useState)(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    dropdownVisible = _useState2[0],
+    setDropdownVisible = _useState2[1];
+  // 自动刷新状态
+  var _useState3 = (0, _react.useState)(!!autoRefresh),
+    _useState4 = _slicedToArray(_useState3, 2),
+    autoRefreshVisible = _useState4[0],
+    setAutoRefreshVisible = _useState4[1];
+  // 间隔时间 ms
+  var _useState5 = (0, _react.useState)(60000),
+    _useState6 = _slicedToArray(_useState5, 2),
+    times = _useState6[0],
+    setTimes = _useState6[1];
+  // 展示计时器时间 s
+  var _useState7 = (0, _react.useState)(60),
+    _useState8 = _slicedToArray(_useState7, 2),
+    remainTime = _useState8[0],
+    setRemainTime = _useState8[1];
+  // 循环计时器
+  var timerRef = (0, _react.useRef)({
+    timer: undefined,
+    remain: 60
+  });
+  (0, _react.useEffect)(function () {
+    (0, _utils2.on)(function (timer) {
+      setTimes(timer);
+      timerRef.current.remain = timer / 1000;
+      if (timerRef.current.timer) {
+        clearInterval(timerRef.current.timer);
+        timerRef.current.timer = undefined;
+      }
+      timerRef.current.timer = setInterval(function () {
+        var remainTime = timerRef.current.remain - 1;
+        if (remainTime >= 0) {
+          setRemainTime(remainTime);
+          timerRef.current.remain = remainTime;
+        }
+      }, 1000);
+    }, 'PRO_TABLE_REFRESH_TIMER_FLAG');
+  }, []);
+  // 下拉菜单显示隐藏回调
+  var onDropdownVisibleChange = function onDropdownVisibleChange(state) {
+    setDropdownVisible(state);
+  };
+  // 自动刷新开启关闭回调
+  var onAutoRefreshChange = function onAutoRefreshChange(visible) {
+    if (visible) {
+      var _actionRef$current, _actionRef$current$se;
+      (_actionRef$current = actionRef.current) === null || _actionRef$current === void 0 ? void 0 : (_actionRef$current$se = _actionRef$current.setAutoRefreshTimers) === null || _actionRef$current$se === void 0 ? void 0 : _actionRef$current$se.call(_actionRef$current, times);
+    } else {
+      var _actionRef$current2, _actionRef$current2$c;
+      (_actionRef$current2 = actionRef.current) === null || _actionRef$current2 === void 0 ? void 0 : (_actionRef$current2$c = _actionRef$current2.clearAutoRefreshTimers) === null || _actionRef$current2$c === void 0 ? void 0 : _actionRef$current2$c.call(_actionRef$current2);
+      if (timerRef.current.timer) {
+        clearInterval(timerRef.current.timer);
+        timerRef.current.timer = undefined;
+        timerRef.current.remain = times / 1000;
+        setRemainTime(times / 1000);
+      }
+    }
+    setAutoRefreshVisible(visible);
+  };
+  // 手动刷新回调
+  var onManualRefresh = function onManualRefresh() {
+    var _actionRef$current3, _actionRef$current3$r;
+    (_actionRef$current3 = actionRef.current) === null || _actionRef$current3 === void 0 ? void 0 : (_actionRef$current3$r = _actionRef$current3.refresh) === null || _actionRef$current3$r === void 0 ? void 0 : _actionRef$current3$r.call(_actionRef$current3);
+    onDropdownVisibleChange(false);
+  };
+  // 选择间隔时间回调
+  var onTimeRadioChange = function onTimeRadioChange(timer) {
+    var _actionRef$current4, _actionRef$current4$s;
+    setTimes(timer);
+    (_actionRef$current4 = actionRef.current) === null || _actionRef$current4 === void 0 ? void 0 : (_actionRef$current4$s = _actionRef$current4.setAutoRefreshTimers) === null || _actionRef$current4$s === void 0 ? void 0 : _actionRef$current4$s.call(_actionRef$current4, timer);
+  };
+  // 渲染刷新图标
+  var renderRefreshIcon = function renderRefreshIcon() {
+    if (!!autoRefresh && autoRefreshVisible && typeof autoRefresh !== 'function') {
+      return /*#__PURE__*/_react.default.createElement(_icon.default, {
+        size: "small",
+        type: "auto-refresh-on-line"
+      });
+    }
+    if (!!autoRefresh && !autoRefreshVisible && typeof autoRefresh !== 'function') {
+      return /*#__PURE__*/_react.default.createElement(_icon.default, {
+        size: "small",
+        type: "auto-refresh-off-line"
+      });
+    }
+    return /*#__PURE__*/_react.default.createElement(_icon.default, {
+      size: "small",
+      type: "refresh-line"
+    });
+  };
+  // 渲染 Radio
+  var renderRadio = autoRefreshRadio.map(function (item) {
+    return /*#__PURE__*/_react.default.createElement(_components.Menu.RadioItem, {
+      className: cls('time-radio'),
+      key: item.value,
+      disabled: !autoRefreshVisible,
+      checked: times === item.value,
+      onChange: function onChange() {
+        var _item$value;
+        return onTimeRadioChange((_item$value = item === null || item === void 0 ? void 0 : item.value) !== null && _item$value !== void 0 ? _item$value : 0);
+      }
+    }, item.label);
+  });
+  if (autoRefresh && typeof autoRefresh !== 'function') {
+    return /*#__PURE__*/_react.default.createElement(_components.Dropdown, {
+      trigger: /*#__PURE__*/_react.default.createElement(_components.Button, {
+        iconSize: "small",
+        className: cls()
+      }, renderRefreshIcon()),
+      visible: dropdownVisible,
+      onVisibleChange: onDropdownVisibleChange,
+      followTrigger: true,
+      cache: true,
+      triggerType: ['click'],
+      align: "tr br"
+    }, /*#__PURE__*/_react.default.createElement("div", {
+      className: cls()
+    }, /*#__PURE__*/_react.default.createElement(_components.Menu, {
+      className: cls('auto-refresh')
+    }, /*#__PURE__*/_react.default.createElement(_components.Menu.CheckboxItem, {
+      checked: autoRefreshVisible,
+      onChange: onAutoRefreshChange
+    }, (0, _utils.getMessage)('autoRefresh'), autoRefreshVisible && /*#__PURE__*/_react.default.createElement("span", null, "\uFF08", remainTime, "s\uFF09")), renderRadio, /*#__PURE__*/_react.default.createElement(_components.Menu.Divider, {
+      key: "divider"
+    }), /*#__PURE__*/_react.default.createElement("div", {
+      className: cls('manual-refresh')
+    }, /*#__PURE__*/_react.default.createElement(_components.Button, {
+      type: "primary",
+      text: true,
+      onClick: onManualRefresh
+    }, (0, _utils.getMessage)('manualRefresh'))))));
+  }
   return /*#__PURE__*/_react.default.createElement(_components.Balloon.Tooltip, {
     trigger: /*#__PURE__*/_react.default.createElement(_components.Button, {
       iconSize: "small",
       className: cls(),
       onClick: function onClick() {
-        var _actionRef$current, _actionRef$current$re;
-        return (_actionRef$current = actionRef.current) === null || _actionRef$current === void 0 ? void 0 : (_actionRef$current$re = _actionRef$current.refresh) === null || _actionRef$current$re === void 0 ? void 0 : _actionRef$current$re.call(_actionRef$current);
+        var _actionRef$current5, _actionRef$current5$r;
+        return (_actionRef$current5 = actionRef.current) === null || _actionRef$current5 === void 0 ? void 0 : (_actionRef$current5$r = _actionRef$current5.refresh) === null || _actionRef$current5$r === void 0 ? void 0 : _actionRef$current5$r.call(_actionRef$current5);
       }
-    }, /*#__PURE__*/_react.default.createElement(_icon.default, {
-      size: "small",
-      type: "refresh-line"
-    })),
+    }, renderRefreshIcon()),
     align: "t"
   }, (0, _utils.getMessage)('refresh'));
 };

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

@@ -158,3 +158,20 @@
     padding-right: 8px;
   }
 }
+
+// refresh
+.teamix-pro-table-toolbar-icon {
+  &-auto-refresh {
+    width: 145px;
+  }
+
+  &-manual-refresh {
+    text-align: center;
+    line-height: 1;
+    margin-bottom: 2px;
+  }
+
+  .teamix-pro-table-toolbar-icon-time-radio.teamix-pro-table-toolbar-icon-time-radio.teamix-pro-table-toolbar-icon-time-radio {
+    padding-left: 32px;
+  }
+}

package/lib/table/index.d.ts

@@ -1,6 +1,5 @@
-import React from 'react';
 import { ProTableProps } from './typing';
 import './index.scss';
 export * from './typing';
-declare const _default: React.MemoExoticComponent<(props: ProTableProps) => JSX.Element>;
-export default _default;
+declare const ProTable: (props: ProTableProps) => JSX.Element;
+export default ProTable;

package/lib/table/index.js

@@ -24,7 +24,6 @@ var _classnames = _interopRequireDefault(require("classnames"));
 var _pageContainer = _interopRequireDefault(require("../page-container"));
 var _lodash = _interopRequireDefault(require("lodash.debounce"));
 var _CardView = _interopRequireDefault(require("./components/CardView"));
-var _lodash2 = _interopRequireDefault(require("lodash.clonedeep"));
 var _typing = require("./typing");
 Object.keys(_typing).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -37,7 +36,7 @@ Object.keys(_typing).forEach(function (key) {
     }
   });
 });
-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", "requestConfig", "requestWhenMount", "showPagination", "pageSizeList", "responsivePaginationType", "showSkeleton", "skeletonSize", "actionRef", "dataSource", "filterDebounce", "footerSuction", "autoRefresh", "customRequest", "filterColumnType", "defaultFilterParams", "reserveSelectedRecords", "size", "disableSelectAll", "context", "fixedTableBody", "isTree", "toolBarAutoWidth", "data-teamix-spm", "switchCardView", "cardViewProps", "defaultView", "emptyProps"],
+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", "requestConfig", "requestWhenMount", "showPagination", "pageSizeList", "responsivePaginationType", "showSkeleton", "skeletonSize", "actionRef", "dataSource", "filterDebounce", "footerSuction", "autoRefresh", "autoRefreshProps", "customRequest", "filterColumnType", "defaultFilterParams", "reserveSelectedRecords", "size", "disableSelectAll", "context", "fixedTableBody", "isTree", "toolBarAutoWidth", "data-teamix-spm", "switchCardView", "cardViewProps", "defaultView", "emptyProps"],
   _excluded2 = ["onChange"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 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); }
@@ -47,9 +46,6 @@ function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableTo
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-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; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : 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; }
 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); }
@@ -58,6 +54,9 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 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); 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 = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : 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.usePrefixCls)('teamix-pro-table');
 /**
  * 处理原生传入的 columns 以便于 选择列 方便处理
@@ -67,8 +66,8 @@ var cls = (0, _utils.usePrefixCls)('teamix-pro-table');
 var processColumns = function processColumns(columns, initialColumns) {
   var _getGlobalConfig;
   var globalFilterColumns = (_getGlobalConfig = (0, _utils.getGlobalConfig)('ProTable')) === null || _getGlobalConfig === void 0 ? void 0 : _getGlobalConfig.filterColumns;
-  var filterColumns = (0, _lodash2.default)(columns).filter(function (item) {
-    return item.columnFilters !== false && (item === null || item === void 0 ? void 0 : item.hidden) !== true && (!globalFilterColumns || globalFilterColumns(item));
+  var filterColumns = columns.filter(function (item) {
+    return item.columnFilters !== false && (item === null || item === void 0 ? void 0 : item.hidden) !== true && (!globalFilterColumns || globalFilterColumns(_objectSpread({}, item)));
   });
   // 处理只剩一列批量选择的情况下宽度错乱问题
   if (filterColumns === null || filterColumns === void 0 ? void 0 : filterColumns.length) {
@@ -154,9 +153,8 @@ var ProTable = function ProTable(props) {
     _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,
+    autoRefresh = _props$autoRefresh === void 0 ? false : _props$autoRefresh,
+    autoRefreshProps = props.autoRefreshProps,
     customRequest = props.customRequest,
     _props$filterColumnTy = props.filterColumnType,
     filterColumnType = _props$filterColumnTy === void 0 ? 'auto' : _props$filterColumnTy,
@@ -642,6 +640,19 @@ var ProTable = function ProTable(props) {
         }
       }
       getHeaderHeight(fullscreenState);
+    },
+    setAutoRefreshTimers: function setAutoRefreshTimers(timers) {
+      clearTimeout(autoRefreshTimerRef.current);
+      autoRefreshTimerRef.current = null;
+      autoRefreshTimerRef.current = setTimeout(function () {
+        var _actionRef$current5, _actionRef$current5$r;
+        (_actionRef$current5 = actionRef.current) === null || _actionRef$current5 === void 0 ? void 0 : (_actionRef$current5$r = _actionRef$current5.refresh) === null || _actionRef$current5$r === void 0 ? void 0 : _actionRef$current5$r.call(_actionRef$current5);
+      }, timers);
+      (0, _utils2.emit)('PRO_TABLE_REFRESH_TIMER_FLAG', timers);
+    },
+    clearAutoRefreshTimers: function clearAutoRefreshTimers() {
+      clearTimeout(autoRefreshTimerRef.current);
+      autoRefreshTimerRef.current = null;
     }
   });
   // 将 Actions 绑定到传入的 propsActionRef 中
@@ -650,12 +661,19 @@ var ProTable = function ProTable(props) {
   }
   function onFormatResult(next) {
     props.onFormatResult && props.onFormatResult(next);
-    var time = autoRefresh ? autoRefresh(next.data) : false;
+    var time = 0;
+    if (autoRefresh) {
+      time = 60 * 1000;
+    }
+    if (autoRefresh && typeof autoRefresh !== 'boolean') {
+      time = autoRefresh ? autoRefresh(next.data) : 0;
+    }
     if (Number.isInteger(time) && time >= 1000) {
       autoRefreshTimerRef.current = setTimeout(function () {
         // 自动刷新不显示 loading
         _request({}, true);
       }, Number(time));
+      (0, _utils2.emit)('PRO_TABLE_REFRESH_TIMER_FLAG', Number(time));
     }
     // 设置 dataSource、total
     if (switchViewState === 'table' || currentPage === 1) {
@@ -695,6 +713,10 @@ var ProTable = function ProTable(props) {
             data: (0, _utils.getDeepValue)(formatResult.data, result) || [],
             total: isNaN(dataTotal) ? 0 : Number(dataTotal)
           };
+        } else if (typeof formatResult === 'string') {
+          nextData = (0, _utils.getTargetValue)(formatResult, {
+            res: result
+          });
         }
       }
       if (nextData instanceof Promise) {
@@ -732,7 +754,7 @@ var ProTable = function ProTable(props) {
   });
   // 请求函数
   function _request(params, noLoading, filterParams) {
-    var _dataFilterFormRef$cu2, _actionRef$current$ge, _actionRef$current5, _actionRef$current5$g, _objectSpread3;
+    var _dataFilterFormRef$cu2, _actionRef$current$ge, _actionRef$current6, _actionRef$current6$g, _objectSpread3;
     // 如果没有传 url 且没有 customRequest，直接返回
     if (!url && !customRequest) {
       return;
@@ -745,9 +767,17 @@ var ProTable = function ProTable(props) {
     // 筛选区请求参数
     var dataFilterParams = filterParams !== null && filterParams !== void 0 ? filterParams : (_dataFilterFormRef$cu2 = dataFilterFormRef.current) === null || _dataFilterFormRef$cu2 === void 0 ? void 0 : _dataFilterFormRef$cu2.values;
     // 列过滤请求参数
-    var columnsFilterParams = (_actionRef$current$ge = (_actionRef$current5 = actionRef.current) === null || _actionRef$current5 === void 0 ? void 0 : (_actionRef$current5$g = _actionRef$current5.getFilterRules) === null || _actionRef$current5$g === void 0 ? void 0 : _actionRef$current5$g.call(_actionRef$current5)) !== null && _actionRef$current$ge !== void 0 ? _actionRef$current$ge : {};
+    var columnsFilterParams = (_actionRef$current$ge = (_actionRef$current6 = actionRef.current) === null || _actionRef$current6 === void 0 ? void 0 : (_actionRef$current6$g = _actionRef$current6.getFilterRules) === null || _actionRef$current6$g === void 0 ? void 0 : _actionRef$current6$g.call(_actionRef$current6)) !== null && _actionRef$current$ge !== void 0 ? _actionRef$current$ge : {};
     // 格式化后的请求参数
-    var requestData = formatParams(_objectSpread(_objectSpread({}, !showPagination ? _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, dataFilterParams), propsParams), sortParams), columnsFilterParams) : _objectSpread(_objectSpread(_objectSpread(_objectSpread((_objectSpread3 = {}, _defineProperty(_objectSpread3, targetPageKey, currentPage), _defineProperty(_objectSpread3, targetPageSizeKey, pageSize), _objectSpread3), dataFilterParams), propsParams), sortParams), columnsFilterParams)), params));
+    var requestData = {};
+    var preParams = _objectSpread(_objectSpread({}, !showPagination ? _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, dataFilterParams), propsParams), sortParams), columnsFilterParams) : _objectSpread(_objectSpread(_objectSpread(_objectSpread((_objectSpread3 = {}, _defineProperty(_objectSpread3, targetPageKey, currentPage), _defineProperty(_objectSpread3, targetPageSizeKey, pageSize), _objectSpread3), dataFilterParams), propsParams), sortParams), columnsFilterParams)), params);
+    if (typeof formatParams === 'string') {
+      requestData = (0, _utils.getTargetValue)(formatParams, {
+        params: preParams
+      });
+    } else {
+      requestData = formatParams(preParams);
+    }
     if (requestData) {
       if (autoRefreshTimerRef.current) {
         clearTimeout(autoRefreshTimerRef.current);
@@ -795,12 +825,19 @@ var ProTable = function ProTable(props) {
             getHeaderHeight(fullscreenState);
           }
           // customRequest 中支持 autoRefresh
-          var time = autoRefresh ? autoRefresh(data) : false;
+          var time = 0;
+          if (autoRefresh) {
+            time = 60 * 1000;
+          }
+          if (autoRefresh && typeof autoRefresh !== 'boolean') {
+            time = autoRefresh ? autoRefresh(data) : 0;
+          }
           if (Number.isInteger(time) && time >= 1000) {
             autoRefreshTimerRef.current = setTimeout(function () {
               // 自动刷新不显示 loading
-              _request(requestData, true);
+              _request({}, true);
             }, Number(time));
+            (0, _utils2.emit)('PRO_TABLE_REFRESH_TIMER_FLAG', Number(time));
           }
         });
       } else {
@@ -826,7 +863,7 @@ var ProTable = function ProTable(props) {
       return true;
     } : undefined,
     onFilter: function onFilter(values) {
-      var _actionRef$current6, _actionRef$current6$c;
+      var _actionRef$current7, _actionRef$current7$c;
       // 全屏状态，判断全屏表单onFilter是否禁用
       if (fullscreenState && !filterEnableRef.current.fullscreen) {
         filterEnableRef.current.fullscreen = true;
@@ -839,7 +876,7 @@ var ProTable = function ProTable(props) {
       }
       (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onFilter) && (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onFilter(values));
       // 搜索变化时，暂时先清空选择
-      (_actionRef$current6 = actionRef.current) === null || _actionRef$current6 === void 0 ? void 0 : (_actionRef$current6$c = _actionRef$current6.clearRowSelection) === null || _actionRef$current6$c === void 0 ? void 0 : _actionRef$current6$c.call(_actionRef$current6);
+      (_actionRef$current7 = actionRef.current) === null || _actionRef$current7 === void 0 ? void 0 : (_actionRef$current7$c = _actionRef$current7.clearRowSelection) === null || _actionRef$current7$c === void 0 ? void 0 : _actionRef$current7$c.call(_actionRef$current7);
       setCurrentPage(1);
       _request(_defineProperty({}, targetPageKey, 1), false, values);
     },
@@ -882,7 +919,9 @@ var ProTable = function ProTable(props) {
         toolBarAutoWidth: toolBarAutoWidth,
         dataTeamixSpm: dataTeamixSpm,
         switchCardView: switchCardView,
-        defaultView: defaultView
+        defaultView: defaultView,
+        autoRefresh: autoRefresh,
+        autoRefreshProps: autoRefreshProps
       }), switchViewState === 'table' && /*#__PURE__*/_react.default.createElement(_components.Table.StickyLock, _objectSpread({
         hasBorder: false,
         dataSource: showSkeleton ? skeletonDataSource : data || props.dataSource,
@@ -950,8 +989,8 @@ var ProTable = function ProTable(props) {
       var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       // 翻页默认清空选择
       if (!reserveSelectedRecords) {
-        var _actionRef$current7, _actionRef$current7$c;
-        (_actionRef$current7 = actionRef.current) === null || _actionRef$current7 === void 0 ? void 0 : (_actionRef$current7$c = _actionRef$current7.clearRowSelection) === null || _actionRef$current7$c === void 0 ? void 0 : _actionRef$current7$c.call(_actionRef$current7);
+        var _actionRef$current8, _actionRef$current8$c;
+        (_actionRef$current8 = actionRef.current) === null || _actionRef$current8 === void 0 ? void 0 : (_actionRef$current8$c = _actionRef$current8.clearRowSelection) === null || _actionRef$current8$c === void 0 ? void 0 : _actionRef$current8$c.call(_actionRef$current8);
       }
       setCurrentPage(currentPage);
       _request(_objectSpread(_defineProperty({}, targetPageKey, currentPage), params));
@@ -960,8 +999,8 @@ var ProTable = function ProTable(props) {
       var _request8;
       // 翻页默认清空选择
       if (!reserveSelectedRecords) {
-        var _actionRef$current8, _actionRef$current8$c;
-        (_actionRef$current8 = actionRef.current) === null || _actionRef$current8 === void 0 ? void 0 : (_actionRef$current8$c = _actionRef$current8.clearRowSelection) === null || _actionRef$current8$c === void 0 ? void 0 : _actionRef$current8$c.call(_actionRef$current8);
+        var _actionRef$current9, _actionRef$current9$c;
+        (_actionRef$current9 = actionRef.current) === null || _actionRef$current9 === void 0 ? void 0 : (_actionRef$current9$c = _actionRef$current9.clearRowSelection) === null || _actionRef$current9$c === void 0 ? void 0 : _actionRef$current9$c.call(_actionRef$current9);
       }
       setPageSize(currentPageSize);
       setCurrentPage(1);
@@ -1069,5 +1108,5 @@ var ProTable = function ProTable(props) {
     }, renderTable(isFullScreen), fixFooterState && /*#__PURE__*/_react.default.createElement(_pageContainer.default.FixedFooter, null, renderFooter()), !fixFooterState && renderFooter());
   });
 };
-var _default = /*#__PURE__*/_react.default.memo(ProTable);
+var _default = ProTable;
 exports.default = _default;

package/lib/table/typing.d.ts

@@ -78,9 +78,9 @@ export declare type ProTableProps = {
     /** sort 排序请求参数处理函数 */
     formatSort?: (sort: object) => object;
     /** 如需自定义调用参数格式，则可以设定此值在请求前对 params 进行自定义，如果返回false则可以阻止请求 */
-    formatParams?: (params: any) => typeof params;
+    formatParams?: ((params: any) => typeof params) | string;
     /** 对返回值的 data，total 进行映射处理  */
-    formatResult?: TDataService | ((res: any) => TDataService);
+    formatResult?: TDataService | ((res: any) => TDataService) | string;
     /** 请求成功后经过 formatResult 转换后的回调 */
     onFormatResult?: (data: any[]) => void;
     /** 是否第一次加载时就发起请求 */
@@ -131,7 +131,15 @@ export declare type ProTableProps = {
     /** 非全屏模式下是否吸底 默认状态下取用 ProPageContainer 作为参照物。如果传入了 Dom，则取用 Dom 作为参照物 */
     footerSuction?: boolean | Element;
     /** 当满足条件时开启自动刷新，返回值为自动刷新间隔时间，如果返回 0 或 false 则停止自动刷新，每次触发翻页、搜索都将重置时间 */
-    autoRefresh?: (dataSource: any[]) => number | boolean;
+    autoRefresh?: ((dataSource: any[]) => number | boolean) | boolean;
+    /** 自动刷新配置 */
+    autoRefreshProps?: {
+        /** 可选间隔列表 **/
+        dataSource?: {
+            label?: React.ReactNode;
+            value?: number;
+        }[];
+    };
     /** 自定义请求方法，必需返回 success，data 字段，如果需要手动分页 total 也是必需的 */
     customRequest?: (params: any) => Promise<{
         success: boolean;
@@ -231,6 +239,10 @@ export declare type ProTableActionType = {
     /** 设置数据源 **/
     setData?: (data: any[]) => void;
     setCardViewScrollPosition?: (scrollTop: number) => void;
+    /** 刷新定时器间隔时间 */
+    setAutoRefreshTimers?: (timers: number) => void;
+    /** 清除刷新定时器 */
+    clearAutoRefreshTimers?: () => void;
 } & ProTableActionTypeMutations;
 /** action State 定义 */
 export declare type ProTableActionTypeMutations = {
@@ -301,6 +313,8 @@ export declare type ProTableLayoutProps = {
     dataTeamixSpm?: string;
     switchCardView?: boolean;
     defaultView?: 'table' | 'card';
+    autoRefresh?: ProTableProps['autoRefresh'];
+    autoRefreshProps?: ProTableProps['autoRefreshProps'];
 } & ProTableTopAreaProps;
 /** columns 列过滤 */
 export declare type ProTableColumnsFilterItemProps = {

package/lib/timeline/ProTimeLineItem/index.js

@@ -68,7 +68,7 @@ var ProTimeLineItem = function ProTimeLineItem(props) {
   };
   /** 对枚举参数进行处理 */
   var formatTime = function formatTime(time) {
-    if (typeof time === 'string') return (0, _utils.dateFormat)(time, '', 'YYYY-MM-DD hh:mm:ss');
+    if (typeof time === 'string') return (0, _utils.dateFormat)(time, '', 'YYYY-MM-DD HH:mm:ss');
     return time;
   };
   var formatShape = function formatShape() {

package/package.json

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