eoss-ui 0.5.73 → 0.5.75

package/packages/theme-chalk/src/login.scss

@@ -323,177 +323,181 @@
     }
   }
 
-  @media screen and (max-width: 1600px) {
-    & {
-      width: 428px;
-      padding: 0 8px;
-      .es-login-logo {
-        height: 42px;
-        left: 20px;
-        top: 20px;
-      }
-      .es-login-name {
-        margin-bottom: 40px;
-      }
-      .es-login-main {
-        padding: 40px 44px;
-        .es-login-switch {
-          right: 24px;
-          top: 24px;
-          .es-icon {
-            font-size: 60px;
-            &::after {
-              left: -10px;
-              border-width: 30px;
-            }
-          }
-        }
-        .es-warning {
-          font-size: 14px;
-        }
-      }
-
-      .es-login-title {
-        height: 22px;
-        margin-bottom: 36px;
-        font-size: 18px;
-        line-height: 22px;
-
-        .es-login-title-content {
-          margin: 0 12px;
-        }
-      }
-      .es-login-form {
-        .el-input__inner {
-          padding-left: 40px;
-          height: 44px;
-          line-height: 44px;
-          font-size: 13px;
-
-          &::-webkit-input-placeholder {
-            font-size: 13px;
-          }
-        }
-
-        .el-input__prefix {
-          left: 16px;
-          line-height: 36px;
-        }
-
-        .es-label-user {
-          font-size: 14px;
-        }
-
-        .es-label-password {
-          font-size: 16px;
-          top: 0;
-        }
-
-        .el-input__clear {
-          font-size: 14px;
-          line-height: 36px;
-        }
-
-        .es-label-code-image {
-          font-size: 16px;
-          line-height: 36px;
-        }
-
-        .es-label-image-code {
-          padding-right: 100px;
-
-          .el-input__suffix {
-            padding: 2px;
-            .es-get-code {
-              margin-top: -2px;
-              margin-bottom: -2px;
-              padding: 5px 6px;
-            }
-          }
-
-          .es-img-code {
-            height: 32px;
-          }
-        }
-
-        .el-form-item__error {
-          font-size: 12px;
-        }
-
-        .es-password-handle {
-          margin-top: 0;
-          margin-bottom: 20px;
-
-          .el-checkbox__label {
-            font-size: 12px;
-          }
-
-          .el-checkbox__input {
-            .el-checkbox__inner {
-              width: 14px;
-              height: 14px;
-              top: 1px;
-              padding-left: 6px;
-
-              &::after {
-                left: 4px;
-                top: 0px;
-              }
-            }
-
-            &.is-checked {
-              .el-checkbox__inner::after {
-                transform: rotate(45deg) scaleY(0.9);
-              }
-            }
-          }
-
-          .es-password-forget {
-            font-size: 12px;
-          }
-        }
-
-        .extra {
-          margin-top: 20px;
-          display: flex;
-          justify-content: space-between;
-
-          span {
-            cursor: pointer;
-            font-size: 14px;
-            color: #12278b;
-          }
-        }
-
-        .es-button-submit {
-          height: 44px;
-          line-height: 44px;
-          font-size: 16px;
-          padding: 0 8px;
-          border-radius: 8px;
-        }
-        &.es-login-verify {
-          .es-login-title {
-            margin-bottom: 68px;
-          }
-          .el-form-item {
-            margin-bottom: 54px;
-          }
-        }
-      }
-
-      .es-login-qrcode {
-        .es-login-title {
-          margin-bottom: 18px;
-        }
-        .es-qrcode-box,
-        .es-wx-qrcode-box {
-          padding-top: 16px;
-          padding-bottom: 16px;
-        }
-      }
-    }
-  }
+  // @media screen and (max-width: 1600px) and (max-height: 900px) {
+  //   & {
+  //     width: 428px;
+  //     padding: 0 8px;
+  //     .es-login-logo {
+  //       height: 42px;
+  //       left: 20px;
+  //       top: 20px;
+  //     }
+  //     .es-login-name {
+  //       margin-bottom: 40px;
+  //     }
+  //     .es-login-main {
+  //       padding: 40px 44px;
+  //       .es-login-switch {
+  //         right: 24px;
+  //         top: 24px;
+  //         .es-icon {
+  //           font-size: 60px;
+  //           &::after {
+  //             left: -10px;
+  //             border-width: 30px;
+  //           }
+  //         }
+  //       }
+  //       .es-warning {
+  //         font-size: 14px;
+  //       }
+  //     }
+
+  //     .es-login-title {
+  //       height: 22px;
+  //       margin-bottom: 36px;
+  //       font-size: 18px;
+  //       line-height: 22px;
+
+  //       .es-login-title-content {
+  //         margin: 0 12px;
+  //       }
+  //     }
+  //     .es-login-form {
+  //       .el-input__inner {
+  //         padding-left: 40px;
+  //         height: 44px;
+  //         line-height: 44px;
+  //         font-size: 13px;
+
+  //         &::-webkit-input-placeholder {
+  //           font-size: 13px;
+  //         }
+  //       }
+
+  //       .el-input__prefix {
+  //         left: 16px;
+  //         line-height: 36px;
+  //       }
+
+  //       .es-label-user {
+  //         font-size: 14px;
+  //       }
+
+  //       .es-label-password {
+  //         font-size: 16px;
+  //         top: 0;
+  //       }
+
+  //       .el-input__clear {
+  //         font-size: 14px;
+  //         line-height: 36px;
+  //       }
+
+  //       .es-label-code-image {
+  //         font-size: 16px;
+  //         line-height: 36px;
+  //       }
+
+  //       .es-label-image-code {
+  //         padding-right: 100px;
+
+  //         .el-input__suffix {
+  //           padding: 2px;
+  //           .es-get-code {
+  //             margin-top: -2px;
+  //             margin-bottom: -2px;
+  //             padding: 5px 6px;
+  //           }
+  //         }
+
+  //         .es-img-code {
+  //           height: 32px;
+  //         }
+  //       }
+
+  //       .el-form-item__error {
+  //         font-size: 12px;
+  //       }
+
+  //       .es-password-handle {
+  //         margin-top: 0;
+  //         margin-bottom: 20px;
+
+  //         .el-checkbox__label {
+  //           font-size: 12px;
+  //         }
+
+  //         .el-checkbox__input {
+  //           .el-checkbox__inner {
+  //             width: 14px;
+  //             height: 14px;
+  //             top: 1px;
+  //             padding-left: 6px;
+
+  //             &::after {
+  //               left: 4px;
+  //               top: 0px;
+  //             }
+  //           }
+
+  //           &.is-checked {
+  //             .el-checkbox__inner::after {
+  //               transform: rotate(45deg) scaleY(0.9);
+  //             }
+  //           }
+  //         }
+
+  //         .es-password-forget {
+  //           font-size: 12px;
+  //         }
+  //       }
+
+  //       .extra {
+  //         margin-top: 20px;
+  //         display: flex;
+  //         justify-content: space-between;
+
+  //         span {
+  //           cursor: pointer;
+  //           font-size: 14px;
+  //           color: #12278b;
+  //         }
+  //       }
+
+  //       .es-button-submit {
+  //         height: 44px;
+  //         line-height: 44px;
+  //         font-size: 16px;
+  //         padding: 0 8px;
+  //         border-radius: 8px;
+  //       }
+  //       &.es-login-verify {
+  //         .es-login-title {
+  //           margin-bottom: 68px;
+  //         }
+  //         .el-form-item {
+  //           margin-bottom: 54px;
+  //         }
+  //       }
+  //     }
+
+  //     .es-login-qrcode {
+  //       .es-login-title {
+  //         margin-bottom: 18px;
+  //       }
+  //       .es-qrcode-box,
+  //       .es-wx-qrcode-box {
+  //         padding-top: 16px;
+  //         padding-bottom: 16px;
+  //       }
+  //     }
+  //   }
+  // }
+  // @media screen and (max-width: 1280px) and (max-height: 720px) {
+  // }
+  // @media screen and (max-width: 1024px) and (max-height: 768px) {
+  // }
 }
 .es-user-info {
   .es-form-content {

package/packages/theme-chalk/src/main.scss

@@ -21,7 +21,7 @@
 
     .es-main-logo {
       max-height: 60%;
-      margin-left: 20px;
+      margin-left: 50px;
     }
 
     .es-logo-error {
@@ -185,7 +185,10 @@
       padding-top: 16px;
       padding-bottom: 16px;
     }
-    .es-nav-main {
+    .es-main-left {
+      border-right: $--border-base;
+    }
+    .es-nav-main:not(.es-nav-overlap) {
       background-color: transparent;
       border-right: 0;
     }

package/packages/theme-chalk/src/nav.scss

@@ -13,7 +13,10 @@
     overflow: hidden;
     display: inline-block;
     height: 100%;
-    background-color: $--color-primary-light-10;
+    background-color: $--color-primary-light-9;
+    &[biserial='true'] {
+      background-color: $--color-primary-light-10;
+    }
     &:not(.es-nav-overlap) {
       border-right: $--border-base;
     }

package/src/index.js

@@ -121,7 +121,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '0.5.73',
+  version: '0.5.75',
   install,
   Button,
   ButtonGroup,

package/src/utils/util.js

@@ -555,6 +555,35 @@ const calculateNetworkDays = function (start_date, end_date, holidays = []) {
   return workdays;
 };
 
+/**
+ * chunkToChinese
+ * @desc 将四位数的整数转换为中文大写
+ * @param {number} chunk - 数字
+ **/
+function chunkToChinese(chunk) {
+  const numberToChinese = ['零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖'];
+  const capitalDigits = ['', '拾', '佰', '仟'];
+
+  let result = '';
+  let digitIndex = 0;
+
+  while (chunk > 0) {
+    const digit = chunk % 10;
+    if (digit > 0) {
+      result = numberToChinese[digit] + capitalDigits[digitIndex] + result;
+    } else {
+      // 当前数字是零，需要判断是否需要添加零
+      if (result.charAt(0) !== '零') {
+        result = '零' + result;
+      }
+    }
+    chunk = Math.floor(chunk / 10);
+    digitIndex++;
+  }
+
+  return result;
+}
+
 /**
  * concatenate
  * @desc 指定连接符合并文本
@@ -1753,6 +1782,34 @@ const getWeekday = function (date, type = 0) {
   return adjustedDay === 0 ? 7 : adjustedDay;
 };
 
+/**
+ * getZoom
+ * @desc 获取缩放比
+ * @param {number} n - 可选参数，表示星期的起始日，0 表示星期天，1 表示星期一，以此类推，默认为 0
+ **/
+const getZoom = function () {
+  let ratio = 0;
+  let screen = window.screen;
+  let ua = navigator.userAgent.toLowerCase();
+  if (window.devicePixelRatio !== undefined) {
+    ratio = window.devicePixelRatio;
+  } else if (~ua.indexOf('msie')) {
+    if (screen.deviceXDPI && screen.logicalXDPI) {
+      ratio = screen.deviceXDPI / screen.logicalXDPI;
+    }
+  } else if (
+    window.outerWidth !== undefined &&
+    window.innerWidth !== undefined
+  ) {
+    ratio = window.outerWidth / window.innerWidth;
+  }
+
+  if (ratio) {
+    ratio = Math.round(ratio * 100);
+  }
+
+  return ratio / 100;
+};
 /**
  * handlerUrl
  * @desc:更新url参数中的时间戳
@@ -2525,32 +2582,63 @@ const rmbToCapital = function (number) {
 
   return result;
 };
-
-// 辅助函数，将四位数的整数转换为中文大写
-function chunkToChinese(chunk) {
-  const numberToChinese = ['零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖'];
-  const capitalDigits = ['', '拾', '佰', '仟'];
-
-  let result = '';
-  let digitIndex = 0;
-
-  while (chunk > 0) {
-    const digit = chunk % 10;
-    if (digit > 0) {
-      result = numberToChinese[digit] + capitalDigits[digitIndex] + result;
+/**
+ * setScale
+ * @desc 设置缩放
+ * @param {number} width - 分辨率宽度
+ * @param {number} height - 分辨率高度
+ **/
+const setScale = function (width = 1920, height = 1080) {
+  let n = 1;
+  let isMac = /macintosh|mac os x/i.test(navigator.userAgent);
+  let zoom = getZoom();
+  if (isMac) {
+    n = 2;
+  } else {
+    n = 1;
+  }
+  if (zoom === 1) {
+    document.body.style.removeProperty('transform');
+    document.body.style.removeProperty('width');
+    document.body.style.removeProperty('height');
+    document.body.style.removeProperty('transform-origin');
+    return;
+  }
+  if (
+    Math.abs(parseInt(width - (window.innerWidth * zoom) / n, 10)) >
+    15 &&
+    (window.innerWidth * zoom) / n !== width
+  ) {
+    let scale =
+      'scale(' +
+      (window.innerWidth * zoom) / width / zoom +
+      ',' +
+      (window.innerHeight * zoom) / height / zoom +
+      ')';
+    document.body.style.transform = scale;
+    document.body.style.width = width + 'px';
+    document.body.style.height = height + 'px';
+    document.body.style.transformOrigin = '0 0';
+  } else {
+    if (isMac) {
+      let scale = 'scale(' + (1 * n) / zoom + ')';
+      document.body.style.transform = scale;
+      document.body.style.width =
+        parseInt((window.innerWidth * zoom) / n, 10) + 'px';
+      document.body.style.height =
+        parseInt((window.innerHeight * zoom) / n, 10) + 'px';
+      document.body.style.transformOrigin = '0 0';
     } else {
-      // 当前数字是零，需要判断是否需要添加零
-      if (result.charAt(0) !== '零') {
-        result = '零' + result;
-      }
+      let scale = 'scale(' + (1 * n) / zoom + ')';
+      document.body.style.transform = scale;
+      document.body.style.width =
+        parseInt((window.innerWidth * zoom) / n, 10) + 'px';
+      document.body.style.height =
+        parseInt((window.innerHeight * zoom) / n, 10) + 'px';
+      document.body.style.transformOrigin = '0 0';
     }
-    chunk = Math.floor(chunk / 10);
-    digitIndex++;
   }
-
-  return result;
-}
-
+};
 /**
  * sendMessage
  * @desc:向iframe发送信息
@@ -3063,6 +3151,7 @@ export default {
   rmbToCapital,
   sendMessage,
   setFavicon,
+  setScale,
   setStorage,
   socket,
   startWith,

package/src/utils/webSocket.js

@@ -15,21 +15,20 @@ class WebSocket {
     this.connects = 1;
     this.recon = false;
     this.sendTimeout = null;
+    this.socket = null;
+    this.subscription = null;
   }
 
   /** socket连接 */
   connect() {
     if (!this.client) {
     // 连接SockJS
-      let socket = new SockJS(this.host + this.url);
-      // 获取STOMP子协议的客户端对象
-      this.client = Stomp.over(socket);
-
+      this.socket = new SockJS(this.host + this.url, {timeout: 60000});
+      this.client = Stomp.over(this.socket);
     }
 
     // 日志不打印
     if (!this.debug) {
-      console.log(111);
       this.client.debug = () => {};
     }
 
@@ -41,9 +40,10 @@ class WebSocket {
       // 订阅消息
       this.subscribe();
     }, (error) => {
+      this.unsubscribe();
+      this.client = null;
       let diffSecond = parseInt((new Date() - this.nextDate) / 1000, 10);
       if (this.connects > 5 && diffSecond < this.interval) {
-        this.client.disconnect();
         this.error && this.error(error);
       } else {
         this.reconTimeout = setTimeout(() => {
@@ -52,11 +52,17 @@ class WebSocket {
         }, 5000);
       }
     });
+  }// 清除订阅
+  unsubscribe() {
+    if (this.subscription) {
+      this.subscription.unsubscribe();
+      this.subscription = null;
+    }
   }
   /** 订阅服务端 */
   subscribe() {
     // 订阅服务端提供的某个topic
-    this.client.subscribe(this.take, (response) => {
+    this.subscription = this.client.subscribe(this.take, (response) => {
       if (response && (this.callback || this.success)) {
         let callback = this.callback || this.success;
         callback(JSON.parse(response.body));
@@ -89,6 +95,7 @@ class WebSocket {
   /** 销毁 */
   destroy() {
     // 断开连接,清除定时器
+    this.unsubscribe();
     if (this.client) {
       this.client.disconnect();
     };