@teamix/pro 1.5.7-beta.0 → 1.5.7

package/dist/pro.js

@@ -74701,8 +74701,14 @@ var useRealHistory = function useRealHistory() {
       history = window.HistoryLibrary.createBrowserHistory();
       var oldPush = history.push;
       history.push = function (p) {
-        var _window$ICESTARK;
-        oldPush(path.join(((_window$ICESTARK = window.ICESTARK) === null || _window$ICESTARK === void 0 ? void 0 : _window$ICESTARK.basename) || '/', 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);
     }
@@ -84149,8 +84155,14 @@ var useRealHistory = function useRealHistory() {
       history = window.HistoryLibrary.createBrowserHistory();
       var oldPush = history.push;
       history.push = function (p) {
-        var _window$ICESTARK;
-        oldPush(path.join(((_window$ICESTARK = window.ICESTARK) === null || _window$ICESTARK === void 0 ? void 0 : _window$ICESTARK.basename) || '/', 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);
     }
@@ -92468,7 +92480,7 @@ if (!((_window = window) != null && _window.TEAMIXPRO_WITHOUT_ICON)) {
 
 
 
-var version = '1.5.7-beta.0';
+var version = '1.5.7';
 
 
 /***/ }),
@@ -93039,7 +93051,9 @@ var ProBaseInfo = function ProBaseInfo(props) {
     actionRef = props.actionRef,
     layout = props.layout,
     size = props.size,
-    context = props.context;
+    context = props.context,
+    _props$disabledAutoSi = props.disabledAutoSize,
+    disabledAutoSize = _props$disabledAutoSi === void 0 ? false : _props$disabledAutoSi;
   var defaultLayout = _utils_layout__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z[(0,_utils_utils__WEBPACK_IMPORTED_MODULE_6__/* .getLayout */ .G)((_size$width = size == null ? void 0 : size.width) != null ? _size$width : 0)];
 
   // 获取列内的布局参数
@@ -93109,7 +93123,7 @@ var ProBaseInfo = function ProBaseInfo(props) {
       }));
     });
   };
