Skip to content
This repository has been archived by the owner on Jun 3, 2021. It is now read-only.

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
tw93 committed Oct 13, 2017
2 parents 1656ff2 + a033f09 commit 090623f
Show file tree
Hide file tree
Showing 41 changed files with 220 additions and 207 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ mods/.sass-cache/
!.editorconfig
lerna-debug.log
build/example
build/*.map
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
69 changes: 37 additions & 32 deletions build/index.native.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion build/index.native.js.map

Large diffs are not rendered by default.

65 changes: 34 additions & 31 deletions build/index.web.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/index.web.js.map

Large diffs are not rendered by default.

25 changes: 8 additions & 17 deletions example/minibar/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
32 changes: 17 additions & 15 deletions example/searchbar/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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 });
}
}
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
4 changes: 2 additions & 2 deletions packages/wxc-button/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@

## 安装

```
```shell
npm i @ali/wxc-button --save
```

## 使用方法

```
```vue
<template>
<wxc-button text="确定"
type="fliggy"
Expand Down
4 changes: 2 additions & 2 deletions packages/wxc-cell/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@

## 安装

```
```shell
npm install weex-ui --save
```

## 使用方法

```
```vue
<template>
<div class="container">
<div class="demo">
Expand Down
Loading

0 comments on commit 090623f

Please sign in to comment.