From 41fca73cadad17cd951cfc08179e7dd19b6ba494 Mon Sep 17 00:00:00 2001
From: chenjinsong <523037378@qq.com>
Date: Tue, 25 May 2021 16:13:59 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-665=20fix:=20=E5=88=97=E5=AE=BD=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/table/alert/alertMessageTable.vue     |  2 +-
 .../common/table/alert/alertRuleTable.vue        |  2 ++
 .../common/table/asset/assetMetaTable.vue        | 14 +++++++++-----
 .../common/table/settings/modelTable.vue         | 16 ++++++++--------
 .../common/table/settings/moduleTable.vue        | 10 +++++-----
 5 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue b/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
index cddd27a8c..477e0e14c 100644
--- a/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
+++ b/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
@@ -168,7 +168,7 @@ export default {
           label: 'ID',
           prop: 'id',
           show: true,
-          width: 80,
+          width: 160,
           sortable: 'custom'
         }, {
           label: this.$t('alert.rule'),
diff --git a/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue b/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue
index a96468abf..a5d476290 100644
--- a/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue
+++ b/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue
@@ -4,6 +4,7 @@
     ref="dataTable"
     :data="tableData"
     :height="height"
+    tooltip-effect="light"
     border
     @header-dragend="dragend"
     @sort-change="tableDataSort"
@@ -27,6 +28,7 @@
       :sort-orders="['ascending', 'descending']"
       :sortable="item.sortable"
       :width="`${item.width}`"
+      :show-overflow-tooltip="item.prop === 'description'"
       class="data-column"
     >
       <template slot="header">
diff --git a/nezha-fronted/src/components/common/table/asset/assetMetaTable.vue b/nezha-fronted/src/components/common/table/asset/assetMetaTable.vue
index d13fdefd4..b2ef2e5fa 100644
--- a/nezha-fronted/src/components/common/table/asset/assetMetaTable.vue
+++ b/nezha-fronted/src/components/common/table/asset/assetMetaTable.vue
@@ -95,34 +95,38 @@ export default {
           prop: 'id',
           show: true,
           width: 80,
-          sortable:'custom'
+          sortable: 'custom'
         }, {
           label: this.$t('config.assetLabel.name'),
           prop: 'name',
           show: true,
-          width: 100,
-          sortable:'custom'
+          sortable: 'custom'
         }, {
           label: this.$t('config.assetLabel.key'),
           prop: 'metaKey',
           show: true,
-          sortable:'custom'
+          width: 200,
+          sortable: 'custom'
         }, {
           label: this.$t('config.assetLabel.group'),
           prop: 'group',
           show: true,
-          sortable:'custom'
+          width: 200,
+          sortable: 'custom'
         }, {
           label: this.$t('config.assetLabel.search'),
           prop: 'search',
+          width: 120,
           show: true
         }, {
           label: this.$t('config.assetLabel.display'),
           prop: 'display',
+          width: 120,
           show: true
         }, {
           label: this.$t('config.assetLabel.type'),
           prop: 'type',
+          width: 150,
           show: true
         }, {
           label: this.$t('config.assetLabel.params'),
diff --git a/nezha-fronted/src/components/common/table/settings/modelTable.vue b/nezha-fronted/src/components/common/table/settings/modelTable.vue
index b5a0862c9..a66a5c3a9 100644
--- a/nezha-fronted/src/components/common/table/settings/modelTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/modelTable.vue
@@ -95,24 +95,24 @@ export default {
           label: this.$t('config.model.name'),
           prop: 'name',
           show: true,
-          width: 450,
+          width: 350,
           sortable: 'custom'
         }, {
           label: this.$t('config.model.brand'),
           prop: 'brand',
           show: true,
-          width: 160,
+          width: 200,
+          sortable: 'custom'
+        }, {
+          label: this.$t('config.model.assetNum'),
+          prop: 'assetNum',
+          show: true,
+          width: 120,
           sortable: 'custom'
         }, {
           label: this.$t('config.model.remark'),
           prop: 'remark',
           show: true
-        }, {
-          label: this.$t('config.model.assetNum'),
-          prop: 'assetNum',
-          show: true,
-          width: 200,
-          sortable: 'custom'
         }
       ]
     }
diff --git a/nezha-fronted/src/components/common/table/settings/moduleTable.vue b/nezha-fronted/src/components/common/table/settings/moduleTable.vue
index d1daa779e..0643e36e1 100644
--- a/nezha-fronted/src/components/common/table/settings/moduleTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/moduleTable.vue
@@ -104,31 +104,31 @@ export default {
           label: this.$t('project.module.type'),
           prop: 'type',
           show: false,
-          width: 150
+          width: 200
         }, {
           label: this.$t('project.project.projectName'),
           prop: 'project',
           show: true,
-          width: 150,
+          width: 200,
           sortable: 'custom'
         },
         {
           label: this.$t('project.endpoint.endpoint'),
           prop: 'endpointNum',
           show: true,
-          width: 150,
+          width: 200,
           sortable: 'custom'
         }, {
           label: this.$t('project.module.alerts'),
           prop: 'alertNum',
           show: true,
-          width: 150,
+          width: 200,
           sortable: 'custom'
         },
         {
           label: this.$t('overall.remark'),
           prop: 'remark',
-          show: false,
+          show: true,
           minWidth: 150
         }
       ]