🔀 merge master

CHANGELOG.md

@@ -1,26 +1,32 @@
 # Change Log
 
+## 0.8.5
+- [!] wxc-dialog: 文档上补充上 `show` 参数
+- [!] wxc-mask: 修正了单击“关闭”按钮和单击“覆盖”之间不一致行为的错误
+- [+] wxc-pan-item: 使用元素前添加判断
+
+
 ## 0.8.4
-- [+] [wxc-lightbox](https://apache.github.io/incubator-weex-ui/#/cn/packages/wxc-lightbox) add `show-indicator` param to show indicator
+- [+] [wxc-lightbox](https://apache.github.io/incubator-weex-ui/#/cn/packages/wxc-lightbox/) add `show-indicator` param to show indicator
 
 ## 0.8.3
-- [+] [wxc-loading](https://apache.github.io/incubator-weex-ui/#/packages/wxc-loading) add `loading-pic` param.
-- [+] [wxc-loading](https://apache.github.io/incubator-weex-ui/#/packages/wxc-slider-bar) add `block-color` param.
+- [+] [wxc-loading](https://apache.github.io/incubator-weex-ui/#/packages/wxc-loading/) add `loading-pic` param.
+- [+] [wxc-loading](https://apache.github.io/incubator-weex-ui/#/packages/wxc-slider-bar/) add `block-color` param.
 
 ## 0.8.0
-- [!]From alibaba/weex-ui to [apcahe/incubator-weex-ui](https://github.com/apache/incubator-weex-ui) 
+- [!]From alibaba/weex-ui to [apcahe/incubator-weex-ui](https://github.com/apache/incubator-weex-ui)
 
 ## 0.7.1
-- [+] [wxc-slider-bar](https://apache.github.io/incubator-weex-ui/#/packages/wxc-slider-bar) add `wxcSliderBarTouchEnd` event.
-- [!] Fixed [wxc-mask](https://apache.github.io/incubator-weex-ui/#/packages/wxc-mask) jitter bug when inputting.
+- [+] [wxc-slider-bar](https://apache.github.io/incubator-weex-ui/#/packages/wxc-slider-bar/) add `wxcSliderBarTouchEnd` event.
+- [!] Fixed [wxc-mask](https://apache.github.io/incubator-weex-ui/#/packages/wxc-mask/) jitter bug when inputting.
 - [!] Fixed the problem that the QR code does not display when debugging.
 
 ## 0.7.0
 - [-] Remove alipay util,Preventing audit issues [issue/467](https://github.com/apache/incubator-weex-ui/issues/467)
-- [!] [wxc-tab-bar](https://apache.github.io/incubator-weex-ui/#/packages/wxc-tab-bar) add `supportXBar` param.
+- [!] [wxc-tab-bar](https://apache.github.io/incubator-weex-ui/#/packages/wxc-tab-bar/) add `supportXBar` param.
 
 ## 0.6.16
-- [+] [wxc-pan-item](https://apache.github.io/incubator-weex-ui/#/packages/wxc-pan-item/) add `extId` when  pan. [issue/441](https://github.com/apache/incubator-weex-ui/issues/441)
+- [+] [wxc-pan-item](https://apache.github.io/incubator-weex-ui/#/packages/wxc-tab-page/?id=wxc-pan-item) add `extId` when  pan. [issue/441](https://github.com/apache/incubator-weex-ui/issues/441)
 
 ## 0.6.15
 - [!] [wxc-swipe-action](https://apache.github.io/incubator-weex-ui/#/packages/wxc-swipe-action/)fix delete the last data item, then click on another item to report the error.

CHANGELOG_cn.md

@@ -1,28 +1,33 @@
 # 升级日志
 
+## 0.8.5
+- [!] wxc-dialog: supplement missing parameters ` show` in document
+- [!] wxc-mask: fix bug that inconsistent behavior between clicking close button and clicking overlay
+- [+] wxc-pan-item: add judgment before using element
+
 ## 0.8.4
-- [+] [wxc-lightbox](https://apache.github.io/incubator-weex-ui/#/cn/packages/wxc-lightbox) 增加 `show-indicator` 参数控制是否显示indicator
+- [+] [wxc-lightbox](https://apache.github.io/incubator-weex-ui/#/cn/packages/wxc-lightbox/) 增加 `show-indicator` 参数控制是否显示indicator
 
 ## 0.8.3
-- [+] [wxc-loading](https://apache.github.io/incubator-weex-ui/#/cn/packages/wxc-loading) 增加 `loading-pic` 参数用于覆盖原有 loading 图片.
-- [+] [wxc-loading](https://apache.github.io/incubator-weex-ui/#/cn/packages/wxc-slider-bar) 增加 `block-color` 参数用于覆盖原有滑块颜色.
+- [+] [wxc-loading](https://apache.github.io/incubator-weex-ui/#/cn/packages/wxc-loading/) 增加 `loading-pic` 参数用于覆盖原有 loading 图片.
+- [+] [wxc-loading](https://apache.github.io/incubator-weex-ui/#/cn/packages/wxc-slider-bar/) 增加 `block-color` 参数用于覆盖原有滑块颜色.
 
 ## 0.8.0
-- [!]从 alibaba/weex-ui 迁移到 [apcahe/incubator-weex-ui](https://github.com/apache/incubator-weex-ui) 
+- [!]从 alibaba/weex-ui 迁移到 [apcahe/incubator-weex-ui](https://github.com/apache/incubator-weex-ui)
 
 
 ## 0.7.1
-- [+] [wxc-slider-bar](https://apache.github.io/incubator-weex-ui/#/cn/packages/wxc-slider-bar) 新增 `wxcSliderBarTouchEnd` 事件.
-- [!] 修复 [wxc-mask](https://apache.github.io/incubator-weex-ui/#/cn/packages/wxc-mask) 输入时候抖动问题
+- [+] [wxc-slider-bar](https://apache.github.io/incubator-weex-ui/#/cn/packages/wxc-slider-bar/) 新增 `wxcSliderBarTouchEnd` 事件.
+- [!] 修复 [wxc-mask](https://apache.github.io/incubator-weex-ui/#/cn/packages/wxc-mask/) 输入时候抖动问题
 - [!] 修复调试时候 console 不显示二维码的问题
 
 
 ## 0.7.0
 - [-] 移除支付宝判断，防止审核问题 [issue/467](https://github.com/apache/incubator-weex-ui/issues/467)
-- [!] [wxc-tab-bar](https://apache.github.io/incubator-weex-ui/#/cn/packages/wxc-tab-bar) 增加 `supportXBar` 参数可用于设置不要 iPhone X 底部 bar 的增高兼容效果
+- [!] [wxc-tab-bar](https://apache.github.io/incubator-weex-ui/#/cn/packages/wxc-tab-bar/) 增加 `supportXBar` 参数可用于设置不要 iPhone X 底部 bar 的增高兼容效果
 
 ## 0.6.16
-- [+] [wxc-pan-item](https://apache.github.io/incubator-weex-ui/#/cn/packages/wxc-pan-item/) 滑动时候新增 `extId` 回调  [issue/441](https://github.com/apache/incubator-weex-ui/issues/441)
+- [+] [wxc-pan-item](https://apache.github.io/incubator-weex-ui/#/cn/packages/wxc-tab-page/?id=wxc-pan-item-%E7%9A%84%E4%BD%BF%E7%94%A8) 滑动时候新增 `extId` 回调  [issue/441](https://github.com/apache/incubator-weex-ui/issues/441)
 
 ## 0.6.15
 - [!] 解决[wxc-swipe-action](https://apache.github.io/incubator-weex-ui/#/cn/packages/wxc-swipe-action/)删除最后一个数据项，再点击其他项动画报错

README.md

@@ -23,7 +23,7 @@
 
 <img src="https://img.alicdn.com/tfs/TB1O2ulhgoQMeJjy0FoXXcShVXa-1282-986.jpg" width=540/>
 
-Try [**it**](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) with Fliggy、Taobao、Tmall、Weex Playground or any browsers now!
+Try [**it**](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) with Fliggy, Taobao, Tmall, Weex Playground or any browsers now!
 
 ## Installation
 
@@ -72,7 +72,7 @@ npm i weex-ui -S
 ### Before use
 
 In order to not pack all the components, you need to use [`babel-plugin-component`](https://www.npmjs.com/package/babel-plugin-component) to import the specified component.
-At the same time, if you haven't installed `babel-preset-stage-0`, its necessary to install it.
+At the same time, if you haven't installed `babel-preset-stage-0`, it's necessary to install it.
 
 ```shell
 npm i babel-preset-stage-0 babel-plugin-component -D
@@ -96,10 +96,10 @@ npm i babel-preset-stage-0 babel-plugin-component -D
 
 ### More
 
-* If babel-loader in `webpack.config.js` has a exclude for node_modules, please turn on for week-ui as `exclude: /node_modules(?!(\/|\\).*(weex).*)/`.
+* If babel-loader in `webpack.config.js` has a exclude for node_modules, please turn on for weex-ui as `exclude: /node_modules(?!(\/|\\).*(weex).*)/`.
 * In order to get the latest features, please focus on the [ChangeLog](https://github.com/apache/incubator-weex-ui/releases) and often update `weex-ui` to the latest.
-* Many questions can be found from [faq](https://apache.github.io/incubator-weex-ui/#/faq) and [issue list](https://github.com/apache/incubator-weex-ui/issues?utf8=%E2%9C%93&q=), if you find a new bug, just file a [issue](https://github.com/apache/incubator-weex-ui/issues/new).
-* More experience in Weex construction can be learned from [Weex + Ui - Weex Conf 2018](https://apache.github.io/incubator-weex-ui/#/docs/weex-ui-weex-conf-2018) ,welcome to translate it.
+* Many questions can be found in the [faq](https://apache.github.io/incubator-weex-ui/#/docs/faq) and [issue list](https://github.com/apache/incubator-weex-ui/issues?utf8=%E2%9C%93&q=), if you find a new bug, just file an [issue](https://github.com/apache/incubator-weex-ui/issues/new).
+* More experience in Weex construction can be learned from [Weex + Ui - Weex Conf 2018](https://apache.github.io/incubator-weex-ui/#/docs/weex-ui-weex-conf-2018), welcome to translate it.
 
 ## Development
 

docs/faq.md

@@ -1,12 +1,12 @@
 ## FAQ
 
-#### wxc-ep-slider、wxc-slider-bar Can't slide
+#### wxc-ep-slider, wxc-slider-bar Can't slide
 - The two components in Weex Ui now depend on an innovative interaction feature called [BindingX](https://alibaba.github.io/bindingx/), And this feature is already open source, please refer to github [to import](https://github.com/alibaba/bindingx#installation).
 
 
 #### Suggestions for using images in Weex.
 - Use CDN image：It is recommended to use, and to ensure that the actual size and size of the image is consistent with what you need to show.
-- Use local image：Weex’s native runtime support load image file from device’s disk, all you have to do set the file url like file:///sdcard/image_new0.png,More you can see [here](http://blog.csdn.net/codingfire/article/details/79528639), At the same time, Weex does not support the loading of image files in your project, nor does it support the direct use of local images by downgrade Web version. Therefore, it is recommended to use the CDN image link.
+- Use local image：Weex’s native runtime support load image file from device’s disk, all you have to do set the file url like file:///sdcard/image_new0.png. See more [here](http://blog.csdn.net/codingfire/article/details/79528639). At the same time, Weex does not support the loading of image files in your project, nor does it support the direct use of local images by downgrade Web version. Therefore, it is recommended to use the CDN image link.
 - Use Base64：This depends on native image library resolution, but it is not recommended to use more than 2k Base64 in Weex, which makes the bundle too large to affect performance.
 
 #### Module not found: Error: Can't resolve 'weex-ui/packages/wxc-button/style.css'
@@ -32,14 +32,14 @@
    ```
 
 #### vue.runtime.js:478 [Vue warn]: Cannot find element: #root
-- The default config of weex project create by weex-toolkit will generate entry config automatically, but this project has already used entry.js as entry config in webpack,Details of the cause are visible in [pull/21](https://github.com/zwwill/yanxuan-weex-demo/pull/21).
+- The default config of weex project created by weex-toolkit will generate entry config automatically, but this project has already used entry.js as entry config in webpack. Details of the cause are visible in [pull/21](https://github.com/zwwill/yanxuan-weex-demo/pull/21).
 
 #### GIF images have no animation on Android
 - This is supported by the underlying image library, More you can refer to [Weex 踩坑之 Gif 加载](https://zhoukekestar.github.io/notes/2017/07/17/weex-gif.html).
 
 #### Does Weex Ui support the horizontal screen ？
 
-- I'm sorry,Now Weex doesn't support horizontal screen, so Weex Ui doesn't have any horizontal screen mode yet. When Weex supports it, it will follow immediately.
+- I'm sorry, Weex currently doesn't support horizontal screen, so Weex Ui doesn't have any horizontal screen mode yet. When Weex supports it, it will follow immediately.
 - You can send a message to weex at the horizontal screen, Then handle this in your code.
 
   ```js
@@ -104,4 +104,4 @@
  ```
 
 ---- 
-More questions can be found from the [issue list](https://github.com/apache/incubator-weex-ui/issues?utf8=%E2%9C%93&q=), If you find a new bug, Just file a  [issue](https://github.com/apache/incubator-weex-ui/issues/new).
+More questions can be found from the [issue list](https://github.com/apache/incubator-weex-ui/issues?utf8=%E2%9C%93&q=). If you find a new bug, Just file an [issue](https://github.com/apache/incubator-weex-ui/issues/new).

docs/with-weex-toolkit.md

@@ -2,7 +2,7 @@
 
 ### Before installing
 
-Before installing, It`s recommended that your Node version >= 8.0, Also recommended to use [n](https://github.com/tj/n) for version management, while suggesting NPM version >= 5
+Before installing, It's recommended that your Node version >= 8.0, Also recommended to use [n](https://github.com/tj/n) for version management. We also suggest NPM version >= 5
 
 How to see
 

package.json

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

packages/wxc-dialog/README.md

@@ -72,6 +72,7 @@ More details can be found in [here](https://github.com/apache/incubator-weex-ui/
 
 | Prop | Type | Required | Default | Description |
 |-------------|------------|--------|-----|-----|
+| show | `Boolean` | `N` | `false` | Whether the dialog is show or not |
 | title | `String` | `Y` | `-` | title (only transparent) |
 | content | `String` | `N` | `-`| content |
 | left | `Number` |`N`| `0` | move left distance  |

packages/wxc-dialog/README_cn.md

@@ -72,6 +72,7 @@
 
 | Prop | Type | Required | Default | Description |
 |-------------|------------|--------|-----|-----|
+| show | `Boolean` | `N` | `false` | 对话框是否可见 |
 | title | `String` | `Y` | `-` | 标题 |
 | left | `Number` |`N`| `0` | 向左移动距离  |
 | content | `String` | `N` | `-`| 内容说明描述 |

packages/wxc-mask/index.vue

@@ -22,7 +22,8 @@ under the License.
 
 <template>
   <div class="container">
-    <wxc-overlay :show="show && hasOverlay"
+    <wxc-overlay ref="overlay"
+                 :show="show && hasOverlay"
                  v-if="show"
                  v-bind="mergeOverlayCfg"
                  :can-auto-close="overlayCanClose"
@@ -191,7 +192,10 @@ under the License.
     },
     methods: {
       closeIconClicked () {
-        this.appearMask(false);
+        this.$refs.overlay.appearOverlay(false);
+        if (!this.overlayCanClose) {
+          this.appearMask(false);
+        }
       },
       wxcOverlayBodyClicking () {
         if (this.hasAnimation) {

packages/wxc-pan-item/index.vue

@@ -63,10 +63,12 @@ under the License.
       setTimeout(() => {
         if (this.supportAndroid && this.needSlider) {
           const element = this.$refs['wxc-pan-item'];
-          Binding.prepare && Binding.prepare({
-            anchor: element.ref,
-            eventType: 'pan'
-          });
+          if (element) {
+            Binding.prepare && Binding.prepare({
+              anchor: element.ref,
+              eventType: 'pan'
+            });
+          }
         }
       }, 300)
     },

packages/wxc-result/README.md

@@ -4,7 +4,7 @@
 
 ### Rule
   - Used for error pages to reduce user anxiety.
-  - You can configure this [type.js#L5](https://github.com/apache/incubator-weex-ui/blob/master/example/result/type.js#L5) for custom errors
+  - You can configure this [type.js](https://github.com/apache/incubator-weex-ui/blob/master/packages/wxc-result/type.js) for custom errors
 
 
 ## [Demo](https://h5.m.taobao.com/trip/wx-detection-demo/result/index.html?_wx_tpl=https%3A%2F%2Fh5.m.taobao.com%2Ftrip%2Fwx-detection-demo%2Fresult%2Findex.weex.js)
@@ -48,7 +48,7 @@ More details can be found in [here](https://github.com/apache/incubator-weex-ui/
 | type | `String` |`N`| `errorPage`|`errorPage、noNetwork、noGoods、errorLocation`|
 | show | `Boolean` |`N`| `true` | whether to show |
 | padding-top | `Number` |`N`| `240` | padding top from screen |
-| custom-set | `Object` |`N`| `{}` |custom config [type.js#L4](https://github.com/apache/incubator-weex-ui/blob/master/example/result/type.js#L4)|
+| custom-set | `Object` |`N`| `{}` |custom config [type.js](https://github.com/apache/incubator-weex-ui/blob/master/packages/wxc-result/type.js)|
 | wrap-style | `Object` | `N`|`{}` | custom wrap style|
 
 ### Custom Config

packages/wxc-result/README_cn.md

@@ -4,7 +4,7 @@
 
 ### 规则
   - 用于出错的页面，减少用户焦虑感
-  - 配置 [type.js#L5](https://github.com/apache/incubator-weex-ui/blob/master/example/result/type.js#L5) 来定制化
+  - 配置 [type.js](https://github.com/apache/incubator-weex-ui/blob/master/packages/wxc-result/type.js) 来定制化
 
 
 ## [Demo](https://h5.m.taobao.com/trip/wx-detection-demo/result/index.html?_wx_tpl=https%3A%2F%2Fh5.m.taobao.com%2Ftrip%2Fwx-detection-demo%2Fresult%2Findex.weex.js)
@@ -49,7 +49,7 @@
 | type | `String` |`N`| `errorPage`|`errorPage、noNetwork、noGoods、errorLocation`|
 | show | `Boolean` |`N`| `true` | 是否显示 |
 | padding-top | `Number` |`N`| `240` | 图案距离顶部高度 |
-| custom-set | `Object` |`N`| `{}` | 自定义覆盖 [type.js#L4](https://github.com/apache/incubator-weex-ui/blob/master/example/result/type.js#L4)|
+| custom-set | `Object` |`N`| `{}` | 自定义覆盖 [type.js](https://github.com/apache/incubator-weex-ui/blob/master/packages/wxc-result/type.js)|
 | wrap-style | `Object` | `N`|`{}` | 外层 wrap 样式自定义 |
 
 ### 自定义配置案例

packages/wxc-swipe-action/index.vue

@@ -89,8 +89,8 @@ export default {
       default: () => ({
         backgroundColor: '#dddddd',
         borderTopColor: '#dddddd',
-        borderTopWidth: 1,
-      }),
+        borderTopWidth: 1
+      })
     },
     data: {
       type: Array,
@@ -150,7 +150,7 @@ export default {
         this.movingDistance(webEndX - this.webStarX, node, this.$refs.skid[i]);
       }
     },
-    onPanStart: function(e, node, i) {
+    onPanStart(e, node, i) {
       const { saveIdx } = this;
       if (saveIdx !== i && saveIdx !== null && this.$refs.skid[saveIdx]) {
         this.special(this.$refs.skid[saveIdx], {

packages/wxc-tab-bar/README.md

@@ -3,7 +3,7 @@
 > Bottom tab bar
 
 ### Rule
-- For the bottom Tab slider page, currently support **icon 、text 、iconFont ** form of the bottom bar.
+- For the bottom Tab slider page, currently support **icon, text, iconFont ** form of the bottom bar.
 
 ## [Demo](https://h5.m.taobao.com/trip/wx-detection-demo/tab-bar/index.html?_wx_tpl=https%3A%2F%2Fh5.m.taobao.com%2Ftrip%2Fwx-detection-demo%2Ftab-bar%2Findex.weex.js)