From 94a1e83185ce7f61686f8be8e875d9887b70f7db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=95=8F?= Date: Tue, 25 Apr 2017 14:37:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E9=A1=B5=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=92=8C=E6=89=93=E5=8C=85=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E4=BC=98=E5=8C=96=20(#8)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 文档页样式和打包配置优化 * upload unit test --- README.md | 8 +- ...ebpack.config.js => webpack.config.dev.js} | 65 -------- build/webpack.config.prod.js | 34 ++++ docs/assets/ZanUIlogo256x256.png | Bin 9253 -> 0 bytes docs/assets/docs.css | 2 +- docs/assets/zanui.ico | Bin 0 -> 16958 bytes docs/src/components/page-footer.vue | 2 +- docs/src/components/page-header.vue | 20 +-- docs/src/index.tpl | 3 +- package.json | 7 +- packages/image-preview/src/image-preview.vue | 1 + test/unit/specs/image-preview.spec.js | 28 +++- test/unit/specs/uploader.spec.js | 148 +++++++++--------- 13 files changed, 158 insertions(+), 160 deletions(-) rename build/{webpack.config.js => webpack.config.dev.js} (71%) create mode 100644 build/webpack.config.prod.js delete mode 100644 docs/assets/ZanUIlogo256x256.png create mode 100644 docs/assets/zanui.ico diff --git a/README.md b/README.md index 84a0b9f70..902ff7fc2 100644 --- a/README.md +++ b/README.md @@ -58,7 +58,13 @@ npm run dev ``` 浏览器访问[http://localhost:8080](http://localhost:8080)就可以看到所有组件的示例了。 + +## 四、手机预览 + +可以手机扫码以下二维码访问手机端demo： + +![zanui_vue_mobile_qrcode](https://img.yzcdn.cn/v2/image/youzanyun/zanui/pc/zanui_vue_mobile_preview_03.png) -## 四、开源协议 +## 五、开源协议 本项目基于 [MIT](https://zh.wikipedia.org/wiki/MIT%E8%A8%B1%E5%8F%AF%E8%AD%89) 协议，请自由地享受和参与开源。 diff --git a/build/webpack.config.js b/build/webpack.config.dev.js similarity index 71% rename from build/webpack.config.js rename to build/webpack.config.dev.js index 837954b40..a078e7e5e 100644 --- a/build/webpack.config.js +++ b/build/webpack.config.dev.js @@ -5,10 +5,8 @@ var striptags = require('./strip-tags'); var ExtractTextPlugin = require('extract-text-webpack-plugin'); var getPoastcssPlugin = require('./utils/postcss_pipe'); var ProgressBarPlugin = require('progress-bar-webpack-plugin'); -var ExtractTextPlugin = require('extract-text-webpack-plugin'); var HtmlWebpackPlugin = require('html-webpack-plugin'); var OptimizeCssAssetsPlugin = require('optimize-css-assets-webpack-plugin'); -var FaviconsWebpackPlugin = require('favicons-webpack-plugin'); var StyleExtractPlugin; if (process.env.NODE_ENV === 'production') { @@ -172,66 +170,3 @@ module.exports = { StyleExtractPlugin ] }; - -if (process.env.NODE_ENV === 'production') { - delete module.exports.devtool; - module.exports.output = { - path: path.join(__dirname, '../docs/dist'), - publicPath: '/zanui/vue', - filename: '[name].[hash:8].js' - }; - module.exports.plugins = module.exports.plugins.concat([ - new webpack.DefinePlugin({ - 'process.env': { - NODE_ENV: JSON.stringify(process.env.NODE_ENV) - } - }), - new webpack.optimize.UglifyJsPlugin({ - compress: { - warnings: false, - drop_console: true - }, - output: { - comments: false - }, - sourceMap: false - }), - new webpack.optimize.CommonsChunkPlugin({ - name: 'vendor', - minChunks: Infinity - }), - new FaviconsWebpackPlugin({ - // Your source logo - logo: path.join(__dirname, '../docs/assets/ZanUIlogo256x256.png'), - // The prefix for all image files (might be a folder or a name) - prefix: 'favico-[hash]-', - // Emit all stats of the generated icons - // emitStats: false, - // The name of the json containing all favicon information - // statsFilename: 'iconstats-[hash].json', - // Generate a cache file with control hashes and - // don't rebuild the favicons until those hashes change - persistentCache: false, - // Inject the html into the html-webpack-plugin - inject: true, - // favicon background color (see https://github.com/haydenbleasel/favicons#usage) - background: '#fff', - // favicon app title (see https://github.com/haydenbleasel/favicons#usage) - title: 'Vant', - - // which icons should be generated (see https://github.com/haydenbleasel/favicons#usage) - icons: { - android: true, - appleIcon: true, - appleStartup: true, - coast: false, - favicons: true, - firefox: true, - opengraph: false, - twitter: false, - yandex: false, - windows: false - } - }) - ]); -} diff --git a/build/webpack.config.prod.js b/build/webpack.config.prod.js new file mode 100644 index 000000000..f7a46de6a --- /dev/null +++ b/build/webpack.config.prod.js @@ -0,0 +1,34 @@ +var webpack = require('webpack'); +var merge = require('webpack-merge'); +var path = require('path'); +var devConfig = require('./webpack.config.dev.js'); + +module.exports = merge(devConfig, { + output: { + path: path.join(__dirname, '../docs/dist'), + publicPath: '/zanui/vue', + filename: '[name].[hash:8].js' + }, + devtool: false, + plugins: [ + new webpack.DefinePlugin({ + 'process.env': { + NODE_ENV: JSON.stringify(process.env.NODE_ENV) + } + }), + new webpack.optimize.UglifyJsPlugin({ + compress: { + warnings: false, + drop_console: true + }, + output: { + comments: false + }, + sourceMap: false + }), + new webpack.optimize.CommonsChunkPlugin({ + name: 'vendor', + minChunks: Infinity + }) + ] +}); diff --git a/docs/assets/ZanUIlogo256x256.png b/docs/assets/ZanUIlogo256x256.png deleted file mode 100644 index 0b32f433866a674ad9bd26cf3b4517ba39c1dc94..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9253 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 Z%DuO)J1(G#Dh1G=y0VT^je=Fg{{s@==KcTx diff --git a/docs/assets/docs.css b/docs/assets/docs.css index 9c18a759c..883417310 100644 --- a/docs/assets/docs.css +++ b/docs/assets/docs.css @@ -67,7 +67,7 @@ code.hljs { } .main-content { - margin: 110px 20px 40px; + margin: 130px 20px 40px; padding-top: 20px; } diff --git a/docs/assets/zanui.ico b/docs/assets/zanui.ico new file mode 100644 index 0000000000000000000000000000000000000000..e53ed3d168c021c7b50a7b8b53732be66b22ee4d GIT binary patch literal 16958 zcmeI3c~n%_9mnqgE&+{=iZkjhOMb6DhjAyqxO2(Y@&M zg9aFi8gzJYHI_)fu!f@<2oW9*qgDhx{FDY%>Aoo?E?wCh9hDjk!mrT* z#zNb53Gru$2@5|8pE3S^qSL6-!4SW8EZ{0B@#1O>yR+J7-oQm1RQ}&%_ubkHBdLb+81#jt>955%0R|Vib2~MI@K; zk7&!z73)rlQFM{OA^xb}FA|TD7l6473hq<76OV~1WCw+-q7^=ql27;#s(~f>wK}L^ z&b)n9!dZJZk~tlJPNKOk69;XBp`9_s0u+(Mvx`3<3IVo10Po8_%zZVW)>{&eiawF< z7lcM+&KVaA=g_xUfuD{Iosd6$Q4!64=WHa){-GJMfr@SOr860_eL|1;Bcfs$>-9!( z_tpZAfn!S~B?8Z|I5)=19lc|NwfJ>>qWOlDICWtSE9i6t%kKPphVQN111KNID7Ki- zj6W>e1l-lYP5F3lHsjZ+*ia2Iauan<-PmAlep&~ZC+Z-NEUJv=dgO&nW}IHZ)HfUv z^b?X4^T$CPdl$xfIWX(s9^6{^cPSrF zacgU(d|UxOt~1v4eIG`CDhK|fbe~|}I~ksk1Dk$-d`&tV-HaF8lt&T1@cic(=;*R@#HZE2bZ&0Q z@M;^#$7xo5b{P1dCmi-8cYLt`d4^0kKxW!*ywe+1C(m;1+$p%AkIk5ER_8AzpUDmi zW3;2G~McDCX|Ylt4nxoi*sGuLNbUeft%Q|L0g=E zvh>%J&}3%+XFaC$Jl-FGYP0ySHRK3>4(>2TBhJvM`A3P~qUiZ`%>1hN@+FfI&seWOB%>Wf6SjdG!H+b-cD zwZgA{FeX#>S%M#YyzAXPUafCtJ9PrLdO-H?#{veQs0&Ub_JwY7p5q;ir5&5`277u4_9mtBm5-)u2bKM?tCV z?LnKlPWkvlwDd?QdOxs7i|2A7(Yi~NswyP!8S^ZYW-`T^!>{Y(p}l>)_gL@EI@msl z6P)Yd3yA^iSkoG^1=AaI1@YYlqAS4CZ3>U6bxq_~OTfpM8S-)Cx%+C;IX8p&%flVM zc@WzgO=U5szLES-z{iyll#geb;N#}$@HB1POy8GsVKnsrHDK!XzRDcN!HyY>UwT-8 zfSXuVJm=1$T$gS$eY|fU8(M!7vW;+Bf7~5G+~c(U7YELmSlU_g`{y;1g8__z)xvlsQp9Tui*y`P~)K$sNuwVo3C?(g7$pT2cW}{ z=X)J})G7s84LQZe+iAQh|Jm--Z~mb+IQrPb?_WMZ;uL}zyoJ~V^Hw!zVB8#Mo>s5; z=?3AF092RfKLPT+CEW$&-#`bm^F4|m@`t*Pd{I&3PSWGU<<5+Isr~z&zBX;iBo^`v zpUMz#AUt8-E&(0ttuz+;@l$OercFlpd>DF`DR|?XTtSkukgNh0gYWlr`kUf@*;{rDkq2LprfCeoV)B7{%-qXxNP zW{1KrA990dx{Uh1!(7q@pW3wK173gypa>sR#xB5C_oQ%SGQ|VI-*)n0Ei7imWvHW@zagR#r~*f8{hsLxnKqOL>X52X@2Jb+_m82in?t6tjdkvj3-&9 zk9GPQhOA#A8_ixeogv<6k=S4oKh?Hy@2L=@%h1=mf*som{5NzJijKaJ3&an$`q$=c7oP2v=-%Rz9^B4*7j6XB3oEjVkM&fbEGK@Y#7EhE?}X8d;-`B zSdAE98Mp(XEa1#-LMRlhOBq6wz)k^6ErZz!@}B)JH9a;A&PCOyE({hLp|NnyGHQLe zEPY+N9ViUgsCLnXZa0F3+D0wCtX#WZ1{RJ*P+Wiw0avaXEC$`M9IPCAqy}saut6o< h0Xjn^&>j}Bnx#x@YqYjQYt>qdcap literal 0 HcmV?d00001 diff --git a/docs/src/components/page-footer.vue b/docs/src/components/page-footer.vue index 7a79ba67e..d840c518b 100644 --- a/docs/src/components/page-footer.vue +++ b/docs/src/components/page-footer.vue @@ -5,7 +5,7 @@ 有赞官网
  • - 有赞云 + 有赞云
  • 加入我们 diff --git a/docs/src/components/page-header.vue b/docs/src/components/page-header.vue index f171777d2..20ae6ddac 100644 --- a/docs/src/components/page-header.vue +++ b/docs/src/components/page-header.vue @@ -2,17 +2,17 @@

    - +

    • - 基础组件 + 基础组件
    • - 业务组件 + 业务组件
    • V{{ version }} @@ -69,7 +69,7 @@ export default { @e top { overflow: hidden; - height: 60px; + height: 80px; background-color: #fbfbfb; box-shadow: 0 1px 4px rgba(0, 0, 0, .1); } @@ -81,10 +81,10 @@ export default { display: block; width: 78px; height: 20px; - background-image: url(https://img.yzcdn.cn/upload_files/2017/03/30/Fjm3aSwID8ROIV_5TO6dZdJ_IEgz.png); + background-image: url(https://img.yzcdn.cn/upload_files/2017/04/20/FjwR1mraVIqtHWb8YWDW_YzQ_Kh2.png); background-size: contain; background-repeat: no-repeat; - margin: 20px 0 0 20px; + margin: 30px 0 0 20px; } } @@ -117,7 +117,7 @@ export default { @e link { display: block; - line-height: 60px; + line-height: 80px; color: #333; font-size: 16px; margin: 0 20px; diff --git a/docs/src/index.tpl b/docs/src/index.tpl index 2e4cc0426..260f318a5 100644 --- a/docs/src/index.tpl +++ b/docs/src/index.tpl @@ -3,7 +3,8 @@ - Vant - Vue mobile ui in Youzan + + ZanUI - 移动端 diff --git a/package.json b/package.json index c20762e3d..a338c42e0 100644 --- a/package.json +++ b/package.json @@ -10,8 +10,8 @@ "packages" ], "scripts": { - "bootstrap": "yarn || npm i --registry=http://registry.npm.qima-inc.com", - "dev": "npm run build:file && webpack-dev-server --inline --hot --config build/webpack.config.js --content-base ./", + "bootstrap": "yarn || npm i", + "dev": "npm run build:file && webpack-dev-server --inline --hot --config build/webpack.config.dev.js --content-base ./", "build:file": "node build/bin/build-entry.js", "build:utils": "cross-env BABEL_ENV=utils babel src --out-dir lib --ignore src/index.js", "build:vant-css": "gulp build --gulpfile packages/vant-css/gulpfile.js && cp-cli packages/vant-css/lib lib/vant-css", @@ -19,7 +19,7 @@ "build:vant": "webpack --progress --hide-modules --config build/webpack.build.js && webpack --progress --hide-modules --config build/webpack.build.min.js", "build:example": "node build/genExamples.js", "deploy": "npm run deploy:docs && gh-pages -d docs/dist --remote youzan && rimraf docs/dist", - "deploy:docs": "rimraf docs/dist && npm run build:example && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.config.js", + "deploy:docs": "rimraf docs/dist && npm run build:example && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.config.prod.js", "dist": "npm run clean && npm run build:file && npm run lint && npm run build:vant && npm run build:components && npm run build:utils && npm run build:vant-css", "clean": "rimraf lib && rimraf packages/*/lib", "lint": "felint lint src/**/*.js packages/**/*.{js,vue} build/**/*.js", @@ -73,7 +73,6 @@ "eslint-loader": "^1.7.1", "eslint-plugin-vue": "^2.0.1", "extract-text-webpack-plugin": "^2.0.0-beta.5", - "favicons-webpack-plugin": "0.0.7", "felint": "^0.5.0-alpha.3", "file-loader": "^0.9.0", "file-save": "^0.2.0", diff --git a/packages/image-preview/src/image-preview.vue b/packages/image-preview/src/image-preview.vue index c66593197..d819a582a 100644 --- a/packages/image-preview/src/image-preview.vue +++ b/packages/image-preview/src/image-preview.vue @@ -68,6 +68,7 @@ export default { }, close() { + /* istanbul ignore if */ if (this.closing) return; this.closing = true; diff --git a/test/unit/specs/image-preview.spec.js b/test/unit/specs/image-preview.spec.js index 19d8cfeee..14cb44ef4 100644 --- a/test/unit/specs/image-preview.spec.js +++ b/test/unit/specs/image-preview.spec.js @@ -1,15 +1,16 @@ import ImagePreview from 'packages/image-preview'; describe('ImagePreview', () => { + beforeEach(() => { + document.body.style.overflow = ''; + }); + afterEach(() => { const el = document.querySelector('.van-image-preview'); if (!el) return; if (el.parentNode) { el.parentNode.removeChild(el); } - if (el.__vue__) { - el.__vue__.$destroy(); - } }); it('create a image preview', (done) => { @@ -24,6 +25,27 @@ describe('ImagePreview', () => { document.querySelector('.van-swipe-item').click(); setTimeout(() => { expect(document.querySelector('.van-image-preview').__vue__.$parent.value).to.be.false; + expect(document.body.style.overflow).to.equal(''); + done(); + }, 500); + }, 500); + }); + + it('create a body hidden image preview', (done) => { + document.body.style.overflow = 'hidden'; + + ImagePreview([ + 'https://img.yzcdn.cn/upload_files/2017/03/14/FmTPs0SeyQaAOSK1rRe1sL8RcwSY.jpeg', + 'https://img.yzcdn.cn/upload_files/2017/03/15/FvexrWlG_WxtCE9Omo5l27n_mAG_.jpeg' + ]); + + expect(document.querySelector('.van-image-preview')).to.exist; + + setTimeout(() => { + document.querySelector('.van-swipe-item').click(); + setTimeout(() => { + expect(document.querySelector('.van-image-preview').__vue__.$parent.value).to.be.false; + expect(document.body.style.overflow).to.equal('hidden'); done(); }, 500); }, 500); diff --git a/test/unit/specs/uploader.spec.js b/test/unit/specs/uploader.spec.js index 83da05616..034a4700f 100644 --- a/test/unit/specs/uploader.spec.js +++ b/test/unit/specs/uploader.spec.js @@ -1,87 +1,87 @@ -// import Uploader from 'packages/uploader'; -// import { mount } from 'avoriaz'; +import Uploader from 'packages/uploader'; +import { mount } from 'avoriaz'; -// describe('Uploader', () => { -// let wrapper; -// afterEach(() => { -// wrapper && wrapper.destroy(); -// }); +describe('Uploader', () => { + let wrapper; + afterEach(() => { + wrapper && wrapper.destroy(); + }); -// it('enabled', () => { -// wrapper = mount(Uploader, { -// propsData: { -// disabled: false -// } -// }); + it('enabled', () => { + wrapper = mount(Uploader, { + propsData: { + disabled: false + } + }); -// expect(wrapper.contains('input')).to.equal(true); -// expect(wrapper.vm.onValueChange({ target: { files: [] }})).to.equal(undefined); -// }); + expect(wrapper.contains('input')).to.equal(true); + expect(wrapper.vm.onValueChange({ target: { files: [] }})).to.equal(undefined); + }); -// it('disabled', () => { -// wrapper = mount(Uploader, { -// propsData: { -// disabled: true -// } -// }); + it('disabled', () => { + wrapper = mount(Uploader, { + propsData: { + disabled: true + } + }); -// expect(wrapper.contains('input')).to.equal(true); -// expect(wrapper.vm.onValueChange({ target: { files: [] }})).to.equal(undefined); -// }); + expect(wrapper.contains('input')).to.equal(true); + expect(wrapper.vm.onValueChange({ target: { files: [] }})).to.equal(undefined); + }); -// it('before read', () => { -// wrapper = mount(Uploader, { -// propsData: { -// disabled: false, -// beforeRead: () => { -// return false; -// } -// } -// }); + // it('before read', () => { + // wrapper = mount(Uploader, { + // propsData: { + // disabled: false, + // beforeRead: () => { + // return false; + // } + // } + // }); -// expect(wrapper.contains('input')).to.equal(true); -// expect(wrapper.vm.onValueChange({ target: { files: [new File([], '')] }})).to.equal(undefined); -// }); + // expect(wrapper.contains('input')).to.equal(true); + // expect(wrapper.vm.onValueChange({ target: { files: [new File([], '')] }})).to.equal(undefined); + // }); -// it('read text', () => { -// wrapper = mount(Uploader, { -// propsData: { -// disabled: false, -// resultType: 'text', -// afterRead: (file) => { -// console.log(file); -// } -// } -// }); + // it('read text', () => { + // wrapper = mount(Uploader, { + // propsData: { + // disabled: false, + // resultType: 'text', + // afterRead: (file) => { + // console.log(file); + // } + // } + // }); -// expect(wrapper.contains('input')).to.equal(true); -// expect(wrapper.vm.onValueChange({ target: { files: [new File([], '/Users')] }})).to.equal(undefined); -// }); + // expect(wrapper.contains('input')).to.equal(true); + // expect(wrapper.vm.onValueChange({ target: { files: [new File([], '/Users')] }})).to.equal(undefined); + // }); -// it('read text no after hook', () => { -// wrapper = mount(Uploader, { -// propsData: { -// disabled: false, -// resultType: 'text' -// } -// }); + // it('read text no after hook', () => { + // wrapper = mount(Uploader, { + // propsData: { + // disabled: false, + // resultType: 'text' + // } + // }); -// expect(wrapper.contains('input')).to.equal(true); -// expect(wrapper.vm.onValueChange({ target: { files: [new File([], '/Users')] }})).to.equal(undefined); -// }); + // expect(wrapper.contains('input')).to.equal(true); + // expect(wrapper.vm.onValueChange({ target: { files: [new File([], '/Users')] }})).to.equal(undefined); + // }); -// it('read dataUrl', () => { -// wrapper = mount(Uploader, { -// propsData: { -// disabled: false, -// resultType: 'dataUrl', -// afterRead: (file) => { -// console.log(file); -// } -// } -// }); + // it('read dataUrl', () => { + // wrapper = mount(Uploader, { + // propsData: { + // disabled: false, + // resultType: 'dataUrl', + // afterRead: (file) => { + // console.log(file); + // } + // } + // }); -// expect(wrapper.contains('input')).to.equal(true); -// expect(wrapper.vm.onValueChange({ target: { files: [new File([], '/Users')] }})).to.equal(undefined); -// }); -// }); + // expect(wrapper.contains('input')).to.equal(true); + // expect(wrapper.vm.onValueChange({ target: { files: [new File([], '/Users')] }})).to.equal(undefined); + // }); +});