Merge pull request #591 from franksun1988/patch-input
删除max-length属性
diff --git a/docs/.vuepress/data/who-is-using-weex.js b/docs/.vuepress/data/who-is-using-weex.js
index 416cb29..5c3c378 100644
--- a/docs/.vuepress/data/who-is-using-weex.js
+++ b/docs/.vuepress/data/who-is-using-weex.js
@@ -311,5 +311,12 @@
icon: 'https://is1-ssl.mzstatic.com/image/thumb/Purple113/v4/0b/14/e3/0b14e352-008d-dcbe-61fd-69f3d4ca3bca/AppIcon-0-0-1x_U007emarketing-0-0-0-5-0-85-220.png/246x0w.png',
iOS:'https://apps.apple.com/cn/app/id1268483731',
android: 'https://sj.qq.com/myapp/detail.htm?apkName=com.zhaopin.ihr'
+ },
+ {
+ name_CN: 'AI快销进销存',
+ name_EN: 'AI kuai xiao ERP',
+ icon: 'http://aikuaixiao-sys.oss-cn-shanghai.aliyuncs.com/logo.png',
+ iOS:'https://apps.apple.com/cn/app/id1454492001',
+ android: 'https://sj.qq.com/myapp/detail.htm?apkName=com.aikuaixiao'
}
];
diff --git a/docs/docs/components/input.md b/docs/docs/components/input.md
index df4ba98..eb1f4d9 100644
--- a/docs/docs/components/input.md
+++ b/docs/docs/components/input.md
@@ -141,7 +141,7 @@
- [input with normal content and binding actions Example] (http://dotwe.org/vue/c2c9a853e5184d8ade57d1d93432f31f)
- [ date & time Example ](http://dotwe.org/vue/23ec083078356ef0e31618164e5a184b)
-- [return-key-type Example](http://dotwe.org/vue/703c94a1db921df110a11ce33b42c0d7)
+- [return-key-type Example](http://dotwe.org/vue/2ab797dc2ffe865f33a5727d0fdd2408)
- [setTextFormatter Example](http://dotwe.org/vue/bea3cb0cad697829d8d343552a2b7b77)
- [Other Examples](http://dotwe.org/vue/aec5342b15d3c01b3b427384a71b0874)
diff --git a/docs/docs/events/common-events.md b/docs/docs/events/common-events.md
index 2aeddaa..32a73af 100644
--- a/docs/docs/events/common-events.md
+++ b/docs/docs/events/common-events.md
@@ -18,7 +18,7 @@
Weex add attribute `eventPenetrationEnabled` to `<div>` component. When the value is `true`(default would be `false`), the view's children views still respond to the event normally, while the view itself will not respond to the event, but pass the event to the lower level View.
-[Event penetration](https://jsplayground.taobao.org/raxplayground/c230a32e-489c-4fda-ae90-40faa6aaafbc??from=)
+[Event penetration](http://dotwe.org/vue/5d8bc374a939e135374be18fa08608dd)
## View interactivity
diff --git a/docs/zh/docs/components/input.md b/docs/zh/docs/components/input.md
index 34c846c..3f9a895 100644
--- a/docs/zh/docs/components/input.md
+++ b/docs/zh/docs/components/input.md
@@ -30,7 +30,7 @@
| `placeholder` | string | 提示用户可以输入什么。 提示文本不能有回车或换行 | | |
| `autofocus` | boolean | 布尔类型的数据,表示是否在页面加载时控件自动获得输入焦点 | | |
| `maxlength` | nubmer | 一个数值类型的值,表示输入的最大长度 | | |
-| `return-key-type` | string | 键盘返回键的类型(即手机输入法右下角回车按钮的地方)<br /><img src="https://img.alicdn.com/tfs/TB1GSs7n9zqK1RjSZFLXXcn2XXa-311-156.png" height="100px" width="200px" /> | | 支持 defalut;go;next;search;send,done <br /> [查看示例](http://dotwe.org/vue/703c94a1db921df110a11ce33b42c0d7) | |
+| `return-key-type` | string | 键盘返回键的类型(即手机输入法右下角回车按钮的地方)<br /><img src="https://img.alicdn.com/tfs/TB1GSs7n9zqK1RjSZFLXXcn2XXa-311-156.png" height="100px" width="200px" /> | | 支持 defalut;go;next;search;send,done <br /> [查看示例](http://dotwe.org/vue/2ab797dc2ffe865f33a5727d0fdd2408) | |
| `singleline` | boolean | 控制内容是否只允许单行 | true | |
| `max` | string | 控制当 type 属性为 date 时选择日期的最大时间,格式为 yyyy-MM-dd | | |
| `min` | string | 控制当 type 属性为 date 时选择日期的最小时间,格式为 yyyy-MM-dd | | |
@@ -131,7 +131,7 @@
- [date + time 示例(手机扫码查看)](http://dotwe.org/vue/23ec083078356ef0e31618164e5a184b)
-* [return-key-type 示例(手机扫码查看)](http://dotwe.org/vue/703c94a1db921df110a11ce33b42c0d7)
+* [return-key-type 示例(手机扫码查看)](http://dotwe.org/vue/2ab797dc2ffe865f33a5727d0fdd2408)
* [setTextFormatter 示例(手机扫码查看)](http://dotwe.org/vue/bea3cb0cad697829d8d343552a2b7b77)
diff --git a/docs/zh/docs/components/list.md b/docs/zh/docs/components/list.md
index 85ad2bc..ca4d0c0 100644
--- a/docs/zh/docs/components/list.md
+++ b/docs/zh/docs/components/list.md
@@ -89,7 +89,35 @@
## 事件
* `loadmore` 事件
- 如果列表滚动到底部将会立即触发这个事件,你可以在这个事件的处理函数中加载下一页的列表项。 如果未触发,请检查是否设置了loadmoreoffset的值,建议此值设置大于0
+ 如果列表滚动到底部将会立即触发这个事件,你可以在这个事件的处理函数中加载下一页的列表项。 如果未触发,请检查是否设置了loadmoreoffset的值,建议此值设置大于0 ,并且可以通过重置loadmore方式达到目的
+
+`如何重置`
+```javascipt
+<template>
+ <list ref="list">
+ <cell v-for="num in lists">
+ <text>{{num}}</text>
+ </cell>
+ </list>
+</template>
+
+<script>
+ export default {
+ data () {
+ return {
+ lists: ['A', 'B', 'C', 'D', 'E']
+ }
+ },
+ methods: {
+ // 重置 loadmore
+ resetLoadMore() {
+ this.$refs["list"].resetLoadmore();
+ }
+ }
+ }
+</script>
+```
+
* `scroll` 事件
列表发生滚动时将会触发该事件,事件的默认抽样率为 10px,即列表每滚动 10px 触发一次,可通过属性 offset-accuracy 设置抽样率。
diff --git a/docs/zh/docs/events/common-events.md b/docs/zh/docs/events/common-events.md
index 37957e8..721d66f 100644
--- a/docs/zh/docs/events/common-events.md
+++ b/docs/zh/docs/events/common-events.md
@@ -12,7 +12,7 @@
Weex在`<div>`组件中增加了`eventPenetrationEnabled`属性,当值为`true`(默认为`false`)时,View的子View仍能正常响应事件,但View自身将不会响应事件。
-[示例](https://jsplayground.taobao.org/raxplayground/c230a32e-489c-4fda-ae90-40faa6aaafbc??from=)
+[示例](http://dotwe.org/vue/5d8bc374a939e135374be18fa08608dd)
## View交互性
diff --git a/docs/zh/docs/modules/stream.md b/docs/zh/docs/modules/stream.md
index a3cca98..6f4cb90 100644
--- a/docs/zh/docs/modules/stream.md
+++ b/docs/zh/docs/modules/stream.md
@@ -29,7 +29,7 @@
* **`ok`**, boolean, 如果状态码在 200-299 之间就为 true
* **`statusText`**, string, 状态描述文本
* **`data`**, string, 返回的数据,如果请求类型是 `json` 和 `jsonp`,则它就是一个 `object` ,否则是一个 `string`。
- * **`headers`**, object, rHTTP 响应头
+ * **`headers`**, object, HTTP 响应头
* **@progressCallback**, function, a progress callback. This callback will be invoked before request finished.
* **`readyState`**, number, 当前状态,`1`: 请求连接中;`2`: 返回响应头中;`3`: 正在加载返回数据
diff --git a/docs/zh/docs/styles/common-styles.md b/docs/zh/docs/styles/common-styles.md
index 5891e00..d274add 100644
--- a/docs/zh/docs/styles/common-styles.md
+++ b/docs/zh/docs/styles/common-styles.md
@@ -47,7 +47,7 @@
### 内边距
`padding {length}`:内边距,内容和边框之间的距离,默认值 0。与标准 CSS 类似,`padding` 支持简写,也可分解为以下四个:
- * `padding {length}`: 上、下、左、右四边内边距,默认值 0
+ * `padding {length}`: 上、右、下、左四边内边距,默认值 0
* `padding-left {length}`:左内边距,默认值 0
* `padding-right {length}`:右内边距,默认值 0
* `padding-top {length}`:上内边距,默认值 0
@@ -111,7 +111,7 @@
### 外边距
`margin {length}`:外边距,元素和元素之间的空白距离,默认值 0。与标准 CSS 类似,`margin` 支持简写,也可分解为四边:
- * `margin {length}`: 上、下、左、右四边外边距,默认值 0
+ * `margin {length}`: 上、右、下、左四边外边距,默认值 0
* `margin-left {length}`:左外边距,默认值 0
* `margin-right {length}`:右外边距,默认值 0
* `margin-top {length}`:上外边距,默认值 0