From 6f5016872dea66c24af5c5cdccecef5db6e99054 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=99=B6=E6=99=B6=20=E5=BC=A0?=
 <zhangjingjing@geedgenetworks.com>
Date: Tue, 27 Jul 2021 09:19:44 +0800
Subject: [PATCH] =?UTF-8?q?CN-71=20feat=EF=BC=9A=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=EF=BC=8C=E8=A7=92=E8=89=B2=EF=BC=8Ci18n=EF=BC=8C=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E8=AE=B0=E5=BD=95=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=20=E6=B7=BB=E5=8A=A0=E6=90=9C=E7=B4=A2=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/table/CnDataList.vue | 26 ++++++++++++++------------
 src/mixins/dataList.js              |  7 ++++++-
 src/views/settings/I18n.vue         |  2 +-
 src/views/settings/OperationLog.vue |  1 +
 src/views/settings/Roles.vue        |  1 +
 src/views/settings/User.vue         |  2 +-
 6 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/src/components/table/CnDataList.vue b/src/components/table/CnDataList.vue
index dffb0365..d4bd76e1 100644
--- a/src/components/table/CnDataList.vue
+++ b/src/components/table/CnDataList.vue
@@ -9,9 +9,14 @@
             <slot name="top-tool-left"></slot>
           </div>
           <div class="top-tool-right">
-            <el-input v-model="keyWord" value="keyWord"></el-input>
-            <el-button @click="onSearch" icon="el-icon-search" type="info" size="mini" style="margin-right: 10px"></el-button>
-            <div v-if="showLayout.indexOf('searchInput') > -1" class="top-tool-search margin-r-20"></div>
+            <div style="margin-right: 10px;display: flex">
+              <input type="text" v-model="keyWord"/>
+              <button><i class="el-icon-search" @click="onsearch" ></i></button>
+            </div>
+<!--           <el-input v-model="keyWord" value="keyWord"></el-input>
+            <el-button @click="onsearch" icon="el-icon-search" type="info" size="mini" style="margin-right: 10px"></el-button>-->
+            <div v-if="showLayout.indexOf('searchInput') > -1" class="top-tool-search margin-r-20">
+            </div>
             <slot name="top-tool-right"></slot>
             <button v-if="showLayout.indexOf('elementSet') > -1"  class="top-tool-btn"
                     type="button" @click="tools.showCustomTableTitle = true">
@@ -45,7 +50,6 @@
 <script>
 import columnCustomize from '@/components/table/ColumnCustomize'
 import { fromRoute } from '@/utils/constants'
-import { get } from '@/utils/http'
 
 export default {
   name: 'cnDataList',
@@ -78,20 +82,15 @@ export default {
       tools: {
         showCustomTableTitle: false // 自定义列弹框是否显示
       },
-      showLayout: [],
-      Search:[],
+      showLayout: []
     }
   },
   methods: {
     updateCustomTableTitle (custom) {
       this.$emit('update:customTableTitle', custom)
     },
-    onSearch () {
-      get('sys/log?pageNo=1&pageSize=30').then(res => {
-        if(res.code === 200){
-          this.Search = res.data.list
-        }
-      })
+    onsearch () {
+      this.$emit('search', this.keyWord)
     }
   },
   watch: {
@@ -106,4 +105,7 @@ export default {
 }
 </script>
 <style>
+input:focus{
+  outline: none;
+}
 </style>
diff --git a/src/mixins/dataList.js b/src/mixins/dataList.js
index 75a75951..05b97c3a 100644
--- a/src/mixins/dataList.js
+++ b/src/mixins/dataList.js
@@ -17,7 +17,7 @@ export default {
       pageObj: { // 分页对象
         pageNo: 1,
         pageSize: defaultPageSize,
-        total: 0
+        total: ''
       },
       /* 工具参数 */
       tools: {
@@ -76,6 +76,7 @@ export default {
           }
           this.tableData = response.data.list
           this.pageObj.total = response.data.total
+          this.pageObj.total = ''
           // TODO 回到顶部
         }
       })
@@ -143,6 +144,10 @@ export default {
     tableDataSort (orderBy) {
       this.$set(this.searchLabel, 'orderBy', orderBy)
       this.getTableData()
+    },
+    search (params) {
+      this.pageObj.pageNo = 1
+      this.getTableData({ q: params })
     }
   },
   watch: {
diff --git a/src/views/settings/I18n.vue b/src/views/settings/I18n.vue
index 23295945..25b1c5a7 100644
--- a/src/views/settings/I18n.vue
+++ b/src/views/settings/I18n.vue
@@ -7,6 +7,7 @@
         :api="url"
         :from="fromRoute.user"
         :layout="['columnCustomize','elementSet']"
+        @search="search"
     >
       <template #top-tool-right>
         <button
@@ -81,7 +82,6 @@ export default {
     }
   },
   methods: {
-
   }
 }
 </script>
diff --git a/src/views/settings/OperationLog.vue b/src/views/settings/OperationLog.vue
index 7897290a..b03975b8 100644
--- a/src/views/settings/OperationLog.vue
+++ b/src/views/settings/OperationLog.vue
@@ -23,6 +23,7 @@
           @reload="getTableData"
           @selectionChange="selectionChange"
           @showBottomBox="(targetTab, object) => { $refs.dataList.showBottomBox(targetTab, object) }"></operation-log-table>
+          @search="search"
       </template>
       <!-- 分页组件 -->
       <template #pagination>
diff --git a/src/views/settings/Roles.vue b/src/views/settings/Roles.vue
index 91d553cb..f404f03c 100644
--- a/src/views/settings/Roles.vue
+++ b/src/views/settings/Roles.vue
@@ -7,6 +7,7 @@
             :api="url"
             :from="fromRoute.roles"
             :layout="['columnCustomize','elementSet']"
+            @search="search"
     >
       <template v-slot:top-tool-right>
         <button id="roles-add" v-has="'role_add'" :title="$t('overall.createRole')" class="top-tool-btn margin-r-10"
diff --git a/src/views/settings/User.vue b/src/views/settings/User.vue
index c4480f8b..fcd4cfb4 100644
--- a/src/views/settings/User.vue
+++ b/src/views/settings/User.vue
@@ -7,6 +7,7 @@
       :api="url"
       :from="fromRoute.user"
       :layout="['columnCustomize','elementSet']"
+      @search="search"
     >
       <template #top-tool-right>
         <button
@@ -85,7 +86,6 @@ export default {
     }
   },
   methods: {
-
   }
 }
 </script>