eoss-ui 0.4.91 → 0.4.93

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.
Files changed (58) hide show
  1. package/lib/button-group.js +56 -37
  2. package/lib/button.js +56 -37
  3. package/lib/card.js +2 -2
  4. package/lib/cascader.js +2 -2
  5. package/lib/checkbox-group.js +56 -37
  6. package/lib/clients.js +2 -2
  7. package/lib/data-table-form.js +55 -36
  8. package/lib/data-table.js +56 -37
  9. package/lib/date-picker.js +56 -37
  10. package/lib/dialog.js +55 -36
  11. package/lib/enterprise.js +2 -2
  12. package/lib/eoss-ui.common.js +321 -131
  13. package/lib/error-page.js +2 -2
  14. package/lib/flow-group.js +56 -37
  15. package/lib/flow-list.js +57 -38
  16. package/lib/flow.js +56 -37
  17. package/lib/form.js +56 -37
  18. package/lib/handle-user.js +56 -37
  19. package/lib/handler.js +56 -37
  20. package/lib/icons.js +2 -2
  21. package/lib/index.js +1 -1
  22. package/lib/input-number.js +56 -37
  23. package/lib/input.js +56 -37
  24. package/lib/label.js +2 -2
  25. package/lib/layout.js +2 -2
  26. package/lib/login.js +55 -36
  27. package/lib/main.js +327 -137
  28. package/lib/menu.js +2 -2
  29. package/lib/nav.js +56 -37
  30. package/lib/notify.js +2 -2
  31. package/lib/page.js +56 -37
  32. package/lib/pagination.js +2 -2
  33. package/lib/player.js +70 -51
  34. package/lib/qr-code.js +63 -44
  35. package/lib/radio-group.js +56 -37
  36. package/lib/retrial-auth.js +56 -37
  37. package/lib/select-ganged.js +56 -37
  38. package/lib/select.js +63 -44
  39. package/lib/selector-panel.js +63 -44
  40. package/lib/selector.js +63 -44
  41. package/lib/sizer.js +56 -37
  42. package/lib/steps.js +56 -37
  43. package/lib/switch.js +56 -37
  44. package/lib/table-form.js +56 -37
  45. package/lib/tabs-panel.js +2 -2
  46. package/lib/tabs.js +56 -37
  47. package/lib/tips.js +56 -37
  48. package/lib/toolbar.js +2 -2
  49. package/lib/tree-group.js +56 -37
  50. package/lib/tree.js +56 -37
  51. package/lib/upload.js +56 -37
  52. package/lib/utils/util.js +43 -24
  53. package/lib/wujie.js +56 -37
  54. package/lib/wxlogin.js +57 -38
  55. package/package.json +2 -2
  56. package/packages/main/src/main.vue +180 -26
  57. package/src/index.js +1 -1
  58. package/src/utils/util.js +50 -28
@@ -92,13 +92,13 @@ module.exports =
92
92
 
93
93
  "use strict";
94
94
  /* harmony import */ var _config_api__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(1);
95
- /* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(4);
95
+ /* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(5);
96
96
  /* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(axios__WEBPACK_IMPORTED_MODULE_1__);
97
- /* harmony import */ var qs__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(3);
97
+ /* harmony import */ var qs__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(4);
98
98
  /* harmony import */ var qs__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(qs__WEBPACK_IMPORTED_MODULE_2__);
99
99
  /* harmony import */ var json_bigint__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(6);
100
100
  /* harmony import */ var json_bigint__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(json_bigint__WEBPACK_IMPORTED_MODULE_3__);
101
- /* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(5);
101
+ /* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(2);
102
102
  /* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(eoss_element__WEBPACK_IMPORTED_MODULE_4__);
103
103
  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; };
104
104
 
@@ -449,11 +449,11 @@ var ajax = function ajax(_ref) {
449
449
  }
450
450
  if (method === 'post' && format) {
451
451
  data = qs__WEBPACK_IMPORTED_MODULE_2___default.a.stringify(data);
452
- if (!header['content-type']) {
452
+ if (!header['content-type'] && !header['Content-Type']) {
453
453
  header['content-type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
454
454
  }
455
455
  } else {
456
- if (!header['content-type']) {
456
+ if (!header['content-type'] && !header['Content-Type']) {
457
457
  header['content-type'] = 'application/json;charset=UTF-8';
458
458
  }
459
459
  }
@@ -1909,8 +1909,6 @@ var isFunction = function isFunction(obj) {
1909
1909
  * @param {boolean} [redirect] - 是否重定向(用于新脚手架)
1910
1910
  **/
