From 4303aa34b5c8d6ac12d885e76607888dd868bb7c Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Tue, 4 Dec 2018 14:36:14 +0800
Subject: [PATCH] [improvement] Icon: reduce setData (#1009)

---
 build/compiler.js         | 3 ++-
 packages/common/utils.ts  | 5 -----
 packages/common/utils.wxs | 5 +++++
 packages/icon/index.ts    | 7 -------
 packages/icon/index.wxml  | 6 ++++--
 5 files changed, 11 insertions(+), 15 deletions(-)
 create mode 100644 packages/common/utils.wxs

diff --git a/build/compiler.js b/build/compiler.js
index f573d2b1..c36f5275 100644
--- a/build/compiler.js
+++ b/build/compiler.js
@@ -10,7 +10,7 @@ const postcss = require('gulp-postcss');
 const isProduction = process.env.NODE_ENV === 'production';
 const src = path.join(__dirname, '../packages');
 const dist = path.join(__dirname, isProduction ? '../dist' : '../example/dist');
-const ext = ['ts', 'less', 'json', 'wxml'];
+const ext = ['ts', 'less', 'json', 'wxml', 'wxs'];
 
 function copy(ext) {
   return gulp.src([src + '/**/*.' + ext]).pipe(gulp.dest(dist));
@@ -45,6 +45,7 @@ gulp.task('compile-ts', () =>
     })
     .pipe(gulp.dest(dist))
 );
+gulp.task('compile-wxs', () => copy('wxs'));
 gulp.task('compile-json', () => copy('json'));
 gulp.task('compile-wxml', () => copy('wxml'));
 gulp.task('build', ext.map(ext => 'compile-' + ext));
diff --git a/packages/common/utils.ts b/packages/common/utils.ts
index ade4e679..765c483d 100644
--- a/packages/common/utils.ts
+++ b/packages/common/utils.ts
@@ -11,13 +11,8 @@ function isNumber(value) {
   return /^\d+$/.test(value);
 }
 
-function isSrc(url) {
-  return /^(https?:)?\/\/|data:image/.test(url);
-}
-
 export {
   isObj,
   isDef,
-  isSrc,
   isNumber
 };
diff --git a/packages/common/utils.wxs b/packages/common/utils.wxs
new file mode 100644
index 00000000..6435ac9e
--- /dev/null
+++ b/packages/common/utils.wxs
@@ -0,0 +1,5 @@
+function isSrc(url) {
+  return url.indexOf('http') === 0 || url.indexOf('data:image') === 0;
+}
+
+module.exports.isSrc = isSrc;
diff --git a/packages/icon/index.ts b/packages/icon/index.ts
index 1e145170..c73f6e73 100644
--- a/packages/icon/index.ts
+++ b/packages/icon/index.ts
@@ -1,4 +1,3 @@
-import { isSrc } from '../common/utils';
 import { VantComponent } from '../common/component';
 
 VantComponent({
@@ -14,12 +13,6 @@ VantComponent({
     }
   },
 
-  computed: {
-    isSrc() {
-      return isSrc(this.data.name);
-    }
-  },
-
   methods: {
     onClick() {
       this.$emit('click');
diff --git a/packages/icon/index.wxml b/packages/icon/index.wxml
index 48075534..aefcdebf 100644
--- a/packages/icon/index.wxml
+++ b/packages/icon/index.wxml
@@ -1,5 +1,5 @@
 <view
-  class="custom-class {{ classPrefix }} {{ isSrc ? 'van-icon--image' : classPrefix + '-' + name }}"
+  class="custom-class {{ classPrefix }} {{ utils.isSrc(name) ? 'van-icon--image' : classPrefix + '-' + name }}"
   style="{{ color ? 'color: ' + color + ';' : '' }}{{ size ? 'font-size: ' + size + ';' : '' }}{{ customStyle }}"
   bind:tap="onClick"
 >
@@ -10,7 +10,9 @@
     {{ info }}
   </view>
   <image
-    wx:if="{{ isSrc }}"
+    wx:if="{{ utils.isSrc(name) }}"
     src="{{ name }}"
   />
 </view>
+
+<wxs src="../common/utils.wxs" module="utils" />