fix(Row): remove row clear when use flex

heyui · Aug 21, 2019 · e13feb3 · e13feb3
1 parent ca15ec1
commit e13feb3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/doc/components/demos/plugins/tree7.vue b/doc/components/demos/plugins/tree7.vue
@@ -1,10 +1,10 @@
 <template>
-  <Row v-height="300" type="flex">
-    <Cell :width="12" class="overflow-y" v-padding="10">
+  <Row type="flex">
+    <Cell v-height="300" :width="12" class="overflow-y" v-padding="10">
       <p>value: {{value1}}</p>
       <Tree config="simple" v-model="value1"></Tree>
     </Cell>
-    <Cell :width="12" class="overflow-y" v-padding="10">
+    <Cell v-height="300" :width="12" class="overflow-y" v-padding="10">
       <p>value: {{value2}}</p>
       <Tree config="simple" multiple v-model="value2"></Tree>
     </Cell>

diff --git a/doc/components_en/demos/plugins/tree7.vue b/doc/components_en/demos/plugins/tree7.vue
@@ -1,12 +1,12 @@
 <template>
-  <Row v-height="300" type="flex">
-    <Cell :width="12" class="overflow-y" v-padding="10">
-    <p>value: {{value1}}</p>
-    <Tree config="simple" v-model="value1"></Tree>
+  <Row type="flex">
+    <Cell v-height="300" :width="12" class="overflow-y" v-padding="10">
+      <p>value: {{value1}}</p>
+      <Tree config="simple" v-model="value1"></Tree>
     </Cell>
-    <Cell :width="12" class="overflow-y" v-padding="10">
-    <p>value: {{value2}}</p>
-    <Tree config="simple" multiple v-model="value2"></Tree>
+    <Cell v-height="300" :width="12" class="overflow-y" v-padding="10">
+      <p>value: {{value2}}</p>
+      <Tree config="simple" multiple v-model="value2"></Tree>
     </Cell>
   </Row>
 </template>

diff --git a/src/components/row/row.vue b/src/components/row/row.vue
@@ -2,7 +2,7 @@
   <div :class="classes"
        :style="styles">
     <slot></slot>
-    <div class="h-row-clear"></div>
+    <div class="h-row-clear" v-if="type!='flex'"></div>
   </div>
 </template>
 <script>