From b3f587c7d05e1c099774d4826ca2380b3353221d Mon Sep 17 00:00:00 2001 From: neverland Date: Sun, 13 Jan 2019 08:44:36 +0800 Subject: [PATCH] [improvement] Icon: jsx (#2514) --- .../test/__snapshots__/demo.spec.js.snap | 9 ++-- .../cell/test/__snapshots__/demo.spec.js.snap | 11 ---- .../test/__snapshots__/demo.spec.js.snap | 13 ----- .../test/__snapshots__/demo.spec.js.snap | 10 ---- .../test/__snapshots__/demo.spec.js.snap | 6 +-- .../test/__snapshots__/demo.spec.js.snap | 1 - .../test/__snapshots__/index.spec.js.snap | 3 -- .../test/__snapshots__/demo.spec.js.snap | 2 - .../test/__snapshots__/index.spec.js.snap | 1 - .../test/__snapshots__/demo.spec.js.snap | 5 -- packages/icon/index.js | 44 ++++++++++++++++ packages/icon/index.vue | 52 ------------------- .../test/__snapshots__/demo.spec.js.snap | 3 -- .../test/__snapshots__/demo.spec.js.snap | 3 -- .../test/__snapshots__/demo.spec.js.snap | 14 ++--- .../rate/test/__snapshots__/demo.spec.js.snap | 21 -------- .../test/__snapshots__/demo.spec.js.snap | 3 -- .../test/__snapshots__/demo.spec.js.snap | 2 - .../test/__snapshots__/demo.spec.js.snap | 1 - .../tab/test/__snapshots__/demo.spec.js.snap | 2 - .../test/__snapshots__/demo.spec.js.snap | 10 ---- .../test/__snapshots__/demo.spec.js.snap | 1 - .../test/__snapshots__/demo.spec.js.snap | 2 - 23 files changed, 55 insertions(+), 164 deletions(-) create mode 100644 packages/icon/index.js delete mode 100644 packages/icon/index.vue diff --git a/packages/address-list/test/__snapshots__/demo.spec.js.snap b/packages/address-list/test/__snapshots__/demo.spec.js.snap index 0586c87a6..c756b7704 100644 --- a/packages/address-list/test/__snapshots__/demo.spec.js.snap +++ b/packages/address-list/test/__snapshots__/demo.spec.js.snap @@ -7,25 +7,22 @@ exports[`renders demo correctly 1`] = `
-
张三,13000000000
浙江省杭州市西湖区文三路 138 号东方通信大厦 7 楼 501 室
+
张三,13000000000
浙江省杭州市西湖区文三路 138 号东方通信大厦 7 楼 501 室
-
-
李四,1310000000
浙江省杭州市拱墅区莫干山路 50 号
+
李四,1310000000
浙江省杭州市拱墅区莫干山路 50 号
-
以下地址超出配送范围
-
王五,1320000000
浙江省杭州市滨江区江南大道 15 号
+
王五,1320000000
浙江省杭州市滨江区江南大道 15 号
-
diff --git a/packages/cell/test/__snapshots__/demo.spec.js.snap b/packages/cell/test/__snapshots__/demo.spec.js.snap index 3e132e5e6..dc9565e2b 100644 --- a/packages/cell/test/__snapshots__/demo.spec.js.snap +++ b/packages/cell/test/__snapshots__/demo.spec.js.snap @@ -30,7 +30,6 @@ exports[`renders demo correctly 1`] = `
-
单元格
内容
@@ -44,53 +43,43 @@ exports[`renders demo correctly 1`] = `
单元格
-
单元格
内容
-
单元格
内容
-
单元格
-
单元格
-
-
单元格 标签
内容
-
-
单元格
-
单元格
-
diff --git a/packages/checkbox/test/__snapshots__/demo.spec.js.snap b/packages/checkbox/test/__snapshots__/demo.spec.js.snap index 8e825d686..4af7677ca 100644 --- a/packages/checkbox/test/__snapshots__/demo.spec.js.snap +++ b/packages/checkbox/test/__snapshots__/demo.spec.js.snap @@ -5,21 +5,18 @@ exports[`renders demo correctly 1`] = `
-
复选框
-
复选框
-
复选框 @@ -28,7 +25,6 @@ exports[`renders demo correctly 1`] = `
-
自定义颜色 @@ -45,21 +41,18 @@ exports[`renders demo correctly 1`] = `
-
复选框 a
-
复选框 b
-
复选框 c @@ -70,21 +63,18 @@ exports[`renders demo correctly 1`] = `
-
复选框 a
-
复选框 b
-
复选框 c @@ -99,7 +89,6 @@ exports[`renders demo correctly 1`] = `
-
@@ -109,7 +98,6 @@ exports[`renders demo correctly 1`] = `
-
@@ -119,7 +107,6 @@ exports[`renders demo correctly 1`] = `
-
diff --git a/packages/collapse/test/__snapshots__/demo.spec.js.snap b/packages/collapse/test/__snapshots__/demo.spec.js.snap index 88c54c37a..0db737007 100644 --- a/packages/collapse/test/__snapshots__/demo.spec.js.snap +++ b/packages/collapse/test/__snapshots__/demo.spec.js.snap @@ -7,7 +7,6 @@ exports[`renders demo correctly 1`] = `
有赞微商城
-
@@ -17,14 +16,12 @@ exports[`renders demo correctly 1`] = `
有赞零售
-
有赞美业
-
@@ -35,7 +32,6 @@ exports[`renders demo correctly 1`] = `
有赞微商城
-
@@ -45,14 +41,12 @@ exports[`renders demo correctly 1`] = `
有赞零售
-
有赞美业
-
@@ -64,20 +58,16 @@ exports[`renders demo correctly 1`] = `
有赞微商城 -
-
-
有赞零售
内容
-
diff --git a/packages/contact-card/test/__snapshots__/demo.spec.js.snap b/packages/contact-card/test/__snapshots__/demo.spec.js.snap index 9fb8dc8d1..94dc17edf 100644 --- a/packages/contact-card/test/__snapshots__/demo.spec.js.snap +++ b/packages/contact-card/test/__snapshots__/demo.spec.js.snap @@ -4,10 +4,8 @@ exports[`renders demo correctly 1`] = `
-
添加联系人
-
-
张三:张三
diff --git a/packages/coupon-list/test/__snapshots__/demo.spec.js.snap b/packages/coupon-list/test/__snapshots__/demo.spec.js.snap index ff011177c..8162e179b 100644 --- a/packages/coupon-list/test/__snapshots__/demo.spec.js.snap +++ b/packages/coupon-list/test/__snapshots__/demo.spec.js.snap @@ -6,7 +6,6 @@ exports[`renders demo correctly 1`] = `
优惠券
2张可用
-
diff --git a/packages/coupon-list/test/__snapshots__/index.spec.js.snap b/packages/coupon-list/test/__snapshots__/index.spec.js.snap index e63a78404..8e81e0d29 100644 --- a/packages/coupon-list/test/__snapshots__/index.spec.js.snap +++ b/packages/coupon-list/test/__snapshots__/index.spec.js.snap @@ -4,7 +4,6 @@ exports[`coupon cell 1`] = `
优惠券
使用优惠
-
`; @@ -13,7 +12,6 @@ exports[`coupon cell 2`] = `
优惠券
-¥1.00
-
`; @@ -61,7 +59,6 @@ exports[`render coupon list 1`] = `

有效期:2017.03.10 - 2017.12.30

-
diff --git a/packages/field/test/__snapshots__/demo.spec.js.snap b/packages/field/test/__snapshots__/demo.spec.js.snap index bc69be03a..162e67634 100644 --- a/packages/field/test/__snapshots__/demo.spec.js.snap +++ b/packages/field/test/__snapshots__/demo.spec.js.snap @@ -18,7 +18,6 @@ exports[`renders demo correctly 1`] = `
-
@@ -34,7 +33,6 @@ exports[`renders demo correctly 1`] = `
-
用户名
diff --git a/packages/field/test/__snapshots__/index.spec.js.snap b/packages/field/test/__snapshots__/index.spec.js.snap index f2a5673bd..56e11f10c 100644 --- a/packages/field/test/__snapshots__/index.spec.js.snap +++ b/packages/field/test/__snapshots__/index.spec.js.snap @@ -12,7 +12,6 @@ exports[`clearable 2`] = `
-
diff --git a/packages/goods-action/test/__snapshots__/demo.spec.js.snap b/packages/goods-action/test/__snapshots__/demo.spec.js.snap index 3133fcc80..0d52cfb6e 100644 --- a/packages/goods-action/test/__snapshots__/demo.spec.js.snap +++ b/packages/goods-action/test/__snapshots__/demo.spec.js.snap @@ -5,24 +5,19 @@ exports[`renders demo correctly 1`] = `
- 客服
- 购物车
- 客服
-
5
购物车
- 店铺
diff --git a/packages/icon/index.js b/packages/icon/index.js new file mode 100644 index 000000000..1da45927e --- /dev/null +++ b/packages/icon/index.js @@ -0,0 +1,44 @@ +import { use } from '../utils'; +import Info from '../info'; +import isSrc from '../utils/validate/src'; + +const [sfc] = use('icon'); + +export default sfc({ + props: { + name: String, + size: String, + color: String, + info: [String, Number], + classPrefix: { + type: String, + default: 'van-icon' + } + }, + + computed: { + isSrc() { + return isSrc(this.name); + } + }, + + render(h) { + return ( + + {this.$slots.default} + {this.isSrc && } + + + ); + } +}); diff --git a/packages/icon/index.vue b/packages/icon/index.vue deleted file mode 100644 index ec7d314ce..000000000 --- a/packages/icon/index.vue +++ /dev/null @@ -1,52 +0,0 @@ - - - diff --git a/packages/nav-bar/test/__snapshots__/demo.spec.js.snap b/packages/nav-bar/test/__snapshots__/demo.spec.js.snap index a7bb30b99..f118ee7c7 100644 --- a/packages/nav-bar/test/__snapshots__/demo.spec.js.snap +++ b/packages/nav-bar/test/__snapshots__/demo.spec.js.snap @@ -5,7 +5,6 @@ exports[`renders demo correctly 1`] = `
- 返回
标题
按钮
@@ -14,11 +13,9 @@ exports[`renders demo correctly 1`] = `
- 返回
标题
-
diff --git a/packages/notice-bar/test/__snapshots__/demo.spec.js.snap b/packages/notice-bar/test/__snapshots__/demo.spec.js.snap index cbac3825a..e49d78e40 100644 --- a/packages/notice-bar/test/__snapshots__/demo.spec.js.snap +++ b/packages/notice-bar/test/__snapshots__/demo.spec.js.snap @@ -4,7 +4,6 @@ exports[`renders demo correctly 1`] = `
-
足协杯战线连续第2年上演广州德比战,上赛季半决赛上恒大以两回合5-3的总比分淘汰富力。
@@ -27,7 +26,6 @@ exports[`renders demo correctly 1`] = `
足协杯战线连续第2年上演广州德比战,上赛季半决赛上恒大以两回合5-3的总比分淘汰富力。
-
@@ -35,7 +33,6 @@ exports[`renders demo correctly 1`] = `
足协杯战线连续第2年上演广州德比战,上赛季半决赛上恒大以两回合5-3的总比分淘汰富力。
-
diff --git a/packages/radio/test/__snapshots__/demo.spec.js.snap b/packages/radio/test/__snapshots__/demo.spec.js.snap index d8444e4ca..ebb115345 100644 --- a/packages/radio/test/__snapshots__/demo.spec.js.snap +++ b/packages/radio/test/__snapshots__/demo.spec.js.snap @@ -4,18 +4,18 @@ exports[`renders demo correctly 1`] = `
-
单选框 1
-
单选框 2
+
单选框 1
+
单选框 2
-
单选框 1
-
单选框 2
+
单选框 1
+
单选框 2
-
+
单选框
@@ -25,7 +25,7 @@ exports[`renders demo correctly 1`] = `
单选框1
-
+
@@ -33,7 +33,7 @@ exports[`renders demo correctly 1`] = `
单选框2
-
+
diff --git a/packages/rate/test/__snapshots__/demo.spec.js.snap b/packages/rate/test/__snapshots__/demo.spec.js.snap index 3a333a905..859c0c903 100644 --- a/packages/rate/test/__snapshots__/demo.spec.js.snap +++ b/packages/rate/test/__snapshots__/demo.spec.js.snap @@ -4,56 +4,35 @@ exports[`renders demo correctly 1`] = `
- - - - -
- - - - -
- - - - - -
- - - - -
diff --git a/packages/search/test/__snapshots__/demo.spec.js.snap b/packages/search/test/__snapshots__/demo.spec.js.snap index 2a1db4ef8..0f04b2a2d 100644 --- a/packages/search/test/__snapshots__/demo.spec.js.snap +++ b/packages/search/test/__snapshots__/demo.spec.js.snap @@ -5,7 +5,6 @@ exports[`renders demo correctly 1`] = `