new version 0.6.13
diff --git a/CHANGELOG.md b/CHANGELOG.md
index de7535f..86e6aa4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,7 +18,7 @@
## 0.6.10
--[!] Fixed the `lines` bug about [wxc-popover](https://alibaba.github.io/weex-ui/#/packages/wxc-popover/) when in web. [issue/384](https://github.com/alibaba/weex-ui/issues/384)
+- [!] Fixed the `lines` bug about [wxc-popover](https://alibaba.github.io/weex-ui/#/packages/wxc-popover/) when in web. [issue/384](https://github.com/alibaba/weex-ui/issues/384)
- [!] Fixed the `sourceData` warning about [wxc-city](https://alibaba.github.io/weex-ui/#/cn/packages/wxc-city/) when searching. [issue/382](https://github.com/alibaba/weex-ui/issues/382)
- [!] Fixed the `btnStyle` style cannot cover about [wxc-button](https://alibaba.github.io/weex-ui/#/cn/packages/wxc-button/). [issue/390](https://github.com/alibaba/weex-ui/issues/390)
- [+] Add Weex and Bindingx DingTalk Group.
diff --git a/CHANGELOG_cn.md b/CHANGELOG_cn.md
index 595a920..8bd747c 100644
--- a/CHANGELOG_cn.md
+++ b/CHANGELOG_cn.md
@@ -18,7 +18,7 @@
## 0.6.10
--[!] 修复 [wxc-popover](https://alibaba.github.io/weex-ui/#/cn/packages/wxc-popover/) 在 Web 环境报 `lines` 的错误 [issue/384](https://github.com/alibaba/weex-ui/issues/384)
+- [!] 修复 [wxc-popover](https://alibaba.github.io/weex-ui/#/cn/packages/wxc-popover/) 在 Web 环境报 `lines` 的错误 [issue/384](https://github.com/alibaba/weex-ui/issues/384)
- [!] 修复[wxc-city](https://alibaba.github.io/weex-ui/#/cn/packages/wxc-city/) 搜索时候 sourceData 的 warning 问题 [issue/382](https://github.com/alibaba/weex-ui/issues/390)
- [!]修复[wxc-button](https://alibaba.github.io/weex-ui/#/cn/packages/wxc-button/) 组件 btnStyle 在有 size 设置时候不可覆盖的问题 [issue/382](https://github.com/alibaba/weex-ui/issues/390)
- [+] 新增 Weex 和 Bindingx 官方钉钉群
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 645828f..66d7e7f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,6 +1,6 @@
## How to contribute to Weex Ui
-
-Welcome to create [pull requests](https://github.com/alibaba/weex-ui/compare/) for bugfix, new component, doc, example, suggestion and anything.
+
+**Welcome to create [pull requests](https://github.com/alibaba/weex-ui/compare/) for bugfix, new component, doc, example, suggestion and anything.**
## Branch Management
@@ -11,8 +11,8 @@
```
* `dev` branch
- * `dev` is the developing branch.
- * It's **RECOMMENDED** to commit feature PR to `dev `.
+ * `dev` is the developing branch.
+ * It's **RECOMMENDED** to commit feature PR to `dev `.
* `master` branch
* `master` is the release branch,we will make tag and publish version on this branch.
diff --git a/CONTRIBUTING_cn.md b/CONTRIBUTING_cn.md
new file mode 100644
index 0000000..212256a
--- /dev/null
+++ b/CONTRIBUTING_cn.md
@@ -0,0 +1,41 @@
+## 怎么给 Weex Ui 贡献代码
+
+**欢迎大家给 Weex Ui 提交 [pull requests](https://github.com/alibaba/weex-ui/compare/) 来修复 Bug、新增组件、完善文档案例已经任何优化建议都可以的**。
+
+## Branch 管理
+
+```
+master
+ ↑
+dev <--- Develop/PR
+```
+
+- `dev` 分支
+ - 所有的开发均在 dev 分支进行
+ - 提 PR 时候请提交到 dev 分支
+- `master` 分支
+ - `master` 是稳定不改的分支，不会在上面进行代码开发
+ - 在 dev 分支 publish 后会 merge 到 master，同时打对应 tag
+
+## Commit 格式
+
+```
+[{action}] {description}
+```
+
+- `{action}`
+ - `+` 新增功能
+ - `!` 更新或者修复 bug
+ - `-` 移除功能
+- `{description}`
+ - 尽可能详细的描述就好
+
+for example:
+
+- [+] 列表选项新增拖拽功能
+- [!] 修复输入框长按闪烁的问题
+
+## 更多
+
+- 很推荐在提交 PR 前，先在钉钉群里进行讨论，已防止此功能已经有同学在开发了
+- 但是如何是想修复文档和明显代码错误，直接提交 PR 就好
diff --git a/README.md b/README.md
index 45a1406..79d2219 100644
--- a/README.md
+++ b/README.md
@@ -116,10 +116,7 @@
* **Star it** if you like.
* Join the chat at DingTalk to help solve weex problems.
- |Weex Ui Group|Weex Group|BindingX Group|
- |:--:|:--:|:--:|
- |<img alt="Join the chat at dingtalk" src="https://img.alicdn.com/tfs/TB15.yALAvoK1RjSZFDXXXY3pXa-750-990.png" width="180"/>|<img alt="Join the chat at dingtalk" src="https://img.alicdn.com/tfs/TB1tpS2LxnaK1RjSZFtXXbC2VXa-606-799.png" width="180"/>|<img alt="Join the chat at dingtalk" src="https://img.alicdn.com/tfs/TB1lf1CLCzqK1RjSZFpXXakSXXa-1125-1485.png" width="180"/>|
-
+ <table><tr><td><img src="https://img.alicdn.com/tfs/TB15.yALAvoK1RjSZFDXXXY3pXa-750-990.png" width="190"></td><td><img src="https://img.alicdn.com/tfs/TB1tpS2LxnaK1RjSZFtXXbC2VXa-606-799.png" width="190"></td><td><img src="https://img.alicdn.com/tfs/TB1lf1CLCzqK1RjSZFpXXakSXXa-1125-1485.png" width="190"></td></tr></table>
## Contribution
diff --git a/README_cn.md b/README_cn.md
index bec50e0..ba631fe 100644
--- a/README_cn.md
+++ b/README_cn.md
@@ -118,9 +118,7 @@
* 如果你觉得 Weex Ui 还不错，可以通过 Star 来表示你的喜欢
* 加入钉钉聊天群帮忙解答 Weex 技术问题
- |Weex Ui 钉钉群|Weex 钉钉群|BindingX 钉钉群|
- |:--:|:--:|:--:|
- |<img alt="Join the chat at dingtalk" src="https://img.alicdn.com/tfs/TB15.yALAvoK1RjSZFDXXXY3pXa-750-990.png" width="180"/>|<img alt="Join the chat at dingtalk" src="https://img.alicdn.com/tfs/TB1tpS2LxnaK1RjSZFtXXbC2VXa-606-799.png" width="180"/>|<img alt="Join the chat at dingtalk" src="https://img.alicdn.com/tfs/TB1lf1CLCzqK1RjSZFpXXakSXXa-1125-1485.png" width="180"/>|
+ <table><tr><td><img src="https://img.alicdn.com/tfs/TB15.yALAvoK1RjSZFDXXXY3pXa-750-990.png" width="190"></td><td><img src="https://img.alicdn.com/tfs/TB1tpS2LxnaK1RjSZFtXXbC2VXa-606-799.png" width="190"></td><td><img src="https://img.alicdn.com/tfs/TB1lf1CLCzqK1RjSZFpXXakSXXa-1125-1485.png" width="190"></td></tr></table>
## 贡献
diff --git a/docs/_navbar.md b/docs/_navbar.md
index 346f122..9473f5c 100644
--- a/docs/_navbar.md
+++ b/docs/_navbar.md
@@ -1,10 +1,10 @@
- [En](/)
- [中文](/cn/)
- <a href="//alibaba.github.io/weex-ui/docs/demo.html" target="_self">Demo</a>
-- <a id="J_show_community" class="show_community" onclick="document.getElementById('J_community_image').classList.toggle('active');this.classList.toggle('active');">Chat</a>
+- <a id="J_show_community" class="show_community" onclick="document.getElementById('J_community_image').classList.toggle('active');this.classList.toggle('active');">Community</a>
<div style="overflow:hidden; width:0; height:0;position:absolute; top:-800px;">
<img src="https://img.alicdn.com/tfs/TB1kCs_er_I8KJjy1XaXXbsxpXa-419-495.png" width="400"/>
</div>
- <img src="https://img.alicdn.com/tfs/TB1_AGyLrvpK1RjSZPiXXbmwXXa-1270-616.png" class="community-img" id="J_community_image" />
+ <img src="https://img.alicdn.com/tfs/TB1fjeQLpzqK1RjSZFvXXcB7VXa-1368-596.png" class="community-img" id="J_community_image" />
diff --git a/docs/_sidebar.md b/docs/_sidebar.md
index 0ee2b7c..4dea105 100644
--- a/docs/_sidebar.md
+++ b/docs/_sidebar.md
@@ -15,7 +15,7 @@
- [wxc-minibar](packages/wxc-minibar/)
- [wxc-tab-bar](packages/wxc-tab-bar/)
- [wxc-tab-page](packages/wxc-tab-page/)
-
+
- Data Entry
- [wxc-checkbox](packages/wxc-checkbox/)
- [wxc-countdown](packages/wxc-countdown/)
@@ -24,7 +24,7 @@
- [wxc-slider-bar](packages/wxc-slider-bar/)
- [wxc-stepper](packages/wxc-stepper/)
- [wxc-searchbar](packages/wxc-searchbar/)
-
+
- Data Display
- [wxc-city](packages/wxc-city/)
- [wxc-icon](packages/wxc-icon/)
@@ -33,21 +33,22 @@
- [wxc-rich-text](packages/wxc-rich-text/)
- [wxc-simple-flow](packages/wxc-simple-flow/)
- [wxc-tag](packages/wxc-tag/)
-
+
- Feedback
- [wxc-dialog](packages/wxc-dialog/)
- [wxc-loading](packages/wxc-loading/)
- [wxc-mask](packages/wxc-mask/)
- [wxc-progress](packages/wxc-progress/)
-
+
- Game
- - [wxc-lottery-rain](packages/wxc-lottery-rain/)
-
+ - [wxc-lottery-rain](packages/wxc-lottery-rain/)
+
- Service
- - [utils](packages/utils/)
-- [**Weex Ui 半年开源之路**](docs/weex-ui-report)
+ - [utils](packages/utils/)
+- [**Weex Ui 半年开源之路**](docs/weex-ui-report)
- [**Weex + Ui - Weex Conf 2018**](docs/weex-ui-weex-conf-2018)
- [**FAQ**](docs/faq)
- [**CHANGELOG**](CHANGELOG)
+- [**CONTRIBUTING**](CONTRIBUTING)
- [Who is using Weex Ui?](docs/who_use.md)
diff --git a/docs/_sidebar_cn.md b/docs/_sidebar_cn.md
index 25d7aa8..4d1ddec 100644
--- a/docs/_sidebar_cn.md
+++ b/docs/_sidebar_cn.md
@@ -16,7 +16,7 @@
- [wxc-minibar 导航栏](cn/packages/wxc-minibar/)
- [wxc-tab-bar 底部标签页](cn/packages/wxc-tab-bar/)
- [wxc-tab-page 顶部标签页](cn/packages/wxc-tab-page/)
-
+
- 数据输入
- [wxc-checkbox 多选](cn/packages/wxc-checkbox/)
- [wxc-city 城市选择](cn/packages/wxc-city/)
@@ -25,7 +25,7 @@
- [wxc-slider-bar 滑动输入条](cn/packages/wxc-slider-bar/)
- [wxc-stepper 步进器](cn/packages/wxc-stepper/)
- [wxc-searchbar 输入框](cn/packages/wxc-searchbar/)
-
+
- 数据展示
- [wxc-grid-select 多格筛选](cn/packages/wxc-grid-select/)
- [wxc-icon 常用 iconFont](cn/packages/wxc-icon/)
@@ -34,20 +34,21 @@
- [wxc-rich-text 富文本](cn/packages/wxc-rich-text/)
- [wxc-simple-flow 简单流程图](cn/packages/wxc-simple-flow/)
- [wxc-tag 标签](cn/packages/wxc-tag/)
-
+
- 反馈
- [wxc-dialog 对话框](cn/packages/wxc-dialog/)
- [wxc-loading 加载器](cn/packages/wxc-loading/)
- [wxc-mask 弹出层](cn/packages/wxc-mask/)
- [wxc-progress 进度条](cn/packages/wxc-progress/)
-
+
- 游戏
- - [wxc-lottery-rain 红包雨](cn/packages/wxc-lottery-rain/)
-
+ - [wxc-lottery-rain 红包雨](cn/packages/wxc-lottery-rain/)
+
- 服务
- - [utils 功能函数](cn/packages/utils/)
-- [**Weex Ui 半年开源之路**](cn/weex-ui-report)
-- [**Weex + Ui - Weex Conf 2018**](cn/weex-ui-weex-conf-2018)
+ - [utils 功能函数](cn/packages/utils/)
+- [**Weex Ui 半年开源之路**](cn/weex-ui-report)
+- [**Weex + Ui - Weex Conf 2018**](cn/weex-ui-weex-conf-2018)
- [**常见问题**](cn/faq)
- [**CHANGELOG**](cn/CHANGELOG)
+- [**CONTRIBUTING**](cn/CONTRIBUTING)
- [谁在使用 Weex Ui?](cn/who_use.md)
diff --git a/docs/demo.html b/docs/demo.html
index 91d43d8..49f4534 100644
--- a/docs/demo.html
+++ b/docs/demo.html
@@ -11,7 +11,7 @@
<style type="text/css">
:root {--theme-color: #F7C242;}
</style>
- <link rel="stylesheet" href="//h5.m.taobao.com/css/trip/weex-ui/index.min.css">
+ <link rel="stylesheet" href="//h5.m.taobao.com/trip/weex-ui/index.min.css">
<script>
if (/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent)) {
location.href = 'https://h5.m.taobao.com/trip/weex-ui/index.html?_wx_tpl=https%3A%2F%2Fh5.m.taobao.com%2Ftrip%2Fweex-ui%2Fdemo%2Findex.native-min.js'
@@ -25,7 +25,11 @@
<li><a href="//alibaba.github.io/weex-ui/#/">En</a></li>
<li><a href="//alibaba.github.io/weex-ui/#/cn/">中文</a></li>
<li><a class="active" href="//alibaba.github.io/weex-ui/docs/demo.html">Demo</a></li>
- <li><a href="//alibaba.github.io/bindingx/" target="_blank">BindingX</a></li>
+ <li><a id="J_show_community" class="show_community" onclick="document.getElementById('J_community_image').classList.toggle('active');this.classList.toggle('active');">Community</a>
+ <div style="overflow:hidden; width:0; height:0;position:absolute; top:-800px;">
+ <img src="https://img.alicdn.com/tfs/TB1kCs_er_I8KJjy1XaXXbsxpXa-419-495.png" width="400"/>
+ </div>
+ <img src="https://img.alicdn.com/tfs/TB1fjeQLpzqK1RjSZFvXXcB7VXa-1368-596.png" class="community-img" id="J_community_image" /></li>
</ul>
</nav>
<a href="https://github.com/alibaba/weex-ui" class="github-corner" aria-label="View source on Github" target="_blank">
diff --git a/index.html b/index.html
index 68fb51d..3615702 100644
--- a/index.html
+++ b/index.html
@@ -37,6 +37,7 @@
'/cn/faq': 'docs/faq_cn.md',
'/cn/who_use': 'docs/who_use.md',
'/cn/CHANGELOG': 'CHANGELOG_cn.md',
+ '/cn/CONTRIBUTING': 'CONTRIBUTING_cn.md',
'/cn/weex-ui-weex-conf-2018': 'docs/weex-ui-weex-conf-2018',
'/cn/weex-ui-report': 'docs/weex-ui-report'
},
diff --git a/packages/wxc-icon/README.md b/packages/wxc-icon/README.md
index e84d206..28eec81 100644
--- a/packages/wxc-icon/README.md
+++ b/packages/wxc-icon/README.md
@@ -32,7 +32,7 @@
| Prop | Type | Required | Default | Description |
| ---- |:----:|:---:|:-------:| :----------:|
| **`name`** | `string` | `Y` | `-` | icon name (*1)|
-| **`size`** | `String` | `N` | `small` | icon size `xs`/`small`/`medium`/`large`|
+| **`size`** | `String` | `N` | `small` | icon size `xs`/`small`/`medium`/`big`|
| **`icon-style`** | `Object` | `N` | `{}` |style override (*2)|
- *1：icon name list：`['less', 'more_unfold', 'back', 'more', 'add', 'subtract', 'close', 'cry', 'search', 'delete', 'help', 'refresh', 'success', 'warning', 'wrong', 'clock', 'scanning', 'filter', 'map', 'play']`
diff --git a/packages/wxc-icon/README_cn.md b/packages/wxc-icon/README_cn.md
index d5d92fe..9fea604 100644
--- a/packages/wxc-icon/README_cn.md
+++ b/packages/wxc-icon/README_cn.md
@@ -31,7 +31,7 @@
| Prop | Type | Required | Default | Description |
| ---- |:----:|:---:|:-------:| :----------:|
| **`name`** | `string` | `Y` | `-` | icon 的名称 (注1)|
-| **`size`** | `String` | `N` | `small` | icon的尺寸 `xs`/`small`/`medium`/`large`|
+| **`size`** | `String` | `N` | `small` | icon的尺寸 `xs`/`small`/`medium`/`big`|
| **`icon-style`** | `Object` | `N` | `{}` |样式覆盖 (注2)|
- 注1：icon的名称详细如下：`['less', 'more_unfold', 'back', 'more', 'add', 'subtract', 'close', 'cry', 'search', 'delete', 'help', 'refresh', 'success', 'warning', 'wrong', 'clock', 'scanning', 'filter', 'map', 'play']`
diff --git a/packages/wxc-popup/index.vue b/packages/wxc-popup/index.vue
index ed941c0..bb24b9a 100644
--- a/packages/wxc-popup/index.vue
+++ b/packages/wxc-popup/index.vue
@@ -53,8 +53,6 @@
<script>
const animation = weex.requireModule('animation');
- const { platform } = weex.config.env;
- const isWeb = typeof (window) === 'object' && platform.toLowerCase() === 'web';
import WxcOverlay from '../wxc-overlay';
export default {
diff --git a/packages/wxc-rich-text/wxc-rich-text-text.vue b/packages/wxc-rich-text/wxc-rich-text-text.vue
index 33a1aad..0191424 100644
--- a/packages/wxc-rich-text/wxc-rich-text-text.vue
+++ b/packages/wxc-rich-text/wxc-rich-text-text.vue
@@ -58,19 +58,12 @@
},
computed: {
themeStyle () {
- let style = {};
- const textStyle = this.textStyle;
- if (textStyle && textStyle.fontSize) {
+ let style = { ...this.textStyle };
+ if (style && (style.fontSize || style['font-size'])) {
style = {
...style,
- fontSize: `${textStyle.fontSize}px`,
- height: `${textStyle.fontSize * 1.2}px`
- }
- }
- if (textStyle && textStyle.color) {
- style = {
- ...style,
- color: textStyle.color
+ fontSize: `${style.fontSize || style['font-size']}px`,
+ height: `${(style.fontSize || style['font-size']) * 1.2}px`
}
}
return style;
diff --git a/packages/wxc-stepper/index.vue b/packages/wxc-stepper/index.vue
index 1174d59..0e0998a 100644
--- a/packages/wxc-stepper/index.vue
+++ b/packages/wxc-stepper/index.vue
@@ -161,8 +161,14 @@
this.correctInputValue(e.value);
},
correctInputValue (v) {
+ const lastValue = this.value;
if (/^[1-9]\d{0,}$/.test(v) && parseInt(v, 10) >= this.min && parseInt(v, 10) <= this.max) {
this.value = parseInt(v, 10);
+ } else {
+ this.value = '';
+ setTimeout(() => {
+ this.value = lastValue;
+ }, 1);
}
this.$emit('wxcStepperValueChanged', { value: this.value });
},