-  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().createElement((react__WEBPACK_IMPORTED_MODULE_1___default().Fragment), null, (size == null ? void 0 : size.width) && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().createElement(Row, {
+  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().createElement((react__WEBPACK_IMPORTED_MODULE_1___default().Fragment), null, ((size == null ? void 0 : size.width) || disabledAutoSize) && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().createElement(Row, {
     wrap: true,
     className: "teamix-pro-info-content-row",
     gutter: 20
@@ -93397,7 +93411,7 @@ var ProTableInfo = function ProTableInfo(props) {
 /* harmony import */ var _teamix_utils__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(80653);
 /* harmony import */ var _teamix_hooks__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(42341);
 /* harmony import */ var ___WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(42345);
-var _excluded = ["type", "url", "method", "formatResult", "formatParams", "params", "actionRef", "header", "onSuccess", "onError", "beforeRequest", "extendParams", "className", "style", "columns", "layout", "dataSource", "loading", "extra", "context"],
+var _excluded = ["type", "url", "method", "formatResult", "formatParams", "params", "actionRef", "header", "onSuccess", "onError", "beforeRequest", "extendParams", "className", "style", "columns", "layout", "dataSource", "loading", "extra", "context", "disabledAutoSize"],
   _excluded2 = ["context"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 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; }
@@ -93437,6 +93451,7 @@ var ProInfo = function ProInfo(props) {
     userLoading = props.loading,
     extra = props.extra,
     infoContext = props.context,
+    disabledAutoSize = props.disabledAutoSize,
     others = _objectWithoutPropertiesLoose(props, _excluded);
   var _useContext = (0,react__WEBPACK_IMPORTED_MODULE_0__.useContext)(_utils__WEBPACK_IMPORTED_MODULE_5__/* .ProInfoGroupContext */ .TH),
     contextUrl = _useContext.url,
@@ -93546,7 +93561,8 @@ var ProInfo = function ProInfo(props) {
     result: data,
     actionRef: actionRef,
     layout: layout,
-    context: context
+    context: context,
+    disabledAutoSize: disabledAutoSize
   }), type === 'header' && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_components_headerInfo__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z, {
     dataSource: dataSource,
     columns: columns,
@@ -93556,7 +93572,8 @@ var ProInfo = function ProInfo(props) {
     actionRef: actionRef,
     layout: layout,
     size: size,
-    context: context
+    context: context,
+    disabledAutoSize: disabledAutoSize
   }), type === 'base' && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_components_baseInfo__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z, {
     dataSource: dataSource,
     columns: columns,
@@ -93565,7 +93582,8 @@ var ProInfo = function ProInfo(props) {
     actionRef: actionRef,
     layout: layout,
     size: size,
-    context: context
+    context: context,
+    disabledAutoSize: disabledAutoSize
   })));
 };
 ProInfo.Group = _components_InfoGroup__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z;
@@ -96958,6 +96976,7 @@ function getTreeNodeProps(item) {
 /* harmony import */ var _teamix_utils__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(80653);
 /* harmony import */ var _utils_columnRender__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(97332);
 /* harmony import */ var _LoadMore__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(53986);
+/* harmony import */ var _teamix_result__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(77226);
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
 
@@ -96967,12 +96986,14 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
 
 
 
+
 var Row = _alicloudfe_components__WEBPACK_IMPORTED_MODULE_1__.Grid.Row,
   Col = _alicloudfe_components__WEBPACK_IMPORTED_MODULE_1__.Grid.Col;
 var cls = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_4__.usePrefixCls)('teamix-pro-table-card-view');
 var CardView = function CardView(props) {
   var _cardViewProps$scroll;
-  var dataSource = props.dataSource,
+  var _props$dataSource = props.dataSource,
+    dataSource = _props$dataSource === void 0 ? [] : _props$dataSource,
     _props$columns = props.columns,
     columns = _props$columns === void 0 ? [] : _props$columns,
     _props$loading = props.loading,
@@ -97003,7 +97024,17 @@ var CardView = function CardView(props) {
     if (showSkeleton) {
       setLoadState('none');
     }
+    if (dataSource.length === 0) {
+      setLoadState('none');
+    }
   }, [loading, skeletonVisible, showSkeleton]);
+
+  // 数据源变化毁掉
+  (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
+    if (dataSource.length === 0) {
+      setLoadState('none');
+    }
+  }, [dataSource]);
   var getDataIndexValue = function getDataIndexValue(dataIndex, dataSource) {
     if (Array.isArray(dataIndex)) {
       return dataIndex.map(function (item) {
@@ -97279,16 +97310,17 @@ var CardView = function CardView(props) {
 
   // 渲染单个卡片
   var renderCard = function renderCard(record, index) {
-    return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(Col, {
+    var _cardViewProps$cardRe;
+    return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(Col, _extends({
       xxs: 24,
       xs: 12,
-      s: 8,
+      s: 12,
       m: 8,
       l: 6,
       xl: 6,
       key: index,
       className: cls('card-item')
-    }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(___WEBPACK_IMPORTED_MODULE_2__.ProCard, _extends({
+    }, (_cardViewProps$cardRe = cardViewProps == null ? void 0 : cardViewProps.cardResponsiveProps) != null ? _cardViewProps$cardRe : {}), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(___WEBPACK_IMPORTED_MODULE_2__.ProCard, _extends({
       title: renderCardTitle(record, index),
       subTitle: renderCardSubTitle(record, index),
       extra: getProCardExtra(record, index),
@@ -97299,25 +97331,43 @@ var CardView = function CardView(props) {
       context: {
         record: record,
         index: index
+      },
+      disabledAutoSize: true
+    })));
+  };
+
+  // 渲染卡片主体
+  var renderCardBox = function renderCardBox() {
+    return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null, skeletonVisible && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_skeleton__WEBPACK_IMPORTED_MODULE_3__/* .ProSkeletonRaw.Content */ .vR.Content, null), !skeletonVisible && (dataSource == null ? void 0 : dataSource.length) === 0 && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_teamix_result__WEBPACK_IMPORTED_MODULE_7__/* ["default"] */ .Z, {
+      theme: "hybridcloud-container",
+      img: "noData",
+      title: (0,___WEBPACK_IMPORTED_MODULE_2__.getMessage)('noData'),
+      style: {
+        padding: '50px 0 60px'
       }
+    }), !skeletonVisible && (dataSource == null ? void 0 : dataSource.length) > 0 && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(Row, {
+      gutter: 16,
+      wrap: true,
+      style: {
+        marginTop: '-16px'
+      }
+    }, dataSource == null ? void 0 : dataSource.map(function (item, index) {
+      return renderCard(item, index);
     })));
   };
   return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
     className: cls()
-  }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_LoadMore__WEBPACK_IMPORTED_MODULE_6__/* ["default"] */ .Z, {
+  }, (cardViewProps == null ? void 0 : cardViewProps.useTablePagination) && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_1__.Loading, {
+    visible: loading,
+    style: {
+      width: '100%'
+    }
+  }, renderCardBox()), !(cardViewProps != null && cardViewProps.useTablePagination) && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_LoadMore__WEBPACK_IMPORTED_MODULE_6__/* ["default"] */ .Z, {
     onScrollBottom: onScrollBottom,
     onLoadMore: onLoadMore,
     loadState: loadState,
     scrollHeight: (_cardViewProps$scroll = cardViewProps.scrollHeight) != null ? _cardViewProps$scroll : scrollHeight
-  }, skeletonVisible && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_skeleton__WEBPACK_IMPORTED_MODULE_3__/* .ProSkeletonRaw.Content */ .vR.Content, null), !skeletonVisible && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(Row, {
-    gutter: 16,
-    wrap: true,
-    style: {
-      marginTop: '-16px'
-    }
-  }, dataSource == null ? void 0 : dataSource.map(function (item, index) {
-    return renderCard(item, index);
-  }))));
+  }, renderCardBox()));
 };
 /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (CardView);
 
@@ -99155,7 +99205,8 @@ var ToolBar = function ToolBar(props) {
 /* harmony import */ var lodash_debounce__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(39339);
 /* harmony import */ var lodash_debounce__WEBPACK_IMPORTED_MODULE_15___default = /*#__PURE__*/__webpack_require__.n(lodash_debounce__WEBPACK_IMPORTED_MODULE_15__);
 /* harmony import */ var _components_CardView__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(9285);
-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"],
+  _excluded2 = ["onChange"];
 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 _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); }
