@teamix/pro 1.5.10-release.2 → 1.5.10-release.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/pro.js CHANGED
@@ -94974,7 +94974,7 @@ if (!((_window = window) != null && _window.TEAMIXPRO_WITHOUT_ICON)) {
94974
94974
 
94975
94975
 
94976
94976
 
94977
- var version = '1.5.10';
94977
+ var version = '1.5.10-release.3';
94978
94978
 
94979
94979
  // By TeamixTest
94980
94980
  window.postMessage({
@@ -105819,12 +105819,18 @@ var isUsable = function isUsable(val) {
105819
105819
  /* harmony export */ });
105820
105820
  /* harmony import */ var react_router_dom__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(18944);
105821
105821
  /* harmony import */ var react_router_dom__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react_router_dom__WEBPACK_IMPORTED_MODULE_0__);
105822
+ /* harmony import */ var _path_link__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(4353);
105822
105823
  // 兼容 react-router-dom v5&v6,拿到真正的 history
105824
+ // v6 版本没有 useHistory
105825
+
105823
105826
 
105824
105827
  var useRealHistory = function useRealHistory() {
105825
- var history;
105826
- if (react_router_dom__WEBPACK_IMPORTED_MODULE_0__.useHistory) {
105827
- history = (0,react_router_dom__WEBPACK_IMPORTED_MODULE_0__.useHistory)();
105828
+ var history = (0,_path_link__WEBPACK_IMPORTED_MODULE_1__/* .getHistory */ .s1)();
105829
+ if (history === window.history) {
105830
+ // 说明没有全局设置 history
105831
+ if (react_router_dom__WEBPACK_IMPORTED_MODULE_0__.useHistory) {
105832
+ history = (0,react_router_dom__WEBPACK_IMPORTED_MODULE_0__.useHistory)();
105833
+ }
105828
105834
  }
105829
105835
  return history;
105830
105836
  };