eoss-ui 0.4.61 → 0.4.63

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 (98) hide show
  1. package/lib/button-group.js +46 -44
  2. package/lib/button.js +46 -44
  3. package/lib/card.js +2 -2
  4. package/lib/cascader.js +2 -2
  5. package/lib/checkbox-group.js +61 -69
  6. package/lib/clients.js +2 -2
  7. package/lib/data-table-form.js +44 -42
  8. package/lib/data-table.js +107 -91
  9. package/lib/date-picker.js +53 -51
  10. package/lib/dialog.js +51 -50
  11. package/lib/editor.js +6 -6
  12. package/lib/enterprise.js +2 -2
  13. package/lib/eoss-ui.common.js +2408 -5194
  14. package/lib/error-page.js +2 -2
  15. package/lib/flow-group.js +127 -63
  16. package/lib/flow-list.js +1020 -323
  17. package/lib/flow.js +51 -50
  18. package/lib/form.js +231 -46
  19. package/lib/handle-user.js +46 -44
  20. package/lib/handler.js +49 -47
  21. package/lib/icons.js +4 -4
  22. package/lib/index.js +1 -1
  23. package/lib/input-number.js +46 -44
  24. package/lib/input.js +46 -44
  25. package/lib/label.js +2 -2
  26. package/lib/login.js +49 -47
  27. package/lib/main.js +289 -177
  28. package/lib/menu.js +7 -5
  29. package/lib/nav.js +48 -48
  30. package/lib/notify.js +2 -2
  31. package/lib/page.js +46 -44
  32. package/lib/pagination.js +2 -2
  33. package/lib/player.js +48 -46
  34. package/lib/qr-code.js +46 -44
  35. package/lib/radio-group.js +49 -47
  36. package/lib/retrial-auth.js +46 -44
  37. package/lib/select-ganged.js +46 -44
  38. package/lib/select.js +47 -45
  39. package/lib/selector-panel.js +46 -44
  40. package/lib/selector.js +63 -50
  41. package/lib/sizer.js +46 -44
  42. package/lib/steps.js +46 -44
  43. package/lib/switch.js +46 -44
  44. package/lib/table-form.js +46 -44
  45. package/lib/tabs-panel.js +2 -2
  46. package/lib/tabs.js +53 -51
  47. package/lib/theme-chalk/data-table.css +1 -1
  48. package/lib/theme-chalk/dialog.css +1 -1
  49. package/lib/theme-chalk/flow-list.css +1 -1
  50. package/lib/theme-chalk/index.css +1 -1
  51. package/lib/theme-chalk/menu.css +1 -1
  52. package/lib/tips.js +46 -44
  53. package/lib/toolbar.js +2 -2
  54. package/lib/tree-group.js +46 -44
  55. package/lib/tree.js +46 -44
  56. package/lib/upload.js +52 -50
  57. package/lib/utils/util.js +44 -42
  58. package/lib/wujie.js +46 -44
  59. package/lib/wxlogin.js +46 -44
  60. package/package.json +2 -2
  61. package/packages/checkbox-group/src/main.vue +16 -25
  62. package/packages/data-table/src/column.vue +15 -1
  63. package/packages/data-table/src/main.vue +58 -47
  64. package/packages/flow/src/component/taskUnionExamine.vue +0 -1
  65. package/packages/flow-group/src/main.vue +32 -14
  66. package/packages/flow-list/src/flow-table.vue +5 -1
  67. package/packages/flow-list/src/main.vue +780 -43
  68. package/packages/form/src/main.vue +63 -0
  69. package/packages/handler/src/main.vue +1 -1
  70. package/packages/login/src/main.vue +10 -1
  71. package/packages/main/src/main.vue +186 -63
  72. package/packages/main/src/userinfo.vue +3 -3
  73. package/packages/menu/src/main.vue +5 -3
  74. package/packages/nav/src/main.vue +0 -2
  75. package/packages/radio-group/src/main.vue +9 -5
  76. package/packages/select/src/main.vue +1 -1
  77. package/packages/selector/src/main.vue +12 -4
  78. package/packages/theme-chalk/lib/data-table.css +1 -1
  79. package/packages/theme-chalk/lib/dialog.css +1 -1
  80. package/packages/theme-chalk/lib/flow-list.css +1 -1
  81. package/packages/theme-chalk/lib/index.css +1 -1
  82. package/packages/theme-chalk/lib/menu.css +1 -1
  83. package/packages/theme-chalk/src/data-table.scss +10 -17
  84. package/packages/theme-chalk/src/dialog.scss +1 -1
  85. package/packages/theme-chalk/src/flow-list.scss +29 -34
  86. package/packages/theme-chalk/src/index.scss +0 -1
  87. package/packages/theme-chalk/src/menu.scss +3 -0
  88. package/packages/upload/src/main.vue +1 -1
  89. package/src/index.js +1 -4
  90. package/src/utils/util.js +58 -55
  91. package/lib/mainComp.js +0 -6817
  92. package/packages/mainComp/index.js +0 -5
  93. package/packages/mainComp/src/async-component/index.vue +0 -85
  94. package/packages/mainComp/src/main.vue +0 -1944
  95. package/packages/mainComp/src/message.vue +0 -239
  96. package/packages/mainComp/src/notice.vue +0 -152
  97. package/packages/mainComp/src/settings.vue +0 -105
  98. package/packages/mainComp/src/userinfo.vue +0 -430
