From 3e85fbde03e2987d1509d86f9dfb2bb1ddc2fe70 Mon Sep 17 00:00:00 2001
From: likexuan <likexuan@geedgenetworks.com>
Date: Mon, 27 Mar 2023 16:04:50 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-2734=20fix:=20=E8=A7=A3=E5=86=B3=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=E6=8F=8F=E8=BF=B0=E5=88=97=E8=A1=A8=E5=8D=95=E8=AF=8D?=
 =?UTF-8?q?=E6=8D=A2=E8=A1=8C=E6=88=AA=E6=96=AD=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/assets/css/common/tableCommon.scss       | 7 +++++++
 .../src/assets/css/components/page/tool/ping.scss          | 1 +
 .../src/assets/css/components/page/tool/trace.scss         | 1 +
 .../components/common/table/alert/alertMessageTable.vue    | 6 +-----
 .../components/common/table/alert/alertSilenceTable.vue    | 2 +-
 .../src/components/common/table/settings/cabinetTable.vue  | 2 +-
 .../components/common/table/settings/credentialsTable.vue  | 4 ++--
 .../common/table/settings/dashboardTmplTable.vue           | 2 +-
 .../src/components/common/table/settings/exprTmplTable.vue | 2 +-
 .../components/common/table/settings/ipDetailsTable.vue    | 2 +-
 .../src/components/common/table/settings/ipamTable.vue     | 2 +-
 .../src/components/common/table/settings/mibTable.vue      | 2 +-
 .../src/components/common/table/settings/modelTable.vue    | 2 +-
 .../src/components/common/table/settings/moduleTable.vue   | 2 +-
 .../components/common/table/settings/recordRuleTable.vue   | 2 +-
 .../src/components/common/table/settings/roleTable.vue     | 2 +-
 nezha-fronted/src/components/page/config/mibBrowser.vue    | 2 +-
 .../src/components/page/config/system/selfApiKeyTable.vue  | 4 ++--
 18 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/nezha-fronted/src/assets/css/common/tableCommon.scss b/nezha-fronted/src/assets/css/common/tableCommon.scss
index 8b54762a4..3d02d085f 100644
--- a/nezha-fronted/src/assets/css/common/tableCommon.scss
+++ b/nezha-fronted/src/assets/css/common/tableCommon.scss
@@ -597,3 +597,10 @@
   line-height: 1;
   height: 16px;
 }
+
+.nz-table-list .el-table__body{
+  .el-table-remark{
+    word-wrap: break-word;
+    word-break: keep-all
+  }
+}
diff --git a/nezha-fronted/src/assets/css/components/page/tool/ping.scss b/nezha-fronted/src/assets/css/components/page/tool/ping.scss
index 656904035..d22e7db59 100644
--- a/nezha-fronted/src/assets/css/components/page/tool/ping.scss
+++ b/nezha-fronted/src/assets/css/components/page/tool/ping.scss
@@ -469,6 +469,7 @@ td.el-table__expanded-cell:hover {
         align-items: center;
         justify-content: center;
         font-size: 14px;
+        margin-left: 3px;
       }
     }
   }
diff --git a/nezha-fronted/src/assets/css/components/page/tool/trace.scss b/nezha-fronted/src/assets/css/components/page/tool/trace.scss
index edfb371d3..d21cb1963 100644
--- a/nezha-fronted/src/assets/css/components/page/tool/trace.scss
+++ b/nezha-fronted/src/assets/css/components/page/tool/trace.scss
@@ -213,6 +213,7 @@
                 align-items: center;
                 justify-content: center;
                 font-size: 14px;
+                margin-left: 3px;
               }
             }
           }
diff --git a/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue b/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
index 4633cfd88..96ddd070b 100644
--- a/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
+++ b/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
@@ -51,11 +51,7 @@
             </div>
           </template>
           <template v-else-if="item.prop === 'description'">
-            <template v-if="scope.row[item.prop]">{{scope.row[item.prop]}}</template>
-            <span v-else>-</span>
-          </template>
-          <template v-else-if="item.prop === 'remark'">
-            <template v-if="scope.row[item.prop]">{{scope.row[item.prop]}}</template>
+            <span v-if="scope.row[item.prop]" class="el-table-remark">{{scope.row[item.prop]}}</span>
             <span v-else>-</span>
           </template>
           <span v-else-if="item.prop === 'severityId'&&scope.row['severity']" class="severity">
diff --git a/nezha-fronted/src/components/common/table/alert/alertSilenceTable.vue b/nezha-fronted/src/components/common/table/alert/alertSilenceTable.vue
index d526e0d9b..5ded9f04a 100644
--- a/nezha-fronted/src/components/common/table/alert/alertSilenceTable.vue
+++ b/nezha-fronted/src/components/common/table/alert/alertSilenceTable.vue
@@ -103,7 +103,7 @@
                   </template>
               </copy>
         </template>
