eoss-ui 0.5.62 → 0.5.64

package/lib/main.js

@@ -2200,7 +2200,7 @@ var isLogined = function isLogined(_ref8) {
           });
         }
       }).catch(function (e) {});
-    } else if (token || to.path === '/' || to.path === '/404' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
+    } else if (token || to.path === '/' || to.path === '/404' || to.path === '/error' || typeof exclude === 'boolean' && exclude || 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 {
@@ -2890,7 +2890,9 @@ var toFunction = function toFunction(str) {
  * @param {string} [$color] - 颜色值
  **/
 var updateTheme = function updateTheme(color, send) {
-  color = color && startWith(color, '#') ? color : '#409eff';
+  if (!color) {
+    return false;
+  }
 
   if (send === undefined) {
     send = true;
@@ -3826,7 +3828,7 @@ module.exports = require("runtime-import");
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/main.vue?vue&type=template&id=fa469480&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/main.vue?vue&type=template&id=5b54252b&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -4228,6 +4230,7 @@ var render = function () {
                   "userinfo",
                   _vm._b(
                     {
+                      attrs: { contents: _vm.userInfoContents },
                       on: {
                         change: _vm.handleUserModel,
                         reGetConfig: _vm.reGetConfig,
@@ -4257,10 +4260,10 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=fa469480&
+// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=5b54252b&
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/userinfo.vue?vue&type=template&id=fc09aaf8&
-var userinfovue_type_template_id_fc09aaf8_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/userinfo.vue?vue&type=template&id=75d533de&
+var userinfovue_type_template_id_75d533de_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -4276,11 +4279,11 @@ var userinfovue_type_template_id_fc09aaf8_render = function () {
     2
   )
 }
-var userinfovue_type_template_id_fc09aaf8_staticRenderFns = []
-userinfovue_type_template_id_fc09aaf8_render._withStripped = true
+var userinfovue_type_template_id_75d533de_staticRenderFns = []
+userinfovue_type_template_id_75d533de_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/userinfo.vue?vue&type=template&id=fc09aaf8&
+// CONCATENATED MODULE: ./packages/main/src/userinfo.vue?vue&type=template&id=75d533de&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(1);
@@ -4292,6 +4295,8 @@ var store = __webpack_require__(11);
 var util = __webpack_require__(0);
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/userinfo.vue?vue&type=script&lang=js&
+var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
+
 //
 //
 //
@@ -4320,6 +4325,102 @@ var util = __webpack_require__(0);
     secret: {
       type: Boolean,
       default: true
+    },
+    contents: {
+      type: Array,
+      default: function _default() {
+        return [{
+          title: '用户信息',
+          contents: [{
+            type: 'upload',
+            name: 'userHeadUrl',
+            label: '头像',
+            portrait: true,
+            code: 'USER_IMG',
+            col: 12,
+            weixinQrcode: true,
+            class: 'es-flex-none'
+          }, {
+            type: 'select',
+            name: 'job',
+            label: '切换职务',
+            valueType: 'object',
+            class: 'es-user-info-job',
+            row: true,
+            col: 12
+          }, {
+            name: 'orgName',
+            label: '所属机构',
+            type: 'text',
+            disabled: true,
+            col: 6
+          }, {
+            name: 'depName',
+            label: '所属部门',
+            type: 'text',
+            disabled: true,
+            col: 6
+          }, {
+            name: 'idCard',
+            label: '身份证号',
+            type: 'text',
+            disabled: true,
+            col: 6
+          }, {
+            name: 'outCode',
+            label: '工号',
+            type: 'text',
+            disabled: true,
+            col: 6
+          }, {
+            name: 'phone',
+            placeholder: '联系电话',
+            label: '联系电话',
+            type: 'text',
+            col: 6
+          }, {
+            name: 'email',
+            placeholder: '电子邮箱',
+            label: '电子邮箱',
+            type: 'text',
+            rules: {
+              type: 'email',
+              message: '请输入正确的邮箱地址',
+              trigger: 'blur'
+            },
+            col: 6
+          }, {
+            name: 'officetel',
+            placeholder: '座机号',
+            label: '座机号',
+            type: 'text',
+            rules: {
+              type: 'telephone'
+              //message: '请输入正确的邮箱地址',
+              //trigger: 'blur'
+            },
+            col: 6
+          }, {
+            name: 'oldpassword',
+            placeholder: '旧密码',
+            label: '旧密码',
+            type: 'text',
+            col: 6
+          }, {
+            name: 'password',
+            placeholder: '新密码',
+            label: '新密码',
+            type: 'text',
+            col: 6
+          }, {
+            name: 'repassword',
+            placeholder: '确认新密码',
+            label: '确认新密码',
+            type: 'text',
+            col: 6
+          }]
+        }];
+      }
     }
   },
   data: function data() {
@@ -4348,123 +4449,52 @@ var util = __webpack_require__(0);
 
   computed: {
     forms: function forms() {
-      var page = [{
-        title: '用户信息',
-        contents: [{
-          type: 'upload',
-          name: 'userHeadUrl',
-          label: '头像',
-          portrait: true,
-          code: 'USER_IMG',
-          ownId: store["a" /* default */].get('userModel').personId,
-          onSuccess: this.handleUploadSuccess,
-          col: 12,
-          class: 'es-flex-none',
-          inline: this.qrcode ? {
-            range: false,
-            class: 'weixinQrcode',
-            type: 'image',
-            url: this.qrcode,
-            event: this.getQrcode
-          } : ''
-        },
-        // {
-        //   type: 'upload',
-        //   name: 'userQrcode',
-        //   // label: '微信二维码',
-        //   portrait: true,
-        //   code: 'USER_IMG',
-        //   ownId: 'ddd',
-        //   class: 'es-qrcode',
-        //   col: 12
-        // },
-        {
-          type: 'select',
-          name: 'job',
-          label: '切换职务',
-          valueType: 'object',
-          data: store["a" /* default */].get('userModel').identityList,
-          class: 'es-user-info-job',
-          row: true,
-          col: 12
-        }, {
-          name: 'orgName',
-          label: '所属机构',
-          type: 'text',
-          disabled: true,
-          col: 6
-        }, {
-          name: 'depName',
-          label: '所属部门',
-          type: 'text',
-          disabled: true,
-          col: 6
-        }, {
-          name: 'idCard',
-          label: '身份证号',
-          type: 'text',
-          disabled: true,
-          row: true,
-          col: 12
-        }, {
-          name: 'phone',
-          placeholder: '联系电话',
-          label: '联系电话',
-          type: 'text',
-          col: 6
-        }, {
-          name: 'email',
-          placeholder: '电子邮箱',
-          label: '电子邮箱',
-          type: 'text',
-          rules: {
-            type: 'email',
-            message: '请输入正确的邮箱地址',
-            trigger: 'blur'
-          },
-          col: 6
-        }, {
-          name: 'officetel',
-          placeholder: '座机号',
-          label: '座机号',
-          type: 'text',
-          rules: {
-            type: 'telephone'
-            //message: '请输入正确的邮箱地址',
-            //trigger: 'blur'
-          },
-          col: 6
-        }, {
-          name: 'oldpassword',
-          placeholder: '旧密码',
-          label: '旧密码',
-          rules: this.values.password ? { required: true, message: '请输入旧密码' } : {},
-          type: 'text',
-          col: 6
-        }, {
-          name: 'password',
-          placeholder: '新密码',
-          label: '新密码',
-          type: 'text',
-          rules: [this.checkPassword ? {
-            pattern: this.checkPassword,
-            message: this.checkPasswordMsg ? this.checkPasswordMsg : '密码格式不合法',
-            trigger: 'blur'
-          } : {}],
-          col: 6
-        }, {
-          name: 'repassword',
-          placeholder: '确认新密码',
-          label: '确认新密码',
-          type: 'text',
-          rules: [this.checkPassword ? {
-            pattern: this.checkPassword,
-            message: this.checkPasswordMsg ? this.checkPasswordMsg : '密码格式不合法',
-            trigger: 'blur'
-          } : {}, { validator: this.repassword, trigger: 'blur' }],
-          col: 6
-        }]
-      }];
+      var page = JSON.parse(JSON.stringify(this.contents));
+      for (var i = 0; i < page.length; i++) {
+        for (var x = 0; x < page[i].contents.length; x++) {
+          var item = page[i].contents[x];
+          if (item.name == 'userHeadUrl') {
+            page[i].contents[x].ownId = store["a" /* default */].get('userModel').personId;
+            page[i].contents[x].onSuccess = this.handleUploadSuccess;
+            if (item.weixinQrcode && this.qrcode) {
+              page[i].contents[x].inline = {
+                range: false,
+                class: 'weixinQrcode',
+                type: 'image',
+                url: this.qrcode,
+                event: this.getQrcode
+              };
+            }
+          }
+          if (item.name == 'job') {
+            page[i].contents[x].data = store["a" /* default */].get('userModel').identityList;
+          }
+          if (item.name == 'oldpassword') {
+            page[i].contents[x].rules = {
+              required: true,
+              message: '请输入旧密码'
+            };
+          }
+          if (item.name == 'password' && this.checkPassword) {
+            page[i].contents[x].rules = {
+              pattern: this.checkPassword,
+              message: this.checkPasswordMsg ? this.checkPasswordMsg : '密码格式不合法',
+              trigger: 'blur'
+            };
+          }
+          if (item.name == 'repassword') {
+            var rules = [{ validator: this.repassword, trigger: 'blur' }];
+            if (this.checkPassword) {
+              rules.push({
+                pattern: this.checkPassword,
+                message: this.checkPasswordMsg ? this.checkPasswordMsg : '密码格式不合法',
+                trigger: 'blur'
+              });
+            }
+            page[i].contents[x].rules = rules;
+          }
+        }
+      }
       if (this.showNotify) {
         page.push({
           title: '接收消息类型',
@@ -4522,12 +4552,13 @@ var util = __webpack_require__(0);
             _this2.checkPasswordMsg = results.checkPasswordMsg;
           }
           _this2.results = results.simpleUserInfo;
-          _this2.values.orgName = results.simpleUserInfo.orgName;
-          _this2.values.depName = results.simpleUserInfo.depName;
-          _this2.values.idCard = results.simpleUserInfo.idCard;
-          _this2.values.phone = results.simpleUserInfo.phone;
-          _this2.values.email = results.simpleUserInfo.email;
-          _this2.values.officeTel = results.simpleUserInfo.officeTel;
+          _this2.values = _extends({}, _this2.values, results.simpleUserInfo);
+          // this.values.orgName = results.simpleUserInfo.orgName;
+          // this.values.depName = results.simpleUserInfo.depName;
+          // this.values.idCard = results.simpleUserInfo.idCard;
+          // this.values.phone = results.simpleUserInfo.phone;
+          // this.values.email = results.simpleUserInfo.email;
+          // this.values.officeTel = results.simpleUserInfo.officeTel;
           if (results.userScanBindImgUrl) {
             _this2.userScanBindImgUrl = results.userScanBindImgUrl;
             _this2.qrcode = util["a" /* default */].getStorage('host') + results.userScanBindImgUrl;
@@ -4712,8 +4743,8 @@ var componentNormalizer = __webpack_require__(3);
 
 var component = Object(componentNormalizer["a" /* default */])(
   src_userinfovue_type_script_lang_js_,
-  userinfovue_type_template_id_fc09aaf8_render,
-  userinfovue_type_template_id_fc09aaf8_staticRenderFns,
+  userinfovue_type_template_id_75d533de_render,
+  userinfovue_type_template_id_75d533de_staticRenderFns,
   false,
   null,
   null,
@@ -6066,7 +6097,7 @@ var async_component_component = Object(componentNormalizer["a" /* default */])(
 
 /* harmony default export */ var async_component = (async_component_component.exports);
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/main.vue?vue&type=script&lang=js&
-var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
+var mainvue_type_script_lang_js_extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
 
 //
 //
@@ -6317,6 +6348,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
 //
 //
 //
+//
 
 
 
@@ -6352,10 +6384,7 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
     //菜单展开关闭
     icons: Object,
     //logo
-    logo: {
-      type: String,
-      default: 'errorlogo'
-    },
+    logo: String,
     //菜单显示类型
     scene: {
       type: String,
@@ -6545,21 +6574,21 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
       }
       if (this.layout === 'subsystem' || this.application) {
         if (this.hides && Object.keys(this.hides).length) {
-          return _extends({}, this.hides, { set: !this.set, system: false });
+          return mainvue_type_script_lang_js_extends({}, this.hides, { set: !this.set, system: false });
         } else if (topRightToolHide && Object.keys(topRightToolHide).length) {
-          return _extends({}, topRightToolHide, { set: !this.set, system: false });
+          return mainvue_type_script_lang_js_extends({}, topRightToolHide, { set: !this.set, system: false });
         } else {
           return { set: !this.set, system: false };
         }
       } else if (this.layout === 'topside') {
         if (this.hides && Object.keys(this.hides).length) {
-          return _extends({}, this.hides, {
+          return mainvue_type_script_lang_js_extends({}, this.hides, {
             set: !this.set,
             system: true,
             user: true
           });
         } else if (topRightToolHide && Object.keys(topRightToolHide).length) {
-          return _extends({}, topRightToolHide, {
+          return mainvue_type_script_lang_js_extends({}, topRightToolHide, {
             set: !this.set,
             system: true,
             user: true
@@ -6569,13 +6598,13 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
         }
       } else {
         if (this.hides && Object.keys(this.hides).length) {
-          return _extends({}, this.hides, {
+          return mainvue_type_script_lang_js_extends({}, this.hides, {
             set: !this.set,
             system: true,
             user: true
           });
         } else if (topRightToolHide && Object.keys(topRightToolHide).length) {
-          return _extends({}, topRightToolHide, {
+          return mainvue_type_script_lang_js_extends({}, topRightToolHide, {
             set: !this.set,
             system: true,
             user: true
@@ -6694,6 +6723,7 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
       color: util["a" /* default */].getStorage('theme') ? util["a" /* default */].getStorage('theme') : this.theme,
       //显示用户信息
       showUserInfo: false,
+      userInfoContents: undefined,
       //是否展示侧边导航
       showMenu: true,
       props: {},
@@ -6979,6 +7009,9 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
             this.color = color;
           }
         }
+        if (i === 'subsystemExtend' && results[i].userInfoContents) {
+          this.userInfoContents = results[i].userInfoContents;
+        }
         if (i === 'subsystemExtend' && results[i].webPageWatermark) {
           try {
             util["a" /* default */].win.top.webPageWatermark = results[i].webPageWatermark;
@@ -7051,7 +7084,7 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
     jumpMenu: function jumpMenu(res, flag, param) {
       var option = { url: res, flag: flag, param: param };
       if (util["a" /* default */].isObject(res)) {
-        option = _extends({}, option, res);
+        option = mainvue_type_script_lang_js_extends({}, option, res);
       }
       var ids = void 0;
       if (typeof option.url === 'string') {
@@ -7120,7 +7153,7 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
       var _this5 = this;
 
       var param = this.menuCode ? { menuCode: this.menuCode } : {};
-      var params = _extends({}, this.param, param);
+      var params = mainvue_type_script_lang_js_extends({}, this.param, param);
       util["a" /* default */].ajax({ url: this.action, params: params }).then(function (res) {
         if (res.rCode === 0) {
           if (res.results && res.results.length) {
@@ -7638,13 +7671,13 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
         case 'user':
           this.showUserInfo = true;
           break;
-        case 'online':
-          this.dialog = {
-            title: '查看在线人员',
-            show: true,
-            url: '/main/sysuseronline/list.dhtml'
-          };
-          break;
+        // case 'online':
+        //   this.dialog = {
+        //     title: '查看在线人员',
+        //     show: true,
+        //     url: '/main/sysuseronline/list.dhtml'
+        //   };
+        //   break;
         case 'notice':
           this.showMsg = !this.showMsg;
           break;
@@ -7694,7 +7727,7 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
         util["a" /* default */].win.open(page);
       } else if (type == 2) {
         location.href = page;
-      } else if (type == 3) {
+      } else if (type == 3 || this.loadWujie === false || this.downgrade && isIE) {
         this.method = 'iframe';
         this.refresh = false;
         this.page = util["a" /* default */].handlerUrl(page, param);
@@ -7724,7 +7757,7 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
               if (path) {
                 var params = util["a" /* default */].getParams({ url: page });
                 if (param) {
-                  params = _extends({}, params, param);
+                  params = mainvue_type_script_lang_js_extends({}, params, param);
                 }
                 if (res) {
                   this.routerKey = res.id;
@@ -7949,9 +7982,10 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
         clearTimeout(this.sysMsgOut);
       }
     },
-    handleDialog: function handleDialog(obj) {
-      this.dialog = obj;
-    },
+
+    // handleDialog(obj) {
+    //   this.dialog = obj;
+    // },
     handleUserModel: function handleUserModel(name, val) {
       this.$set(this.userModel, name, val);
     },

package/lib/menu.js

@@ -411,7 +411,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
         popper = this.popperClass !== undefined ? this.popperClass : ' es-menu-popper-' + this.mode;
       }
       var title = [h('i', {
-        class: [item.icons ? this.unicode(item.icons) ? item.icons : 'es-icons iconfont' : 'es-icon-application', 'es-menu-item-icon'],
+        class: [item.icons ? this.unicode(item.icons) ? item.icons : 'es-icon iconfont' : 'es-icon-application', 'es-menu-item-icon'],
         domProps: item.icons === '' || this.unicode(item.icons) ? {} : { innerHTML: item.icons }
       }), h('div', {
         class: ['es-menu-title-text es-menu-title-' + this.mode]
@@ -502,7 +502,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
         doms = doms.concat(_this5.getSub(item, h, 'es-sub-menu'));
       } else {
         var title = [h('i', {
-          class: [item.icons ? _this5.unicode(item.icons) ? item.icons : 'es-icons iconfont' : 'es-icon-application', 'es-menu-item-icon'],
+          class: [item.icons ? _this5.unicode(item.icons) ? item.icons : 'es-icon iconfont' : 'es-icon-application', 'es-menu-item-icon'],
           domProps: item.icons === '' || _this5.unicode(item.icons) ? {} : { innerHTML: item.icons }
         }), h('div', {
           class: ['es-menu-title-text es-menu-title-' + _this5.mode]

package/lib/nav.js

@@ -2201,7 +2201,7 @@ var isLogined = function isLogined(_ref8) {
           });
         }
       }).catch(function (e) {});
-    } else if (token || to.path === '/' || to.path === '/404' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
+    } else if (token || to.path === '/' || to.path === '/404' || to.path === '/error' || typeof exclude === 'boolean' && exclude || 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 {
@@ -2891,7 +2891,9 @@ var toFunction = function toFunction(str) {
  * @param {string} [$color] - 颜色值
  **/
 var updateTheme = function updateTheme(color, send) {
-  color = color && startWith(color, '#') ? color : '#409eff';
+  if (!color) {
+    return false;
+  }
 
   if (send === undefined) {
     send = true;

package/lib/page.js

@@ -2201,7 +2201,7 @@ var isLogined = function isLogined(_ref8) {
           });
         }
       }).catch(function (e) {});
-    } else if (token || to.path === '/' || to.path === '/404' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
+    } else if (token || to.path === '/' || to.path === '/404' || to.path === '/error' || typeof exclude === 'boolean' && exclude || 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 {
@@ -2891,7 +2891,9 @@ var toFunction = function toFunction(str) {
  * @param {string} [$color] - 颜色值
  **/
 var updateTheme = function updateTheme(color, send) {
-  color = color && startWith(color, '#') ? color : '#409eff';
+  if (!color) {
+    return false;
+  }
 
   if (send === undefined) {
     send = true;

package/lib/player.js

@@ -2201,7 +2201,7 @@ var isLogined = function isLogined(_ref8) {
           });
         }
       }).catch(function (e) {});
-    } else if (token || to.path === '/' || to.path === '/404' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
+    } else if (token || to.path === '/' || to.path === '/404' || to.path === '/error' || typeof exclude === 'boolean' && exclude || 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 {
@@ -2891,7 +2891,9 @@ var toFunction = function toFunction(str) {
  * @param {string} [$color] - 颜色值
  **/
 var updateTheme = function updateTheme(color, send) {
-  color = color && startWith(color, '#') ? color : '#409eff';
+  if (!color) {
+    return false;
+  }
 
   if (send === undefined) {
     send = true;