eoss-ui 0.4.50 → 0.4.52

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

@@ -1,8 +1,6 @@
 @import './common/var.scss';
-
 .es-form {
   background-color: #ffffff;
-
   .es-form-content {
     &::after {
       content: '';
@@ -10,10 +8,8 @@
       height: 0;
       clear: both;
     }
-
     .el-scrollbar__view {
       padding: 12px 24px 0 12px;
-
       &::after {
         content: '';
         display: block;
@@ -21,12 +17,10 @@
         clear: both;
       }
     }
-
     &.es-form-padding {
       padding: 12px 24px 0 12px;
     }
   }
-
   .es-form-item-caption {
     display: inline-block;
     width: 100%;
@@ -40,7 +34,6 @@
     margin-bottom: 22px;
     border-bottom: 1px solid $--border-color-base;
   }
-
   .el-autocomplete,
   .el-input-number,
   .el-select,
@@ -48,46 +41,37 @@
     width: 100%;
     display: block;
   }
-
   .is-without-controls {
     .el-input__inner {
       text-align: left;
     }
   }
-
   .el-form-item {
     .es-label-box {
       display: flex;
     }
-
     &.is-required:not(.is-no-asterisk) {
       .required-after {
         position: relative;
-
         &::before {
           content: none !important;
         }
-
         &::after {
           content: '*';
           color: $--color-danger;
         }
-
         &.required-position::after {
           position: absolute;
         }
-
         &.es-label-box::after {
           right: 4px;
         }
       }
     }
-
     .es-toolbar {
       border: 0;
     }
   }
-
   .es-input__inner {
     display: block;
     flex: 1;
@@ -98,13 +82,11 @@
     border-radius: $--input-border-radius;
     color: $--input-font-color;
   }
-
   div.es-input__inner {
     text-overflow: ellipsis;
     white-space: nowrap;
     overflow: hidden;
   }
-
   .es-textarea__inner {
     min-height: 40px;
     padding: 5px 15px;
@@ -117,34 +99,27 @@
     display: flex;
     align-items: center;
   }
-
   .es-input {
     display: block;
     line-height: 40px;
   }
-
   .es-textarea {
     min-height: 40px;
   }
-
   .el-form-item__content {
     line-height: normal;
-
     .el-upload {
       line-height: 40px;
     }
   }
-
   .es-form-button {
     text-align: center;
     padding: 8px 12px;
   }
-
   &.es-form-group:not(.es-form-search-nobtn) {
     .el-form-item {
       margin-right: 0;
       float: left;
-
       .el-input__inner {
         border-radius: 0;
         border-right: 0;
@@ -159,42 +134,34 @@
           border-bottom-left-radius: $--input-border-radius;
         }
       }
-
       &:last-child {
         .el-input__inner {
           border-top-right-radius: $--input-border-radius;
           border-bottom-right-radius: $--input-border-radius;
         }
-
         .el-button:first-child {
           border-top-left-radius: 0;
           border-bottom-left-radius: 0;
         }
       }
-
       .el-form-item__label {
         display: none;
       }
     }
-
     .es-form-button {
       display: inline-block;
       text-align: center;
     }
   }
-
   .es-collapse {
     border: 0;
-
     .es-collapse-item {
       border-top: 0;
-
       .el-collapse-item__header {
         padding-left: 14px;
         font-size: 16px;
         font-weight: bold;
         border-bottom-color: $--border-color-base;
-
         &::before {
           content: '';
           width: 4px;
@@ -203,38 +170,31 @@
           margin-right: 2px;
         }
       }
-
       .el-collapse-item__wrap {
         padding-top: 16px;
         border-bottom: 0;
       }
-
       &.es-collapse-readonly {
         .el-collapse-item__header {
           cursor: default;
         }
       }
-
       &.is-active {
         &.es-collapse-readonly {
           border-top: 0;
         }
       }
-
       &:last-child {
         margin-bottom: 0;
       }
-
       &.es-collapse-caption {
         .el-collapse-item__wrap {
           padding-top: 0;
         }
       }
     }
-
     .el-collapse-item__content {
       padding: 0 12px;
-
       &::after {
         content: '';
         display: table;
@@ -242,65 +202,51 @@
       }
     }
   }
-
   .es-plain {
     border: 0;
-
     .es-input__inner,
     .es-textarea__inner {
       border: 0;
     }
   }
-
   .es-form-item-table {
     .el-form-item__content {
       margin-left: 0 !important;
     }
-
     .es-data-table-content,
     .el-scrollbar__view {
       padding: 0 !important;
     }
   }
-
   .es-form-table-data {
     .es-data-form {
       margin: -1px;
     }
   }