1911
1911
  var isLogined = function isLogined(_ref8) {
1912
- var _this = this;
1913
-
1914
1912
  var to = _ref8.to,
1915
1913
  from = _ref8.from,
1916
1914
  next = _ref8.next,
@@ -1929,6 +1927,17 @@ var isLogined = function isLogined(_ref8) {
1929
1927
  if (logined || cookie == true || cookie == 1) {
1930
1928
  if (loginPage) {
1931
1929
  sessionStorage.setItem('loginPage', loginPage);
1930
+ if (!startWith(loginPage, ['http', '/'], true)) {
1931
+ var pathname = win.top.location.pathname;
1932
+ if (pathname !== '/') {
1933
+ pathname = pathname.split('/');
1934
+ pathname.splice(pathname.length - 1);
1935
+ pathname = pathname.join('/');
1936
+ loginPage = pathname + '/' + loginPage.replace('./', '');
1937
+ } else {
1938
+ loginPage = pathname + loginPage.replace('./', '');
1939
+ }
1940
+ }
1932
1941
  }
1933
1942
  next();
1934
1943
  } else {
@@ -1941,7 +1950,7 @@ var isLogined = function isLogined(_ref8) {
1941
1950
  url = win.location.href;
1942
1951
  break;
1943
1952
  case 'blank':
1944
- url = win.location.href;
1953
+ url = win.open(url);
1945
1954
  break;
1946
1955
  case 'parent':
1947
1956
  url = win.parent.location.href;
@@ -2000,31 +2009,41 @@ var isLogined = function isLogined(_ref8) {
2000
2009
  }
2001
2010
  break;
2002
2011
  case 4:
2003
- _this.$alert(results.msg ? results.msg : '账号未绑定,账号密码登录后自动绑定!', '提示', {
2012
+ eoss_element__WEBPACK_IMPORTED_MODULE_4__["MessageBox"].alert(results.msg ? results.msg : '账号未绑定,账号密码登录后自动绑定!', '提示', {
2004
2013
  confirmButtonText: '确定',
2005
- type: 'error'
2006
- }).then(function () {
2007
- sessionStorage.setItem('extUserBindHandleId', results.extUserBindHandleId);
2008
- window.location.href = delUrlParam({ key: 'code' });
2009
- if (loginPage) {
2010
- win.top.location.replace(loginPage);
2011
- } else if (document.referrer) {
2012
- win.top.location.replace(document.referrer);
2013
- } else if (win.top.location.href.indexOf('main.html') > -1) {
2014
- win.top.location.href = './login.html';
2015
- } else {
2016
- next('/login');
2014
+ type: 'error',
2015
+ callback: function callback() {
2016
+ sessionStorage.setItem('extUserBindHandleId', results.extUserBindHandleId);
2017
+ if (loginPage) {
2018
+ win.top.location.replace(loginPage);
2019
+ } else if (document.referrer) {
2020
+ win.top.location.replace(document.referrer);
2021
+ } else if (win.top.location.href.indexOf('main.html') > -1) {
2022
+ win.top.location.href = './login.html';
2023
+ } else {
2024
+ next('/login');
2025
+ }
2017
2026
  }
2018
- }).catch(function (e) {});
2027
+ });
2019
2028
  break;
2020
2029
  default:
2021
2030
  }
2022
2031
  } else {
2023
- if (token) {
2024
- next();
2025
- } else {
2026
- alert(res.msg);
2027
- }
2032
+ eoss_element__WEBPACK_IMPORTED_MODULE_4__["MessageBox"].alert(res.msg, '提示', {
2033
+ confirmButtonText: '确定',
2034
+ type: 'error',
2035
+ callback: function callback() {
2036
+ if (loginPage) {
2037
+ win.top.location.replace(loginPage);
2038
+ } else if (document.referrer) {
2039
+ win.top.location.replace(document.referrer);
2040
+ } else if (win.top.location.href.indexOf('main.html') > -1) {
2041
+ win.top.location.href = './login.html';
2042
+ } else {
2043
+ next('/login');
2044
+ }
2045
+ }
2046
+ });
2028
2047
  }
2029
2048
  }).catch(function (e) {});
2030
2049
  } else if (token || to.path === '/' || to.path === '/404' || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
@@ -3280,6 +3299,13 @@ var formContents = '/config/admin/online/onlineForm/render';
3280
3299
  /***/ }),
