@teamix/pro 1.5.8 → 1.5.10

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.8";
+declare const version = "1.5.10";
 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.8';
+var version = '1.5.10';
+// 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/index.js

@@ -1,4 +1,4 @@
-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(); }
@@ -29,12 +29,13 @@ 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');
 /**
@@ -45,7 +46,7 @@ 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 = columns.filter(function (item) {
+  var filterColumns = cloneDeep(columns).filter(function (item) {
     return item.columnFilters !== false && (item === null || item === void 0 ? void 0 : item.hidden) !== true && (!globalFilterColumns || globalFilterColumns(item));
   });
   // 处理只剩一列批量选择的情况下宽度错乱问题
@@ -156,6 +157,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;
@@ -875,7 +877,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';
@@ -58,9 +58,11 @@ export declare type ProTableColumnProps = {
     dataIndex?: string | string[];
     /** 指定 valueType 为日期时间格式时，可以格式化日期时间 */
     format?: string;
+    /** 多级表头 **/
+    children?: ProTableColumnProps[];
     /** ProField 其他配置项 */
     props?: any;
-} & Omit<ColumnProps, 'filters' | 'dataIndex' | 'filtersMode'>;
+} & Omit<ColumnProps, 'filters' | 'dataIndex' | 'filtersMode' | 'children'>;
 export declare type ProColumnProps = ProTableColumnProps;
 export declare type ProTableProps = {
     /** ProColums 定义，取代 Table 的 columns */
@@ -156,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/table/utils/genProColumnToColumn.js

@@ -1,4 +1,4 @@
-var _excluded = ["filters", "dataIndex"];
+var _excluded = ["filters", "dataIndex", "children"];
 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; }
