From 0d686313e00eb1141ea449b2ec7bfabf446d47ef Mon Sep 17 00:00:00 2001 From: neverland Date: Thu, 23 Nov 2017 20:13:30 +0800 Subject: [PATCH] [bugfix] should not access window when ssr (#344) * fix: Tabbar icon line-height * [new feature] progress add showPivot prop * [new feature] TabItem support vue-router * [new feature] update document header style * [Doc] add toast english ducoment * [bugfix] Search box-sizing wrong * [Doc] update vant-demo respo * [Doc] translate theme & demo pages * [Doc] add Internationalization document * [bugfix] remove unnecessary props * [fix] optimize clickoutside * [new feature] optimize find-parent * [new feature]: change document title accordinng to language * [new feature] Pagination code review * [improvement] adjust icon-font unicode * [improvement] Icon spinner color inherit * [improvement] icon default width * [bugfix] DateTimePicker validate date props * [bugfix] Tab item text ellipsis * [improvement] optimize single line ellipsis * [Improvement] optimzie staticClass * [Improvement] Button: use sfc instread of jsx * [Improvement] update actionsheet close icon style * fix: yarn.lock * fix: icon test cases * [bugfix] errors during ssr --- docs/demos/common.js | 2 +- packages/address-edit/Detail.vue | 2 +- packages/locale/index.js | 3 +-- packages/sku/containers/SkuContainer.vue | 5 +++++ packages/utils/camelize.js | 4 ---- packages/utils/clickoutside.js | 3 +-- packages/utils/env/is-android.js | 3 --- packages/utils/get.js | 9 -------- packages/utils/index.js | 27 ++++++++++++++++++++++++ packages/utils/scroll.js | 4 ++-- 10 files changed, 38 insertions(+), 24 deletions(-) delete mode 100644 packages/utils/camelize.js delete mode 100644 packages/utils/env/is-android.js delete mode 100644 packages/utils/get.js create mode 100644 packages/utils/index.js diff --git a/docs/demos/common.js b/docs/demos/common.js index a3446c2a2..a31312f1f 100644 --- a/docs/demos/common.js +++ b/docs/demos/common.js @@ -5,7 +5,7 @@ import Vue from 'vue'; import { Locale, Toast, Dialog } from 'packages'; import { DemoBlock, DemoSection } from 'vant-doc'; -import camelize from 'packages/utils/camelize'; +import { camelize } from 'packages/utils'; const demoBaseMixin = { beforeCreate() { diff --git a/packages/address-edit/Detail.vue b/packages/address-edit/Detail.vue index 5f9bbb4cd..94e2fd828 100644 --- a/packages/address-edit/Detail.vue +++ b/packages/address-edit/Detail.vue @@ -41,7 +41,7 @@ import Icon from '../icon'; import Field from '../field'; import Cell from '../cell'; import CellGroup from '../cell-group'; -import isAndroid from '../utils/env/is-android'; +import { isAndroid } from '../utils'; import { i18n } from '../locale'; export default { diff --git a/packages/locale/index.js b/packages/locale/index.js index 84e536deb..dcb455cc8 100644 --- a/packages/locale/index.js +++ b/packages/locale/index.js @@ -1,6 +1,5 @@ import Vue from 'vue'; -import get from '../utils/get'; -import camelize from '../utils/camelize'; +import { get, camelize } from '../utils'; import deepAssign from '../utils/deep-assign'; import defaultMessages from './lang/zh-CN'; diff --git a/packages/sku/containers/SkuContainer.vue b/packages/sku/containers/SkuContainer.vue index 550403062..22854b2af 100644 --- a/packages/sku/containers/SkuContainer.vue +++ b/packages/sku/containers/SkuContainer.vue @@ -72,6 +72,7 @@