ztxkutils 2.8.8 → 2.8.11
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/useHistory.js +20 -4
- package/package.json +1 -1
package/dist/useHistory.js
CHANGED
|
@@ -6,7 +6,12 @@ import { WORKFLOW_HIDEFRAME_KEY } from './constants.js';
|
|
|
6
6
|
|
|
7
7
|
var ROUTER_FILTER_RULES_KEY = '__symbol__alias__session';
|
|
8
8
|
var ROUTER_FILTER_RULES_VALUE = 'zQzNDkwNjg2MjYwMjI4MDk3LDEzNDU5Nzg1';
|
|
9
|
-
var _pushTarget = [
|
|
9
|
+
var _pushTarget = [
|
|
10
|
+
'_blank',
|
|
11
|
+
'_blank_noframe',
|
|
12
|
+
'_blank_close',
|
|
13
|
+
'_blank_nopre',
|
|
14
|
+
];
|
|
10
15
|
/**
|
|
11
16
|
* @author 陈亚雄
|
|
12
17
|
* @description 代理路由的push方法，可以用window.open的方式跳转页面
|
|
@@ -24,13 +29,24 @@ function useHistory(routeBasename) {
|
|
|
24
29
|
}
|
|
25
30
|
else {
|
|
26
31
|
// 如果是需要在无框架下，外链打开
|
|
27
|
-
if (target === '
|
|
32
|
+
if (target === '_blank_noframe' &&
|
|
28
33
|
path.indexOf(WORKFLOW_HIDEFRAME_KEY) !== -1) {
|
|
29
34
|
// 如果不是在隐藏框架内跳转，那么直接内部打开
|
|
30
35
|
history.push(path, state);
|
|
31
36
|
return;
|
|
32
37
|
}
|
|
33
|
-
if (target === '
|
|
38
|
+
if (target === '_blank_close' &&
|
|
39
|
+
path.indexOf(WORKFLOW_HIDEFRAME_KEY) !== -1) {
|
|
40
|
+
window.close();
|
|
41
|
+
return;
|
|
42
|
+
}
|
|
43
|
+
if (target === '_blank_close') {
|
|
44
|
+
history.push(path, state);
|
|
45
|
+
return;
|
|
46
|
+
}
|
|
47
|
+
if (target === '_blank' ||
|
|
48
|
+
target === '_blank_noframe' ||
|
|
49
|
+
target === '_blank_nopre') {
|
|
34
50
|
// state 没法处理，请不要传递state，可以拼接再地址栏参数后面
|
|
35
51
|
// 新窗口打开的页面 都不需要菜单
|
|
36
52
|
var _path = path.indexOf('?') === -1
|
|
@@ -45,7 +61,7 @@ function useHistory(routeBasename) {
|
|
|
45
61
|
? _path
|
|
46
62
|
: "/" + _path;
|
|
47
63
|
// 如果在微前端里面，需要添加前缀
|
|
48
|
-
if (isQiankun()) {
|
|
64
|
+
if (isQiankun() && target !== '_blank_nopre') {
|
|
49
65
|
_path = _path.startsWith('http')
|
|
50
66
|
? _path
|
|
51
67
|
: routeBasename
|