From 0318f55322fc1df734a4e7f9dc1ded3fa1c3d702 Mon Sep 17 00:00:00 2001
From: "Sijie.Sun" <sunsijie@buaa.edu.cn>
Date: Wed, 12 Mar 2025 10:36:54 +0800
Subject: [PATCH] add serde default to NetworkConfig (#675)

* add serde default to NetworkConfig

* set base z-index of event-dialog
---
 easytier-web/frontend-lib/src/components/Status.vue | 9 +++++----
 easytier-web/frontend/src/components/DeviceList.vue | 2 +-
 easytier/build.rs                                   | 1 +
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/easytier-web/frontend-lib/src/components/Status.vue b/easytier-web/frontend-lib/src/components/Status.vue
index ccf017b..b99fb5a 100644
--- a/easytier-web/frontend-lib/src/components/Status.vue
+++ b/easytier-web/frontend-lib/src/components/Status.vue
@@ -303,14 +303,15 @@ function showEventLogs() {
 
 <template>
   <div class="frontend-lib">
-    <Dialog v-model:visible="dialogVisible" modal :header="t(dialogHeader)" class="w-2/3 h-auto max-w-full">
+    <Dialog v-model:visible="dialogVisible" modal :header="t(dialogHeader)" class="w-2/3 h-auto max-w-full"
+      :baseZIndex="2000">
       <ScrollPanel v-if="dialogHeader === 'vpn_portal_config'">
         <pre>{{ dialogContent }}</pre>
       </ScrollPanel>
       <Timeline v-else :value="dialogContent">
         <template #opposite="slotProps">
           <small class="text-surface-500 dark:text-surface-400">{{ useTimeAgo(Date.parse(slotProps.item.time))
-            }}</small>
+          }}</small>
         </template>
         <template #content="slotProps">
           <HumanEvent :event="slotProps.item.event" />
@@ -366,7 +367,7 @@ function showEventLogs() {
 
           <div class="flex flex-row items-center flex-wrap w-full max-h-40 overflow-scroll">
             <Chip v-for="(chip, i) in myNodeInfoChips" :key="i" :label="chip.label" :icon="chip.icon"
-                  class="mr-2 mt-2 text-sm" />
+              class="mr-2 mt-2 text-sm" />
           </div>
 
           <div v-if="myNodeInfo" class="m-0 flex flex-row justify-center gap-x-5 text-sm">
@@ -387,7 +388,7 @@ function showEventLogs() {
           <Column :header="t('hostname')">
             <template #body="slotProps">
               <div v-if="!slotProps.data.route.cost || !slotProps.data.route.feature_flag.is_public_server"
-                   v-tooltip="slotProps.data.route.hostname">
+                v-tooltip="slotProps.data.route.hostname">
                 {{
                   slotProps.data.route.hostname }}
               </div>
diff --git a/easytier-web/frontend/src/components/DeviceList.vue b/easytier-web/frontend/src/components/DeviceList.vue
index 50c36be..2b6bd61 100644
--- a/easytier-web/frontend/src/components/DeviceList.vue
+++ b/easytier-web/frontend/src/components/DeviceList.vue
@@ -102,7 +102,7 @@ const selectedDeviceHostname = computed<string | undefined>(() => {
     </DataTable>
 
     <Drawer v-model:visible="deviceManageVisible" :header="`Manage ${selectedDeviceHostname}`" position="right"
-        class="w-3/5 min-w-96">
+        :baseZIndex=1000 class="w-3/5 min-w-96">
         <RouterView v-slot="{ Component }">
             <component :is="Component" :api="api" :deviceList="deviceList" @update="loadDevices" />
         </RouterView>
diff --git a/easytier/build.rs b/easytier/build.rs
index 489a234..39e0621 100644
--- a/easytier/build.rs
+++ b/easytier/build.rs
@@ -156,6 +156,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         .type_attribute("peer_rpc.PeerInfoForGlobalMap", "#[derive(Hash)]")
         .type_attribute("peer_rpc.ForeignNetworkRouteInfoKey", "#[derive(Hash, Eq)]")
         .type_attribute("common.RpcDescriptor", "#[derive(Hash, Eq)]")
+        .field_attribute(".web.NetworkConfig", "#[serde(default)]")
         .service_generator(Box::new(rpc_build::ServiceGenerator::new()))
         .btree_map(["."]);