3281
3300
 
3282
3301
  /***/ 2:
3302
+ /***/ (function(module, exports) {
3303
+
3304
+ module.exports = require("eoss-element");
3305
+
3306
+ /***/ }),
3307
+
3308
+ /***/ 3:
3283
3309
  /***/ (function(module, __webpack_exports__, __webpack_require__) {
3284
3310
 
3285
3311
  "use strict";
@@ -3382,26 +3408,19 @@ function normalizeComponent(
3382
3408
  }
3383
3409
 
3384
3410
 
3385
- /***/ }),
3386
-
3387
- /***/ 3:
3388
- /***/ (function(module, exports) {
3389
-
3390
- module.exports = require("qs");
3391
-
3392
3411
  /***/ }),
3393
3412
 
3394
3413
  /***/ 4:
3395
3414
  /***/ (function(module, exports) {
3396
3415
 
3397
- module.exports = require("axios");
3416
+ module.exports = require("qs");
3398
3417
 
3399
3418
  /***/ }),
3400
3419
 
3401
3420
  /***/ 5:
3402
3421
  /***/ (function(module, exports) {
3403
3422
 
3404
- module.exports = require("eoss-element");
3423
+ module.exports = require("axios");
3405
3424
 
3406
3425
  /***/ }),
3407
3426
 
@@ -3519,7 +3538,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
3519
3538
  // CONCATENATED MODULE: ./packages/input-number/src/main.vue?vue&type=script&lang=js&
3520
3539
  /* harmony default export */ var src_mainvue_type_script_lang_js_ = (mainvue_type_script_lang_js_);
3521
3540
  // EXTERNAL MODULE: ./node_modules/vue-loader/lib/runtime/componentNormalizer.js
3522
- var componentNormalizer = __webpack_require__(2);
3541
+ var componentNormalizer = __webpack_require__(3);
3523
3542
 
3524
3543
  // CONCATENATED MODULE: ./packages/input-number/src/main.vue
3525
3544
  var main_render, staticRenderFns
package/lib/input.js CHANGED
@@ -92,13 +92,13 @@ module.exports =
92
92
 
93
93
  "use strict";
94
94
  /* harmony import */ var _config_api__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(1);
95
- /* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(4);
95
+ /* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(5);
96
96
  /* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(axios__WEBPACK_IMPORTED_MODULE_1__);
97
- /* harmony import */ var qs__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(3);
97
+ /* harmony import */ var qs__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(4);
98
98
  /* harmony import */ var qs__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(qs__WEBPACK_IMPORTED_MODULE_2__);
99
99
  /* harmony import */ var json_bigint__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(6);
100
100
  /* harmony import */ var json_bigint__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(json_bigint__WEBPACK_IMPORTED_MODULE_3__);
101
- /* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(5);
101
+ /* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(2);
102
102
  /* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(eoss_element__WEBPACK_IMPORTED_MODULE_4__);
103
103
  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; };
104
104
 
@@ -449,11 +449,11 @@ var ajax = function ajax(_ref) {
449
449
  }
450
450
  if (method === 'post' && format) {
451
451
  data = qs__WEBPACK_IMPORTED_MODULE_2___default.a.stringify(data);
452
- if (!header['content-type']) {
452
+ if (!header['content-type'] && !header['Content-Type']) {
453
453
  header['content-type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
454
454
  }
455
455
  } else {
456
- if (!header['content-type']) {
456
+ if (!header['content-type'] && !header['Content-Type']) {
457
457
  header['content-type'] = 'application/json;charset=UTF-8';
458
458
  }
459
459
  }
@@ -1909,8 +1909,6 @@ var isFunction = function isFunction(obj) {
1909
1909
  * @param {boolean} [redirect] - 是否重定向(用于新脚手架)
1910
1910
  **/
