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/calogin.js
CHANGED
|
@@ -286,6 +286,7 @@ var lodash = __webpack_require__(12);
|
|
|
286
286
|
|
|
287
287
|
|
|
288
288
|
var win = window.__WUJIE_RAW_WINDOW__ ? window.__WUJIE_RAW_WINDOW__ : window;
|
|
289
|
+
var winTop = getWinTop();
|
|
289
290
|
var isIE = /MSIE|Trident/.test(navigator.userAgent);
|
|
290
291
|
var parser = new external_ua_parser_js_["UAParser"]();
|
|
291
292
|
var $hueStep = 2;
|
|
@@ -833,19 +834,19 @@ var busEmit = function busEmit(that, _ref3) {
|
|
|
833
834
|
return;
|
|
834
835
|
}
|
|
835
836
|
if (isIE) {
|
|
836
|
-
if (
|
|
837
|
-
|
|
837
|
+
if (winTop !== win.self) {
|
|
838
|
+
winTop.postMessage({ method: method, query: args, args: args }, '*');
|
|
838
839
|
return;
|
|
839
840
|
}
|
|
840
841
|
var bus = that ? that.bus || that.$root.Bus || that.$root.$bus : null;
|
|
841
842
|
bus && (Array.isArray(args) ? bus.$emit.apply(bus, [method].concat(args)) : bus.$emit(method, args));
|
|
842
843
|
} else {
|
|
843
|
-
if (
|
|
844
|
+
if (winTop !== win.self) {
|
|
844
845
|
var _bus2 = win.$wujie ? win.$wujie.bus : null;
|
|
845
846
|
if (_bus2) {
|
|
846
847
|
Array.isArray(args) ? _bus2.$emit.apply(_bus2, [method].concat(args)) : _bus2.$emit(method, args);
|
|
847
848
|
} else {
|
|
848
|
-
|
|
849
|
+
winTop.postMessage({ method: method, query: args, args: args }, '*');
|
|
849
850
|
}
|
|
850
851
|
return;
|
|
851
852
|
}
|
|
@@ -1083,7 +1084,7 @@ var delUrlParam = function delUrlParam(_ref4) {
|
|
|
1083
1084
|
|
|
1084
1085
|
var pUrl = '';
|
|
1085
1086
|
try {
|
|
1086
|
-
pUrl =
|
|
1087
|
+
pUrl = winTop.location.href;
|
|
1087
1088
|
} catch (error) {
|
|
1088
1089
|
pUrl = win.location.href;
|
|
1089
1090
|
}
|
|
@@ -2537,7 +2538,7 @@ var isLogined = function () {
|
|
|
2537
2538
|
pathname = '';
|
|
2538
2539
|
|
|
2539
2540
|
try {
|
|
2540
|
-
pathname =
|
|
2541
|
+
pathname = winTop.location.pathname;
|
|
2541
2542
|
} catch (error) {
|
|
2542
2543
|
pathname = win.location.pathname;
|
|
2543
2544
|
}
|
|
@@ -2603,12 +2604,12 @@ var isLogined = function () {
|
|
|
2603
2604
|
});
|
|
2604
2605
|
try {
|
|
2605
2606
|
var url = delUrlParam({
|
|
2606
|
-
url:
|
|
2607
|
+
url: winTop.location.href,
|
|
2607
2608
|
key: ['serverId', 'authType', 'code', 'sessionId']
|
|
2608
2609
|
});
|
|
2609
|
-
|
|
2610
|
+
winTop.location.href = url;
|
|
2610
2611
|
setTimeout(function () {
|
|
2611
|
-
|
|
2612
|
+
winTop.location.reload();
|
|
2612
2613
|
}, 200);
|
|
2613
2614
|
} catch (error) {
|
|
2614
2615
|
var _url2 = delUrlParam({
|
|
@@ -2627,8 +2628,8 @@ var isLogined = function () {
|
|
|
2627
2628
|
break;
|
|
2628
2629
|
case 3:
|
|
2629
2630
|
try {
|
|
2630
|
-
var href = results.authorizeUrl.replace('{redirectUri}', encodeURIComponent(
|
|
2631
|
-
|
|
2631
|
+
var href = results.authorizeUrl.replace('{redirectUri}', encodeURIComponent(winTop.location.href));
|
|
2632
|
+
winTop.location.href = href;
|
|
2632
2633
|
} catch (error) {
|
|
2633
2634
|
var _href = results.authorizeUrl.replace('{redirectUri}', encodeURIComponent(win.location.href));
|
|
2634
2635
|
win.location.href = _href;
|
|
@@ -2642,18 +2643,18 @@ var isLogined = function () {
|
|
|
2642
2643
|
sessionStorage.setItem('extUserBindHandleId', results.extUserBindHandleId);
|
|
2643
2644
|
try {
|
|
2644
2645
|
if (loginPage) {
|
|
2645
|
-
|
|
2646
|
+
winTop.location.replace(loginPage);
|
|
2646
2647
|
} else if (document.referrer) {
|
|
2647
2648
|
var referrerUrl = new URL(document.referrer);
|
|
2648
|
-
if (referrerUrl.host !==
|
|
2649
|
-
|
|
2650
|
-
} else if (
|
|
2651
|
-
|
|
2649
|
+
if (referrerUrl.host !== winTop.location.host) {
|
|
2650
|
+
winTop.location.replace(document.referrer);
|
|
2651
|
+
} 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) {
|
|
2652
|
+
winTop.location.href = './login.html';
|
|
2652
2653
|
} else {
|
|
2653
2654
|
next('/login');
|
|
2654
2655
|
}
|
|
2655
|
-
} else if (
|
|
2656
|
-
|
|
2656
|
+
} else if (winTop.location.href.indexOf('main.html') > -1) {
|
|
2657
|
+
winTop.location.href = './login.html';
|
|
2657
2658
|
} else {
|
|
2658
2659
|
next('/login');
|
|
2659
2660
|
}
|
|
@@ -2672,18 +2673,18 @@ var isLogined = function () {
|
|
|
2672
2673
|
callback: function callback() {
|
|
2673
2674
|
try {
|
|
2674
2675
|
if (loginPage) {
|
|
2675
|
-
|
|
2676
|
+
winTop.location.replace(loginPage);
|
|
2676
2677
|
} else if (document.referrer) {
|
|
2677
2678
|
var referrerUrl = new URL(document.referrer);
|
|
2678
|
-
if (referrerUrl.host !==
|
|
2679
|
-
|
|
2680
|
-
} else if (
|
|
2681
|
-
|
|
2679
|
+
if (referrerUrl.host !== winTop.location.host) {
|
|
2680
|
+
winTop.location.replace(document.referrer);
|
|
2681
|
+
} 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) {
|
|
2682
|
+
winTop.location.href = './login.html';
|
|
2682
2683
|
} else {
|
|
2683
2684
|
next('/login');
|
|
2684
2685
|
}
|
|
2685
|
-
} else if (
|
|
2686
|
-
|
|
2686
|
+
} else if (winTop.location.href.indexOf('main.html') > -1) {
|
|
2687
|
+
winTop.location.href = './login.html';
|
|
2687
2688
|
} else {
|
|
2688
2689
|
next('/login');
|
|
2689
2690
|
}
|
|
@@ -2712,19 +2713,19 @@ var isLogined = function () {
|
|
|
2712
2713
|
} else {
|
|
2713
2714
|
try {
|
|
2714
2715
|
if (loginPage) {
|
|
2715
|
-
|
|
2716
|
+
winTop.location.replace(loginPage);
|
|
2716
2717
|
} else if (document.referrer) {
|
|
2717
2718
|
referrerUrl = new URL(document.referrer);
|
|
2718
2719
|
|
|
2719
|
-
if (referrerUrl.host !==
|
|
2720
|
-
|
|
2721
|
-
} else if (
|
|
2722
|
-
|
|
2720
|
+
if (referrerUrl.host !== winTop.location.host) {
|
|
2721
|
+
winTop.location.replace(document.referrer);
|
|
2722
|
+
} 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) {
|
|
2723
|
+
winTop.location.href = './login.html';
|
|
2723
2724
|
} else {
|
|
2724
2725
|
next('/login');
|
|
2725
2726
|
}
|
|
2726
|
-
} else if (
|
|
2727
|
-
|
|
2727
|
+
} else if (winTop.location.href.indexOf('main.html') > -1) {
|
|
2728
|
+
winTop.location.href = './login.html';
|
|
2728
2729
|
} else {
|
|
2729
2730
|
next('/login');
|
|
2730
2731
|
}
|
|
@@ -2856,7 +2857,7 @@ var util_loading = function loading($loading, res) {
|
|
|
2856
2857
|
}
|
|
2857
2858
|
if (isObject(res)) {
|
|
2858
2859
|
var config = extend({}, {
|
|
2859
|
-
target:
|
|
2860
|
+
target: winTop.document.body,
|
|
2860
2861
|
fullscreen: true,
|
|
2861
2862
|
background: 'rgba(0, 0, 0, 0.65)',
|
|
2862
2863
|
spinner: 'el-icon-loading',
|
|
@@ -2865,7 +2866,7 @@ var util_loading = function loading($loading, res) {
|
|
|
2865
2866
|
return $loading(config);
|
|
2866
2867
|
} else {
|
|
2867
2868
|
var _loading = $loading({
|
|
2868
|
-
target:
|
|
2869
|
+
target: winTop.document.body,
|
|
2869
2870
|
fullscreen: true,
|
|
2870
2871
|
background: 'rgba(0, 0, 0, 0.65)',
|
|
2871
2872
|
spinner: 'el-icon-loading',
|
|
@@ -3011,7 +3012,7 @@ var util_responses = function responses(data) {
|
|
|
3011
3012
|
removeStorage(['Authorization', 'token', 'ssId', 'userId', 'userName', 'deviceUnique', 'menus', 'useCaseCodes', 'mainConfig', 'jump', 'showLaunch']);
|
|
3012
3013
|
var href = '';
|
|
3013
3014
|
try {
|
|
3014
|
-
href =
|
|
3015
|
+
href = winTop.location.href;
|
|
3015
3016
|
} catch (error) {
|
|
3016
3017
|
href = win.location.href;
|
|
3017
3018
|
}
|
|
@@ -3036,7 +3037,7 @@ var util_responses = function responses(data) {
|
|
|
3036
3037
|
if (loginPage) {
|
|
3037
3038
|
var src = void 0;
|
|
3038
3039
|
if (!startWith(loginPage, ['http', '/'], true)) {
|
|
3039
|
-
var pathname =
|
|
3040
|
+
var pathname = winTop.location.pathname;
|
|
3040
3041
|
if (pathname !== '/') {
|
|
3041
3042
|
pathname = pathname.split('/');
|
|
3042
3043
|
pathname.splice(pathname.length - 1);
|
|
@@ -3048,16 +3049,16 @@ var util_responses = function responses(data) {
|
|
|
3048
3049
|
} else {
|
|
3049
3050
|
src = loginPage;
|
|
3050
3051
|
}
|
|
3051
|
-
|
|
3052
|
-
} else if (
|
|
3053
|
-
|
|
3052
|
+
winTop.location.href = src;
|
|
3053
|
+
} else if (winTop.location.href.indexOf('main.html') > -1) {
|
|
3054
|
+
winTop.location.href = './login.html';
|
|
3054
3055
|
} else {
|
|
3055
|
-
var hash =
|
|
3056
|
+
var hash = winTop.location.hash;
|
|
3056
3057
|
if (hash) {
|
|
3057
|
-
var len =
|
|
3058
|
-
|
|
3058
|
+
var len = winTop.location.href.indexOf(hash);
|
|
3059
|
+
winTop.location.href = win.location.href.slice(0, len) + '#/login';
|
|
3059
3060
|
} else {
|
|
3060
|
-
|
|
3061
|
+
winTop.location.href = '/login.html';
|
|
3061
3062
|
}
|
|
3062
3063
|
}
|
|
3063
3064
|
} catch (error) {
|
|
@@ -3876,9 +3877,9 @@ var removeCookie = function removeCookie(key) {
|
|
|
3876
3877
|
|
|
3877
3878
|
var winTopOpen = function winTopOpen(config) {
|
|
3878
3879
|
if (isIE) {
|
|
3879
|
-
if (
|
|
3880
|
+
if (winTop !== win.self) {
|
|
3880
3881
|
try {
|
|
3881
|
-
|
|
3882
|
+
winTop.windowOpen(config);
|
|
3882
3883
|
} catch (error) {
|
|
3883
3884
|
win.postMessage({ method: 'windowOpen', query: config }, '*');
|
|
3884
3885
|
}
|
|
@@ -4673,15 +4674,23 @@ render._withStripped = true
|
|
|
4673
4674
|
// EXTERNAL MODULE: ./src/utils/util.js + 1 modules
|
|
4674
4675
|
var util = __webpack_require__(0);
|
|
4675
4676
|
|
|
4677
|
+
// EXTERNAL MODULE: external "babel-runtime/regenerator"
|
|
4678
|
+
var regenerator_ = __webpack_require__(4);
|
|
4679
|
+
var regenerator_default = /*#__PURE__*/__webpack_require__.n(regenerator_);
|
|
4680
|
+
|
|
4676
4681
|
// CONCATENATED MODULE: ./packages/calogin/src/plugin.js
|
|
4682
|
+
|
|
4683
|
+
|
|
4677
4684
|
var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
|
|
4678
4685
|
|
|
4686
|
+
function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, arguments); return new Promise(function (resolve, reject) { function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { return Promise.resolve(value).then(function (value) { step("next", value); }, function (err) { step("throw", err); }); } } return step("next"); }); }; }
|
|
4687
|
+
|
|
4679
4688
|
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
|
|
4680
4689
|
|
|
4681
4690
|
/**
|
|
4682
4691
|
* JIT_GW_ExtInterface 模块,提供与客户端交互的功能
|
|
4683
4692
|
*/
|
|
4684
|
-
var
|
|
4693
|
+
var plugin_CA_ExtInterface = function () {
|
|
4685
4694
|
function CA_ExtInterface() {
|
|
4686
4695
|
_classCallCheck(this, CA_ExtInterface);
|
|
4687
4696
|
|
|
@@ -4747,11 +4756,34 @@ var CA_ExtInterface = function () {
|
|
|
4747
4756
|
*/
|
|
4748
4757
|
|
|
4749
4758
|
|
|
4750
|
-
CA_ExtInterface.prototype.sendAndWaitMessageEx = function
|
|
4751
|
-
|
|
4752
|
-
|
|
4753
|
-
|
|
4754
|
-
|
|
4759
|
+
CA_ExtInterface.prototype.sendAndWaitMessageEx = function () {
|
|
4760
|
+
var _ref = _asyncToGenerator( /*#__PURE__*/regenerator_default.a.mark(function _callee(operatorCmd, sendMsg) {
|
|
4761
|
+
var strSendMsg;
|
|
4762
|
+
return regenerator_default.a.wrap(function _callee$(_context) {
|
|
4763
|
+
while (1) {
|
|
4764
|
+
switch (_context.prev = _context.next) {
|
|
4765
|
+
case 0:
|
|
4766
|
+
_context.next = 2;
|
|
4767
|
+
return this.checkSessionWSURL();
|
|
4768
|
+
|
|
4769
|
+
case 2:
|
|
4770
|
+
strSendMsg = operatorCmd + ':' + sendMsg;
|
|
4771
|
+
return _context.abrupt('return', this.sendAndWaitMessage(this.currentSessionWSURL, strSendMsg));
|
|
4772
|
+
|
|
4773
|
+
case 4:
|
|
4774
|
+
case 'end':
|
|
4775
|
+
return _context.stop();
|
|
4776
|
+
}
|
|
4777
|
+
}
|
|
4778
|
+
}, _callee, this);
|
|
4779
|
+
}));
|
|
4780
|
+
|
|
4781
|
+
function sendAndWaitMessageEx(_x, _x2) {
|
|
4782
|
+
return _ref.apply(this, arguments);
|
|
4783
|
+
}
|
|
4784
|
+
|
|
4785
|
+
return sendAndWaitMessageEx;
|
|
4786
|
+
}();
|
|
4755
4787
|
|
|
4756
4788
|
/**
|
|
4757
4789
|
* 发送消息并等待响应
|
|
@@ -4772,13 +4804,13 @@ var CA_ExtInterface = function () {
|
|
|
4772
4804
|
globalXmlHttpRequest.setRequestHeader('Content-Type', 'text/plain;charset=UTF-8');
|
|
4773
4805
|
globalXmlHttpRequest.send(sendMsg);
|
|
4774
4806
|
ResultMsg = globalXmlHttpRequest.responseText;
|
|
4807
|
+
return ResultMsg;
|
|
4775
4808
|
} catch (e) {
|
|
4776
4809
|
this.currentSessionWSURL = '';
|
|
4777
4810
|
if (this.options.onError) {
|
|
4778
4811
|
this.options.onError.call(undefined, e);
|
|
4779
4812
|
}
|
|
4780
4813
|
}
|
|
4781
|
-
return ResultMsg;
|
|
4782
4814
|
};
|
|
4783
4815
|
|
|
4784
4816
|
/**
|
|
@@ -5541,12 +5573,12 @@ var CA_ExtInterface = function () {
|
|
|
5541
5573
|
*/
|
|
5542
5574
|
|
|
5543
5575
|
|
|
5544
|
-
CA_ExtInterface.prototype.getMessage = function getMessage(
|
|
5576
|
+
CA_ExtInterface.prototype.getMessage = function getMessage(_ref2) {
|
|
5545
5577
|
var _this = this;
|
|
5546
5578
|
|
|
5547
|
-
var action =
|
|
5548
|
-
|
|
5549
|
-
params =
|
|
5579
|
+
var action = _ref2.action,
|
|
5580
|
+
_ref2$params = _ref2.params,
|
|
5581
|
+
params = _ref2$params === undefined ? [] : _ref2$params;
|
|
5550
5582
|
|
|
5551
5583
|
return new Promise(function (resolve, reject) {
|
|
5552
5584
|
var obj = JSON.stringify({
|
|
@@ -5708,7 +5740,7 @@ var CA_ExtInterface = function () {
|
|
|
5708
5740
|
return CA_ExtInterface;
|
|
5709
5741
|
}();
|
|
5710
5742
|
|
|
5711
|
-
var caPlugin = new
|
|
5743
|
+
var caPlugin = new plugin_CA_ExtInterface();
|
|
5712
5744
|
/* harmony default export */ var src_plugin = (caPlugin);
|
|
5713
5745
|
// CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/calogin/src/main.vue?vue&type=script&lang=js&
|
|
5714
5746
|
//
|
package/lib/checkbox-group.js
CHANGED
|
@@ -286,6 +286,7 @@ var lodash = __webpack_require__(12);
|
|
|
286
286
|
|
|
287
287
|
|
|
288
288
|
var win = window.__WUJIE_RAW_WINDOW__ ? window.__WUJIE_RAW_WINDOW__ : window;
|
|
289
|
+
var winTop = getWinTop();
|
|
289
290
|
var isIE = /MSIE|Trident/.test(navigator.userAgent);
|
|
290
291
|
var parser = new external_ua_parser_js_["UAParser"]();
|
|
291
292
|
var $hueStep = 2;
|
|
@@ -833,19 +834,19 @@ var busEmit = function busEmit(that, _ref3) {
|
|
|
833
834
|
return;
|
|
834
835
|
}
|
|
835
836
|
if (isIE) {
|
|
836
|
-
if (
|
|
837
|
-
|
|
837
|
+
if (winTop !== win.self) {
|
|
838
|
+
winTop.postMessage({ method: method, query: args, args: args }, '*');
|
|
838
839
|
return;
|
|
839
840
|
}
|
|
840
841
|
var bus = that ? that.bus || that.$root.Bus || that.$root.$bus : null;
|
|
841
842
|
bus && (Array.isArray(args) ? bus.$emit.apply(bus, [method].concat(args)) : bus.$emit(method, args));
|
|
842
843
|
} else {
|
|
843
|
-
if (
|
|
844
|
+
if (winTop !== win.self) {
|
|
844
845
|
var _bus2 = win.$wujie ? win.$wujie.bus : null;
|
|
845
846
|
if (_bus2) {
|
|
846
847
|
Array.isArray(args) ? _bus2.$emit.apply(_bus2, [method].concat(args)) : _bus2.$emit(method, args);
|
|
847
848
|
} else {
|
|
848
|
-
|
|
849
|
+
winTop.postMessage({ method: method, query: args, args: args }, '*');
|
|
849
850
|
}
|
|
850
851
|
return;
|
|
851
852
|
}
|
|
@@ -1083,7 +1084,7 @@ var delUrlParam = function delUrlParam(_ref4) {
|
|
|
1083
1084
|
|
|
1084
1085
|
var pUrl = '';
|
|
1085
1086
|
try {
|
|
1086
|
-
pUrl =
|
|
1087
|
+
pUrl = winTop.location.href;
|
|
1087
1088
|
} catch (error) {
|
|
1088
1089
|
pUrl = win.location.href;
|
|
1089
1090
|
}
|
|
@@ -2537,7 +2538,7 @@ var isLogined = function () {
|
|
|
2537
2538
|
pathname = '';
|
|
2538
2539
|
|
|
2539
2540
|
try {
|
|
2540
|
-
pathname =
|
|
2541
|
+
pathname = winTop.location.pathname;
|
|
2541
2542
|
} catch (error) {
|
|
2542
2543
|
pathname = win.location.pathname;
|
|
2543
2544
|
}
|
|
@@ -2603,12 +2604,12 @@ var isLogined = function () {
|
|
|
2603
2604
|
});
|
|
2604
2605
|
try {
|
|
2605
2606
|
var url = delUrlParam({
|
|
2606
|
-
url:
|
|
2607
|
+
url: winTop.location.href,
|
|
2607
2608
|
key: ['serverId', 'authType', 'code', 'sessionId']
|
|
2608
2609
|
});
|
|
2609
|
-
|
|
2610
|
+
winTop.location.href = url;
|
|
2610
2611
|
setTimeout(function () {
|
|
2611
|
-
|
|
2612
|
+
winTop.location.reload();
|
|
2612
2613
|
}, 200);
|
|
2613
2614
|
} catch (error) {
|
|
2614
2615
|
var _url2 = delUrlParam({
|
|
@@ -2627,8 +2628,8 @@ var isLogined = function () {
|
|
|
2627
2628
|
break;
|
|
2628
2629
|
case 3:
|
|
2629
2630
|
try {
|
|
2630
|
-
var href = results.authorizeUrl.replace('{redirectUri}', encodeURIComponent(
|
|
2631
|
-
|
|
2631
|
+
var href = results.authorizeUrl.replace('{redirectUri}', encodeURIComponent(winTop.location.href));
|
|
2632
|
+
winTop.location.href = href;
|
|
2632
2633
|
} catch (error) {
|
|
2633
2634
|
var _href = results.authorizeUrl.replace('{redirectUri}', encodeURIComponent(win.location.href));
|
|
2634
2635
|
win.location.href = _href;
|
|
@@ -2642,18 +2643,18 @@ var isLogined = function () {
|
|
|
2642
2643
|
sessionStorage.setItem('extUserBindHandleId', results.extUserBindHandleId);
|
|
2643
2644
|
try {
|
|
2644
2645
|
if (loginPage) {
|
|
2645
|
-
|
|
2646
|
+
winTop.location.replace(loginPage);
|
|
2646
2647
|
} else if (document.referrer) {
|
|
2647
2648
|
var referrerUrl = new URL(document.referrer);
|
|
2648
|
-
if (referrerUrl.host !==
|
|
2649
|
-
|
|
2650
|
-
} else if (
|
|
2651
|
-
|
|
2649
|
+
if (referrerUrl.host !== winTop.location.host) {
|
|
2650
|
+
winTop.location.replace(document.referrer);
|
|
2651
|
+
} 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) {
|
|
2652
|
+
winTop.location.href = './login.html';
|
|
2652
2653
|
} else {
|
|
2653
2654
|
next('/login');
|
|
2654
2655
|
}
|
|
2655
|
-
} else if (
|
|
2656
|
-
|
|
2656
|
+
} else if (winTop.location.href.indexOf('main.html') > -1) {
|
|
2657
|
+
winTop.location.href = './login.html';
|
|
2657
2658
|
} else {
|
|
2658
2659
|
next('/login');
|
|
2659
2660
|
}
|
|
@@ -2672,18 +2673,18 @@ var isLogined = function () {
|
|
|
2672
2673
|
callback: function callback() {
|
|
2673
2674
|
try {
|
|
2674
2675
|
if (loginPage) {
|
|
2675
|
-
|
|
2676
|
+
winTop.location.replace(loginPage);
|
|
2676
2677
|
} else if (document.referrer) {
|
|
2677
2678
|
var referrerUrl = new URL(document.referrer);
|
|
2678
|
-
if (referrerUrl.host !==
|
|
2679
|
-
|
|
2680
|
-
} else if (
|
|
2681
|
-
|
|
2679
|
+
if (referrerUrl.host !== winTop.location.host) {
|
|
2680
|
+
winTop.location.replace(document.referrer);
|
|
2681
|
+
} 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) {
|
|
2682
|
+
winTop.location.href = './login.html';
|
|
2682
2683
|
} else {
|
|
2683
2684
|
next('/login');
|
|
2684
2685
|
}
|
|
2685
|
-
} else if (
|
|
2686
|
-
|
|
2686
|
+
} else if (winTop.location.href.indexOf('main.html') > -1) {
|
|
2687
|
+
winTop.location.href = './login.html';
|
|
2687
2688
|
} else {
|
|
2688
2689
|
next('/login');
|
|
2689
2690
|
}
|
|
@@ -2712,19 +2713,19 @@ var isLogined = function () {
|
|
|
2712
2713
|
} else {
|
|
2713
2714
|
try {
|
|
2714
2715
|
if (loginPage) {
|
|
2715
|
-
|
|
2716
|
+
winTop.location.replace(loginPage);
|
|
2716
2717
|
} else if (document.referrer) {
|
|
2717
2718
|
referrerUrl = new URL(document.referrer);
|
|
2718
2719
|
|
|
2719
|
-
if (referrerUrl.host !==
|
|
2720
|
-
|
|
2721
|
-
} else if (
|
|
2722
|
-
|
|
2720
|
+
if (referrerUrl.host !== winTop.location.host) {
|
|
2721
|
+
winTop.location.replace(document.referrer);
|
|
2722
|
+
} 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) {
|
|
2723
|
+
winTop.location.href = './login.html';
|
|
2723
2724
|
} else {
|
|
2724
2725
|
next('/login');
|
|
2725
2726
|
}
|
|
2726
|
-
} else if (
|
|
2727
|
-
|
|
2727
|
+
} else if (winTop.location.href.indexOf('main.html') > -1) {
|
|
2728
|
+
winTop.location.href = './login.html';
|
|
2728
2729
|
} else {
|
|
2729
2730
|
next('/login');
|
|
2730
2731
|
}
|
|
@@ -2856,7 +2857,7 @@ var util_loading = function loading($loading, res) {
|
|
|
2856
2857
|
}
|
|
2857
2858
|
if (isObject(res)) {
|
|
2858
2859
|
var config = extend({}, {
|
|
2859
|
-
target:
|
|
2860
|
+
target: winTop.document.body,
|
|
2860
2861
|
fullscreen: true,
|
|
2861
2862
|
background: 'rgba(0, 0, 0, 0.65)',
|
|
2862
2863
|
spinner: 'el-icon-loading',
|
|
@@ -2865,7 +2866,7 @@ var util_loading = function loading($loading, res) {
|
|
|
2865
2866
|
return $loading(config);
|
|
2866
2867
|
} else {
|
|
2867
2868
|
var _loading = $loading({
|
|
2868
|
-
target:
|
|
2869
|
+
target: winTop.document.body,
|
|
2869
2870
|
fullscreen: true,
|
|
2870
2871
|
background: 'rgba(0, 0, 0, 0.65)',
|
|
2871
2872
|
spinner: 'el-icon-loading',
|
|
@@ -3011,7 +3012,7 @@ var util_responses = function responses(data) {
|
|
|
3011
3012
|
removeStorage(['Authorization', 'token', 'ssId', 'userId', 'userName', 'deviceUnique', 'menus', 'useCaseCodes', 'mainConfig', 'jump', 'showLaunch']);
|
|
3012
3013
|
var href = '';
|
|
3013
3014
|
try {
|
|
3014
|
-
href =
|
|
3015
|
+
href = winTop.location.href;
|
|
3015
3016
|
} catch (error) {
|
|
3016
3017
|
href = win.location.href;
|
|
3017
3018
|
}
|
|
@@ -3036,7 +3037,7 @@ var util_responses = function responses(data) {
|
|
|
3036
3037
|
if (loginPage) {
|
|
3037
3038
|
var src = void 0;
|
|
3038
3039
|
if (!startWith(loginPage, ['http', '/'], true)) {
|
|
3039
|
-
var pathname =
|
|
3040
|
+
var pathname = winTop.location.pathname;
|
|
3040
3041
|
if (pathname !== '/') {
|
|
3041
3042
|
pathname = pathname.split('/');
|
|
3042
3043
|
pathname.splice(pathname.length - 1);
|
|
@@ -3048,16 +3049,16 @@ var util_responses = function responses(data) {
|
|
|
3048
3049
|
} else {
|
|
3049
3050
|
src = loginPage;
|
|
3050
3051
|
}
|
|
3051
|
-
|
|
3052
|
-
} else if (
|
|
3053
|
-
|
|
3052
|
+
winTop.location.href = src;
|
|
3053
|
+
} else if (winTop.location.href.indexOf('main.html') > -1) {
|
|
3054
|
+
winTop.location.href = './login.html';
|
|
3054
3055
|
} else {
|
|
3055
|
-
var hash =
|
|
3056
|
+
var hash = winTop.location.hash;
|
|
3056
3057
|
if (hash) {
|
|
3057
|
-
var len =
|
|
3058
|
-
|
|
3058
|
+
var len = winTop.location.href.indexOf(hash);
|
|
3059
|
+
winTop.location.href = win.location.href.slice(0, len) + '#/login';
|
|
3059
3060
|
} else {
|
|
3060
|
-
|
|
3061
|
+
winTop.location.href = '/login.html';
|
|
3061
3062
|
}
|
|
3062
3063
|
}
|
|
3063
3064
|
} catch (error) {
|
|
@@ -3876,9 +3877,9 @@ var removeCookie = function removeCookie(key) {
|
|
|
3876
3877
|
|
|
3877
3878
|
var winTopOpen = function winTopOpen(config) {
|
|
3878
3879
|
if (isIE) {
|
|
3879
|
-
if (
|
|
3880
|
+
if (winTop !== win.self) {
|
|
3880
3881
|
try {
|
|
3881
|
-
|
|
3882
|
+
winTop.windowOpen(config);
|
|
3882
3883
|
} catch (error) {
|
|
3883
3884
|
win.postMessage({ method: 'windowOpen', query: config }, '*');
|
|
3884
3885
|
}
|