eoss-ui 0.4.92 → 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 +54 -35
  2. package/lib/button.js +54 -35
  3. package/lib/card.js +2 -2
  4. package/lib/cascader.js +2 -2
  5. package/lib/checkbox-group.js +54 -35
  6. package/lib/clients.js +2 -2
  7. package/lib/data-table-form.js +53 -34
  8. package/lib/data-table.js +54 -35
  9. package/lib/date-picker.js +54 -35
  10. package/lib/dialog.js +53 -34
  11. package/lib/enterprise.js +2 -2
  12. package/lib/eoss-ui.common.js +300 -110
  13. package/lib/error-page.js +2 -2
  14. package/lib/flow-group.js +54 -35
  15. package/lib/flow-list.js +55 -36
  16. package/lib/flow.js +54 -35
  17. package/lib/form.js +54 -35
  18. package/lib/handle-user.js +54 -35
  19. package/lib/handler.js +54 -35
  20. package/lib/icons.js +2 -2
  21. package/lib/index.js +1 -1
  22. package/lib/input-number.js +54 -35
  23. package/lib/input.js +54 -35
  24. package/lib/label.js +2 -2
  25. package/lib/layout.js +2 -2
  26. package/lib/login.js +53 -34
  27. package/lib/main.js +306 -116
  28. package/lib/menu.js +2 -2
  29. package/lib/nav.js +54 -35
  30. package/lib/notify.js +2 -2
  31. package/lib/page.js +54 -35
  32. package/lib/pagination.js +2 -2
  33. package/lib/player.js +68 -49
  34. package/lib/qr-code.js +61 -42
  35. package/lib/radio-group.js +54 -35
  36. package/lib/retrial-auth.js +54 -35
  37. package/lib/select-ganged.js +54 -35
  38. package/lib/select.js +61 -42
  39. package/lib/selector-panel.js +61 -42
  40. package/lib/selector.js +61 -42
  41. package/lib/sizer.js +54 -35
  42. package/lib/steps.js +54 -35
  43. package/lib/switch.js +54 -35
  44. package/lib/table-form.js +54 -35
  45. package/lib/tabs-panel.js +2 -2
  46. package/lib/tabs.js +54 -35
  47. package/lib/tips.js +54 -35
  48. package/lib/toolbar.js +2 -2
  49. package/lib/tree-group.js +54 -35
  50. package/lib/tree.js +54 -35
  51. package/lib/upload.js +54 -35
  52. package/lib/utils/util.js +41 -22
  53. package/lib/wujie.js +54 -35
  54. package/lib/wxlogin.js +55 -36
  55. package/package.json +2 -2
  56. package/packages/main/src/main.vue +158 -4
  57. package/src/index.js +1 -1
  58. package/src/utils/util.js +48 -26
package/lib/upload.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
 
@@ -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,13 +3408,6 @@ 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
  /***/ 34:
@@ -4836,7 +4855,7 @@ var _props;
4836
4855
  // CONCATENATED MODULE: ./packages/upload/src/main.vue?vue&type=script&lang=js&
4837
4856
  /* harmony default export */ var src_mainvue_type_script_lang_js_ = (mainvue_type_script_lang_js_);
4838
4857
  // EXTERNAL MODULE: ./node_modules/vue-loader/lib/runtime/componentNormalizer.js
4839
- var componentNormalizer = __webpack_require__(2);
4858
+ var componentNormalizer = __webpack_require__(3);
4840
4859
 
4841
4860
  // CONCATENATED MODULE: ./packages/upload/src/main.vue
4842
4861
 