1911
1911
  var isLogined = function isLogined(_ref8) {
1912
- var _this = this;
1913
-
1914
1912
  var to = _ref8.to,
1915
1913
  from = _ref8.from,
1916
1914
  next = _ref8.next,
@@ -1929,6 +1927,17 @@ var isLogined = function isLogined(_ref8) {
1929
1927
  if (logined || cookie == true || cookie == 1) {
1930
1928
  if (loginPage) {
1931
1929
  sessionStorage.setItem('loginPage', loginPage);
1930
+ if (!startWith(loginPage, ['http', '/'], true)) {
1931
+ var pathname = win.top.location.pathname;
1932
+ if (pathname !== '/') {
1933
+ pathname = pathname.split('/');
1934
+ pathname.splice(pathname.length - 1);
1935
+ pathname = pathname.join('/');
1936
+ loginPage = pathname + '/' + loginPage.replace('./', '');
1937
+ } else {
1938
+ loginPage = pathname + loginPage.replace('./', '');
1939
+ }
1940
+ }
1932
1941
  }
1933
1942
  next();
1934
1943
  } else {
@@ -1941,7 +1950,7 @@ var isLogined = function isLogined(_ref8) {
1941
1950
  url = win.location.href;
1942
1951
  break;
1943
1952
  case 'blank':
1944
- url = win.location.href;
1953
+ url = win.open(url);
1945
1954
  break;
1946
1955
  case 'parent':
1947
1956
  url = win.parent.location.href;
@@ -2000,31 +2009,41 @@ var isLogined = function isLogined(_ref8) {
2000
2009
  }
2001
2010
  break;
2002
2011
  case 4:
2003
- _this.$alert(results.msg ? results.msg : '账号未绑定,账号密码登录后自动绑定!', '提示', {
2012
+ eoss_element__WEBPACK_IMPORTED_MODULE_4__["MessageBox"].alert(results.msg ? results.msg : '账号未绑定,账号密码登录后自动绑定!', '提示', {
2004
2013
  confirmButtonText: '确定',
2005
- type: 'error'
2006
- }).then(function () {
2007
- sessionStorage.setItem('extUserBindHandleId', results.extUserBindHandleId);
2008
- window.location.href = delUrlParam({ key: 'code' });
2009
- if (loginPage) {
2010
- win.top.location.replace(loginPage);
2011
- } else if (document.referrer) {
2012
- win.top.location.replace(document.referrer);
2013
- } else if (win.top.location.href.indexOf('main.html') > -1) {
2014
- win.top.location.href = './login.html';
2015
- } else {
2016
- next('/login');
2014
+ type: 'error',
2015
+ callback: function callback() {
2016
+ sessionStorage.setItem('extUserBindHandleId', results.extUserBindHandleId);
2017
+ if (loginPage) {
2018
+ win.top.location.replace(loginPage);
2019
+ } else if (document.referrer) {
2020
+ win.top.location.replace(document.referrer);
2021
+ } else if (win.top.location.href.indexOf('main.html') > -1) {
2022
+ win.top.location.href = './login.html';
2023
+ } else {
2024
+ next('/login');
2025
+ }
2017
2026
  }
2018
- }).catch(function (e) {});
2027
+ });
2019
2028
  break;
2020
2029
  default:
2021
2030
  }
2022
2031
  } else {
2023
- if (token) {
2024
- next();
2025
- } else {
2026
- alert(res.msg);
2027
- }
2032
+ eoss_element__WEBPACK_IMPORTED_MODULE_4__["MessageBox"].alert(res.msg, '提示', {
2033
+ confirmButtonText: '确定',
2034
+ type: 'error',
2035
+ callback: function callback() {
2036
+ if (loginPage) {
2037
+ win.top.location.replace(loginPage);
2038
+ } else if (document.referrer) {
2039
+ win.top.location.replace(document.referrer);
2040
+ } else if (win.top.location.href.indexOf('main.html') > -1) {
2041
+ win.top.location.href = './login.html';
2042
+ } else {
2043
+ next('/login');
2044
+ }
2045
+ }
2046
+ });
2028
2047
  }
2029
2048
  }).catch(function (e) {});
2030
2049
  } else if (token || to.path === '/' || to.path === '/404' || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
@@ -3305,6 +3324,13 @@ var bankCard = { pattern: new RegExp('^([1-9]{1})(\\d{14}|\\d{18})$'), message:
3305
3324
  /***/ }),
