From 00c090ad0703baa7440076a76e65b585944e90d0 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@youzan.com>
Date: Tue, 3 Sep 2019 15:28:51 +0800
Subject: [PATCH] feat(Icon): remove wxs (#1942)

---
 packages/icon/index.ts   | 9 ++++++++-
 packages/icon/index.wxml | 6 ++----
 packages/wxs/utils.wxs   | 5 -----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/icon/index.ts b/packages/icon/index.ts
index c73f6e73..77586ccf 100644
--- a/packages/icon/index.ts
+++ b/packages/icon/index.ts
@@ -3,13 +3,20 @@ import { VantComponent } from '../common/component';
 VantComponent({
   props: {
     info: null,
-    name: String,
     size: String,
     color: String,
     customStyle: String,
     classPrefix: {
       type: String,
       value: 'van-icon'
+    },
+    name: {
+      type: String,
+      observer(val) {
+        this.setData({
+          isImageName: val.indexOf('/') !== -1
+        });
+      }
     }
   },
 
diff --git a/packages/icon/index.wxml b/packages/icon/index.wxml
index 3c1bbad0..4b961fcc 100644
--- a/packages/icon/index.wxml
+++ b/packages/icon/index.wxml
@@ -1,7 +1,5 @@
-<wxs src="../wxs/utils.wxs" module="utils" />
-
 <view
-  class="custom-class {{ classPrefix }} {{ utils.isSrc(name) ? 'van-icon--image' : classPrefix + '-' + name }}"
+  class="custom-class {{ classPrefix }} {{ isImageName ? 'van-icon--image' : classPrefix + '-' + name }}"
   style="{{ color ? 'color: ' + color + ';' : '' }}{{ size ? 'font-size: ' + size + ';' : '' }}{{ customStyle }}"
   bind:tap="onClick"
 >
@@ -11,7 +9,7 @@
     custom-class="van-icon__info"
   />
   <image
-    wx:if="{{ utils.isSrc(name) }}"
+    wx:if="{{ isImageName }}"
     src="{{ name }}"
     mode="aspectFit"
     class="van-icon__image"
diff --git a/packages/wxs/utils.wxs b/packages/wxs/utils.wxs
index 8cced70f..a18662df 100644
--- a/packages/wxs/utils.wxs
+++ b/packages/wxs/utils.wxs
@@ -1,12 +1,7 @@
 var bem = require('./bem.wxs').bem;
 var memoize = require('./memoize.wxs').memoize;
 
-function isSrc(url) {
-  return url.indexOf('http') === 0 || url.indexOf('data:image') === 0 || url.indexOf('//') === 0;
-}
-
 module.exports = {
   bem: memoize(bem),
-  isSrc: isSrc,
   memoize: memoize
 };