删除了 clearfix 相关的代码

d2-projects · Mar 19, 2019 · 088d0ea · 088d0ea
1 parent 619976d
commit 088d0ea
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 16 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -16,6 +16,9 @@
         <span class="log-message">{{log.message}}</span>
       </p>
     </section>
+    <template slot="footer">
+      <span>{{list.length}}条记录</span>
+    </template>
   </d2-container>
 </template>