-
   .es-form-item-inline {
     .el-form-item__content {
       display: flex;
-      align-items: center;
-
       .es-range {
         padding: 0 8px;
         color: #c0c4cc;
         line-height: 40px;
       }
-
       & > div:not(.es-range):not(.es-flex-none) {
         flex: 1;
-        height: 100%;
       }
     }
-
     .el-form-item__error {
       bottom: -16px;
     }
   }
-
   .es-form-item-onrow {
     .el-form-item__content {
       margin-right: 50%;
     }
   }
-
   .es-table-form {
     margin-bottom: 24px;
     border: $--border-base;
-
     .es-table-caption {
       text-align: left;
       font-size: 15px;
@@ -309,169 +255,117 @@
       line-height: 42px;
       padding: 0 8px;
     }
-
     td {
       &.es-table-form-item {
         padding: 0;
         position: relative;
         vertical-align: top;
-        height: 40px;
-
+        &.td-disabled{
+          background-color: #f5f5f5
+        }
         .el-input__inner,
         .el-textarea__inner {
           border-width: 0;
         }
-
         .el-input-number__decrease,
         .el-input-number__increase {
           top: 0;
           bottom: 0;
           border-radius: 0;
         }
-
         .el-input-number__decrease {
           left: 0;
         }
-
         .el-input-number__increase {
           right: 0;
         }
-
         .el-form-item {
           margin: 0;
-          height: 100%;
-
           &.is-error {
             .el-input__inner,
             .el-textarea__inner {
               border-width: 1px;
               border-radius: 4px;
             }
-
             .el-input-number__decrease,
             .el-input-number__increase {
               top: 1px;
               bottom: 1px;
             }
-
             .el-input-number__decrease {
               left: 1px;
               border-radius: 4px 0 0 4px;
             }
-
             .el-input-number__increase {
               border-radius: 0 4px 4px 0;
               right: 1px;
             }
           }
-
-          &:not(.es-form-item-inline) {
-            .el-form-item__content {
-              height: 100%;
-
-              .el-select {
-                height: 100%;
-              }
-            }
-          }
-
-          .el-form-item__content {
-            height: 100%;
-
-            & > div:not(.el-select):not(.es-range) {
-              transform: translateY(-50%);
-              top: 50%;
-              position: relative;
-              height: 100%;
-            }
-
-            .is-disabled {
-              height: 100%;
-
-              input,
-              textarea {
-                height: 100%;
-              }
-            }
+          .is-disabled .el-input__inner,.is-disabled .el-textarea__inner {
+            background-color: #F5F5F5;
           }
         }
-
         .el-form-item__error {
           z-index: 1001;
           background-color: #e4e7ed;
         }
-
         .es-upload {
           padding: 40px 8px 8px;
           position: relative;
-
           &.es-upload-readonly {
             padding-top: 8px;
           }
-
           .el-upload {
             line-height: normal;
             position: absolute;
             right: 8px;
             top: 8px;
           }
-
           .el-upload-list--text {
             margin-top: 0;
           }
         }
-
         .el-checkbox-group,
         .el-radio-group,
         .es-switch-content {
           padding: 0 8px;
         }
-
         .es-input__inner,
         .es-textarea__inner {
           border: 0;
         }
-
         .es-select-ganged {
           .el-select {
             margin-left: 0;
           }
         }
-
         .el-input-group__append,
         .el-input-group__prepend {
           border: 0;
           border-radius: 0;
         }
       }
-
       &.es-align-middle {
         vertical-align: middle;
       }
-
       &.es-table-form-data {
         padding: 0;
-
         .es-data-table {
           .es-table {
             border: 0;
-
             &::before {
               height: 0;
             }
           }
         }
-
         .el-scrollbar__view {
           padding: 0;
         }
       }
-
       &.es-table-td-caption {
         padding: 0;
         position: relative;
         height: 40px;
-
         .es-table-caption {
           position: absolute;
           left: -1px;
@@ -482,100 +376,82 @@
         }
       }
     }
-
     .es-table-form-label {
       padding: 2px 10px;
       line-height: 36px;
       background-color: #fafafa;
     }
-
     & ~ .es-data-table {
       margin-bottom: 24px;
     }
   }
-
   .el-input__prefix,
   .el-input__suffix {
     line-height: 38px;
   }
-
   &.es-form-table {
     .el-scrollbar__view {
       padding: 12px 12px 0 12px;
     }
-
     .es-form-padding {
       padding: 12px 12px 0 12px;
     }
   }
-
   &.es-form-inside-dialog {
     .es-form-button {
       text-align: right;
     }
   }
 }
-
 .es-form-item-label-hide {
   .el-form-item__label {
     display: none;
   }
-
   .el-form-item__content {
     margin-left: 0 !important;
   }
 }
-
 .es-input-button-prefix {
   .el-input__inner {
     padding-left: 70px;
   }
 }
