From 3b964fbe88890bf95e2701557bf9dbd2adad1912 Mon Sep 17 00:00:00 2001 From: zhangyu Date: Tue, 21 Mar 2023 10:58:23 +0800 Subject: [PATCH 1/5] =?UTF-8?q?NEZ-2719=20style=EF=BC=9A=20IPAM=E4=BA=8C?= =?UTF-8?q?=E7=BA=A7=E9=A1=B5=E9=9D=A2=E6=96=B0=E5=BB=BA=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E6=97=B6State=E6=A0=B7=E5=BC=8F=E5=B1=95=E5=BC=80=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/assets/css/components/common/rightBox/ipam.scss | 3 +++ nezha-fronted/src/components/common/rightBox/ipDetailsBox.vue | 2 +- nezha-fronted/src/components/common/rightBox/ipamBox.vue | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/nezha-fronted/src/assets/css/components/common/rightBox/ipam.scss b/nezha-fronted/src/assets/css/components/common/rightBox/ipam.scss index 029964ee1..bd105b948 100644 --- a/nezha-fronted/src/assets/css/components/common/rightBox/ipam.scss +++ b/nezha-fronted/src/assets/css/components/common/rightBox/ipam.scss @@ -38,3 +38,6 @@ .ip-detail-available { color:$--color-success !important; } +.right-box-select-top.right-box-select-width { + width: 640px !important; +} diff --git a/nezha-fronted/src/components/common/rightBox/ipDetailsBox.vue b/nezha-fronted/src/components/common/rightBox/ipDetailsBox.vue index 5889725df..38736181c 100644 --- a/nezha-fronted/src/components/common/rightBox/ipDetailsBox.vue +++ b/nezha-fronted/src/components/common/rightBox/ipDetailsBox.vue @@ -25,7 +25,7 @@ diff --git a/nezha-fronted/src/components/common/rightBox/ipamBox.vue b/nezha-fronted/src/components/common/rightBox/ipamBox.vue index 9769a7533..bbc95cef2 100644 --- a/nezha-fronted/src/components/common/rightBox/ipamBox.vue +++ b/nezha-fronted/src/components/common/rightBox/ipamBox.vue @@ -50,7 +50,7 @@
- + {{item.name}} From babd0e4df922a3242b82bde929a115c2e9316fa5 Mon Sep 17 00:00:00 2001 From: zyh Date: Wed, 22 Mar 2023 10:20:14 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=E5=9B=BD?= =?UTF-8?q?=E9=99=85=E5=8C=96=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/common/popBox/topToolMoreOptions.vue | 2 +- .../src/components/common/rightBox/dashboardTempBox.vue | 2 +- nezha-fronted/src/components/common/rightBox/panelBox.vue | 4 ++-- nezha-fronted/src/entrance/exportHtml/i18nData.js | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue b/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue index 663c974aa..fe05755ec 100644 --- a/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue +++ b/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue @@ -6,7 +6,7 @@ -
{{$t('dashboard.dashboard.editPanelTitle')}}
+
{{$t('dashboard.dashboard.editDashboardTitle')}}
{{!panelLock ? $t("overall.locked") : $t("overall.unlocked")}}
diff --git a/nezha-fronted/src/components/common/rightBox/dashboardTempBox.vue b/nezha-fronted/src/components/common/rightBox/dashboardTempBox.vue index 31f82dacd..faf72ba9b 100644 --- a/nezha-fronted/src/components/common/rightBox/dashboardTempBox.vue +++ b/nezha-fronted/src/components/common/rightBox/dashboardTempBox.vue @@ -1,7 +1,7 @@