From 8e865c2c4663acaa3f0c50ac133c8e35537f5357 Mon Sep 17 00:00:00 2001
From: Kadxy <linghaokai1025@gmail.com>
Date: Thu, 15 Oct 2026 15:42:18 +0800
Subject: [PATCH] fix: stop translating the built-in Default group name
 (#14100)

* fix: stop translating the built-in Default group name

* fix: resolve default cronjob group by flag

---------

Co-authored-by: ssongliu <sloooop1x@gmail.com>
---
 frontend/src/components/agent-group/index.vue |  5 +--
 frontend/src/components/group/index.vue       |  5 +--
 .../terminal/connection-menu/index.vue        |  2 +-
 .../src/components/terminal/host-create.vue   |  9 +----
 .../Sidebar/components/node-drawer/index.vue  |  3 --
 frontend/src/views/cronjob/cronjob/index.vue  | 34 +++++--------------
 .../views/cronjob/cronjob/operate/index.vue   | 14 ++++----
 frontend/src/views/cronjob/library/index.vue  | 14 ++------
 .../views/cronjob/library/operate/index.vue   |  9 +----
 .../host/file-management/terminal/index.vue   |  6 ----
 .../views/terminal/command/import/index.vue   | 12 ++-----
 frontend/src/views/terminal/command/index.vue | 25 +++++---------
 .../views/terminal/command/operate/index.vue  |  9 +----
 frontend/src/views/terminal/host/index.vue    | 25 +++++---------
 .../src/views/terminal/host/operate/index.vue |  9 +----
 .../src/views/terminal/terminal/index.vue     |  5 ---
 .../website/components/group/index.vue        |  7 +---
 frontend/src/views/website/website/index.vue  |  9 +----
 18 files changed, 44 insertions(+), 158 deletions(-)

diff --git a/frontend/src/components/agent-group/index.vue b/frontend/src/components/agent-group/index.vue
index ba6c49d1a..e48a127c2 100644
--- a/frontend/src/components/agent-group/index.vue
+++ b/frontend/src/components/agent-group/index.vue
@@ -8,10 +8,7 @@
                 <el-table-column :label="$t('commons.table.name')" prop="name">
                     <template #default="{ row }">
                         <div v-if="!row.edit">
-                            <span v-if="row.name === 'Default'">
-                                {{ $t('commons.table.default') }}
-                            </span>
-                            <span v-if="row.name !== 'Default'">{{ row.name }}</span>
+                            <span>{{ row.name }}</span>
                             <el-tag v-if="row.isDefault" type="success" class="ml-2" size="small">
                                 ({{ $t('commons.table.default') }})
                             </el-tag>
diff --git a/frontend/src/components/group/index.vue b/frontend/src/components/group/index.vue
index f1fde912b..9733bbd19 100644
--- a/frontend/src/components/group/index.vue
+++ b/frontend/src/components/group/index.vue
@@ -8,10 +8,7 @@
                 <el-table-column :label="$t('commons.table.name')" prop="name">
                     <template #default="{ row }">
                         <div v-if="!row.edit">
-                            <span v-if="row.name === 'Default'">
-                                {{ $t('commons.table.default') }}
-                            </span>
-                            <span v-if="row.name !== 'Default'">{{ row.name }}</span>
+                            <span>{{ row.name }}</span>
                             <el-tag v-if="row.isDefault" type="success" class="ml-2" size="small">
                                 ({{ $t('commons.table.default') }})
                             </el-tag>
diff --git a/frontend/src/components/terminal/connection-menu/index.vue b/frontend/src/components/terminal/connection-menu/index.vue
index d6c866035..fb94630a5 100644
--- a/frontend/src/components/terminal/connection-menu/index.vue
+++ b/frontend/src/components/terminal/connection-menu/index.vue
@@ -154,7 +154,7 @@ const connectionTree = computed<ConnectionTreeItem[]>(() => {
         groups.push(
             ...hostTree.value.map((group): ConnectionTreeItem => ({
                 id: `host-group-${group.id}`,
-                label: group.label === 'Default' ? i18n.global.t('commons.table.default') : group.label,
+                label: group.label,
                 kind: 'group',
                 children: (group.children || []).map((host) => ({
                     id: `host-${host.id}`,
diff --git a/frontend/src/components/terminal/host-create.vue b/frontend/src/components/terminal/host-create.vue
index d2f18d1e3..12a616d2b 100644
--- a/frontend/src/components/terminal/host-create.vue
+++ b/frontend/src/components/terminal/host-create.vue
@@ -38,14 +38,7 @@
             </el-form-item>
             <el-form-item v-if="!form.isLocal" :label="$t('commons.table.group')" prop="groupID">
                 <el-select filterable v-model="form.groupID" clearable style="width: 100%">
-                    <div v-for="item in groupList" :key="item.id">
-                        <el-option
-                            v-if="item.name === 'Default'"
-                            :label="$t('commons.table.default')"
-                            :value="item.id"
-                        />
-                        <el-option v-else :label="item.name" :value="item.id" />
-                    </div>
+                    <el-option v-for="item in groupList" :key="item.id" :label="item.name" :value="item.id" />
                 </el-select>
             </el-form-item>
             <el-form-item v-if="!form.isLocal" :label="$t('commons.table.title')" prop="name">
diff --git a/frontend/src/layout/components/Sidebar/components/node-drawer/index.vue b/frontend/src/layout/components/Sidebar/components/node-drawer/index.vue
index 5d797dd1e..38469356b 100644
--- a/frontend/src/layout/components/Sidebar/components/node-drawer/index.vue
+++ b/frontend/src/layout/components/Sidebar/components/node-drawer/index.vue
@@ -163,9 +163,6 @@ const displayNodeName = (item: NodeItem) => {
 };
 
 const displayGroupName = (item: NodeItem) => {
-    if (item.groupBelong === 'Default') {
-        return i18n.global.t('commons.table.default');
-    }
     return item.group || item.groupBelong || i18n.global.t('commons.table.default');
 };
 
diff --git a/frontend/src/views/cronjob/cronjob/index.vue b/frontend/src/views/cronjob/cronjob/index.vue
index 60e14cf58..73afeaa50 100644
--- a/frontend/src/views/cronjob/cronjob/index.vue
+++ b/frontend/src/views/cronjob/cronjob/index.vue
@@ -45,14 +45,7 @@
                 <TableViewSwitch v-model="viewMode" storage-key="cronjob" />
                 <el-select v-model="searchGroupID" @change="search()" clearable class="p-w-200">
                     <template #prefix>{{ $t('commons.table.group') }}</template>
-                    <div v-for="item in groupOptions" :key="item.id">
-                        <el-option
-                            v-if="item.name === 'Default'"
-                            :label="$t('commons.table.default')"
-                            :value="item.id"
-                        />
-                        <el-option v-else :label="item.name" :value="item.id" />
-                    </div>
+                    <el-option v-for="item in groupOptions" :key="item.id" :label="item.name" :value="item.id" />
                 </el-select>
                 <TableSearch @search="search()" v-model:searchName="searchName" />
                 <TableRefresh @search="search()" />
@@ -104,16 +97,14 @@
                                 @change="updateGroup(row)"
                             >
                                 <template #read>
-                                    {{ row.groupBelong === 'Default' ? $t('commons.table.default') : row.groupBelong }}
+                                    {{ row.groupBelong }}
                                 </template>
-                                <div v-for="item in groupOptions" :key="item.id">
-                                    <el-option
-                                        v-if="item.name === 'Default'"
-                                        :label="$t('commons.table.default')"
-                                        :value="item.id"
-                                    />
-                                    <el-option v-else :label="item.name" :value="item.id" />
-                                </div>
+                                <el-option
+                                    v-for="item in groupOptions"
+                                    :key="item.id"
+                                    :label="item.name"
+                                    :value="item.id"
+                                />
                             </fu-select-rw-switch>
                         </template>
                     </el-table-column>
@@ -474,17 +465,10 @@ const loadGroups = async () => {
         searchGroupID.value = undefined;
         paginationConfig.currentPage = 1;
     }
-    for (const group of groupOptions.value) {
-        if (group.name === 'Default') {
-            defaultGroupID.value = group.id;
-            break;
-        }
-    }
+    defaultGroupID.value = groupOptions.value.find((group) => group.isDefault)?.id;
     for (const item of data.value) {
         if (item.groupID === 0) {
-            item.groupBelong = 'Default';
             item.groupID = defaultGroupID.value;
-            continue;
         }
         let hasGroup = false;
         for (const group of groupOptions.value) {
diff --git a/frontend/src/views/cronjob/cronjob/operate/index.vue b/frontend/src/views/cronjob/cronjob/operate/index.vue
index 833446e3a..5f516fd24 100644
--- a/frontend/src/views/cronjob/cronjob/operate/index.vue
+++ b/frontend/src/views/cronjob/cronjob/operate/index.vue
@@ -80,14 +80,12 @@
                                 <LayoutCol>
                                     <el-form-item :label="$t('commons.table.group')" prop="groupID">
                                         <el-select filterable v-model="form.groupID" clearable>
-                                            <div v-for="item in groupOptions" :key="item.id">
-                                                <el-option
-                                                    v-if="item.name === 'Default'"
-                                                    :label="$t('commons.table.default')"
-                                                    :value="item.id"
-                                                />
-                                                <el-option v-else :label="item.name" :value="item.id" />
-                                            </div>
+                                            <el-option
+                                                v-for="item in groupOptions"
+                                                :key="item.id"
+                                                :label="item.name"
+                                                :value="item.id"
+                                            />
                                         </el-select>
                                     </el-form-item>
                                 </LayoutCol>
diff --git a/frontend/src/views/cronjob/library/index.vue b/frontend/src/views/cronjob/library/index.vue
index ea8d86d4e..d65a967a1 100644
--- a/frontend/src/views/cronjob/library/index.vue
+++ b/frontend/src/views/cronjob/library/index.vue
@@ -45,14 +45,7 @@
             <template #rightToolBar>
                 <el-select v-model="group" @change="search()" clearable class="p-w-200">
                     <template #prefix>{{ $t('commons.table.group') }}</template>
-                    <div v-for="item in groupOptions" :key="item.id">
-                        <el-option
-                            v-if="item.name === 'Default'"
-                            :label="$t('commons.table.default')"
-                            :value="item.id"
-                        />
-                        <el-option v-else :label="item.name" :value="item.id" />
-                    </div>
+                    <el-option v-for="item in groupOptions" :key="item.id" :label="item.name" :value="item.id" />
                 </el-select>
                 <TableSearch @search="search()" v-model:searchName="searchInfo" />
                 <TableRefresh @search="search()" />
@@ -91,10 +84,7 @@
                             <el-button class="mr-3" size="small" v-if="row.isSystem">{{ $t('menu.system') }}</el-button>
                             <span v-if="row.groupBelong">
                                 <el-button size="small" v-for="(item, index) in row.groupBelong" :key="index">
-                                    <span v-if="item === 'Default'">
-                                        {{ $t('commons.table.default') }}
-                                    </span>
-                                    <span v-else>{{ item }}</span>
+                                    {{ item }}
                                 </el-button>
                             </span>
                         </template>
diff --git a/frontend/src/views/cronjob/library/operate/index.vue b/frontend/src/views/cronjob/library/operate/index.vue
index 8a2137031..acf4f32f6 100644
--- a/frontend/src/views/cronjob/library/operate/index.vue
+++ b/frontend/src/views/cronjob/library/operate/index.vue
@@ -21,14 +21,7 @@
             </el-form-item>
             <el-form-item :label="$t('commons.table.group')" prop="groupList">
                 <el-select filterable v-model="dialogData.rowData!.groupList" multiple>
-                    <div v-for="item in groupOptions" :key="item.id">
-                        <el-option
-                            v-if="item.name === 'Default'"
-                            :label="$t('commons.table.default')"
-                            :value="item.id"
-                        />
-                        <el-option v-else :label="item.name" :value="item.id" />
-                    </div>
+                    <el-option v-for="item in groupOptions" :key="item.id" :label="item.name" :value="item.id" />
                 </el-select>
                 <span class="input-help">{{ $t('cronjob.library.groupHelper') }}</span>
             </el-form-item>
diff --git a/frontend/src/views/host/file-management/terminal/index.vue b/frontend/src/views/host/file-management/terminal/index.vue
index 7f1abf076..f559c945a 100644
--- a/frontend/src/views/host/file-management/terminal/index.vue
+++ b/frontend/src/views/host/file-management/terminal/index.vue
@@ -33,7 +33,6 @@
 import { ref, nextTick } from 'vue';
 import Terminal from '@/components/terminal/index.vue';
 import { getCommandTree } from '@/api/modules/command';
-import i18n from '@/lang';
 
 const terminalVisible = ref(false);
 const terminalRef = ref<InstanceType<typeof Terminal> | null>(null);
@@ -64,11 +63,6 @@ const initTerm = async (cwd: string) => {
 const loadCommandTree = async () => {
     const res = await getCommandTree('command');
     commandTree.value = res.data || [];
-    for (const item of commandTree.value) {
-        if (item.label === 'Default') {
-            item.label = i18n.global.t('commons.table.default');
-        }
-    }
 };
 
 function quickInput(val: Array<string>) {
diff --git a/frontend/src/views/terminal/command/import/index.vue b/frontend/src/views/terminal/command/import/index.vue
index 0af6b70c8..43dff231d 100644
--- a/frontend/src/views/terminal/command/import/index.vue
+++ b/frontend/src/views/terminal/command/import/index.vue
@@ -27,10 +27,7 @@
                 @change="changeGroup"
                 class="p-w-200 ml-2 mt-2"
             >
-                <div v-for="item in groupList" :key="item.id">
-                    <el-option v-if="item.name === 'Default'" :label="$t('commons.table.default')" :value="item.id" />
-                    <el-option v-else :label="item.name" :value="item.id" />
-                </div>
+                <el-option v-for="item in groupList" :key="item.id" :label="item.name" :value="item.id" />
             </el-select>
 
             <el-card class="mt-2 w-full" v-loading="loading">
@@ -54,12 +51,7 @@
                         min-width="80"
                         prop="groupBelong"
                         fix
-                    >
-                        <template #default="{ row }">
-                            <span v-if="row.groupBelong === 'Default'">{{ $t('commons.table.default') }}</span>
-                            <span v-else>{{ row.groupBelong }}</span>
-                        </template>
-                    </el-table-column>
+                    />
                     <el-table-column
                         :label="$t('terminal.command')"
                         :min-width="120"
diff --git a/frontend/src/views/terminal/command/index.vue b/frontend/src/views/terminal/command/index.vue
index f4350a2d5..74d7d8f85 100644
--- a/frontend/src/views/terminal/command/index.vue
+++ b/frontend/src/views/terminal/command/index.vue
@@ -27,14 +27,7 @@
             <template #rightToolBar>
                 <el-select v-model="group" @change="search()" clearable class="p-w-200">
                     <template #prefix>{{ $t('commons.table.group') }}</template>
-                    <div v-for="item in groupList" :key="item.id">
-                        <el-option
-                            v-if="item.name === 'Default'"
-                            :label="$t('commons.table.default')"
-                            :value="item.id"
-                        />
-                        <el-option v-else :label="item.name" :value="item.id" />
-                    </div>
+                    <el-option v-for="item in groupList" :key="item.id" :label="item.name" :value="item.id" />
                 </el-select>
                 <TableSearch @search="search()" v-model:searchName="info" />
                 <TableRefresh @search="search()" />
@@ -74,16 +67,14 @@
                         <template #default="{ row }">
                             <fu-select-rw-switch v-model="row.groupID" @change="updateGroup(row)">
                                 <template #read>
-                                    {{ row.groupBelong === 'Default' ? $t('commons.table.default') : row.groupBelong }}
+                                    {{ row.groupBelong }}
                                 </template>
-                                <div v-for="item in groupList" :key="item.id">
-                                    <el-option
-                                        v-if="item.name === 'Default'"
-                                        :label="$t('commons.table.default')"
-                                        :value="item.id"
-                                    />
-                                    <el-option v-else :label="item.name" :value="item.id" />
-                                </div>
+                                <el-option
+                                    v-for="item in groupList"
+                                    :key="item.id"
+                                    :label="item.name"
+                                    :value="item.id"
+                                />
                             </fu-select-rw-switch>
                         </template>
                     </el-table-column>
diff --git a/frontend/src/views/terminal/command/operate/index.vue b/frontend/src/views/terminal/command/operate/index.vue
index 6b4d5d4db..44a24e296 100644
--- a/frontend/src/views/terminal/command/operate/index.vue
+++ b/frontend/src/views/terminal/command/operate/index.vue
@@ -22,14 +22,7 @@
             </el-form-item>
             <el-form-item :label="$t('commons.table.group')" prop="groupID">
                 <el-select filterable v-model="dialogData.rowData!.groupID" clearable style="width: 100%">
-                    <div v-for="item in groupList" :key="item.id">
-                        <el-option
-                            v-if="item.name === 'Default'"
-                            :label="$t('commons.table.default')"
-                            :value="item.id"
-                        />
-                        <el-option v-else :label="item.name" :value="item.id" />
-                    </div>
+                    <el-option v-for="item in groupList" :key="item.id" :label="item.name" :value="item.id" />
                 </el-select>
             </el-form-item>
             <el-form-item v-if="!batchMode" :label="$t('terminal.command')" prop="command">
diff --git a/frontend/src/views/terminal/host/index.vue b/frontend/src/views/terminal/host/index.vue
index 69a1bb315..8c31aa47c 100644
--- a/frontend/src/views/terminal/host/index.vue
+++ b/frontend/src/views/terminal/host/index.vue
@@ -16,14 +16,7 @@
                 <el-select v-model="group" @change="search()" clearable class="p-w-200">
                     <template #prefix>{{ $t('commons.table.group') }}</template>
                     <el-option :label="$t('commons.table.all')" value=""></el-option>
-                    <div v-for="item in groupList" :key="item.id">
-                        <el-option
-                            v-if="item.name === 'Default'"
-                            :label="$t('commons.table.default')"
-                            :value="item.id"
-                        />
-                        <el-option v-else :label="item.name" :value="item.id" />
-                    </div>
+                    <el-option v-for="item in groupList" :key="item.id" :label="item.name" :value="item.id" />
                 </el-select>
                 <TableSearch @search="search()" v-model:searchName="info" />
                 <TableRefresh @search="search()" />
@@ -48,16 +41,14 @@
                         <template #default="{ row }">
                             <fu-select-rw-switch v-model="row.groupID" @change="updateGroup(row)">
                                 <template #read>
-                                    {{ row.groupBelong === 'Default' ? $t('commons.table.default') : row.groupBelong }}
+                                    {{ row.groupBelong }}
                                 </template>
-                                <div v-for="item in groupList" :key="item.id">
-                                    <el-option
-                                        v-if="item.name === 'Default'"
-                                        :label="$t('commons.table.default')"
-                                        :value="item.id"
-                                    />
-                                    <el-option v-else :label="item.name" :value="item.id" />
-                                </div>
+                                <el-option
+                                    v-for="item in groupList"
+                                    :key="item.id"
+                                    :label="item.name"
+                                    :value="item.id"
+                                />
                             </fu-select-rw-switch>
                         </template>
                     </el-table-column>
diff --git a/frontend/src/views/terminal/host/operate/index.vue b/frontend/src/views/terminal/host/operate/index.vue
index c0a9d1b46..3b76dbeba 100644
--- a/frontend/src/views/terminal/host/operate/index.vue
+++ b/frontend/src/views/terminal/host/operate/index.vue
@@ -50,14 +50,7 @@
             </el-form-item>
             <el-form-item :label="$t('commons.table.group')" prop="groupID">
                 <el-select filterable v-model="dialogData.rowData!.groupID" clearable style="width: 100%">
-                    <div v-for="item in groupList" :key="item.id">
-                        <el-option
-                            v-if="item.name === 'Default'"
-                            :label="$t('commons.table.default')"
-                            :value="item.id"
-                        />
-                        <el-option v-else :label="item.name" :value="item.id" />
-                    </div>
+                    <el-option v-for="item in groupList" :key="item.id" :label="item.name" :value="item.id" />
                 </el-select>
             </el-form-item>
             <el-form-item :label="$t('commons.table.title')" prop="name">
diff --git a/frontend/src/views/terminal/terminal/index.vue b/frontend/src/views/terminal/terminal/index.vue
index 66595c9a3..a2a6889e2 100644
--- a/frontend/src/views/terminal/terminal/index.vue
+++ b/frontend/src/views/terminal/terminal/index.vue
@@ -268,11 +268,6 @@ const handleTabsRemove = async (targetName: string, action: 'remove' | 'add') =>
 const loadCommandTree = async () => {
     const res = await getCommandTree('command');
     commandTree.value = res.data || [];
-    for (const item of commandTree.value) {
-        if (item.label === 'Default') {
-            item.label = i18n.global.t('commons.table.default');
-        }
-    }
 };
 
 const sendToTerminals = (command: string, all: boolean) => {
diff --git a/frontend/src/views/website/website/components/group/index.vue b/frontend/src/views/website/website/components/group/index.vue
index 92ea92438..95b0e0433 100644
--- a/frontend/src/views/website/website/components/group/index.vue
+++ b/frontend/src/views/website/website/components/group/index.vue
@@ -1,12 +1,7 @@
 <template>
     <el-form-item :label="$t('commons.table.group')" :prop="prop">
         <el-select v-model="selectedValue">
-            <el-option
-                v-for="(group, index) in groups"
-                :key="index"
-                :label="group.name === 'Default' ? $t('commons.table.default') : group.name"
-                :value="group.id"
-            />
+            <el-option v-for="(group, index) in groups" :key="index" :label="group.name" :value="group.id" />
         </el-select>
     </el-form-item>
 </template>
diff --git a/frontend/src/views/website/website/index.vue b/frontend/src/views/website/website/index.vue
index cba937c2e..88e1683a1 100644
--- a/frontend/src/views/website/website/index.vue
+++ b/frontend/src/views/website/website/index.vue
@@ -45,14 +45,7 @@
                 <el-select v-model="req.websiteGroupId" @change="search()" class="p-w-200" :disabled="disabledConfig">
                     <template #prefix>{{ $t('commons.table.group') }}</template>
                     <el-option :label="$t('commons.table.all')" :value="0"></el-option>
-                    <div v-for="item in groups" :key="item.id">
-                        <el-option
-                            v-if="item.name === 'Default'"
-                            :label="$t('commons.table.default')"
-                            :value="item.id"
-                        />
-                        <el-option v-else :label="item.name" :value="item.id" />
-                    </div>
+                    <el-option v-for="item in groups" :key="item.id" :label="item.name" :value="item.id" />
                 </el-select>
                 <TableSearch @search="search()" v-model:searchName="req.name" :disabled="disabledConfig" />
                 <TableRefresh @search="search()" :disabled="disabledConfig" />