Merge pull request #5092 from jumpserver/dev

merge: v4.10.4-lts

src/components/Table/AutoDataTable/utils.js

@@ -20,18 +20,18 @@ export class TableColumnsGenerator {
     this.vm = vm
   }
 
-  dynamicActionWidth() {
-    console.log(i18n.locale)
-    if (i18n.locale === 'zh-hans' || i18n.locale === 'zh-hant') {
-      return '100px'
-    }
+  // dynamicActionWidth() {
+  //   console.log(i18n.locale)
+  //   if (i18n.locale === 'zh-hans' || i18n.locale === 'zh-hant') {
+  //     return '100px'
+  //   }
 
-    if (i18n.locale === 'ja' || i18n.locale === 'ko') {
-      return '120px'
-    }
+  //   if (i18n.locale === 'ja' || i18n.locale === 'ko') {
+  //     return '120px'
+  //   }
 
-    return '160px'
-  }
+  //   return '160px'
+  // }
 
   generateColumns() {
     const config = _.cloneDeep(this.config)
@@ -135,7 +135,7 @@ export class TableColumnsGenerator {
           prop: 'actions',
           label: i18n.t('Actions'),
           align: 'center',
-          width: this.dynamicActionWidth(),
+          width: '120px',
           formatter: ActionsFormatter,
           fixed: 'right',
           formatterArgs: {}

src/components/Table/CardTable/Panel.vue

@@ -4,7 +4,7 @@
       {{ $t('Enterprise') }}
     </span>
     <el-row class="panel">
-      <el-col v-if="d.icon" :span="8" class="image">
+      <el-col v-if="d.icon" :span="d.icon ? 8 : 0" class="image">
         <img
           v-if="d.icon.startsWith('/') || d.icon.startsWith('data:')"
           :alt="d.display_name"
@@ -12,21 +12,21 @@
         >
         <Icon v-else :icon="d.icon" />
       </el-col>
-      <el-col :span="16" class="text-zone">
+      <el-col :span="d.icon ? 16 : 24" class="text-zone">
         <div class="one-line">
           <b>{{ d.display_name }}</b>
-          <el-tag v-if="d.version" size="mini" style="margin-left: 5px">
+        </div>
+        <div class="tag-zone">
+          <el-tag v-if="d.version" size="mini" style="margin-left: 5px; background-color: #ecf5ff; color: #409eff;">
             {{ d.version }}
           </el-tag>
+          <el-tag v-for="tag of d.tags" :key="tag" size="mini">
+            {{ capitalize(tag) }}
+          </el-tag>
         </div>
         <div :title="d.comment " class="comment">
           {{ d.comment }}
         </div>
-        <div class="tag-zone">
-          <el-tag v-for="tag of d.tags" :key="tag" size="mini">
-            {{ capitalize(tag) }}
-          </el-tag>
-        </div>
       </el-col>
     </el-row>
   </div>
@@ -107,22 +107,20 @@ export default {
 
     .comment {
       display: -webkit-box;
-      height: 120px;
+      margin-top: 10px;
       font-size: 12px;
-      padding: 10px 0;
       cursor: pointer;
       overflow: hidden;
       -webkit-line-clamp: 4;
-      -webkit-box-flex: 1;
       -webkit-box-orient: vertical;
-      text-align: left;
     }
 
     .tag-zone {
       display: flex;
-      height: 30%;
       align-items: center;
       cursor: pointer;
+      margin-top: 10px;
+      margin-left: -5px;
     }
   }
 }

src/components/Table/CardTable/index.vue

@@ -248,6 +248,10 @@ export default {
     display: flex;
     justify-content: left;
     flex-wrap: wrap;
+
+    .el-card .el-card__body div {
+      height: inherit;
+    }
   }
 
   .el-col, div {

src/components/Table/TableFormatters/AccountConnectFormatter.vue

@@ -60,6 +60,7 @@ export default {
               asset=${assetId}
               &account=${row.id}
               &protocol=${protocol}
+              &org_id=${this.$store.getters.currentOrg.id}
             `.replace(/\s+/g, '')
           },
           asset: null,

src/components/Table/TagSearch/index.vue

@@ -244,10 +244,12 @@ export default {
         delete routeFilter.search
       }
       const asFilterTags = _.cloneDeep(this.filterTags)
-      this.filterTags = {
-        ...asFilterTags,
-        ...routeFilter
-      }
+      setTimeout(() => {
+        this.filterTags = {
+          ...asFilterTags,
+          ...routeFilter
+        }
+      }, 100)
     },
     getValueLabel(key, value) {
       for (const field of this.options) {

src/views/settings/Auth/Ldap/ImportDialog.vue

@@ -133,14 +133,7 @@ export default {
   },
   methods: {
     orgIds() {
-      let orgIds = []
-      if (store.getters.hasValidLicense) {
-        const allOrgIds = store.getters.publicSettings.AUTH_LDAP_SYNC_ORG_IDS
-        orgIds = allOrgIds.filter(item => item.id !== SYSTEM_ORG_ID)
-      } else {
-        orgIds = [DEFAULT_ORG_ID]
-      }
-      return orgIds
+      return [DEFAULT_ORG_ID]
     },
     importUserClick() {
       this.dialogLdapUserImportLoginStatus = true