Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Adjust menu and node switching styles #8206

Merged
merged 1 commit into from
Mar 21, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions frontend/src/assets/iconfont/iconfont.css
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
@font-face {
font-family: "iconfont"; /* Project id 4776196 */
src: url('iconfont.woff2?t=1740641533654') format('woff2'),
url('iconfont.woff?t=1740641533654') format('woff'),
url('iconfont.ttf?t=1740641533654') format('truetype'),
url('iconfont.svg?t=1740641533654#iconfont') format('svg');
src: url('iconfont.woff2?t=1742467026147') format('woff2'),
url('iconfont.woff?t=1742467026147') format('woff'),
url('iconfont.ttf?t=1742467026147') format('truetype'),
url('iconfont.svg?t=1742467026147#iconfont') format('svg');
}

.iconfont {
Expand All @@ -14,6 +14,10 @@
-moz-osx-font-smoothing: grayscale;
}

.p-gerenzhongxin1:before {
content: "\e61e";
}

.p-jiqiren2:before {
content: "\e61b";
}
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/assets/iconfont/iconfont.js

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions frontend/src/assets/iconfont/iconfont.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@
"css_prefix_text": "p-",
"description": "",
"glyphs": [
{
"icon_id": "10199157",
"name": "个人中心",
"font_class": "gerenzhongxin1",
"unicode": "e61e",
"unicode_decimal": 58910
},
{
"icon_id": "10505865",
"name": "机器人",
Expand Down
2 changes: 2 additions & 0 deletions frontend/src/assets/iconfont/iconfont.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified frontend/src/assets/iconfont/iconfont.ttf
Binary file not shown.
Binary file modified frontend/src/assets/iconfont/iconfont.woff
Binary file not shown.
Binary file modified frontend/src/assets/iconfont/iconfont.woff2
Binary file not shown.
23 changes: 9 additions & 14 deletions frontend/src/components/table-setting/index.vue
Original file line number Diff line number Diff line change
@@ -1,23 +1,18 @@
<template>
<div>
<el-dropdown @command="changeRefresh">
<el-badge
badge-style="background-color: transparent; font-size: 12px; border: none; color: black"
:offset="[-12, 7]"
:value="refreshRateUnit === 0 ? '' : refreshRateUnit + 's'"
class="item"
>
<el-button class="timer-button" icon="Clock"></el-button>
</el-badge>
<el-button class="timer-button">
{{ refreshRateUnit === 0 ? $t('commons.table.noRefresh') : refreshRateUnit + 's' }}
</el-button>
<template #dropdown>
<el-dropdown-menu>
<el-dropdown-item :command="0">{{ $t('commons.table.noRefresh') }}</el-dropdown-item>
<el-dropdown-item :command="5">{{ $t('commons.table.refreshRateUnit', [5]) }}</el-dropdown-item>
<el-dropdown-item :command="10">{{ $t('commons.table.refreshRateUnit', [10]) }}</el-dropdown-item>
<el-dropdown-item :command="30">{{ $t('commons.table.refreshRateUnit', [30]) }}</el-dropdown-item>
<el-dropdown-item :command="60">{{ $t('commons.table.refreshRateUnit', [60]) }}</el-dropdown-item>
<el-dropdown-item :command="120">{{ $t('commons.table.refreshRateUnit', [120]) }}</el-dropdown-item>
<el-dropdown-item :command="300">{{ $t('commons.table.refreshRateUnit', [300]) }}</el-dropdown-item>
<el-dropdown-item :command="5">5s</el-dropdown-item>
<el-dropdown-item :command="10">10s</el-dropdown-item>
<el-dropdown-item :command="30">30s</el-dropdown-item>
<el-dropdown-item :command="60">60s</el-dropdown-item>
<el-dropdown-item :command="120">120s</el-dropdown-item>
<el-dropdown-item :command="300">300s</el-dropdown-item>
</el-dropdown-menu>
</template>
</el-dropdown>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/task-list/index.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<DrawerPro v-model="open" size="large" :header="$t('logs.task')" @close="handleClose">
<DrawerPro v-model="open" size="large" :header="$t('menu.msgCenter')" @close="handleClose">
<template #content>
<LayoutContent v-loading="loading" :title="$t('logs.task')">
<template #rightToolBar>
Expand Down
3 changes: 2 additions & 1 deletion frontend/src/lang/modules/en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,6 @@ const message = {
tableSetting: 'Table setting',
refreshRate: 'Rate',
noRefresh: 'No Refresh',
refreshRateUnit: '{0} Seconds/Time',
selectColumn: 'Select column',
local: 'local',
serialNumber: 'Serial number',
Expand Down Expand Up @@ -363,6 +362,7 @@ const message = {
supervisor: 'Supervisor',
tamper: 'Tamper-proof',
app: 'Application',
msgCenter: 'Task Center',
},
home: {
recommend: 'recommend',
Expand Down Expand Up @@ -929,6 +929,7 @@ const message = {
sockPathErr: 'Please select or enter the correct Docker sock file path',
related: 'Related',
includeAppstore: 'Show app store container',
excludeAppstore: 'Hide App Store Container',

cleanDockerDiskZone: 'Clean up disk space used by Docker',
cleanImagesHelper: '( Clean up all images that are not used by any containers )',
Expand Down
3 changes: 2 additions & 1 deletion frontend/src/lang/modules/ja.ts
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,6 @@ const message = {
protocol: 'プロトコル',
tableSetting: 'テーブル設定',
refreshRate: 'リフレッシュレート',
refreshRateUnit: '更新なし|{n}秒/時 |{n}秒/時',
selectColumn: '列を選択します',
local: 'ローカル',
serialNumber: 'シリアル番号',
Expand Down Expand Up @@ -355,6 +354,7 @@ const message = {
supervisor: '監督者',
tamper: '改ざん防止',
app: 'アプリケーション',
msgCenter: 'タスクセンター',
},
home: {
restart_1panel: 'パネルを再起動します',
Expand Down Expand Up @@ -900,6 +900,7 @@ const message = {
sockPathErr: '正しいDockerソックファイルパスを選択または入力してください',
related: '関連している',
includeAppstore: 'アプリストアから取得したコンテナを表示',
excludeAppstore: 'アプリストアコンテナを隠す',

cleanDockerDiskZone: 'Dockerが使用するディスクスペースをクリーンアップします',
cleanImagesHelper: '(コンテナで使用されていないすべての画像をクリーンアップ)',
Expand Down
3 changes: 2 additions & 1 deletion frontend/src/lang/modules/ko.ts
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,6 @@ const message = {
protocol: '프로토콜',
tableSetting: '테이블 설정',
refreshRate: '새로 고침 속도',
refreshRateUnit: '새로 고침 안 함 | {n} 초/회 | {n} 초/회',
selectColumn: '열 선택',
local: '로컬',
serialNumber: '일련 번호',
Expand Down Expand Up @@ -357,6 +356,7 @@ const message = {
supervisor: '슈퍼바이저',
tamper: '변조 방지',
app: '애플리케이션',
msgCenter: '작업 센터',
},
home: {
restart_1panel: '패널 재시작',
Expand Down Expand Up @@ -890,6 +890,7 @@ const message = {
sockPathErr: '올바른 Docker 소켓 파일 경로를 선택하거나 입력해 주세요.',
related: '관련',
includeAppstore: '앱 스토어에서 컨테이너 표시',
excludeAppstore: '앱스토어 컨테이너 숨기기',

cleanDockerDiskZone: 'Docker 에서 사용하는 디스크 공간 정리',
cleanImagesHelper: '(사용되지 않는 모든 이미지를 정리합니다.)',
Expand Down
3 changes: 2 additions & 1 deletion frontend/src/lang/modules/ms.ts
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,6 @@ const message = {
protocol: 'Protokol',
tableSetting: 'Tetapan jadual',
refreshRate: 'Kadar penyegaran',
refreshRateUnit: 'Tiada penyegaran | {n} saat/masa | {n} saat/masa',
selectColumn: 'Pilih lajur',
local: 'Tempatan',
serialNumber: 'Nombor siri',
Expand Down Expand Up @@ -363,6 +362,7 @@ const message = {
supervisor: 'Supervisor',
tamper: 'Bukti Pengubahsuaian',
app: 'Aplikasi',
msgCenter: 'Pusat Tugas',
},
home: {
restart_1panel: 'Mulakan semula panel',
Expand Down Expand Up @@ -921,6 +921,7 @@ const message = {
sockPathErr: 'Sila pilih atau masukkan laluan fail sock Docker yang betul',
related: 'Berkaitan',
includeAppstore: 'Tunjukkan kontena dari gedung aplikasi',
excludeAppstore: 'Sembunyikan Kontena Kedai Aplikasi',

cleanDockerDiskZone: 'Bersihkan ruang cakera yang digunakan oleh Docker',
cleanImagesHelper: '( Bersihkan semua imej yang tidak digunakan oleh mana-mana kontena )',
Expand Down
3 changes: 2 additions & 1 deletion frontend/src/lang/modules/pt-br.ts
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,6 @@ const message = {
protocol: 'Protocolo',
tableSetting: 'Configuração da tabela',
refreshRate: 'Taxa de atualização',
refreshRateUnit: 'Sem atualização | {n} segundo/atualização | {n} segundos/atualização',
selectColumn: 'Selecionar coluna',
local: 'Local',
serialNumber: 'Número de série',
Expand Down Expand Up @@ -361,6 +360,7 @@ const message = {
supervisor: 'Supervisor',
tamper: 'À prova de violação',
app: 'Aplicativo',
msgCenter: 'Central de Tarefas',
},
home: {
restart_1panel: 'Reiniciar painel',
Expand Down Expand Up @@ -917,6 +917,7 @@ const message = {
sockPathErr: 'Por favor, selecione ou insira o caminho correto do arquivo do Docker sock',
related: 'Relacionado',
includeAppstore: 'Exibir containers da loja de aplicativos',
excludeAppstore: 'Ocultar Contêiner da Loja de Aplicativos',

cleanDockerDiskZone: 'Limpar o espaço em disco usado pelo Docker',
cleanImagesHelper: '(Limpar todas as imagens que não são usadas por nenhum container)',
Expand Down
3 changes: 2 additions & 1 deletion frontend/src/lang/modules/ru.ts
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,6 @@ const message = {
protocol: 'Протокол',
tableSetting: 'Настройки таблицы',
refreshRate: 'Частота обновления',
refreshRateUnit: 'Без обновления | {n} секунда/раз | {n} секунд/раз',
selectColumn: 'Выбрать столбец',
local: 'локальный',
serialNumber: 'Серийный номер',
Expand Down Expand Up @@ -358,6 +357,7 @@ const message = {
supervisor: 'Супервизор',
tamper: 'Защита от несанкционированного доступа',
app: 'Приложение',
msgCenter: 'Центр задач',
},
home: {
restart_1panel: 'Перезапустить панель',
Expand Down Expand Up @@ -917,6 +917,7 @@ const message = {
sockPathErr: 'Пожалуйста, выберите или введите правильный путь к файлу Docker sock',
related: 'Связанные',
includeAppstore: 'Показывать контейнеры из магазина приложений',
excludeAppstore: 'Скрыть контейнер магазина приложений',

cleanDockerDiskZone: 'Очистить дисковое пространство, используемое Docker',
cleanImagesHelper: '(Очистить все образы, не используемые контейнерами)',
Expand Down
3 changes: 2 additions & 1 deletion frontend/src/lang/modules/zh-Hant.ts
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@ const message = {
tableSetting: '列表設置',
refreshRate: '刷新頻率',
noRefresh: '不刷新',
refreshRateUnit: '{0} 秒/次',
selectColumn: '選擇列',
local: '本地',
serialNumber: '序號',
Expand Down Expand Up @@ -354,6 +353,7 @@ const message = {
supervisor: '進程守護',
tamper: '防篡改',
app: '應用',
msgCenter: '任務中心',
},
home: {
recommend: '推薦',
Expand Down Expand Up @@ -883,6 +883,7 @@ const message = {
sockPathErr: '請選擇或輸入正確的 Docker sock 文件路徑',
related: '相關資源',
includeAppstore: '顯示應用程式商店容器',
excludeAppstore: '隱藏應用商店容器',

cleanDockerDiskZone: '清理 Docker 使用的磁碟空間',
cleanImagesHelper: '( 清理所有未被任何容器使用的鏡像 )',
Expand Down
3 changes: 2 additions & 1 deletion frontend/src/lang/modules/zh.ts
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@ const message = {
tableSetting: '列表设置',
refreshRate: '刷新频率',
noRefresh: '不刷新',
refreshRateUnit: '{0} 秒/次',
selectColumn: '选择列',
local: '本地',
serialNumber: '序号',
Expand Down Expand Up @@ -352,6 +351,7 @@ const message = {
supervisor: '进程守护',
tamper: '防篡改',
app: '应用',
msgCenter: '任务中心',
},
home: {
recommend: '推荐',
Expand Down Expand Up @@ -881,6 +881,7 @@ const message = {
sockPathErr: '请选择或输入正确的 Docker sock 文件路径',
related: '关联资源',
includeAppstore: '显示应用商店容器',
excludeAppstore: '隐藏应用商店容器',

cleanDockerDiskZone: '清理 Docker 使用的磁盘空间',
cleanImagesHelper: '( 清理所有未被任何容器使用的镜像 )',
Expand Down
Loading
Loading