* [doc] merge scroller&dom&slider file update
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/5675ef71 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/5675ef71 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/5675ef71 Branch: refs/heads/dev Commit: 5675ef71f23ba5a15ec1b852f002db860b765220 Parents: 855f69b c4fa292 Author: tancy <ron...@gmail.com> Authored: Wed May 17 16:52:23 2017 +0800 Committer: tancy <ron...@gmail.com> Committed: Wed May 17 16:52:23 2017 +0800 ---------------------------------------------------------------------- doc/source/cn/references/components/list.md | 13 +++++++++++++ doc/source/cn/references/components/scroller.md | 15 +++++++++++++-- doc/source/cn/references/components/slider.md | 11 +++++------ doc/source/cn/references/modules/dom.md | 5 +++-- 4 files changed, 34 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5675ef71/doc/source/cn/references/components/list.md ---------------------------------------------------------------------- diff --cc doc/source/cn/references/components/list.md index e6cd20a,3cc3049..7c8b2b2 --- a/doc/source/cn/references/components/list.md +++ b/doc/source/cn/references/components/list.md @@@ -42,10 -42,8 +42,11 @@@ version: 2. ## ç¹æ§ - `loadmoreoffset {number}`ï¼é»è®¤å¼ä¸º 0ï¼è§¦å `loadmore` äºä»¶æéè¦çåç´å移è·ç¦»ï¼è®¾å¤å±å¹åºé¨ä¸ `<list>` åºé¨ä¹é´çè·ç¦»ï¼ãå½ `<list>` çæ»å¨æ¡æ»å¨å°è¶³å¤æ¥è¿ `<list>` åºé¨æ¶å°ä¼è§¦å `loadmore` è¿ä¸ªäºä»¶ã + - `offset-accuracy {number}` <sup class="wx-v">0.11+</sup>ï¼æ§å¶`onscroll`äºä»¶è§¦åçé¢çï¼é»è®¤å¼ä¸º10ï¼è¡¨ç¤ºä¸¤æ¬¡`onscroll`äºä»¶ä¹é´å表è³å°æ»å¨äº10pxã注æï¼å°è¯¥å¼è®¾ç½®ä¸ºè¾å°çæ°å¼ä¼æé«æ»å¨äºä»¶éæ ·ç精度ï¼ä½åæ¶ä¹ä¼éä½é¡µé¢çæ§è½ã + ![mobile_preview](../images/list_4.jpg) + +- `offset-accuracy`ï¼é»è®¤å¼æ¯0ï¼è§¦å `scroll` äºä»¶æéè¦çåç´å移è·ç¦»ã ## æ ·å¼ - éç¨æ ·å¼ï¼æ¯æææéç¨æ ·å¼ @@@ -61,13 -59,16 +62,22 @@@ ## äºä»¶ - `loadmore` <sup class="wx-v">0.5+</sup>ï¼å¦æå表æ»å¨å°åºé¨å°ä¼ç«å³è§¦åè¿ä¸ªäºä»¶ï¼ä½ å¯ä»¥å¨è¿ä¸ªäºä»¶çå¤çå½æ°ä¸å è½½ä¸ä¸é¡µçå表项ã + - `onscroll` <sup class="wx-v">0.11+</sup>: å表åçæ»å¨æ¶å°ä¼è§¦å该äºä»¶ï¼äºä»¶çé»è®¤æ½æ ·ç为10pxï¼å³å表æ¯æ»å¨10px触åä¸æ¬¡ï¼å¯éè¿å±æ§`offset-accuracy`设置æ½æ ·çã + + äºä»¶ä¸ event 对象å±æ§ï¼ + - `contentSize {Object}`ï¼å表çå 容尺寸 + - `width {number}`: å表å 容宽度 + - `height {number}`: å表å 容é«åº¦ + - `contentOffset {Object}`: å表çå移尺寸 + - `x {number}`: xè½´ä¸çå移é + - `y {number}`: yè½´ä¸çå移é + [ä½éªä¸ä¸](http://dotwe.org/bc445ede8746a31360e3607d210304c5) + +- `scroll` <sup class="wx-v">0.12+</sup>ï¼å表æ»å¨æ¶è§¦åè¿ä¸ªäºä»¶ãæ¤äºä»¶åè°ä¸ä¼ç»åºå½å`contentOffset`å¼ã + + [ä½éªä¸ä¸](http://dotwe.org/weex/5837c1b7f1f69e5adf1fc4cac0747c34) + - éç¨äºä»¶ æ¯æææéç¨äºä»¶ï¼ http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5675ef71/doc/source/cn/references/components/scroller.md ---------------------------------------------------------------------- diff --cc doc/source/cn/references/components/scroller.md index 4a9c374,175b3f7..dd74525 --- a/doc/source/cn/references/components/scroller.md +++ b/doc/source/cn/references/components/scroller.md @@@ -42,10 -41,9 +42,11 @@@ version: 2. ![mobile_preview](../images/scroller_1.jpg) - - `loadmoreretry {number}`ï¼é»è®¤å¼ä¸º 0ï¼å½ `loadmore` 失败æ¶æ¯å¦éç½® `loadmore` ç¸å ³ç UIï¼å¼ä¸ä¸æ ·å°±ä¼éç½®ã + - ~~`loadmoreretry {number}`ï¼é»è®¤å¼ä¸º 0ï¼å½ `loadmore` 失败æ¶æ¯å¦éç½® `loadmore` ç¸å ³ç UIï¼å¼ä¸ä¸æ ·å°±ä¼éç½®ã~~ 该å±æ§å·²åºå¼ï¼è¯·ä½¿ç¨`resetLoadmore()`å½æ°å®ç°éç½®`loadmore`çæä½ã + - `offset-accuracy {number}` <sup class="wx-v">0.11+</sup>ï¼æ§å¶`onscroll`äºä»¶è§¦åçé¢çï¼é»è®¤å¼ä¸º10ï¼è¡¨ç¤ºä¸¤æ¬¡`onscroll`äºä»¶ä¹é´å表è³å°æ»å¨äº10pxã注æï¼å°è¯¥å¼è®¾ç½®ä¸ºè¾å°çæ°å¼ä¼æé«æ»å¨äºä»¶éæ ·ç精度ï¼ä½åæ¶ä¹ä¼éä½é¡µé¢çæ§è½ã +- `offset-accuracy`ï¼é»è®¤å¼æ¯0ï¼è§¦å `scroll` äºä»¶æéè¦çåç´å移è·ç¦»ã + ## æ ·å¼ - éç¨æ ·å¼ï¼æ¯æææéç¨æ ·å¼ @@@ -61,8 -59,15 +62,15 @@@ ## äºä»¶ - `loadmore` <sup class="wx-v">v0.5+</sup>ï¼å¦ææ»å¨å°åºé¨å°ä¼ç«å³è§¦åè¿ä¸ªäºä»¶ï¼ä½ å¯ä»¥å¨è¿ä¸ªäºä»¶çå¤çå½æ°ä¸å è½½ä¸ä¸é¡µçå表项ã -- `onscroll` <sup class="wx-v">0.11+</sup>: å表åçæ»å¨æ¶å°ä¼è§¦å该äºä»¶ï¼äºä»¶çé»è®¤æ½æ ·ç为10pxï¼å³å表æ¯æ»å¨10px触åä¸æ¬¡ï¼å¯éè¿å±æ§`offset-accuracy`设置æ½æ ·çã ++- `scroll` <sup class="wx-v">0.11+</sup>: å表åçæ»å¨æ¶å°ä¼è§¦å该äºä»¶ï¼äºä»¶çé»è®¤æ½æ ·ç为10pxï¼å³å表æ¯æ»å¨10px触åä¸æ¬¡ï¼å¯éè¿å±æ§`offset-accuracy`设置æ½æ ·çã - - `scroll` <sup class="wx-v">0.12+</sup>ï¼å表æ»å¨æ¶è§¦åè¿ä¸ªäºä»¶ãæ¤äºä»¶åè°ä¸ä¼ç»åºå½å`contentOffset`å¼ã + äºä»¶ä¸ event 对象å±æ§ï¼ + - `contentSize {Object}`ï¼å表çå 容尺寸 + - `width {number}`: å表å 容宽度 + - `height {number}`: å表å 容é«åº¦ + - `contentOffset {Object}`: å表çå移尺寸 + - `x {number}`: xè½´ä¸çå移é + - `y {number}`: yè½´ä¸çå移é - éç¨äºä»¶ http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5675ef71/doc/source/cn/references/components/slider.md ---------------------------------------------------------------------- diff --cc doc/source/cn/references/components/slider.md index c07734b,049ff06..0a23c2e --- a/doc/source/cn/references/components/slider.md +++ b/doc/source/cn/references/components/slider.md @@@ -22,10 -22,8 +22,8 @@@ version: 2. 该å¼å³å®æ¯å¦èªå¨ææ¾è½®æãéç½® `loadmore` ç¸å ³ç UIï¼å¼ä¸ä¸æ ·å°±ä¼éç½®ã - `interval {number}`ï¼å¼ä¸ºæ¯«ç§æ°ï¼æ¤å¼è®¾å® slider åæ¢æ¶é´é´éãå½ `auto-play` å¼ä¸º `true` æ¶çæã -- +- `infinite {boolean}`ï¼å¾ªç¯ææ¾ï¼å¯éå¼ä¸º `true`/`false`ï¼é»è®¤çæ¯ `true`ã - - - `offset-x-accuracy {float}`ï¼è®¾å® `scroll`äºä»¶è§¦å精度ï¼ç²¾åº¦æ°å¼ä»£è¡¨æ»å¨è·ç¦»å ä¸é¡µå®½åº¦çæ¯ä¾ã + - `offset-x-accuracy {number}`<sup class="wx-v">0.11+</sup>ï¼æ§å¶`onscroll`äºä»¶è§¦åçé¢çï¼é»è®¤å¼ä¸º10ï¼è¡¨ç¤ºä¸¤æ¬¡`onscroll`äºä»¶ä¹é´Slider Pageè³å°æ»å¨äº10pxã注æï¼å°è¯¥å¼è®¾ç½®ä¸ºè¾å°çæ°å¼ä¼æé«æ»å¨äºä»¶éæ ·ç精度ï¼ä½åæ¶ä¹ä¼éä½é¡µé¢çæ§è½ã ## æ ·å¼ @@@ -45,10 -43,12 +43,11 @@@ äºä»¶ä¸ event 对象å±æ§ï¼ - `index`ï¼å±ç¤ºçå¾çç´¢å¼ - - - `scroll` <sup class="wx-v">0.11+</sup>ï¼æ»å¨æ¶è§¦åè¿ä¸ªäºä»¶ãæ¤äºä»¶åè°ä¸ä¼ç»åºå½å`offsetXRatio`å¼ã -- -- `onscroll` <sup class="wx-v">0.11+</sup>: å表åçæ»å¨æ¶å°ä¼è§¦å该äºä»¶ï¼äºä»¶çé»è®¤æ½æ ·ç为10pxï¼å³å表æ¯æ»å¨10px触åä¸æ¬¡ï¼å¯éè¿å±æ§`offset-accuracy`设置æ½æ ·çã - ++ - `scroll` <sup class="wx-v">0.11+</sup>: å表åçæ»å¨æ¶å°ä¼è§¦å该äºä»¶ï¼äºä»¶çé»è®¤æ½æ ·ç为10pxï¼å³å表æ¯æ»å¨10px触åä¸æ¬¡ï¼å¯éè¿å±æ§`offset-accuracy`设置æ½æ ·çã + [ä½éªä¸ä¸](http://dotwe.org/vue/832e8f50cc325975b9d3aba93a9f6c39) + äºä»¶ä¸ event 对象å±æ§ï¼ + - `offsetXRatio {number}`ï¼è¡¨ç¤ºå½å页é¢çå移æ¯ä¾ï¼åå¼èå´ä¸º[-1, 1]ï¼è´å¼è¡¨ç¤ºå左侧æ»å¨ï¼æ£å¼åå³ãä¾å¦ï¼`-0.2`表示å½åitemæ20%çåºå被æ»å¨å°slider左侧边ç以å¤ï¼`0.3`表示å½åitemæ30%çåºå被æ»å¨å°sliderå³ä¾§è¾¹ç以å¤ã + - éç¨äºä»¶ http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5675ef71/doc/source/cn/references/modules/dom.md ---------------------------------------------------------------------- diff --cc doc/source/cn/references/modules/dom.md index 6028de0,ed4f1c2..71a4bd9 --- a/doc/source/cn/references/modules/dom.md +++ b/doc/source/cn/references/modules/dom.md @@@ -29,8 -29,9 +29,9 @@@ version: 2. #### åæ° - `node {Node}`ï¼ä½ è¦æ»å¨å°çé£ä¸ªèç¹ - `options {Object}`ï¼å¦ä¸é项 -- - `offset {number}`ï¼ä¸ä¸ªå°å ¶å¯è§ä½ç½®çå移è·ç¦»ï¼é»è®¤æ¯ `0` - - `animated {bool}`ï¼è®¾ç½®æ¯å¦ææ»å¨å¨ç»ï¼é»è®¤æ¯ true - - `animated {boolean}` <sup class="wx-v">0.10+</sup>ï¼æ¯å¦éè¦é带æ»å¨å¨ç»ï¼é»è®¤æ¯`true` ++- `offset {number}`ï¼ä¸ä¸ªå°å ¶å¯è§ä½ç½®çå移è·ç¦»ï¼é»è®¤æ¯ `0` ++- `animated {boolean}` <sup class="wx-v">0.10+</sup>ï¼æ¯å¦éè¦é带æ»å¨å¨ç»ï¼é»è®¤æ¯`true` + #### ç¤ºä¾ ```html