diff --git a/src/components/Apps/AccountListTable/AccountList.vue b/src/components/Apps/AccountListTable/AccountList.vue index a996433fa..7c8b13075 100644 --- a/src/components/Apps/AccountListTable/AccountList.vue +++ b/src/components/Apps/AccountListTable/AccountList.vue @@ -132,7 +132,7 @@ export default { columnsDefault: { type: Array, default: () => ([ - 'name', 'username', 'secret', 'asset', 'platform', 'date_updated', 'connect' + 'name', 'username', 'secret', 'asset', 'platform', 'connect' ]) }, headerExtraActions: { @@ -210,6 +210,7 @@ export default { }, platform: { label: this.$t('Platform'), + width: '120px', formatter: PlatformFormatter, formatterArgs: { platformAttr: 'asset.platform' diff --git a/src/components/Dialog/ProcessingDialog.vue b/src/components/Dialog/ProcessingDialog.vue index 02dda62cd..9782b4a3e 100644 --- a/src/components/Dialog/ProcessingDialog.vue +++ b/src/components/Dialog/ProcessingDialog.vue @@ -4,6 +4,7 @@ height="300" title="Processing" width="300" + class="processing-dialog" >
@@ -40,12 +41,18 @@ export default { diff --git a/src/components/Form/FormFields/UpdateToken.vue b/src/components/Form/FormFields/UpdateToken.vue index ced1488ca..a9d6d11c9 100644 --- a/src/components/Form/FormFields/UpdateToken.vue +++ b/src/components/Form/FormFields/UpdateToken.vue @@ -6,15 +6,15 @@ - - + +
diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json index 3b4c929f6..457468a45 100644 --- a/src/i18n/langs/en.json +++ b/src/i18n/langs/en.json @@ -7,6 +7,18 @@ "notAlphanumericUnderscore": "Only alphanumeric characters and underscores are allowed.", "notParenthesis": "Parentheses are not allowed.", "InvalidJson": "Invalid JSON format.", - "requiredHasUserNameMapped": "Username attr is required." + "requiredHasUserNameMapped": "Username attr is required.", + "NewFound": "New Found", + "LastLoginTime": "Last login time", + "Diff": "Difference", + "LastChangeTime": "Last change time", + "AccountDeleted": "Account deleted", + "WeakPassword": "Weak password", + "RepeatPassword": "Repeat password", + "LeakPassword": "Password leaked", + "Other": "Other", + "Details": "Details", + "Confirm": "Confirm", + "Ignore": "Ignore" } diff --git a/src/i18n/langs/ja.json b/src/i18n/langs/ja.json index cd7765272..2b2faa4b6 100644 --- a/src/i18n/langs/ja.json +++ b/src/i18n/langs/ja.json @@ -1,11 +1,12 @@ { - "FieldRequiredError": "这个字段是必需的。", - "InputEmailAddress": "输入一个电子邮件地址。", - "ServerError": "服务错误,请联系管理员。", - "FormatError": "格式错误。", - "NotSpecialEmoji": "不支持表情字符。", - "notAlphanumericUnderscore": "仅支持字母、数字和下划线。", - "notParenthesis": "不能包含括号。", - "InvalidJson": "JSON 格式错误.", - "requiredHasUserNameMapped": "用户名属性是必需的。" + "FieldRequiredError": "这个字段是必需的。", + "InputEmailAddress": "输入一个电子邮件地址。", + "ServerError": "服务错误,请联系管理员。", + "FormatError": "格式错误。", + "NotSpecialEmoji": "不支持表情字符。", + "notAlphanumericUnderscore": "仅支持字母、数字和下划线。", + "notParenthesis": "不能包含括号。", + "InvalidJson": "JSON 格式错误.", + "requiredHasUserNameMapped": "用户名属性是必需的。", + "Diff": "" } diff --git a/src/i18n/langs/zh.json b/src/i18n/langs/zh.json index cd7765272..6d1d5ad2d 100644 --- a/src/i18n/langs/zh.json +++ b/src/i18n/langs/zh.json @@ -7,5 +7,17 @@ "notAlphanumericUnderscore": "仅支持字母、数字和下划线。", "notParenthesis": "不能包含括号。", "InvalidJson": "JSON 格式错误.", - "requiredHasUserNameMapped": "用户名属性是必需的。" + "requiredHasUserNameMapped": "用户名属性是必需的。", + "NewFound": "新发现", + "LastLoginTime": "最后登录时间", + "Diff": "差异", + "LastChangeTime": "最后修改时间", + "AccountDeleted": "账户已删除", + "WeakPassword": "弱密码", + "RepeatPassword": "重复密码", + "LeakPassword": "密码泄露", + "Other": "其他", + "Details": "详情", + "Confirm": "确认", + "Ignore": "忽略" } diff --git a/src/store/modules/assets.js b/src/store/modules/assets.js index 412450d3b..360cff4fe 100644 --- a/src/store/modules/assets.js +++ b/src/store/modules/assets.js @@ -102,8 +102,11 @@ const actions = { const recentPlatformIds = state.recentPlatformIds return new Promise(resolve => { dispatch('getPlatforms').then(platforms => { - const recentPlatforms = platforms.filter(p => recentPlatformIds.includes(p.id)) - .sort((a, b) => recentPlatformIds.indexOf(a.id) - recentPlatformIds.indexOf(b.id)) + const platformsMap = {} + platforms.forEach(p => { + platformsMap[p.id] = p + }) + const recentPlatforms = recentPlatformIds.map(id => platformsMap[id]).filter(p => p) resolve(recentPlatforms) }) }) diff --git a/src/views/assets/Asset/AssetList/components/BaseList.vue b/src/views/assets/Asset/AssetList/components/BaseList.vue index 8876d278c..882bdc49b 100644 --- a/src/views/assets/Asset/AssetList/components/BaseList.vue +++ b/src/views/assets/Asset/AssetList/components/BaseList.vue @@ -252,10 +252,9 @@ export default { }, async setRecentPlatforms() { const recentPlatforms = await this.$store.dispatch('assets/getRecentPlatforms') - const recentIds = recentPlatforms.map(item => item.id) - let allPlatforms = await this.$store.dispatch('assets/getPlatforms') - allPlatforms = allPlatforms.filter(item => !recentIds.includes(item.id)) - let platforms = [...recentPlatforms, ...allPlatforms] + const allPlatforms = await this.$store.dispatch('assets/getPlatforms') + const otherPlatforms = allPlatforms.filter(item => !this.recentPlatformIds.includes(item.id)) + let platforms = [...recentPlatforms, ...otherPlatforms] if (this.category !== 'all') { platforms = platforms.filter(item => item.category.value === this.category) } diff --git a/src/views/dashboard/Pam/index.vue b/src/views/dashboard/Pam/index.vue index db6e55a44..94673d672 100644 --- a/src/views/dashboard/Pam/index.vue +++ b/src/views/dashboard/Pam/index.vue @@ -72,8 +72,6 @@ export default { diff --git a/src/views/pam/RiskDetect/RiskHandlerFormatter/index.vue b/src/views/pam/RiskDetect/RiskHandlerFormatter/index.vue index 8ad86fe7b..f37e96371 100644 --- a/src/views/pam/RiskDetect/RiskHandlerFormatter/index.vue +++ b/src/views/pam/RiskDetect/RiskHandlerFormatter/index.vue @@ -35,7 +35,7 @@