eoss-ui 0.7.17 → 0.7.19

package/lib/qr-code.js

@@ -4332,19 +4332,19 @@ var QRCode = __webpack_require__(28);
               //设置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/switch.js

@@ -4341,7 +4341,9 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
     },
     value: [String, Boolean, Number],
     readonly: Boolean,
-    plain: Boolean
+    plain: Boolean,
+    activeText: String,
+    inactiveText: String
   },
   data: function data() {
     return {
@@ -4395,10 +4397,10 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
           if (util["a" /* default */].isObject(item) && (typeof item.value === 'boolean' || typeof item.value === 'number')) {
             if (item.value) {
               _this.attrs.activeValue = item.value;
-              _this.attrs.activeText = item.name || item.label || item.text || item.value;
+              _this.attrs.activeText = _this.activeText !== undefined ? _this.activeText : item.name || item.label || item.text || item.value;
             } else {
               _this.attrs.inactiveValue = item.value;
-              _this.attrs.inactiveText = item.name || item.label || item.text || item.value;
+              _this.attrs.inactiveText = _this.inactiveText !== undefined ? _this.inactiveText : item.name || item.label || item.text || item.value;
             }
           } else {
             console.error('数据错误');
@@ -4409,17 +4411,17 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
         if (this.data.active && this.data.inactive) {
           if (typeof this.data.active === 'string') {
             this.attrs.activeValue = this.data.active;
-            this.attrs.activeText = this.data.active;
+            this.attrs.activeText = this.activeText !== undefined ? this.activeText : this.data.active;
           } else if (util["a" /* default */].isObject(this.data.active)) {
             this.attrs.activeValue = this.data.active.value;
-            this.attrs.activeText = this.data.active.name || this.data.active.label || this.data.active.text || this.data.active.value;
+            this.attrs.activeText = this.activeText !== undefined ? this.activeText : this.data.active.name || this.data.active.label || this.data.active.text || this.data.active.value;
           }
           if (typeof this.data.inactive === 'string') {
             this.attrs.inactiveValue = this.data.inactive;
-            this.attrs.inactiveText = this.data.inactive;
+            this.attrs.inactiveText = this.inactiveText !== undefined ? this.inactiveText : this.data.inactive;
           } else if (util["a" /* default */].isObject(this.data.inactive)) {
             this.attrs.inactiveValue = this.data.inactive.value;
-            this.attrs.inactiveText = this.data.inactive.name || this.data.inactive.label || this.data.inactive.text || this.data.inactive.value;
+            this.attrs.inactiveText = this.inactiveText !== undefined ? this.inactiveText : this.data.inactive.name || this.data.inactive.label || this.data.inactive.text || this.data.inactive.value;
           }
         }
       }

package/lib/theme-chalk/handler.css

@@ -1 +1 @@
-@charset "UTF-8";.es-handler{padding:5px 16px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.es-handler .es-handler-item{position:relative}.es-handler .es-handler-item+.es-handler-item{margin-left:12px}.es-handler .es-handler-item .el-badge__content.is-fixed{top:4px;right:14px}.es-handler .es-handler-item:first-child .es-handler-date,.es-handler .es-handler-item:first-child .es-handler-user{padding-right:12px}.es-handler .es-handler-item:first-child .es-handler-date::after,.es-handler .es-handler-item:first-child .es-handler-user::after{content:'';height:100%;display:block;position:absolute;top:0;right:0;border-right:1px solid #d9d9d9}.es-handler .es-handler-icon{font-size:24px;cursor:pointer;padding:4px;border-radius:4px}.es-handler .es-handler-icon:hover{background-color:#69c0ff}.es-handler .es-handler-contact{display:-webkit-box;display:-ms-flexbox;display:flex;line-height:20px;margin-right:12px;-moz-text-align-last:justify;text-align-last:justify}.es-handler .es-handler-contact .es-contact-label{width:56px;margin-right:12px}.es-handler .es-handler-date{font-size:14px;padding-right:8px}.es-handler .es-handler-date .es-online-num{font-weight:700;padding:0 7px;color:#ffea00}.es-handler .es-handler-user{height:48px}.es-handler .es-handler-user .es-user-img{width:48px;height:48px;float:left}.es-handler .es-handler-user .es-user-info{margin-left:60px}.es-handler .es-handler-user .es-user-job{max-width:140px}.es-popper-sub-system{background-color:#1890ff!important;color:#ffff;min-width:unset}.es-popper-sub-system.is-width{width:346px}.es-popper-sub-system .popper__arrow::after{border-bottom-color:#096dd9!important}.es-sub-system{margin:0}.es-sub-system::after{content:'';display:block;clear:both}.es-sub-system .es-sub-system-item{width:80px;height:80px;padding:10px 4px;float:left;text-align:center;cursor:pointer}.es-sub-system .es-sub-system-item .es-sub-system-icon{font-size:32px;display:block;clear:both;margin-bottom:8px}.es-sub-system .es-sub-system-item .es-sub-system-title{width:100%;height:17px;font-size:13px;line-height:17px;display:block;overflow:hidden}.es-sub-system .es-sub-system-item:hover{background-color:#69c0ff;color:#fff}.es-sub-system .es-sub-system-item.es-disabled{cursor:not-allowed;color:rgba(255,255,255,.3);background-color:transparent}.el-dropdown-menu__item:focus,.el-dropdown-menu__item:not(.is-disabled):hover{color:#1890ff}.el-dropdown-menu__item.es-job-active{background-color:#1890ff;color:#fff}.es-color-picker{padding-left:24px}.es-color-picker .el-color-picker-tip{font-size:12px;color:#f21f06;margin-top:8px}
+@charset "UTF-8";.es-handler{padding:5px 16px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.es-handler .es-handler-item{position:relative}.es-handler .es-handler-item+.es-handler-item{margin-left:12px}.es-handler .es-handler-item .el-badge__content.is-fixed{top:4px;right:14px}.es-handler .es-handler-item:first-child .es-handler-date,.es-handler .es-handler-item:first-child .es-handler-user{padding-right:12px}.es-handler .es-handler-item:first-child .es-handler-date::after,.es-handler .es-handler-item:first-child .es-handler-user::after{content:'';height:100%;display:block;position:absolute;top:0;right:0;border-right:1px solid #d9d9d9}.es-handler .es-handler-icon{font-size:24px;cursor:pointer;padding:4px;border-radius:4px}.es-handler .es-handler-icon.es-icon_image{width:24px;height:24px;padding:0}.es-handler .es-handler-icon:hover{background-color:#69c0ff}.es-handler .es-handler-contact{display:-webkit-box;display:-ms-flexbox;display:flex;line-height:20px;margin-right:12px;-moz-text-align-last:justify;text-align-last:justify}.es-handler .es-handler-contact .es-contact-label{width:56px;margin-right:12px}.es-handler .es-handler-date{font-size:14px;padding-right:8px}.es-handler .es-handler-date .es-online-num{font-weight:700;padding:0 7px;color:#ffea00}.es-handler .es-handler-user{height:48px}.es-handler .es-handler-user .es-user-img{width:48px;height:48px;float:left}.es-handler .es-handler-user .es-user-info{margin-left:60px}.es-handler .es-handler-user .es-user-job{max-width:140px}.es-popper-sub-system{background-color:#1890ff!important;color:#ffff;min-width:unset}.es-popper-sub-system.is-width{width:346px}.es-popper-sub-system .popper__arrow::after{border-bottom-color:#096dd9!important}.es-sub-system{margin:0}.es-sub-system::after{content:'';display:block;clear:both}.es-sub-system .es-sub-system-item{width:80px;height:80px;padding:10px 4px;float:left;text-align:center;cursor:pointer}.es-sub-system .es-sub-system-item .es-sub-system-icon{font-size:32px;display:block;clear:both;margin-bottom:8px}.es-sub-system .es-sub-system-item .es-sub-system-title{width:100%;height:17px;font-size:13px;line-height:17px;display:block;overflow:hidden}.es-sub-system .es-sub-system-item:hover{background-color:#69c0ff;color:#fff}.es-sub-system .es-sub-system-item.es-disabled{cursor:not-allowed;color:rgba(255,255,255,.3);background-color:transparent}.el-dropdown-menu__item:focus,.el-dropdown-menu__item:not(.is-disabled):hover{color:#1890ff}.el-dropdown-menu__item.es-job-active{background-color:#1890ff;color:#fff}.es-color-picker{padding-left:24px}.es-color-picker .el-color-picker-tip{font-size:12px;color:#f21f06;margin-top:8px}