From 639ef64d967b7154dec987d73d61d9215173ff44 Mon Sep 17 00:00:00 2001 From: neverland Date: Mon, 19 Mar 2018 20:49:35 +0800 Subject: [PATCH] [bugfix] module circular dependency (#728) --- docs/markdown/en-US/quickstart.md | 12 ------------ docs/markdown/zh-CN/changelog.md | 4 ++-- docs/markdown/zh-CN/quickstart.md | 12 ------------ packages/actionsheet/index.vue | 2 +- packages/address-edit/Detail.vue | 2 +- packages/address-edit/index.vue | 3 ++- packages/address-list/index.vue | 2 +- packages/area/index.vue | 3 ++- packages/badge-group/index.vue | 2 +- packages/badge/index.vue | 2 +- packages/button/index.vue | 2 +- packages/card/index.vue | 2 +- packages/cell-swipe/index.vue | 2 +- packages/checkbox-group/index.vue | 2 +- packages/checkbox/index.vue | 3 ++- packages/circle/index.vue | 2 +- packages/col/index.vue | 2 +- packages/collapse-item/index.vue | 3 ++- packages/collapse/index.vue | 2 +- packages/contact-card/index.vue | 2 +- packages/contact-edit/index.vue | 2 +- packages/contact-list/index.vue | 2 +- packages/coupon-cell/index.vue | 2 +- packages/coupon-list/Item.vue | 2 +- packages/coupon-list/index.vue | 2 +- packages/datetime-picker/index.vue | 2 +- packages/dialog/dialog.vue | 2 +- packages/field/index.vue | 3 ++- packages/goods-action-big-btn/index.vue | 2 +- packages/goods-action-mini-btn/index.vue | 2 +- packages/goods-action/index.vue | 2 +- packages/image-preview/image-preview.vue | 2 +- packages/nav-bar/index.vue | 2 +- packages/notice-bar/index.vue | 2 +- packages/number-keyboard/index.vue | 2 +- packages/pagination/index.vue | 2 +- packages/panel/index.vue | 2 +- packages/password-input/index.vue | 2 +- packages/picker/PickerColumn.vue | 3 ++- packages/picker/index.vue | 2 +- packages/popup/index.vue | 2 +- packages/progress/index.vue | 2 +- packages/pull-refresh/index.vue | 2 +- packages/radio-group/index.vue | 2 +- packages/radio/index.vue | 2 +- packages/row/index.vue | 2 +- packages/search/index.vue | 2 +- packages/sku/Sku.vue | 2 +- packages/sku/components/SkuActions.vue | 2 +- packages/sku/components/SkuHeader.vue | 2 +- packages/sku/components/SkuImgUploader.vue | 2 +- packages/sku/components/SkuMessages.vue | 2 +- packages/sku/components/SkuRow.vue | 6 ++++-- packages/sku/components/SkuRowItem.vue | 2 +- packages/sku/components/SkuStepper.vue | 2 +- packages/step/index.vue | 2 +- packages/stepper/index.vue | 2 +- packages/steps/index.vue | 2 +- packages/submit-bar/index.vue | 2 +- packages/swipe-item/index.vue | 2 +- packages/swipe/index.vue | 2 +- packages/switch-cell/index.vue | 2 +- packages/switch/index.vue | 2 +- packages/tab/index.vue | 2 +- packages/tabbar-item/index.vue | 2 +- packages/tabbar/index.vue | 2 +- packages/tabs/index.vue | 2 +- packages/tag/index.vue | 2 +- packages/toast/toast.vue | 2 +- packages/tree-select/index.vue | 2 +- packages/uploader/index.vue | 2 +- packages/utils/index.js | 2 -- 72 files changed, 79 insertions(+), 97 deletions(-) diff --git a/docs/markdown/en-US/quickstart.md b/docs/markdown/en-US/quickstart.md index c3639a0d2..781dfbb34 100644 --- a/docs/markdown/en-US/quickstart.md +++ b/docs/markdown/en-US/quickstart.md @@ -64,15 +64,3 @@ Vue.use(Vant); ```shell vue init youzan/vue-cli-template-vant projectName ``` - -### Props Named Style -HTML attributes are case-insensitive, so when using non-string templates, camelCased prop names need to use their kebab-case (hyphen-delimited) equivalents. - -``` html - - - - - -``` - diff --git a/docs/markdown/zh-CN/changelog.md b/docs/markdown/zh-CN/changelog.md index ab075d082..ffa226846 100644 --- a/docs/markdown/zh-CN/changelog.md +++ b/docs/markdown/zh-CN/changelog.md @@ -9,7 +9,7 @@ * 新增 Collapse 组件 [\#674](https://github.com/youzan/vant/pull/674) [@chenjiahan](https://github.com/chenjiahan) * 构建: 升级至 webpack 4,优化构建配置 [\#693](https://github.com/youzan/vant/pull/693) [@chenjiahan](https://github.com/chenjiahan) * Popup: 新增 lock-scroll 属性,废弃 lock-on-scroll、prevent-scroll 属性 [\#688](https://github.com/youzan/vant/pull/688) [@chenjiahan](https://github.com/chenjiahan) -* 废弃 Waterfall 组件,推荐使用 List 组件代替 [\#683](https://github.com/youzan/vant/pull/683) [@chenjiahan](https://github.com/chenjiahan) +* Waterfall 组件不再维护,推荐使用 List 组件代替 [\#683](https://github.com/youzan/vant/pull/683) [@chenjiahan](https://github.com/chenjiahan) **Improvements** @@ -22,7 +22,7 @@ * Sku: 新增头部金额 slot [\#705](https://github.com/youzan/vant/pull/705) [@w91](https://github.com/w91) * Sku: 优化 DOM 结构 [\#704](https://github.com/youzan/vant/pull/704) [@chenjiahan](https://github.com/chenjiahan) * Tab: 支持通过滑动手势进行切换 [\#694](https://github.com/youzan/vant/pull/694) [\#695](https://github.com/youzan/vant/pull/695) [@cookfront](https://github.com/cookfront) -* Tag: 跳转标签样式 [\#689](https://github.com/youzan/vant/pull/689) [@chenjiahan](https://github.com/chenjiahan) +* Tag: 调整标签样式 [\#689](https://github.com/youzan/vant/pull/689) [@chenjiahan](https://github.com/chenjiahan) * Toast: 支持通过 Vue.use 注册 [\#690](https://github.com/youzan/vant/pull/690) [@chenjiahan](https://github.com/chenjiahan) diff --git a/docs/markdown/zh-CN/quickstart.md b/docs/markdown/zh-CN/quickstart.md index 6c31efe4b..e48a197bc 100644 --- a/docs/markdown/zh-CN/quickstart.md +++ b/docs/markdown/zh-CN/quickstart.md @@ -63,15 +63,3 @@ Vue.use(Vant); ```shell vue init youzan/vue-cli-template-vant projectName ``` - -### Props 命名风格 -Vant 文档中的 props 默认采用驼峰式命名 (camelCase)。由于 HTML 特性是不区分大小写的,如果在 HTML 中直接书写 Vue 模板,需要使用短横线分割式 (kebab-case) 的命名来传递 props - -``` html - - - - - -``` - diff --git a/packages/actionsheet/index.vue b/packages/actionsheet/index.vue index 9b3e6dc38..79fb9ec4f 100644 --- a/packages/actionsheet/index.vue +++ b/packages/actionsheet/index.vue @@ -34,7 +34,7 @@ diff --git a/packages/sku/components/SkuRowItem.vue b/packages/sku/components/SkuRowItem.vue index 787ca0c35..96f4e4cd5 100644 --- a/packages/sku/components/SkuRowItem.vue +++ b/packages/sku/components/SkuRowItem.vue @@ -12,7 +12,7 @@