eoss-ui 0.7.98 → 0.8.0

package/lib/qr-code.js

@@ -4800,19 +4800,19 @@ var QRCode = __webpack_require__(34);
               //设置logo大小
               var logoPosition = (_this3.mwidth - 46) / 2; //logo相对于canvas居中定位
               //设置获取的logo将其变为圆角以及添加白色背景
-              /* ctx.fillStyle = "#fff";
-              ctx.beginPath();
-              let h = 46; //圆角高 10为基数(logo四周白色背景为10/2)
-              let w = 46; //圆角宽
-              let x = logoPosition - 5;
-              let y = logoPosition - 5;
-              let r = 5; //圆角半径
-              ctx.moveTo(x + r, y);
-              ctx.arcTo(x + w, y, x + w, y + h, r);
-              ctx.arcTo(x + w, y + h, x, y + h, r);
-              ctx.arcTo(x, y + h, x, y, r);
-              ctx.arcTo(x, y, x + w, y, r);
-              ctx.closePath();
+              /* ctx.fillStyle = "#fff";
+              ctx.beginPath();
+              let h = 46; //圆角高 10为基数(logo四周白色背景为10/2)
+              let w = 46; //圆角宽
+              let x = logoPosition - 5;
+              let y = logoPosition - 5;
+              let r = 5; //圆角半径
+              ctx.moveTo(x + r, y);
+              ctx.arcTo(x + w, y, x + w, y + h, r);
+              ctx.arcTo(x + w, y + h, x, y + h, r);
+              ctx.arcTo(x, y + h, x, y, r);
+              ctx.arcTo(x, y, x + w, y, r);
+              ctx.closePath();
               ctx.fill(); */
               logo.onload = function () {
                 ctx.drawImage(logo, logoPosition, logoPosition, 46, 46);

package/lib/select.js

@@ -5119,6 +5119,8 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
       }
     },
     getLabel: function getLabel(value, data) {
+      console.log('value', value);
+      console.log('data', data);
       if ((value || value === 0) && data) {
         if (util["a" /* default */].isObject(data)) {
           if (value === data[this.valKey]) {
@@ -5127,7 +5129,7 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
             return value;
           } else if (Object.prototype.hasOwnProperty.call(data, 'children') && data.children && data.children.length) {
             var val = this.getLabel(value, data.children);
-            if (val) {
+            if (val !== null) {
               return val;
             }
           }
@@ -5138,14 +5140,14 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
           if (Array.isArray(data) && data.length) {
             for (var i = 0; i < data.length; i++) {
               var _val = this.getLabel(value, data[i]);
-              if (_val) {
+              if (_val !== null) {
                 return _val;
               }
             }
           }
         }
       }
-      return value;
+      return null;
     },
     reload: function reload() {
       this.getData.apply(this, arguments);
@@ -5246,7 +5248,7 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
     if (!this.hide) {
       if (this.readonly) {
         var dom = [];
-        var models = this.models ? JSON.parse(JSON.stringify(this.models)) : '';
+        var models = this.models || this.models == 0 ? JSON.parse(JSON.stringify(this.models)) : '';
         if (typeof models === 'string' && models.includes(',')) {
           models = models.split(',');
         }
@@ -5254,22 +5256,27 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
           dom = models.map(function (item) {
             if (util["a" /* default */].isObject(item)) {
               if (!item[_this8.label] && !item.label) {
-                return _this8.getLabel(value[_this8.valKey], data);
+                var _label = _this8.getLabel(value[_this8.valKey], data);
+                return _label !== null ? _label : value[_this8.valKey];
               }
               return item[_this8.label] || item.label;
             }
-            return _this8.getLabel(item, _this8.results);
+            var label = _this8.getLabel(item, _this8.results);
+            return label !== null ? label : item;
           });
         } else if (util["a" /* default */].isObject(models)) {
           if (!models[this.label] && !models.label) {
-            dom = [this.getLabel(models[this.valKey], this.results)];
+            var label = this.getLabel(models[this.valKey], this.results);
+            dom = [label !== null ? label : models[this.valKey]];
           } else {
             dom = [models[this.label] || models.label];
           }
         } else {
-          dom = [this.getLabel(models, this.results)];
+          var _label2 = this.getLabel(models, this.results);
+          dom = [_label2 !== null ? _label2 : models];
         }
         console.log('dom', dom);
+        console.log('dom.join(this.symbol)', dom.join(this.symbol));
         return h('div', {
           class: [{
             'es-plain': this.plain,