eoss-ui 0.4.10 → 0.4.14

package/lib/upload.js

@@ -534,7 +534,7 @@ var esEncode = function esEncode(value) {
  **/
 var esDecode = function esDecode(value) {
   var kleng = publicKey.length;
-  var result;
+  var result = void 0;
   var cat1 = void 0;
   var cat2 = void 0;
   var cat3 = void 0;
@@ -639,11 +639,13 @@ var exportXls = function exportXls(_ref6) {
       _ref6$data = _ref6.data,
       data = _ref6$data === undefined ? [] : _ref6$data,
       name = _ref6.name,
-      numbers = _ref6.numbers;
+      numbers = _ref6.numbers,
+      option = _ref6.option;
 
   var tbody = '';
   var aligns = [];
   var fields = [];
+  var keys = {};
   var others = {};
   var alink = document.createElement('a');
   for (var i = 0; i < thead.length; i++) {
@@ -653,12 +655,15 @@ var exportXls = function exportXls(_ref6) {
     }
     var tr = thead[i];
     var col = 0;
-    for (var _x = 0; _x < tr.length; _x++) {
-      var td = tr[_x];
+    for (var x = 0; x < tr.length; x++) {
+      var td = tr[x];
       if (td.property) {
-        if (col === _x) {
+        if (col === x) {
           fields.push(td.property);
           aligns.push(td.align);
+          if (td.labelKey && td.valueKey) {
+            keys[td.property] = { labelKey: td.labelKey, valueKey: td.valueKey, multiple: !!(td.valueToString || td['value-to-string']) };
+          }
         } else {
           others[String(col)] = [td.property, td.align];
         }
@@ -676,12 +681,72 @@ var exportXls = function exportXls(_ref6) {
     fields.splice(_i2, 0, others[_i2][0]);
     aligns.splice(_i2, 0, others[_i2][1]);
   }
-  for (var _i3 = 0; _i3 < data.length; _i3++) {
+
+  var _loop = function _loop(_i3) {
     tbody += '<tr>';
-    for (var x in fields) {
-      tbody += '<td align="' + aligns[x] + '">' + data[_i3][fields[x]] + '</td>';
+
+    var _loop2 = function _loop2(_x) {
+      var field = '';
+      var valueKey = keys[fields[_x]] && keys[fields[_x]].valueKey ? keys[fields[_x]].valueKey : 'value';
+      var labelKey = keys[fields[_x]] && keys[fields[_x]].labelKey ? keys[fields[_x]].labelKey : 'name';
+      if (option[fields[_x]]) {
+        if (Array.isArray(data[_i3][fields[_x]])) {
+          field = [];
+          data[_i3][fields[_x]].forEach(function (ele) {
+            option[fields[_x]].forEach(function (item) {
+              // eslint-disable-next-line eqeqeq
+              if (item[valueKey] == ele) {
+                field.push(item[labelKey]);
+                return;
+              }
+            });
+          });
+          field = field.join(' ');
+        } else if (typeof data[_i3][fields[_x]] === 'string' && keys[fields[_x]] && keys[fields[_x]].multiple) {
+          field = [];
+          data[_i3][fields[_x]].split(',').forEach(function (ele) {
+            option[fields[_x]].forEach(function (item) {
+              // eslint-disable-next-line eqeqeq
+              if (item[valueKey] == ele) {
+                field.push(item[labelKey]);
+                return;
+              }
+            });
+          });
+          field = field.join(' ');
+        } else {
+          option[fields[_x]].forEach(function (item) {
+            // eslint-disable-next-line eqeqeq
+            if (item[valueKey] == data[_i3][fields[_x]]) {
+              field = item[labelKey];
+              return;
+            }
+          });
+        }
+      } else if (_typeof(data[_i3][fields[_x]]) === 'object' && keys[fields[_x]]) {
+        if (Array.isArray(data[_i3][fields[_x]])) {
+          data[_i3][fields[_x]].forEach(function (item) {
+            field = [];
+            field.push({}.toString.call(item) === '[object Object]' ? item[labelKey] : item);
+          });
+          field = field.join(' ');
+        } else {
+          field = data[_i3][fields[_x]][labelKey];
+        }
+      } else {
+        field = data[_i3][fields[_x]];
+      }
+      tbody += '<td align="' + aligns[_x] + '">' + field + '</td>';
+    };
+
+    for (var _x in fields) {
+      _loop2(_x);
     }
     tbody += '</tr>';
+  };
+
+  for (var _i3 = 0; _i3 < data.length; _i3++) {
+    _loop(_i3);
   }
   if (!name) {
     name = 'table_' + new Date().getTime();
@@ -1430,10 +1495,27 @@ var isLogged = function isLogged(_ref8) {
               break;
             case 3:
               var href = res.results.authorizeUrl.replace('{redirectUri}', encodeURIComponent(url));
-              if (open) {
-                win.open(href);
+              if (to.query.openType) {
+                switch (to.query.openType) {
+                  case 'self':
+                    win.location.href = href;
+                    break;
+                  case 'blank':
+                    win.open(href);
+                    break;
+                  case 'top':
+                    win.top.location.href = href;
+                    break;
+                  case 'parent':
+                    win.parent.location.href = href;
+                    break;
+                }
               } else {
-                win.top.location.href = href;
+                if (open) {
+                  win.open(href);
+                } else {
+                  win.top.location.href = href;
+                }
               }
               break;
           }
@@ -1445,9 +1527,9 @@ var isLogged = function isLogged(_ref8) {
           }
         }
       }).catch(function (e) {});
-    } else if (token || to.path === '/' || to.path === '/login' || to.path === '/404' || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1) {
-      if (redirect && to.name && (to.name === 'login' || to.name === 'main')) {
-        window.location.replace(urlJoinParams({ url: './' + to.name + '.html', param: to.query }));
+    } else if (token || to.path === '/' || to.path === '/404' || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
+      if (redirect && (to.path === '/main' || to.path === '/login')) {
+        window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
       } else {
         next();
       }

package/lib/utils/util.js

@@ -449,7 +449,7 @@ var esEncode = function esEncode(value) {
  **/
 var esDecode = function esDecode(value) {
   var kleng = publicKey.length;
-  var result;
+  var result = void 0;
   var cat1 = void 0;
   var cat2 = void 0;
   var cat3 = void 0;
@@ -554,11 +554,13 @@ var exportXls = function exportXls(_ref6) {
       _ref6$data = _ref6.data,
       data = _ref6$data === undefined ? [] : _ref6$data,
       name = _ref6.name,
-      numbers = _ref6.numbers;
+      numbers = _ref6.numbers,
+      option = _ref6.option;
 
   var tbody = '';
   var aligns = [];
   var fields = [];
+  var keys = {};
   var others = {};
   var alink = document.createElement('a');
   for (var i = 0; i < thead.length; i++) {
@@ -568,12 +570,15 @@ var exportXls = function exportXls(_ref6) {
     }
     var tr = thead[i];
     var col = 0;
-    for (var _x = 0; _x < tr.length; _x++) {
-      var td = tr[_x];
+    for (var x = 0; x < tr.length; x++) {
+      var td = tr[x];
       if (td.property) {
-        if (col === _x) {
+        if (col === x) {
           fields.push(td.property);
           aligns.push(td.align);
+          if (td.labelKey && td.valueKey) {
+            keys[td.property] = { labelKey: td.labelKey, valueKey: td.valueKey, multiple: !!(td.valueToString || td['value-to-string']) };
+          }
         } else {
           others[String(col)] = [td.property, td.align];
         }
@@ -591,12 +596,72 @@ var exportXls = function exportXls(_ref6) {
     fields.splice(_i2, 0, others[_i2][0]);
     aligns.splice(_i2, 0, others[_i2][1]);
   }
-  for (var _i3 = 0; _i3 < data.length; _i3++) {
+
+  var _loop = function _loop(_i3) {
     tbody += '<tr>';
-    for (var x in fields) {
-      tbody += '<td align="' + aligns[x] + '">' + data[_i3][fields[x]] + '</td>';
+
+    var _loop2 = function _loop2(_x) {
+      var field = '';
+      var valueKey = keys[fields[_x]] && keys[fields[_x]].valueKey ? keys[fields[_x]].valueKey : 'value';
+      var labelKey = keys[fields[_x]] && keys[fields[_x]].labelKey ? keys[fields[_x]].labelKey : 'name';
+      if (option[fields[_x]]) {
+        if (Array.isArray(data[_i3][fields[_x]])) {
+          field = [];
+          data[_i3][fields[_x]].forEach(function (ele) {
+            option[fields[_x]].forEach(function (item) {
+              // eslint-disable-next-line eqeqeq
+              if (item[valueKey] == ele) {
+                field.push(item[labelKey]);
+                return;
+              }
+            });
+          });
+          field = field.join(' ');
+        } else if (typeof data[_i3][fields[_x]] === 'string' && keys[fields[_x]] && keys[fields[_x]].multiple) {
+          field = [];
+          data[_i3][fields[_x]].split(',').forEach(function (ele) {
+            option[fields[_x]].forEach(function (item) {
+              // eslint-disable-next-line eqeqeq
+              if (item[valueKey] == ele) {
+                field.push(item[labelKey]);
+                return;
+              }
+            });
+          });
+          field = field.join(' ');
+        } else {
+          option[fields[_x]].forEach(function (item) {
+            // eslint-disable-next-line eqeqeq
+            if (item[valueKey] == data[_i3][fields[_x]]) {
+              field = item[labelKey];
+              return;
+            }
+          });
+        }
+      } else if (_typeof(data[_i3][fields[_x]]) === 'object' && keys[fields[_x]]) {
+        if (Array.isArray(data[_i3][fields[_x]])) {
+          data[_i3][fields[_x]].forEach(function (item) {
+            field = [];
+            field.push({}.toString.call(item) === '[object Object]' ? item[labelKey] : item);
+          });
+          field = field.join(' ');
+        } else {
+          field = data[_i3][fields[_x]][labelKey];
+        }
+      } else {
+        field = data[_i3][fields[_x]];
+      }
+      tbody += '<td align="' + aligns[_x] + '">' + field + '</td>';
+    };
+
+    for (var _x in fields) {
+      _loop2(_x);
     }
     tbody += '</tr>';
+  };
+
+  for (var _i3 = 0; _i3 < data.length; _i3++) {
+    _loop(_i3);
   }
   if (!name) {
     name = 'table_' + new Date().getTime();
@@ -1345,10 +1410,27 @@ var isLogged = function isLogged(_ref8) {
               break;
             case 3:
               var href = res.results.authorizeUrl.replace('{redirectUri}', encodeURIComponent(url));
-              if (open) {
-                win.open(href);
+              if (to.query.openType) {
+                switch (to.query.openType) {
+                  case 'self':
+                    win.location.href = href;
+                    break;
+                  case 'blank':
+                    win.open(href);
+                    break;
+                  case 'top':
+                    win.top.location.href = href;
+                    break;
+                  case 'parent':
+                    win.parent.location.href = href;
+                    break;
+                }
               } else {
-                win.top.location.href = href;
+                if (open) {
+                  win.open(href);
+                } else {
+                  win.top.location.href = href;
+                }
               }
               break;
           }
@@ -1360,9 +1442,9 @@ var isLogged = function isLogged(_ref8) {
           }
         }
       }).catch(function (e) {});
-    } else if (token || to.path === '/' || to.path === '/login' || to.path === '/404' || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1) {
-      if (redirect && to.name && (to.name === 'login' || to.name === 'main')) {
-        window.location.replace(urlJoinParams({ url: './' + to.name + '.html', param: to.query }));
+    } else if (token || to.path === '/' || to.path === '/404' || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
+      if (redirect && (to.path === '/main' || to.path === '/login')) {
+        window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
       } else {
         next();
       }

package/lib/wujie.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 60);
+/******/ 	return __webpack_require__(__webpack_require__.s = 61);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -534,7 +534,7 @@ var esEncode = function esEncode(value) {
  **/
 var esDecode = function esDecode(value) {
   var kleng = publicKey.length;
-  var result;
+  var result = void 0;
   var cat1 = void 0;
   var cat2 = void 0;
   var cat3 = void 0;
@@ -639,11 +639,13 @@ var exportXls = function exportXls(_ref6) {
       _ref6$data = _ref6.data,
       data = _ref6$data === undefined ? [] : _ref6$data,
       name = _ref6.name,
-      numbers = _ref6.numbers;
+      numbers = _ref6.numbers,
+      option = _ref6.option;
 
   var tbody = '';
   var aligns = [];
   var fields = [];
+  var keys = {};
   var others = {};
   var alink = document.createElement('a');
   for (var i = 0; i < thead.length; i++) {
@@ -653,12 +655,15 @@ var exportXls = function exportXls(_ref6) {
     }
     var tr = thead[i];
     var col = 0;
-    for (var _x = 0; _x < tr.length; _x++) {
-      var td = tr[_x];
+    for (var x = 0; x < tr.length; x++) {
+      var td = tr[x];
       if (td.property) {
-        if (col === _x) {
+        if (col === x) {
           fields.push(td.property);
           aligns.push(td.align);
+          if (td.labelKey && td.valueKey) {
+            keys[td.property] = { labelKey: td.labelKey, valueKey: td.valueKey, multiple: !!(td.valueToString || td['value-to-string']) };
+          }
         } else {
           others[String(col)] = [td.property, td.align];
         }
@@ -676,12 +681,72 @@ var exportXls = function exportXls(_ref6) {
     fields.splice(_i2, 0, others[_i2][0]);
     aligns.splice(_i2, 0, others[_i2][1]);
   }
-  for (var _i3 = 0; _i3 < data.length; _i3++) {
+
+  var _loop = function _loop(_i3) {
     tbody += '<tr>';
-    for (var x in fields) {
-      tbody += '<td align="' + aligns[x] + '">' + data[_i3][fields[x]] + '</td>';
+
+    var _loop2 = function _loop2(_x) {
+      var field = '';
+      var valueKey = keys[fields[_x]] && keys[fields[_x]].valueKey ? keys[fields[_x]].valueKey : 'value';
+      var labelKey = keys[fields[_x]] && keys[fields[_x]].labelKey ? keys[fields[_x]].labelKey : 'name';
+      if (option[fields[_x]]) {
+        if (Array.isArray(data[_i3][fields[_x]])) {
+          field = [];
+          data[_i3][fields[_x]].forEach(function (ele) {
+            option[fields[_x]].forEach(function (item) {
+              // eslint-disable-next-line eqeqeq
+              if (item[valueKey] == ele) {
+                field.push(item[labelKey]);
+                return;
+              }
+            });
+          });
+          field = field.join(' ');
+        } else if (typeof data[_i3][fields[_x]] === 'string' && keys[fields[_x]] && keys[fields[_x]].multiple) {
+          field = [];
+          data[_i3][fields[_x]].split(',').forEach(function (ele) {
+            option[fields[_x]].forEach(function (item) {
+              // eslint-disable-next-line eqeqeq
+              if (item[valueKey] == ele) {
+                field.push(item[labelKey]);
+                return;
+              }
+            });
+          });
+          field = field.join(' ');
+        } else {
+          option[fields[_x]].forEach(function (item) {
+            // eslint-disable-next-line eqeqeq
+            if (item[valueKey] == data[_i3][fields[_x]]) {
+              field = item[labelKey];
+              return;
+            }
+          });
+        }
+      } else if (_typeof(data[_i3][fields[_x]]) === 'object' && keys[fields[_x]]) {
+        if (Array.isArray(data[_i3][fields[_x]])) {
+          data[_i3][fields[_x]].forEach(function (item) {
+            field = [];
+            field.push({}.toString.call(item) === '[object Object]' ? item[labelKey] : item);
+          });
+          field = field.join(' ');
+        } else {
+          field = data[_i3][fields[_x]][labelKey];
+        }
+      } else {
+        field = data[_i3][fields[_x]];
+      }
+      tbody += '<td align="' + aligns[_x] + '">' + field + '</td>';
+    };
+
+    for (var _x in fields) {
+      _loop2(_x);
     }
     tbody += '</tr>';
+  };
+
+  for (var _i3 = 0; _i3 < data.length; _i3++) {
+    _loop(_i3);
   }
   if (!name) {
     name = 'table_' + new Date().getTime();
@@ -1430,10 +1495,27 @@ var isLogged = function isLogged(_ref8) {
               break;
             case 3:
               var href = res.results.authorizeUrl.replace('{redirectUri}', encodeURIComponent(url));
-              if (open) {
-                win.open(href);
+              if (to.query.openType) {
+                switch (to.query.openType) {
+                  case 'self':
+                    win.location.href = href;
+                    break;
+                  case 'blank':
+                    win.open(href);
+                    break;
+                  case 'top':
+                    win.top.location.href = href;
+                    break;
+                  case 'parent':
+                    win.parent.location.href = href;
+                    break;
+                }
               } else {
-                win.top.location.href = href;
+                if (open) {
+                  win.open(href);
+                } else {
+                  win.top.location.href = href;
+                }
               }
               break;
           }
@@ -1445,9 +1527,9 @@ var isLogged = function isLogged(_ref8) {
           }
         }
       }).catch(function (e) {});
-    } else if (token || to.path === '/' || to.path === '/login' || to.path === '/404' || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1) {
-      if (redirect && to.name && (to.name === 'login' || to.name === 'main')) {
-        window.location.replace(urlJoinParams({ url: './' + to.name + '.html', param: to.query }));
+    } else if (token || to.path === '/' || to.path === '/404' || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
+      if (redirect && (to.path === '/main' || to.path === '/login')) {
+        window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
       } else {
         next();
       }
@@ -2601,7 +2683,7 @@ module.exports = require("json-bigint");
 
 /***/ }),
 
-/***/ 60:
+/***/ 61:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/lib/wxlogin.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 61);
+/******/ 	return __webpack_require__(__webpack_require__.s = 62);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -534,7 +534,7 @@ var esEncode = function esEncode(value) {
  **/
 var esDecode = function esDecode(value) {
   var kleng = publicKey.length;
-  var result;
+  var result = void 0;
   var cat1 = void 0;
   var cat2 = void 0;
   var cat3 = void 0;
@@ -639,11 +639,13 @@ var exportXls = function exportXls(_ref6) {
       _ref6$data = _ref6.data,
       data = _ref6$data === undefined ? [] : _ref6$data,
       name = _ref6.name,
-      numbers = _ref6.numbers;
+      numbers = _ref6.numbers,
+      option = _ref6.option;
 
   var tbody = '';
   var aligns = [];
   var fields = [];
+  var keys = {};
   var others = {};
   var alink = document.createElement('a');
   for (var i = 0; i < thead.length; i++) {
@@ -653,12 +655,15 @@ var exportXls = function exportXls(_ref6) {
     }
     var tr = thead[i];
     var col = 0;
-    for (var _x = 0; _x < tr.length; _x++) {
-      var td = tr[_x];
+    for (var x = 0; x < tr.length; x++) {
+      var td = tr[x];
       if (td.property) {
-        if (col === _x) {
+        if (col === x) {
           fields.push(td.property);
           aligns.push(td.align);
+          if (td.labelKey && td.valueKey) {
+            keys[td.property] = { labelKey: td.labelKey, valueKey: td.valueKey, multiple: !!(td.valueToString || td['value-to-string']) };
+          }
         } else {
           others[String(col)] = [td.property, td.align];
         }
@@ -676,12 +681,72 @@ var exportXls = function exportXls(_ref6) {
     fields.splice(_i2, 0, others[_i2][0]);
     aligns.splice(_i2, 0, others[_i2][1]);
   }
-  for (var _i3 = 0; _i3 < data.length; _i3++) {
+
+  var _loop = function _loop(_i3) {
     tbody += '<tr>';
-    for (var x in fields) {
-      tbody += '<td align="' + aligns[x] + '">' + data[_i3][fields[x]] + '</td>';
+
+    var _loop2 = function _loop2(_x) {
+      var field = '';
+      var valueKey = keys[fields[_x]] && keys[fields[_x]].valueKey ? keys[fields[_x]].valueKey : 'value';
+      var labelKey = keys[fields[_x]] && keys[fields[_x]].labelKey ? keys[fields[_x]].labelKey : 'name';
+      if (option[fields[_x]]) {
+        if (Array.isArray(data[_i3][fields[_x]])) {
+          field = [];
+          data[_i3][fields[_x]].forEach(function (ele) {
+            option[fields[_x]].forEach(function (item) {
+              // eslint-disable-next-line eqeqeq
+              if (item[valueKey] == ele) {
+                field.push(item[labelKey]);
+                return;
+              }
+            });
+          });
+          field = field.join(' ');
+        } else if (typeof data[_i3][fields[_x]] === 'string' && keys[fields[_x]] && keys[fields[_x]].multiple) {
+          field = [];
+          data[_i3][fields[_x]].split(',').forEach(function (ele) {
+            option[fields[_x]].forEach(function (item) {
+              // eslint-disable-next-line eqeqeq
+              if (item[valueKey] == ele) {
+                field.push(item[labelKey]);
+                return;
+              }
+            });
+          });
+          field = field.join(' ');
+        } else {
+          option[fields[_x]].forEach(function (item) {
+            // eslint-disable-next-line eqeqeq
+            if (item[valueKey] == data[_i3][fields[_x]]) {
+              field = item[labelKey];
+              return;
+            }
+          });
+        }
+      } else if (_typeof(data[_i3][fields[_x]]) === 'object' && keys[fields[_x]]) {
+        if (Array.isArray(data[_i3][fields[_x]])) {
+          data[_i3][fields[_x]].forEach(function (item) {
+            field = [];
+            field.push({}.toString.call(item) === '[object Object]' ? item[labelKey] : item);
+          });
+          field = field.join(' ');
+        } else {
+          field = data[_i3][fields[_x]][labelKey];
+        }
+      } else {
+        field = data[_i3][fields[_x]];
+      }
+      tbody += '<td align="' + aligns[_x] + '">' + field + '</td>';
+    };
+
+    for (var _x in fields) {
+      _loop2(_x);
     }
     tbody += '</tr>';
+  };
+
+  for (var _i3 = 0; _i3 < data.length; _i3++) {
+    _loop(_i3);
   }
   if (!name) {
     name = 'table_' + new Date().getTime();
@@ -1430,10 +1495,27 @@ var isLogged = function isLogged(_ref8) {
               break;
             case 3:
               var href = res.results.authorizeUrl.replace('{redirectUri}', encodeURIComponent(url));
-              if (open) {
-                win.open(href);
+              if (to.query.openType) {
+                switch (to.query.openType) {
+                  case 'self':
+                    win.location.href = href;
+                    break;
+                  case 'blank':
+                    win.open(href);
+                    break;
+                  case 'top':
+                    win.top.location.href = href;
+                    break;
+                  case 'parent':
+                    win.parent.location.href = href;
+                    break;
+                }
               } else {
-                win.top.location.href = href;
+                if (open) {
+                  win.open(href);
+                } else {
+                  win.top.location.href = href;
+                }
               }
               break;
           }
@@ -1445,9 +1527,9 @@ var isLogged = function isLogged(_ref8) {
           }
         }
       }).catch(function (e) {});
-    } else if (token || to.path === '/' || to.path === '/login' || to.path === '/404' || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1) {
-      if (redirect && to.name && (to.name === 'login' || to.name === 'main')) {
-        window.location.replace(urlJoinParams({ url: './' + to.name + '.html', param: to.query }));
+    } else if (token || to.path === '/' || to.path === '/404' || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
+      if (redirect && (to.path === '/main' || to.path === '/login')) {
+        window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
       } else {
         next();
       }
@@ -2601,7 +2683,7 @@ module.exports = require("json-bigint");
 
 /***/ }),
 
-/***/ 61:
+/***/ 62:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";