eoss-ui 0.5.13 → 0.5.15

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 (69) hide show
  1. package/lib/button-group.js +5 -1
  2. package/lib/button.js +7 -3
  3. package/lib/cascader.js +2 -2
  4. package/lib/checkbox-group.js +44 -22
  5. package/lib/data-table-form.js +8 -3
  6. package/lib/data-table.js +1205 -1517
  7. package/lib/date-picker.js +7 -3
  8. package/lib/dialog.js +14 -10
  9. package/lib/eoss-ui.common.js +1211 -1752
  10. package/lib/flow-group.js +5 -1
  11. package/lib/flow-list.js +7 -3
  12. package/lib/flow.js +12 -7
  13. package/lib/form.js +9 -10
  14. package/lib/handle-user.js +5 -1
  15. package/lib/handler.js +5 -1
  16. package/lib/icons.js +2 -2
  17. package/lib/index.js +1 -1
  18. package/lib/input-number.js +7 -3
  19. package/lib/input.js +7 -3
  20. package/lib/label.js +2 -2
  21. package/lib/layout.js +166 -152
  22. package/lib/login.js +5 -1
  23. package/lib/main.js +11 -6
  24. package/lib/menu.js +2 -2
  25. package/lib/nav.js +14 -10
  26. package/lib/notify.js +2 -2
  27. package/lib/page.js +7 -3
  28. package/lib/pagination.js +2 -2
  29. package/lib/player.js +13 -9
  30. package/lib/qr-code.js +9 -5
  31. package/lib/radio-group.js +48 -22
  32. package/lib/retrial-auth.js +7 -3
  33. package/lib/select-ganged.js +30 -6
  34. package/lib/select.js +46 -19
  35. package/lib/selector-panel.js +11 -6
  36. package/lib/selector.js +9 -5
  37. package/lib/sizer.js +7 -3
  38. package/lib/steps.js +14 -10
  39. package/lib/switch.js +7 -3
  40. package/lib/table-form.js +7 -3
  41. package/lib/tabs-panel.js +2 -2
  42. package/lib/tabs.js +7 -3
  43. package/lib/theme-chalk/data-table.css +1 -1
  44. package/lib/theme-chalk/index.css +1 -1
  45. package/lib/tips.js +7 -3
  46. package/lib/toolbar.js +2 -2
  47. package/lib/tree-group.js +7 -3
  48. package/lib/tree.js +7 -3
  49. package/lib/upload.js +8 -4
  50. package/lib/utils/util.js +5 -1
  51. package/lib/wujie.js +7 -3
  52. package/lib/wxlogin.js +7 -3
  53. package/package.json +2 -2
  54. package/packages/checkbox-group/src/main.vue +20 -30
  55. package/packages/data-table/src/children.vue +4 -8
  56. package/packages/data-table/src/column.vue +524 -575
  57. package/packages/data-table/src/main.vue +95 -119
  58. package/packages/form/src/main.vue +2 -7
  59. package/packages/radio-group/src/main.vue +20 -30
  60. package/packages/select/src/main.vue +20 -29
  61. package/packages/select-ganged/src/main.vue +1 -3
  62. package/packages/theme-chalk/lib/data-table.css +1 -1
  63. package/packages/theme-chalk/lib/index.css +1 -1
  64. package/packages/theme-chalk/src/data-table.scss +2 -1
  65. package/src/index.js +1 -1
  66. package/src/utils/util.js +5 -1
  67. package/packages/data-table/src/column copy.vue +0 -977
  68. package/packages/data-table/src/main copy.vue +0 -1325
  69. package/packages/data-table/src/mixins/table.js +0 -12
@@ -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 = 72);
85
+ /******/ return __webpack_require__(__webpack_require__.s = 73);
86
86
  /******/ })
87
87
  /************************************************************************/
