Merge pull request #3770 from jumpserver/pr@v4@translate

perf: translate and width
2025-09-17 23:59:02 +00:00 · 2024-03-06 16:51:19 +08:00
parent 33c75915ca 89ed35815c
commit bcb817b30d
21 changed files with 17 additions and 156 deletions
--- a/src/components/Apps/AccountListTable/AccountList.vue
+++ b/src/components/Apps/AccountListTable/AccountList.vue
@@ -157,6 +157,7 @@ export default {
        },
        columnsMeta: {
          name: {
+            width: '120px',
            formatter: function(row) {
              const to = {
                name: 'AssetAccountDetail',
@@ -182,8 +183,10 @@ export default {
              }
            }
          },
+          username: {
+            width: '120px'
+          },
          secret_type: {
-            width: '100px',
            formatter: function(row) {
              return row.secret_type.label
            }
@@ -194,7 +197,7 @@ export default {
            }
          },
          has_secret: {
-            width: '100px',
+            width: '120px',
            formatterArgs: {
              showFalse: false
            }
--- a/src/views/accounts/AccountBackup/AccountBackupDetail/AccountBackupExecution/AccountBackupExecutionList.vue
+++ b/src/views/accounts/AccountBackup/AccountBackupDetail/AccountBackupExecution/AccountBackupExecutionList.vue
@@ -42,14 +42,10 @@ export default {
          },
          timedelta: {
            label: this.$t('TimeDelta'),
-            width: '90px',
            formatter: function(row) {
              return row.timedelta.toFixed(2) + 's'
            }
          },
-          is_success: {
-            width: '90px'
-          },
          actions: {
            formatterArgs: {
              hasDelete: false,
--- a/src/views/accounts/AccountBackup/AccountBackupList.vue
+++ b/src/views/accounts/AccountBackup/AccountBackupList.vue
@@ -45,14 +45,7 @@ export default {
          is_periodic: {
            formatterArgs: {
              showFalse: false
-            },
-            width: '80px'
-          },
-          periodic_display: {
-            width: '150px'
-          },
-          comment: {
-            width: '90px'
+            }
          },
          executed_amount: {
            formatter: DetailFormatter,
@@ -70,7 +63,6 @@ export default {
            }
          },
          actions: {
-            width: '164px',
            formatterArgs: {
              onClone: ({ row }) => {
                vm.$router.push({ name: 'AccountBackupPlanCreate', query: { clone_from: row.id }})
--- a/src/views/accounts/AccountChangeSecret/AccountChangeSecretDetail/AccountChangeSecretAsset/index.vue
+++ b/src/views/accounts/AccountChangeSecret/AccountChangeSecretDetail/AccountChangeSecretAsset/index.vue
@@ -51,7 +51,6 @@ export default {
            prop: 'id',
            label: this.$t('Actions'),
            align: 'center',
-            width: 150,
            objects: this.object.assets,
            formatter: DeleteActionFormatter,
            onDelete: function(col, row, cellValue, reload) {
--- a/src/views/accounts/AccountChangeSecret/AccountChangeSecretDetail/AccountChangeSecretExecution/AccountChangeSecretExecutionList.vue
+++ b/src/views/accounts/AccountChangeSecret/AccountChangeSecretDetail/AccountChangeSecretExecution/AccountChangeSecretExecutionList.vue
@@ -42,25 +42,21 @@ export default {
          },
          asset_amount: {
            label: this.$t('AssetAmount'),
-            width: '80px',
            formatter: function(row) {
              return <span>{row.snapshot.asset_amount}</span>
            }
          },
          node_amount: {
            label: this.$t('NodeAmount'),
-            width: '80px',
            formatter: function(row) {
              return <span>{row.snapshot.node_amount}</span>
            }
          },
          status: {
-            label: this.$t('Result'),
-            width: '80px'
+            label: this.$t('Result')
          },
          timedelta: {
            label: this.$t('TimeDelta'),
-            width: '90px',
            formatter: function(row) {
              return row.timedelta.toFixed(2) + 's'
            }
--- a/src/views/accounts/AccountChangeSecret/AccountChangeSecretList.vue
+++ b/src/views/accounts/AccountChangeSecret/AccountChangeSecretList.vue
@@ -46,21 +46,14 @@ export default {
              return <span> { row.secret_strategy.label } </span>
            }
          },
-          secret_type: {
-            width: '120px'
-          },
          is_periodic: {
            formatterArgs: {
              showFalse: false
            },
-            width: '152px'
-          },
-          periodic_display: {
            width: '150px'
          },
          executed_amount: {
            formatter: DetailFormatter,
-            width: '100px',
            formatterArgs: {
              route: 'AccountGatherList',
              can: vm.$hasPerm('accounts.view_changesecretexecution'),
@@ -75,11 +68,7 @@ export default {
              }
            }
          },
-          comment: {
-            width: '90px'
-          },
          actions: {
-            width: '164px',
            formatterArgs: {
              onClone: ({ row }) => {
                vm.$router.push({ name: 'AccountChangeSecretCreate', query: { clone_from: row.id }})
--- a/src/views/accounts/AccountGather/AccountGatherTaskList.vue
+++ b/src/views/accounts/AccountGather/AccountGatherTaskList.vue
@@ -52,7 +52,7 @@ export default {
            formatterArgs: {
              showFalse: false
            },
-            width: '152px'
+            width: '150px'
          },
          periodic_display: {
          },
--- a/src/views/accounts/AccountPush/AccountPushExecutionList.vue
+++ b/src/views/accounts/AccountPush/AccountPushExecutionList.vue
@@ -42,25 +42,21 @@ export default {
          },
          asset_amount: {
            label: this.$t('AssetAmount'),
-            width: '120px',
            formatter: function(row) {
              return <span>{row.snapshot.asset_amount}</span>
            }
          },
          node_amount: {
            label: this.$t('NodeAmount'),
-            width: '120px',
            formatter: function(row) {
              return <span>{row.snapshot.node_amount}</span>
            }
          },
          status: {
-            label: this.$t('Result'),
-            width: '120px'
+            label: this.$t('Result')
          },
          timedelta: {
            label: this.$t('TimeDelta'),
-            width: '100px',
            formatter: function(row) {
              return row.timedelta.toFixed(2) + 's'
            }
--- a/src/views/accounts/AccountPush/AccountPushList.vue
+++ b/src/views/accounts/AccountPush/AccountPushList.vue
@@ -56,22 +56,13 @@ export default {
            }
          },
          assets_amount: {
-            label: vm.$t('AssetAmount'),
-            width: '80px'
+            label: vm.$t('AssetAmount')
          },
          nodes_amount: {
-            label: vm.$t('NodeAmount'),
-            width: '80px'
-          },
-          is_periodic: {
-            width: '152px'
-          },
-          periodic_display: {
-            width: '150px'
+            label: vm.$t('NodeAmount')
          },
          password_strategy_display: {
            label: vm.$t('PasswordStrategy'),
-            width: '220px',
            showOverflowTooltip: true
          },
          executed_amount: {
@@ -89,14 +80,7 @@ export default {
              }
            }
          },
-          is_active: {
-            width: '87px'
-          },
-          comment: {
-            width: '90px'
-          },
          actions: {
-            width: '164px',
            formatterArgs: {
              extraActions: [
                {
--- a/src/views/accounts/AccountTemplate/AccountTemplateList.vue
+++ b/src/views/accounts/AccountTemplate/AccountTemplateList.vue
@@ -38,17 +38,12 @@ export default {
        },
        columnsMeta: {
          privileged: {
-            width: '120px',
            formatterArgs: {
              showText: false,
              showFalse: false
            }
          },
-          secret_type: {
-            width: '120px'
-          },
          has_secret: {
-            width: '120px',
            formatterArgs: {
              showFalse: false,
              showText: false
--- a/src/views/audits/JobExecutionLogList.vue
+++ b/src/views/audits/JobExecutionLogList.vue
@@ -21,14 +21,12 @@ export default {
          min: ['material', 'is_success'],
          default: [
            'creator_name', 'material', 'is_finished',
-            'is_success', 'time_cost',
-            'date_finished', 'actions'
+            'is_success', 'time_cost', 'date_finished', 'actions'
          ]
        },
        columns: [
          'creator_name', 'material', 'is_finished',
-          'is_success', 'time_cost',
-          'date_finished', 'actions'
+          'is_success', 'time_cost', 'date_finished', 'actions'
        ],
        columnsMeta: {
          actions: {
@@ -50,7 +48,6 @@ export default {
            }
          },
          time_cost: {
-            width: '100px',
            formatter: function(row) {
              if (row.time_cost) {
                return row.time_cost.toFixed(2) + 's'
@@ -59,19 +56,14 @@ export default {
            }
          },
          is_finished: {
-            width: '96px',
            formatter: (row) => {
              if (row.is_finished) {
                return <i Class='fa fa-check text-primary'/>
              }
              return <i Class='fa fa-times text-danger'/>
-            },
-            formatterArgs: {
-              width: '14px'
            }
          },
          is_success: {
-            width: '96px',
            formatter: (row) => {
              if (!row.is_finished) {
                return <i Class='fa  fa fa-spinner fa-spin'/>
@@ -80,13 +72,7 @@ export default {
                return <i Class='fa fa-check text-primary'/>
              }
              return <i Class='fa fa-times text-danger'/>
-            },
-            formatterArgs: {
-              width: '14px'
            }
-          },
-          date_start: {
-            width: '160px'
          }
        }
      },
--- a/src/views/audits/LoginLog/LoginLogList.vue
+++ b/src/views/audits/LoginLog/LoginLogList.vue
@@ -25,23 +25,8 @@ export default {
        },
        url: '/api/v1/audits/login-logs/',
        columnsMeta: {
-          username: {
-            width: '120px'
-          },
-          backend_display: {
-            width: '120px'
-          },
          actions: {
            has: false
-          },
-          city: {
-            width: '120px'
-          },
-          reason_display: {
-            width: '120px'
-          },
-          datetime: {
-            width: '120px'
          }
        }
      },
--- a/src/views/audits/OperateLog/OperateLogList.vue
+++ b/src/views/audits/OperateLog/OperateLogList.vue
@@ -39,20 +39,7 @@ export default {
          ]
        },
        columnsMeta: {
-          resource_type: {
-            width: '180px'
-          },
-          datetime: {
-            width: '160px'
-          },
-          remote_addr: {
-            width: '140px'
-          },
-          action_display: {
-            width: '70px'
-          },
          actions: {
-            width: '70px',
            formatter: ActionsFormatter,
            formatterArgs: {
              hasUpdate: false,
--- a/src/views/audits/PasswordChangeLogList.vue
+++ b/src/views/audits/PasswordChangeLogList.vue
@@ -18,12 +18,6 @@ export default {
          default: ['user', 'change_by', 'remote_addr', 'datetime']
        },
        columnsMeta: {
-          remote_addr: {
-            width: '140px'
-          },
-          datetime: {
-            width: '180px'
-          },
          actions: {
            has: false
          }
--- a/src/views/sessions/CommandList/BaseList.vue
+++ b/src/views/sessions/CommandList/BaseList.vue
@@ -66,7 +66,6 @@ export default {
            formatter: OutputExpandFormatter
          },
          risk_level: {
-            width: '105px',
            formatter: (row, col, cellValue) => {
              const display = row['risk_level'].label
              if (cellValue?.value === 0) {
@@ -79,15 +78,8 @@ export default {
          actions: {
            has: false
          },
-          asset: {
-            width: '120px'
-          },
-          user: {
-            width: '100px'
-          },
          session: {
            formatter: DetailFormatter,
-            width: '100px',
            formatterArgs: {
              openInNewPage: true,
              can: this.$hasPerm('terminal.view_session'),
@@ -104,7 +96,6 @@ export default {
          },
          timestamp: {
            label: this.$t('Date'),
-            width: '130px',
            sortable: 'custom',
            formatter: function(row) {
              return toSafeLocalDateStr(row.timestamp * 1000)
--- a/src/views/sessions/FTPLogList.vue
+++ b/src/views/sessions/FTPLogList.vue
@@ -21,17 +21,7 @@ export default {
        },
        url: '/api/v1/audits/ftp-logs/',
        columnsMeta: {
-          remote_addr: {
-            width: '140px'
-          },
-          operate: {
-            width: '100px'
-          },
-          is_success: {
-            width: '100px'
-          },
          actions: {
-            width: '82px',
            formatterArgs: {
              hasUpdate: false,
              hasDelete: false,
--- a/src/views/sessions/SessionList/BaseList.vue
+++ b/src/views/sessions/SessionList/BaseList.vue
@@ -46,7 +46,6 @@ export default {
            prop: 'id',
            label: this.$t('Number'),
            align: 'center',
-            width: '80px',
            formatter: function(row, column, cellValue, index) {
              const label = index + 1
              const route = { to: { name: 'SessionDetail', params: { id: row.id }}}
@@ -54,7 +53,6 @@ export default {
            }
          },
          user: {
-            width: '100px',
            formatter: DetailFormatter,
            formatterArgs: {
              getRoute: ({ row }) => {
@@ -88,7 +86,6 @@ export default {
            }
          },
          is_finished: {
-            width: '86px',
            formatterArgs: {
              showFalse: false
            }
@@ -112,32 +109,15 @@ export default {
              }
            }
          },
-          command_amount: {
-            width: '90px'
-          },
-          login_from: {
-            width: '115px'
-          },
-          remote_addr: {
-            width: '140px'
-          },
          protocol: {
-            width: '100px',
            sortable: false,
            formatter: null
          },
-          date_start: {
-            width: '150px'
-          },
-          date_end: {
-            width: '150px'
-          },
          duration: {
            label: this.$t('Duration'),
            formatter: function(row) {
              return timeOffset(row.date_start, row.date_end)
-            },
-            width: '80px'
+            }
          },
          is_locked: {
            label: this.$t('IsLocked')
@@ -145,7 +125,6 @@ export default {
          actions: {
            prop: 'actions',
            label: this.$t('Actions'),
-            width: '160px',
            formatter: ActionsFormatter,
            formatterArgs: {
              hasEdit: false,
--- a/src/views/settings/Storage/CommandStorage.vue
+++ b/src/views/settings/Storage/CommandStorage.vue
@@ -67,7 +67,7 @@ export default {
              showText: false
            },
            align: 'center',
-            width: '100px'
+            width: '150px'
          },
          actions: {
            formatterArgs: {
--- a/src/views/settings/Storage/ReplayStorage.vue
+++ b/src/views/settings/Storage/ReplayStorage.vue
@@ -53,7 +53,7 @@ export default {
              showText: false
            },
            align: 'center',
-            width: '100px'
+            width: '150px'
          },
          comment: {
            sortable: 'custom'
--- a/src/views/users/Group/UserGroupList.vue
+++ b/src/views/users/Group/UserGroupList.vue
@@ -21,7 +21,6 @@ export default {
        },
        columnsMeta: {
          users_amount: {
-            width: '120px',
            formatter: AmountFormatter,
            formatterArgs: {
              async: true,
--- a/src/views/users/Role/RoleList/BaseRoleList.vue
+++ b/src/views/users/Role/RoleList/BaseRoleList.vue
@@ -66,7 +66,7 @@ export default {
            }
          },
          builtin: {
-            width: '100px',
+            width: '150px',
            formatterArgs: {
              showFalse: false
            }