From c62248fdaf4eb4cc632a880a7ac48145a934da94 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 19 Mar 2019 21:56:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BA=86=20clearfix=20?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E7=9A=84=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 4b9e48e57fa9a3aa679bbeb8029d3f28de61e27e [formerly 4b9e48e57fa9a3aa679bbeb8029d3f28de61e27e [formerly 4b9e48e57fa9a3aa679bbeb8029d3f28de61e27e [formerly 4b9e48e57fa9a3aa679bbeb8029d3f28de61e27e [formerly 33899ac6fd09a122ad71dbd89363e90cad5071aa [formerly 27c82ded5d78e431bb710b7bf1a699b70675289f]]]]]
Former-commit-id: 61eea194c45605f39985af151bac028d29d5855b
Former-commit-id: cd9b4b0fa53307068919a15fad8bf18dd616fd12
Former-commit-id: 84785db7c037f1590a283ed91a6a257f581619ee [formerly da6799054002c4eb3a598c6449e3bd108318bff8]
Former-commit-id: 71904e17a21b6db3bdbf8e0aaa346fb2570c16ff
Former-commit-id: 11b3e68c88f4b37ead0bf1811acf912a81da28ff
Former-commit-id: e6826aea1605f350672b21ab7f6a19ef29edd4fb
Former-commit-id: 656e5e672c0a8c037771b085c3bba1135a4f84f0
Former-commit-id: a1ecd8c27ceff6d1dcd6e79ce6687ff20bc5c5b6
---
 src/assets/style/public-class.scss                        | 8 --------
 src/components/d2-icon-select/index.vue                   | 4 ++--
 src/components/d2-icon-svg-select/index.vue               | 6 ++----
 .../demo/plugins/mock/components/d2-demo-mock-card.vue    | 4 ++--
 src/views/system/log/index.vue                            | 3 +++
 5 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/src/assets/style/public-class.scss b/src/assets/style/public-class.scss
index dc41e4e6..a851d827 100644
--- a/src/assets/style/public-class.scss
+++ b/src/assets/style/public-class.scss
@@ -34,14 +34,6 @@
 .#{$prefix}-fr {
   float: right;
 }
-.#{$prefix}-clearfix:before,
-.#{$prefix}-clearfix:after {
-  display: table;
-  content: "";
-}
-.#{$prefix}-clearfix:after {
-  clear: both
-}
 
 // 边距相关
 $sizes: (0, 5, 10, 15, 20);
diff --git a/src/components/d2-icon-select/index.vue b/src/components/d2-icon-select/index.vue
index 18db2fc8..1b215cf9 100644
--- a/src/components/d2-icon-select/index.vue
+++ b/src/components/d2-icon-select/index.vue
@@ -6,7 +6,7 @@
       :placement="placement"
       width="300"
       trigger="click">
-      <div class="d2-clearfix d2-mb-10" v-if="clearable">
+      <el-row type="flex" justify="end" class="d2-mb-10" v-if="clearable">
         <el-button
           type="danger"
           icon="el-icon-delete"
@@ -15,7 +15,7 @@
           @click="selectIcon()">
           清空
         </el-button>
-      </div>
+      </el-row>
       <el-input
         v-model="searchText"
         :clearable="true"
diff --git a/src/components/d2-icon-svg-select/index.vue b/src/components/d2-icon-svg-select/index.vue
index 1ed98438..8a88eaa5 100644
--- a/src/components/d2-icon-svg-select/index.vue
+++ b/src/components/d2-icon-svg-select/index.vue
@@ -6,9 +6,7 @@
       :placement="placement"
       width="300"
       trigger="click">
-      <div
-        class="d2-clearfix d2-mb-10"
-        v-if="clearable">
+      <el-row type="flex" justify="end" class="d2-mb-10" v-if="clearable">
         <el-button
           type="danger"
           icon="el-icon-delete"
@@ -17,7 +15,7 @@
           @click="selectIcon()">
           清空
         </el-button>
-      </div>
+      </el-row>
       <el-input
         v-model="searchText"
         :clearable="true"
diff --git a/src/views/demo/plugins/mock/components/d2-demo-mock-card.vue b/src/views/demo/plugins/mock/components/d2-demo-mock-card.vue
index 1bb290fa..5005699d 100644
--- a/src/views/demo/plugins/mock/components/d2-demo-mock-card.vue
+++ b/src/views/demo/plugins/mock/components/d2-demo-mock-card.vue
@@ -1,11 +1,11 @@
 <template>
   <el-card shadow="never" class="d2-mb">
-    <div slot="header" class="d2-clearfix">
+    <el-row type="flex" justify="end" slot="header">
       <el-button type="text" size="mini">{{title}}</el-button>
       <el-tooltip content="重新 mock 数据" placement="top-end">
         <el-button type="primary" size="mini" @click="$emit('reload')" class="d2-fr">刷新</el-button>
       </el-tooltip>
-    </div>
+    </el-row>
     <el-row :gutter="10">
       <el-col :span="12">
         <div class="col col-l">
diff --git a/src/views/system/log/index.vue b/src/views/system/log/index.vue
index ed6cceac..24b1b727 100644
--- a/src/views/system/log/index.vue
+++ b/src/views/system/log/index.vue
@@ -16,6 +16,9 @@
         <span class="log-message">{{log.message}}</span>
       </p>
     </section>
+    <template slot="footer">
+      <span>{{list.length}}条记录</span>
+    </template>
   </d2-container>
 </template>