From 7da66cfe95d8953be3293509db92c4b71c701100 Mon Sep 17 00:00:00 2001
From: rex <rexkaneki@gmail.com>
Date: Wed, 26 Aug 2020 18:59:56 +0800
Subject: [PATCH] fix(empty): support slot (#3563)

fix #3549
---
 packages/empty/README.md  | 19 +++++--------------
 packages/empty/index.less | 16 ++++++++++++++++
 packages/empty/index.wxml | 20 +++++++++++++-------
 3 files changed, 34 insertions(+), 21 deletions(-)

diff --git a/packages/empty/README.md b/packages/empty/README.md
index 22c22b8a..4a64abd9 100644
--- a/packages/empty/README.md
+++ b/packages/empty/README.md
@@ -14,8 +14,6 @@
 }
 ```
 
-> Vant Weapp 1.0 版本开始支持此组件，升级方式参见[快速上手](#/quickstart)
-
 ## 代码演示
 
 ### 基础用法
@@ -47,13 +45,6 @@ Empty 组件内置了多种占位图片类型，可以在不同业务场景下
   image="https://img.yzcdn.cn/vant/custom-empty-image.png"
   description="描述文字"
 />
-
-<style>
-  .custom-image .van-empty__image {
-    width: 90px;
-    height: 90px;
-  }
-</style>
 ```
 
 ### 底部内容
@@ -68,10 +59,10 @@ Empty 组件内置了多种占位图片类型，可以在不同业务场景下
 </van-empty>
 
 <style>
-  .bottom-button {
-    width: 160px;
-    height: 40px;
-  }
+.bottom-button {
+  width: 160px;
+  height: 40px;
+}
 </style>
 ```
 
@@ -88,6 +79,6 @@ Empty 组件内置了多种占位图片类型，可以在不同业务场景下
 
 | 名称        | 说明           |
 | ----------- | -------------- |
-| default     | 自定义底部内容 |
+| -           | 自定义底部内容 |
 | image       | 自定义图标     |
 | description | 自定义描述文字 |
diff --git a/packages/empty/index.less b/packages/empty/index.less
index 810b7ee0..62b827e5 100644
--- a/packages/empty/index.less
+++ b/packages/empty/index.less
@@ -13,18 +13,34 @@
     width: @empty-image-size;
     height: @empty-image-size;
 
+    &:empty {
+      display: none;
+    }
+
     &__img {
       width: 100%;
       height: 100%;
     }
   }
 
+  &__image:not(:empty) + &__image {
+    display: none;
+  }
+
   &__description {
     margin-top: @empty-description-margin-top;
     padding: @empty-description-padding;
     color: @empty-description-color;
     font-size: @empty-description-font-size;
     line-height: @empty-description-line-height;
+
+    &:empty {
+      display: none;
+    }
+  }
+
+  &__description:not(:empty) + &__description {
+    display: none;
   }
 
   &__bottom {
diff --git a/packages/empty/index.wxml b/packages/empty/index.wxml
index 1c284697..b6a2cb3c 100644
--- a/packages/empty/index.wxml
+++ b/packages/empty/index.wxml
@@ -1,15 +1,21 @@
 <wxs src="../wxs/utils.wxs" module="utils" />
 
-<view class=" custom-class van-empty">
+<view class="custom-class van-empty">
   <view class="van-empty__image">
-    <image wx:if="{{ imageUrl }}"
-      class="van-empty__image__img"
-      src="{{ imageUrl }}" />
+    <slot name="image"></slot>
   </view>
-  <p class="van-empty__description">
+  <view class="van-empty__image">
+    <image wx:if="{{ imageUrl }}" class="van-empty__image__img" src="{{ imageUrl }}" />
+  </view>
+
+  <view class="van-empty__description">
+    <slot name="description"></slot>
+  </view>
+  <view class="van-empty__description">
     {{ description }}
-  </p>
+  </view>
+
   <view class="van-empty__bottom">
     <slot></slot>
   </view>
-</view>
\ No newline at end of file
+</view>