Skip to content

Commit

Permalink
Merge branch 'v2'
Browse files Browse the repository at this point in the history
  • Loading branch information
Franslee committed Jan 25, 2019
2 parents 6a05d1c + cdde3b1 commit 9b59199
Show file tree
Hide file tree
Showing 53 changed files with 3,094 additions and 288 deletions.
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,8 @@ coverage/
sites/doc/view
sites/doc/page
package-lock.json
yarn.lock
yarn.lock
docshashCache.text
srchashCache.text
localsrc.cache
localdocs.cache
25 changes: 25 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,28 @@
## 2.0.3

`2019-1-25`

* :sparkles: 新增返回顶部`BackTop`组件
* :bug: 修复`Swiper`组件 slideChangeEnd 事件的一个bug
* :zap: `Rate`组件增加允许设置只读和间距
* :zap: 文档MD转Vue增加文件缓存功能,提升文档预览和构建速度
* :zap: 示例页面增加评分推荐

## 2.0.2

`2019-1-18`

* :zap: 优化`Picker`组件样式,增加放大镜效果
* :zap: 优化`Dialog`组件按钮点击状态样式
* :zap: 优化官网代码展示容器样式

## 2.0.1

`2019-1-16`

* :bug: 修复`Dialog`组件在部分低版本浏览器上的高度问题
* :zap: 优化`Demo`列表页面在部分 iOS 设备上的展示

## 2.0.0

`2019-1-15`
Expand Down
6 changes: 4 additions & 2 deletions build/webpack.doc.base.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,16 @@ module.exports = merge(webpackBaseConf, {
entry:'./src',
output:'./sites/doc/view/',
template:'./doc-site/template.html',
nav:'left'
nav:'left',
needCode:true
}),
new mdtohtml({
entry:'./docs',
output:'./sites/doc/page/',
template:'./doc-site/template.html',
nav:'left',
nohead:true
needCode:false

}),
new HtmlWebpackPlugin({
template: './sites/doc/index.html',
Expand Down
4 changes: 4 additions & 0 deletions build/webpack.prod.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ const webpackBaseConf = require('./webpack.base.conf.js');
const rimraf = require('rimraf');
const merge = require('webpack-merge');

rimraf('./dist/sites/', function (err) {
if (err) console.log(err);
});

rimraf('./dist/nutui.js', function (err) {
if (err) console.log(err);
});
Expand Down
8 changes: 4 additions & 4 deletions docs/intro.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@

NutUI是一套京东风格的移动端Vue组件库,开发和服务于移动Web界面的企业级前中后台产品。

<div style="margin:30px 0;">
<img src="http://img14.360buyimg.com/uba/jfs/t1/8543/6/11560/22014/5c2c6136E8023ac0a/6abbd9de10999c48.png" width="150" alt="NutUI">
</div>

<iframe src="https://ghbtns.com/github-btn.html?user=jdf2e&repo=nutui&type=star&count=true" frameborder="0" scrolling="0" width="60px" height="20px"></iframe>

<iframe src="https://ghbtns.com/github-btn.html?user=jdf2e&repo=nutui&type=watch&count=true&v=2" frameborder="0" scrolling="0" width="70px" height="20px"></iframe>

<iframe src="https://ghbtns.com/github-btn.html?user=jdf2e&repo=nutui&type=fork&count=true" frameborder="0" scrolling="0" width="60px" height="20px"></iframe>

<div style="margin:30px 0;">
<img src="http://img14.360buyimg.com/uba/jfs/t1/8543/6/11560/22014/5c2c6136E8023ac0a/6abbd9de10999c48.png" width="150" alt="NutUI">
</div>

## 特性

* 跨平台,自动转微信小程序组件(稍后上线,敬请期待)
Expand Down
15 changes: 9 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@nutui/nutui",
"version": "2.0.2",
"version": "2.0.3",
"description": "一套轻量级移动端Vue组件库",
"typings": "dist/types/index.d.ts",
"main": "dist/nutui.js",
Expand Down Expand Up @@ -59,7 +59,6 @@
"@babel/preset-env": "7.1.0",
"@nutui/carefree": "^0.4.0",
"@tweenjs/tween.js": "17.2.0",
"istanbul-instrumenter-loader": "3.0.1",
"@vue/test-utils": "1.0.0-beta.25",
"autoprefixer": "9.1.3",
"babel-eslint": "8.2.6",
Expand All @@ -73,6 +72,8 @@
"babel-preset-env": "1.7.0",
"babel-preset-stage-2": "6.24.1",
"chalk": "2.4.1",
"chokidar": "^2.0.4",
"clipboard": "2.0.1",
"copy": "0.3.2",
"copy-webpack-plugin": "4.5.4",
"coveralls": "^3.0.2",
Expand All @@ -83,11 +84,14 @@
"eslint-plugin-vue": "4.7.1",
"expect": "23.6.0",
"file-loader": "1.1.11",
"folder-hash": "^2.1.2",
"friendly-errors-webpack-plugin": "1.7.0",
"google-code-prettify": "1.0.5",
"has": "1.0.3",
"highlight.js": "^9.13.1",
"html-webpack-plugin": "3.2.0",
"inquirer": "6.2.0",
"istanbul-instrumenter-loader": "3.0.1",
"jest": "23.5.0",
"jest-serializer-vue": "2.0.2",
"jsdom": "13.0.0",
Expand All @@ -103,6 +107,7 @@
"offline-plugin": "^5.0.6",
"optimize-css-assets-webpack-plugin": "5.0.0",
"ora": "3.0.0",
"path": "^0.12.7",
"portfinder": "1.0.17",
"postcss-import": "12.0.0",
"postcss-loader": "3.0.0",
Expand All @@ -123,6 +128,7 @@
"vue-i18n": "8.1.0",
"vue-jest": "2.6.0",
"vue-loader": "15.4.0",
"vue-router": "^3.0.2",
"vue-style-loader": "4.1.2",
"vue-template-compiler": "2.5.17",
"vueg": "1.3.4",
Expand All @@ -131,10 +137,7 @@
"webpack-cli": "3.1.0",
"webpack-dev-server": "3.1.11",
"webpack-merge": "4.1.4",
"webpack-node-externals": "1.7.2",
"clipboard": "2.0.1",
"highlight.js": "^9.13.1",
"path": "^0.12.7"
"webpack-node-externals": "1.7.2"
},
"browserslist": [
"> 3%",
Expand Down
Loading

0 comments on commit 9b59199

Please sign in to comment.