eoss-ui 0.6.76 → 0.6.77

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 (64) hide show
  1. package/lib/button-group.js +30 -8
  2. package/lib/button.js +30 -8
  3. package/lib/calogin.js +30 -8
  4. package/lib/checkbox-group.js +30 -8
  5. package/lib/data-table-form.js +30 -8
  6. package/lib/data-table.js +30 -8
  7. package/lib/date-picker.js +30 -8
  8. package/lib/dialog.js +30 -8
  9. package/lib/eoss-ui.common.js +300 -241
  10. package/lib/flow-group.js +30 -8
  11. package/lib/flow-list.js +30 -8
  12. package/lib/flow.js +30 -8
  13. package/lib/form.js +50 -10
  14. package/lib/handle-user.js +30 -8
  15. package/lib/handler.js +30 -8
  16. package/lib/icon.js +30 -8
  17. package/lib/index.js +1 -1
  18. package/lib/input-number.js +30 -8
  19. package/lib/input.js +30 -8
  20. package/lib/login.js +30 -8
  21. package/lib/main.js +241 -200
  22. package/lib/nav.js +30 -8
  23. package/lib/page.js +30 -8
  24. package/lib/pagination.js +30 -8
  25. package/lib/player.js +30 -8
  26. package/lib/qr-code.js +30 -8
  27. package/lib/radio-group.js +30 -8
  28. package/lib/retrial-auth.js +30 -8
  29. package/lib/select-ganged.js +30 -8
  30. package/lib/select.js +30 -8
  31. package/lib/selector-panel.js +30 -8
  32. package/lib/selector.js +30 -8
  33. package/lib/sizer.js +30 -8
  34. package/lib/steps.js +30 -8
  35. package/lib/switch.js +30 -8
  36. package/lib/table-form.js +30 -8
  37. package/lib/tabs.js +30 -8
  38. package/lib/theme-chalk/form.css +1 -1
  39. package/lib/theme-chalk/index.css +1 -1
  40. package/lib/tips.js +30 -8
  41. package/lib/tree-group.js +30 -8
  42. package/lib/tree.js +30 -8
  43. package/lib/upload.js +30 -8
  44. package/lib/utils/util.js +26 -4
  45. package/lib/wujie.js +30 -8
  46. package/lib/wxlogin.js +30 -8
  47. package/package.json +1 -1
  48. package/packages/.DS_Store +0 -0
  49. package/packages/form/.DS_Store +0 -0
  50. package/packages/form/src/main.vue +1 -0
  51. package/packages/login/.DS_Store +0 -0
  52. package/packages/main/.DS_Store +0 -0
  53. package/packages/main/src/.DS_Store +0 -0
  54. package/packages/main/src/default/index.vue +6 -5
  55. package/packages/main/src/main.vue +107 -84
  56. package/packages/main/src/simplicity/index.vue +5 -2
  57. package/packages/theme-chalk/lib/form.css +1 -1
  58. package/packages/theme-chalk/lib/index.css +1 -1
  59. package/packages/theme-chalk/src/form.scss +3 -0
  60. package/packages/upload/.DS_Store +0 -0
  61. package/src/.DS_Store +0 -0
  62. package/src/index.js +1 -1
  63. package/src/utils/util.js +39 -3
  64. package/packages/login/src/IcpItem.vue +0 -66
package/lib/tips.js CHANGED
@@ -123,8 +123,8 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
123
123
  **/
124
124
 
125
125
  /* eslint-disable indent */
126
- var sm2 = __webpack_require__(13).sm2;
127
- var lodash = __webpack_require__(12);
126
+ var sm2 = __webpack_require__(12).sm2;
127
+ var lodash = __webpack_require__(13);
128
128
 
129
129
 
130
130
 