88
88
  /******/ ({
@@ -1966,7 +1966,11 @@ var isLogined = function isLogined(_ref8) {
1966
1966
  // const logined = getStorage('logined');
1967
1967
  // eslint-disable-next-line eqeqeq
1968
1968
  if (token || cookie == true || cookie == 1) {
1969
- next && next();
1969
+ if (to.path === '/main' || to.path === '/login') {
1970
+ window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
1971
+ } else {
1972
+ next && next();
1973
+ }
1970
1974
  } else {
1971
1975
  if (!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
1972
1976
  ajax({
@@ -3586,7 +3590,7 @@ var WebSocket = function () {
3586
3590
 
3587
3591
  /***/ }),
3588
3592
 
3589
- /***/ 72:
3593
+ /***/ 73:
3590
3594
  /***/ (function(module, __webpack_exports__, __webpack_require__) {
3591
3595
 
3592
3596
  "use strict";
package/lib/input.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 = 71);
85
+ /******/ return __webpack_require__(__webpack_require__.s = 72);
86
86
  /******/ })
87
87
  /************************************************************************/
88
88
  /******/ ({
@@ -1966,7 +1966,11 @@ var isLogined = function isLogined(_ref8) {
1966
1966
  // const logined = getStorage('logined');
1967
1967
  // eslint-disable-next-line eqeqeq
1968
1968
  if (token || cookie == true || cookie == 1) {
1969
- next && next();
1969
+ if (to.path === '/main' || to.path === '/login') {
1970
+ window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
1971
+ } else {
1972
+ next && next();
1973
+ }
1970
1974
  } else {
1971
1975
  if (!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
1972
1976
  ajax({
@@ -3611,7 +3615,7 @@ var WebSocket = function () {
3611
3615
 
3612
3616
  /***/ }),
3613
3617
 
3614
- /***/ 71:
3618
+ /***/ 72:
3615
3619
  /***/ (function(module, __webpack_exports__, __webpack_require__) {
3616
3620
 
3617
3621
  "use strict";
package/lib/label.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 = 73);
85
+ /******/ return __webpack_require__(__webpack_require__.s = 74);
86
86
  /******/ })
87
87
  /************************************************************************/
88
88
  /******/ ({
@@ -192,7 +192,7 @@ function normalizeComponent(
192
192
 
193
193
  /***/ }),
194
194
 
195
- /***/ 73:
195
+ /***/ 74:
196
196
  /***/ (function(module, __webpack_exports__, __webpack_require__) {
197
197
 
198
198
  "use strict";
package/lib/layout.js CHANGED
@@ -82,164 +82,25 @@ 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 = 49);
86
86
  /******/ })
87
87
  /************************************************************************/
88
88
  /******/ ({
89
89
 
90
- /***/ 14:
90
+ /***/ 15:
91
91
  /***/ (function(module, exports) {
92
92
 
93
93
  module.exports = require("interactjs");
94
94
 
95
95
  /***/ }),
96
96
 
97
- /***/ 3:
98
- /***/ (function(module, __webpack_exports__, __webpack_require__) {
99
-
100
- "use strict";
101
- /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return normalizeComponent; });
102
- /* globals __VUE_SSR_CONTEXT__ */
103
-
104
- // IMPORTANT: Do NOT use ES2015 features in this file (except for modules).
105
- // This module is a runtime utility for cleaner component module output and will
106
- // be included in the final webpack user bundle.
107
-
108
- function normalizeComponent(
109
- scriptExports,
110
- render,
111
- staticRenderFns,
112
- functionalTemplate,
113
- injectStyles,
114
- scopeId,
115
- moduleIdentifier /* server only */,
116
- shadowMode /* vue-cli only */
117
- ) {
118
- // Vue.extend constructor export interop
119
- var options =
120
- typeof scriptExports === 'function' ? scriptExports.options : scriptExports
121
-
122
- // render functions
123
- if (render) {
124
- options.render = render
125
- options.staticRenderFns = staticRenderFns
126
- options._compiled = true
127
- }
128
-
129
- // functional template
130
- if (functionalTemplate) {
131
- options.functional = true
132
- }
133
-
134
- // scopedId
135
- if (scopeId) {
136
- options._scopeId = 'data-v-' + scopeId
137
- }
138
-
139
- var hook
140
- if (moduleIdentifier) {
141
- // server build
142
- hook = function (context) {
143
- // 2.3 injection
144
- context =
145
- context || // cached call
146
- (this.$vnode && this.$vnode.ssrContext) || // stateful
147
- (this.parent && this.parent.$vnode && this.parent.$vnode.ssrContext) // functional
148
- // 2.2 with runInNewContext: true
149
- if (!context && typeof __VUE_SSR_CONTEXT__ !== 'undefined') {
150
- context = __VUE_SSR_CONTEXT__
151
- }
152
- // inject component styles
153
- if (injectStyles) {
154
- injectStyles.call(this, context)
155
- }
156
- // register component module identifier for async chunk inferrence
157
- if (context && context._registeredComponents) {
158
- context._registeredComponents.add(moduleIdentifier)
159
- }
160
- }
161
- // used by ssr in case component is cached and beforeCreate
162
- // never gets called
163
- options._ssrRegister = hook
164
- } else if (injectStyles) {
165
- hook = shadowMode
166
- ? function () {
167
- injectStyles.call(
168
- this,
169
- (options.functional ? this.parent : this).$root.$options.shadowRoot
170
- )
171
- }
172
- : injectStyles
173
- }
174
-
175
- if (hook) {
176
- if (options.functional) {
177
- // for template-only hot-reload because in that case the render fn doesn't
178
- // go through the normalizer
179
- options._injectStyles = hook
180
- // register for functional component in vue file
181
- var originalRender = options.render
182
- options.render = function renderWithStyleInjection(h, context) {
183
- hook.call(context)
184
- return originalRender(h, context)
185
- }
186
- } else {
187
- // inject component registration as beforeCreate hook
188
- var existing = options.beforeCreate
189
- options.beforeCreate = existing ? [].concat(existing, hook) : [hook]
190
- }
191
- }
192
-
193
- return {
194
- exports: scriptExports,
195
- options: options
196
- }
197
- }
198
-
199
-
200
- /***/ }),
201
-
202
- /***/ 33:
97
+ /***/ 18:
203
98
  /***/ (function(module, __webpack_exports__, __webpack_require__) {
204
99
 
205
100
  "use strict";
206
- // ESM COMPAT FLAG
207
- __webpack_require__.r(__webpack_exports__);
208
-
209
- // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/layout/src/main.vue?vue&type=template&id=3f931032&
210
- var render = function () {
211
- var _vm = this
212
- var _h = _vm.$createElement
213
- var _c = _vm._self._c || _h
214
- return _c(
215
- "div",
216
- { staticClass: "es-layout" },
217
- [
218
- _c("layout-item"),
219
- _c("layout-item", { attrs: { top: "100px" } }),
220
- _vm._l(_vm.contents, function (item, index) {
221
- return _c(
222
- "layout-item",
223
- _vm._b(
224
- { key: item.id || index },
225
- "layout-item",
226
- Object.assign({}, item, { disabled: _vm.disabled }),
227
- false
228
- )
229
- )
230
- }),
231
- ],
232
- 2
233
- )
234
- }
235
- var staticRenderFns = []
236
- render._withStripped = true
237
-
238
-
239
- // CONCATENATED MODULE: ./packages/layout/src/main.vue?vue&type=template&id=3f931032&
240
101
 
241
102
  // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/layout/src/item.vue?vue&type=template&id=124bb300&
242
- var itemvue_type_template_id_124bb300_render = function () {
103
+ var render = function () {
243
104
  var _vm = this
244
105
  var _h = _vm.$createElement
245
106
  var _c = _vm._self._c || _h
@@ -260,14 +121,14 @@ var itemvue_type_template_id_124bb300_render = function () {
260
121
  1
261
122
  )
262
123
  }
263
- var itemvue_type_template_id_124bb300_staticRenderFns = []
264
- itemvue_type_template_id_124bb300_render._withStripped = true
124
+ var staticRenderFns = []
125
+ render._withStripped = true
265
126
 
266
127
 
267
128
  // CONCATENATED MODULE: ./packages/layout/src/item.vue?vue&type=template&id=124bb300&
268
129
 
269
130
  // EXTERNAL MODULE: external "interactjs"
270
- var external_interactjs_ = __webpack_require__(14);
131
+ var external_interactjs_ = __webpack_require__(15);
271
132
  var external_interactjs_default = /*#__PURE__*/__webpack_require__.n(external_interactjs_);
272
133
 
273
134
  // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/layout/src/item.vue?vue&type=script&lang=js&
@@ -436,8 +297,8 @@ var componentNormalizer = __webpack_require__(3);
436
297
 
437
298
  var component = Object(componentNormalizer["a" /* default */])(
438
299
  src_itemvue_type_script_lang_js_,
439
- itemvue_type_template_id_124bb300_render,
440
- itemvue_type_template_id_124bb300_staticRenderFns,
300
+ render,
301
+ staticRenderFns,
441
302
  false,
442
303
  null,
443
304
  null,
@@ -445,7 +306,157 @@ var component = Object(componentNormalizer["a" /* default */])(
445
306
 
446
307
  )
447
308
 
448
- /* harmony default export */ var item = (component.exports);
309
+ /* harmony default export */ var item = __webpack_exports__["a"] = (component.exports);
310
+
311
+ /***/ }),
312
+
313
+ /***/ 3:
314
+ /***/ (function(module, __webpack_exports__, __webpack_require__) {
315
+
316
+ "use strict";
317
+ /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return normalizeComponent; });
318
+ /* globals __VUE_SSR_CONTEXT__ */
319
+
320
+ // IMPORTANT: Do NOT use ES2015 features in this file (except for modules).
321
+ // This module is a runtime utility for cleaner component module output and will
322
+ // be included in the final webpack user bundle.
323
+
324
+ function normalizeComponent(
325
+ scriptExports,
326
+ render,
327
+ staticRenderFns,
328
+ functionalTemplate,
329
+ injectStyles,
330
+ scopeId,
331
+ moduleIdentifier /* server only */,
332
+ shadowMode /* vue-cli only */
333
+ ) {
334
+ // Vue.extend constructor export interop
335
+ var options =
336
+ typeof scriptExports === 'function' ? scriptExports.options : scriptExports
337
+
338
+ // render functions
339
+ if (render) {
340
+ options.render = render
341
+ options.staticRenderFns = staticRenderFns
342
+ options._compiled = true
343
+ }
344
+
345
+ // functional template
346
+ if (functionalTemplate) {
347
+ options.functional = true
348
+ }
349
+
350
+ // scopedId
351
+ if (scopeId) {
352
+ options._scopeId = 'data-v-' + scopeId
353
+ }
354
+
355
+ var hook
356
+ if (moduleIdentifier) {
357
+ // server build
358
+ hook = function (context) {
359
+ // 2.3 injection
360
+ context =
361
+ context || // cached call
362
+ (this.$vnode && this.$vnode.ssrContext) || // stateful
363
+ (this.parent && this.parent.$vnode && this.parent.$vnode.ssrContext) // functional
364
+ // 2.2 with runInNewContext: true
365
+ if (!context && typeof __VUE_SSR_CONTEXT__ !== 'undefined') {
366
+ context = __VUE_SSR_CONTEXT__
367
+ }
368
+ // inject component styles
369
+ if (injectStyles) {
370
+ injectStyles.call(this, context)
371
+ }
372
+ // register component module identifier for async chunk inferrence
373
+ if (context && context._registeredComponents) {
374
+ context._registeredComponents.add(moduleIdentifier)
375
+ }
376
+ }
377
+ // used by ssr in case component is cached and beforeCreate
378
+ // never gets called
379
+ options._ssrRegister = hook
380
+ } else if (injectStyles) {
381
+ hook = shadowMode
382
+ ? function () {
383
+ injectStyles.call(
384
+ this,
385
+ (options.functional ? this.parent : this).$root.$options.shadowRoot
386
+ )
387
+ }
388
+ : injectStyles
389
+ }
390
+
391
+ if (hook) {
392
+ if (options.functional) {
393
+ // for template-only hot-reload because in that case the render fn doesn't
394
+ // go through the normalizer
395
+ options._injectStyles = hook
396
+ // register for functional component in vue file
397
+ var originalRender = options.render
398
+ options.render = function renderWithStyleInjection(h, context) {
399
+ hook.call(context)
400
+ return originalRender(h, context)
401
+ }
402
+ } else {
403
+ // inject component registration as beforeCreate hook
404
+ var existing = options.beforeCreate
405
+ options.beforeCreate = existing ? [].concat(existing, hook) : [hook]
406
+ }
407
+ }
408
+
409
+ return {
410
+ exports: scriptExports,
411
+ options: options
412
+ }
413
+ }
414
+
415
+
416
+ /***/ }),
417
+
418
+ /***/ 49:
419
+ /***/ (function(module, __webpack_exports__, __webpack_require__) {
420
+
421
+ "use strict";
422
+ // ESM COMPAT FLAG
423
+ __webpack_require__.r(__webpack_exports__);
424
+
425
+ // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/layout/src/main.vue?vue&type=template&id=3f931032&
426
+ var render = function () {
427
+ var _vm = this
428
+ var _h = _vm.$createElement
429
+ var _c = _vm._self._c || _h
430
+ return _c(
431
+ "div",
432
+ { staticClass: "es-layout" },
433
+ [
434
+ _c("layout-item"),
435
+ _c("layout-item", { attrs: { top: "100px" } }),
436
+ _vm._l(_vm.contents, function (item, index) {
437
+ return _c(
438
+ "layout-item",
439
+ _vm._b(
440
+ { key: item.id || index },
441
+ "layout-item",
442
+ Object.assign({}, item, { disabled: _vm.disabled }),
443
+ false
444
+ )
445
+ )
446
+ }),
447
+ ],
448
+ 2
449
+ )
450
+ }
451
+ var staticRenderFns = []
452
+ render._withStripped = true
453
+
454
+
455
+ // CONCATENATED MODULE: ./packages/layout/src/main.vue?vue&type=template&id=3f931032&
456
+
457
+ // EXTERNAL MODULE: ./packages/layout/src/item.vue + 4 modules
458
+ var item = __webpack_require__(18);
459
+
449
460
  // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/layout/src/main.vue?vue&type=script&lang=js&
450
461
  //
451
462
  //
@@ -462,7 +473,7 @@ var component = Object(componentNormalizer["a" /* default */])(
462
473
 
463
474
  /* harmony default export */ var mainvue_type_script_lang_js_ = ({
464
475
  name: 'EsLayout',
465
- components: { layoutItem: item },
476
+ components: { layoutItem: item["a" /* default */] },
466
477
  props: {
467
478
  contents: Array,
468
479
  disabled: Boolean
@@ -480,6 +491,9 @@ var component = Object(componentNormalizer["a" /* default */])(
480
491
  });
481
492
  // CONCATENATED MODULE: ./packages/layout/src/main.vue?vue&type=script&lang=js&
482
493
  /* harmony default export */ var src_mainvue_type_script_lang_js_ = (mainvue_type_script_lang_js_);
494
+ // EXTERNAL MODULE: ./node_modules/vue-loader/lib/runtime/componentNormalizer.js
495
+ var componentNormalizer = __webpack_require__(3);
496
+
483
497
  // CONCATENATED MODULE: ./packages/layout/src/main.vue
484
498
 
485
499
 
@@ -488,7 +502,7 @@ var component = Object(componentNormalizer["a" /* default */])(
488
502
 
489
503
  /* normalize component */
490
504
 
491
- var main_component = Object(componentNormalizer["a" /* default */])(
505
+ var component = Object(componentNormalizer["a" /* default */])(
492
506
  src_mainvue_type_script_lang_js_,
493
507
  render,
494
508
  staticRenderFns,
@@ -499,7 +513,7 @@ var main_component = Object(componentNormalizer["a" /* default */])(
499
513
 
500
514
  )
501
515
 
502
- /* harmony default export */ var main = (main_component.exports);
516
+ /* harmony default export */ var main = (component.exports);
503
517
  // CONCATENATED MODULE: ./packages/layout/index.js
504
518
 
505
519
 
package/lib/login.js CHANGED
@@ -1965,7 +1965,11 @@ var isLogined = function isLogined(_ref8) {
1965
1965
  // const logined = getStorage('logined');
1966
1966
  // eslint-disable-next-line eqeqeq
1967
1967
  if (token || cookie == true || cookie == 1) {
1968
- next && next();
1968
+ if (to.path === '/main' || to.path === '/login') {
1969
+ window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
1970
+ } else {
1971
+ next && next();
1972
+ }
1969
1973
  } else {
1970
1974
  if (!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
1971
1975
  ajax({
package/lib/main.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 = 30);
85
+ /******/ return __webpack_require__(__webpack_require__.s = 31);
86
86
  /******/ })
87
87
  /************************************************************************/
88
88
  /******/ ([
@@ -1965,7 +1965,11 @@ var isLogined = function isLogined(_ref8) {
1965
1965
  // const logined = getStorage('logined');
1966
1966
  // eslint-disable-next-line eqeqeq
1967
1967
  if (token || cookie == true || cookie == 1) {
1968
- next && next();
1968
+ if (to.path === '/main' || to.path === '/login') {
1969
+ window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
1970
+ } else {
1971
+ next && next();
1972
+ }
1969
1973
  } else {
1970
1974
  if (!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
1971
1975
  ajax({
@@ -3629,13 +3633,13 @@ module.exports = require("babel-runtime/regenerator");
3629
3633
  /* 18 */,
3630
3634
  /* 19 */,
3631
3635
  /* 20 */,
3632
- /* 21 */
3636
+ /* 21 */,
3637
+ /* 22 */
3633
3638
  /***/ (function(module, exports) {
3634
3639
 
3635
3640
  module.exports = require("runtime-import");
3636
3641
 
3637
3642
  /***/ }),
3638
- /* 22 */,
3639
3643
  /* 23 */,
3640
3644
  /* 24 */,
3641
3645
  /* 25 */,
@@ -3643,7 +3647,8 @@ module.exports = require("runtime-import");
3643
3647
  /* 27 */,
3644
3648
  /* 28 */,
3645
3649
  /* 29 */,
3646
- /* 30 */
3650
+ /* 30 */,
3651
+ /* 31 */
3647
3652
  /***/ (function(module, __webpack_exports__, __webpack_require__) {
3648
3653
 
3649
3654
  "use strict";
@@ -5730,7 +5735,7 @@ var regenerator_ = __webpack_require__(12);
5730
5735
  var regenerator_default = /*#__PURE__*/__webpack_require__.n(regenerator_);
5731
5736
 
5732
5737
  // EXTERNAL MODULE: external "runtime-import"
5733
- var external_runtime_import_ = __webpack_require__(21);
5738
+ var external_runtime_import_ = __webpack_require__(22);
5734
5739
 
5735
5740
  // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/async-component/index.vue?vue&type=script&lang=js&
5736
5741
 
package/lib/menu.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 = 74);
85
+ /******/ return __webpack_require__(__webpack_require__.s = 75);
86
86
  /******/ })
87
87
  /************************************************************************/
88
88
  /******/ ({
@@ -192,7 +192,7 @@ function normalizeComponent(
192
192
 
193
193
  /***/ }),
194
194
 
195
- /***/ 74:
195
+ /***/ 75:
196
196
  /***/ (function(module, __webpack_exports__, __webpack_require__) {
197
197
 
198
198
  "use strict";
package/lib/nav.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 = 49);
85
+ /******/ return __webpack_require__(__webpack_require__.s = 50);
86
86
  /******/ })
87
87
  /************************************************************************/
88
88
  /******/ ({
@@ -1966,7 +1966,11 @@ var isLogined = function isLogined(_ref8) {
1966
1966
  // const logined = getStorage('logined');
1967
1967
  // eslint-disable-next-line eqeqeq
1968
1968
  if (token || cookie == true || cookie == 1) {
1969
- next && next();
1969
+ if (to.path === '/main' || to.path === '/login') {
1970
+ window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
1971
+ } else {
1972
+ next && next();
1973
+ }
1970
1974
  } else {
1971
1975
  if (!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
1972
1976
  ajax({
@@ -3439,7 +3443,14 @@ module.exports = require("qs");
3439
3443
 
3440
3444
  /***/ }),
3441
3445
 
3442
- /***/ 49:
3446
+ /***/ 5:
3447
+ /***/ (function(module, exports) {
3448
+
3449
+ module.exports = require("axios");
3450
+
3451
+ /***/ }),
3452
+
3453
+ /***/ 50:
3443
3454
  /***/ (function(module, __webpack_exports__, __webpack_require__) {
3444
3455
 
3445
3456
  "use strict";
@@ -3883,13 +3894,6 @@ main.install = function (Vue) {
3883
3894
 
3884
3895
  /***/ }),
3885
3896
 
3886
- /***/ 5:
3887
- /***/ (function(module, exports) {
3888
-
3889
- module.exports = require("axios");
3890
-
3891
- /***/ }),
3892
-
3893
3897
  /***/ 6:
3894
3898
  /***/ (function(module, exports) {
3895
3899
 
package/lib/notify.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 = 50);
85
+ /******/ return __webpack_require__(__webpack_require__.s = 51);
86
86
  /******/ })
87
87
  /************************************************************************/
88
88
  /******/ ({
@@ -532,7 +532,7 @@ function normalizeComponent(
532
532
 
533
533
  /***/ }),
534
534
 
535
- /***/ 50:
535
+ /***/ 51:
536
536
  /***/ (function(module, __webpack_exports__, __webpack_require__) {
537
537
 
538
538
  "use strict";
package/lib/page.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 = 52);
85
+ /******/ return __webpack_require__(__webpack_require__.s = 53);
86
86
  /******/ })
87
87
  /************************************************************************/
88
88
  /******/ ({
@@ -1966,7 +1966,11 @@ var isLogined = function isLogined(_ref8) {
1966
1966
  // const logined = getStorage('logined');
1967
1967
  // eslint-disable-next-line eqeqeq
1968
1968
  if (token || cookie == true || cookie == 1) {
1969
- next && next();
1969
+ if (to.path === '/main' || to.path === '/login') {
1970
+ window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
1971
+ } else {
1972
+ next && next();
1973
+ }
1970
1974
  } else {
1971
1975
  if (!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
1972
1976
  ajax({
@@ -3446,7 +3450,7 @@ module.exports = require("axios");
3446
3450
 
3447
3451
  /***/ }),
3448
3452
 
3449
- /***/ 52:
3453
+ /***/ 53:
3450
3454
  /***/ (function(module, __webpack_exports__, __webpack_require__) {
3451
3455
 
3452
3456
  "use strict";
package/lib/pagination.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 = 51);
85
+ /******/ return __webpack_require__(__webpack_require__.s = 52);
86
86
  /******/ })
87
87
  /************************************************************************/
88
88
  /******/ ({
@@ -192,7 +192,7 @@ function normalizeComponent(
192
192
 
193
193
  /***/ }),
194
194
 
195
- /***/ 51:
195
+ /***/ 52:
196
196
  /***/ (function(module, __webpack_exports__, __webpack_require__) {
197
197
 
198
198
  "use strict";