3306
3325
 
3307
3326
  /***/ 2:
3327
+ /***/ (function(module, exports) {
3328
+
3329
+ module.exports = require("eoss-element");
3330
+
3331
+ /***/ }),
3332
+
3333
+ /***/ 3:
3308
3334
  /***/ (function(module, __webpack_exports__, __webpack_require__) {
3309
3335
 
3310
3336
  "use strict";
@@ -3407,26 +3433,19 @@ function normalizeComponent(
3407
3433
  }
3408
3434
 
3409
3435
 
3410
- /***/ }),
3411
-
3412
- /***/ 3:
3413
- /***/ (function(module, exports) {
3414
-
3415
- module.exports = require("qs");
3416
-
3417
3436
  /***/ }),
3418
3437
 
3419
3438
  /***/ 4:
3420
3439
  /***/ (function(module, exports) {
3421
3440
 
3422
- module.exports = require("axios");
3441
+ module.exports = require("qs");
3423
3442
 
3424
3443
  /***/ }),
3425
3444
 
3426
3445
  /***/ 5:
3427
3446
  /***/ (function(module, exports) {
3428
3447
 
3429
- module.exports = require("eoss-element");
3448
+ module.exports = require("axios");
3430
3449
 
3431
3450
  /***/ }),
3432
3451
 
@@ -3732,7 +3751,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
3732
3751
  // CONCATENATED MODULE: ./packages/input/src/main.vue?vue&type=script&lang=js&
3733
3752
  /* harmony default export */ var src_mainvue_type_script_lang_js_ = (mainvue_type_script_lang_js_);
3734
3753
  // EXTERNAL MODULE: ./node_modules/vue-loader/lib/runtime/componentNormalizer.js
3735
- var componentNormalizer = __webpack_require__(2);
3754
+ var componentNormalizer = __webpack_require__(3);
3736
3755
 
3737
3756
  // CONCATENATED MODULE: ./packages/input/src/main.vue
3738
3757
  var render, staticRenderFns
package/lib/label.js CHANGED
@@ -87,7 +87,7 @@ module.exports =
87
87
  /************************************************************************/
