From f0d32f08a0473fe812f595e283669a3ecde7921a Mon Sep 17 00:00:00 2001
From: thomasy <c6swift@gmail.com>
Date: Thu, 5 Sep 2019 20:50:33 +0800
Subject: [PATCH] =?UTF-8?q?feat(Loading):=20=E7=BB=84=E4=BB=B6=20size=20?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=20Number=20=E6=A0=BC=E5=BC=8F=20(#1952)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/loading/README.md  | 14 +++++++-------
 packages/loading/index.ts   | 24 +++++++++++++++++++++++-
 packages/loading/index.wxml |  4 ++--
 3 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/packages/loading/README.md b/packages/loading/README.md
index 46727f59..9496bf7d 100644
--- a/packages/loading/README.md
+++ b/packages/loading/README.md
@@ -29,14 +29,14 @@
 
 ### Props
 
-| 参数 | 说明 | 类型 | 默认值 |
-|-----------|-----------|-----------|-------------|
-| color | 颜色 | *string* | `#c9c9c9` |
-| type | 类型，可选值为 `spinner` | *string* | `circular` |
-| size | 大小 | *string* | `30px` |
+| 参数  | 说明                          | 类型     | 默认值     |
+| ----- | ----------------------------- | -------- | ---------- |
+| color | 颜色                          | *string* | `#c9c9c9`  |
+| type  | 类型，可选值为 `spinner`      | *string* | `circular` |
+| size  | 加载图标大小，默认单位为 `px` | *string  | number*    | `30px` |
 
 ### 外部样式类
 
-| 类名 | 说明 |
-|-----------|-----------|
+| 类名         | 说明         |
+| ------------ | ------------ |
 | custom-class | 根节点样式类 |
diff --git a/packages/loading/index.ts b/packages/loading/index.ts
index 889c31f3..7a2c7ccc 100644
--- a/packages/loading/index.ts
+++ b/packages/loading/index.ts
@@ -1,11 +1,14 @@
 import { VantComponent } from '../common/component';
 
+const defaultLoadingSize = '30px';
 VantComponent({
   props: {
     size: {
       type: String,
-      value: '30px'
+      value: defaultLoadingSize,
+      observer: 'normalizeSize'
     },
+
     type: {
       type: String,
       value: 'circular'
@@ -14,5 +17,24 @@ VantComponent({
       type: String,
       value: '#c9c9c9'
     }
+  },
+
+  data: {
+    loadingSize: defaultLoadingSize
+  },
+
+  methods: {
+    // 支持 size="10" 和 size="10px" size="10rpx" 这些格式, 显然也不需要理会 size="abcpx"
+    normalizeSize(size: string | number): void {
+      const numberLike = (s: string) => !Number.isNaN(+s);
+      let loadingSize = size;
+      if (typeof size === 'number' || numberLike(size)) {
+        loadingSize = size + 'px';
+      }
+
+      this.setData({
+        loadingSize
+      });
+    }
   }
 });
diff --git a/packages/loading/index.wxml b/packages/loading/index.wxml
index 35ca0e22..eeecb2da 100644
--- a/packages/loading/index.wxml
+++ b/packages/loading/index.wxml
@@ -1,6 +1,6 @@
 <view
   class="van-loading custom-class"
-  style="width: {{ size }}; height: {{ size }}"
+  style="width: {{ loadingSize }}; height: {{ loadingSize }}"
 >
   <view
     class="van-loading__spinner van-loading__spinner--{{ type }}"
@@ -13,4 +13,4 @@
       class="van-loading__dot"
     />
   </view>
-</view>
+</view>
\ No newline at end of file