Merge branch 'v4' of github.com:jumpserver/lina into v4

src/components/Table/CardTable.vue

@@ -286,12 +286,12 @@ export default {
 
             .comment {
               display: -webkit-box;
-              height: 75px;
+              height: 110px;
               font-size: 12px;
               padding: 15px 0;
               cursor: pointer;
               overflow: hidden;
-              -webkit-line-clamp: 2;
+              -webkit-line-clamp: 3;
               -webkit-box-flex: 1;
               -webkit-flex-grow: 1;
               flex-grow: 1;

src/layout/components/NavHeader/Organization.vue

@@ -132,8 +132,8 @@ $height: 28px;
 
 ::v-deep .el-input {
   .el-input__inner {
-    height: 30px;
-    line-height: 30px;
+    height: 28px;
+    line-height: 28px;
     background: none;
     border: none;
     padding-left: 20px;
@@ -150,6 +150,8 @@ $height: 28px;
 
 .el-select-dropdown.switch-org {
   border-radius: 4px;
+  left: 220px !important;
+  max-width: 400px;
 
   .option-group {
     padding-right: 8px;

src/layout/components/NavHeader/index.vue

@@ -182,14 +182,18 @@ export default {
       .organization {
         display: flex;
         align-items: center;
-        line-height: 30px;
-        padding: 0 10px 0 15px !important;
-        border-radius: 5px;
+        line-height: 28px;
+        padding: 0 0 0 15px !important;
+        border-radius: 3px;
         background-color: rgba(255, 255, 255, .15);
         color: #fff;
         font-weight: 600;
         font-size: 15px;
 
+        ::v-deep .el-input.is-disabled > input {
+          background: none;
+        }
+
         &:hover {
           background-color: rgba(0, 0, 0, .12) !important;
         }

src/styles/index.scss

@@ -218,15 +218,16 @@ input[type=file] {
 
 @media screen and (max-width: 992px) {
   .el-select-dropdown.switch-org {
-    left: 0!important;
-    width: 100vw!important;
+    left: 0 !important;
+    width: 350px;
   }
 }
 
-.el-popper.switch-org {
-  border-radius: 5px;
-  left: 220px !important;
-  max-width: 400px;
+@media screen and (min-width: 992px) {
+  .el-select-dropdown.switch-org {
+    left: 220px !important;
+    max-width: 400px;
+  }
 }
 
 // 步骤条
@@ -401,6 +402,10 @@ input[type=file] {
 }
 
 .el-alert {
+  &.el-alert--success.is-light {
+    color: var(--color-text-primary)
+  }
+
   .el-alert__description,
   .el-alert__title{
     color: var(--color-text-primary) !important;