From 9d623a6196236497bd0579f8394ea09847a588a3 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Tue, 24 Apr 2018 08:38:26 +0800
Subject: [PATCH] [Improvement] Cell: optimize flex layout (#919)

---
 docs/demos/views/list.vue              |  2 +-
 packages/cell-group/index.vue          |  2 +-
 packages/cell/index.vue                | 29 +++++++++-----------
 packages/mixins/bem.js                 |  2 +-
 packages/vant-css/src/address-edit.css |  2 +-
 packages/vant-css/src/cell.css         | 37 ++++++++++++--------------
 packages/vant-css/src/field.css        |  2 +-
 packages/vant-css/src/sku.css          |  2 +-
 8 files changed, 36 insertions(+), 42 deletions(-)

diff --git a/docs/demos/views/list.vue b/docs/demos/views/list.vue
index c720eb45d..3a5b50e96 100644
--- a/docs/demos/views/list.vue
+++ b/docs/demos/views/list.vue
@@ -65,7 +65,7 @@ export default {
 <style lang="postcss">
 .demo-list {
   .van-cell {
-    justify-content: center;
+    text-align: center;
   }
 
   .page-desc {
diff --git a/packages/cell-group/index.vue b/packages/cell-group/index.vue
index ff5d6d81d..717b58e21 100644
--- a/packages/cell-group/index.vue
+++ b/packages/cell-group/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="van-cell-group" :class="{ 'van-hairline--top-bottom': border }">
+  <div :class="[b(), { 'van-hairline--top-bottom': border }]">
     <slot />
   </div>
 </template>
diff --git a/packages/cell/index.vue b/packages/cell/index.vue
index 9f21c42eb..a80788cea 100644
--- a/packages/cell/index.vue
+++ b/packages/cell/index.vue
@@ -1,37 +1,34 @@
 <template>
   <div
-    class="van-cell"
-    :class="{
-      'van-hairline': border,
-      'van-cell--center': center,
-      'van-cell--required': required,
-      'van-cell--clickable': isLink || clickable
-    }"
+    :class="[
+      b({
+        center,
+        required,
+        clickable: isLink || clickable
+      }),
+      { 'van-hairline': border }
+    ]"
     @click="onClick"
   >
     <slot name="icon">
-      <icon v-if="icon" class="van-cell__left-icon" :name="icon" />
+      <icon v-if="icon" :class="b('left-icon')" :name="icon" />
     </slot>
-    <div class="van-cell__title" v-if="title || $slots.title">
+    <div v-if="title || $slots.title" :class="b('title')">
       <slot name="title">
         <span v-text="title" />
-        <div class="van-cell__label" v-if="label" v-text="label" />
+        <div v-if="label" v-text="label" :class="b('label')" />
       </slot>
     </div>
     <div
-      class="van-cell__value"
       v-if="value || $slots.default"
-      :class="{
-        'van-cell__value--link': isLink,
-        'van-cell__value--alone': !$slots.title && !title && !label
-      }"
+      :class="b('value', { alone: !$slots.title && !title })"
     >
       <slot>
         <span v-text="value" />
       </slot>
     </div>
     <slot name="right-icon">
-      <icon name="arrow" class="van-cell__right-icon" v-if="isLink" />
+      <icon v-if="isLink" :class="b('right-icon')" name="arrow" />
     </slot>
     <slot name="extra" />
   </div>
diff --git a/packages/mixins/bem.js b/packages/mixins/bem.js
index 5daffba85..4578901d5 100644
--- a/packages/mixins/bem.js
+++ b/packages/mixins/bem.js
@@ -39,7 +39,7 @@ export default {
       }
       el = join(name, el, ELEMENT);
 
-      return mods ? [el, prefix(name, mods)] : el;
+      return mods ? [el, prefix(el, mods)] : el;
     }
   }
 };
diff --git a/packages/vant-css/src/address-edit.css b/packages/vant-css/src/address-edit.css
index ad1dd5ca3..b2009cc55 100644
--- a/packages/vant-css/src/address-edit.css
+++ b/packages/vant-css/src/address-edit.css
@@ -11,7 +11,7 @@
 
   &__area {
     .van-cell__title {
-      width: 90px;
+      max-width: 90px;
     }
 
     .van-cell__value {
diff --git a/packages/vant-css/src/cell.css b/packages/vant-css/src/cell.css
index ea646c0bf..7cade2d30 100644
--- a/packages/vant-css/src/cell.css
+++ b/packages/vant-css/src/cell.css
@@ -1,7 +1,6 @@
 @import './common/var.css';
 
 .van-cell {
-  width: 100%;
   display: flex;
   padding: 10px 15px;
   box-sizing: border-box;
@@ -24,31 +23,38 @@
     background-color: $white;
   }
 
-  &__left-icon {
-    font-size: 16px;
-    line-height: 1.5;
-    margin-right: 5px;
-  }
-
   &__label {
     font-size: 12px;
     line-height: 1.2;
     color: $gray-darker;
   }
 
+  &__title,
   &__value {
     flex: 1;
+  }
+
+  &__value {
+    overflow: hidden;
     text-align: right;
     vertical-align: middle;
-    overflow: hidden;
 
     &--alone {
       text-align: left;
     }
+  }
+  
+  &__left-icon {
+    font-size: 16px;
+    line-height: 24px;
+    margin-right: 5px;
+  }
 
-    &--link {
-      padding-right: 15px;
-    }
+  &__right-icon {
+    color: $gray-dark;
+    font-size: 12px;
+    line-height: 24px;
+    margin-left: 5px;
   }
 
   &--clickable {
@@ -72,13 +78,4 @@
   &--center {
     align-items: center;
   }
-
-  &__right-icon {
-    position: absolute;
-    top: 50%;
-    right: 15px;
-    transform: translateY(-50%);
-    color: $gray-dark;
-    font-size: 12px;
-  }
 }
diff --git a/packages/vant-css/src/field.css b/packages/vant-css/src/field.css
index bcc1903a1..841441689 100644
--- a/packages/vant-css/src/field.css
+++ b/packages/vant-css/src/field.css
@@ -2,7 +2,7 @@
 
 .van-field {
   .van-cell__title {
-    min-width: 90px;
+    max-width: 90px;
   }
 
   .van-cell__value {
diff --git a/packages/vant-css/src/sku.css b/packages/vant-css/src/sku.css
index 5fc62344a..a0af82188 100644
--- a/packages/vant-css/src/sku.css
+++ b/packages/vant-css/src/sku.css
@@ -164,7 +164,7 @@
 
     &__image-cell {
       .van-cell__title {
-        width: 90px;
+        max-width: 90px;
       }
       .van-cell__value {
         text-align: left;