From 0f5972e75ed7d9d89a8dbb9a9ffaeb56d103289a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=95=8F?= Date: Thu, 15 Jun 2017 19:46:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81SSR=E3=80=81=E5=8D=87?= =?UTF-8?q?=E7=BA=A7Vue=E7=89=88=E6=9C=AC=E5=92=8C=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=96=B0=E7=9A=84icon=20(#40)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * search component add new style * update vue version and support ssr * unit test * add new icon * new icon --- build/webpack.config.dev.js | 9 +- docs/examples-dist/checkbox.vue | 8 +- docs/examples-dist/icon.vue | 33 ++++- docs/examples-dist/lazyload.vue | 6 +- docs/examples-dist/progress.vue | 6 +- docs/examples-dist/swipe.vue | 4 +- docs/examples-dist/switch.vue | 8 +- docs/examples-dist/uploader.vue | 2 + docs/examples-dist/waterfall.vue | 2 +- docs/examples-docs/checkbox.md | 8 +- docs/examples-docs/datetime-picker.md | 4 +- docs/examples-docs/icon.md | 33 ++++- docs/examples-docs/lazyload.md | 6 +- docs/examples-docs/progress.md | 6 +- docs/examples-docs/quickstart.md | 26 +++- docs/examples-docs/swipe.md | 4 +- docs/examples-docs/switch.md | 8 +- docs/examples-docs/uploader.md | 11 ++ docs/examples-docs/waterfall.md | 3 +- docs/src/components/demo-list.vue | 6 +- docs/src/components/mobile-nav.vue | 3 +- docs/src/components/page-header.vue | 6 +- docs/src/components/side-nav.vue | 9 +- docs/src/examples.js | 8 +- package.json | 21 ++-- packages/actionsheet/src/actionsheet.vue | 3 +- packages/badge/src/badge.vue | 8 +- .../datetime-picker/src/datetime-picker.vue | 2 +- packages/image-preview/src/image-preview.js | 2 + packages/image-preview/src/image-preview.vue | 2 +- packages/picker/src/picker-column.vue | 3 +- packages/picker/src/picker.vue | 1 + packages/swipe/src/input.js | 3 + packages/swipe/src/swipe.vue | 4 +- packages/swipe/src/utils.js | 29 +++-- packages/tab/src/tabs.vue | 1 + packages/vant-css/assets/icons.sketch | Bin 191585 -> 210206 bytes packages/vant-css/scripts/fount-config.js | 31 +++++ packages/vant-css/src/icon.css | 18 ++- src/mixins/popup/index.js | 1 + src/mixins/popup/popup-context.js | 9 +- src/mixins/popup/popup-manager.js | 2 + src/utils/scroll.js | 4 +- test/unit/specs/actionsheet.spec.js | 4 +- test/unit/specs/badge.spec.js | 2 +- test/unit/specs/button.spec.js | 6 +- test/unit/specs/cell.spec.js | 2 +- test/unit/specs/checkbox.spec.js | 8 +- test/unit/specs/field.spec.js | 6 +- test/unit/specs/icon.spec.js | 2 +- test/unit/specs/image-preview.spec.js | 12 +- test/unit/specs/layout.spec.js | 4 +- test/unit/specs/picker.spec.js | 4 +- test/unit/specs/quantity.spec.js | 10 +- test/unit/specs/radio.spec.js | 8 +- test/unit/specs/search.spec.js | 14 +-- test/unit/specs/switch.spec.js | 8 +- test/unit/specs/tabs.spec.js | 4 +- yarn.lock | 117 ++++++++++-------- 59 files changed, 370 insertions(+), 204 deletions(-) diff --git a/build/webpack.config.dev.js b/build/webpack.config.dev.js index d2538370d..04ca6c82f 100644 --- a/build/webpack.config.dev.js +++ b/build/webpack.config.dev.js @@ -7,6 +7,7 @@ var getPostcssPlugin = require('./utils/postcss_pipe'); var ProgressBarPlugin = require('progress-bar-webpack-plugin'); var HtmlWebpackPlugin = require('html-webpack-plugin'); var OptimizeCssAssetsPlugin = require('optimize-css-assets-webpack-plugin'); +var FriendlyErrorsPlugin = require('friendly-errors-webpack-plugin') var StyleExtractPlugin; if (process.env.NODE_ENV === 'production') { @@ -25,8 +26,7 @@ function convert(str) { function wrap(render) { return function() { return render.apply(this, arguments) - .replace('', ''); + .replace(/\
- 复选框2 + 复选框2
@@ -15,7 +15,7 @@
- 复选框{{item}} + 复选框{{item}}
@@ -24,7 +24,7 @@
- 复选框{{item}} + 复选框{{item}}
@@ -33,7 +33,7 @@
- + 复选框{{item}} diff --git a/docs/examples-dist/icon.vue b/docs/examples-dist/icon.vue index dc0e0a8e7..a208f1a82 100644 --- a/docs/examples-dist/icon.vue +++ b/docs/examples-dist/icon.vue @@ -120,18 +120,42 @@ password-view - - - password-not-view - wap-nav + + + password-not-view + wap-home + + + ecard-pay + + + + balance-pay + + + + peer-pay + + + + credit-pay + + + + debit-pay + + + + other-pay + @@ -140,6 +164,7 @@ @b icon { .van-col { text-align: center; + height: 120px; } .van-icon { diff --git a/docs/examples-dist/lazyload.vue b/docs/examples-dist/lazyload.vue index bab9e763d..c8d1579c2 100644 --- a/docs/examples-dist/lazyload.vue +++ b/docs/examples-dist/lazyload.vue @@ -1,6 +1,6 @@