@teamix/pro 1.5.9 → 1.5.10-release.1

package/es/actions/dialog-form.js

@@ -17,7 +17,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; }
 import React, { useState, useEffect, createRef, useMemo } from 'react';
 // import { useHistory } from 'react-router-dom';
-import useRealHistory from '../utils/useRealHistory';
+import { useRealHistory } from '@teamix/utils';
 import { Loading } from '@alicloudfe/components';
 import ProForm, { createForm, formilyReactive } from '../form';
 import { getTargetValue, resolveMaybePromiseMethod } from '@teamix/utils';

package/es/actions/dialog.js

@@ -18,7 +18,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useState, useEffect, useMemo, useRef } from 'react';
 import classnames from 'classnames';
 // import { useHistory } from 'react-router-dom';
-import useRealHistory from '../utils/useRealHistory';
+import { useRealHistory } from '@teamix/utils';
 import { Dialog, Drawer } from '@alicloudfe/components';
 import PopConfirm from '@teamix/pop-confirm';
 import { getTargetValue, getMessage } from '@teamix/utils';

package/es/actions/link.js

@@ -3,7 +3,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; }
 import { getTargetValue, goToLink } from '@teamix/utils';
 // import { useHistory } from 'react-router-dom';
-import useRealHistory from '../utils/useRealHistory';
+import { useRealHistory } from '@teamix/utils';
 import { eventHandler } from './base';
 export function useLinkAction(action, actionContext) {
   var history = useRealHistory();

package/es/actions/request.js

@@ -13,7 +13,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 { useState } from 'react';
 // import { useHistory } from 'react-router-dom';
-import useRealHistory from '../utils/useRealHistory';
+import { useRealHistory } from '@teamix/utils';
 import { doCommonRequest } from '@teamix/utils';
 import { eventHandler } from './base';
 // action 里的数据请求都默认是 post 类型

package/es/form/Filter/index.js

@@ -222,6 +222,17 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
           };
         }();
       }
+      // 自定义updateDataSource
+      if (!formRef.current.updateDataSource) {
+        formRef.current.updateDataSource = function (query, params) {
+          [simpleForm, lightForm, advancedForm].forEach(function (f) {
+            var $query = f.query(query).take();
+            if ($query) {
+              $query.data.refresh = params;
+            }
+          });
+        };
+      }
     }
   };
   // 创建简单筛选表单实例

package/es/form/ProForm/useAutoSubmit.js

@@ -2,7 +2,7 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 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; }
 // import { useHistory } from 'react-router-dom';
-import useRealHistory from '../../utils/useRealHistory';
+import { useRealHistory } from '@teamix/utils';
 import { doCommonRequest, isObj } from '@teamix/utils';
 var useAutoSubmit = function useAutoSubmit(onSubmit, context) {
   if (isObj(onSubmit)) {

package/es/index.d.ts

@@ -28,5 +28,5 @@ export * from './table';
 export * from './sidebar';
 export * from './utils';
 export * from './timeline';
-declare const version = "1.5.9";
+declare const version = "1.5.10-release.1";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, TeamixIcon, hooks, nocode, templates, utils, };

package/es/index.js

@@ -35,7 +35,17 @@ export * from './table';
 export * from './sidebar';
 export * from './utils';
 export * from './timeline';
-var version = '1.5.9';
+var version = '1.5.10-release.1';
+// By TeamixTest
+window.postMessage({
+  source: 'teamix-test-devtools',
+  url: window.location.href,
+  event: 'getModuleInfo',
+  moduleName: '@teamix/pro',
+  moduleVersion: version,
+  moduleType: 'TeamixPro',
+  componentName: 'TeamixPro'
+}, '*');
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo,
 // ProLayout,
 ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, TeamixIcon, hooks, nocode, templates, utils };

package/es/page-header/index.js

@@ -8,7 +8,7 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import React from 'react';
 // import { useHistory } from 'react-router-dom';