@@ -2366,7 +2366,7 @@ var isLogined = function () {
2366
2366
  cookie = _ref11.cookie,
2367
2367
  loginPage = _ref11.loginPage,
2368
2368
  redirect = _ref11.redirect;
2369
- var quit, pathname, path, token, loadingInstance;
2369
+ var quit, pathname, path, token, loadingInstance, referrerUrl;
2370
2370
  return babel_runtime_regenerator__WEBPACK_IMPORTED_MODULE_0___default.a.wrap(function _callee$(_context) {
2371
2371
  while (1) {
2372
2372
  switch (_context.prev = _context.next) {
@@ -2494,7 +2494,14 @@ var isLogined = function () {
2494
2494
  if (loginPage) {
2495
2495
  win.top.location.replace(loginPage);
2496
2496
  } else if (document.referrer) {
2497
- win.top.location.replace(document.referrer);
2497
+ var referrerUrl = new URL(document.referrer);
2498
+ if (referrerUrl.host !== win.top.location.host) {
2499
+ win.top.location.replace(document.referrer);
2500
+ } else if (win.top.location.href.indexOf('main.html') > -1 || win.top.location.href.indexOf('index.html') > -1 || document.referrer.indexOf('main.html') > -1 || document.referrer.indexOf('index.html') > -1) {
2501
+ win.top.location.href = './login.html';
2502
+ } else {
2503
+ next('/login');
2504
+ }
2498
2505
  } else if (win.top.location.href.indexOf('main.html') > -1) {
2499
2506
  win.top.location.href = './login.html';
2500
2507
  } else {
@@ -2517,7 +2524,14 @@ var isLogined = function () {
2517
2524
  if (loginPage) {
2518
2525
  win.top.location.replace(loginPage);
2519
2526
  } else if (document.referrer) {
2520
- win.top.location.replace(document.referrer);
2527
+ var referrerUrl = new URL(document.referrer);
2528
+ if (referrerUrl.host !== win.top.location.host) {
2529
+ win.top.location.replace(document.referrer);
2530
+ } else if (win.top.location.href.indexOf('main.html') > -1 || win.top.location.href.indexOf('index.html') > -1 || document.referrer.indexOf('main.html') > -1 || document.referrer.indexOf('index.html') > -1) {
2531
+ win.top.location.href = './login.html';
2532
+ } else {
2533
+ next('/login');
2534
+ }
2521
2535
  } else if (win.top.location.href.indexOf('main.html') > -1) {
2522
2536
  win.top.location.href = './login.html';
2523
2537
  } else {
@@ -2550,7 +2564,15 @@ var isLogined = function () {
2550
2564
  if (loginPage) {
2551
2565
  win.top.location.replace(loginPage);
2552
2566
  } else if (document.referrer) {
2553
- win.top.location.replace(document.referrer);
2567
+ referrerUrl = new URL(document.referrer);
2568
+
2569
+ if (referrerUrl.host !== win.top.location.host) {
2570
+ win.top.location.replace(document.referrer);
2571
+ } else if (win.top.location.href.indexOf('main.html') > -1 || win.top.location.href.indexOf('index.html') > -1 || document.referrer.indexOf('main.html') > -1 || document.referrer.indexOf('index.html') > -1) {
2572
+ win.top.location.href = './login.html';
2573
+ } else {
2574
+ next('/login');
2575
+ }
2554
2576
  } else if (win.top.location.href.indexOf('main.html') > -1) {
2555
2577
  win.top.location.href = './login.html';
2556
2578
  } else {
@@ -3963,14 +3985,14 @@ module.exports = require("ua-parser-js");
3963
3985
  /***/ 12:
3964
3986
  /***/ (function(module, exports) {
3965
3987
 
3966
- module.exports = require("lodash");
3988
+ module.exports = require("sm-crypto");
3967
3989
 
3968
3990
  /***/ }),
3969
3991
 
3970
3992
  /***/ 13:
3971
3993
  /***/ (function(module, exports) {
3972
3994
 
3973
- module.exports = require("sm-crypto");
3995
+ module.exports = require("lodash");
3974
3996
 
3975
3997
  /***/ }),
3976
3998
 
package/lib/tree-group.js CHANGED
@@ -123,8 +123,8 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
123
123
  **/
124
124
 
125
125
  /* eslint-disable indent */
126
- var sm2 = __webpack_require__(13).sm2;
127
- var lodash = __webpack_require__(12);
126
+ var sm2 = __webpack_require__(12).sm2;
127
+ var lodash = __webpack_require__(13);
128
128
 
129
129
 
130
130
 
@@ -2366,7 +2366,7 @@ var isLogined = function () {
2366
2366
  cookie = _ref11.cookie,
2367
2367
  loginPage = _ref11.loginPage,
2368
2368
  redirect = _ref11.redirect;
2369
- var quit, pathname, path, token, loadingInstance;
2369
+ var quit, pathname, path, token, loadingInstance, referrerUrl;
2370
2370
  return babel_runtime_regenerator__WEBPACK_IMPORTED_MODULE_0___default.a.wrap(function _callee$(_context) {
2371
2371
  while (1) {
2372
2372
  switch (_context.prev = _context.next) {
@@ -2494,7 +2494,14 @@ var isLogined = function () {
2494
2494
  if (loginPage) {
2495
2495
  win.top.location.replace(loginPage);
2496
2496
  } else if (document.referrer) {
2497
- win.top.location.replace(document.referrer);
2497
+ var referrerUrl = new URL(document.referrer);
2498
+ if (referrerUrl.host !== win.top.location.host) {
2499
+ win.top.location.replace(document.referrer);
2500
+ } else if (win.top.location.href.indexOf('main.html') > -1 || win.top.location.href.indexOf('index.html') > -1 || document.referrer.indexOf('main.html') > -1 || document.referrer.indexOf('index.html') > -1) {
2501
+ win.top.location.href = './login.html';
2502
+ } else {
2503
+ next('/login');
2504
+ }
2498
2505
  } else if (win.top.location.href.indexOf('main.html') > -1) {
2499
2506
  win.top.location.href = './login.html';
2500
2507
  } else {
@@ -2517,7 +2524,14 @@ var isLogined = function () {
2517
2524
  if (loginPage) {
2518
2525
  win.top.location.replace(loginPage);
2519
2526
  } else if (document.referrer) {
2520
- win.top.location.replace(document.referrer);
2527
+ var referrerUrl = new URL(document.referrer);
2528
+ if (referrerUrl.host !== win.top.location.host) {
2529
+ win.top.location.replace(document.referrer);
2530
+ } else if (win.top.location.href.indexOf('main.html') > -1 || win.top.location.href.indexOf('index.html') > -1 || document.referrer.indexOf('main.html') > -1 || document.referrer.indexOf('index.html') > -1) {
2531
+ win.top.location.href = './login.html';
2532
+ } else {
2533
+ next('/login');
2534
+ }
2521
2535
  } else if (win.top.location.href.indexOf('main.html') > -1) {
2522
2536
  win.top.location.href = './login.html';
2523
2537
  } else {
@@ -2550,7 +2564,15 @@ var isLogined = function () {
2550
2564
  if (loginPage) {
2551
2565
  win.top.location.replace(loginPage);
2552
2566
  } else if (document.referrer) {
2553
- win.top.location.replace(document.referrer);
2567
+ referrerUrl = new URL(document.referrer);
2568
+
2569
+ if (referrerUrl.host !== win.top.location.host) {
2570
+ win.top.location.replace(document.referrer);
2571
+ } else if (win.top.location.href.indexOf('main.html') > -1 || win.top.location.href.indexOf('index.html') > -1 || document.referrer.indexOf('main.html') > -1 || document.referrer.indexOf('index.html') > -1) {
2572
+ win.top.location.href = './login.html';
2573
+ } else {
2574
+ next('/login');
2575
+ }
2554
2576
  } else if (win.top.location.href.indexOf('main.html') > -1) {
2555
2577
  win.top.location.href = './login.html';
2556
2578
  } else {
@@ -3963,14 +3985,14 @@ module.exports = require("ua-parser-js");
3963
3985
  /***/ 12:
3964
3986
  /***/ (function(module, exports) {
3965
3987
 
3966
- module.exports = require("lodash");
3988
+ module.exports = require("sm-crypto");
3967
3989
 
3968
3990
  /***/ }),
3969
3991
 
3970
3992
  /***/ 13:
3971
3993
  /***/ (function(module, exports) {
3972
3994
 
3973
- module.exports = require("sm-crypto");
3995
+ module.exports = require("lodash");
3974
3996
 
3975
3997
  /***/ }),
3976
3998
 
package/lib/tree.js CHANGED
@@ -123,8 +123,8 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
123
123
  **/
124
124
 
125
125
  /* eslint-disable indent */
126
- var sm2 = __webpack_require__(13).sm2;
127
- var lodash = __webpack_require__(12);
126
+ var sm2 = __webpack_require__(12).sm2;
127
+ var lodash = __webpack_require__(13);
128
128
 
129
129
 
130
130
 
@@ -2366,7 +2366,7 @@ var isLogined = function () {
2366
2366
  cookie = _ref11.cookie,
2367
2367
  loginPage = _ref11.loginPage,
2368
2368
  redirect = _ref11.redirect;
2369
- var quit, pathname, path, token, loadingInstance;
2369
+ var quit, pathname, path, token, loadingInstance, referrerUrl;
2370
2370
  return babel_runtime_regenerator__WEBPACK_IMPORTED_MODULE_0___default.a.wrap(function _callee$(_context) {
2371
2371
  while (1) {
2372
2372
  switch (_context.prev = _context.next) {
@@ -2494,7 +2494,14 @@ var isLogined = function () {
2494
2494
  if (loginPage) {
2495
2495
  win.top.location.replace(loginPage);
2496
2496
  } else if (document.referrer) {
2497
- win.top.location.replace(document.referrer);
2497
+ var referrerUrl = new URL(document.referrer);
2498
+ if (referrerUrl.host !== win.top.location.host) {
2499
+ win.top.location.replace(document.referrer);
2500
+ } else if (win.top.location.href.indexOf('main.html') > -1 || win.top.location.href.indexOf('index.html') > -1 || document.referrer.indexOf('main.html') > -1 || document.referrer.indexOf('index.html') > -1) {
2501
+ win.top.location.href = './login.html';
2502
+ } else {
2503
+ next('/login');
2504
+ }
2498
2505
  } else if (win.top.location.href.indexOf('main.html') > -1) {
2499
2506
  win.top.location.href = './login.html';
2500
2507
  } else {
@@ -2517,7 +2524,14 @@ var isLogined = function () {
2517
2524
  if (loginPage) {
2518
2525
  win.top.location.replace(loginPage);
2519
2526
  } else if (document.referrer) {
2520
- win.top.location.replace(document.referrer);
2527
+ var referrerUrl = new URL(document.referrer);
2528
+ if (referrerUrl.host !== win.top.location.host) {
2529
+ win.top.location.replace(document.referrer);
2530
+ } else if (win.top.location.href.indexOf('main.html') > -1 || win.top.location.href.indexOf('index.html') > -1 || document.referrer.indexOf('main.html') > -1 || document.referrer.indexOf('index.html') > -1) {
2531
+ win.top.location.href = './login.html';
2532
+ } else {
2533
+ next('/login');
2534
+ }
2521
2535
  } else if (win.top.location.href.indexOf('main.html') > -1) {
2522
2536
  win.top.location.href = './login.html';
2523
2537
  } else {
@@ -2550,7 +2564,15 @@ var isLogined = function () {
2550
2564
  if (loginPage) {
2551
2565
  win.top.location.replace(loginPage);
2552
2566
  } else if (document.referrer) {
2553
- win.top.location.replace(document.referrer);
2567
+ referrerUrl = new URL(document.referrer);
2568
+
2569
+ if (referrerUrl.host !== win.top.location.host) {
2570
+ win.top.location.replace(document.referrer);
2571
+ } else if (win.top.location.href.indexOf('main.html') > -1 || win.top.location.href.indexOf('index.html') > -1 || document.referrer.indexOf('main.html') > -1 || document.referrer.indexOf('index.html') > -1) {
2572
+ win.top.location.href = './login.html';
2573
+ } else {
2574
+ next('/login');
2575
+ }
2554
2576
  } else if (win.top.location.href.indexOf('main.html') > -1) {
2555
2577
  win.top.location.href = './login.html';
2556
2578
  } else {
@@ -3963,14 +3985,14 @@ module.exports = require("ua-parser-js");
3963
3985
  /***/ 12:
3964
3986
  /***/ (function(module, exports) {
3965
3987
 
3966
- module.exports = require("lodash");
3988
+ module.exports = require("sm-crypto");
3967
3989
 
3968
3990
  /***/ }),
3969
3991
 
3970
3992
  /***/ 13:
3971
3993
  /***/ (function(module, exports) {
3972
3994
 
3973
- module.exports = require("sm-crypto");
3995
+ module.exports = require("lodash");
3974
3996
 
3975
3997
  /***/ }),
3976
3998
 
package/lib/upload.js CHANGED
@@ -122,8 +122,8 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
122
122
  **/
123
123
 
124
124
  /* eslint-disable indent */
125
- var sm2 = __webpack_require__(13).sm2;
126
- var lodash = __webpack_require__(12);
125
+ var sm2 = __webpack_require__(12).sm2;
126
+ var lodash = __webpack_require__(13);
127
127
 
128
128
 
129
129
 
@@ -2365,7 +2365,7 @@ var isLogined = function () {
2365
2365
  cookie = _ref11.cookie,
2366
2366
  loginPage = _ref11.loginPage,
2367
2367
  redirect = _ref11.redirect;
2368
- var quit, pathname, path, token, loadingInstance;
2368
+ var quit, pathname, path, token, loadingInstance, referrerUrl;
2369
2369
  return babel_runtime_regenerator__WEBPACK_IMPORTED_MODULE_0___default.a.wrap(function _callee$(_context) {
2370
2370
  while (1) {
2371
2371
  switch (_context.prev = _context.next) {
@@ -2493,7 +2493,14 @@ var isLogined = function () {
2493
2493
  if (loginPage) {
2494
2494
  win.top.location.replace(loginPage);
2495
2495
  } else if (document.referrer) {
2496
- win.top.location.replace(document.referrer);
2496
+ var referrerUrl = new URL(document.referrer);
2497
+ if (referrerUrl.host !== win.top.location.host) {
2498
+ win.top.location.replace(document.referrer);
2499
+ } else if (win.top.location.href.indexOf('main.html') > -1 || win.top.location.href.indexOf('index.html') > -1 || document.referrer.indexOf('main.html') > -1 || document.referrer.indexOf('index.html') > -1) {
2500
+ win.top.location.href = './login.html';
2501
+ } else {
2502
+ next('/login');
2503
+ }
2497
2504
  } else if (win.top.location.href.indexOf('main.html') > -1) {
2498
2505
  win.top.location.href = './login.html';
2499
2506
  } else {
@@ -2516,7 +2523,14 @@ var isLogined = function () {
2516
2523
  if (loginPage) {
2517
2524
  win.top.location.replace(loginPage);
2518
2525
  } else if (document.referrer) {
2519
- win.top.location.replace(document.referrer);
2526
+ var referrerUrl = new URL(document.referrer);
2527
+ if (referrerUrl.host !== win.top.location.host) {
2528
+ win.top.location.replace(document.referrer);
2529
+ } else if (win.top.location.href.indexOf('main.html') > -1 || win.top.location.href.indexOf('index.html') > -1 || document.referrer.indexOf('main.html') > -1 || document.referrer.indexOf('index.html') > -1) {
2530
+ win.top.location.href = './login.html';
2531
+ } else {
2532
+ next('/login');
2533
+ }
2520
2534
  } else if (win.top.location.href.indexOf('main.html') > -1) {
2521
2535
  win.top.location.href = './login.html';
2522
2536
  } else {
@@ -2549,7 +2563,15 @@ var isLogined = function () {
2549
2563
  if (loginPage) {
2550
2564
  win.top.location.replace(loginPage);
2551
2565
  } else if (document.referrer) {
2552
- win.top.location.replace(document.referrer);
2566
+ referrerUrl = new URL(document.referrer);
2567
+
2568
+ if (referrerUrl.host !== win.top.location.host) {
2569
+ win.top.location.replace(document.referrer);
2570
+ } else if (win.top.location.href.indexOf('main.html') > -1 || win.top.location.href.indexOf('index.html') > -1 || document.referrer.indexOf('main.html') > -1 || document.referrer.indexOf('index.html') > -1) {
2571
+ win.top.location.href = './login.html';
2572
+ } else {
2573
+ next('/login');
2574
+ }
2553
2575
  } else if (win.top.location.href.indexOf('main.html') > -1) {
2554
2576
  win.top.location.href = './login.html';
2555
2577
  } else {
@@ -4240,13 +4262,13 @@ module.exports = require("ua-parser-js");
4240
4262
  /* 12 */
4241
4263
  /***/ (function(module, exports) {
4242
4264
 
4243
- module.exports = require("lodash");
4265
+ module.exports = require("sm-crypto");
4244
4266
 
4245
4267
  /***/ }),
4246
4268
  /* 13 */
4247
4269
  /***/ (function(module, exports) {
4248
4270
 
4249
- module.exports = require("sm-crypto");
4271
+ module.exports = require("lodash");
4250
4272
 
4251
4273
  /***/ }),
4252
4274
  /* 14 */
package/lib/utils/util.js CHANGED
@@ -2282,7 +2282,7 @@ var isLogined = function () {
2282
2282
  cookie = _ref10.cookie,
2283
2283
  loginPage = _ref10.loginPage,
2284
2284
  redirect = _ref10.redirect;
2285
- var quit, pathname, path, token, loadingInstance;
2285
+ var quit, pathname, path, token, loadingInstance, referrerUrl;
2286
2286
  return _regenerator2.default.wrap(function _callee$(_context) {
2287
2287
  while (1) {
2288
2288
  switch (_context.prev = _context.next) {
@@ -2410,7 +2410,14 @@ var isLogined = function () {
2410
2410
  if (loginPage) {
2411
2411
  win.top.location.replace(loginPage);
2412
2412
  } else if (document.referrer) {
2413
- win.top.location.replace(document.referrer);
2413
+ var referrerUrl = new URL(document.referrer);
2414
+ if (referrerUrl.host !== win.top.location.host) {
2415
+ win.top.location.replace(document.referrer);
2416
+ } else if (win.top.location.href.indexOf('main.html') > -1 || win.top.location.href.indexOf('index.html') > -1 || document.referrer.indexOf('main.html') > -1 || document.referrer.indexOf('index.html') > -1) {
2417
+ win.top.location.href = './login.html';
2418
+ } else {
2419
+ next('/login');
2420
+ }
2414
2421
  } else if (win.top.location.href.indexOf('main.html') > -1) {
2415
2422
  win.top.location.href = './login.html';
2416
2423
  } else {
@@ -2433,7 +2440,14 @@ var isLogined = function () {
2433
2440
  if (loginPage) {
2434
2441
  win.top.location.replace(loginPage);
2435
2442
  } else if (document.referrer) {
2436
- win.top.location.replace(document.referrer);
2443
+ var referrerUrl = new URL(document.referrer);
2444
+ if (referrerUrl.host !== win.top.location.host) {
2445
+ win.top.location.replace(document.referrer);
2446
+ } else if (win.top.location.href.indexOf('main.html') > -1 || win.top.location.href.indexOf('index.html') > -1 || document.referrer.indexOf('main.html') > -1 || document.referrer.indexOf('index.html') > -1) {
2447
+ win.top.location.href = './login.html';
2448
+ } else {
2449
+ next('/login');
2450
+ }
2437
2451
  } else if (win.top.location.href.indexOf('main.html') > -1) {
2438
2452
  win.top.location.href = './login.html';
2439
2453
  } else {
@@ -2466,7 +2480,15 @@ var isLogined = function () {
2466
2480
  if (loginPage) {
2467
2481
  win.top.location.replace(loginPage);
2468
2482
  } else if (document.referrer) {
2469
- win.top.location.replace(document.referrer);
2483
+ referrerUrl = new URL(document.referrer);
2484
+
2485
+ if (referrerUrl.host !== win.top.location.host) {
2486
+ win.top.location.replace(document.referrer);
2487
+ } else if (win.top.location.href.indexOf('main.html') > -1 || win.top.location.href.indexOf('index.html') > -1 || document.referrer.indexOf('main.html') > -1 || document.referrer.indexOf('index.html') > -1) {
2488
+ win.top.location.href = './login.html';
2489
+ } else {
2490
+ next('/login');
2491
+ }
2470
2492
  } else if (win.top.location.href.indexOf('main.html') > -1) {
2471
2493
  win.top.location.href = './login.html';
2472
2494
  } else {
package/lib/wujie.js CHANGED
@@ -123,8 +123,8 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
123
123
  **/
124
124
 
125
125
  /* eslint-disable indent */
126
- var sm2 = __webpack_require__(13).sm2;
127
- var lodash = __webpack_require__(12);
126
+ var sm2 = __webpack_require__(12).sm2;
127
+ var lodash = __webpack_require__(13);
128
128
 
129
129
 
130
130
 
@@ -2366,7 +2366,7 @@ var isLogined = function () {
2366
2366
  cookie = _ref11.cookie,
2367
2367
  loginPage = _ref11.loginPage,
2368
2368
  redirect = _ref11.redirect;
2369
- var quit, pathname, path, token, loadingInstance;
2369
+ var quit, pathname, path, token, loadingInstance, referrerUrl;
2370
2370
  return babel_runtime_regenerator__WEBPACK_IMPORTED_MODULE_0___default.a.wrap(function _callee$(_context) {
2371
2371
  while (1) {
2372
2372
  switch (_context.prev = _context.next) {
@@ -2494,7 +2494,14 @@ var isLogined = function () {
2494
2494
  if (loginPage) {
2495
2495
  win.top.location.replace(loginPage);
2496
2496
  } else if (document.referrer) {
2497
- win.top.location.replace(document.referrer);
2497
+ var referrerUrl = new URL(document.referrer);
2498
+ if (referrerUrl.host !== win.top.location.host) {
2499
+ win.top.location.replace(document.referrer);
2500
+ } else if (win.top.location.href.indexOf('main.html') > -1 || win.top.location.href.indexOf('index.html') > -1 || document.referrer.indexOf('main.html') > -1 || document.referrer.indexOf('index.html') > -1) {
2501
+ win.top.location.href = './login.html';
2502
+ } else {
2503
+ next('/login');
2504
+ }
2498
2505
  } else if (win.top.location.href.indexOf('main.html') > -1) {
2499
2506
  win.top.location.href = './login.html';
2500
2507
  } else {
@@ -2517,7 +2524,14 @@ var isLogined = function () {
2517
2524
  if (loginPage) {
2518
2525
  win.top.location.replace(loginPage);
2519
2526
  } else if (document.referrer) {
2520
- win.top.location.replace(document.referrer);
2527
+ var referrerUrl = new URL(document.referrer);
2528
+ if (referrerUrl.host !== win.top.location.host) {
2529
+ win.top.location.replace(document.referrer);
2530
+ } else if (win.top.location.href.indexOf('main.html') > -1 || win.top.location.href.indexOf('index.html') > -1 || document.referrer.indexOf('main.html') > -1 || document.referrer.indexOf('index.html') > -1) {
2531
+ win.top.location.href = './login.html';
2532
+ } else {
2533
+ next('/login');
2534
+ }
2521
2535
  } else if (win.top.location.href.indexOf('main.html') > -1) {
2522
2536
  win.top.location.href = './login.html';
2523
2537
  } else {
@@ -2550,7 +2564,15 @@ var isLogined = function () {
2550
2564
  if (loginPage) {
2551
2565
  win.top.location.replace(loginPage);
2552
2566
  } else if (document.referrer) {
2553
- win.top.location.replace(document.referrer);
2567
+ referrerUrl = new URL(document.referrer);
2568
+
2569
+ if (referrerUrl.host !== win.top.location.host) {
2570
+ win.top.location.replace(document.referrer);
2571
+ } else if (win.top.location.href.indexOf('main.html') > -1 || win.top.location.href.indexOf('index.html') > -1 || document.referrer.indexOf('main.html') > -1 || document.referrer.indexOf('index.html') > -1) {
2572
+ win.top.location.href = './login.html';
2573
+ } else {
2574
+ next('/login');
2575
+ }
2554
2576
  } else if (win.top.location.href.indexOf('main.html') > -1) {
2555
2577
  win.top.location.href = './login.html';
2556
2578
  } else {
@@ -3963,14 +3985,14 @@ module.exports = require("ua-parser-js");
3963
3985
  /***/ 12:
3964
3986
  /***/ (function(module, exports) {
3965
3987
 
3966
- module.exports = require("lodash");
3988
+ module.exports = require("sm-crypto");
3967
3989
 
3968
3990
  /***/ }),
3969
3991
 
3970
3992
  /***/ 13:
3971
3993
  /***/ (function(module, exports) {
3972
3994
 
3973
- module.exports = require("sm-crypto");
3995
+ module.exports = require("lodash");
3974
3996
 
3975
3997
  /***/ }),
3976
3998
 
package/lib/wxlogin.js CHANGED
@@ -123,8 +123,8 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
123
123
  **/
124
124
 
125
125
  /* eslint-disable indent */
126
- var sm2 = __webpack_require__(13).sm2;
127
- var lodash = __webpack_require__(12);
126
+ var sm2 = __webpack_require__(12).sm2;
127
+ var lodash = __webpack_require__(13);
128
128
 
129
129
 
130
130
 
@@ -2366,7 +2366,7 @@ var isLogined = function () {
2366
2366
  cookie = _ref11.cookie,
2367
2367
  loginPage = _ref11.loginPage,
2368
2368
  redirect = _ref11.redirect;
2369
- var quit, pathname, path, token, loadingInstance;
2369
+ var quit, pathname, path, token, loadingInstance, referrerUrl;
2370
2370
  return babel_runtime_regenerator__WEBPACK_IMPORTED_MODULE_0___default.a.wrap(function _callee$(_context) {
2371
2371
  while (1) {
2372
2372
  switch (_context.prev = _context.next) {
@@ -2494,7 +2494,14 @@ var isLogined = function () {
2494
2494
  if (loginPage) {
2495
2495
  win.top.location.replace(loginPage);
2496
2496
  } else if (document.referrer) {
2497
- win.top.location.replace(document.referrer);
2497
+ var referrerUrl = new URL(document.referrer);
2498
+ if (referrerUrl.host !== win.top.location.host) {
2499
+ win.top.location.replace(document.referrer);
2500
+ } else if (win.top.location.href.indexOf('main.html') > -1 || win.top.location.href.indexOf('index.html') > -1 || document.referrer.indexOf('main.html') > -1 || document.referrer.indexOf('index.html') > -1) {
2501
+ win.top.location.href = './login.html';
2502
+ } else {
2503
+ next('/login');
2504
+ }
2498
2505
  } else if (win.top.location.href.indexOf('main.html') > -1) {
2499
2506
  win.top.location.href = './login.html';
2500
2507
  } else {
@@ -2517,7 +2524,14 @@ var isLogined = function () {
2517
2524
  if (loginPage) {
2518
2525
  win.top.location.replace(loginPage);
2519
2526
  } else if (document.referrer) {
2520
- win.top.location.replace(document.referrer);
2527
+ var referrerUrl = new URL(document.referrer);
2528
+ if (referrerUrl.host !== win.top.location.host) {
2529
+ win.top.location.replace(document.referrer);
2530
+ } else if (win.top.location.href.indexOf('main.html') > -1 || win.top.location.href.indexOf('index.html') > -1 || document.referrer.indexOf('main.html') > -1 || document.referrer.indexOf('index.html') > -1) {
2531
+ win.top.location.href = './login.html';
2532
+ } else {
2533
+ next('/login');
2534
+ }
2521
2535
  } else if (win.top.location.href.indexOf('main.html') > -1) {
2522
2536
  win.top.location.href = './login.html';
2523
2537
  } else {
@@ -2550,7 +2564,15 @@ var isLogined = function () {
2550
2564
  if (loginPage) {
2551
2565
  win.top.location.replace(loginPage);
2552
2566
  } else if (document.referrer) {
2553
- win.top.location.replace(document.referrer);
2567
+ referrerUrl = new URL(document.referrer);
2568
+
2569
+ if (referrerUrl.host !== win.top.location.host) {
2570
+ win.top.location.replace(document.referrer);
2571
+ } else if (win.top.location.href.indexOf('main.html') > -1 || win.top.location.href.indexOf('index.html') > -1 || document.referrer.indexOf('main.html') > -1 || document.referrer.indexOf('index.html') > -1) {
2572
+ win.top.location.href = './login.html';
2573
+ } else {
2574
+ next('/login');
2575
+ }
2554
2576
  } else if (win.top.location.href.indexOf('main.html') > -1) {
2555
2577
  win.top.location.href = './login.html';
2556
2578
  } else {
@@ -3963,14 +3985,14 @@ module.exports = require("ua-parser-js");
3963
3985
  /***/ 12:
3964
3986
  /***/ (function(module, exports) {
3965
3987
 
3966
- module.exports = require("lodash");
3988
+ module.exports = require("sm-crypto");
3967
3989
 
3968
3990
  /***/ }),
3969
3991
 
3970
3992
  /***/ 13:
3971
3993
  /***/ (function(module, exports) {
3972
3994
 
3973
- module.exports = require("sm-crypto");
3995
+ module.exports = require("lodash");
3974
3996
 
3975
3997
  /***/ }),
3976
3998
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "eoss-ui",
3
- "version": "0.6.76",
3
+ "version": "0.6.77",
4
4
  "description": "eoss内部业务组件",
5
5
  "main": "lib/eoss-ui.common.js",
6
6
  "files": [
Binary file
Binary file
@@ -1639,6 +1639,7 @@
1639
1639
  attrs: ['value', 'ownId']
1640
1640
  })
1641
1641
  "
1642
+ v-model="models[item.name]"
1642
1643
  :ownId="item.ownId || models.id"
1643
1644
  btn-size="medium"
1644
1645
  :readonly="
Binary file
Binary file
Binary file
@@ -1054,7 +1054,7 @@ export default {
1054
1054
  !this.menuCode &&
1055
1055
  (!jump || !this.isHistory) &&
1056
1056
  (hash === '#/' || hash === '#/main')) ||
1057
- jump == results[i]
1057
+ jump == this.homePage
1058
1058
  ) {
1059
1059
  if (this.isHomePage) {
1060
1060
  if (this.menus && this.menus.length) {
@@ -1074,9 +1074,9 @@ export default {
1074
1074
  this.userModel = results.userModel;
1075
1075
  },
1076
1076
  //初始用户配置及信息
1077
- init(results) {
1077
+ init(results, first) {
1078
1078
  this.setConfig(results);
1079
- if (this.remote) {
1079
+ if (this.remote && first) {
1080
1080
  this.getMenu();
1081
1081
  } else {
1082
1082
  this.renderMenu();
@@ -2194,8 +2194,9 @@ export default {
2194
2194
  this.$store.commit('websocket', data);
2195
2195
  } catch (error) {}
2196
2196
  }
2197
- if (this.$eventBus) {
2198
- this.$eventBus.$emit('websocket', data);
2197
+ const bus = this.bus || this.$eventBus || this.$root.Bus;
2198
+ if (bus) {
2199
+ bus.$emit('websocket', data);
2199
2200
  }
2200
2201
  if (util.win.eventBus) {
2201
2202
  util.win.eventBus.$emit('websocket', data);