From 4349c24eb9cbea1823ac8cae5b88fe9d786bee34 Mon Sep 17 00:00:00 2001
From: KangChun <97212897+Springrx@users.noreply.github.com>
Date: Mon, 18 Mar 2024 15:30:18 +0800
Subject: [PATCH] fix URL displayed (#833)

* fix the inconsistency in the truncation length of the URL displayed on the inspector page

* fix the inconsistency in the truncation length of the URL displayed on the inspector page

* fix the url displayed on the inspector page
---
 frontend/src/views/inspector/FlowList.vue | 35 +++++++++++++++++++++--
 lyrebird/version.py                       |  2 +-
 2 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/frontend/src/views/inspector/FlowList.vue b/frontend/src/views/inspector/FlowList.vue
index b44f5470..e9881915 100644
--- a/frontend/src/views/inspector/FlowList.vue
+++ b/frontend/src/views/inspector/FlowList.vue
@@ -98,7 +98,7 @@
 
       <template v-slot:item.request="{ item }">
         <v-row class="my-0 ml-0 mr-1">
-          <span class="flow-list-item-url">
+          <span class="flow-list-item-url" :style="{maxWidth:urlMaxWidth+'px'}">
             <span>{{ item.request.scheme }}</span>
             <span v-if="item.request.scheme">://</span>
 
@@ -193,6 +193,8 @@ export default {
   },
   data () {
     return {
+      urlMaxWidth:0,
+      resizeObserver:null,
       tableSize: {
         width: 0,
         height: 0,
@@ -272,6 +274,7 @@ export default {
       }, 1000)
   },
   mounted () {
+    this.initResizeObserver();
     // The maximum number of clicks per second is limited to 4 times. 
     // Too high click frequency may cause jumping if the refresh is not timely
     this.debouncedKeyboardSelectFlow = debounce(this.keyboardSelctFlow, 250);
@@ -279,6 +282,9 @@ export default {
   },
   beforeDestroy () {
     document.removeEventListener('keydown', this.debouncedKeyboardSelectFlow);
+    if (this.resizeObserver) {
+      this.resizeObserver.disconnect();
+    }
   },
   destroyed () {
     this.$io.removeListener('action', this.resetRefreshGapTime)
@@ -331,6 +337,32 @@ export default {
       this.refreshGapTime = 1
       this.lastRefreshTime = 1
     },
+    initResizeObserver() {
+      const tableWrapper = this.$el.querySelector('.v-data-table__wrapper');
+      if (tableWrapper) {
+        const debouncedCalculateUrlMaxWidth = debounce((width) => {
+          this.calculateUrlMaxWidth(width);
+        }, 250);
+        this.resizeObserver = new ResizeObserver(entries => {
+          for (let entry of entries) {
+            debouncedCalculateUrlMaxWidth(entry.contentRect.width);
+          }
+        });
+        this.resizeObserver.observe(tableWrapper);
+      }
+    },
+    calculateUrlMaxWidth(tableWidth){
+      /* widths of fixed columns
+      source: 105px
+      method: 60px
+      status: 50px
+      start_time: 70px
+      duration: 70px
+      size: 70px
+      */
+      const otherColumnsWidth=105+60+50+70+70+70;
+      this.urlMaxWidth=tableWidth-otherColumnsWidth
+    },
     onTableResize () {
       const height = window.innerHeight - 44 - 40 - 12 - 26 - 7 - 1 - 8 - 32 - 12 - 12 - 28
       /* reset table height
@@ -593,7 +625,6 @@ export default {
 .flow-list-item-url {
   display: inline-block;
   word-break: keep-all;
-  max-width: 900px;
   width: calc(100% - 100px);
   white-space: nowrap;
   overflow: hidden;
diff --git a/lyrebird/version.py b/lyrebird/version.py
index e11292d0..869b45fc 100644
--- a/lyrebird/version.py
+++ b/lyrebird/version.py
@@ -1,3 +1,3 @@
-IVERSION = (2, 25, 3)
+IVERSION = (2, 25, 4)
 VERSION = ".".join(str(i) for i in IVERSION)
 LYREBIRD = "Lyrebird " + VERSION