Skip to content

Commit 3a8dd80

Browse files
authored
Merge pull request #9246 from GuoLiBin6/feat/glb-to-4.0/src
feat: add ai dashboard config
2 parents ef6524a + 323e257 commit 3a8dd80

File tree

6 files changed

+947
-7
lines changed

6 files changed

+947
-7
lines changed

containers/Dashboard/locales/en.json

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,7 @@
228228
"dashboard.mounted": "Mounted",
229229
"dashboard.not_mounted": "Unmounted",
230230
"dashboard.net.send.top5": "Network Outbound TOP5",
231+
"dashboard.net.recv.top5": "Network Inbound TOP5",
231232
"dashboard.currency": "Currency",
232233
"dashboard.leave_page_tips": "The current page data is not saved. Are you sure you want to leave?",
233234
"dashboard.color.scheme": "Color Schemes",
@@ -340,5 +341,12 @@
340341
"dashboard.specified_domain": "Specified @:dictionary.domain",
341342
"dashboard.specified_project": "Specified @:dictionary.project",
342343
"dashboard.usage_key_deny_tips": "After switching the data range, the original data indicators may not have permission to view in the new data view, that is, the indicators are invalid",
343-
"dashboard.usage_key_deny_tips_2": "Indicators are invalid"
344+
"dashboard.usage_key_deny_tips_2": "Indicators are invalid",
345+
"dashboard.container_server_count": "Container server number",
346+
"dashboard.container_server_cpu_num": "Container server CPU number",
347+
"dashboard.containers_memory": "Container memory capacity",
348+
"dashboard.running_containers_cpu_num": "Running container CPU number",
349+
"dashboard.running_containers_memory_num": "Running container memory capacity",
350+
"dashboard.running_containers_count": "Running container server number",
351+
"dashboard.container_server_running_rate": "Server running rate"
344352
}

containers/Dashboard/locales/ja-JP.json

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,7 @@
228228
"dashboard.mounted": "マウント",
229229
"dashboard.not_mounted": "マウントされていません",
230230
"dashboard.net.send.top5": "上位 5 つのネットワーク送信トラフィック",
231+
"dashboard.net.recv.top5": "ネットワーク受信トラフィック TOP5",
231232
"dashboard.currency": "通貨",
232233
"dashboard.leave_page_tips": "現在のページデータは保存されていませんが、退会してもよろしいですか?",
233234
"dashboard.color.scheme": "配色",
@@ -340,5 +341,12 @@
340341
"dashboard.specified_domain": "指定された@:dictionary.domain",
341342
"dashboard.specified_project": "指定された@:dictionary.project",
342343
"dashboard.usage_key_deny_tips": "データ範囲を切り替えた後、元のデータ指標は新しいデータビューで表示できない可能性があり、つまり指標が無効になります",
343-
"dashboard.usage_key_deny_tips_2": "指標が無効です"
344+
"dashboard.usage_key_deny_tips_2": "指標が無効です",
345+
"dashboard.container_server_count": "コンテナホスト数",
346+
"dashboard.container_server_cpu_num": "コンテナホストCPU数",
347+
"dashboard.containers_memory": "コンテナメモリ容量",
348+
"dashboard.running_containers_cpu_num": "実行中コンテナホストCPU数",
349+
"dashboard.running_containers_memory_num": "実行中コンテナホストメモリ容量",
350+
"dashboard.running_containers_count": "実行中コンテナホスト数",
351+
"dashboard.container_server_running_rate": "コンテナホスト使用率"
344352
}

containers/Dashboard/locales/zh-CN.json

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,7 @@
228228
"dashboard.mounted": "已挂载",
229229
"dashboard.not_mounted": "未挂载",
230230
"dashboard.net.send.top5": "网络发送流量TOP5",
231+
"dashboard.net.recv.top5": "网络入流量TOP5",
231232
"dashboard.currency": "币种",
232233
"dashboard.leave_page_tips": "当前页面数据未保存,确定要离开?",
233234
"dashboard.color.scheme": "配色方案",
@@ -340,5 +341,12 @@
340341
"dashboard.specified_domain": "指定@:dictionary.domain",
341342
"dashboard.specified_project": "指定@:dictionary.project",
342343
"dashboard.usage_key_deny_tips": "切换数据范围后,原数据指标可能在新的数据视图无权限查看,即指标无效",
343-
"dashboard.usage_key_deny_tips_2": "指标无效"
344+
"dashboard.usage_key_deny_tips_2": "指标无效",
345+
"dashboard.container_server_count": "容器主机数量",
346+
"dashboard.container_server_cpu_num": "容器主机CPU数量",
347+
"dashboard.containers_memory": "容器内存容量",
348+
"dashboard.running_containers_cpu_num": "运行中容器CPU数量",
349+
"dashboard.running_containers_memory_num": "运行中容器内存容量",
350+
"dashboard.running_containers_count": "运行中容器主机数量",
351+
"dashboard.container_server_running_rate": "容器主机使用率"
344352
}

containers/Dashboard/views/dashboard/components/Header.vue

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,9 @@ export default {
198198
await this.pm.delete({
199199
id: this.current.id,
200200
})
201-
this.$emit('select', this.options[0])
201+
// 使用删除后的列表首项,避免 update-options 尚未反映到 tabs 时仍用旧的 options[0]
202+
const next = newOptions.length ? newOptions[0] : this.options[0]
203+
this.$emit('select', next)
202204
} catch (error) {
203205
throw error
204206
}

0 commit comments

Comments
 (0)