@teamix/pro 1.5.8 → 1.5.10-release.1

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

@@ -87,9 +87,11 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
         var showDataIndex = stateFilterColumns.map(function (item) {
           return item.dataIndex;
         });
-        var stateColumns = (0, _utils2.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;
         });
@@ -110,11 +112,11 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
   // 全选
   var onChangeAllColumns = function onChangeAllColumns(check) {
     setAllVisible(check);
-    var keyNewColumns = (0, _utils2.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);
   };
@@ -126,10 +128,12 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
   };
   // 修改
   var onChangeColumns = function onChangeColumns(check, dataIndex) {
-    var keyNewColumns = (0, _utils2.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;
     });
@@ -137,26 +141,25 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
   };
   // 修改：dialog
   var onChangeColumnsForDialog = function onChangeColumnsForDialog() {
-    var keyNewColumns = (0, _utils2.cloneDeep)(newColumns);
-    notifyTableRender(keyNewColumns);
+    notifyTableRender(newColumns);
     setDropdownVisible(false);
   };
   // 向上
   var moveUp = function moveUp(e, dataIndex) {
     var _newColumns$filter, _newColumns$filter2;
     e.stopPropagation();
-    var keyNewColumns = (0, _utils2.cloneDeep)(newColumns).filter(function (_ref) {
+    var keyNewColumns = _toConsumableArray(newColumns).filter(function (_ref) {
       var lock = _ref.lock;
       return !lock;
     });
-    var headLock = (0, _utils2.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 = (0, _utils2.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;
@@ -172,18 +175,18 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
   var moveDown = function moveDown(e, dataIndex) {
     var _newColumns$filter3, _newColumns$filter4;
     e.stopPropagation();
-    var keyNewColumns = (0, _utils2.cloneDeep)(newColumns).filter(function (_ref5) {
+    var keyNewColumns = _toConsumableArray(newColumns).filter(function (_ref5) {
       var lock = _ref5.lock;
       return !lock;
     });
-    var headLock = (0, _utils2.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 = (0, _utils2.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;
@@ -336,9 +339,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 = (0, _utils2.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/lib/table/index.js

@@ -18,7 +18,7 @@ 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"));
@@ -36,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"],
+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); }
@@ -46,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); }
@@ -57,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,7 +67,7 @@ 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) {
-    return item.columnFilters !== false && (item === null || item === void 0 ? void 0 : item.hidden) !== true && (!globalFilterColumns || globalFilterColumns(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) {
@@ -177,6 +177,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;
@@ -693,6 +694,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) {
@@ -745,7 +750,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 = (0, _utils.getTargetValue)(formatParams, {
+        params: preParams
+      });
+    } else {
+      requestData = formatParams(preParams);
+    }
     if (requestData) {
       if (autoRefreshTimerRef.current) {
         clearTimeout(autoRefreshTimerRef.current);
@@ -896,7 +909,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 */
@@ -76,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;
     /** 是否第一次加载时就发起请求 */
@@ -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/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.8",
+  "version": "1.5.10-release.1",
   "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;

package/lib/utils/useRealHistory.js

@@ -1,45 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _react = require("react");
-var _reactRouterDom = require("react-router-dom");
-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 path = require('path-browserify');
-var useRealHistory = function useRealHistory() {
-  var history;
-  if (_reactRouterDom.useHistory) {
-    history = (0, _reactRouterDom.useHistory)();
-  }
-  var _useState = (0, _react.useState)(history),
-    _useState2 = _slicedToArray(_useState, 2),
-    realHistory = _useState2[0],
-    setRealHistory = _useState2[1];
-  (0, _react.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;
-};
-var _default = useRealHistory;
-exports.default = _default;