-        <span v-else-if="scope.row[item.prop]">{{
+        <span v-else-if="scope.row[item.prop]" :class="item.prop === 'remark'? 'el-table-remark':''">{{
           scope.row[item.prop] || "-"
         }}</span>
         <template v-else>-</template>
diff --git a/nezha-fronted/src/components/common/table/settings/cabinetTable.vue b/nezha-fronted/src/components/common/table/settings/cabinetTable.vue
index 81f5faac8..dadc8ed6f 100644
--- a/nezha-fronted/src/components/common/table/settings/cabinetTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/cabinetTable.vue
@@ -22,7 +22,7 @@
       :key="`col-${index}`"
       :label="item.label">
       <template slot-scope="scope" :column="item">
-        <template v-if="scope.row[item.prop]">{{scope.row[item.prop]}}</template>
+        <span v-if="scope.row[item.prop]" :class="item.prop === 'remark'? 'el-table-remark':''">{{scope.row[item.prop]}}</span>
         <template v-else>-</template>
       </template>
     </el-table-column>
diff --git a/nezha-fronted/src/components/common/table/settings/credentialsTable.vue b/nezha-fronted/src/components/common/table/settings/credentialsTable.vue
index 824622d72..cf5dcbeb4 100644
--- a/nezha-fronted/src/components/common/table/settings/credentialsTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/credentialsTable.vue
@@ -61,9 +61,9 @@
           <template v-else>-</template>
         </template>
         <template v-if="item.prop === 'remark'">
-          <template v-if="scope.row.remark">
+          <span v-if="scope.row.remark" class="el-table-remark">
             {{scope.row.remark}}
-          </template>
+          </span>
           <template v-else>-</template>
         </template>
       </template>
diff --git a/nezha-fronted/src/components/common/table/settings/dashboardTmplTable.vue b/nezha-fronted/src/components/common/table/settings/dashboardTmplTable.vue
index 1d92f0aec..1c4e81369 100644
--- a/nezha-fronted/src/components/common/table/settings/dashboardTmplTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/dashboardTmplTable.vue
@@ -48,7 +48,7 @@
             </template>
           </copy>
         </template>
-        <span v-else-if="scope.row[item.prop]">{{scope.row[item.prop] || '-'}}</span>
+        <span v-else-if="scope.row[item.prop]" :class="item.prop === 'remark'? 'el-table-remark':''">{{scope.row[item.prop] || '-'}}</span>
         <template v-else>-</template>
       </template>
     </el-table-column>
diff --git a/nezha-fronted/src/components/common/table/settings/exprTmplTable.vue b/nezha-fronted/src/components/common/table/settings/exprTmplTable.vue
index 032058b98..9a57aac59 100644
--- a/nezha-fronted/src/components/common/table/settings/exprTmplTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/exprTmplTable.vue
@@ -49,7 +49,7 @@
                   </template>
               </copy>
           </template>
-        <span v-else-if="scope.row[item.prop]">{{scope.row[item.prop] || '-'}}</span>
+        <span v-else-if="scope.row[item.prop]" :class="item.prop === 'remark'? 'el-table-remark':''">{{scope.row[item.prop] || '-'}}</span>
         <template v-else>-</template>
       </template>
     </el-table-column>
diff --git a/nezha-fronted/src/components/common/table/settings/ipDetailsTable.vue b/nezha-fronted/src/components/common/table/settings/ipDetailsTable.vue
index ab51f1dd5..25bbbbc93 100644
--- a/nezha-fronted/src/components/common/table/settings/ipDetailsTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/ipDetailsTable.vue
@@ -49,7 +49,7 @@
             {{ 'Used' }}
           </div>
         </template>
-        <template v-else-if="scope.row[item.prop]">{{scope.row[item.prop]}}</template>
+        <span v-else-if="scope.row[item.prop]" :class="item.prop === 'remark'? 'el-table-remark':''">{{scope.row[item.prop]}}</span>
         <template v-else>-</template>
       </template>
     </el-table-column>
diff --git a/nezha-fronted/src/components/common/table/settings/ipamTable.vue b/nezha-fronted/src/components/common/table/settings/ipamTable.vue
index e52119076..3d73da16d 100644
--- a/nezha-fronted/src/components/common/table/settings/ipamTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/ipamTable.vue
@@ -53,7 +53,7 @@
                   </template>
               </copy>
           </template>
-        <span v-else-if="scope.row[item.prop]">{{scope.row[item.prop]}}</span>
+        <span v-else-if="scope.row[item.prop]" :class="item.prop === 'remark'? 'el-table-remark':''">{{scope.row[item.prop]}}</span>
         <span v-else>-</span>
       </template>
     </el-table-column>
diff --git a/nezha-fronted/src/components/common/table/settings/mibTable.vue b/nezha-fronted/src/components/common/table/settings/mibTable.vue
index 0f4f5d8bd..294c6ae61 100644
--- a/nezha-fronted/src/components/common/table/settings/mibTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/mibTable.vue
@@ -78,7 +78,7 @@
           </div>
         </template>
         <span v-else-if="item.prop === 'updateAt'">{{utcTimeToTimezoneStr(scope.row[item.prop])}}</span>
-        <template v-else-if="scope.row[item.prop]">{{scope.row[item.prop]}}</template>
+        <span v-else-if="scope.row[item.prop]" :class="item.prop === 'remark'? 'el-table-remark':''">{{scope.row[item.prop]}}</span>
         <template v-else>-</template>
       </template>
     </el-table-column>
diff --git a/nezha-fronted/src/components/common/table/settings/modelTable.vue b/nezha-fronted/src/components/common/table/settings/modelTable.vue
index 1a29e7c5b..a9adfff47 100644
--- a/nezha-fronted/src/components/common/table/settings/modelTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/modelTable.vue
@@ -74,7 +74,7 @@
           {{scope.row[item.prop]}}
           </span>
         </template>
-        <span v-else-if="scope.row[item.prop]">{{scope.row[item.prop]}}</span>
+        <span v-else-if="scope.row[item.prop]" :class="item.prop === 'remark'? 'el-table-remark':''">{{scope.row[item.prop]}}</span>
         <span v-else>-</span>
       </template>
     </el-table-column>
diff --git a/nezha-fronted/src/components/common/table/settings/moduleTable.vue b/nezha-fronted/src/components/common/table/settings/moduleTable.vue
index d5a489706..d26473355 100644
--- a/nezha-fronted/src/components/common/table/settings/moduleTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/moduleTable.vue
@@ -80,7 +80,7 @@
           {{scope.row.dashboard ? scope.row.dashboard.name : '-'}}
         </template>
         <span v-else-if="item.prop === 'id'" :id="'globalSearch' + scope.row.id">{{scope.row[item.prop]}}</span>
-        <span v-else-if="scope.row[item.prop]">{{scope.row[item.prop]}}</span>
+        <span v-else-if="scope.row[item.prop]" :class="item.prop === 'remark'? 'el-table-remark':''">{{scope.row[item.prop]}}</span>
         <span v-else>-</span>
       </template>
     </el-table-column>
diff --git a/nezha-fronted/src/components/common/table/settings/recordRuleTable.vue b/nezha-fronted/src/components/common/table/settings/recordRuleTable.vue
index f179048c6..a1175aa9f 100644
--- a/nezha-fronted/src/components/common/table/settings/recordRuleTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/recordRuleTable.vue
@@ -87,7 +87,7 @@
         </template>
 
         <template v-else-if="item.prop === 'remark'">
-          <template>{{scope.row[item.prop] ? scope.row[item.prop] : '-'}}</template>
+          <span class="el-table-remark">{{scope.row[item.prop] ? scope.row[item.prop] : '-'}}</span>
         </template>
         <template v-else-if="item.prop === 'state'">
            <div v-if="scope.row[item.prop] == '1'">
diff --git a/nezha-fronted/src/components/common/table/settings/roleTable.vue b/nezha-fronted/src/components/common/table/settings/roleTable.vue
index c6d68d596..e2486d857 100644
--- a/nezha-fronted/src/components/common/table/settings/roleTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/roleTable.vue
@@ -51,7 +51,7 @@
               </copy>
           </template>
         </template>
-        <span v-else-if="scope.row[item.prop]">{{scope.row[item.prop]}}</span>
+        <span v-else-if="scope.row[item.prop]" :class="item.prop === 'remark'? 'el-table-remark':''">{{scope.row[item.prop]}}</span>
         <span v-else>-</span>
       </template>
     </el-table-column>
diff --git a/nezha-fronted/src/components/page/config/mibBrowser.vue b/nezha-fronted/src/components/page/config/mibBrowser.vue
index 55ed8d79e..75e2d414c 100644
--- a/nezha-fronted/src/components/page/config/mibBrowser.vue
+++ b/nezha-fronted/src/components/page/config/mibBrowser.vue
@@ -126,7 +126,7 @@
               </div>
               <div class="mib-browser-detail-row">
                 <div>Description</div>
-                <div>{{currentWalk.description}}</div>
+                <div class="el-table-remark">{{currentWalk.description}}</div>
               </div>
             </div>
           </div>
diff --git a/nezha-fronted/src/components/page/config/system/selfApiKeyTable.vue b/nezha-fronted/src/components/page/config/system/selfApiKeyTable.vue
index 1ae6abade..a8434dea2 100644
--- a/nezha-fronted/src/components/page/config/system/selfApiKeyTable.vue
+++ b/nezha-fronted/src/components/page/config/system/selfApiKeyTable.vue
@@ -52,9 +52,9 @@
             <template v-if="item.prop == 'createAt'">
               {{scope.row[item.prop]?utcTimeToTimezoneStr(scope.row[item.prop]):'-'}}
             </template>
-             <template v-if="item.prop == 'remark'">
+             <span v-if="item.prop == 'remark'" class="el-table-remark">
               {{scope.row[item.prop]?scope.row[item.prop]:'-'}}
-            </template>
+            </span>
         </template>
       </el-table-column>
       <el-table-column