From 58ba171511efa6c9b431e59c0ec9713f074abced Mon Sep 17 00:00:00 2001
From: airyland <airyland@qq.com>
Date: Fri, 17 Mar 2017 22:51:29 +0800
Subject: [PATCH] -> v2.1.1-rc.12

---
 package.json                        | 2 +-
 src/components/marquee/metas.yml    | 2 +-
 src/components/search/metas.yml     | 2 +-
 src/components/x-address/metas.yml  | 2 +-
 src/components/x-button/metas.yml   | 2 +-
 src/components/x-textarea/metas.yml | 2 +-
 src/demo_list.json                  | 3 ++-
 src/demos/Search.vue                | 5 ++++-
 src/demos/SearchStatic.vue          | 7 +++++--
 9 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index 60f0eda6e..9538868c6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vux",
-  "version": "2.1.1-rc.11",
+  "version": "2.1.1-rc.12",
   "main": "index.js",
   "description": "Mobile web UI based on Vue and WeUI",
   "keywords": [
diff --git a/src/components/marquee/metas.yml b/src/components/marquee/metas.yml
index 3468460a0..7b18a6d7d 100644
--- a/src/components/marquee/metas.yml
+++ b/src/components/marquee/metas.yml
@@ -29,7 +29,7 @@ marquee-item:
       en: content slot
       zh-CN: 内容插槽
 changes:
-  next:
+  v2.1.1-rc.12:
     en:
       - '[feature] Support async marquee-item'
     zh-CN:
diff --git a/src/components/search/metas.yml b/src/components/search/metas.yml
index 3b0571d37..02bc165f5 100644
--- a/src/components/search/metas.yml
+++ b/src/components/search/metas.yml
@@ -62,7 +62,7 @@ events:
     en: when input gets focus
     zh-CN: 输入框获取到焦点时触发
 changes:
-  next:
+  v2.1.1-rc.12:
     en:
       - '[enhance] do not emit on-change is isCancel = true'
     zh-CN:
diff --git a/src/components/x-address/metas.yml b/src/components/x-address/metas.yml
index ee22f1f1e..53516838c 100755
--- a/src/components/x-address/metas.yml
+++ b/src/components/x-address/metas.yml
@@ -106,7 +106,7 @@ events:
     en: emits when being open
     zh-CN: 显示时触发
 changes:
-  next:
+  v2.1.1-rc.12:
     en:
       - '[enhance] Simpify Address data #1101'
     zh-CN:
diff --git a/src/components/x-button/metas.yml b/src/components/x-button/metas.yml
index 42c4aaa86..e1241d528 100755
--- a/src/components/x-button/metas.yml
+++ b/src/components/x-button/metas.yml
@@ -63,7 +63,7 @@ changes:
   v2.1.0-rc.46:
       zh-CN:
         - '[feature] 添加`less`变量 #896 @erguotou520'
-  next:
+  v2.1.1-rc.12:
       en:
         - '[fix] Fix primary button active background-color'
       zh-CN:
diff --git a/src/components/x-textarea/metas.yml b/src/components/x-textarea/metas.yml
index 24ac5e742..bd042f8f2 100755
--- a/src/components/x-textarea/metas.yml
+++ b/src/components/x-textarea/metas.yml
@@ -86,7 +86,7 @@ events:
     en: blur event
     zh-CN: blur 事件
 changes:
-  next:
+  v2.1.1-rc.12:
     en:
       - '[enhance] trigger focus event of x-textarea when click counter'
     zh-CN:
diff --git a/src/demo_list.json b/src/demo_list.json
index d0d3035b0..452dc800a 100644
--- a/src/demo_list.json
+++ b/src/demo_list.json
@@ -94,5 +94,6 @@
   "XIcon",
   "ScrollerSwiper",
   "TabbarIcon",
-  "DatetimeRange"
+  "DatetimeRange",
+  "XImgScroller#/demo/x-img-scroller"
 ]
diff --git a/src/demos/Search.vue b/src/demos/Search.vue
index ff66ef085..98c4e8c44 100755
--- a/src/demos/Search.vue
+++ b/src/demos/Search.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <img src="../assets/demo/filter_bg.jpg" style="width: 100%">
-    <search @result-click="resultClick" @on-change="getResult" :results="results" v-model="value" position="absolute" auto-scroll-to-top top="46px" @on-focus="onFocus"></search>
+    <search @result-click="resultClick" @on-change="getResult" :results="results" v-model="value" position="absolute" auto-scroll-to-top top="46px" @on-focus="onFocus" @on-cancel="onCancel"></search>
     <br>
     <group>
       <cell title="static position demo" is-link link="/component/search-static"></cell>
@@ -27,6 +27,9 @@ export default {
     },
     onFocus () {
       console.log('on focus')
+    },
+    onCancel () {
+      console.log('on cancel')
     }
   },
   data () {
diff --git a/src/demos/SearchStatic.vue b/src/demos/SearchStatic.vue
index 68d8b4591..71ca4ad73 100755
--- a/src/demos/SearchStatic.vue
+++ b/src/demos/SearchStatic.vue
@@ -2,9 +2,9 @@
   <div>
     <img src="../assets/demo/filter_bg.jpg" style="width: 100%">
     <br>
-    <search @on-submit="onSubmit" :auto-fixed="autoFixed" @on-focus="onFocus"></search>
+    <search @on-submit="onSubmit" :auto-fixed="autoFixed" @on-focus="onFocus" @on-cancel="onCancel"></search>
     <divider>set value</divider>
-    <search @on-submit="onSubmit" :auto-fixed="false" v-model="value2" @on-focus="onFocus"></search>
+    <search @on-submit="onSubmit" :auto-fixed="false" v-model="value2" @on-focus="onFocus" @on-cancel="onCancel"></search>
   </div>
 </template>
 
@@ -26,6 +26,9 @@ export default {
     onSubmit (val) {
       window.alert('on submit' + val)
     },
+    onCancel () {
+      console.log('on cancel')
+    },
     onFocus () {
       console.log('on focus')
     }