From 65c07e5a439d6280d8776835adb3b2d388ee01d5 Mon Sep 17 00:00:00 2001
From: "@changcode" <changyongqiang@geedgenetworks.com>
Date: Wed, 8 Sep 2021 16:22:49 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20project=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=BE=A7=E6=BB=91=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=EF=BC=8Csystem=E9=A1=B5=E9=9D=A2=E5=88=97=E8=A1=A8=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=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/stylus/main.scss                    | 3 +++
 .../src/components/common/project/popData/alertTable.vue     | 2 +-
 .../src/components/common/project/popData/assetTable.vue     | 1 +
 .../src/components/common/project/popData/endpointTable.vue  | 1 +
 nezha-fronted/src/components/common/table/nzDataList.vue     | 5 +++--
 .../src/components/page/config/system/apiKeyTab.vue          | 2 +-
 .../src/components/page/config/system/notifyMethodTab.vue    | 2 +-
 7 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/nezha-fronted/src/assets/stylus/main.scss b/nezha-fronted/src/assets/stylus/main.scss
index 2493cac5f..5e656572b 100644
--- a/nezha-fronted/src/assets/stylus/main.scss
+++ b/nezha-fronted/src/assets/stylus/main.scss
@@ -73,6 +73,9 @@ li{
 .margin-r-20 {
   margin-right: 20px !important;
 }
+.project-search.alert-table.asset-table.endpoint-table {
+  margin-right: 0px !important;
+}
 .margin-t-20 {
   margin-top: 20px !important;
 }
diff --git a/nezha-fronted/src/components/common/project/popData/alertTable.vue b/nezha-fronted/src/components/common/project/popData/alertTable.vue
index 8422e6b73..6d58d39c9 100644
--- a/nezha-fronted/src/components/common/project/popData/alertTable.vue
+++ b/nezha-fronted/src/components/common/project/popData/alertTable.vue
@@ -13,7 +13,7 @@
         v-loading="tools.loading"
       >
         <template v-slot:top-tool-right>
-          <el-select v-model="state" class="margin-r-10" size="small" value-key="value" @change="getTableData">
+          <el-select v-model="state" size="small" value-key="value" @change="getTableData">
             <el-option v-for="item in stateOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
           </el-select>
         </template>
diff --git a/nezha-fronted/src/components/common/project/popData/assetTable.vue b/nezha-fronted/src/components/common/project/popData/assetTable.vue
index ea060e61e..c3a3f996a 100644
--- a/nezha-fronted/src/components/common/project/popData/assetTable.vue
+++ b/nezha-fronted/src/components/common/project/popData/assetTable.vue
@@ -10,6 +10,7 @@
         :layout="dataListLayout"
         :search-msg="searchMsg"
         @search="search"
+        :search-right="true"
       >
         <template v-slot:default="slotProps">
           <asset-table
diff --git a/nezha-fronted/src/components/common/project/popData/endpointTable.vue b/nezha-fronted/src/components/common/project/popData/endpointTable.vue
index 21813b065..fd09a6655 100644
--- a/nezha-fronted/src/components/common/project/popData/endpointTable.vue
+++ b/nezha-fronted/src/components/common/project/popData/endpointTable.vue
@@ -9,6 +9,7 @@
         :from="fromRoute.endpoint"
         :layout="['searchInput', 'pagination']"
         :search-msg="searchMsg"
+        :search-right="true"
         @search="search"
       >
         <template  v-slot:default="slotProps">
diff --git a/nezha-fronted/src/components/common/table/nzDataList.vue b/nezha-fronted/src/components/common/table/nzDataList.vue
index 4adc9a8e0..03ca78f7b 100644
--- a/nezha-fronted/src/components/common/table/nzDataList.vue
+++ b/nezha-fronted/src/components/common/table/nzDataList.vue
@@ -10,7 +10,7 @@
             <slot name="top-tool-left"></slot>
           </div>
           <div :class="{'top-tool-main-right-to-left': bottomBox.showSubList}" class="top-tool-right">
-            <div v-if="showLayout.indexOf('searchInput') > -1" class="top-tool-search margin-r-20">
+            <div v-if="showLayout.indexOf('searchInput') > -1" class="top-tool-search margin-r-20" :class="{'project-search alert-table asset-table endpoint-table': searchRight}">
               <search-input ref="searchInput" :from="from" :inTransform="bottomBox.inTransform" :searchMsg="searchMsg" @search="search"></search-input>
             </div>
             <slot name="top-tool-right"></slot>
@@ -91,7 +91,8 @@ export default {
     searchMsg: {
       type: Object
     },
-    nzTableHeightOffset: Number
+    nzTableHeightOffset: Number,
+    searchRight: Boolean
   },
   computed: {
     nzTableHeight () {
diff --git a/nezha-fronted/src/components/page/config/system/apiKeyTab.vue b/nezha-fronted/src/components/page/config/system/apiKeyTab.vue
index 53b42fdd9..f6eb421ce 100644
--- a/nezha-fronted/src/components/page/config/system/apiKeyTab.vue
+++ b/nezha-fronted/src/components/page/config/system/apiKeyTab.vue
@@ -12,7 +12,7 @@
 
       </template>
       <template v-slot:top-tool-right>
-        <button id="api-key-add" v-has="'system_apiKey_add'" :title="$t('config.system.notification.create')" class="top-tool-btn margin-r-10" type="button" @click="addApiKey">
+        <button id="api-key-add" v-has="'system_apiKey_add'" :title="$t('config.system.notification.create')" class="top-tool-btn" type="button" @click="addApiKey">
           <i class="nz-icon-create-square nz-icon"></i>
         </button>
       </template>
diff --git a/nezha-fronted/src/components/page/config/system/notifyMethodTab.vue b/nezha-fronted/src/components/page/config/system/notifyMethodTab.vue
index faaab4045..84d648468 100644
--- a/nezha-fronted/src/components/page/config/system/notifyMethodTab.vue
+++ b/nezha-fronted/src/components/page/config/system/notifyMethodTab.vue
@@ -13,7 +13,7 @@
 
       </template>
       <template v-slot:top-tool-right>
-        <button id="notify-add" v-has="'snmp_mibFile_add'" :title="$t('config.system.notification.create')" class="top-tool-btn margin-r-10" type="button" @click="addNotify">
+        <button id="notify-add" v-has="'snmp_mibFile_add'" :title="$t('config.system.notification.create')" class="top-tool-btn" type="button" @click="addNotify">
           <i class="nz-icon-create-square nz-icon"></i>
         </button>
       </template>