ztxkutils 2.8.11 → 2.8.14

package/dist/useHistory.js

@@ -1,9 +1,12 @@
-import { _ as __assign } from './tslib.es6-f9459658.js';
 import { useEffect } from 'react';
 import { useHistory as useHistory$1 } from 'react-router-dom';
 import { i as isQiankun } from './authority-5bc06c1a.js';
 import { WORKFLOW_HIDEFRAME_KEY } from './constants.js';
 
+/**
+ * @author 陈亚雄
+ * @description 路由跳转方法
+ */
 var ROUTER_FILTER_RULES_KEY = '__symbol__alias__session';
 var ROUTER_FILTER_RULES_VALUE = 'zQzNDkwNjg2MjYwMjI4MDk3LDEzNDU5Nzg1';
 var _pushTarget = [
@@ -18,60 +21,63 @@ var _pushTarget = [
  */
 function useHistory(routeBasename) {
     var history = useHistory$1();
-    return __assign(__assign({}, history), { push: function (path, state, target) {
-            // 代理react router dom 的push方法
-            if (typeof state === 'string' && _pushTarget.includes(state)) {
-                target = state;
+    var historyPush = history.push;
+    history.push = function (path, state, target) {
+        var _a, _b;
+        // 代理react router dom 的push方法
+        if (typeof state === 'string' && _pushTarget.includes(state)) {
+            target = state;
+        }
+        // 如果没有传入target，那么还是使用原生的push方法
+        if (!target) {
+            historyPush(path, state);
+        }
+        else {
+            // 如果是需要在无框架下，外链打开
+            if (target === '_blank_noframe' &&
+                ((_a = window.location.href) === null || _a === void 0 ? void 0 : _a.indexOf(WORKFLOW_HIDEFRAME_KEY)) !== -1) {
+                // 如果不是在隐藏框架内跳转，那么直接内部打开
+                historyPush(path, state);
+                return;
             }
-            // 如果没有传入target，那么还是使用原生的push方法
-            if (!target) {
-                history.push(path, state);
+            if (target === '_blank_close' &&
+                ((_b = window.location.href) === null || _b === void 0 ? void 0 : _b.indexOf(WORKFLOW_HIDEFRAME_KEY)) !== -1) {
+                window.close();
+                return;
             }
-            else {
-                // 如果是需要在无框架下，外链打开
-                if (target === '_blank_noframe' &&
-                    path.indexOf(WORKFLOW_HIDEFRAME_KEY) !== -1) {
-                    // 如果不是在隐藏框架内跳转，那么直接内部打开
-                    history.push(path, state);
-                    return;
-                }
-                if (target === '_blank_close' &&
-                    path.indexOf(WORKFLOW_HIDEFRAME_KEY) !== -1) {
-                    window.close();
-                    return;
-                }
-                if (target === '_blank_close') {
-                    history.push(path, state);
-                    return;
-                }
-                if (target === '_blank' ||
-                    target === '_blank_noframe' ||
-                    target === '_blank_nopre') {
-                    // state 没法处理，请不要传递state，可以拼接再地址栏参数后面
-                    // 新窗口打开的页面 都不需要菜单
-                    var _path = path.indexOf('?') === -1
-                        ? path + "?" + WORKFLOW_HIDEFRAME_KEY + "=1"
-                        : path.indexOf(WORKFLOW_HIDEFRAME_KEY) === -1
-                            ? path + "&" + WORKFLOW_HIDEFRAME_KEY + "=1"
-                            : path;
-                    // 是否是全路径
+            if (target === '_blank_close') {
+                historyPush(path, state);
+                return;
+            }
+            if (target === '_blank' ||
+                target === '_blank_noframe' ||
+                target === '_blank_nopre') {
+                // state 没法处理，请不要传递state，可以拼接再地址栏参数后面
+                // 新窗口打开的页面 都不需要菜单
+                var _path = path.indexOf('?') === -1
+                    ? path + "?" + WORKFLOW_HIDEFRAME_KEY + "=1"
+                    : path.indexOf(WORKFLOW_HIDEFRAME_KEY) === -1
+                        ? path + "&" + WORKFLOW_HIDEFRAME_KEY + "=1"
+                        : path;
+                // 是否是全路径
+                _path = _path.startsWith('http')
+                    ? _path
+                    : _path.startsWith('/')
+                        ? _path
+                        : "/" + _path;
+                // 如果在微前端里面，需要添加前缀
+                if (isQiankun() && target !== '_blank_nopre') {
                     _path = _path.startsWith('http')
                         ? _path
-                        : _path.startsWith('/')
-                            ? _path
-                            : "/" + _path;
-                    // 如果在微前端里面，需要添加前缀
-                    if (isQiankun() && target !== '_blank_nopre') {
-                        _path = _path.startsWith('http')
-                            ? _path
-                            : routeBasename
-                                ? "" + routeBasename + _path
-                                : _path;
-                    }
-                    window.open(_path);
+                        : routeBasename
+                            ? "" + routeBasename + _path
+                            : _path;
                 }
+                window.open(_path);
             }
-        } });
+        }
+    };
+    return history;
 }
 /**
  * @author 陈亚雄

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ztxkutils",
-  "version": "2.8.11",
+  "version": "2.8.14",
   "description": "",
   "main": "./dist/index.js",
   "module": "./dist/index.js",