Merge branch 'v2' of https://github.com/jdf2e/nutui into v2

.travis.yml

@@ -2,7 +2,6 @@ sudo: required
 language: node_js
 node_js:
   - '8'
-cache: npm
 script:
   - npm test
   - npm run coveralls

README-zh_CN.md

@@ -0,0 +1,61 @@
+# NutUI 2
+![npm version](https://img.shields.io/npm/v/@nutui/nutui.svg)  [![Build Status](https://api.travis-ci.org/jdf2e/nutui.svg?branch=master)](https://github.com/jdf2e/nutui/) [![Coverage Status](https://coveralls.io/repos/github/jdf2e/nutui/badge.svg?branch=master)](https://coveralls.io/github/jdf2e/nutui?branch=master) ![license](https://img.shields.io/npm/l/@nutui/nutui.svg)
+ 
+一套移动端轻量级Vue组件库
+    
+![NutUI](https://img11.360buyimg.com/uba/jfs/t1/11117/21/3608/18942/5c20ab52E35e5a500/02e3c1f89cd3dad1.png)
+
+简体中文 | [English](./README.md)
+
+## 特性
+
+* 跨平台，自动转微信小程序组件（稍后上线，敬请期待）
+* 全新的架构
+* 30+ 京东移动端项目正在使用
+* 参照京东APP 7.0 视觉规范
+* 支持按需加载
+* 详尽的文档和示例
+* 支持定制主题
+* 支持多语言（国际化）
+* 支持 TypeScript
+* 支持服务端渲染（Vue SSR）
+* 单元测试加持
+* 配套有基于Webpack的构建工具，可快速创建已内置本组件库的Vue工程 
+
+> 如需使用 1.x 版本，安装时请指定版本号，如： `npm i @nutui/nutui@1.3.2 -S`
+
+## 支持环境
+
+* Android 4.0+
+* iOS 8.0+
+* 支持 Vue 服务端渲染
+
+## 版本
+
+* 稳定版：[![npm](https://img.shields.io/npm/v/@nutui/nutui.svg)](https://www.npmjs.com/package/@nutui/nutui)
+
+> 你还可以订阅： https://github.com/jdf2e/nutui/releases.atom 来获得稳定版发布的通知。
+
+## 示例
+
+![NutUI Demo](https://img14.360buyimg.com/uba/jfs/t1/32118/11/559/2782/5c3d81ecEbda0c0f1/5f2b637d11817204.png)
+
+## 安装使用
+
+具体安装使用方法请参考 NutUI 官网 
+
+https://nutui.jd.com
+
+文档：[2.X](https://nutui.jd.com/default.html#/start) | [1.X](https://nutui.jd.com/1x/index.html#/intro)
+
+## 链接
+* [意见反馈](https://github.com/jdf2e/nutui/issues)
+* [更新日志](https://github.com/jdf2e/nutui/releases)
+* [按需加载插件](https://www.npmjs.com/package/@nutui/babel-plugin-separate-import)
+* [模板工程命令行工具(Gaea-cli)](https://github.com/jdf2e/Gaea4)
+* 联系我们：nutui@jd.com
+
+
+## 开源协议
+
+本项目基于 **MIT** 协议

README.cn.md

@@ -0,0 +1,60 @@
+# NutUI 2
+![npm version](https://img.shields.io/npm/v/@nutui/nutui.svg)  [![Build Status](https://api.travis-ci.org/jdf2e/nutui.svg?branch=master)](https://github.com/jdf2e/nutui/) [![Coverage Status](https://coveralls.io/repos/github/jdf2e/nutui/badge.svg?branch=master)](https://coveralls.io/github/jdf2e/nutui?branch=master) ![license](https://img.shields.io/npm/l/@nutui/nutui.svg)
+ 
+A light mobile Toolkit based on Vue
+    
+![NutUI](https://img11.360buyimg.com/uba/jfs/t1/11117/21/3608/18942/5c20ab52E35e5a500/02e3c1f89cd3dad1.png)
+
+
+## Features
+
+* Cross-platform，automatically convert to WeChat Mini Program components（coming soon）
+* New structure
+* Used by 30+ JD mobile projects
+* Refer to JD APP 7.0 visual specification
+* On-demand loading support
+* Detailed documents and examples
+* Customize themes support
+* Multiple languages support (Internationalization)
+* TypeScript support
+* Vue Server-side Rendering support（Vue SSR）
+* Unit test blessing
+* A Webpack-based build tool is available to quickly create a Vue project with this component library built in 
+
+> If you want to use the 1.x version, please specify the version number when installing，such as： `npm i @nutui/nutui@1.3.2 -S`
+
+## Environment Support
+
+* Android 4.0+
+* iOS 8.0+
+* Support Vue Server-side Rendering
+
+## Version
+
+* Stable:[![npm](https://img.shields.io/npm/v/@nutui/nutui.svg)](https://www.npmjs.com/package/@nutui/nutui)
+
+> You can also subscribe to： https://github.com/jdf2e/nutui/releases.atom for the notifications of stable releases。
+
+## Examples
+
+![NutUI Demo](https://img14.360buyimg.com/uba/jfs/t1/32118/11/559/2782/5c3d81ecEbda0c0f1/5f2b637d11817204.png)
+
+## Installation
+
+Please refer to the NutUI offcial website for the details on how to use it 
+
+https://nutui.jd.com
+
+Documents：[2.X](https://nutui.jd.com/default.html#/start) | [1.X](https://nutui.jd.com/1x/index.html#/intro)
+
+## Links
+* [Feedback](https://github.com/jdf2e/nutui/issues)
+* [Change Logs](https://github.com/jdf2e/nutui/releases)
+* [On-demand plugins](https://www.npmjs.com/package/@nutui/babel-plugin-separate-import)
+* [Template project command line tool(Gaea-cli)](https://github.com/jdf2e/Gaea4)
+* Contact us：nutui@jd.com
+
+
+## Open Source LICENSE
+
+Based on **MIT** LICENSE

README.md

@@ -1,60 +1,61 @@
 # NutUI 2
 ![npm version](https://img.shields.io/npm/v/@nutui/nutui.svg)  [![Build Status](https://api.travis-ci.org/jdf2e/nutui.svg?branch=master)](https://github.com/jdf2e/nutui/) [![Coverage Status](https://coveralls.io/repos/github/jdf2e/nutui/badge.svg?branch=master)](https://coveralls.io/github/jdf2e/nutui?branch=master) ![license](https://img.shields.io/npm/l/@nutui/nutui.svg)
  
-一套移动端轻量级Vue组件库
+A light mobile Toolkit based on Vue
     
 ![NutUI](https://img11.360buyimg.com/uba/jfs/t1/11117/21/3608/18942/5c20ab52E35e5a500/02e3c1f89cd3dad1.png)
 
+English | [简体中文](./README-zh_CN.md)
 
-## 特性
+## Features
 
-* 跨平台，自动转微信小程序组件（稍后上线，敬请期待）
-* 全新的架构
-* 30+ 京东移动端项目正在使用
-* 参照京东APP 7.0 视觉规范
-* 支持按需加载
-* 详尽的文档和示例
-* 支持定制主题
-* 支持多语言（国际化）
-* 支持 TypeScript
-* 支持服务端渲染（Vue SSR）
-* 单元测试加持
-* 配套有基于Webpack的构建工具，可快速创建已内置本组件库的Vue工程 
+* Cross-platform，automatically convert to WeChat Mini Program components（coming soon）
+* New structure
+* Used by 30+ JD mobile projects
+* Refer to JD APP 7.0 visual specification
+* On-demand loading Support
+* Detailed documents and examples
+* Customize themes Support
+* Multiple languages Support (Internationalization)
+* TypeScript Support
+* Vue Server-side Rendering Support（Vue SSR）
+* Unit test blessing
+* A Webpack-based build tool is available to quickly create a Vue project with this component library built in 
 
-> 如需使用 1.x 版本，安装时请指定版本号，如： `npm i @nutui/nutui@1.3.2 -S`
+> If you want to use the 1.x version, please specify the version number when installing，such as： `npm i @nutui/nutui@1.3.2 -S`
 
-## 支持环境
+## Environment Support
 
 * Android 4.0+
 * iOS 8.0+
-* 支持 Vue 服务端渲染
+* Support Vue Server-side Rendering
 
-## 版本
+## Version
 
-* 稳定版：[![npm](https://img.shields.io/npm/v/@nutui/nutui.svg)](https://www.npmjs.com/package/@nutui/nutui)
+* Stable:[![npm](https://img.shields.io/npm/v/@nutui/nutui.svg)](https://www.npmjs.com/package/@nutui/nutui)
 
-> 你还可以订阅： https://github.com/jdf2e/nutui/releases.atom 来获得稳定版发布的通知。
+> You can also subscribe to： https://github.com/jdf2e/nutui/releases.atom for the notifications of stable releases。
 
-## 示例
+## Examples
 
 ![NutUI Demo](https://img14.360buyimg.com/uba/jfs/t1/32118/11/559/2782/5c3d81ecEbda0c0f1/5f2b637d11817204.png)
 
-## 安装使用
+## Installation
 
-具体安装使用方法请参考 NutUI 官网 
+Please refer to the NutUI offcial website for the details on how to use it 
 
 https://nutui.jd.com
 
-文档：[2.X](https://nutui.jd.com/default.html#/start) | [1.X](https://nutui.jd.com/1x/index.html#/intro)
+Documents：[2.X](https://nutui.jd.com/default.html#/start) | [1.X](https://nutui.jd.com/1x/index.html#/intro)
 
-## 链接
-* [意见反馈](https://github.com/jdf2e/nutui/issues)
-* [更新日志](https://github.com/jdf2e/nutui/releases)
-* [按需加载插件](https://www.npmjs.com/package/@nutui/babel-plugin-separate-import)
-* [模板工程命令行工具(Gaea-cli)](https://github.com/jdf2e/Gaea4)
-* 联系我们：nutui@jd.com
+## Links
+* [Feedback](https://github.com/jdf2e/nutui/issues)
+* [Change Logs](https://github.com/jdf2e/nutui/releases)
+* [On-demand plugins](https://www.npmjs.com/package/@nutui/babel-plugin-separate-import)
+* [Template project command line tool(Gaea-cli)](https://github.com/jdf2e/Gaea4)
+* Contact us：nutui@jd.com
 
 
-## 开源协议
+## Open Source LICENSE
 
-本项目基于 **MIT** 协议
+Based on **MIT** LICENSE

sites/demo/index.html

@@ -14,6 +14,9 @@
     html {
         background: #F6F6F6;
     }
+    a[title=站长统计]{
+      display: none;
+    }
   </style>
 </head>
 
@@ -58,6 +61,7 @@
         s.parentNode.insertBefore(ja, s);
       })()
     </script>
+    <script type="text/javascript" src="https://s23.cnzz.com/z_stat.php?id=1276268086&web_id=1276268086"></script>
 </body>
 
 </html>

sites/doc/asset/css/common.scss

@@ -297,11 +297,11 @@ pre.prettyprint {
 .markList{
     position: fixed;
     right: 10px;
-    top:65px;
+    top: 100px;
     background: #fff;
     border:1px solid #efefef;
     padding:10px 10px 10px 20px!important;    
-    
+    border-right: none;
     li:before{
         display: none!important;
         

sites/doc/asset/js/isVisibiliy.js

@@ -1,6 +1,3 @@
-
-
-import('intersection-observer');
 function isVisibility(param){
     
     let domLists = document.querySelectorAll(param);

sites/doc/index.html

@@ -7,6 +7,11 @@
   <link rel="shortcut icon" href="/favicon.ico">
   <title>NutUI 2.0 - 移动端Vue组件库</title>
   <script src="//misc.360buyimg.com/felibs/vue/2.5.16/vue.min.js"></script>
+  <style>
+    a[title=站长统计]{
+      display: none;
+    }
+  </style>
 </head>
 
 <body>
@@ -29,6 +34,7 @@
       s.parentNode.insertBefore(ja, s);
     })()
   </script>
+  <script type="text/javascript" src="https://s23.cnzz.com/z_stat.php?id=1276268086&web_id=1276268086"></script>
 </body>
 
 </html>

src/packages/datepicker/__test__/datapicker.spec.js

@@ -55,7 +55,7 @@ describe('DatePicker.vue', () => {
         return Vue.nextTick().then(function () {
             expect(wrapper.findAll('.nut-picker-list').length).toBe(3)
             expect(wrapper.findAll('.nut-picker-list').at(0).findAll('.nut-picker-item').at(0).text()).toBe('12时')
-            expect(wrapper.findAll('.nut-picker-list-panel').at(2).attributes('style')).toBe('-webkit-transform: translate3d(0, -36px, 0);');
+            expect(wrapper.findAll('.nut-picker-list-panel').at(2).attributes('style')).toContain('translate3d(0, -36px, 0)');
         })
     });
     

src/packages/picker/__test__/picker.spec.js

@@ -66,7 +66,7 @@ describe('PickerSlot.vue', () => {
 
     it('设置默认值', () => {
         return Vue.nextTick().then(function () {
-            expect(wrapper.find('.nut-picker-list-panel').attributes('style')).toBe('-webkit-transform: translate3d(0, -36px, 0);');
+            expect(wrapper.find('.nut-picker-list-panel').attributes('style')).toContain('translate3d(0, -36px, 0)');
         })
     });
 });

src/packages/skeleton/layout/skeleton-column.vue

@@ -4,6 +4,7 @@
         :style="{
             width:width,
             padding:padding,
+            'align-items':center
         }"    
     >
         <slot></slot>
@@ -26,6 +27,10 @@
             padding:{
                 type:String,
                 default:"0 0 0 0"
+            },
+            center:{
+                type:String,
+                default:"flex-start"
             }
         },
     }

src/packages/skeleton/layout/skeleton-row.vue

@@ -4,6 +4,7 @@
         :style="{
             width:width,
             padding:padding,
+            'justify-content': center
         }"    
     >
         <slot></slot>
@@ -21,11 +22,15 @@
         props:{
             width:{
                 type:String,
-                default:"100%"
+                default:"auto"
             },
             padding:{
                 type:String,
                 default:"0 0 0 0"
+            },
+            center:{
+                type:String,
+                default:"flex-start"
             }
         },
     }

src/packages/skeleton/skeleton.scss

@@ -35,6 +35,7 @@
     display: flex;
     flex-direction: column;
     justify-content: center;
+    
 }
 
 .vue-skeleton-row {

src/packages/swiper/doc.md

@@ -8,7 +8,7 @@
 
 ```html
 <nut-swiper
-    :paginationVisibile="true"
+    :paginationVisible="true"
     direction="horizontal"
     ref="demo1"
     
@@ -23,7 +23,6 @@
 
 ```html
 <nut-swiper
-    :paginationVisibile="true"
     direction="horizontal"
     ref="demo2"
     :canDragging="false"
@@ -41,7 +40,6 @@
 
 ```html
 <nut-swiper
-    :paginationVisibile="true"
     direction="horizontal"
     ref="demo3"
     :loop="true"

test/setup.js

@@ -1,2 +1,3 @@
 require('jsdom-global')();
+window.Date = Date;
 global.expect = require('expect');