@@ -4872,14 +4891,14 @@ main.install = function (Vue) {
4872
4891
  /***/ 4:
4873
4892
  /***/ (function(module, exports) {
4874
4893
 
4875
- module.exports = require("axios");
4894
+ module.exports = require("qs");
4876
4895
 
4877
4896
  /***/ }),
4878
4897
 
4879
4898
  /***/ 5:
4880
4899
  /***/ (function(module, exports) {
4881
4900
 
4882
- module.exports = require("eoss-element");
4901
+ module.exports = require("axios");
4883
4902
 
4884
4903
  /***/ }),
4885
4904
 
package/lib/utils/util.js CHANGED
@@ -1824,8 +1824,6 @@ var isFunction = function isFunction(obj) {
1824
1824
  * @param {boolean} [redirect] - 是否重定向(用于新脚手架)
1825
1825
  **/
1826
1826
  var isLogined = function isLogined(_ref8) {
1827
- var _this = this;
1828
-
1829
1827
  var to = _ref8.to,
1830
1828
  from = _ref8.from,
1831
1829
  next = _ref8.next,
@@ -1844,6 +1842,17 @@ var isLogined = function isLogined(_ref8) {
1844
1842
  if (logined || cookie == true || cookie == 1) {
1845
1843
  if (loginPage) {
1846
1844
  sessionStorage.setItem('loginPage', loginPage);
1845
+ if (!startWith(loginPage, ['http', '/'], true)) {
1846
+ var pathname = win.top.location.pathname;
1847
+ if (pathname !== '/') {
1848
+ pathname = pathname.split('/');
1849
+ pathname.splice(pathname.length - 1);
1850
+ pathname = pathname.join('/');
1851
+ loginPage = pathname + '/' + loginPage.replace('./', '');
1852
+ } else {
1853
+ loginPage = pathname + loginPage.replace('./', '');
1854
+ }
1855
+ }
1847
1856
  }
1848
1857
  next();
1849
1858
  } else {
@@ -1856,7 +1865,7 @@ var isLogined = function isLogined(_ref8) {
1856
1865
  url = win.location.href;
1857
1866
  break;
1858
1867
  case 'blank':
1859
- url = win.location.href;
1868
+ url = win.open(url);
1860
1869
  break;
1861
1870
  case 'parent':
1862
1871
  url = win.parent.location.href;
@@ -1915,31 +1924,41 @@ var isLogined = function isLogined(_ref8) {
1915
1924
  }
1916
1925
  break;
1917
1926
  case 4:
1918
- _this.$alert(results.msg ? results.msg : '账号未绑定,账号密码登录后自动绑定!', '提示', {
1927
+ _eossElement.MessageBox.alert(results.msg ? results.msg : '账号未绑定,账号密码登录后自动绑定!', '提示', {
1919
1928
  confirmButtonText: '确定',
1920
- type: 'error'
1921
- }).then(function () {
1922
- sessionStorage.setItem('extUserBindHandleId', results.extUserBindHandleId);
1923
- window.location.href = delUrlParam({ key: 'code' });
1924
- if (loginPage) {
1925
- win.top.location.replace(loginPage);
1926
- } else if (document.referrer) {
1927
- win.top.location.replace(document.referrer);
1928
- } else if (win.top.location.href.indexOf('main.html') > -1) {
1929
- win.top.location.href = './login.html';
1930
- } else {
1931
- next('/login');
1929
+ type: 'error',
1930
+ callback: function callback() {
1931
+ sessionStorage.setItem('extUserBindHandleId', results.extUserBindHandleId);
1932
+ if (loginPage) {
1933
+ win.top.location.replace(loginPage);
1934
+ } else if (document.referrer) {
1935
+ win.top.location.replace(document.referrer);
1936
+ } else if (win.top.location.href.indexOf('main.html') > -1) {
1937
+ win.top.location.href = './login.html';
1938
+ } else {
1939
+ next('/login');
1940
+ }
1932
1941
  }
1933
- }).catch(function (e) {});
1942
+ });
1934
1943
  break;
1935
1944
  default:
1936
1945
  }
1937
1946
  } else {
1938
- if (token) {
1939
- next();
1940
- } else {
1941
- alert(res.msg);
1942
- }
1947
+ _eossElement.MessageBox.alert(res.msg, '提示', {
1948
+ confirmButtonText: '确定',
1949
+ type: 'error',
1950
+ callback: function callback() {
1951
+ if (loginPage) {
1952
+ win.top.location.replace(loginPage);
1953
+ } else if (document.referrer) {
1954
+ win.top.location.replace(document.referrer);
1955
+ } else if (win.top.location.href.indexOf('main.html') > -1) {
1956
+ win.top.location.href = './login.html';
1957
+ } else {
1958
+ next('/login');
1959
+ }
1960
+ }
1961
+ });
1943
1962
  }
1944
1963
  }).catch(function (e) {});
1945
1964
  } 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') {
package/lib/wujie.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
 
@@ -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
 
@@ -3614,7 +3633,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
3614
3633
  // CONCATENATED MODULE: ./packages/wujie/src/main.vue?vue&type=script&lang=js&
3615
3634
  /* harmony default export */ var src_mainvue_type_script_lang_js_ = (mainvue_type_script_lang_js_);
3616
3635
  // EXTERNAL MODULE: ./node_modules/vue-loader/lib/runtime/componentNormalizer.js
3617
- var componentNormalizer = __webpack_require__(2);
3636
+ var componentNormalizer = __webpack_require__(3);
3618
3637
 
3619
3638
  // CONCATENATED MODULE: ./packages/wujie/src/main.vue
3620
3639
 
package/lib/wxlogin.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
 
@@ -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
 
@@ -3457,7 +3476,7 @@ render._withStripped = true
3457
3476
  var util = __webpack_require__(0);
3458
3477
 
3459
3478
  // EXTERNAL MODULE: external "qs"
3460
- var external_qs_ = __webpack_require__(3);
3479
+ var external_qs_ = __webpack_require__(4);
3461
3480
  var external_qs_default = /*#__PURE__*/__webpack_require__.n(external_qs_);
3462
3481
 
3463
3482
  // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/wxlogin/src/main.vue?vue&type=script&lang=js&
@@ -3568,7 +3587,7 @@ var external_qs_default = /*#__PURE__*/__webpack_require__.n(external_qs_);
3568
3587
  // CONCATENATED MODULE: ./packages/wxlogin/src/main.vue?vue&type=script&lang=js&
3569
3588
  /* harmony default export */ var src_mainvue_type_script_lang_js_ = (mainvue_type_script_lang_js_);
3570
3589
  // EXTERNAL MODULE: ./node_modules/vue-loader/lib/runtime/componentNormalizer.js
3571
- var componentNormalizer = __webpack_require__(2);
3590
+ var componentNormalizer = __webpack_require__(3);
3572
3591
 
3573
3592
  // CONCATENATED MODULE: ./packages/wxlogin/src/main.vue
3574
3593
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "eoss-ui",
3
- "version": "0.4.92",
3
+ "version": "0.4.93",
4
4
  "description": "eoss内部业务组件",
5
5
  "main": "lib/eoss-ui.common.js",
6
6
  "files": [
@@ -95,7 +95,7 @@
95
95
  "cp-cli": "^1.0.2",
96
96
  "cross-env": "^3.1.3",
97
97
  "css-loader": "^2.1.0",
98
- "eoss-element": "^0.2.73",
98
+ "eoss-element": "^0.2.74",
99
99
  "es6-promise": "^4.0.5",
100
100
  "eslint": "4.18.2",
101
101
  "eslint-config-elemefe": "0.1.1",