chore: chore home default css (#14101)

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

* fix: resolve default cronjob group by flag

---------

Co-authored-by: ssongliu <sloooop1x@gmail.com>

agent/app/api/v2/alert.go

@@ -293,7 +293,7 @@ func (b *BaseApi) PageAlertConfig(c *gin.Context) {
 // @Security ApiKeyAuth
 // @Security Timestamp
 // @Router /alert/config/update [post]
-// @x-panel-log {"bodyKeys":["id","displayName"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新告警配置 [id][displayName]","formatEN":"update alert config [id][displayName]"}
+// @x-panel-log {"bodyKeys":["displayName"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新告警配置 [displayName]","formatEN":"update alert config [displayName]"}
 func (b *BaseApi) UpdateAlertConfig(c *gin.Context) {
 	var req dto.AlertConfigUpdate
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
@@ -321,13 +321,15 @@ func (b *BaseApi) UpdateAlertConfig(c *gin.Context) {
 // @Security ApiKeyAuth
 // @Security Timestamp
 // @Router /alert/config/status [post]
-// @x-panel-log {"bodyKeys":["id","status"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新告警配置状态 [id][status]","formatEN":"update alert config status [id][status]"}
+// @x-panel-log {"bodyKeys":["status"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"更新告警配置状态 [name][status]","formatEN":"update alert config status [name][status]"}
 func (b *BaseApi) UpdateAlertConfigStatus(c *gin.Context) {
 	var req dto.AlertConfigStatusUpdate
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
-	if err := alertService.UpdateAlertConfigStatus(req, loadAuditUser(c)); err != nil {
+	name, err := alertService.UpdateAlertConfigStatus(req, loadAuditUser(c))
+	helper.SetOperationLogValues(c, map[string]string{"name": name})
+	if err != nil {
 		helper.InternalServer(c, err)
 		return
 	}
@@ -353,13 +355,14 @@ func loadAuditUser(c *gin.Context) string {
 // @Security ApiKeyAuth
 // @Security Timestamp
 // @Router /alert/config/del [post]
-// @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"删除告警配置 [id]","formatEN":"delete alert config [id]"}
+// @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"删除告警配置 [name]","formatEN":"delete alert config [name]"}
 func (b *BaseApi) DeleteAlertConfig(c *gin.Context) {
 	var req dto.DeleteRequest
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {
 		return
 	}
-	err := alertService.DeleteAlertConfig(req.ID)
+	name, err := alertService.DeleteAlertConfig(req.ID)
+	helper.SetOperationLogValues(c, map[string]string{"name": name})
 	if err != nil {
 		helper.InternalServer(c, err)
 		return

agent/app/api/v2/helper/helper.go

@@ -3,6 +3,7 @@ package helper
 import (
 	"compress/gzip"
 	"context"
+	"encoding/base64"
 	"encoding/json"
 	"fmt"
 	"net/http"
@@ -184,3 +185,23 @@ func GetParamInt32(paramName string, c *gin.Context) (int32, error) {
 	intNum, _ := strconv.Atoi(idParam)
 	return int32(intNum), nil
 }
+
+// SetOperationLogValues supplies server-resolved values to Core's operation log.
+// Call before writing the response. Only pass public audit fields, never credentials.
+func SetOperationLogValues(c *gin.Context, values map[string]string) {
+	const header = "X-Op-Resolved"
+	resolved := make(map[string]string)
+	if data, err := base64.RawURLEncoding.DecodeString(c.Writer.Header().Get(header)); err == nil {
+		_ = json.Unmarshal(data, &resolved)
+	}
+	if resolved == nil {
+		resolved = make(map[string]string)
+	}
+	for key, value := range values {
+		resolved[key] = value
+	}
+	data, err := json.Marshal(resolved)
+	if err == nil {
+		c.Header(header, base64.RawURLEncoding.EncodeToString(data))
+	}
+}

agent/app/service/alert.go

@@ -74,8 +74,8 @@ type IAlertService interface {
 	GetAlertConfig(req dto.AlertConfigQuery) ([]model.AlertConfig, error)
 	PageAlertConfig(req dto.AlertConfigPageReq) (int64, []model.AlertConfig, error)
 	UpdateAlertConfig(req dto.AlertConfigUpdate, operator string) error
-	UpdateAlertConfigStatus(req dto.AlertConfigStatusUpdate, operator string) error
-	DeleteAlertConfig(id uint) error
+	UpdateAlertConfigStatus(req dto.AlertConfigStatusUpdate, operator string) (string, error)
+	DeleteAlertConfig(id uint) (string, error)
 	TestAlertConfig(req dto.AlertConfigTest) (bool, error)
 	TestCustomAlertConfig(req dto.AlertConfigTest, lang string) (dto.AlertConfigTestResult, error)
 }
@@ -623,25 +623,26 @@ func (a AlertService) updateCustomAlertConfig(req dto.AlertConfigUpdate, operato
 	})
 }
 
-func (a AlertService) UpdateAlertConfigStatus(req dto.AlertConfigStatusUpdate, operator string) error {
+func (a AlertService) UpdateAlertConfigStatus(req dto.AlertConfigStatusUpdate, operator string) (string, error) {
 	if err := validateAlertConfigStatus(req.Status); err != nil {
-		return err
+		return "", err
 	}
 	config, err := alertRepo.GetConfigById(req.ID)
 	if err != nil {
-		return err
+		return "", err
 	}
+	name := alertConfigLogName(config.Config, config.Title)
 	if req.Status == constant.AlertEnable {
 		if err := a.validateCommunityAlertConfigType(config.Type); err != nil {
-			return err
+			return name, err
 		}
 		if config.Type == constant.Custom {
 			if _, err := alertwebhook.Resolve(config); err != nil {
-				return err
+				return name, err
 			}
 		}
 	}
-	return alertRepo.UpdateAlertConfig(map[string]interface{}{
+	return name, alertRepo.UpdateAlertConfig(map[string]interface{}{
 		"status":      req.Status,
 		"update_user": operator,
 	}, repo.WithByID(req.ID))
@@ -813,19 +814,20 @@ func alertConfigSMSPhone(configData string) string {
 	return strings.TrimSpace(cfg.Phone)
 }
 
-func (a AlertService) DeleteAlertConfig(id uint) error {
-	_, err := alertRepo.GetConfigById(id)
+func (a AlertService) DeleteAlertConfig(id uint) (string, error) {
+	config, err := alertRepo.GetConfigById(id)
 	if err != nil {
-		return err
+		return "", err
 	}
+	name := alertConfigLogName(config.Config, config.Title)
 	usedAlerts, err := alertRepo.List(alertRepo.WithByAlertMethodContainsConfigID(id))
 	if err != nil {
-		return err
+		return name, err
 	}
 	if len(usedAlerts) > 0 {
-		return buserr.New("ErrAlertConfigInUse")
+		return name, buserr.New("ErrAlertConfigInUse")
 	}
-	return alertRepo.DeleteAlertConfig(repo.WithByID(id))
+	return name, alertRepo.DeleteAlertConfig(repo.WithByID(id))
 }
 
 func (a AlertService) TestAlertConfig(req dto.AlertConfigTest) (bool, error) {
@@ -1043,3 +1045,13 @@ func (a AlertService) validateCronJobAlertChannels(alertType, advanced, method s
 	_, err = a.validateAlertMethodReferences(method)
 	return err
 }
+
+func alertConfigLogName(config, title string) string {
+	var value struct {
+		DisplayName string `json:"displayName"`
+	}
+	if json.Unmarshal([]byte(config), &value) == nil && strings.TrimSpace(value.DisplayName) != "" {
+		return strings.TrimSpace(value.DisplayName)
+	}
+	return title
+}

agent/cmd/server/docs/x-log.json

@@ -108,33 +108,29 @@
 		"formatEN": "create alert [title]"
 	},
 	"/alert/config/del": {
-		"bodyKeys": [
-			"id"
-		],
+		"bodyKeys": [],
 		"paramKeys": [],
-		"beforeFunctions": [],
-		"formatZH": "删除告警配置 [id]",
-		"formatEN": "delete alert config [id]"
+		"formatZH": "删除告警配置 [name]",
+		"formatEN": "delete alert config [name]",
+		"beforeFunctions": []
 	},
 	"/alert/config/status": {
 		"bodyKeys": [
-			"id",
 			"status"
 		],
 		"paramKeys": [],
-		"beforeFunctions": [],
-		"formatZH": "更新告警配置状态 [id][status]",
-		"formatEN": "update alert config status [id][status]"
+		"formatZH": "更新告警配置状态 [name][status]",
+		"formatEN": "update alert config status [name][status]",
+		"beforeFunctions": []
 	},
 	"/alert/config/update": {
 		"bodyKeys": [
-			"id",
 			"displayName"
 		],
 		"paramKeys": [],
-		"beforeFunctions": [],
-		"formatZH": "更新告警配置 [id][displayName]",
-		"formatEN": "update alert config [id][displayName]"
+		"formatZH": "更新告警配置 [displayName]",
+		"formatEN": "update alert config [displayName]",
+		"beforeFunctions": []
 	},
 	"/alert/del": {
 		"bodyKeys": [

core/cmd/server/docs/docs.go

@@ -3906,13 +3906,11 @@ const docTemplate = `{
 					"Alert"
 				],
 				"x-panel-log": {
-					"BeforeFunctions": [],
-					"bodyKeys": [
-						"id"
-					],
-					"formatEN": "delete alert config [id]",
-					"formatZH": "删除告警配置 [id]",
-					"paramKeys": []
+					"bodyKeys": [],
+					"paramKeys": [],
+					"formatZH": "删除告警配置 [name]",
+					"formatEN": "delete alert config [name]",
+					"BeforeFunctions": []
 				}
 			}
 		},
@@ -4041,14 +4039,13 @@ const docTemplate = `{
 					"Alert"
 				],
 				"x-panel-log": {
-					"BeforeFunctions": [],
 					"bodyKeys": [
-						"id",
 						"displayName"
 					],
-					"formatEN": "update alert config [id][displayName]",
-					"formatZH": "更新告警配置 [id][displayName]",
-					"paramKeys": []
+					"paramKeys": [],
+					"formatZH": "更新告警配置 [displayName]",
+					"formatEN": "update alert config [displayName]",
+					"BeforeFunctions": []
 				}
 			}
 		},

core/cmd/server/docs/swagger.json

@@ -3902,13 +3902,11 @@
 					"Alert"
 				],
 				"x-panel-log": {
-					"BeforeFunctions": [],
-					"bodyKeys": [
-						"id"
-					],
-					"formatEN": "delete alert config [id]",
-					"formatZH": "删除告警配置 [id]",
-					"paramKeys": []
+					"bodyKeys": [],
+					"paramKeys": [],
+					"formatZH": "删除告警配置 [name]",
+					"formatEN": "delete alert config [name]",
+					"BeforeFunctions": []
 				}
 			}
 		},
@@ -4037,14 +4035,13 @@
 					"Alert"
 				],
 				"x-panel-log": {
-					"BeforeFunctions": [],
 					"bodyKeys": [
-						"id",
 						"displayName"
 					],
-					"formatEN": "update alert config [id][displayName]",
-					"formatZH": "更新告警配置 [id][displayName]",
-					"paramKeys": []
+					"paramKeys": [],
+					"formatZH": "更新告警配置 [displayName]",
+					"formatEN": "update alert config [displayName]",
+					"BeforeFunctions": []
 				}
 			}
 		},

core/cmd/server/docs/x-log.json

@@ -108,33 +108,29 @@
 		"formatEN": "create alert [title]"
 	},
 	"/alert/config/del": {
-		"bodyKeys": [
-			"id"
-		],
+		"bodyKeys": [],
 		"paramKeys": [],
-		"beforeFunctions": [],
-		"formatZH": "删除告警配置 [id]",
-		"formatEN": "delete alert config [id]"
+		"formatZH": "删除告警配置 [name]",
+		"formatEN": "delete alert config [name]",
+		"beforeFunctions": []
 	},
 	"/alert/config/status": {
 		"bodyKeys": [
-			"id",
 			"status"
 		],
 		"paramKeys": [],
-		"beforeFunctions": [],
-		"formatZH": "更新告警配置状态 [id][status]",
-		"formatEN": "update alert config status [id][status]"
+		"formatZH": "更新告警配置状态 [name][status]",
+		"formatEN": "update alert config status [name][status]",
+		"beforeFunctions": []
 	},
 	"/alert/config/update": {
 		"bodyKeys": [
-			"id",
 			"displayName"
 		],
 		"paramKeys": [],
-		"beforeFunctions": [],
-		"formatZH": "更新告警配置 [id][displayName]",
-		"formatEN": "update alert config [id][displayName]"
+		"formatZH": "更新告警配置 [displayName]",
+		"formatEN": "update alert config [displayName]",
+		"beforeFunctions": []
 	},
 	"/alert/del": {
 		"bodyKeys": [

core/middleware/operation.go

@@ -133,11 +133,9 @@ func OperationLog() gin.HandlerFunc {
 			record.AuthMethod = "session"
 		}
 
+		// Handlers may supply audit values even without database resolution metadata.
+		mergeResolvedData(writer.resolvedHeader, formatMap)
 		if len(operationDic.BeforeFunctions) != 0 {
-			if needAgentResolve {
-				mergeResolvedData(writer.resolvedHeader, formatMap)
-			}
-
 			if allowCoreFallback && !hasAllResolvedData(formatMap, operationDic.BeforeFunctions) {
 				dbItem, err := newDB(record.Path)
 				if err == nil {

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>

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>

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}`,

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">

frontend/src/components/v-charts/components/Pie.vue

@@ -4,11 +4,8 @@
 <script lang="ts" setup>
 import { onMounted, nextTick, watch, onBeforeUnmount, ref } from 'vue';
 import echarts from '@/utils/echarts';
-import { useGlobalStore } from '@/composables/useGlobalStore';
-const { themeConfig } = useGlobalStore();
-const isDarkTheme = ref(false);
 const PieChartRef = ref<HTMLElement>();
-let mediaQuery: MediaQueryList;
+let themeObserver: MutationObserver | undefined;
 let resizeObserver: ResizeObserver | undefined;
 let resizeFrame: number | undefined;
 
@@ -47,16 +44,17 @@ function resizeChart() {
     echarts.getInstanceByDom(PieChartRef.value)?.resize();
 }
 function getThemeColors() {
+    // Match the applied page theme, including while settings are still loading.
+    const isDarkTheme = document.documentElement.classList.contains('dark');
+    const style = getComputedStyle(document.documentElement);
     return {
-        primaryLight2: getComputedStyle(document.documentElement)
-            .getPropertyValue('--panel-color-primary-light-3')
-            .trim(),
-        primaryLight1: getComputedStyle(document.documentElement).getPropertyValue('--panel-color-primary').trim(),
-        pieBgColor: isDarkTheme.value ? '#434552' : '#ffffff',
-        textColor: isDarkTheme.value ? '#ffffff' : '#0f0f0f',
-        subtextColor: isDarkTheme.value ? '#BBBFC4' : '#646A73',
-        shadowColor: isDarkTheme.value ? '#16191D' : 'rgba(0, 94, 235, 0.1)',
-        backgroundStyleColor: isDarkTheme.value ? 'rgba(255, 255, 255, 0.05)' : 'rgba(0, 94, 235, 0.05)',
+        primaryLight2: style.getPropertyValue('--panel-color-primary-light-3').trim() || '#4c8ef1',
+        primaryLight1: style.getPropertyValue('--panel-color-primary').trim() || '#005eeb',
+        pieBgColor: isDarkTheme ? '#434552' : '#ffffff',
+        textColor: isDarkTheme ? '#ffffff' : '#0f0f0f',
+        subtextColor: isDarkTheme ? '#BBBFC4' : '#646A73',
+        shadowColor: isDarkTheme ? '#16191D' : 'rgba(0, 94, 235, 0.1)',
+        backgroundStyleColor: isDarkTheme ? 'rgba(255, 255, 255, 0.05)' : 'rgba(0, 94, 235, 0.05)',
     };
 }
 
@@ -64,11 +62,6 @@ function initChart() {
     if (!PieChartRef.value) {
         return;
     }
-    if (themeConfig.value.theme === 'auto') {
-        isDarkTheme.value = window.matchMedia('(prefers-color-scheme: dark)').matches;
-    } else {
-        isDarkTheme.value = themeConfig.value.theme === 'dark';
-    }
     let myChart = echarts?.getInstanceByDom(PieChartRef.value);
     if (myChart === null || myChart === undefined) {
         myChart = echarts.init(PieChartRef.value);
@@ -194,8 +187,11 @@ function handleThemeChange() {
 
 onMounted(() => {
     nextTick(() => {
-        mediaQuery = window.matchMedia('(prefers-color-scheme: dark)');
-        mediaQuery.addEventListener('change', handleThemeChange);
+        themeObserver = new MutationObserver(handleThemeChange);
+        themeObserver.observe(document.documentElement, {
+            attributes: true,
+            attributeFilter: ['class', 'style'],
+        });
         initChart();
         window.addEventListener('resize', changeChartSize);
         if (PieChartRef.value) {
@@ -214,7 +210,7 @@ onBeforeUnmount(() => {
         echarts.getInstanceByDom(PieChartRef.value)?.dispose();
     }
     window.removeEventListener('resize', changeChartSize);
-    mediaQuery?.removeEventListener('change', handleThemeChange);
+    themeObserver?.disconnect();
     resizeObserver?.disconnect();
 });
 </script>

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');
 };
 

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) {

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>

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()" />
@@ -69,7 +62,12 @@
                     :heightDiff="300"
                 >
                     <el-table-column type="selection" fix />
-                    <el-table-column :label="$t('commons.table.name')" show-overflow-tooltip prop="name" min-width="60">
+                    <el-table-column
+                        :label="$t('commons.table.name')"
+                        show-overflow-tooltip
+                        prop="name"
+                        min-width="140"
+                    >
                         <template #default="{ row }">
                             <el-text type="primary" class="cursor-pointer" @click="showScript(row)">
                                 {{ row.name }}
@@ -78,21 +76,15 @@
                     </el-table-column>
                     <el-table-column :label="$t('cronjob.library.isInteractive')" prop="isInteractive" min-width="60">
                         <template #default="{ row }">
-                            <div class="-mb-1">
-                                <el-icon v-if="row.isInteractive"><Check /></el-icon>
-                                <el-icon v-else><Minus /></el-icon>
-                            </div>
+                            {{ $t(row.isInteractive ? 'commons.true' : 'commons.false') }}
                         </template>
                     </el-table-column>
-                    <el-table-column :label="$t('commons.table.group')" min-width="120" prop="group">
+                    <el-table-column :label="$t('commons.table.group')" min-width="100" prop="group">
                         <template #default="{ row }">
                             <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>

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>

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>) {

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"

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>

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">

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>

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">

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) => {

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>

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" />