eoss-ui 0.5.63 → 0.5.65

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;

package/lib/qr-code.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;
@@ -3635,7 +3637,7 @@ module.exports = require("axios");
 // 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/qr-code/src/main.vue?vue&type=template&id=31151606&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/qr-code/src/main.vue?vue&type=template&id=28375a46&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -3649,13 +3651,6 @@ var render = function () {
         staticClass: "es-qrcode-img",
         attrs: { width: _vm._width, height: _vm._height, alt: "二维码图片" },
       }),
-      _vm.logo
-        ? _c("img", {
-            ref: "qrcodeLogo",
-            staticClass: "es-qrcode-logo",
-            attrs: { src: _vm.logo, alt: "二维码logo" },
-          })
-        : _vm._e(),
       _c("canvas", {
         ref: "canvas",
         staticClass: "canvas",
@@ -3668,7 +3663,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/qr-code/src/main.vue?vue&type=template&id=31151606&
+// CONCATENATED MODULE: ./packages/qr-code/src/main.vue?vue&type=template&id=28375a46&
 
 // EXTERNAL MODULE: ./src/utils/util.js
 var util = __webpack_require__(0);
@@ -3776,7 +3771,7 @@ var QRCode = __webpack_require__(28);
       var _this3 = this;
 
       var qrcodeImg = this.$refs.qrcodeImg;
-      var qrcodeLogo = this.$refs.qrcodeLogo;
+      //let qrcodeLogo = this.$refs.qrcodeLogo;
       var canvas = this.$refs.canvas;
       var option = util["a" /* default */].extend({}, this.option, {
         width: this._width,
@@ -3794,6 +3789,8 @@ var QRCode = __webpack_require__(28);
             //获取图片
             ctx.drawImage(qrcodeImg, 0, 0, _this3._width, _this3._height);
             if (_this3.logo && _this3.logo.indexOf('.') > -1) {
+              var logo = new Image();
+              logo.src = _this3.logo;
               //设置logo大小
               var logoPosition = (_this3._width - 46) / 2; //logo相对于canvas居中定位
               //设置获取的logo将其变为圆角以及添加白色背景
@@ -3811,7 +3808,10 @@ var QRCode = __webpack_require__(28);
               ctx.arcTo(x, y, x + w, y, r);
               ctx.closePath();
               ctx.fill(); */
-              ctx.drawImage(qrcodeLogo, logoPosition, logoPosition, 46, 46);
+              logo.onload = function () {
+                ctx.drawImage(logo, logoPosition, logoPosition, 46, 46);
+                qrcodeImg.src = canvas.toDataURL();
+              };
             } else if (_this3.text) {
               //设置字体
               var fpadd = 10; //规定内间距

package/lib/radio-group.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/retrial-auth.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/select-ganged.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/select.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/selector-panel.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;

package/lib/selector.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/sizer.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/steps.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/switch.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/table-form.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/tabs.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;