-
 .es-input-button-suffix {
   .el-input__inner {
     padding-right: 60px;
   }
 }
-
 .es-select-button-prefix {
   .el-input__inner {
     padding-left: 60px;
   }
 }
-
 .es-select-button-suffix {
   .el-input__inner {
     padding-right: 70px;
   }
 }
-
 .es-collapse-title,
 .es-collapse-title-handler {
   display: flex;
   align-items: center;
-
   .es-label {
     white-space: nowrap;
   }
-
   span ~ span,
   span ~ div,
   span ~ i {
     margin-left: 8px;
   }
-
   .es-icon-delete,
   .el-icon-delete {
     color: $--color-primary;
     cursor: pointer;
   }
 }
-
 .es-collapse-title-handler + .es-collapse-title-handler {
   margin-left: 8px;
 }
-
 .es-form-inline {
   display: flex;
-}
+}

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

@@ -60,6 +60,7 @@
         border-bottom: 0;
       }
       .el-menu-item,
+      .es-submenu,
       .el-submenu__title {
         height: 60px !important;
         line-height: 1 !important;
@@ -171,6 +172,7 @@
     }
     .es-nav-main {
       background-color: transparent;
+      border-right: 0;
     }
     .es-main-top-nav {
       .es-menu-horizontal {
@@ -250,15 +252,18 @@
   }
   .es-setting-navs-box {
     display: flex;
+    flex-wrap: wrap;
+    justify-content: space-around;
   }
   .es-setting-navs {
-    width: 44px;
-    height: 36px;
+    width: 100px;
+    height: 50px;
     border-radius: 2px;
     position: relative;
     overflow: hidden;
     background-color: $--color-primary;
-    margin-right: 12px;
+    margin-bottom: 12px;
+    cursor: pointer;
     &::after {
       content: '';
       display: block;
@@ -276,22 +281,56 @@
         display: block;
         position: absolute;
         left: 0;
-        width: 6px;
+        width: 8px;
         top: 10px;
         bottom: 0;
         z-index: 2;
         background-color: $--color-primary-light-8;
       }
       .es-setting-side-sub-nav {
-        width: 12px;
+        width: 16px;
         position: absolute;
-        left: 6px;
+        left: 8px;
         top: 10px;
         bottom: 0;
         z-index: 3;
         background-color: $--color-primary-light-10;
       }
     }
+    &.es-setting-subsystem-nav {
+      &::before {
+        content: '';
+        display: block;
+        position: absolute;
+        left: 0;
+        width: 16px;
+        top: 10px;
+        bottom: 0;
+        z-index: 2;
+        background-color: $--color-primary-light-10;
+      }
+    }
+    &.es-setting-top-side-nav {
+      &::before {
+        content: '';
+        display: block;
+        position: absolute;
+        left: 0;
+        width: 20px;
+        top: 10px;
+        bottom: 0;
+        z-index: 2;
+        background-color: $--color-primary-light-10;
+      }
+    }
+    .es-icon-gou {
+      position: absolute;
+      z-index: 9;
+      left: 50%;
+      top: 50%;
+      margin-left: -8px;
+      margin-top: -6px;
+    }
   }
 }
 .es-setting-title {

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

@@ -146,7 +146,6 @@
   }
 }
 .el-menu--horizontal {
-  padding: 0 8px;
   & > .el-submenu {
     .el-submenu__icon-arrow {
       margin-top: 0;

package/src/config/api.js

@@ -15,6 +15,8 @@ export const codeModifyPass = '/sso2/signIn/assembly/codeModifyPass'; // 验证
 export const authCenter = '/sso2/authCenter/login'; // 单点登录认证中心
 export const initModifyPassword = '/sso2/signIn/assembly/initModifyPassword'; // 初始化密码修改信息
 export const doWechatQrLogin = '/sso2/signIn/auth/doWechatQrLogin'; // 微信扫码登录
+export const getTwoFactorLoginCode = '/sso2/signIn/auth/getTwoFactorLoginCode'; // 双因素登录，通过消息中心发送登陆验证码给用户
+export const doTwoFactorLogin = '/sso2/signIn/auth/doTwoFactorLogin'; // 双因素登录
 // 框架
 export const mainConfig = '/main2/main/mainConfig'; // 获取主页面配置
 export const initUserSet = '/main2/main/initUserSet'; // 获取用户信息

package/src/index.js

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

package/src/utils/util.js

@@ -297,9 +297,9 @@ const ajax = function ({
     if (!mix) {
       params = {};
     }
-    if (format && !headers) {
+    if (format && !header['content-type']) {
       data = qs.stringify(data);
-      header['content-type'] = 'application/x-www-form-urlencoded';
+      header['content-type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
     }
   }
   return http({