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
package/lib/menu.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";
@@ -510,7 +510,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
510
510
  // CONCATENATED MODULE: ./packages/menu/src/main.vue?vue&type=script&lang=js&
511
511
  /* harmony default export */ var src_mainvue_type_script_lang_js_ = (mainvue_type_script_lang_js_);
512
512
  // EXTERNAL MODULE: ./node_modules/vue-loader/lib/runtime/componentNormalizer.js
513
- var componentNormalizer = __webpack_require__(2);
513
+ var componentNormalizer = __webpack_require__(3);
514
514
 
515
515
  // CONCATENATED MODULE: ./packages/menu/src/main.vue
516
516
  var render, staticRenderFns
package/lib/nav.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') {
@@ -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,19 +3408,12 @@ 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
 
@@ -3809,7 +3828,7 @@ var util = __webpack_require__(0);
3809
3828
  // CONCATENATED MODULE: ./packages/nav/src/main.vue?vue&type=script&lang=js&
3810
3829
  /* harmony default export */ var src_mainvue_type_script_lang_js_ = (mainvue_type_script_lang_js_);
3811
3830
  // EXTERNAL MODULE: ./node_modules/vue-loader/lib/runtime/componentNormalizer.js
3812
- var componentNormalizer = __webpack_require__(2);
3831
+ var componentNormalizer = __webpack_require__(3);
3813
3832
 
3814
3833
  // CONCATENATED MODULE: ./packages/nav/src/main.vue
3815
3834
 
@@ -3845,7 +3864,7 @@ main.install = function (Vue) {
3845
3864
  /***/ 5:
3846
3865
  /***/ (function(module, exports) {
3847
3866
 
3848
- module.exports = require("eoss-element");
3867
+ module.exports = require("axios");
3849
3868
 
3850
3869
  /***/ }),
3851
3870
 
package/lib/notify.js CHANGED
@@ -427,7 +427,7 @@ var formContents = '/config/admin/online/onlineForm/render';
427
427
 
428
428
  /***/ }),
429
429
 
430
- /***/ 2:
430
+ /***/ 3:
431
431
  /***/ (function(module, __webpack_exports__, __webpack_require__) {
432
432
 
433
433
  "use strict";
@@ -1058,7 +1058,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
1058
1058
  // CONCATENATED MODULE: ./packages/notify/src/main.vue?vue&type=script&lang=js&
1059
1059
  /* harmony default export */ var src_mainvue_type_script_lang_js_ = (mainvue_type_script_lang_js_);
1060
1060
  // EXTERNAL MODULE: ./node_modules/vue-loader/lib/runtime/componentNormalizer.js
1061
- var componentNormalizer = __webpack_require__(2);
1061
+ var componentNormalizer = __webpack_require__(3);
1062
1062
 
1063
1063
  // CONCATENATED MODULE: ./packages/notify/src/main.vue
1064
1064
 
package/lib/page.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') {
@@ -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
 
@@ -3798,7 +3817,7 @@ var util = __webpack_require__(0);
3798
3817
  // CONCATENATED MODULE: ./packages/page/src/main.vue?vue&type=script&lang=js&
3799
3818
  /* harmony default export */ var src_mainvue_type_script_lang_js_ = (mainvue_type_script_lang_js_);
3800
3819
  // EXTERNAL MODULE: ./node_modules/vue-loader/lib/runtime/componentNormalizer.js
3801
- var componentNormalizer = __webpack_require__(2);
3820
+ var componentNormalizer = __webpack_require__(3);
3802
3821
 
3803
3822
  // CONCATENATED MODULE: ./packages/page/src/main.vue
3804
3823
 
package/lib/pagination.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";
@@ -318,7 +318,7 @@ render._withStripped = true
318
318
  // CONCATENATED MODULE: ./packages/pagination/src/main.vue?vue&type=script&lang=js&
319
319
  /* harmony default export */ var src_mainvue_type_script_lang_js_ = (mainvue_type_script_lang_js_);
320
320
  // EXTERNAL MODULE: ./node_modules/vue-loader/lib/runtime/componentNormalizer.js
321
- var componentNormalizer = __webpack_require__(2);
321
+ var componentNormalizer = __webpack_require__(3);
322
322
 
323
323
  // CONCATENATED MODULE: ./packages/pagination/src/main.vue
324
324
 
package/lib/player.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') {
@@ -3287,6 +3306,27 @@ module.exports = require("video.js");
3287
3306
  /***/ }),
3288
3307
 
3289
3308
  /***/ 2:
3309
+ /***/ (function(module, exports) {
3310
+
3311
+ module.exports = require("eoss-element");
3312
+
3313
+ /***/ }),
3314
+
3315
+ /***/ 21:
3316
+ /***/ (function(module, exports) {
3317
+
3318
+ module.exports = require("video.js/dist/lang/zh-CN.json");
3319
+
3320
+ /***/ }),
3321
+
3322
+ /***/ 24:
3323
+ /***/ (function(module, exports) {
3324
+
3325
+ module.exports = require("video.js/dist/video-js.css");
3326
+
3327
+ /***/ }),
3328
+
3329
+ /***/ 3:
3290
3330
  /***/ (function(module, __webpack_exports__, __webpack_require__) {
3291
3331
 
3292
3332
  "use strict";
@@ -3389,40 +3429,19 @@ function normalizeComponent(
3389
3429
  }
3390
3430
 
3391
3431
 
3392
- /***/ }),
3393
-
3394
- /***/ 21:
3395
- /***/ (function(module, exports) {
3396
-
3397
- module.exports = require("video.js/dist/lang/zh-CN.json");
3398
-
3399
- /***/ }),
3400
-
3401
- /***/ 24:
3402
- /***/ (function(module, exports) {
3403
-
3404
- module.exports = require("video.js/dist/video-js.css");
3405
-
3406
- /***/ }),
3407
-
3408
- /***/ 3:
3409
- /***/ (function(module, exports) {
3410
-
3411
- module.exports = require("qs");
3412
-
3413
3432
  /***/ }),
3414
3433
 
3415
3434
  /***/ 4:
3416
3435
  /***/ (function(module, exports) {
3417
3436
 
3418
- module.exports = require("axios");
3437
+ module.exports = require("qs");
3419
3438
 
3420
3439
  /***/ }),
3421
3440
 
3422
3441
  /***/ 5:
3423
3442
  /***/ (function(module, exports) {
3424
3443
 
3425
- module.exports = require("eoss-element");
3444
+ module.exports = require("axios");
3426
3445
 
3427
3446
  /***/ }),
3428
3447
 
@@ -3666,7 +3685,7 @@ external_video_js_default.a.addLanguage('zh-CN', zh_CN_json_default.a);
3666
3685
  // CONCATENATED MODULE: ./packages/player/src/main.vue?vue&type=script&lang=js&
3667
3686
  /* harmony default export */ var src_mainvue_type_script_lang_js_ = (mainvue_type_script_lang_js_);
3668
3687
  // EXTERNAL MODULE: ./node_modules/vue-loader/lib/runtime/componentNormalizer.js
3669
- var componentNormalizer = __webpack_require__(2);
3688
+ var componentNormalizer = __webpack_require__(3);
3670
3689
 
3671
3690
  // CONCATENATED MODULE: ./packages/player/src/main.vue
3672
3691