eoss-ui 0.8.3 → 0.8.5
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/lib/button-group.js +46 -45
- package/lib/button.js +46 -45
- package/lib/calogin.js +89 -57
- package/lib/checkbox-group.js +46 -45
- package/lib/data-table-form.js +46 -45
- package/lib/data-table.js +95 -69
- package/lib/date-picker.js +46 -45
- package/lib/dialog.js +46 -45
- package/lib/eoss-ui.common.js +401 -333
- package/lib/flow-group.js +46 -45
- package/lib/flow-list.js +46 -45
- package/lib/flow.js +285 -270
- package/lib/form.js +46 -45
- package/lib/handle-user.js +46 -45
- package/lib/handler.js +46 -45
- package/lib/icon.js +46 -45
- package/lib/index.js +1 -1
- package/lib/input-number.js +46 -45
- package/lib/input.js +46 -45
- package/lib/login.js +46 -45
- package/lib/main.js +63 -61
- package/lib/nav.js +46 -45
- package/lib/page.js +46 -45
- package/lib/pagination.js +46 -45
- package/lib/player.js +46 -45
- package/lib/qr-code.js +46 -45
- package/lib/radio-group.js +46 -45
- package/lib/retrial-auth.js +46 -45
- package/lib/select-ganged.js +46 -45
- package/lib/select.js +46 -45
- package/lib/selector-panel.js +46 -45
- package/lib/selector.js +46 -45
- package/lib/sizer.js +46 -45
- package/lib/steps.js +46 -45
- package/lib/switch.js +46 -45
- package/lib/table-form.js +46 -45
- package/lib/tabs.js +46 -45
- package/lib/tips.js +46 -45
- package/lib/tree-group.js +46 -45
- package/lib/tree.js +46 -45
- package/lib/upload.js +46 -45
- package/lib/utils/util.js +46 -45
- package/lib/wujie.js +46 -45
- package/lib/wxlogin.js +46 -45
- package/package.json +1 -1
- package/packages/calogin/src/plugin.js +3 -3
- package/packages/data-table/src/main.vue +49 -20
- package/packages/flow/src/processForm.vue +259 -228
- package/packages/main/src/main.vue +1 -1
- package/packages/main/src/simplicityTop/index.vue +6 -5
- package/src/index.js +1 -1
- package/src/utils/util.js +49 -48
package/lib/utils/util.js
CHANGED
|
@@ -49,6 +49,7 @@ var lodash = require('lodash');
|
|
|
49
49
|
|
|
50
50
|
|
|
51
51
|
var win = window.__WUJIE_RAW_WINDOW__ ? window.__WUJIE_RAW_WINDOW__ : window;
|
|
52
|
+
var winTop = getWinTop();
|
|
52
53
|
var isIE = /MSIE|Trident/.test(navigator.userAgent);
|
|
53
54
|
var parser = new _uaParserJs.UAParser();
|
|
54
55
|
var $hueStep = 2;
|
|
@@ -596,19 +597,19 @@ var busEmit = function busEmit(that, _ref3) {
|
|
|
596
597
|
return;
|
|
597
598
|
}
|
|
598
599
|
if (isIE) {
|
|
599
|
-
if (
|
|
600
|
-
|
|
600
|
+
if (winTop !== win.self) {
|
|
601
|
+
winTop.postMessage({ method: method, query: args, args: args }, '*');
|
|
601
602
|
return;
|
|
602
603
|
}
|
|
603
604
|
var bus = that ? that.bus || that.$root.Bus || that.$root.$bus : null;
|
|
604
605
|
bus && (Array.isArray(args) ? bus.$emit.apply(bus, [method].concat(args)) : bus.$emit(method, args));
|
|
605
606
|
} else {
|
|
606
|
-
if (
|
|
607
|
+
if (winTop !== win.self) {
|
|
607
608
|
var _bus2 = win.$wujie ? win.$wujie.bus : null;
|
|
608
609
|
if (_bus2) {
|
|
609
610
|
Array.isArray(args) ? _bus2.$emit.apply(_bus2, [method].concat(args)) : _bus2.$emit(method, args);
|
|
610
611
|
} else {
|
|
611
|
-
|
|
612
|
+
winTop.postMessage({ method: method, query: args, args: args }, '*');
|
|
612
613
|
}
|
|
613
614
|
return;
|
|
614
615
|
}
|
|
@@ -846,7 +847,7 @@ var delUrlParam = function delUrlParam(_ref4) {
|
|
|
846
847
|
|
|
847
848
|
var pUrl = '';
|
|
848
849
|
try {
|
|
849
|
-
pUrl =
|
|
850
|
+
pUrl = winTop.location.href;
|
|
850
851
|
} catch (error) {
|
|
851
852
|
pUrl = win.location.href;
|
|
852
853
|
}
|
|
@@ -2300,7 +2301,7 @@ var isLogined = function () {
|
|
|
2300
2301
|
pathname = '';
|
|
2301
2302
|
|
|
2302
2303
|
try {
|
|
2303
|
-
pathname =
|
|
2304
|
+
pathname = winTop.location.pathname;
|
|
2304
2305
|
} catch (error) {
|
|
2305
2306
|
pathname = win.location.pathname;
|
|
2306
2307
|
}
|
|
@@ -2366,12 +2367,12 @@ var isLogined = function () {
|
|
|
2366
2367
|
});
|
|
2367
2368
|
try {
|
|
2368
2369
|
var url = delUrlParam({
|
|
2369
|
-
url:
|
|
2370
|
+
url: winTop.location.href,
|
|
2370
2371
|
key: ['serverId', 'authType', 'code', 'sessionId']
|
|
2371
2372
|
});
|
|
2372
|
-
|
|
2373
|
+
winTop.location.href = url;
|
|
2373
2374
|
setTimeout(function () {
|
|
2374
|
-
|
|
2375
|
+
winTop.location.reload();
|
|
2375
2376
|
}, 200);
|
|
2376
2377
|
} catch (error) {
|
|
2377
2378
|
var _url2 = delUrlParam({
|
|
@@ -2390,8 +2391,8 @@ var isLogined = function () {
|
|
|
2390
2391
|
break;
|
|
2391
2392
|
case 3:
|
|
2392
2393
|
try {
|
|
2393
|
-
var href = results.authorizeUrl.replace('{redirectUri}', encodeURIComponent(
|
|
2394
|
-
|
|
2394
|
+
var href = results.authorizeUrl.replace('{redirectUri}', encodeURIComponent(winTop.location.href));
|
|
2395
|
+
winTop.location.href = href;
|
|
2395
2396
|
} catch (error) {
|
|
2396
2397
|
var _href = results.authorizeUrl.replace('{redirectUri}', encodeURIComponent(win.location.href));
|
|
2397
2398
|
win.location.href = _href;
|
|
@@ -2405,18 +2406,18 @@ var isLogined = function () {
|
|
|
2405
2406
|
sessionStorage.setItem('extUserBindHandleId', results.extUserBindHandleId);
|
|
2406
2407
|
try {
|
|
2407
2408
|
if (loginPage) {
|
|
2408
|
-
|
|
2409
|
+
winTop.location.replace(loginPage);
|
|
2409
2410
|
} else if (document.referrer) {
|
|
2410
2411
|
var referrerUrl = new URL(document.referrer);
|
|
2411
|
-
if (referrerUrl.host !==
|
|
2412
|
-
|
|
2413
|
-
} else if (
|
|
2414
|
-
|
|
2412
|
+
if (referrerUrl.host !== winTop.location.host) {
|
|
2413
|
+
winTop.location.replace(document.referrer);
|
|
2414
|
+
} else if (winTop.location.href.indexOf('main.html') > -1 || winTop.location.href.indexOf('index.html') > -1 || document.referrer.indexOf('main.html') > -1 || document.referrer.indexOf('index.html') > -1) {
|
|
2415
|
+
winTop.location.href = './login.html';
|
|
2415
2416
|
} else {
|
|
2416
2417
|
next('/login');
|
|
2417
2418
|
}
|
|
2418
|
-
} else if (
|
|
2419
|
-
|
|
2419
|
+
} else if (winTop.location.href.indexOf('main.html') > -1) {
|
|
2420
|
+
winTop.location.href = './login.html';
|
|
2420
2421
|
} else {
|
|
2421
2422
|
next('/login');
|
|
2422
2423
|
}
|
|
@@ -2435,18 +2436,18 @@ var isLogined = function () {
|
|
|
2435
2436
|
callback: function callback() {
|
|
2436
2437
|
try {
|
|
2437
2438
|
if (loginPage) {
|
|
2438
|
-
|
|
2439
|
+
winTop.location.replace(loginPage);
|
|
2439
2440
|
} else if (document.referrer) {
|
|
2440
2441
|
var referrerUrl = new URL(document.referrer);
|
|
2441
|
-
if (referrerUrl.host !==
|
|
2442
|
-
|
|
2443
|
-
} else if (
|
|
2444
|
-
|
|
2442
|
+
if (referrerUrl.host !== winTop.location.host) {
|
|
2443
|
+
winTop.location.replace(document.referrer);
|
|
2444
|
+
} else if (winTop.location.href.indexOf('main.html') > -1 || winTop.location.href.indexOf('index.html') > -1 || document.referrer.indexOf('main.html') > -1 || document.referrer.indexOf('index.html') > -1) {
|
|
2445
|
+
winTop.location.href = './login.html';
|
|
2445
2446
|
} else {
|
|
2446
2447
|
next('/login');
|
|
2447
2448
|
}
|
|
2448
|
-
} else if (
|
|
2449
|
-
|
|
2449
|
+
} else if (winTop.location.href.indexOf('main.html') > -1) {
|
|
2450
|
+
winTop.location.href = './login.html';
|
|
2450
2451
|
} else {
|
|
2451
2452
|
next('/login');
|
|
2452
2453
|
}
|
|
@@ -2475,19 +2476,19 @@ var isLogined = function () {
|
|
|
2475
2476
|
} else {
|
|
2476
2477
|
try {
|
|
2477
2478
|
if (loginPage) {
|
|
2478
|
-
|
|
2479
|
+
winTop.location.replace(loginPage);
|
|
2479
2480
|
} else if (document.referrer) {
|
|
2480
2481
|
referrerUrl = new URL(document.referrer);
|
|
2481
2482
|
|
|
2482
|
-
if (referrerUrl.host !==
|
|
2483
|
-
|
|
2484
|
-
} else if (
|
|
2485
|
-
|
|
2483
|
+
if (referrerUrl.host !== winTop.location.host) {
|
|
2484
|
+
winTop.location.replace(document.referrer);
|
|
2485
|
+
} else if (winTop.location.href.indexOf('main.html') > -1 || winTop.location.href.indexOf('index.html') > -1 || document.referrer.indexOf('main.html') > -1 || document.referrer.indexOf('index.html') > -1) {
|
|
2486
|
+
winTop.location.href = './login.html';
|
|
2486
2487
|
} else {
|
|
2487
2488
|
next('/login');
|
|
2488
2489
|
}
|
|
2489
|
-
} else if (
|
|
2490
|
-
|
|
2490
|
+
} else if (winTop.location.href.indexOf('main.html') > -1) {
|
|
2491
|
+
winTop.location.href = './login.html';
|
|
2491
2492
|
} else {
|
|
2492
2493
|
next('/login');
|
|
2493
2494
|
}
|
|
@@ -2619,7 +2620,7 @@ var loading = function loading($loading, res) {
|
|
|
2619
2620
|
}
|
|
2620
2621
|
if (isObject(res)) {
|
|
2621
2622
|
var config = extend({}, {
|
|
2622
|
-
target:
|
|
2623
|
+
target: winTop.document.body,
|
|
2623
2624
|
fullscreen: true,
|
|
2624
2625
|
background: 'rgba(0, 0, 0, 0.65)',
|
|
2625
2626
|
spinner: 'el-icon-loading',
|
|
@@ -2628,7 +2629,7 @@ var loading = function loading($loading, res) {
|
|
|
2628
2629
|
return $loading(config);
|
|
2629
2630
|
} else {
|
|
2630
2631
|
var _loading = $loading({
|
|
2631
|
-
target:
|
|
2632
|
+
target: winTop.document.body,
|
|
2632
2633
|
fullscreen: true,
|
|
2633
2634
|
background: 'rgba(0, 0, 0, 0.65)',
|
|
2634
2635
|
spinner: 'el-icon-loading',
|
|
@@ -2774,7 +2775,7 @@ var responses = function responses(data) {
|
|
|
2774
2775
|
removeStorage(['Authorization', 'token', 'ssId', 'userId', 'userName', 'deviceUnique', 'menus', 'useCaseCodes', 'mainConfig', 'jump', 'showLaunch']);
|
|
2775
2776
|
var href = '';
|
|
2776
2777
|
try {
|
|
2777
|
-
href =
|
|
2778
|
+
href = winTop.location.href;
|
|
2778
2779
|
} catch (error) {
|
|
2779
2780
|
href = win.location.href;
|
|
2780
2781
|
}
|
|
@@ -2799,7 +2800,7 @@ var responses = function responses(data) {
|
|
|
2799
2800
|
if (loginPage) {
|
|
2800
2801
|
var src = void 0;
|
|
2801
2802
|
if (!startWith(loginPage, ['http', '/'], true)) {
|
|
2802
|
-
var pathname =
|
|
2803
|
+
var pathname = winTop.location.pathname;
|
|
2803
2804
|
if (pathname !== '/') {
|
|
2804
2805
|
pathname = pathname.split('/');
|
|
2805
2806
|
pathname.splice(pathname.length - 1);
|
|
@@ -2811,16 +2812,16 @@ var responses = function responses(data) {
|
|
|
2811
2812
|
} else {
|
|
2812
2813
|
src = loginPage;
|
|
2813
2814
|
}
|
|
2814
|
-
|
|
2815
|
-
} else if (
|
|
2816
|
-
|
|
2815
|
+
winTop.location.href = src;
|
|
2816
|
+
} else if (winTop.location.href.indexOf('main.html') > -1) {
|
|
2817
|
+
winTop.location.href = './login.html';
|
|
2817
2818
|
} else {
|
|
2818
|
-
var hash =
|
|
2819
|
+
var hash = winTop.location.hash;
|
|
2819
2820
|
if (hash) {
|
|
2820
|
-
var len =
|
|
2821
|
-
|
|
2821
|
+
var len = winTop.location.href.indexOf(hash);
|
|
2822
|
+
winTop.location.href = win.location.href.slice(0, len) + '#/login';
|
|
2822
2823
|
} else {
|
|
2823
|
-
|
|
2824
|
+
winTop.location.href = '/login.html';
|
|
2824
2825
|
}
|
|
2825
2826
|
}
|
|
2826
2827
|
} catch (error) {
|
|
@@ -3639,9 +3640,9 @@ var removeCookie = function removeCookie(key) {
|
|
|
3639
3640
|
|
|
3640
3641
|
var winTopOpen = function winTopOpen(config) {
|
|
3641
3642
|
if (isIE) {
|
|
3642
|
-
if (
|
|
3643
|
+
if (winTop !== win.self) {
|
|
3643
3644
|
try {
|
|
3644
|
-
|
|
3645
|
+
winTop.windowOpen(config);
|
|
3645
3646
|
} catch (error) {
|
|
3646
3647
|
win.postMessage({ method: 'windowOpen', query: config }, '*');
|
|
3647
3648
|
}
|
package/lib/wujie.js
CHANGED
|
@@ -287,6 +287,7 @@ var lodash = __webpack_require__(12);
|
|
|
287
287
|
|
|
288
288
|
|
|
289
289
|
var win = window.__WUJIE_RAW_WINDOW__ ? window.__WUJIE_RAW_WINDOW__ : window;
|
|
290
|
+
var winTop = getWinTop();
|
|
290
291
|
var isIE = /MSIE|Trident/.test(navigator.userAgent);
|
|
291
292
|
var parser = new external_ua_parser_js_["UAParser"]();
|
|
292
293
|
var $hueStep = 2;
|
|
@@ -834,19 +835,19 @@ var busEmit = function busEmit(that, _ref3) {
|
|
|
834
835
|
return;
|
|
835
836
|
}
|
|
836
837
|
if (isIE) {
|
|
837
|
-
if (
|
|
838
|
-
|
|
838
|
+
if (winTop !== win.self) {
|
|
839
|
+
winTop.postMessage({ method: method, query: args, args: args }, '*');
|
|
839
840
|
return;
|
|
840
841
|
}
|
|
841
842
|
var bus = that ? that.bus || that.$root.Bus || that.$root.$bus : null;
|
|
842
843
|
bus && (Array.isArray(args) ? bus.$emit.apply(bus, [method].concat(args)) : bus.$emit(method, args));
|
|
843
844
|
} else {
|
|
844
|
-
if (
|
|
845
|
+
if (winTop !== win.self) {
|
|
845
846
|
var _bus2 = win.$wujie ? win.$wujie.bus : null;
|
|
846
847
|
if (_bus2) {
|
|
847
848
|
Array.isArray(args) ? _bus2.$emit.apply(_bus2, [method].concat(args)) : _bus2.$emit(method, args);
|
|
848
849
|
} else {
|
|
849
|
-
|
|
850
|
+
winTop.postMessage({ method: method, query: args, args: args }, '*');
|
|
850
851
|
}
|
|
851
852
|
return;
|
|
852
853
|
}
|
|
@@ -1084,7 +1085,7 @@ var delUrlParam = function delUrlParam(_ref4) {
|
|
|
1084
1085
|
|
|
1085
1086
|
var pUrl = '';
|
|
1086
1087
|
try {
|
|
1087
|
-
pUrl =
|
|
1088
|
+
pUrl = winTop.location.href;
|
|
1088
1089
|
} catch (error) {
|
|
1089
1090
|
pUrl = win.location.href;
|
|
1090
1091
|
}
|
|
@@ -2538,7 +2539,7 @@ var isLogined = function () {
|
|
|
2538
2539
|
pathname = '';
|
|
2539
2540
|
|
|
2540
2541
|
try {
|
|
2541
|
-
pathname =
|
|
2542
|
+
pathname = winTop.location.pathname;
|
|
2542
2543
|
} catch (error) {
|
|
2543
2544
|
pathname = win.location.pathname;
|
|
2544
2545
|
}
|
|
@@ -2604,12 +2605,12 @@ var isLogined = function () {
|
|
|
2604
2605
|
});
|
|
2605
2606
|
try {
|
|
2606
2607
|
var url = delUrlParam({
|
|
2607
|
-
url:
|
|
2608
|
+
url: winTop.location.href,
|
|
2608
2609
|
key: ['serverId', 'authType', 'code', 'sessionId']
|
|
2609
2610
|
});
|
|
2610
|
-
|
|
2611
|
+
winTop.location.href = url;
|
|
2611
2612
|
setTimeout(function () {
|
|
2612
|
-
|
|
2613
|
+
winTop.location.reload();
|
|
2613
2614
|
}, 200);
|
|
2614
2615
|
} catch (error) {
|
|
2615
2616
|
var _url2 = delUrlParam({
|
|
@@ -2628,8 +2629,8 @@ var isLogined = function () {
|
|
|
2628
2629
|
break;
|
|
2629
2630
|
case 3:
|
|
2630
2631
|
try {
|
|
2631
|
-
var href = results.authorizeUrl.replace('{redirectUri}', encodeURIComponent(
|
|
2632
|
-
|
|
2632
|
+
var href = results.authorizeUrl.replace('{redirectUri}', encodeURIComponent(winTop.location.href));
|
|
2633
|
+
winTop.location.href = href;
|
|
2633
2634
|
} catch (error) {
|
|
2634
2635
|
var _href = results.authorizeUrl.replace('{redirectUri}', encodeURIComponent(win.location.href));
|
|
2635
2636
|
win.location.href = _href;
|
|
@@ -2643,18 +2644,18 @@ var isLogined = function () {
|
|
|
2643
2644
|
sessionStorage.setItem('extUserBindHandleId', results.extUserBindHandleId);
|
|
2644
2645
|
try {
|
|
2645
2646
|
if (loginPage) {
|
|
2646
|
-
|
|
2647
|
+
winTop.location.replace(loginPage);
|
|
2647
2648
|
} else if (document.referrer) {
|
|
2648
2649
|
var referrerUrl = new URL(document.referrer);
|
|
2649
|
-
if (referrerUrl.host !==
|
|
2650
|
-
|
|
2651
|
-
} else if (
|
|
2652
|
-
|
|
2650
|
+
if (referrerUrl.host !== winTop.location.host) {
|
|
2651
|
+
winTop.location.replace(document.referrer);
|
|
2652
|
+
} else if (winTop.location.href.indexOf('main.html') > -1 || winTop.location.href.indexOf('index.html') > -1 || document.referrer.indexOf('main.html') > -1 || document.referrer.indexOf('index.html') > -1) {
|
|
2653
|
+
winTop.location.href = './login.html';
|
|
2653
2654
|
} else {
|
|
2654
2655
|
next('/login');
|
|
2655
2656
|
}
|
|
2656
|
-
} else if (
|
|
2657
|
-
|
|
2657
|
+
} else if (winTop.location.href.indexOf('main.html') > -1) {
|
|
2658
|
+
winTop.location.href = './login.html';
|
|
2658
2659
|
} else {
|
|
2659
2660
|
next('/login');
|
|
2660
2661
|
}
|
|
@@ -2673,18 +2674,18 @@ var isLogined = function () {
|
|
|
2673
2674
|
callback: function callback() {
|
|
2674
2675
|
try {
|
|
2675
2676
|
if (loginPage) {
|
|
2676
|
-
|
|
2677
|
+
winTop.location.replace(loginPage);
|
|
2677
2678
|
} else if (document.referrer) {
|
|
2678
2679
|
var referrerUrl = new URL(document.referrer);
|
|
2679
|
-
if (referrerUrl.host !==
|
|
2680
|
-
|
|
2681
|
-
} else if (
|
|
2682
|
-
|
|
2680
|
+
if (referrerUrl.host !== winTop.location.host) {
|
|
2681
|
+
winTop.location.replace(document.referrer);
|
|
2682
|
+
} else if (winTop.location.href.indexOf('main.html') > -1 || winTop.location.href.indexOf('index.html') > -1 || document.referrer.indexOf('main.html') > -1 || document.referrer.indexOf('index.html') > -1) {
|
|
2683
|
+
winTop.location.href = './login.html';
|
|
2683
2684
|
} else {
|
|
2684
2685
|
next('/login');
|
|
2685
2686
|
}
|
|
2686
|
-
} else if (
|
|
2687
|
-
|
|
2687
|
+
} else if (winTop.location.href.indexOf('main.html') > -1) {
|
|
2688
|
+
winTop.location.href = './login.html';
|
|
2688
2689
|
} else {
|
|
2689
2690
|
next('/login');
|
|
2690
2691
|
}
|
|
@@ -2713,19 +2714,19 @@ var isLogined = function () {
|
|
|
2713
2714
|
} else {
|
|
2714
2715
|
try {
|
|
2715
2716
|
if (loginPage) {
|
|
2716
|
-
|
|
2717
|
+
winTop.location.replace(loginPage);
|
|
2717
2718
|
} else if (document.referrer) {
|
|
2718
2719
|
referrerUrl = new URL(document.referrer);
|
|
2719
2720
|
|
|
2720
|
-
if (referrerUrl.host !==
|
|
2721
|
-
|
|
2722
|
-
} else if (
|
|
2723
|
-
|
|
2721
|
+
if (referrerUrl.host !== winTop.location.host) {
|
|
2722
|
+
winTop.location.replace(document.referrer);
|
|
2723
|
+
} else if (winTop.location.href.indexOf('main.html') > -1 || winTop.location.href.indexOf('index.html') > -1 || document.referrer.indexOf('main.html') > -1 || document.referrer.indexOf('index.html') > -1) {
|
|
2724
|
+
winTop.location.href = './login.html';
|
|
2724
2725
|
} else {
|
|
2725
2726
|
next('/login');
|
|
2726
2727
|
}
|
|
2727
|
-
} else if (
|
|
2728
|
-
|
|
2728
|
+
} else if (winTop.location.href.indexOf('main.html') > -1) {
|
|
2729
|
+
winTop.location.href = './login.html';
|
|
2729
2730
|
} else {
|
|
2730
2731
|
next('/login');
|
|
2731
2732
|
}
|
|
@@ -2857,7 +2858,7 @@ var util_loading = function loading($loading, res) {
|
|
|
2857
2858
|
}
|
|
2858
2859
|
if (isObject(res)) {
|
|
2859
2860
|
var config = extend({}, {
|
|
2860
|
-
target:
|
|
2861
|
+
target: winTop.document.body,
|
|
2861
2862
|
fullscreen: true,
|
|
2862
2863
|
background: 'rgba(0, 0, 0, 0.65)',
|
|
2863
2864
|
spinner: 'el-icon-loading',
|
|
@@ -2866,7 +2867,7 @@ var util_loading = function loading($loading, res) {
|
|
|
2866
2867
|
return $loading(config);
|
|
2867
2868
|
} else {
|
|
2868
2869
|
var _loading = $loading({
|
|
2869
|
-
target:
|
|
2870
|
+
target: winTop.document.body,
|
|
2870
2871
|
fullscreen: true,
|
|
2871
2872
|
background: 'rgba(0, 0, 0, 0.65)',
|
|
2872
2873
|
spinner: 'el-icon-loading',
|
|
@@ -3012,7 +3013,7 @@ var util_responses = function responses(data) {
|
|
|
3012
3013
|
removeStorage(['Authorization', 'token', 'ssId', 'userId', 'userName', 'deviceUnique', 'menus', 'useCaseCodes', 'mainConfig', 'jump', 'showLaunch']);
|
|
3013
3014
|
var href = '';
|
|
3014
3015
|
try {
|
|
3015
|
-
href =
|
|
3016
|
+
href = winTop.location.href;
|
|
3016
3017
|
} catch (error) {
|
|
3017
3018
|
href = win.location.href;
|
|
3018
3019
|
}
|
|
@@ -3037,7 +3038,7 @@ var util_responses = function responses(data) {
|
|
|
3037
3038
|
if (loginPage) {
|
|
3038
3039
|
var src = void 0;
|
|
3039
3040
|
if (!startWith(loginPage, ['http', '/'], true)) {
|
|
3040
|
-
var pathname =
|
|
3041
|
+
var pathname = winTop.location.pathname;
|
|
3041
3042
|
if (pathname !== '/') {
|
|
3042
3043
|
pathname = pathname.split('/');
|
|
3043
3044
|
pathname.splice(pathname.length - 1);
|
|
@@ -3049,16 +3050,16 @@ var util_responses = function responses(data) {
|
|
|
3049
3050
|
} else {
|
|
3050
3051
|
src = loginPage;
|
|
3051
3052
|
}
|
|
3052
|
-
|
|
3053
|
-
} else if (
|
|
3054
|
-
|
|
3053
|
+
winTop.location.href = src;
|
|
3054
|
+
} else if (winTop.location.href.indexOf('main.html') > -1) {
|
|
3055
|
+
winTop.location.href = './login.html';
|
|
3055
3056
|
} else {
|
|
3056
|
-
var hash =
|
|
3057
|
+
var hash = winTop.location.hash;
|
|
3057
3058
|
if (hash) {
|
|
3058
|
-
var len =
|
|
3059
|
-
|
|
3059
|
+
var len = winTop.location.href.indexOf(hash);
|
|
3060
|
+
winTop.location.href = win.location.href.slice(0, len) + '#/login';
|
|
3060
3061
|
} else {
|
|
3061
|
-
|
|
3062
|
+
winTop.location.href = '/login.html';
|
|
3062
3063
|
}
|
|
3063
3064
|
}
|
|
3064
3065
|
} catch (error) {
|
|
@@ -3877,9 +3878,9 @@ var removeCookie = function removeCookie(key) {
|
|
|
3877
3878
|
|
|
3878
3879
|
var winTopOpen = function winTopOpen(config) {
|
|
3879
3880
|
if (isIE) {
|
|
3880
|
-
if (
|
|
3881
|
+
if (winTop !== win.self) {
|
|
3881
3882
|
try {
|
|
3882
|
-
|
|
3883
|
+
winTop.windowOpen(config);
|
|
3883
3884
|
} catch (error) {
|
|
3884
3885
|
win.postMessage({ method: 'windowOpen', query: config }, '*');
|
|
3885
3886
|
}
|