package/lib/selector-panel.js CHANGED
@@ -82,7 +82,7 @@ module.exports =
82
82
  /******/
83
83
  /******/
84
84
  /******/ // Load entry module and return exports
85
- /******/ return __webpack_require__(__webpack_require__.s = 33);
85
+ /******/ return __webpack_require__(__webpack_require__.s = 32);
86
86
  /******/ })
87
87
  /************************************************************************/
88
88
  /******/ ({
@@ -248,52 +248,54 @@ var ajax = function ajax(_ref) {
248
248
  if (response.data.rCode === 64 || response.data.rCode === 65 || response.data.rCode === 67 || response.data.rCode === 69) {
249
249
  removeStorage(['Authorization', 'token', 'ssId', 'userId', 'userName', 'deviceUnique', 'menus', 'menus', 'useCaseCodes', 'mainConfig', 'jump']);
250
250
  if (win.top.location.href.indexOf('#/login') === -1 && win.top.location.href.indexOf('/login.html') === -1) {
251
- clearTimeout(loginMsg);
252
251
  var remind = sessionStorage.getItem('remind');
253
- !remind && (loginMsg = setTimeout(function () {
254
- sessionStorage.setItem('remind', 1);
255
- eoss_element__WEBPACK_IMPORTED_MODULE_4__["MessageBox"].confirm(response.data.rCode === 69 ? '该账号在其他地方已登陆!' : '登录已过期，请重新登录!', '提示', response.data.rCode === 69 ? {
256
- confirmButtonText: '确定',
257
- closeOnClickModal: false,
258
- type: 'warning'
259
- } : {
260
- confirmButtonText: '确定',
261
- cancelButtonText: '取消',
262
- closeOnClickModal: false,
263
- type: 'warning'
264
- }).then(function () {
265
- var loginPage = getStorage('login') || getStorage('loginPage');
266
- if (loginPage) {
267
- var src = void 0;
268
- if (!startWith(loginPage, ['http', '/'])) {
269
- var pathname = win.top.location.pathname;
270
- if (pathname !== '/') {
271
- pathname = pathname.split('/');
272
- pathname.splice(pathname.length - 1);
273
- pathname = pathname.join('/');
274
- src = pathname + '/' + loginPage.replace('./', '');
252
+ if (!remind) {
253
+ clearTimeout(loginMsg);
254
+ loginMsg = setTimeout(function () {
255
+ sessionStorage.setItem('remind', 1);
256
+ eoss_element__WEBPACK_IMPORTED_MODULE_4__["MessageBox"].confirm(response.data.rCode === 69 ? '该账号在其他地方已登陆!' : '登录已过期，请重新登录!', '提示', response.data.rCode === 69 ? {
257
+ confirmButtonText: '确定',
258
+ closeOnClickModal: false,
259
+ type: 'warning'
260
+ } : {
261
+ confirmButtonText: '确定',
262
+ cancelButtonText: '取消',
263
+ closeOnClickModal: false,
264
+ type: 'warning'
265
+ }).then(function () {
266
+ var loginPage = getStorage('login') || getStorage('loginPage');
267
+ if (loginPage) {
268
+ var src = void 0;
269
+ if (!startWith(loginPage, ['http', '/'], true)) {
270
+ var pathname = win.top.location.pathname;
271
+ if (pathname !== '/') {
272
+ pathname = pathname.split('/');
273
+ pathname.splice(pathname.length - 1);
274
+ pathname = pathname.join('/');
275
+ src = pathname + '/' + loginPage.replace('./', '');
276
+ } else {
277
+ src = pathname + loginPage.replace('./', '');
278
+ }
275
279
  } else {
276
- src = pathname + loginPage.replace('./', '');
280
+ src = loginPage;
277
281
  }
282
+ win.top.location.href = src;
283
+ } else if (win.top.location.href.indexOf('main.html') > -1) {
284
+ win.top.location.href = './login.html';
278
285
  } else {
279
- src = loginPage;
280
- }
281
- win.top.location.href = src;
282
- } else if (win.top.location.href.indexOf('main.html') > -1) {
283
- win.top.location.href = './login.html';
284
- } else {
285
- var hash = win.top.location.hash;
286
- if (hash) {
287
- var len = win.top.location.href.indexOf(hash);
288
- win.top.location.href = win.location.href.slice(0, len) + '#/login';
289
- } else {
290
- win.top.location.href = '/login.html';
286
+ var hash = win.top.location.hash;
287
+ if (hash) {
288
+ var len = win.top.location.href.indexOf(hash);
289
+ win.top.location.href = win.location.href.slice(0, len) + '#/login';
290
+ } else {
291
+ win.top.location.href = '/login.html';
292
+ }
291
293
  }
292
- }
293
- }).catch(function (e) {
294
- sessionStorage.removeItem('remind');
295
- });
296
- }, 1000));
294
+ }).catch(function (e) {
295
+ sessionStorage.removeItem('remind');
296
+ });
297
+ }, 2000);
298
+ }
297
299
  }
298
300
  } else if (response.data.rCode === 61) {
299
301
  clearTimeout(initAuth);
@@ -2082,7 +2084,7 @@ var setStorage = function setStorage(_ref14) {
2082
2084
  * @param {boolean} [or] - 或者（等同于||）
2083
2085
  **/
2084
2086
  var startWith = function startWith(value, reg) {
2085
- var or = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
2087
+ var or = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
2086
2088
 
2087
2089
  if (Array.isArray(reg)) {
2088
2090
  var flag = true;
@@ -2848,7 +2850,7 @@ function normalizeComponent(
2848
2850
 
2849
2851
  /***/ }),
2850
2852
 
2851
- /***/ 33:
2853
+ /***/ 32:
2852
2854
  /***/ (function(module, __webpack_exports__, __webpack_require__) {
2853
2855
 
2854
2856
  "use strict";
package/lib/selector.js CHANGED
@@ -82,7 +82,7 @@ module.exports =
82
82
  /******/
83
83
  /******/
84
84
  /******/ // Load entry module and return exports
85
- /******/ return __webpack_require__(__webpack_require__.s = 57);
85
+ /******/ return __webpack_require__(__webpack_require__.s = 56);
86
86
  /******/ })
87
87
  /************************************************************************/
88
88
  /******/ ({
@@ -248,52 +248,54 @@ var ajax = function ajax(_ref) {
248
248
  if (response.data.rCode === 64 || response.data.rCode === 65 || response.data.rCode === 67 || response.data.rCode === 69) {
249
249
  removeStorage(['Authorization', 'token', 'ssId', 'userId', 'userName', 'deviceUnique', 'menus', 'menus', 'useCaseCodes', 'mainConfig', 'jump']);
250
250
  if (win.top.location.href.indexOf('#/login') === -1 && win.top.location.href.indexOf('/login.html') === -1) {
251
- clearTimeout(loginMsg);
252
251
  var remind = sessionStorage.getItem('remind');
253
- !remind && (loginMsg = setTimeout(function () {
254
- sessionStorage.setItem('remind', 1);
255
- eoss_element__WEBPACK_IMPORTED_MODULE_4__["MessageBox"].confirm(response.data.rCode === 69 ? '该账号在其他地方已登陆!' : '登录已过期，请重新登录!', '提示', response.data.rCode === 69 ? {
256
- confirmButtonText: '确定',
257
- closeOnClickModal: false,
258
- type: 'warning'
259
- } : {
260
- confirmButtonText: '确定',
261
- cancelButtonText: '取消',
262
- closeOnClickModal: false,
263
- type: 'warning'
264
- }).then(function () {
265
- var loginPage = getStorage('login') || getStorage('loginPage');
266
- if (loginPage) {
267
- var src = void 0;
268
- if (!startWith(loginPage, ['http', '/'])) {
269
- var pathname = win.top.location.pathname;
270
- if (pathname !== '/') {
271
- pathname = pathname.split('/');
272
- pathname.splice(pathname.length - 1);
273
- pathname = pathname.join('/');
274
- src = pathname + '/' + loginPage.replace('./', '');
252
+ if (!remind) {
253
+ clearTimeout(loginMsg);
254
+ loginMsg = setTimeout(function () {
255
+ sessionStorage.setItem('remind', 1);
256
+ eoss_element__WEBPACK_IMPORTED_MODULE_4__["MessageBox"].confirm(response.data.rCode === 69 ? '该账号在其他地方已登陆!' : '登录已过期，请重新登录!', '提示', response.data.rCode === 69 ? {
257
+ confirmButtonText: '确定',
258
+ closeOnClickModal: false,
259
+ type: 'warning'
260
+ } : {
261
+ confirmButtonText: '确定',
262
+ cancelButtonText: '取消',
263
+ closeOnClickModal: false,
264
+ type: 'warning'
265
+ }).then(function () {
266
+ var loginPage = getStorage('login') || getStorage('loginPage');
267
+ if (loginPage) {
268
+ var src = void 0;
269
+ if (!startWith(loginPage, ['http', '/'], true)) {
270
+ var pathname = win.top.location.pathname;
271
+ if (pathname !== '/') {
272
+ pathname = pathname.split('/');
273
+ pathname.splice(pathname.length - 1);
274
+ pathname = pathname.join('/');
275
+ src = pathname + '/' + loginPage.replace('./', '');
276
+ } else {
277
+ src = pathname + loginPage.replace('./', '');
278
+ }
275
279
  } else {
276
- src = pathname + loginPage.replace('./', '');
280
+ src = loginPage;
277
281
  }
282
+ win.top.location.href = src;
283
+ } else if (win.top.location.href.indexOf('main.html') > -1) {
284
+ win.top.location.href = './login.html';
278
285
  } else {
279
- src = loginPage;
280
- }
281
- win.top.location.href = src;
282
- } else if (win.top.location.href.indexOf('main.html') > -1) {
283
- win.top.location.href = './login.html';
284
- } else {
285
- var hash = win.top.location.hash;
286
- if (hash) {
287
- var len = win.top.location.href.indexOf(hash);
288
- win.top.location.href = win.location.href.slice(0, len) + '#/login';
289
- } else {
290
- win.top.location.href = '/login.html';
286
+ var hash = win.top.location.hash;
287
+ if (hash) {
288
+ var len = win.top.location.href.indexOf(hash);
289
+ win.top.location.href = win.location.href.slice(0, len) + '#/login';
290
+ } else {
291
+ win.top.location.href = '/login.html';
292
+ }
291
293
  }
292
- }
293
- }).catch(function (e) {
294
- sessionStorage.removeItem('remind');
295
- });
296
- }, 1000));
294
+ }).catch(function (e) {
295
+ sessionStorage.removeItem('remind');
296
+ });
297
+ }, 2000);
298
+ }
297
299
  }
298
300
  } else if (response.data.rCode === 61) {
299
301
  clearTimeout(initAuth);
@@ -2082,7 +2084,7 @@ var setStorage = function setStorage(_ref14) {
2082
2084
  * @param {boolean} [or] - 或者（等同于||）
2083
2085
  **/
2084
2086
  var startWith = function startWith(value, reg) {
2085
- var or = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
2087
+ var or = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
2086
2088
 
2087
2089
  if (Array.isArray(reg)) {
2088
2090
  var flag = true;
@@ -2862,14 +2864,14 @@ module.exports = require("axios");
2862
2864
 
2863
2865
  /***/ }),
2864
2866
 
2865
- /***/ 57:
2867
+ /***/ 56:
2866
2868
  /***/ (function(module, __webpack_exports__, __webpack_require__) {
2867
2869
 
2868
2870
  "use strict";
2869
2871
  // ESM COMPAT FLAG
2870
2872
  __webpack_require__.r(__webpack_exports__);
2871
2873
 
2872
- // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector/src/main.vue?vue&type=template&id=88396248&
2874
+ // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector/src/main.vue?vue&type=template&id=71e1a8ee&
2873
2875
  var render = function () {
2874
2876
  var _vm = this
2875
2877
  var _h = _vm.$createElement
@@ -3147,6 +3149,8 @@ var render = function () {
3147
3149
  attrs: {
3148
3150
  type: "text",
3149
3151
  autocomplete: "off",
3152
+ clearable: "clearable",
3153
+ showClearIcon: "",
3150
3154
  name: _vm.name,
3151
3155
  readonly: _vm.filterable ? false : true,
3152
3156
  active: _vm.actived,
@@ -3156,6 +3160,7 @@ var render = function () {
3156
3160
  disabled: _vm.selectorDisabled,
3157
3161
  tabindex: _vm.multiple ? "-1" : null,
3158
3162
  },
3163
+ on: { clear: _vm.handleClear },
3159
3164
  nativeOn: {
3160
3165
  dblclick: function ($event) {
3161
3166
  return _vm.openDialog($event)
@@ -3343,7 +3348,7 @@ var staticRenderFns = []
3343
3348
  render._withStripped = true
3344
3349
 
3345
3350
 
3346
- // CONCATENATED MODULE: ./packages/selector/src/main.vue?vue&type=template&id=88396248&
3351
+ // CONCATENATED MODULE: ./packages/selector/src/main.vue?vue&type=template&id=71e1a8ee&
3347
3352
 
3348
3353
  // EXTERNAL MODULE: ./src/utils/util.js
3349
3354
  var util = __webpack_require__(0);
@@ -3550,6 +3555,9 @@ var clickoutside_default = /*#__PURE__*/__webpack_require__.n(clickoutside_);
3550
3555
  //
3551
3556
  //
3552
3557
  //
3558
+ //
3559
+ //
3560
+ //
3553
3561
 
3554
3562
 
3555
3563
 
@@ -3614,7 +3622,10 @@ var clickoutside_default = /*#__PURE__*/__webpack_require__.n(clickoutside_);
3614
3622
  size: String,
3615
3623
  id: String,
3616
3624
  disabled: Boolean,
3617
- clearable: Boolean,
3625
+ clearable: {
3626
+ type: Boolean,
3627
+ default: true
3628
+ },
3618
3629
  placeholder: {
3619
3630
  type: String,
3620
3631
  default: '请选择'
@@ -3627,9 +3638,7 @@ var clickoutside_default = /*#__PURE__*/__webpack_require__.n(clickoutside_);
3627
3638
  readonly: Boolean,
3628
3639
  collapseTags: {
3629
3640
  type: Boolean,
3630
- default: function _default() {
3631
- return false;
3632
- }
3641
+ default: false
3633
3642
  },
3634
3643
  plain: Boolean,
3635
3644
  types: {
@@ -3887,6 +3896,10 @@ var clickoutside_default = /*#__PURE__*/__webpack_require__.n(clickoutside_);
3887
3896
  input.blur();
3888
3897
  }
3889
3898
  },
3899
+ handleClear: function handleClear() {
3900
+ this.$emit('input', []);
3901
+ this.$emit('clear');
3902
+ },
3890
3903
  handleCancel: function handleCancel() {
3891
3904
  this.visible = false;
3892
3905
  this.$emit('cancel');
package/lib/sizer.js CHANGED
@@ -82,7 +82,7 @@ module.exports =
82
82
  /******/
83
83
  /******/
84
84
  /******/ // Load entry module and return exports
85
- /******/ return __webpack_require__(__webpack_require__.s = 58);
85
+ /******/ return __webpack_require__(__webpack_require__.s = 57);
86
86
  /******/ })
87
87
  /************************************************************************/
88
88
  /******/ ({
@@ -248,52 +248,54 @@ var ajax = function ajax(_ref) {
248
248
  if (response.data.rCode === 64 || response.data.rCode === 65 || response.data.rCode === 67 || response.data.rCode === 69) {
249
249
  removeStorage(['Authorization', 'token', 'ssId', 'userId', 'userName', 'deviceUnique', 'menus', 'menus', 'useCaseCodes', 'mainConfig', 'jump']);
250
250
  if (win.top.location.href.indexOf('#/login') === -1 && win.top.location.href.indexOf('/login.html') === -1) {
251
- clearTimeout(loginMsg);
252
251
  var remind = sessionStorage.getItem('remind');
253
- !remind && (loginMsg = setTimeout(function () {
254
- sessionStorage.setItem('remind', 1);
255
- eoss_element__WEBPACK_IMPORTED_MODULE_4__["MessageBox"].confirm(response.data.rCode === 69 ? '该账号在其他地方已登陆!' : '登录已过期，请重新登录!', '提示', response.data.rCode === 69 ? {
256
- confirmButtonText: '确定',
257
- closeOnClickModal: false,
258
- type: 'warning'
259
- } : {
260
- confirmButtonText: '确定',
261
- cancelButtonText: '取消',
262
- closeOnClickModal: false,
263
- type: 'warning'
264
- }).then(function () {
265
- var loginPage = getStorage('login') || getStorage('loginPage');
266
- if (loginPage) {
267
- var src = void 0;
268
- if (!startWith(loginPage, ['http', '/'])) {
269
- var pathname = win.top.location.pathname;
270
- if (pathname !== '/') {
271
- pathname = pathname.split('/');
272
- pathname.splice(pathname.length - 1);
273
- pathname = pathname.join('/');
274
- src = pathname + '/' + loginPage.replace('./', '');
252
+ if (!remind) {
253
+ clearTimeout(loginMsg);
254
+ loginMsg = setTimeout(function () {
255
+ sessionStorage.setItem('remind', 1);
256
+ eoss_element__WEBPACK_IMPORTED_MODULE_4__["MessageBox"].confirm(response.data.rCode === 69 ? '该账号在其他地方已登陆!' : '登录已过期，请重新登录!', '提示', response.data.rCode === 69 ? {
257
+ confirmButtonText: '确定',
258
+ closeOnClickModal: false,
259
+ type: 'warning'
260
+ } : {
261
+ confirmButtonText: '确定',
262
+ cancelButtonText: '取消',
263
+ closeOnClickModal: false,
264
+ type: 'warning'
265
+ }).then(function () {
266
+ var loginPage = getStorage('login') || getStorage('loginPage');
267
+ if (loginPage) {
268
+ var src = void 0;
269
+ if (!startWith(loginPage, ['http', '/'], true)) {
270
+ var pathname = win.top.location.pathname;
271
+ if (pathname !== '/') {
272
+ pathname = pathname.split('/');
273
+ pathname.splice(pathname.length - 1);
274
+ pathname = pathname.join('/');
275
+ src = pathname + '/' + loginPage.replace('./', '');
276
+ } else {
277
+ src = pathname + loginPage.replace('./', '');
278
+ }
275
279
  } else {
276
- src = pathname + loginPage.replace('./', '');
280
+ src = loginPage;
277
281
  }
282
+ win.top.location.href = src;
283
+ } else if (win.top.location.href.indexOf('main.html') > -1) {
284
+ win.top.location.href = './login.html';
278
285
  } else {
279
- src = loginPage;
280
- }
281
- win.top.location.href = src;
282
- } else if (win.top.location.href.indexOf('main.html') > -1) {
283
- win.top.location.href = './login.html';
284
- } else {
285
- var hash = win.top.location.hash;
286
- if (hash) {
287
- var len = win.top.location.href.indexOf(hash);
288
- win.top.location.href = win.location.href.slice(0, len) + '#/login';
289
- } else {
290
- win.top.location.href = '/login.html';
286
+ var hash = win.top.location.hash;
287
+ if (hash) {
288
+ var len = win.top.location.href.indexOf(hash);
289
+ win.top.location.href = win.location.href.slice(0, len) + '#/login';
290
+ } else {
291
+ win.top.location.href = '/login.html';
292
+ }
291
293
  }
292
- }
293
- }).catch(function (e) {
294
- sessionStorage.removeItem('remind');
295
- });
296
- }, 1000));
294
+ }).catch(function (e) {
295
+ sessionStorage.removeItem('remind');
296
+ });
297
+ }, 2000);
298
+ }
297
299
  }
298
300
  } else if (response.data.rCode === 61) {
299
301
  clearTimeout(initAuth);
@@ -2082,7 +2084,7 @@ var setStorage = function setStorage(_ref14) {
2082
2084
  * @param {boolean} [or] - 或者（等同于||）
2083
2085
  **/
2084
2086
  var startWith = function startWith(value, reg) {
2085
- var or = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
2087
+ var or = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
2086
2088
 
2087
2089
  if (Array.isArray(reg)) {
2088
2090
  var flag = true;
@@ -2855,7 +2857,7 @@ module.exports = require("axios");
2855
2857
 
2856
2858
  /***/ }),
2857
2859
 
2858
- /***/ 58:
2860
+ /***/ 57:
2859
2861
  /***/ (function(module, __webpack_exports__, __webpack_require__) {
2860
2862
 
2861
2863
  "use strict";
package/lib/steps.js CHANGED
@@ -82,7 +82,7 @@ module.exports =
82
82
  /******/
83
83
  /******/
84
84
  /******/ // Load entry module and return exports
85
- /******/ return __webpack_require__(__webpack_require__.s = 59);
85
+ /******/ return __webpack_require__(__webpack_require__.s = 58);
86
86
  /******/ })
87
87
  /************************************************************************/
88
88
  /******/ ({
@@ -248,52 +248,54 @@ var ajax = function ajax(_ref) {
248
248
  if (response.data.rCode === 64 || response.data.rCode === 65 || response.data.rCode === 67 || response.data.rCode === 69) {
249
249
  removeStorage(['Authorization', 'token', 'ssId', 'userId', 'userName', 'deviceUnique', 'menus', 'menus', 'useCaseCodes', 'mainConfig', 'jump']);
250
250
  if (win.top.location.href.indexOf('#/login') === -1 && win.top.location.href.indexOf('/login.html') === -1) {
251
- clearTimeout(loginMsg);
252
251
  var remind = sessionStorage.getItem('remind');
253
- !remind && (loginMsg = setTimeout(function () {
254
- sessionStorage.setItem('remind', 1);
255
- eoss_element__WEBPACK_IMPORTED_MODULE_4__["MessageBox"].confirm(response.data.rCode === 69 ? '该账号在其他地方已登陆!' : '登录已过期，请重新登录!', '提示', response.data.rCode === 69 ? {
256
- confirmButtonText: '确定',
257
- closeOnClickModal: false,
258
- type: 'warning'
259
- } : {
260
- confirmButtonText: '确定',
261
- cancelButtonText: '取消',
262
- closeOnClickModal: false,
263
- type: 'warning'
264
- }).then(function () {
265
- var loginPage = getStorage('login') || getStorage('loginPage');
266
- if (loginPage) {
267
- var src = void 0;
268
- if (!startWith(loginPage, ['http', '/'])) {
269
- var pathname = win.top.location.pathname;
270
- if (pathname !== '/') {
271
- pathname = pathname.split('/');
272
- pathname.splice(pathname.length - 1);
273
- pathname = pathname.join('/');
274
- src = pathname + '/' + loginPage.replace('./', '');
252
+ if (!remind) {
253
+ clearTimeout(loginMsg);
254
+ loginMsg = setTimeout(function () {
255
+ sessionStorage.setItem('remind', 1);
256
+ eoss_element__WEBPACK_IMPORTED_MODULE_4__["MessageBox"].confirm(response.data.rCode === 69 ? '该账号在其他地方已登陆!' : '登录已过期，请重新登录!', '提示', response.data.rCode === 69 ? {
257
+ confirmButtonText: '确定',
258
+ closeOnClickModal: false,
259
+ type: 'warning'
260
+ } : {
261
+ confirmButtonText: '确定',
262
+ cancelButtonText: '取消',
263
+ closeOnClickModal: false,
264
+ type: 'warning'
265
+ }).then(function () {
266
+ var loginPage = getStorage('login') || getStorage('loginPage');
267
+ if (loginPage) {
268
+ var src = void 0;
269
+ if (!startWith(loginPage, ['http', '/'], true)) {
270
+ var pathname = win.top.location.pathname;
271
+ if (pathname !== '/') {
272
+ pathname = pathname.split('/');
273
+ pathname.splice(pathname.length - 1);
274
+ pathname = pathname.join('/');
275
+ src = pathname + '/' + loginPage.replace('./', '');
276
+ } else {
277
+ src = pathname + loginPage.replace('./', '');
278
+ }
275
279
  } else {
276
- src = pathname + loginPage.replace('./', '');
280
+ src = loginPage;
277
281
  }
282
+ win.top.location.href = src;
283
+ } else if (win.top.location.href.indexOf('main.html') > -1) {
284
+ win.top.location.href = './login.html';
278
285
  } else {
279
- src = loginPage;
280
- }
281
- win.top.location.href = src;
282
- } else if (win.top.location.href.indexOf('main.html') > -1) {
283
- win.top.location.href = './login.html';
284
- } else {
285
- var hash = win.top.location.hash;
286
- if (hash) {
287
- var len = win.top.location.href.indexOf(hash);
288
- win.top.location.href = win.location.href.slice(0, len) + '#/login';
289
- } else {
290
- win.top.location.href = '/login.html';
286
+ var hash = win.top.location.hash;
287
+ if (hash) {
288
+ var len = win.top.location.href.indexOf(hash);
289
+ win.top.location.href = win.location.href.slice(0, len) + '#/login';
290
+ } else {
291
+ win.top.location.href = '/login.html';
292
+ }
291
293
  }
292
- }
293
- }).catch(function (e) {
294
- sessionStorage.removeItem('remind');
295
- });
296
- }, 1000));
294
+ }).catch(function (e) {
295
+ sessionStorage.removeItem('remind');
296
+ });
297
+ }, 2000);
298
+ }
297
299
  }
298
300
  } else if (response.data.rCode === 61) {
299
301
  clearTimeout(initAuth);
@@ -2082,7 +2084,7 @@ var setStorage = function setStorage(_ref14) {
2082
2084
  * @param {boolean} [or] - 或者（等同于||）
2083
2085
  **/
2084
2086
  var startWith = function startWith(value, reg) {
2085
- var or = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
2087
+ var or = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
2086
2088
 
2087
2089
  if (Array.isArray(reg)) {
2088
2090
  var flag = true;
@@ -2855,7 +2857,7 @@ module.exports = require("axios");
2855
2857
 
2856
2858
  /***/ }),
2857
2859
 
2858
- /***/ 59:
2860
+ /***/ 58:
2859
2861
  /***/ (function(module, __webpack_exports__, __webpack_require__) {
2860
2862
 
2861
2863
  "use strict";