@@ -99272,7 +99323,7 @@ var ProTable = function ProTable(props) {
     pageSizeList = _props$pageSizeList === void 0 ? [5, 10, 20, 50, 100] : _props$pageSizeList,
     responsivePaginationType = props.responsivePaginationType,
     _props$showSkeleton = props.showSkeleton,
-    propsShowSkeleton = _props$showSkeleton === void 0 ? true : _props$showSkeleton,
+    propsShowSkeleton = _props$showSkeleton === void 0 ? false : _props$showSkeleton,
     _props$skeletonSize = props.skeletonSize,
     skeletonSize = _props$skeletonSize === void 0 ? 5 : _props$skeletonSize,
     propsActionRef = props.actionRef,
@@ -99365,6 +99416,15 @@ var ProTable = function ProTable(props) {
   // 存储定时器 id
   var autoRefreshTimerRef = (0,react__WEBPACK_IMPORTED_MODULE_0__.useRef)();
   var onResize = null;
+  (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
+    setShowSkeleton(propsShowSkeleton);
+  }, [propsShowSkeleton]);
+
+  // useEffect(() => {
+  //   console.log('传入的props变化', propsLoading);
+  //   setShowLoading(propsLoading ?? false);
+  // }, [propsLoading]);
+
   (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
     var _propsDataFilter$sche, _propsDataFilter$sche2;
     getHeaderHeight(fullscreenState);
@@ -99711,10 +99771,14 @@ var ProTable = function ProTable(props) {
       setCurrentPage(1);
     },
     nextPage: function nextPage() {
-      var _request3;
+      var _props$paginationProp;
       var newCurrentPage = currentPage + 1;
       setCurrentPage(newCurrentPage);
-      _request((_request3 = {}, _request3[targetPageKey] = newCurrentPage, _request3));
+      props == null ? void 0 : (_props$paginationProp = props.paginationProps) == null ? void 0 : _props$paginationProp.onChange == null ? void 0 : _props$paginationProp.onChange(newCurrentPage, {});
+      if (!propsDataSource) {
+        var _request3;
+        _request((_request3 = {}, _request3[targetPageKey] = newCurrentPage, _request3));
+      }
     },
     rowSelection: rowSelection,
     clearRowSelection: function clearRowSelection() {
@@ -99743,17 +99807,24 @@ var ProTable = function ProTable(props) {
     },
     switchView: function switchView(view) {
       setSwitchViewState(view);
-      setShowSkeleton(true);
-      setCurrentPage(1);
+      if (!propsDataSource) {
+        setCurrentPage(1);
+      }
       if (view === 'table') {
-        var _request4;
         setPageSize(pageSize != null ? pageSize : 20);
-        _request((_request4 = {}, _request4[targetPageSizeKey] = pageSize != null ? pageSize : 20, _request4[targetPageKey] = 1, _request4));
+        if (!propsDataSource) {
+          var _request4;
+          setShowSkeleton(true);
+          _request((_request4 = {}, _request4[targetPageSizeKey] = pageSize != null ? pageSize : 20, _request4[targetPageKey] = 1, _request4));
+        }
       }
       if (view === 'card') {
-        var _cardViewProps$pageSi, _cardViewProps$pageSi2, _request5;
+        var _cardViewProps$pageSi;
         setPageSize((_cardViewProps$pageSi = cardViewProps == null ? void 0 : cardViewProps.pageSize) != null ? _cardViewProps$pageSi : 12);
-        _request((_request5 = {}, _request5[targetPageSizeKey] = (_cardViewProps$pageSi2 = cardViewProps == null ? void 0 : cardViewProps.pageSize) != null ? _cardViewProps$pageSi2 : 12, _request5[targetPageKey] = 1, _request5));
+        if (!propsDataSource) {
+          var _cardViewProps$pageSi2, _request5;
+          _request((_request5 = {}, _request5[targetPageSizeKey] = (_cardViewProps$pageSi2 = cardViewProps == null ? void 0 : cardViewProps.pageSize) != null ? _cardViewProps$pageSi2 : 12, _request5[targetPageKey] = 1, _request5));
+        }
       }
       getHeaderHeight(fullscreenState);
     }
@@ -100122,7 +100193,11 @@ var ProTable = function ProTable(props) {
         }
       }
     }
-    if (showPagination && switchViewState === 'table') {
+    if (showPagination && switchViewState === 'table' || cardViewProps != null && cardViewProps.useTablePagination && switchViewState === 'card') {
+      var _props$paginationProp2;
+      var _ref5 = (_props$paginationProp2 = props == null ? void 0 : props.paginationProps) != null ? _props$paginationProp2 : {},
+        onPaginationPropsChange = _ref5.onChange,
+        othersPaginationProps = _objectWithoutPropertiesLoose(_ref5, _excluded2);
       return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
         className: cls('footer', {
           'footer-has-rowSelection': rowSelection,
@@ -100132,8 +100207,9 @@ var ProTable = function ProTable(props) {
         className: cls('footer-right-wrapper')
       }, showSkeleton ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_skeleton__WEBPACK_IMPORTED_MODULE_5__/* .ProSkeletonRaw.Footer.Pagination */ .vR.Footer.Pagination, null) : /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null, data.length > 0 && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_components_Pagination__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z, _extends({
         className: cls('pagination'),
-        onChange: function onChange(number) {
-          return onChangePagination(number);
+        onChange: function onChange(number, e) {
+          onChangePagination(number);
+          onPaginationPropsChange == null ? void 0 : onPaginationPropsChange(number, e);
         },
         total: total,
         responsivePaginationType: responsivePaginationType
@@ -100153,7 +100229,7 @@ var ProTable = function ProTable(props) {
         onPageSizeChange: function onPageSizeChange(number) {
           return onChangePaginationSize(number);
         }
-      }, props.paginationProps)))));
+      }, othersPaginationProps)))));
     } else if (!showPagination && (footerAction || rowSelection || useRowSelection)) {
       return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
         className: cls('footer', {
@@ -101647,8 +101723,14 @@ var useRealHistory = function useRealHistory() {
       history = window.HistoryLibrary.createBrowserHistory();
       var oldPush = history.push;
       history.push = function (p) {
-        var _window$ICESTARK;
-        oldPush(path.join(((_window$ICESTARK = window.ICESTARK) == null ? void 0 : _window$ICESTARK.basename) || '/', p));
+        if (typeof p === 'string') {
+          var _window$ICESTARK;
+          oldPush(path.join(((_window$ICESTARK = window.ICESTARK) == null ? void 0 : _window$ICESTARK.basename) || '/', p));
+        } else {
+          var _window$ICESTARK2;
+          p.pathname = path.join(((_window$ICESTARK2 = window.ICESTARK) == null ? void 0 : _window$ICESTARK2.basename) || '/', p.pathname);
+          oldPush(p);
+        }
       };
       setRealHistory(history);
     }