-import useRealHistory from '../utils/useRealHistory';
+import { useRealHistory } from '@teamix/utils';
 import classnames from 'classnames';
 import TeamixIcon from '@teamix/icon';
 import { Breadcrumb, Balloon } from '@alicloudfe/components';
@@ -154,7 +154,7 @@ var ProPageHeader = function ProPageHeader(props) {
         return;
       }
       if (goback === true) {
-        history.go(-1);
+        history && history.go && history.go(-1);
         return;
       }
       goToLink(goback, history);

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

@@ -18,7 +18,7 @@ import { Button, Dropdown, Menu, Dialog, Grid, Checkbox } from '@alicloudfe/comp
 import TeamixIcon from '@teamix/icon';
 import { usePrefixCls, getMessage, getGlobalConfig } from '@teamix/utils';
 import React, { useState, useEffect } from 'react';
-import { cloneDeep, off, on } from '../../utils';
+import { off, on } from '../../utils';
 import { Ellipsis } from '../../../field';
 import './index.scss';
 var CheckboxItem = Menu.CheckboxItem;
@@ -80,9 +80,11 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
         var showDataIndex = stateFilterColumns.map(function (item) {
           return item.dataIndex;
         });
-        var stateColumns = cloneDeep(processColumns(columns)).map(function (item) {
+        var stateColumns = processColumns(columns).map(function (item) {
           if (!showDataIndex.includes(item.dataIndex)) {
-            item.columnFilters = false;
+            return _objectSpread(_objectSpread({}, item), {}, {
+              columnFilters: false
+            });
           }
           return item;
         });
@@ -103,11 +105,11 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
   // 全选
   var onChangeAllColumns = function onChangeAllColumns(check) {
     setAllVisible(check);
-    var keyNewColumns = cloneDeep(newColumns);
-    keyNewColumns.map(function (item) {
+    var keyNewColumns = newColumns.map(function (item) {
       var _item$columnFiltersDi;
-      item.columnFilters = (_item$columnFiltersDi = item.columnFiltersDisabled) !== null && _item$columnFiltersDi !== void 0 ? _item$columnFiltersDi : check;
-      return item;
+      return _objectSpread(_objectSpread({}, item), {}, {
+        columnFilters: (_item$columnFiltersDi = item.columnFiltersDisabled) !== null && _item$columnFiltersDi !== void 0 ? _item$columnFiltersDi : check
+      });
     });
     notifyTableRender(keyNewColumns);
   };
@@ -119,10 +121,12 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
   };
   // 修改
   var onChangeColumns = function onChangeColumns(check, dataIndex) {
-    var keyNewColumns = cloneDeep(newColumns);
-    keyNewColumns.map(function (item) {
+    var keyNewColumns = newColumns.map(function (item) {
       if (item.dataIndex === dataIndex) {
         item.columnFilters = check;
+        return _objectSpread(_objectSpread({}, item), {}, {
+          columnFilters: check
+        });
       }
       return item;
     });
@@ -130,26 +134,25 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
   };
   // 修改：dialog
   var onChangeColumnsForDialog = function onChangeColumnsForDialog() {
-    var keyNewColumns = cloneDeep(newColumns);
-    notifyTableRender(keyNewColumns);
+    notifyTableRender(newColumns);
     setDropdownVisible(false);
   };
   // 向上
   var moveUp = function moveUp(e, dataIndex) {
     var _newColumns$filter, _newColumns$filter2;
     e.stopPropagation();
-    var keyNewColumns = cloneDeep(newColumns).filter(function (_ref) {
+    var keyNewColumns = _toConsumableArray(newColumns).filter(function (_ref) {
       var lock = _ref.lock;
       return !lock;
     });
-    var headLock = cloneDeep((_newColumns$filter = newColumns.filter(function (_ref2) {
+    var headLock = (_newColumns$filter = newColumns.filter(function (_ref2) {
       var lock = _ref2.lock;
       return lock === true || lock === 'left';
-    })) !== null && _newColumns$filter !== void 0 ? _newColumns$filter : []);
-    var tailLock = cloneDeep((_newColumns$filter2 = newColumns.filter(function (_ref3) {
+    })) !== null && _newColumns$filter !== void 0 ? _newColumns$filter : [];
+    var tailLock = (_newColumns$filter2 = newColumns.filter(function (_ref3) {
       var lock = _ref3.lock;
       return lock === 'right';
-    })) !== null && _newColumns$filter2 !== void 0 ? _newColumns$filter2 : []);
+    })) !== null && _newColumns$filter2 !== void 0 ? _newColumns$filter2 : [];
     var index = keyNewColumns.findIndex(function (_ref4) {
       var index = _ref4.dataIndex;
       return index === dataIndex;
@@ -165,18 +168,18 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
   var moveDown = function moveDown(e, dataIndex) {
     var _newColumns$filter3, _newColumns$filter4;
     e.stopPropagation();
-    var keyNewColumns = cloneDeep(newColumns).filter(function (_ref5) {
+    var keyNewColumns = _toConsumableArray(newColumns).filter(function (_ref5) {
       var lock = _ref5.lock;
       return !lock;
     });
-    var headLock = cloneDeep((_newColumns$filter3 = newColumns.filter(function (_ref6) {
+    var headLock = (_newColumns$filter3 = newColumns.filter(function (_ref6) {
       var lock = _ref6.lock;
       return lock === true || lock === 'left';
-    })) !== null && _newColumns$filter3 !== void 0 ? _newColumns$filter3 : []);
-    var tailLock = cloneDeep((_newColumns$filter4 = newColumns.filter(function (_ref7) {
+    })) !== null && _newColumns$filter3 !== void 0 ? _newColumns$filter3 : [];
+    var tailLock = (_newColumns$filter4 = newColumns.filter(function (_ref7) {
       var lock = _ref7.lock;
       return lock === 'right';
-    })) !== null && _newColumns$filter4 !== void 0 ? _newColumns$filter4 : []);
+    })) !== null && _newColumns$filter4 !== void 0 ? _newColumns$filter4 : [];
     var index = keyNewColumns.findIndex(function (_ref8) {
       var index = _ref8.dataIndex;
       return index === dataIndex;
@@ -329,9 +332,11 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
           return key === dataIndex;
         })) === null || _newColumns$find2 === void 0 ? void 0 : _newColumns$find2.columnFilters,
         onChange: function onChange(check) {
-          var columnsList = cloneDeep(newColumns).map(function (item) {
+          var columnsList = newColumns.map(function (item) {
             if (item.dataIndex === dataIndex) {
-              item.columnFilters = check;
+              return _objectSpread(_objectSpread({}, item), {}, {
+                columnFilters: check
+              });
             }
             return item;
           });

package/es/table/index.js

@@ -1,13 +1,10 @@
-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"],
+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"],
   _excluded2 = ["onChange"];
 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); }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 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); }
@@ -16,11 +13,14 @@ 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; }
 import React, { useState, useEffect, useRef, useMemo } from 'react';
 import { Table, Checkbox } from '@alicloudfe/components';
 import Pagination from './components/Pagination';
 import genProColumnToColumn from './utils/genProColumnToColumn';
-import { getGlobalConfig, useRequest, request as utilResquest, getDeepValue, getMessage, pickProps, usePrefixCls, getTestRequestData, getTestRequestParams } from '@teamix/utils';
+import { getGlobalConfig, useRequest, request as utilResquest, getDeepValue, getMessage, pickProps, usePrefixCls, getTestRequestData, getTestRequestParams, getTargetValue } from '@teamix/utils';
 import { ProSkeletonRaw as Skeleton } from '../skeleton';
 import './index.scss';
 import Layout from './components/Layout';
@@ -29,13 +29,12 @@ import getTableProps from './utils/getTableProps';
 import getTableSortIcons from './utils/getTableSortIcons';
 import useTableSelection from './utils/useTableSelection';
 import FullScreen from './components/ToolBar/Fullscreen';
-import EmptyContent from './components/EmptyContent';
+import { EmptyContent } from '@teamix/pro-field';
 import { ProActionGroup } from '../actions';
 import classNames from 'classnames';
 import ProPageContainer from '../page-container';
 import debounce from 'lodash.debounce';
 import CardView from './components/CardView';
-import cloneDeep from 'lodash.clonedeep';
 export * from './typing';
 var cls = usePrefixCls('teamix-pro-table');
 /**
@@ -46,8 +45,8 @@ var cls = usePrefixCls('teamix-pro-table');
 var processColumns = function processColumns(columns, initialColumns) {
   var _getGlobalConfig;
   var globalFilterColumns = (_getGlobalConfig = getGlobalConfig('ProTable')) === null || _getGlobalConfig === void 0 ? void 0 : _getGlobalConfig.filterColumns;
-  var filterColumns = cloneDeep(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) {
@@ -157,6 +156,7 @@ var ProTable = function ProTable(props) {
     cardViewProps = props.cardViewProps,
     _props$defaultView = props.defaultView,
     defaultView = _props$defaultView === void 0 ? 'table' : _props$defaultView,
+    emptyProps = props.emptyProps,
     otherProps = _objectWithoutProperties(props, _excluded);
   var targetPageKey = pageKey || globalPageKey;
   var targetPageSizeKey = pageSizeKey || globalPageSizeKey;
@@ -673,6 +673,10 @@ var ProTable = function ProTable(props) {
             data: getDeepValue(formatResult.data, result) || [],
             total: isNaN(dataTotal) ? 0 : Number(dataTotal)
           };
+        } else if (typeof formatResult === 'string') {
+          nextData = getTargetValue(formatResult, {
+            res: result
+          });
         }
       }
       if (nextData instanceof Promise) {
@@ -725,7 +729,15 @@ var ProTable = function ProTable(props) {
     // 列过滤请求参数
     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 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 = getTargetValue(formatParams, {
+        params: preParams
+      });
+    } else {
+      requestData = formatParams(preParams);
+    }
     if (requestData) {
       if (autoRefreshTimerRef.current) {
         clearTimeout(autoRefreshTimerRef.current);
@@ -876,7 +888,7 @@ var ProTable = function ProTable(props) {
         sort: sort,
         primaryKey: primaryKey,
         rowSelection: rowSelection,
-        emptyContent: /*#__PURE__*/React.createElement(EmptyContent, null),
+        emptyContent: /*#__PURE__*/React.createElement(EmptyContent, _objectSpread({}, emptyProps)),
         sortIcons: getTableSortIcons(),
         fixedHeader: fullscreenState || fixedTableBody,
         maxBodyHeight: "calc(100vh - ".concat(headerHeight, "px)")

package/es/table/index.scss

@@ -89,6 +89,14 @@ $fullscreenPadding: 24px;
       color: var(--table-sort-color-current, #0064c8);
     }
   }
+  .next-table-empty {
+    padding: 0;
+  }
+  .next-table-wrap-empty {
+    .next-table-body tr td{
+      border-bottom: 0;
+    }
+  }
 }
 
 .teamix-pro-table-footer-suction {

package/es/table/typing.d.ts

@@ -2,7 +2,7 @@
  * ProTable 类型定义
  */
 import { ColumnProps, TableProps } from '@alicloudfe/components/types/table';
-import { ProFieldType, ProFieldRenderProps, ProFieldDataSourceItem } from '../field';
+import { ProFieldType, ProFieldRenderProps, ProFieldDataSourceItem, EmptyContentProps } from '../field';
 import { QueryFilterProps, ProFormType } from '../form';
 import { ProActionGroupProps, ProActionButtonProps } from '../actions';
 import { PaginationProps } from '@alicloudfe/components/types/pagination';
@@ -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;
     /** 是否第一次加载时就发起请求 */
@@ -158,6 +158,8 @@ export declare type ProTableProps = {
     cardViewProps?: ProTableCardProps;
     /** 默认展示维度 **/
     defaultView?: 'table' | 'card';
+    /** 空状态配置 **/
+    emptyProps?: EmptyContentProps;
 } & Omit<TableProps, 'columns'> & ProTableTopAreaProps;
 export declare type rowSelectionType = {
     getProps?: (record: any, index: number) => any;

package/es/timeline/ProTimeLineItem/index.js

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

package/lib/actions/dialog-form.js

@@ -6,10 +6,9 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 exports.useDialogFormAction = useDialogFormAction;
 var _react = _interopRequireWildcard(require("react"));
-var _useRealHistory = _interopRequireDefault(require("../utils/useRealHistory"));
+var _utils = require("@teamix/utils");
 var _components = require("@alicloudfe/components");
 var _form = _interopRequireWildcard(require("../form"));
-var _utils = require("@teamix/utils");
 var _request = require("./request");
 var _dialog = _interopRequireDefault(require("./dialog"));
 var _utils2 = require("./utils");
@@ -101,7 +100,7 @@ var DialogForm = function DialogForm(props) {
     _useState2 = _slicedToArray(_useState, 2),
     loading = _useState2[0],
     setLoading = _useState2[1];
-  var history = (0, _useRealHistory.default)();
+  var history = (0, _utils.useRealHistory)();
   (0, _react.useEffect)(function () {
     if (formRef) {
       formRef.current = form;

package/lib/actions/dialog.js

@@ -8,10 +8,9 @@ exports.default = void 0;
 exports.useDialogAction = useDialogAction;
 var _react = _interopRequireWildcard(require("react"));
 var _classnames = _interopRequireDefault(require("classnames"));
-var _useRealHistory = _interopRequireDefault(require("../utils/useRealHistory"));
+var _utils = require("@teamix/utils");
 var _components = require("@alicloudfe/components");
 var _popConfirm = _interopRequireDefault(require("@teamix/pop-confirm"));
-var _utils = require("@teamix/utils");
 var _form = _interopRequireWildcard(require("../form"));
 var _message = require("../utils/message");
 var _base = require("./base");
@@ -72,7 +71,7 @@ function useDialogAction(action, actionContext, hasForm) {
     loading = _useState2[0],
     setLoading = _useState2[1];
   var footerDescriptionRef = (0, _react.useRef)();
-  var history = (0, _useRealHistory.default)();
+  var history = (0, _utils.useRealHistory)();
   var onActionStart = function onActionStart(context, e) {
     var _objectSpread2;
     var trigger = action.trigger,

package/lib/actions/link.js

@@ -6,14 +6,12 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 exports.useLinkAction = useLinkAction;
 var _utils = require("@teamix/utils");
-var _useRealHistory = _interopRequireDefault(require("../utils/useRealHistory"));
 var _base = require("./base");
-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); 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 useLinkAction(action, actionContext) {
-  var history = (0, _useRealHistory.default)();
+  var history = (0, _utils.useRealHistory)();
   return _objectSpread({}, (0, _base.eventHandler)(action, actionContext, function (context) {
     var linkAction = (0, _utils.getTargetValue)(action, context);
     (0, _utils.goToLink)(linkAction, history);

package/lib/actions/request.js

@@ -7,12 +7,10 @@ exports.default = void 0;
 exports.doRequest = doRequest;
 exports.useRequestAction = useRequestAction;
 var _react = require("react");
-var _useRealHistory = _interopRequireDefault(require("../utils/useRealHistory"));
 var _utils = require("@teamix/utils");
 var _base = require("./base");
 var _excluded = ["method"],
   _excluded2 = ["onFinish"];
-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); }
@@ -38,7 +36,7 @@ function useRequestAction(action, actionContext) {
     _useState2 = _slicedToArray(_useState, 2),
     loading = _useState2[0],
     setLoading = _useState2[1];
-  var history = (0, _useRealHistory.default)();
+  var history = (0, _utils.useRealHistory)();
   var onFinish = action.onFinish,
     others = _objectWithoutProperties(action, _excluded2);
   return _objectSpread(_objectSpread({}, (0, _base.eventHandler)(action, actionContext, function (context) {

package/lib/form/Filter/index.js

@@ -237,6 +237,17 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
           };
         }();
       }
+      // 自定义updateDataSource
+      if (!formRef.current.updateDataSource) {
+        formRef.current.updateDataSource = function (query, params) {
+          [simpleForm, lightForm, advancedForm].forEach(function (f) {
+            var $query = f.query(query).take();
+            if ($query) {
+              $query.data.refresh = params;
+            }
+          });
+        };
+      }
     }
   };
   // 创建简单筛选表单实例

package/lib/form/ProForm/useAutoSubmit.js

@@ -4,15 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _useRealHistory = _interopRequireDefault(require("../../utils/useRealHistory"));
 var _utils = require("@teamix/utils");
-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); 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 useAutoSubmit = function useAutoSubmit(onSubmit, context) {
   if ((0, _utils.isObj)(onSubmit)) {
-    var history = (0, _useRealHistory.default)();
+    var history = (0, _utils.useRealHistory)();
     var submitConfig = onSubmit;
     return function (values) {
       return (0, _utils.doCommonRequest)(_objectSpread(_objectSpread({

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.5.9";
+declare const version = "1.5.10-release.1";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, TeamixIcon, hooks, nocode, templates, utils, };

package/lib/index.js

@@ -280,5 +280,15 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 if (!((_window = window) === null || _window === void 0 ? void 0 : _window.TEAMIXPRO_WITHOUT_ICON)) {
   _icon.default.setConfig(_utils.default.getTeamixIconConfig());
 }
-var version = '1.5.9';
-exports.version = version;
+var version = '1.5.10-release.1';
+// By TeamixTest
+exports.version = version;
+window.postMessage({
+  source: 'teamix-test-devtools',
+  url: window.location.href,
+  event: 'getModuleInfo',
+  moduleName: '@teamix/pro',
+  moduleVersion: version,
+  moduleType: 'TeamixPro',
+  componentName: 'TeamixPro'
+}, '*');

package/lib/page-header/index.js

@@ -5,11 +5,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
-var _useRealHistory = _interopRequireDefault(require("../utils/useRealHistory"));
+var _utils = require("@teamix/utils");
 var _classnames2 = _interopRequireDefault(require("classnames"));
 var _icon = _interopRequireDefault(require("@teamix/icon"));
 var _components = require("@alicloudfe/components");
-var _utils = require("@teamix/utils");
 var _field = require("../field");
 var _actions = require("../actions");
 var _skeleton = require("../skeleton");
@@ -138,7 +137,7 @@ var ProPageHeader = function ProPageHeader(props) {
     style = props.style,
     tabs = props.tabs,
     others = _objectWithoutProperties(props, _excluded3);
-  var history = (0, _useRealHistory.default)();
+  var history = (0, _utils.useRealHistory)();
   var backgroundImage = image ? "url('".concat(image, "')") : undefined;
   var showList = function showList(list) {
     var _list$actions;
@@ -160,7 +159,7 @@ var ProPageHeader = function ProPageHeader(props) {
         return;
       }
       if (goback === true) {
-        history.go(-1);
+        history && history.go && history.go(-1);
         return;
       }
       (0, _utils.goToLink)(goback, history);