88
88
  /******/ ({
89
89
 
90
- /***/ 2:
90
+ /***/ 3:
91
91
  /***/ (function(module, __webpack_exports__, __webpack_require__) {
92
92
 
93
93
  "use strict";
@@ -574,7 +574,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
574
574
  // CONCATENATED MODULE: ./packages/label/src/main.vue?vue&type=script&lang=js&
575
575
  /* harmony default export */ var src_mainvue_type_script_lang_js_ = (mainvue_type_script_lang_js_);
576
576
  // EXTERNAL MODULE: ./node_modules/vue-loader/lib/runtime/componentNormalizer.js
577
- var componentNormalizer = __webpack_require__(2);
577
+ var componentNormalizer = __webpack_require__(3);
578
578
 
579
579
  // CONCATENATED MODULE: ./packages/label/src/main.vue
580
580
  var render, staticRenderFns
package/lib/layout.js CHANGED
@@ -94,7 +94,7 @@ module.exports = require("interactjs");
94
94
 
95
95
  /***/ }),
96
96
 
97
- /***/ 2:
97
+ /***/ 3:
98
98
  /***/ (function(module, __webpack_exports__, __webpack_require__) {
99
99
 
100
100
  "use strict";
@@ -424,7 +424,7 @@ var external_interactjs_default = /*#__PURE__*/__webpack_require__.n(external_in
424
424
  // CONCATENATED MODULE: ./packages/layout/src/item.vue?vue&type=script&lang=js&
425
425
  /* harmony default export */ var src_itemvue_type_script_lang_js_ = (itemvue_type_script_lang_js_);
426
426
  // EXTERNAL MODULE: ./node_modules/vue-loader/lib/runtime/componentNormalizer.js
427
- var componentNormalizer = __webpack_require__(2);
427
+ var componentNormalizer = __webpack_require__(3);
428
428
 
429
429
  // CONCATENATED MODULE: ./packages/layout/src/item.vue
430
430
 
package/lib/login.js CHANGED
@@ -91,13 +91,13 @@ module.exports =
91
91
 
92
92
  "use strict";
93
93
  /* harmony import */ var _config_api__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(1);
94
- /* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(4);
94
+ /* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(5);
95
95
  /* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(axios__WEBPACK_IMPORTED_MODULE_1__);
96
- /* harmony import */ var qs__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(3);
96
+ /* harmony import */ var qs__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(4);
97
97
  /* harmony import */ var qs__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(qs__WEBPACK_IMPORTED_MODULE_2__);
98
98
  /* harmony import */ var json_bigint__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(6);
99
99
  /* harmony import */ var json_bigint__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(json_bigint__WEBPACK_IMPORTED_MODULE_3__);
100
- /* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(5);
100
+ /* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(2);
101
101
  /* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(eoss_element__WEBPACK_IMPORTED_MODULE_4__);
102
102
  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; };
103
103
 
@@ -448,11 +448,11 @@ var ajax = function ajax(_ref) {
448
448
  }
449
449
  if (method === 'post' && format) {
450
450
  data = qs__WEBPACK_IMPORTED_MODULE_2___default.a.stringify(data);
451
- if (!header['content-type']) {
451
+ if (!header['content-type'] && !header['Content-Type']) {
452
452
  header['content-type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
453
453
  }
454
454
  } else {
455
- if (!header['content-type']) {
455
+ if (!header['content-type'] && !header['Content-Type']) {
456
456
  header['content-type'] = 'application/json;charset=UTF-8';
457
457
  }
458
458
  }
@@ -1908,8 +1908,6 @@ var isFunction = function isFunction(obj) {
1908
1908
  * @param {boolean} [redirect] - 是否重定向(用于新脚手架)
1909
1909
  **/
1910
1910
  var isLogined = function isLogined(_ref8) {
1911
- var _this = this;
1912
-
1913
1911
  var to = _ref8.to,
1914
1912
  from = _ref8.from,
1915
1913
  next = _ref8.next,
@@ -1928,6 +1926,17 @@ var isLogined = function isLogined(_ref8) {
1928
1926
  if (logined || cookie == true || cookie == 1) {
1929
1927
  if (loginPage) {
1930
1928
  sessionStorage.setItem('loginPage', loginPage);
1929
+ if (!startWith(loginPage, ['http', '/'], true)) {
1930
+ var pathname = win.top.location.pathname;
1931
+ if (pathname !== '/') {
1932
+ pathname = pathname.split('/');
1933
+ pathname.splice(pathname.length - 1);
1934
+ pathname = pathname.join('/');
1935
+ loginPage = pathname + '/' + loginPage.replace('./', '');
1936
+ } else {
1937
+ loginPage = pathname + loginPage.replace('./', '');
1938
+ }
1939
+ }
1931
1940
  }
1932
1941
  next();
1933
1942
  } else {
@@ -1940,7 +1949,7 @@ var isLogined = function isLogined(_ref8) {
1940
1949
  url = win.location.href;
1941
1950
  break;
1942
1951
  case 'blank':
1943
- url = win.location.href;
1952
+ url = win.open(url);
1944
1953
  break;
1945
1954
  case 'parent':
1946
1955
  url = win.parent.location.href;
@@ -1999,31 +2008,41 @@ var isLogined = function isLogined(_ref8) {
1999
2008
  }
2000
2009
  break;
2001
2010
  case 4:
2002
- _this.$alert(results.msg ? results.msg : '账号未绑定,账号密码登录后自动绑定!', '提示', {
2011
+ eoss_element__WEBPACK_IMPORTED_MODULE_4__["MessageBox"].alert(results.msg ? results.msg : '账号未绑定,账号密码登录后自动绑定!', '提示', {
2003
2012
  confirmButtonText: '确定',
2004
- type: 'error'
2005
- }).then(function () {
2006
- sessionStorage.setItem('extUserBindHandleId', results.extUserBindHandleId);
2007
- window.location.href = delUrlParam({ key: 'code' });
2008
- if (loginPage) {
2009
- win.top.location.replace(loginPage);
2010
- } else if (document.referrer) {
2011
- win.top.location.replace(document.referrer);
2012
- } else if (win.top.location.href.indexOf('main.html') > -1) {
2013
- win.top.location.href = './login.html';
2014
- } else {
2015
- next('/login');
2013
+ type: 'error',
2014
+ callback: function callback() {
2015
+ sessionStorage.setItem('extUserBindHandleId', results.extUserBindHandleId);
2016
+ if (loginPage) {
2017
+ win.top.location.replace(loginPage);
2018
+ } else if (document.referrer) {
2019
+ win.top.location.replace(document.referrer);
2020
+ } else if (win.top.location.href.indexOf('main.html') > -1) {
2021
+ win.top.location.href = './login.html';
2022
+ } else {
2023
+ next('/login');
2024
+ }
2016
2025
  }
2017
- }).catch(function (e) {});
2026
+ });
2018
2027
  break;
2019
2028
  default:
2020
2029
  }
2021
2030
  } else {
2022
- if (token) {
2023
- next();
2024
- } else {
2025
- alert(res.msg);
2026
- }
2031
+ eoss_element__WEBPACK_IMPORTED_MODULE_4__["MessageBox"].alert(res.msg, '提示', {
2032
+ confirmButtonText: '确定',
2033
+ type: 'error',
2034
+ callback: function callback() {
2035
+ if (loginPage) {
2036
+ win.top.location.replace(loginPage);
2037
+ } else if (document.referrer) {
2038
+ win.top.location.replace(document.referrer);
2039
+ } else if (win.top.location.href.indexOf('main.html') > -1) {
2040
+ win.top.location.href = './login.html';
2041
+ } else {
2042
+ next('/login');
2043
+ }
2044
+ }
2045
+ });
2027
2046
  }
2028
2047
  }).catch(function (e) {});
2029
2048
  } else if (token || to.path === '/' || to.path === '/404' || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
@@ -3277,6 +3296,12 @@ var formContents = '/config/admin/online/onlineForm/render';
3277
3296
 
3278
3297
  /***/ }),
3279
3298
  /* 2 */
3299
+ /***/ (function(module, exports) {
3300
+
3301
+ module.exports = require("eoss-element");
3302
+
3303
+ /***/ }),
3304
+ /* 3 */
3280
3305
  /***/ (function(module, __webpack_exports__, __webpack_require__) {
3281
3306
 
3282
3307
  "use strict";
@@ -3379,23 +3404,17 @@ function normalizeComponent(
3379
3404
  }
3380
3405
 
3381
3406
 
3382
- /***/ }),
3383
- /* 3 */
3384
- /***/ (function(module, exports) {
3385
-
3386
- module.exports = require("qs");
3387
-
3388
3407
  /***/ }),
3389
3408
  /* 4 */
3390
3409
  /***/ (function(module, exports) {
3391
3410
 
3392
- module.exports = require("axios");
3411
+ module.exports = require("qs");
3393
3412
 
3394
3413
  /***/ }),
3395
3414
  /* 5 */
3396
3415
  /***/ (function(module, exports) {
3397
3416
 
3398
- module.exports = require("eoss-element");
3417
+ module.exports = require("axios");
3399
3418
 
3400
3419
  /***/ }),
3401
3420
  /* 6 */
@@ -4732,7 +4751,7 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
4732
4751
  // CONCATENATED MODULE: ./packages/login/src/resetPassword.vue?vue&type=script&lang=js&
4733
4752
  /* harmony default export */ var src_resetPasswordvue_type_script_lang_js_ = (resetPasswordvue_type_script_lang_js_);
4734
4753
  // EXTERNAL MODULE: ./node_modules/vue-loader/lib/runtime/componentNormalizer.js
4735
- var componentNormalizer = __webpack_require__(2);
4754
+ var componentNormalizer = __webpack_require__(3);
4736
4755
 
4737
4756
  // CONCATENATED MODULE: ./packages/login/src/resetPassword.vue
4738
4757