diff --git a/nezha-fronted/src/assets/css/components/common/globalSearch/globalSearch.scss b/nezha-fronted/src/assets/css/components/common/globalSearch/globalSearch.scss index 6e6585dbc..31d7fd38b 100644 --- a/nezha-fronted/src/assets/css/components/common/globalSearch/globalSearch.scss +++ b/nezha-fronted/src/assets/css/components/common/globalSearch/globalSearch.scss @@ -58,6 +58,7 @@ margin-left: 20px; margin-right: 20px; color: $--color-text-primary; + white-space: nowrap; } } .global-search-input.search-after{ diff --git a/nezha-fronted/src/components/cli/webSSH.vue b/nezha-fronted/src/components/cli/webSSH.vue index 0cab005a7..d6fef2881 100644 --- a/nezha-fronted/src/components/cli/webSSH.vue +++ b/nezha-fronted/src/components/cli/webSSH.vue @@ -51,8 +51,8 @@ :popper-class="'popover-webshell'" >
-
Select asset
-
Custom connect
+
{{$t('webshell.selAsset')}}
+
{{$t('webshell.custom')}}
+ @@ -153,7 +153,7 @@ -
Connect
+
{{$t('webshell.connect')}}
@@ -190,7 +190,7 @@
-
Connect
+
{{$t('webshell.connect')}}
@@ -243,7 +243,7 @@ {{$t('overall.cancel')}}
diff --git a/nezha-fronted/src/components/common/globalSearch/globalSearch.vue b/nezha-fronted/src/components/common/globalSearch/globalSearch.vue index b0804dd41..6372b0a8f 100644 --- a/nezha-fronted/src/components/common/globalSearch/globalSearch.vue +++ b/nezha-fronted/src/components/common/globalSearch/globalSearch.vue @@ -5,7 +5,7 @@
- Cancel + {{$t('overall.cancel')}}
diff --git a/nezha-fronted/src/components/common/rightBox/asset/assetBatchEditBox.vue b/nezha-fronted/src/components/common/rightBox/asset/assetBatchEditBox.vue index bb810d0e0..162d4aeec 100644 --- a/nezha-fronted/src/components/common/rightBox/asset/assetBatchEditBox.vue +++ b/nezha-fronted/src/components/common/rightBox/asset/assetBatchEditBox.vue @@ -205,9 +205,9 @@ @search="search" @leftToRight="addAsset" @rightToLeft="removeAsset"> - + -
{{this.$t('validate.required')}}
+
{{$t('validate.required')}}
@@ -292,13 +292,13 @@ export default { disabled: false }, { id: 20, - name: 'SN', + name: this.$t('asset.sn'), type: 'input', label: 'sn', disabled: false }, { id: 21, - name: 'Host', + name: this.$t('webshell.host'), type: 'input', label: 'manageIp', disabled: false @@ -310,7 +310,7 @@ export default { disabled: false }, { id: 23, - name: 'pingStatus', + name: this.$t('asset.pingStatus'), type: 'select', label: 'pingStatus', disabled: false