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/tree.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 = 63);
85
+ /******/ return __webpack_require__(__webpack_require__.s = 62);
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,7 +2864,7 @@ module.exports = require("json-bigint");
2862
2864
 
2863
2865
  /***/ }),
2864
2866
 
2865
- /***/ 63:
2867
+ /***/ 62:
2866
2868
  /***/ (function(module, __webpack_exports__, __webpack_require__) {
2867
2869
 
2868
2870
  "use strict";
package/lib/upload.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 = 36);
85
+ /******/ return __webpack_require__(__webpack_require__.s = 35);
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;
@@ -2841,15 +2843,15 @@ function normalizeComponent(
2841
2843
 
2842
2844
  /***/ }),
2843
2845
 
2844
- /***/ 36:
2846
+ /***/ 35:
2845
2847
  /***/ (function(module, __webpack_exports__, __webpack_require__) {
2846
2848
 
2847
2849
  "use strict";
2848
2850
  // ESM COMPAT FLAG
2849
2851
  __webpack_require__.r(__webpack_exports__);
2850
2852
 
2851
- // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/upload/src/main.vue?vue&type=template&id=a329683c&
2852
- var mainvue_type_template_id_a329683c_render = function () {
2853
+ // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/upload/src/main.vue?vue&type=template&id=167445a0&
2854
+ var mainvue_type_template_id_167445a0_render = function () {
2853
2855
  var _vm = this
2854
2856
  var _h = _vm.$createElement
2855
2857
  var _c = _vm._self._c || _h
@@ -3211,10 +3213,10 @@ var mainvue_type_template_id_a329683c_render = function () {
3211
3213
  )
3212
3214
  }
3213
3215
  var staticRenderFns = []
3214
- mainvue_type_template_id_a329683c_render._withStripped = true
3216
+ mainvue_type_template_id_167445a0_render._withStripped = true
3215
3217
 
3216
3218
 
3217
- // CONCATENATED MODULE: ./packages/upload/src/main.vue?vue&type=template&id=a329683c&
3219
+ // CONCATENATED MODULE: ./packages/upload/src/main.vue?vue&type=template&id=167445a0&
3218
3220
 
3219
3221
  // EXTERNAL MODULE: ./src/config/api.js
3220
3222
  var api = __webpack_require__(1);
@@ -3959,7 +3961,7 @@ var _props;
3959
3961
  } else if (suffix.includes('pdf')) {
3960
3962
  util["a" /* default */].win.open(this.host + (url ? url : api["hb" /* previewAdjunct2 */]) + '/' + file.originalName + '?adjunctId=' + file.adjunctId);
3961
3963
  } else if (suffix.includes('jpge') || suffix.includes('jpg') || suffix.includes('gif') || suffix.includes('png')) {
3962
- this.imgUrl = res.url && util["a" /* default */].startWith(url, ['http', '/']) ? res.url : this.host + (url ? url : this.previewAdjunct) + '?adjunctId=' + file.adjunctId;
3964
+ this.imgUrl = res.url && util["a" /* default */].startWith(url, ['http', '/', true]) ? res.url : this.host + (url ? url : this.previewAdjunct) + '?adjunctId=' + file.adjunctId;
3963
3965
  this.title = file.originalName;
3964
3966
  this.showImg = true;
3965
3967
  this.$nextTick(function () {
@@ -4256,7 +4258,7 @@ var componentNormalizer = __webpack_require__(3);
4256
4258
 
4257
4259
  var component = Object(componentNormalizer["a" /* default */])(
4258
4260
  src_mainvue_type_script_lang_js_,
4259
- mainvue_type_template_id_a329683c_render,
4261
+ mainvue_type_template_id_167445a0_render,
4260
4262
  staticRenderFns,
4261
4263
  false,
4262
4264
  null,
package/lib/utils/util.js CHANGED
@@ -163,52 +163,54 @@ var ajax = function ajax(_ref) {
163
163
  if (response.data.rCode === 64 || response.data.rCode === 65 || response.data.rCode === 67 || response.data.rCode === 69) {
164
164
  removeStorage(['Authorization', 'token', 'ssId', 'userId', 'userName', 'deviceUnique', 'menus', 'menus', 'useCaseCodes', 'mainConfig', 'jump']);
165
165
  if (win.top.location.href.indexOf('#/login') === -1 && win.top.location.href.indexOf('/login.html') === -1) {
166
- clearTimeout(loginMsg);
167
166
  var remind = sessionStorage.getItem('remind');
168
- !remind && (loginMsg = setTimeout(function () {
169
- sessionStorage.setItem('remind', 1);
170
- _eossElement.MessageBox.confirm(response.data.rCode === 69 ? '该账号在其他地方已登陆!' : '登录已过期，请重新登录!', '提示', response.data.rCode === 69 ? {
171
- confirmButtonText: '确定',
172
- closeOnClickModal: false,
173
- type: 'warning'
174
- } : {
175
- confirmButtonText: '确定',
176
- cancelButtonText: '取消',
177
- closeOnClickModal: false,
178
- type: 'warning'
179
- }).then(function () {
180
- var loginPage = getStorage('login') || getStorage('loginPage');
181
- if (loginPage) {
182
- var src = void 0;
183
- if (!startWith(loginPage, ['http', '/'])) {
184
- var pathname = win.top.location.pathname;
185
- if (pathname !== '/') {
186
- pathname = pathname.split('/');
187
- pathname.splice(pathname.length - 1);
188
- pathname = pathname.join('/');
189
- src = pathname + '/' + loginPage.replace('./', '');
167
+ if (!remind) {
168
+ clearTimeout(loginMsg);
169
+ loginMsg = setTimeout(function () {
170
+ sessionStorage.setItem('remind', 1);
171
+ _eossElement.MessageBox.confirm(response.data.rCode === 69 ? '该账号在其他地方已登陆!' : '登录已过期，请重新登录!', '提示', response.data.rCode === 69 ? {
172
+ confirmButtonText: '确定',
173
+ closeOnClickModal: false,
174
+ type: 'warning'
175
+ } : {
176
+ confirmButtonText: '确定',
177
+ cancelButtonText: '取消',
178
+ closeOnClickModal: false,
179
+ type: 'warning'
180
+ }).then(function () {
181
+ var loginPage = getStorage('login') || getStorage('loginPage');
182
+ if (loginPage) {
183
+ var src = void 0;
184
+ if (!startWith(loginPage, ['http', '/'], true)) {
185
+ var pathname = win.top.location.pathname;
186
+ if (pathname !== '/') {
187
+ pathname = pathname.split('/');
188
+ pathname.splice(pathname.length - 1);
189
+ pathname = pathname.join('/');
190
+ src = pathname + '/' + loginPage.replace('./', '');
191
+ } else {
192
+ src = pathname + loginPage.replace('./', '');
193
+ }
190
194
  } else {
191
- src = pathname + loginPage.replace('./', '');
195
+ src = loginPage;
192
196
  }
197
+ win.top.location.href = src;
198
+ } else if (win.top.location.href.indexOf('main.html') > -1) {
199
+ win.top.location.href = './login.html';
193
200
  } else {
194
- src = loginPage;
195
- }
196
- win.top.location.href = src;
197
- } else if (win.top.location.href.indexOf('main.html') > -1) {
198
- win.top.location.href = './login.html';
199
- } else {
200
- var hash = win.top.location.hash;
201
- if (hash) {
202
- var len = win.top.location.href.indexOf(hash);
203
- win.top.location.href = win.location.href.slice(0, len) + '#/login';
204
- } else {
205
- win.top.location.href = '/login.html';
201
+ var hash = win.top.location.hash;
202
+ if (hash) {
203
+ var len = win.top.location.href.indexOf(hash);
204
+ win.top.location.href = win.location.href.slice(0, len) + '#/login';
205
+ } else {
206
+ win.top.location.href = '/login.html';
207
+ }
206
208
  }
207
- }
208
- }).catch(function (e) {
209
- sessionStorage.removeItem('remind');
210
- });
211
- }, 1000));
209
+ }).catch(function (e) {
210
+ sessionStorage.removeItem('remind');
211
+ });
212
+ }, 2000);
213
+ }
212
214
  }
213
215
  } else if (response.data.rCode === 61) {
214
216
  clearTimeout(initAuth);
@@ -1997,7 +1999,7 @@ var setStorage = function setStorage(_ref14) {
1997
1999
  * @param {boolean} [or] - 或者（等同于||）
1998
2000
  **/
1999
2001
  var startWith = function startWith(value, reg) {
2000
- var or = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
2002
+ var or = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
2001
2003
 
2002
2004
  if (Array.isArray(reg)) {
2003
2005
  var flag = true;
package/lib/wujie.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 = 66);
85
+ /******/ return __webpack_require__(__webpack_require__.s = 65);
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,7 +2864,7 @@ module.exports = require("json-bigint");
2862
2864
 
2863
2865
  /***/ }),
2864
2866
 
2865
- /***/ 66:
2867
+ /***/ 65:
2866
2868
  /***/ (function(module, __webpack_exports__, __webpack_require__) {
2867
2869
 
2868
2870
  "use strict";