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

src/components/Table/CardTable.vue

@@ -7,7 +7,7 @@
       v-bind="headerActions"
     />
     <el-row :gutter="10" class="the-row">
-      <el-col v-for="(d, index) in totalData" :key="index" :md="8" :sm="24">
+      <el-col v-for="(d, index) in totalData" :key="index" :lg="8" :md="12" :sm="24" style="min-width: 335px;">
         <el-card
           :body-style="{ 'text-align': 'center', 'padding': '20px' }"
           :class="{'is-disabled': isDisabled(d)}"
@@ -228,9 +228,9 @@ export default {
 
   .el-col, div {
     .my-card {
-      max-width: 400px;
+      min-width: 330px;
-      min-width: 300px;
       height: 240px;
+      width: 100%;
       position: relative;
       margin-bottom: 20px;
 
@@ -268,21 +268,30 @@ export default {
 
             .one-line {
               display: flex;
+              flex-wrap: wrap;
               align-items: center;
               padding-top: 10px;
               text-overflow: ellipsis;
               white-space: nowrap;
               cursor: pointer;
+
+              b {
+                padding-right: 5px;
+              }
+
+              span {
+                margin-left: 0 !important;
+              }
             }
 
             .comment {
               display: -webkit-box;
-              height: 150px;
+              height: 75px;
               font-size: 12px;
               padding: 15px 0;
               cursor: pointer;
               overflow: hidden;
-              -webkit-line-clamp: 6;
+              -webkit-line-clamp: 2;
               -webkit-box-flex: 1;
               -webkit-flex-grow: 1;
               flex-grow: 1;

src/layout/components/NavHeader/Organization.vue

@@ -152,6 +152,8 @@ $height: 28px;
   border-radius: 4px;
 
   .option-group {
+    padding-right: 8px;
+    padding-left: 8px;
     max-width: 400px;
 
     ::v-deep .el-select-group__title {

src/layout/components/NavHeader/index.vue

@@ -211,7 +211,9 @@ export default {
   }
 
   .navbar-right {
+    display: flex;
     float: right;
+    align-items: center;
     margin-right: 10px;
     height: $headerHeight;
     line-height: $headerHeight;
@@ -224,6 +226,7 @@ export default {
       vertical-align: top;
 
       & >>> .svg-icon {
+        line-height: 40px;
         color: #FFF !important;
         font-size: 16px;
       }

src/layout/components/Page/index.vue

@@ -128,7 +128,7 @@ export default {
   .page-content {
     height: calc(100% - 20px);
     overflow-x: hidden;
-    overflow-y: auto;
+    overflow-y: auto !important;
 
     ::v-deep > div {
       margin-bottom: 50px;

src/router/console/accounts.js

@@ -79,7 +79,7 @@ export default [
         name: 'AccountTemplateList',
         component: () => import('@/views/accounts/AccountTemplate/AccountTemplateList'),
         meta: {
-          menuTitle: i18n.t('AccountTemplates'),
+          menuTitle: i18n.t('AccountTemplate'),
           title: i18n.t('AccountTemplateList'),
           permissions: ['accounts.view_accounttemplate']
         }
@@ -142,7 +142,7 @@ export default [
         name: 'AccountPushList',
         meta: {
           title: i18n.t('AccountPushList'),
-          menuTitle: i18n.t('PushAccounts'),
+          menuTitle: i18n.t('AccountPushList'),
           activeMenu: '/console/accounts/automations',
           permissions: ['accounts.view_pushaccountautomation']
         }
@@ -381,7 +381,7 @@ export default [
         component: () => import('@/views/accounts/AccountBackup/index.vue'),
         name: 'AccountBackupList',
         meta: {
-          menuTitle: i18n.t('BackupAccounts'),
+          menuTitle: i18n.t('AccountBackup'),
           title: i18n.t('AccountBackupList'),
           activeMenu: '/console/accounts/automations',
           permissions: ['accounts.view_accountbackupautomation']

src/router/profile/index.js

@@ -60,7 +60,7 @@ export default {
           component: () => import('@/views/profile/AccessKey/index'),
           name: 'AccessKey',
           icon: 'key',
-          meta: { title: i18n.t('AccessKeys'), permissions: ['authentication.view_accesskey'] }
+          meta: { title: i18n.t('AccessKey'), permissions: ['authentication.view_accesskey'] }
         },
         {
           path: ':id/update',
@@ -68,7 +68,7 @@ export default {
           name: 'AccessKeyCreateUpdate',
           hidden: true,
           meta: {
-            title: i18n.t('AccessKeys'),
+            title: i18n.t('AccessKey'),
             permissions: ['authentication.change_accesskey'],
             activeMenu: '/profile/access-keys'
           }

src/views/accounts/AccountGather/index.vue

@@ -16,7 +16,7 @@ export default {
         activeMenu: 'AccountGatherList',
         submenu: [
           {
-            title: this.$t('GatheredAccounts'),
+            title: this.$t('AccountGatherList'),
             name: 'AccountGatherList',
             hidden: !this.$hasPerm('accounts.view_gatheredaccount'),
             component: () => import('@/views/accounts/AccountGather/AccountGatherList.vue')

src/views/accounts/Automation/index.vue

@@ -21,7 +21,7 @@ export default {
         totalData: [
           {
             id: 'push-account',
-            display_name: this.$t('PushAccounts'),
+            display_name: this.$t('AccountPushList'),
             name: 'AccountPushList',
             comment: this.$t('PushAccountsHelpText'),
             icon: 'push-account',
@@ -47,7 +47,7 @@ export default {
           },
           {
             id: 'backup_account',
-            display_name: this.$t('BackupAccounts'),
+            display_name: this.$t('AccountBackup'),
             name: 'AccountBackupList',
             comment: this.$t('BackupAccountsHelpText'),
             icon: 'backup-account',

src/views/dashboard/Audit/index.vue

@@ -52,23 +52,3 @@ export default {
   }
 }
 </script>
-
-<style lang="scss" scoped>
-.switch-date >>> .switch {
-  background: #DEE0E3!important;
-  .el-radio-button {
-    .el-radio-button__inner {
-      background: #DEE0E3!important;
-    }
-  }
-  .el-radio-button.is-active {
-    border-radius: 4px!important;
-    padding: 4px 0!important;
-    .el-radio-button__inner {
-      color: black!important;
-      background-color: #FFF!important;
-      border-radius: 4px!important;
-    }
-  }
-}
-</style>

src/views/dashboard/components/SwitchDate.vue

@@ -57,26 +57,21 @@ export default {
 
 <style lang="scss" scoped>
 .switch {
-  background: #EFF0F1;
+  padding: 4px;
-  border-radius: 4px;
-  padding: 1px 4px;
 
-  & >>> .el-radio-button {
+  ::v-deep .el-radio-button {
     .el-radio-button__inner {
-      border: none;
+      border: 1px solid var(--color-border);
-      color: #8F959E;
+      color: var(--color-text-primary);
-      background: #EFF0F1;
+      background: #ffffff;
+      border-radius: 0;
     }
 
     &.is-active {
-      border-radius: 4px;
-      padding: 4px 0;
-
       .el-radio-button__inner {
-        color: var(--color-text-primary);
+        border: 1px solid #1ab394;
+        color: #1ab394;
         background-color: #FFF;
-        border-radius: 4px;
-        box-shadow: 0 1px 2px rgba(31 35 41 / 12%) !important;
       }
     }
   }