From 84538c888e3ccf2e4dbb85e168632419ca237243 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Mon, 30 Jul 2018 10:26:34 +0800 Subject: [PATCH] [breaking change] update component prefix --- README.md | 10 +- changelog.md | 2 +- dist/actionsheet/index.json | 2 +- dist/actionsheet/index.wxml | 26 ++-- dist/actionsheet/index.wxss | 2 +- dist/badge/index.wxml | 4 +- dist/badge/index.wxss | 2 +- dist/btn/index.wxml | 2 +- dist/btn/index.wxss | 2 +- dist/capsule/index.wxml | 10 +- dist/capsule/index.wxss | 2 +- dist/card/index.wxml | 24 ++-- dist/card/index.wxss | 2 +- dist/cell/index.wxml | 14 +- dist/cell/index.wxss | 2 +- dist/checkbox-group/index.wxss | 2 +- dist/checkbox/index.json | 2 +- dist/checkbox/index.wxml | 10 +- dist/checkbox/index.wxss | 2 +- dist/col/index.wxml | 2 +- dist/col/index.wxss | 2 +- dist/color/index.wxss | 2 +- dist/dialog/data.js | 2 +- dist/dialog/index.js | 2 +- dist/dialog/index.json | 2 +- dist/dialog/index.wxml | 16 +-- dist/dialog/index.wxss | 2 +- dist/field/index.json | 2 +- dist/field/index.wxml | 18 +-- dist/field/index.wxss | 2 +- dist/helper/index.wxss | 2 +- dist/icon/index.wxml | 2 +- dist/icon/index.wxss | 2 +- dist/index.wxss | 2 +- dist/loadmore/index.wxml | 14 +- dist/loadmore/index.wxss | 2 +- dist/noticebar/index.js | 4 +- dist/noticebar/index.json | 2 +- dist/noticebar/index.wxml | 14 +- dist/noticebar/index.wxss | 2 +- dist/panel/index.wxml | 6 +- dist/panel/index.wxss | 2 +- dist/radio/index.json | 2 +- dist/radio/index.wxml | 14 +- dist/radio/index.wxss | 2 +- dist/row/index.wxml | 2 +- dist/row/index.wxss | 2 +- dist/search/index.wxml | 12 +- dist/search/index.wxss | 2 +- dist/select/index.json | 4 +- dist/select/index.wxml | 10 +- dist/select/index.wxss | 2 +- dist/stepper/index.wxml | 8 +- dist/stepper/index.wxss | 2 +- dist/steps/index.wxml | 14 +- dist/steps/index.wxss | 2 +- dist/steps/wxss/step.wxss | 2 +- dist/steps/wxss/vstep.wxss | 2 +- dist/switch/index.wxml | 8 +- dist/switch/index.wxss | 2 +- dist/tab/index.wxml | 16 +-- dist/tab/index.wxss | 2 +- dist/tag/index.wxml | 2 +- dist/tag/index.wxss | 2 +- dist/toast/index.json | 2 +- dist/toast/index.wxml | 14 +- dist/toast/index.wxss | 2 +- dist/toptips/index.wxml | 2 +- dist/toptips/index.wxss | 2 +- dist/toptips/toptips.js | 2 +- dist/tree-select/index.json | 2 +- dist/tree-select/index.wxml | 8 +- dist/tree-select/index.wxss | 2 +- example/pages/actionsheet/index.json | 4 +- example/pages/actionsheet/index.wxml | 8 +- example/pages/badge/index.json | 2 +- example/pages/badge/index.wxml | 10 +- example/pages/btn/index.json | 6 +- example/pages/btn/index.wxml | 88 ++++++------- example/pages/capsule/index.json | 4 +- example/pages/capsule/index.wxml | 14 +- example/pages/capsule/index.wxss | 2 +- example/pages/card/index.json | 4 +- example/pages/card/index.wxml | 18 +-- example/pages/cell/index.json | 10 +- example/pages/cell/index.wxml | 76 +++++------ example/pages/checkbox/index.json | 8 +- example/pages/checkbox/index.wxml | 46 +++---- example/pages/dashboard/index.json | 6 +- example/pages/dashboard/index.wxml | 12 +- example/pages/datetime/index.json | 8 +- example/pages/datetime/index.wxml | 42 +++--- example/pages/dialog/index.js | 16 +-- example/pages/dialog/index.json | 8 +- example/pages/dialog/index.wxml | 30 ++--- example/pages/field/index.json | 10 +- example/pages/field/index.wxml | 74 +++++------ example/pages/helper/index.json | 6 +- example/pages/helper/index.wxml | 72 +++++------ example/pages/icon/index.json | 2 +- example/pages/icon/index.wxml | 4 +- example/pages/layout/index.json | 6 +- example/pages/layout/index.wxml | 32 ++--- example/pages/layout/index.wxss | 4 +- example/pages/loading/index.json | 2 +- example/pages/loading/index.wxml | 26 ++-- example/pages/loading/index.wxss | 2 +- example/pages/loadmore/index.json | 4 +- example/pages/loadmore/index.wxml | 18 +-- example/pages/loadmore/index.wxss | 2 +- example/pages/noticebar/index.json | 4 +- example/pages/noticebar/index.wxml | 42 +++--- example/pages/panel/index.json | 2 +- example/pages/panel/index.wxml | 12 +- example/pages/popup/index.json | 6 +- example/pages/popup/index.wxml | 60 ++++----- example/pages/radio/index.json | 6 +- example/pages/radio/index.wxml | 40 +++--- example/pages/search/index.json | 6 +- example/pages/search/index.wxml | 24 ++-- example/pages/select/index.json | 4 +- example/pages/select/index.wxml | 12 +- example/pages/stepper/index.json | 4 +- example/pages/stepper/index.wxml | 32 ++--- example/pages/steps/index.json | 8 +- example/pages/steps/index.wxml | 108 ++++++++-------- example/pages/switch/index.json | 6 +- example/pages/switch/index.wxml | 40 +++--- example/pages/tab/index.json | 2 +- example/pages/tab/index.wxml | 6 +- example/pages/tag/index.json | 6 +- example/pages/tag/index.wxml | 48 +++---- example/pages/tag/index.wxss | 2 +- example/pages/toast/index.js | 14 +- example/pages/toast/index.json | 6 +- example/pages/toast/index.wxml | 38 +++--- example/pages/toptips/index.json | 4 +- example/pages/toptips/index.wxml | 16 +-- example/pages/tree-select/index.json | 2 +- example/pages/tree-select/index.wxml | 4 +- packages/actionsheet/README.md | 6 +- packages/actionsheet/index.json | 2 +- packages/actionsheet/index.pcss | 32 ++--- packages/actionsheet/index.wxml | 26 ++-- packages/badge/README.md | 8 +- packages/badge/index.pcss | 4 +- packages/badge/index.wxml | 4 +- packages/btn/README.md | 36 +++--- packages/btn/index.pcss | 46 +++---- packages/btn/index.wxml | 2 +- packages/capsule/README.md | 4 +- packages/capsule/index.pcss | 14 +- packages/capsule/index.wxml | 10 +- packages/card/README.md | 14 +- packages/card/index.pcss | 14 +- packages/card/index.wxml | 24 ++-- packages/cell/README.md | 26 ++-- packages/cell/index.pcss | 14 +- packages/cell/index.wxml | 14 +- packages/checkbox-group/index.pcss | 2 +- packages/checkbox/README.md | 32 ++--- packages/checkbox/index.json | 2 +- packages/checkbox/index.pcss | 8 +- packages/checkbox/index.wxml | 10 +- packages/col/index.pcss | 6 +- packages/col/index.wxml | 2 +- packages/color/index.pcss | 14 +- packages/datetime-picker/README.md | 6 +- packages/dialog/README.md | 6 +- packages/dialog/data.js | 2 +- packages/dialog/index.js | 2 +- packages/dialog/index.json | 2 +- packages/dialog/index.pcss | 20 +-- packages/dialog/index.wxml | 16 +-- packages/field/README.md | 18 +-- packages/field/index.json | 2 +- packages/field/index.pcss | 24 ++-- packages/field/index.wxml | 18 +-- packages/helper/README.md | 50 +++---- packages/helper/index.pcss | 50 +++---- packages/icon/README.md | 6 +- packages/icon/index.pcss | 186 +++++++++++++-------------- packages/icon/index.wxml | 2 +- packages/loading/README.md | 10 +- packages/loadmore/README.md | 10 +- packages/loadmore/index.pcss | 12 +- packages/loadmore/index.wxml | 14 +- packages/noticebar/README.md | 16 +-- packages/noticebar/index.js | 4 +- packages/noticebar/index.json | 2 +- packages/noticebar/index.pcss | 2 +- packages/noticebar/index.wxml | 14 +- packages/panel/README.md | 6 +- packages/panel/index.pcss | 8 +- packages/panel/index.wxml | 6 +- packages/popup/README.md | 16 +-- packages/radio/README.md | 20 +-- packages/radio/index.json | 2 +- packages/radio/index.pcss | 16 +-- packages/radio/index.wxml | 14 +- packages/row/README.md | 28 ++-- packages/row/index.pcss | 2 +- packages/row/index.wxml | 2 +- packages/search/README.md | 4 +- packages/search/index.pcss | 26 ++-- packages/search/index.wxml | 12 +- packages/select/README.md | 4 +- packages/select/index.json | 4 +- packages/select/index.pcss | 2 +- packages/select/index.wxml | 10 +- packages/stepper/README.md | 6 +- packages/stepper/index.pcss | 24 ++-- packages/stepper/index.wxml | 8 +- packages/steps/README.md | 14 +- packages/steps/index.pcss | 2 +- packages/steps/index.wxml | 14 +- packages/steps/wxss/step.pcss | 48 +++---- packages/steps/wxss/vstep.pcss | 26 ++-- packages/switch/README.md | 8 +- packages/switch/index.pcss | 18 +-- packages/switch/index.wxml | 8 +- packages/tab/README.md | 6 +- packages/tab/index.pcss | 16 +-- packages/tab/index.wxml | 16 +-- packages/tag/README.md | 14 +- packages/tag/index.pcss | 18 +-- packages/tag/index.wxml | 2 +- packages/toast/README.md | 8 +- packages/toast/index.json | 2 +- packages/toast/index.pcss | 14 +- packages/toast/index.wxml | 14 +- packages/toptips/README.md | 12 +- packages/toptips/index.pcss | 4 +- packages/toptips/index.wxml | 2 +- packages/toptips/toptips.js | 2 +- packages/tree-select/README.md | 6 +- packages/tree-select/index.json | 2 +- packages/tree-select/index.wxml | 8 +- scripts/build-icon.sh | 4 +- scripts/icons/fount-config.js | 2 +- 240 files changed, 1504 insertions(+), 1504 deletions(-) diff --git a/README.md b/README.md index 55e949a7..1c0adb1f 100644 --- a/README.md +++ b/README.md @@ -59,14 +59,14 @@ npm run dev ```json { "usingComponents": { - "zan-button": "/path/to/vant-weapp/dist/btn/index" + "van-button": "/path/to/vant-weapp/dist/btn/index" } } ``` ```html -按钮 +按钮 ``` ![](https://img.yzcdn.cn/public_files/2017/02/08/1b1e39ed3dc6b63519a68ba1e2650cfc.png) @@ -78,12 +78,12 @@ npm run dev ```json { "usingComponents": { - "zan-toast": "/path/to/vant-weapp/dist/toast/index" + "van-toast": "/path/to/vant-weapp/dist/toast/index" } } ``` ```html - + ``` 将对应的 Toast 的函数引入页面,就可以直接调用来展示 Toast 了 @@ -96,7 +96,7 @@ const Toast = require('/path/to/vant-weapp/dist/toast/toast'); Page({ showToast() { Toast({ - selector: '#zan-toast-test', + selector: '#van-toast-test', message: 'toast内容' }); } diff --git a/changelog.md b/changelog.md index 848b65cd..e650d19f 100644 --- a/changelog.md +++ b/changelog.md @@ -246,7 +246,7 @@ **Improvements** -- 修复 zan-icon-new 展示 [\#66](https://github.com/youzan/vant-weapp/pull/66) ([pangxie1991](https://github.com/pangxie1991)) +- 修复 van-icon-new 展示 [\#66](https://github.com/youzan/vant-weapp/pull/66) ([pangxie1991](https://github.com/pangxie1991)) ## [v2.3.4](https://github.com/youzan/vant-weapp/tree/v2.3.4) (2017-11-24) [Full Changelog](https://github.com/youzan/vant-weapp/compare/v2.3.3...v2.3.4) diff --git a/dist/actionsheet/index.json b/dist/actionsheet/index.json index 9d70aaf4..5ec84cb6 100644 --- a/dist/actionsheet/index.json +++ b/dist/actionsheet/index.json @@ -1,6 +1,6 @@ { "component": true, "usingComponents": { - "zan-btn": "../btn/index" + "van-btn": "../btn/index" } } diff --git a/dist/actionsheet/index.wxml b/dist/actionsheet/index.wxml index de6b80d0..48c53780 100644 --- a/dist/actionsheet/index.wxml +++ b/dist/actionsheet/index.wxml @@ -1,39 +1,39 @@ - + - + - - - {{ item.name }} + + {{ item.name }} + class="van-actionsheet__subname"> {{ item.subname }} - + - {{ cancelText }} + >{{ cancelText }} diff --git a/dist/actionsheet/index.wxss b/dist/actionsheet/index.wxss index d580e64c..101f00db 100644 --- a/dist/actionsheet/index.wxss +++ b/dist/actionsheet/index.wxss @@ -1 +1 @@ -.zan-actionsheet{background-color:#f8f8f8}.zan-actionsheet__mask{position:fixed;top:0;left:0;right:0;bottom:0;z-index:10;background:rgba(0,0,0,.7);display:none}.zan-actionsheet__container{position:fixed;left:0;right:0;bottom:0;background:#f8f8f8;-webkit-transform:translate3d(0,50%,0);transform:translate3d(0,50%,0);-webkit-transform-origin:center;transform-origin:center;-webkit-transition:all .2s ease;transition:all .2s ease;z-index:11;opacity:0;visibility:hidden}.zan-actionsheet__btn{margin-bottom:0!important}.zan-actionsheet__footer .zan-actionsheet__btn{background:#fff}.zan-actionsheet__btn-content{display:-webkit-box;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;flex-direction:row;-webkit-box-pack:center;justify-content:center}.zan-actionsheet__subname{color:#999}.zan-actionsheet__name,.zan-actionsheet__subname{height:45px;line-height:45px}.zan-actionsheet__btn.zan-btn:last-child::after{border-bottom-width:0}.zan-actionsheet__subname{margin-left:2px;font-size:12px}.zan-actionsheet__footer{margin-top:10px}.zan-actionsheet__btn--loading .zan-actionsheet__subname{color:transparent}.zan-actionsheet--show .zan-actionsheet__container{opacity:1;-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0);visibility:visible}.zan-actionsheet--show .zan-actionsheet__mask{display:block} \ No newline at end of file +.van-actionsheet{background-color:#f8f8f8}.van-actionsheet__mask{position:fixed;top:0;left:0;right:0;bottom:0;z-index:10;background:rgba(0,0,0,.7);display:none}.van-actionsheet__container{position:fixed;left:0;right:0;bottom:0;background:#f8f8f8;-webkit-transform:translate3d(0,50%,0);transform:translate3d(0,50%,0);-webkit-transform-origin:center;transform-origin:center;-webkit-transition:all .2s ease;transition:all .2s ease;z-index:11;opacity:0;visibility:hidden}.van-actionsheet__btn{margin-bottom:0!important}.van-actionsheet__footer .van-actionsheet__btn{background:#fff}.van-actionsheet__btn-content{display:-webkit-box;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;flex-direction:row;-webkit-box-pack:center;justify-content:center}.van-actionsheet__subname{color:#999}.van-actionsheet__name,.van-actionsheet__subname{height:45px;line-height:45px}.van-actionsheet__btn.van-btn:last-child::after{border-bottom-width:0}.van-actionsheet__subname{margin-left:2px;font-size:12px}.van-actionsheet__footer{margin-top:10px}.van-actionsheet__btn--loading .van-actionsheet__subname{color:transparent}.van-actionsheet--show .van-actionsheet__container{opacity:1;-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0);visibility:visible}.van-actionsheet--show .van-actionsheet__mask{display:block} \ No newline at end of file diff --git a/dist/badge/index.wxml b/dist/badge/index.wxml index 322f1ba7..31b18476 100644 --- a/dist/badge/index.wxml +++ b/dist/badge/index.wxml @@ -1,6 +1,6 @@ - + diff --git a/dist/badge/index.wxss b/dist/badge/index.wxss index 4e52bf72..fa21f8fa 100644 --- a/dist/badge/index.wxss +++ b/dist/badge/index.wxss @@ -1 +1 @@ -.zan-badge{position:relative}.zan-badge__text{position:absolute;top:-.8em;right:0;height:1.6em;min-width:1.6em;line-height:1.6;padding:0 .4em;font-size:20px;border-radius:.8em;background:#f44;color:#fff;text-align:center;white-space:nowrap;-webkit-transform:translateX(50%) scale(.5);transform:translateX(50%) scale(.5);-webkit-transform-origin:center;transform-origin:center;z-index:10;box-shadow:0 0 0 2px #fff;box-sizing:border-box} \ No newline at end of file +.van-badge{position:relative}.van-badge__text{position:absolute;top:-.8em;right:0;height:1.6em;min-width:1.6em;line-height:1.6;padding:0 .4em;font-size:20px;border-radius:.8em;background:#f44;color:#fff;text-align:center;white-space:nowrap;-webkit-transform:translateX(50%) scale(.5);transform:translateX(50%) scale(.5);-webkit-transform-origin:center;transform-origin:center;z-index:10;box-shadow:0 0 0 2px #fff;box-sizing:border-box} \ No newline at end of file diff --git a/dist/btn/index.wxml b/dist/btn/index.wxml index 13d69d79..4ad687b9 100644 --- a/dist/btn/index.wxml +++ b/dist/btn/index.wxml @@ -1,5 +1,5 @@