Merge branch 'dev'

Author: tw93

.gitignore

@@ -15,3 +15,4 @@ mods/.sass-cache/
 !.editorconfig
 lerna-debug.log
 build/example
+build/*.map

CHANGELOG.md

@@ -1,4 +1,12 @@
 # Change Log
+## 0.1.3
+- [+] Fix syntax highlighting
+- [!] Fixed wxc-indexlist bug from [issues/16](https://github.com/alibaba/weex-ui/issues/16).
+- [!] Normalize wxc-searchbar,wxc-minibar function name.
+
+## 0.1.2
+- [!] Fixed the link jump bug
+- [!] Modify the usage documentation for some components
 
 ## 0.1.2
 - [!] fixed the link jump bug

build/index.native.js

@@ -12,29 +12,29 @@
         </div>
 
         <div class="demo">
-          <wxc-minibar v-on:minibarLeftButtonClick="minibarLeftButtonClick"
-                       v-on:minibarRightButtonClick="minibarRightButtonClick"></wxc-minibar>
+          <wxc-minibar v-on:wxcMinibarLeftButtonClicked="minibarLeftButtonClick"
+                       v-on:wxcMinibarRightButtonClicked="minibarRightButtonClick"></wxc-minibar>
         </div>
 
         <div class="demo">
           <wxc-minibar title="阿里旅行购物车"
                        right-text="更多"
-                       v-on:minibarLeftButtonClick="minibarLeftButtonClick"
-                       v-on:minibarRightButtonClick="minibarRightButtonClick"></wxc-minibar>
+                       v-on:wxcMinibarLeftButtonClicked="minibarLeftButtonClick"
+                       v-on:wxcMinibarRightButtonClicked="minibarRightButtonClick"></wxc-minibar>
         </div>
         <div class="demo">
           <wxc-minibar title="阿里旅行购物车"
                        background-color="#009ff0"
                        text-color="#FFFFFF"
                        :left-button="leftButton"
-                       v-on:minibarLeftButtonClick="minibarLeftButtonClick"
-                       v-on:minibarRightButtonClick="minibarRightButtonClick"
+                       v-on:wxcMinibarLeftButtonClicked="minibarLeftButtonClick"
+                       v-on:wxcMinibarRightButtonClicked="minibarRightButtonClick"
                        right-text="更多"></wxc-minibar>
         </div>
         <div class="demo">
           <wxc-minibar title="阿里旅行购物车"
-                       v-on:minibarLeftButtonClick="minibarLeftButtonClick"
-                       v-on:minibarRightButtonClick="minibarRightButtonClick"
+                       v-on:wxcMinibarLeftButtonClicked="minibarLeftButtonClick"
+                       v-on:wxcMinibarRightButtonClicked="minibarRightButtonClick"
                        :right-button="rightButton"></wxc-minibar>
         </div>
       </div>
@@ -56,21 +56,12 @@
     flex: 1;
   }
 
-  .category {
-    margin-top: 70px;
-  }
-
   .demo {
     width: 750px;
     height: 180px;
     align-items: flex-start;
     padding-top: 60px;
   }
-
-  .text {
-    margin-left: 40px;
-    margin-bottom: 30px;
-  }
 </style>
 
 <script>

build/index.native.js.map

@@ -12,11 +12,12 @@
             @click="setValue">点我可设置输入框内容</text>
       <div class="demo">
         <wxc-searchbar ref="wxc-searchbar"
-                       v-on:searchbarCancelClick="searchbarCancelClick"
-                       v-on:searchbarInputOninput="searchbarInputOninput"
-                       v-on:searchbarCloseClick="searchbarCloseClick"
-                       v-on:searchbarInputOnfocus="searchbarInputOnfocus"
-                       v-on:searchbarInputOnblur="searchbarInputOnblur"></wxc-searchbar>
+                       v-on:wxcSearchbarCancelClicked="wxcSearchbarCancelClicked"
+                       v-on:wxcSearchbarInputReturned="wxcSearchbarInputReturned"
+                       v-on:wxcSearchbarInputOnInput="wxcSearchbarInputOnInput"
+                       v-on:wxcSearchbarCloseClicked="wxcSearchbarCloseClicked"
+                       v-on:wxcSearchbarInputOnFocus="wxcSearchbarInputOnFocus"
+                       v-on:wxcSearchbarInputOnBlur="wxcSearchbarInputOnBlur"></wxc-searchbar>
         <text class="value-text">{{value}}</text>
 
       </div>
@@ -25,7 +26,7 @@
       <div class="demo demo1">
         <wxc-searchbar :disabled="isDisabled"
                        placeholder="无法输入"
-                       v-on:searchbarInputDisabledOnclick="searchbarInputDisabledOnclick"></wxc-searchbar>
+                       v-on:wxcSearchbarInputDisabledClicked="wxcSearchbarInputDisabledClicked"></wxc-searchbar>
       </div>
 
       <text class="hint">一直显示取消按钮,同时theme="yellow"</text>
@@ -42,8 +43,8 @@
                        theme="yellow"
                        mod="hasDep"
                        dep-name="杭州出发"
-                       v-on:searchbarDepChooseClick="searchbarDepChooseClick"
-                       v-on:searchbarInputDisabledOnclick="searchbarInputDisabledOnclick"></wxc-searchbar>
+                       v-on:wxcSearchbarDepChooseClicked="wxcSearchbarDepChooseClicked"
+                       v-on:wxcSearchbarInputDisabledClicked="wxcSearchbarInputDisabledClicked"></wxc-searchbar>
       </div>
     </scroller>
   </div>
@@ -109,25 +110,26 @@
       setValue () {
         this.$refs['wxc-searchbar'].setValue('点击了手动设置输入框内容的开关');
       },
-      searchbarInputOnfocus () {
+
+      wxcSearchbarInputOnFocus () {
         modal.toast({ 'message': 'onfocus', 'duration': 1 });
       },
-      searchbarInputOnblur () {
+      wxcSearchbarInputOnBlur () {
         modal.toast({ 'message': 'onbulr', 'duration': 1 });
       },
-      searchbarCloseClick () {
+      wxcSearchbarCloseClicked () {
         modal.toast({ 'message': 'close.click', 'duration': 1 });
       },
-      searchbarInputOninput (e) {
+      wxcSearchbarInputOnInput (e) {
         this.value = e.value;
       },
-      searchbarCancelClick () {
+      wxcSearchbarCancelClicked () {
         modal.toast({ 'message': 'cancel.click', 'duration': 1 });
       },
-      searchbarInputDisabledOnclick () {
+      wxcSearchbarInputDisabledClicked () {
         modal.toast({ 'message': 'input.onclick', 'duration': 1 });
       },
-      searchbarDepChooseClick () {
+      wxcSearchbarDepChooseClicked () {
         modal.toast({ 'message': 'dep.choose.click', 'duration': 1 });
       }
     }

build/index.web.js

@@ -1,6 +1,6 @@
 {
   "name": "weex-ui",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "A rich interaction, lightweight, high performance UI library based on Weex",
   "main": "index.js",
   "lib": "vue",

build/index.web.js.map

@@ -9,13 +9,13 @@
 
 ## 安装
 
-```
+```shell
 npm i @ali/wxc-button --save
 ```
 
 ## 使用方法
 
-```
+```vue
 <template>
   <wxc-button text="确定"
               type="fliggy"

example/minibar/index.vue

@@ -13,13 +13,13 @@
 
 ## 安装
 
-```
+```shell
 npm install weex-ui --save
 ```
 
 ## 使用方法
 
-```
+```vue
 <template>
   <div class="container">
     <div class="demo">