@@ -20,6 +20,7 @@ showSkeleton, actionRef) {
   return columns.map(function (columnProps) {
     var filters = columnProps.filters,
       dataIndex = columnProps.dataIndex,
+      children = columnProps.children,
       others = _objectWithoutProperties(columnProps, _excluded);
     if (showSkeleton) {
       return _objectSpread(_objectSpread({}, others), {}, {
@@ -37,6 +38,7 @@ showSkeleton, actionRef) {
       align: columnProps.valueType === 'money' ? 'right' : 'left',
       wordBreak: getLanguage() === 'en-us' ? 'word' : 'all'
     }, others), {}, {
+      children: children ? genProColumnToColumn(children, showSkeleton, actionRef, context) : undefined,
       dataIndex: dataIndex === null || dataIndex === void 0 ? void 0 : dataIndex.toString(),
       title: renderColumnsTitle(columnProps, actionRef),
       cell: function cell(value, index, record) {

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.8";
+declare const version = "1.5.10";
 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.8';
-exports.version = version;
+var version = '1.5.10';
+// 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);

package/lib/table/index.js

@@ -18,12 +18,13 @@ var _getTableProps = _interopRequireDefault(require("./utils/getTableProps"));
 var _getTableSortIcons = _interopRequireDefault(require("./utils/getTableSortIcons"));
 var _useTableSelection = _interopRequireDefault(require("./utils/useTableSelection"));
 var _Fullscreen = _interopRequireDefault(require("./components/ToolBar/Fullscreen"));
-var _EmptyContent = _interopRequireDefault(require("./components/EmptyContent"));
+var _proField = require("@teamix/pro-field");
 var _actions = require("../actions");
 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;
@@ -36,7 +37,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"],
+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 _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); }
@@ -66,7 +67,7 @@ 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 = columns.filter(function (item) {
+  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));
   });
   // 处理只剩一列批量选择的情况下宽度错乱问题
@@ -177,6 +178,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;
@@ -896,7 +898,7 @@ var ProTable = function ProTable(props) {
         sort: sort,
         primaryKey: primaryKey,
         rowSelection: rowSelection,
-        emptyContent: /*#__PURE__*/_react.default.createElement(_EmptyContent.default, null),
+        emptyContent: /*#__PURE__*/_react.default.createElement(_proField.EmptyContent, _objectSpread({}, emptyProps)),
         sortIcons: (0, _getTableSortIcons.default)(),
         fixedHeader: fullscreenState || fixedTableBody,
         maxBodyHeight: "calc(100vh - ".concat(headerHeight, "px)")

package/lib/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/lib/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';
@@ -58,9 +58,11 @@ export declare type ProTableColumnProps = {
     dataIndex?: string | string[];
     /** 指定 valueType 为日期时间格式时，可以格式化日期时间 */
     format?: string;
+    /** 多级表头 **/
+    children?: ProTableColumnProps[];
     /** ProField 其他配置项 */
     props?: any;
-} & Omit<ColumnProps, 'filters' | 'dataIndex' | 'filtersMode'>;
+} & Omit<ColumnProps, 'filters' | 'dataIndex' | 'filtersMode' | 'children'>;
 export declare type ProColumnProps = ProTableColumnProps;
 export declare type ProTableProps = {
     /** ProColums 定义，取代 Table 的 columns */
@@ -156,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/lib/table/utils/genProColumnToColumn.js

@@ -8,7 +8,7 @@ var _react = _interopRequireDefault(require("react"));
 var _columnRender = require("./columnRender");
 var _skeleton = require("../../skeleton");
 var _utils = require("@teamix/utils");
-var _excluded = ["filters", "dataIndex"];
+var _excluded = ["filters", "dataIndex", "children"];
 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; }
@@ -27,6 +27,7 @@ showSkeleton, actionRef) {
   return columns.map(function (columnProps) {
     var filters = columnProps.filters,
       dataIndex = columnProps.dataIndex,
+      children = columnProps.children,
       others = _objectWithoutProperties(columnProps, _excluded);
     if (showSkeleton) {
       return _objectSpread(_objectSpread({}, others), {}, {
@@ -44,6 +45,7 @@ showSkeleton, actionRef) {
       align: columnProps.valueType === 'money' ? 'right' : 'left',
       wordBreak: (0, _utils.getLanguage)() === 'en-us' ? 'word' : 'all'
     }, others), {}, {
+      children: children ? genProColumnToColumn(children, showSkeleton, actionRef, context) : undefined,
       dataIndex: dataIndex === null || dataIndex === void 0 ? void 0 : dataIndex.toString(),
       title: (0, _columnRender.renderColumnsTitle)(columnProps, actionRef),
       cell: function cell(value, index, record) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamix/pro",
-  "version": "1.5.8",
+  "version": "1.5.10",
   "description": "TeamixPro大包",
   "keywords": [
     "aliyun",
@@ -49,7 +49,6 @@
     "lodash.clonedeep": "^4.5.0",
     "lodash.debounce": "^4.0.8",
     "lodash.isempty": "^4.4.0",
-    "path-browserify": "^1.0.1",
     "react-helmet": "^6.1.0"
   },
   "devDependencies": {

package/es/utils/useRealHistory.d.ts

@@ -1,8 +0,0 @@
-declare global {
-    interface Window {
-        HistoryLibrary: any;
-        ICESTARK: any;
-    }
-}
-declare const useRealHistory: () => any;
-export default useRealHistory;

package/es/utils/useRealHistory.js

@@ -1,40 +0,0 @@
-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; }
-// 兼容 react-router-dom v5&v6，拿到真正的 history
-import { useEffect, useState } from 'react';
-// import path from 'path';
-import { useHistory } from 'react-router-dom';
-var path = require('path-browserify');
-var useRealHistory = function useRealHistory() {
-  var history;
-  if (useHistory) {
-    history = useHistory();
-  }
-  var _useState = useState(history),
-    _useState2 = _slicedToArray(_useState, 2),
-    realHistory = _useState2[0],
-    setRealHistory = _useState2[1];
-  useEffect(function () {
-    if (window.HistoryLibrary) {
-      history = window.HistoryLibrary.createBrowserHistory();
-      var oldPush = history.push;
-      history.push = function (p) {
-        if (typeof p === 'string') {
-          var _window$ICESTARK;
-          oldPush(path.join(((_window$ICESTARK = window.ICESTARK) === null || _window$ICESTARK === void 0 ? void 0 : _window$ICESTARK.basename) || '/', p));
-        } else {
-          var _window$ICESTARK2;
-          p.pathname = path.join(((_window$ICESTARK2 = window.ICESTARK) === null || _window$ICESTARK2 === void 0 ? void 0 : _window$ICESTARK2.basename) || '/', p.pathname);
-          oldPush(p);
-        }
-      };
-      setRealHistory(history);
-    }
-  }, []);
-  return realHistory;
-};
-export default useRealHistory;

package/lib/utils/useRealHistory.d.ts

@@ -1,8 +0,0 @@
-declare global {
-    interface Window {
-        HistoryLibrary: any;
-        ICESTARK: any;
-    }
-}
-declare const useRealHistory: () => any;
-export default useRealHistory;