From 64cce6b0bfd0541a8b0dce4307a196172d81255d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Sun, 12 Jan 2020 16:56:48 +0800 Subject: [PATCH 01/15] fix(ImagePreview): disable desktop browser image drag #4487 --- src/image-preview/demo/index.vue | 6 ------ src/image-preview/index.less | 5 +++++ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/image-preview/demo/index.vue b/src/image-preview/demo/index.vue index b1448428a..006992795 100644 --- a/src/image-preview/demo/index.vue +++ b/src/image-preview/demo/index.vue @@ -109,10 +109,4 @@ export default { margin-left: @padding-md; } } - -.van-image-preview { - img { - -webkit-user-drag: none; - } -} diff --git a/src/image-preview/index.less b/src/image-preview/index.less index cbf4e907b..285fd6b5a 100644 --- a/src/image-preview/index.less +++ b/src/image-preview/index.less @@ -25,6 +25,11 @@ left: 0; transition-property: transform; + img { + // disable desktop browser image drag + -webkit-user-drag: none; + } + .van-image__loading { background-color: transparent; } From 96991fd8920ab4355e76f5f9c6b8d366d9d20a7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Sun, 12 Jan 2020 17:03:38 +0800 Subject: [PATCH 02/15] feat(cli): support custom devServer port --- packages/vant-cli/src/compiler/compile-site.ts | 2 +- packages/vant-cli/src/config/webpack.site.dev.ts | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/vant-cli/src/compiler/compile-site.ts b/packages/vant-cli/src/compiler/compile-site.ts index a8a8bcaae..a134ecba5 100644 --- a/packages/vant-cli/src/compiler/compile-site.ts +++ b/packages/vant-cli/src/compiler/compile-site.ts @@ -13,7 +13,7 @@ function watch() { getPort( { - port: 8080 + port: siteDevConfig.devServer!.port }, (err, port) => { if (err) { diff --git a/packages/vant-cli/src/config/webpack.site.dev.ts b/packages/vant-cli/src/config/webpack.site.dev.ts index 110e88b55..17d12e77d 100644 --- a/packages/vant-cli/src/config/webpack.site.dev.ts +++ b/packages/vant-cli/src/config/webpack.site.dev.ts @@ -44,6 +44,7 @@ export const siteDevBaseConfig = merge(baseConfig as any, { 'site-mobile': [join(__dirname, '../../site/mobile/main.js')] }, devServer: { + port: 8080, quiet: true, host: '0.0.0.0', stats: 'errors-only', From 02cf4af16cdfd7a54c9e39df7b1fba0683906357 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Sun, 12 Jan 2020 17:09:14 +0800 Subject: [PATCH 03/15] docs(cli): add webpack config guide --- packages/vant-cli/docs/config.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/packages/vant-cli/docs/config.md b/packages/vant-cli/docs/config.md index 4e3225f36..0a6eca48e 100644 --- a/packages/vant-cli/docs/config.md +++ b/packages/vant-cli/docs/config.md @@ -179,3 +179,15 @@ module.exports = { } }; ``` + +## Webpack + +根目录下的`webpack.config.js`文件会通过 [webpack-merge](https://github.com/survivejs/webpack-merge) 合并到最终的配置中。因此可以灵活地自定义 Webpack 配置，比如修改 devServer 端口： + +```js +module.exports = { + devServer: { + port: 9000 + } +}; +``` From 0406579b9b036e27d4471c2a5925fb58c049f954 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Sun, 12 Jan 2020 17:22:05 +0800 Subject: [PATCH 04/15] docs(cli): add babel config guide --- packages/vant-cli/docs/config.md | 50 +++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/packages/vant-cli/docs/config.md b/packages/vant-cli/docs/config.md index 0a6eca48e..01dbb99c1 100644 --- a/packages/vant-cli/docs/config.md +++ b/packages/vant-cli/docs/config.md @@ -182,7 +182,9 @@ module.exports = { ## Webpack -根目录下的`webpack.config.js`文件会通过 [webpack-merge](https://github.com/survivejs/webpack-merge) 合并到最终的配置中。因此可以灵活地自定义 Webpack 配置，比如修改 devServer 端口： +通过根目录下的`webpack.config.js`文件可以修改 Webpack 配置，配置内容会通过 [webpack-merge](https://github.com/survivejs/webpack-merge) 合并到最终的配置中。 + +比如修改 devServer 端口： ```js module.exports = { @@ -191,3 +193,49 @@ module.exports = { } }; ``` + +## Babel + +通过根目录下的`babel.config.js`文件可以对 Babel 进行配置。 + +### Preset + +推荐使用`vant-cli`内置的 preset，配置如下： + +```js +module.exports = { + presets: ['@vant/cli/preset'] +}; +``` + +`@vant/cli/preset`中默认包含了以下插件： + +- @babel/preset-env +- @babel/preset-typescript +- @babel/plugin-transform-runtime +- @babel/plugin-transform-object-assign +- @babel/plugin-proposal-optional-chaining +- @babel/plugin-proposal-nullish-coalescing-operator +- @vue/babel-preset-jsx + +### Dependencies + +由于使用了`@babel/plugin-transform-runtime`来优化 Babel 的 helper 函数，你需要将`@babel/runtime`添加到`package.json`的依赖项： + +```json +{ + "dependencies": { + "@babel/runtime": "7.x" + } +} +``` + +如果使用了 JSX 的语法，还需要将`@vue/babel-helper-vue-jsx-merge-props`添加到依赖中： + +```json +{ + "dependencies": { + "@vue/babel-helper-vue-jsx-merge-props": "^1.0.0" + } +} +``` \ No newline at end of file From 6ce9f5598a2df2891119bf8d631dd837e959d354 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Sun, 12 Jan 2020 17:41:36 +0800 Subject: [PATCH 05/15] feat(cli): support custom postcss config --- packages/vant-cli/docs/config.md | 32 +++++++++++++++++-- packages/vant-cli/src/common/constant.ts | 3 +- packages/vant-cli/src/common/index.ts | 23 ++++++++++--- .../vant-cli/src/config/postcss.config.ts | 23 ++++++++++++- 4 files changed, 72 insertions(+), 9 deletions(-) diff --git a/packages/vant-cli/docs/config.md b/packages/vant-cli/docs/config.md index 01dbb99c1..8511a776a 100644 --- a/packages/vant-cli/docs/config.md +++ b/packages/vant-cli/docs/config.md @@ -210,7 +210,7 @@ module.exports = { `@vant/cli/preset`中默认包含了以下插件： -- @babel/preset-env +- @babel/preset-env（不含 core-js） - @babel/preset-typescript - @babel/plugin-transform-runtime - @babel/plugin-transform-object-assign @@ -238,4 +238,32 @@ module.exports = { "@vue/babel-helper-vue-jsx-merge-props": "^1.0.0" } } -``` \ No newline at end of file +``` + +## Postcss + +通过根目录下的`postcss.config.js`文件可以对 Postcss 进行配置。 + +### 默认配置 + +`vant-cli`中默认的 Postcss 配置如下： + +```js +module.exports = { + plugins: { + autoprefixer: {} + } +}; +``` + +## browserslist + +推荐在`package.json`文件里添加 browserslist 字段，这个值会被`@babel/preset-env`和`autoprefixer`用来确定目标浏览器的版本，保证编译后代码的兼容性。 + +在移动端浏览器中使用，可以添加如下配置： + +```json +{ + "browserslist": ["Android >= 4.0", "iOS >= 8"] +} +``` diff --git a/packages/vant-cli/src/common/constant.ts b/packages/vant-cli/src/common/constant.ts index a3542be1c..9b56725ea 100644 --- a/packages/vant-cli/src/common/constant.ts +++ b/packages/vant-cli/src/common/constant.ts @@ -22,7 +22,8 @@ export const DOCS_DIR = join(ROOT, 'docs'); export const SITE_DIST_DIR = join(ROOT, 'site'); export const VANT_CONFIG_FILE = join(ROOT, 'vant.config.js'); export const PACKAGE_JSON_FILE = join(ROOT, 'package.json'); -export const WEBPACK_CONFIG_FILE = join(ROOT, 'webpack.config.js'); +export const ROOT_WEBPACK_CONFIG_FILE = join(ROOT, 'webpack.config.js'); +export const ROOT_POSTCSS_CONFIG_FILE = join(ROOT, 'postcss.config.js'); export const DIST_DIR = join(__dirname, '../../dist'); export const CONFIG_DIR = join(__dirname, '../config'); diff --git a/packages/vant-cli/src/common/index.ts b/packages/vant-cli/src/common/index.ts index 54204c045..9660d217a 100644 --- a/packages/vant-cli/src/common/index.ts +++ b/packages/vant-cli/src/common/index.ts @@ -7,7 +7,12 @@ import { readFileSync, outputFileSync } from 'fs-extra'; -import { SRC_DIR, getVantConfig, WEBPACK_CONFIG_FILE } from './constant'; +import { + SRC_DIR, + getVantConfig, + ROOT_WEBPACK_CONFIG_FILE, + ROOT_POSTCSS_CONFIG_FILE +} from './constant'; export const EXT_REGEXP = /\.\w+$/; export const SFC_REGEXP = /\.(vue)$/; @@ -96,8 +101,8 @@ export function normalizePath(path: string): string { } export function getWebpackConfig(): object { - if (existsSync(WEBPACK_CONFIG_FILE)) { - const config = require(WEBPACK_CONFIG_FILE); + if (existsSync(ROOT_WEBPACK_CONFIG_FILE)) { + const config = require(ROOT_WEBPACK_CONFIG_FILE); if (typeof config === 'function') { return config(); @@ -109,6 +114,14 @@ export function getWebpackConfig(): object { return {}; } +export function getPostcssConfig(): object { + if (existsSync(ROOT_POSTCSS_CONFIG_FILE)) { + return require(ROOT_POSTCSS_CONFIG_FILE); + } + + return {}; +} + export type ModuleEnv = 'esmodule' | 'commonjs'; export type NodeEnv = 'production' | 'development' | 'test'; export type BuildTarget = 'site' | 'package'; @@ -129,8 +142,8 @@ export function isDev() { return process.env.NODE_ENV === 'development'; } -// Smarter outputFileSync -// Skip if content unchanged +// smarter outputFileSync +// skip output if file content unchanged export function smartOutputFile(filePath: string, content: string) { if (existsSync(filePath)) { const previousContent = readFileSync(filePath, 'utf-8'); diff --git a/packages/vant-cli/src/config/postcss.config.ts b/packages/vant-cli/src/config/postcss.config.ts index 5bfb8f628..fbe328c58 100644 --- a/packages/vant-cli/src/config/postcss.config.ts +++ b/packages/vant-cli/src/config/postcss.config.ts @@ -1,5 +1,26 @@ -module.exports = { +import { getPostcssConfig } from '../common'; + +type PostcssConfig = object & { + plugins?: object; +}; + +function mergePostcssConfig(config1: PostcssConfig, config2: PostcssConfig) { + const plugins = { + ...config1.plugins, + ...config2.plugins + }; + + return { + ...config1, + ...config2, + plugins + }; +} + +const DEFAULT_CONFIG = { plugins: { autoprefixer: {} } }; + +module.exports = mergePostcssConfig(DEFAULT_CONFIG, getPostcssConfig()); From 28c486abb248dbb8dfc2aa3cd9d5d3531a27d7e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Sun, 12 Jan 2020 17:43:02 +0800 Subject: [PATCH 06/15] chore: release @vant/cli@2.1.6 --- packages/vant-cli/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vant-cli/package.json b/packages/vant-cli/package.json index 999558491..6aa36e95b 100644 --- a/packages/vant-cli/package.json +++ b/packages/vant-cli/package.json @@ -1,6 +1,6 @@ { "name": "@vant/cli", - "version": "2.1.5", + "version": "2.1.6", "description": "", "main": "lib/index.js", "typings": "lib/index.d.ts", From fb6ab03f74b750ed79a576503b8a1c5172c0999b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Sun, 12 Jan 2020 17:45:55 +0800 Subject: [PATCH 07/15] docs(cli): v2.1.6 changelog --- packages/vant-cli/README.md | 6 +++++- packages/vant-cli/changelog.md | 9 +++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/packages/vant-cli/README.md b/packages/vant-cli/README.md index 559b3dce4..ceca5f7f8 100644 --- a/packages/vant-cli/README.md +++ b/packages/vant-cli/README.md @@ -80,7 +80,7 @@ yarn add @vant/cli --dev ### changelog -基于 commit 记录生成更新日志， +基于 commit 记录生成更新日志 ### commit-lint @@ -89,3 +89,7 @@ yarn add @vant/cli --dev ## 配置 参见[配置](https://github.com/youzan/vant/tree/dev/packages/vant-cli/docs/config.md)。 + +## 更新日志 + +参见[更新日志](https://github.com/youzan/vant/tree/dev/packages/vant-cli/changelog.md)。 diff --git a/packages/vant-cli/changelog.md b/packages/vant-cli/changelog.md index 7e0a8636c..17f841880 100644 --- a/packages/vant-cli/changelog.md +++ b/packages/vant-cli/changelog.md @@ -1,5 +1,14 @@ # 更新日志 +### [v2.1.6] +`2020-01-12` + +- 支持自定义 Postcss 配置 +- 支持自定义 devServer 端口 +- 优化文档站点的 meta 字段 +- 新增 API 文档中的版本标签样式 + + ### [v2.1.5] `2020-01-10` From 2907939058ca8ad6926f385a4753ca5c5583f956 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Sun, 12 Jan 2020 17:47:22 +0800 Subject: [PATCH 08/15] chore: bump @vant/cli@2.1.6 --- package.json | 2 +- packages/vant-cli/README.md | 2 +- yarn.lock | 106 +++++++++++++++--------------------- 3 files changed, 47 insertions(+), 63 deletions(-) diff --git a/package.json b/package.json index b1206e1a4..06c0ddd27 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "vue": ">= 2.5.22" }, "devDependencies": { - "@vant/cli": "^2.1.4", + "@vant/cli": "^2.1.6", "vue": "^2.6.11", "vue-template-compiler": "^2.6.11" }, diff --git a/packages/vant-cli/README.md b/packages/vant-cli/README.md index ceca5f7f8..cfb72bf54 100644 --- a/packages/vant-cli/README.md +++ b/packages/vant-cli/README.md @@ -88,7 +88,7 @@ yarn add @vant/cli --dev ## 配置 -参见[配置](https://github.com/youzan/vant/tree/dev/packages/vant-cli/docs/config.md)。 +参见[配置指南](https://github.com/youzan/vant/tree/dev/packages/vant-cli/docs/config.md)。 ## 更新日志 diff --git a/yarn.lock b/yarn.lock index 07d735605..e85c21c57 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1377,11 +1377,6 @@ resolved "https://registry.npm.taobao.org/@types/node/download/@types/node-12.12.9.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fnode%2Fdownload%2F%40types%2Fnode-12.12.9.tgz#0b5ae05516b757cbff2e82c04500190aef986c7b" integrity sha1-C1rgVRa3V8v/LoLARQAZCu+YbHs= -"@types/normalize-package-data@^2.4.0": - version "2.4.0" - resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e" - integrity sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA== - "@types/parse-json@^4.0.0": version "4.0.0" resolved "https://registry.npm.taobao.org/@types/parse-json/download/@types/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0" @@ -1469,10 +1464,10 @@ semver "^6.3.0" tsutils "^3.17.1" -"@vant/cli@^2.1.4": - version "2.1.4" - resolved "https://registry.npm.taobao.org/@vant/cli/download/@vant/cli-2.1.4.tgz?cache=0&sync_timestamp=1578283277451&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40vant%2Fcli%2Fdownload%2F%40vant%2Fcli-2.1.4.tgz#b283a1d22f9846f4148787afa91763ee86d155f8" - integrity sha1-soOh0i+YRvQUh4evqRdj7obRVfg= +"@vant/cli@^2.1.6": + version "2.1.6" + resolved "https://registry.yarnpkg.com/@vant/cli/-/cli-2.1.6.tgz#67d4ab2d7aca2396acf0a44d388dacbe8d6ff9d2" + integrity sha512-45LLDdTXEFIlQvwRvkrGWVWnN8BVi+ESPLn6LBCvNjCd7sNBbGZsdC1fjFrBH6cocvDxyIzXKhX1E2OdqJ7Gpg== dependencies: "@babel/core" "^7.7.7" "@babel/plugin-proposal-nullish-coalescing-operator" "^7.7.4" @@ -1490,7 +1485,7 @@ "@vant/stylelint-config" "^1.1.0" "@vant/touch-emulator" "^1.2.0" "@vue/babel-preset-jsx" "^1.1.2" - "@vue/component-compiler-utils" "^3.1.0" + "@vue/component-compiler-utils" "^3.1.1" "@vue/test-utils" "1.0.0-beta.29" autoprefixer "^9.7.3" babel-jest "^24.9.0" @@ -1500,15 +1495,14 @@ chokidar "^3.3.1" clean-css "^4.2.1" codecov "^3.6.1" - commander "^4.0.1" + commander "^4.1.0" conventional-changelog "^3.1.18" cross-env "^6.0.3" css-loader "^3.4.1" eslint "^6.8.0" - find-babel-config "^1.2.0" gh-pages "2.0.1" html-webpack-plugin "3.2.0" - husky "^3.1.0" + husky "^4.0.4" jest "^24.9.0" jest-canvas-mock "^2.2.0" jest-serializer-vue "^2.0.2" @@ -1520,7 +1514,7 @@ postcss "^7.0.26" postcss-loader "^3.0.0" release-it "^12.4.3" - sass "^1.24.2" + sass "^1.24.4" sass-loader "^8.0.0" shelljs "^0.8.3" signale "^1.4.0" @@ -1676,6 +1670,21 @@ source-map "~0.6.1" vue-template-es2015-compiler "^1.9.0" +"@vue/component-compiler-utils@^3.1.1": + version "3.1.1" + resolved "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-3.1.1.tgz#d4ef8f80292674044ad6211e336a302e4d2a6575" + integrity sha512-+lN3nsfJJDGMNz7fCpcoYIORrXo0K3OTsdr8jCM7FuqdI4+70TY6gxY6viJ2Xi1clqyPg7LpeOWwjF31vSMmUw== + dependencies: + consolidate "^0.15.1" + hash-sum "^1.0.2" + lru-cache "^4.1.2" + merge-source-map "^1.1.0" + postcss "^7.0.14" + postcss-selector-parser "^6.0.2" + prettier "^1.18.2" + source-map "~0.6.1" + vue-template-es2015-compiler "^1.9.0" + "@vue/test-utils@1.0.0-beta.29": version "1.0.0-beta.29" resolved "https://registry.npm.taobao.org/@vue/test-utils/download/@vue/test-utils-1.0.0-beta.29.tgz#c942cf25e891cf081b6a03332b4ae1ef430726f0" @@ -3205,10 +3214,10 @@ commander@^2.18.0, commander@^2.19.0, commander@^2.20.0: resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422" integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ== -commander@^4.0.1: - version "4.0.1" - resolved "https://registry.npm.taobao.org/commander/download/commander-4.0.1.tgz#b67622721785993182e807f4883633e6401ba53c" - integrity sha1-tnYicheFmTGC6Af0iDYz5kAbpTw= +commander@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.0.tgz#545983a0603fe425bc672d66c9e3c89c42121a83" + integrity sha512-NIQrwvv9V39FHgGFm36+U9SMQzbiHvU79k+iADraJTpmrFFfx7Ds0IvDoAdZsDrknlkRk14OYoWXb57uTh7/sw== commander@~2.19.0: version "2.19.0" @@ -4948,14 +4957,6 @@ finalhandler@~1.1.2: statuses "~1.5.0" unpipe "~1.0.0" -find-babel-config@^1.2.0: - version "1.2.0" - resolved "https://registry.npm.taobao.org/find-babel-config/download/find-babel-config-1.2.0.tgz#a9b7b317eb5b9860cda9d54740a8c8337a2283a2" - integrity sha1-qbezF+tbmGDNqdVHQKjIM3oig6I= - dependencies: - json5 "^0.5.1" - path-exists "^3.0.0" - find-cache-dir@^2.0.0, find-cache-dir@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7" @@ -5769,22 +5770,20 @@ humanize-url@^1.0.0: normalize-url "^1.0.0" strip-url-auth "^1.0.0" -husky@^3.1.0: - version "3.1.0" - resolved "https://registry.npm.taobao.org/husky/download/husky-3.1.0.tgz#5faad520ab860582ed94f0c1a77f0f04c90b57c0" - integrity sha1-X6rVIKuGBYLtlPDBp38PBMkLV8A= +husky@^4.0.4: + version "4.0.7" + resolved "https://registry.yarnpkg.com/husky/-/husky-4.0.7.tgz#cee4301d1db1d731be9c2aa2ac72b46439d30c91" + integrity sha512-ULivTOe0k+nNjZKIojoHxXjybtEycaba0EDuk1G8iNGD8wZgo8Sr3YiN8bKitXNpI1RvVKTJwRnh2GLysLbxMQ== dependencies: - chalk "^2.4.2" + chalk "^3.0.0" ci-info "^2.0.0" - cosmiconfig "^5.2.1" - execa "^1.0.0" + cosmiconfig "^6.0.0" get-stdin "^7.0.0" opencollective-postinstall "^2.0.2" pkg-dir "^4.2.0" please-upgrade-node "^3.2.0" - read-pkg "^5.2.0" - run-node "^1.0.0" slash "^3.0.0" + which-pm-runs "^1.0.0" iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4: version "0.4.24" @@ -6980,7 +6979,7 @@ json5@2.x, json5@^2.1.0: dependencies: minimist "^1.2.0" -json5@^0.5.0, json5@^0.5.1: +json5@^0.5.0: version "0.5.1" resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821" integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE= @@ -8051,7 +8050,7 @@ nopt@^4.0.1, nopt@~4.0.1: abbrev "1" osenv "^0.1.4" -normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.3.5, normalize-package-data@^2.5.0: +normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.3.5: version "2.5.0" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA== @@ -9406,16 +9405,6 @@ read-pkg@^3.0.0: normalize-package-data "^2.3.2" path-type "^3.0.0" -read-pkg@^5.2.0: - version "5.2.0" - resolved "https://registry.npm.taobao.org/read-pkg/download/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc" - integrity sha1-e/KVQ4yloz5WzTDgU7NO5yUMk8w= - dependencies: - "@types/normalize-package-data" "^2.4.0" - normalize-package-data "^2.5.0" - parse-json "^5.0.0" - type-fest "^0.6.0" - "readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6: version "2.3.6" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf" @@ -9907,11 +9896,6 @@ run-async@^2.2.0: dependencies: is-promise "^2.1.0" -run-node@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/run-node/-/run-node-1.0.0.tgz#46b50b946a2aa2d4947ae1d886e9856fd9cabe5e" - integrity sha512-kc120TBlQ3mih1LSzdAJXo4xn/GWS2ec0l3S+syHDXP9uRr0JAT8Qd3mdMuyjqCzeZktgP3try92cEgf9Nks8A== - run-parallel@^1.1.9: version "1.1.9" resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.9.tgz#c9dd3a7cf9f4b2c4b6244e173a6ed866e61dd679" @@ -9979,10 +9963,10 @@ sass-loader@^8.0.0: schema-utils "^2.1.0" semver "^6.3.0" -sass@^1.24.2: - version "1.24.2" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.24.2.tgz#0a0e0f00368be6808b2e94470172266ac45498fe" - integrity sha512-0JxdMMRd0fOmGFQFRI91vh4n0Ed766ib9JwPUa+1C37zn3VaqlHxbknUn/6LqP/MSfvNPxRYoCrYf5g8vu4OHw== +sass@^1.24.4: + version "1.24.4" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.24.4.tgz#aa50575a9ed2b9e9645b5599156fd149bdad9eaa" + integrity sha512-SqizkIEEcVPzmK1tYdlNRl/RSXMEwGcifL9GD+S2p9rEPdj6ycRbk4PWZs0jwlajNSyBPo/SXRB81i22SG0jmw== dependencies: chokidar ">=2.0.0 <4.0.0" @@ -11247,11 +11231,6 @@ type-fest@^0.5.2: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.5.2.tgz#d6ef42a0356c6cd45f49485c3b6281fc148e48a2" integrity sha512-DWkS49EQKVX//Tbupb9TFa19c7+MK1XmzkrZUR8TAktmE/DizXoaoJV6TZ/tSIPXipqNiRI6CyAe7x69Jb6RSw== -type-fest@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b" - integrity sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg== - type-fest@^0.8.1: version "0.8.1" resolved "https://registry.npm.taobao.org/type-fest/download/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" @@ -11908,6 +11887,11 @@ which-module@^2.0.0: resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho= +which-pm-runs@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/which-pm-runs/-/which-pm-runs-1.0.0.tgz#670b3afbc552e0b55df6b7780ca74615f23ad1cb" + integrity sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs= + which@^1.2.9, which@^1.3.0, which@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" From bbb2392bb5c1cb62bc867fb8246ef29f56ff1265 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Sun, 12 Jan 2020 17:48:50 +0800 Subject: [PATCH 09/15] docs(cli): add config toc --- packages/vant-cli/docs/config.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/vant-cli/docs/config.md b/packages/vant-cli/docs/config.md index 8511a776a..d5fe15fb4 100644 --- a/packages/vant-cli/docs/config.md +++ b/packages/vant-cli/docs/config.md @@ -1,4 +1,6 @@ -# 配置 +# 配置指南 + +[toc] ## vant.config.js @@ -198,7 +200,7 @@ module.exports = { 通过根目录下的`babel.config.js`文件可以对 Babel 进行配置。 -### Preset +### 默认配置 推荐使用`vant-cli`内置的 preset，配置如下： @@ -218,7 +220,7 @@ module.exports = { - @babel/plugin-proposal-nullish-coalescing-operator - @vue/babel-preset-jsx -### Dependencies +### 依赖 由于使用了`@babel/plugin-transform-runtime`来优化 Babel 的 helper 函数，你需要将`@babel/runtime`添加到`package.json`的依赖项： From 99fb78edb5d2257bf4a5bd9d5a163089c47c9c9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Sun, 12 Jan 2020 17:54:01 +0800 Subject: [PATCH 10/15] docs(cli): add manual generated toc for github --- packages/vant-cli/docs/config.md | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/packages/vant-cli/docs/config.md b/packages/vant-cli/docs/config.md index d5fe15fb4..6c2b637dd 100644 --- a/packages/vant-cli/docs/config.md +++ b/packages/vant-cli/docs/config.md @@ -1,6 +1,23 @@ # 配置指南 -[toc] +- [配置指南](#) + - [vant.config.js](#vantconfigjs) + - [name](#name) + - [build.css](#buildcss) + - [build.site](#buildsite) + - [site.title](#sitetitle) + - [site.logo](#sitelogo) + - [site.description](#sitedescription) + - [site.nav](#sitenav) + - [site.versions](#siteversions) + - [site.baiduAnalytics](#sitebaiduanalytics) + - [Webpack](#webpack) + - [Babel](#babel) + - [默认配置](#-1) + - [依赖](#-2) + - [Postcss](#postcss) + - [默认配置](#-3) + - [browserslist](#browserslist) ## vant.config.js From c29372b1142655fdcdbf87484d230740e250aed9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Mon, 13 Jan 2020 15:07:37 +0800 Subject: [PATCH 11/15] feat(cli): add command description --- packages/vant-cli/src/index.ts | 46 +++++++++++++++++++++++++--------- 1 file changed, 34 insertions(+), 12 deletions(-) diff --git a/packages/vant-cli/src/index.ts b/packages/vant-cli/src/index.ts index 294ed4f7c..cf3dd4f7c 100755 --- a/packages/vant-cli/src/index.ts +++ b/packages/vant-cli/src/index.ts @@ -11,27 +11,49 @@ import { changelog } from './commands/changelog'; import { buildSite } from './commands/build-site'; import { commitLint } from './commands/commit-lint'; -command('dev').action(dev); +command('dev') + .description('Run webpack dev server') + .action(dev); -command('lint').action(lint); +command('lint') + .description('Run eslint and stylelint') + .action(lint); -command('clean').action(clean); +command('test') + .description('Run unit tests through jest') + .option( + '--watch', + 'Watch files for changes and rerun tests related to changed files' + ) + .option( + '--clearCache', + 'Clears the configured Jest cache directory and then exits' + ) + .action(test); + +command('clean') + .description('Clean all dist files') + .action(clean); command('build') + .description('Compile components in production mode') .option('--watch', 'Watch file change') .action(build); -command('release').action(release); +command('release') + .description('Compile components and release it') + .action(release); -command('changelog').action(changelog); +command('build-site') + .description('Compile site in production mode') + .action(buildSite); -command('build-site').action(buildSite); +command('changelog') + .description('Generate changelog') + .action(changelog); -command('commit-lint').action(commitLint); - -command('test') - .option('--watch') - .option('--clearCache') - .action(test); +command('commit-lint') + .description('Lint commit message') + .action(commitLint); parse(process.argv); From a530c0314c193b0a8e552e851a026b1ad06bd6ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=A8=E6=A7=BF=E8=8A=B1=E5=BC=80?= <15800678225@163.com> Date: Tue, 14 Jan 2020 10:15:35 +0800 Subject: [PATCH 12/15] feat: add multiple examples (#5564) --- src/field/README.md | 13 +++++ src/field/README.zh-CN.md | 13 +++++ src/field/demo/index.vue | 19 +++++++- .../test/__snapshots__/demo.spec.js.snap | 10 ++++ src/number-keyboard/README.md | 39 +++++++++++++++ src/number-keyboard/README.zh-CN.md | 39 +++++++++++++++ src/number-keyboard/demo/index.vue | 39 ++++++++++++++- .../test/__snapshots__/demo.spec.js.snap | 12 +++++ src/password-input/README.md | 47 ++++++++++++++++++ src/password-input/README.zh-CN.md | 48 +++++++++++++++++++ src/password-input/demo/index.vue | 26 ++++++++-- .../test/__snapshots__/demo.spec.js.snap | 12 +++++ 12 files changed, 310 insertions(+), 7 deletions(-) diff --git a/src/field/README.md b/src/field/README.md index 8b9f109fd..1f2084be3 100644 --- a/src/field/README.md +++ b/src/field/README.md @@ -195,6 +195,19 @@ Textarea Field can be auto resize when has `autosize` prop /> ``` +### Input Align + +Use `input-align` prop to align the input value + +```html + +``` + ## API ### Props diff --git a/src/field/README.zh-CN.md b/src/field/README.zh-CN.md index 99e83f4b6..8c778a98d 100644 --- a/src/field/README.zh-CN.md +++ b/src/field/README.zh-CN.md @@ -214,6 +214,19 @@ export default { /> ``` +### 输入框内容对齐 + +通过`input-align`属性可以设置输入框内容的对齐方式 + +```html + +``` + ## API ### Props diff --git a/src/field/demo/index.vue b/src/field/demo/index.vue index df9c43610..48b90e710 100644 --- a/src/field/demo/index.vue +++ b/src/field/demo/index.vue @@ -145,6 +145,17 @@ /> + + + + + + @@ -171,13 +182,15 @@ export default { showWordLimit: '显示字数统计', inputReadonly: '输入框只读', inputDisabled: '输入框已禁用', + inputAlign: '输入框内容对齐', smsPlaceholder: '请输入短信验证码', textPlaceholder: '请输入文本', digitPlaceholder: '请输入整数', phonePlaceholder: '请输入手机号', textareaAutosize: '高度自适应', numberPlaceholder: '请输入数字（支持小数）', - messagePlaceholder: '请输入留言' + messagePlaceholder: '请输入留言', + alignPlaceHolder: '输入框内容右对齐', }, 'en-US': { tel: 'Tel', @@ -199,13 +212,15 @@ export default { showWordLimit: 'Show Word Limit', inputReadonly: 'Input Readonly', inputDisabled: 'Input Disabled', + inputAlign: 'Input Align', smsPlaceholder: 'SMS', textPlaceholder: 'Text', digitPlaceholder: 'Digit', phonePlaceholder: 'Phone', textareaAutosize: 'Auto Resize', numberPlaceholder: 'Number', - messagePlaceholder: 'Message' + messagePlaceholder: 'Message', + alignPlaceHolder: 'Input Align Right', } }, diff --git a/src/field/test/__snapshots__/demo.spec.js.snap b/src/field/test/__snapshots__/demo.spec.js.snap index 92f5d3c1b..204a15802 100644 --- a/src/field/test/__snapshots__/demo.spec.js.snap +++ b/src/field/test/__snapshots__/demo.spec.js.snap @@ -146,5 +146,15 @@ exports[`renders demo correctly 1`] = ` +
+
+
+
文本
+
+
+
+
+
+
`; diff --git a/src/number-keyboard/README.md b/src/number-keyboard/README.md index 1a64da1fa..c53ed2662 100644 --- a/src/number-keyboard/README.md +++ b/src/number-keyboard/README.md @@ -90,6 +90,45 @@ export default { } ``` +### Bottom Left Button Content + +Use `extra-key` prop to set the content of bottom left button + +```html + + Show Id Card Number Keyboard + + + +``` + +### Keyboard Title + +Use `title` prop to set keyboard title + +```html + + Show Custom Title Keyboard + + + +``` + ## API ### Props diff --git a/src/number-keyboard/README.zh-CN.md b/src/number-keyboard/README.zh-CN.md index 6ed827e87..0edc0f4df 100644 --- a/src/number-keyboard/README.zh-CN.md +++ b/src/number-keyboard/README.zh-CN.md @@ -96,6 +96,45 @@ export default { } ``` +### 左下角按键内容 + +通过`extra-key`属性可以设置左下角按键内容 + +```html + + 弹出身份证号码键盘 + + + +``` + +### 键盘标题 + +通过`title`属性可以设置键盘标题 + +```html + + 弹出自定义标题键盘 + + + +``` + ## API ### Props diff --git a/src/number-keyboard/demo/index.vue b/src/number-keyboard/demo/index.vue index 18329299d..85a8cf8f4 100644 --- a/src/number-keyboard/demo/index.vue +++ b/src/number-keyboard/demo/index.vue @@ -43,6 +43,33 @@ @blur="keyboard = ''" /> + + + {{ $t('button3') }} + + + + + + {{ $t('button4') }} + + + @@ -54,20 +81,28 @@ export default { custom: '自定义样式', button1: '弹出默认键盘', button2: '弹出自定义键盘', + button3: '弹出身份证号码键盘', + button4: '弹出自定义标题键盘', close: '完成', input: '输入', bindValue: '双向绑定', - clickToInput: '点此输入' + clickToInput: '点此输入', + extraKey: '左下角按键内容', + title: '键盘标题' }, 'en-US': { default: 'Default style', custom: 'Custom style', button1: 'Show Default Keyboard', button2: 'Show Custom Keyboard', + button3: 'Show Id Card Number Keyboard', + button4: 'Show Custom Title Keyboard', close: 'Close', input: 'Input', bindValue: 'Bind Value', - clickToInput: 'Click To Input' + clickToInput: 'Click To Input', + extraKey: 'Bottom Left Button Content', + title: 'Keyboard Title' } }, diff --git a/src/number-keyboard/test/__snapshots__/demo.spec.js.snap b/src/number-keyboard/test/__snapshots__/demo.spec.js.snap index 9f688b807..6b52c552b 100644 --- a/src/number-keyboard/test/__snapshots__/demo.spec.js.snap +++ b/src/number-keyboard/test/__snapshots__/demo.spec.js.snap @@ -25,5 +25,17 @@ exports[`renders demo correctly 1`] = `
1234567890删除
+
+ +
+
+ +
`; diff --git a/src/password-input/README.md b/src/password-input/README.md index dd2b0b931..cb56735d7 100644 --- a/src/password-input/README.md +++ b/src/password-input/README.md @@ -78,6 +78,53 @@ export default { /> ``` +### Hint Error + +Use `error-info` prop to set error message. For example, a password error is prompted when entering 6 bits + +```html + + + + + +``` + +```javascript +export default { + data() { + return { + value: '123', + showKeyboard: true, + errorInfo: '' + }; + }, + + methods: { + onInput(key) { + this.value = (this.value + key).slice(0, 6); + if (this.value.length === 6) { + this.errorInfo = 'Password Mistake'; + } else { + this.errorInfo = ''; + } + }, + onDelete() { + this.value = this.value.slice(0, this.value.length - 1); + } + } +} +``` ## API ### Props diff --git a/src/password-input/README.zh-CN.md b/src/password-input/README.zh-CN.md index b2d815dff..bc721f8c5 100644 --- a/src/password-input/README.zh-CN.md +++ b/src/password-input/README.zh-CN.md @@ -78,6 +78,54 @@ export default { /> ``` +### 错误提示 + +通过`error-info`属性可以设置错误提示信息，例如当输入六位时提示密码错误 + +```html + + + + + +``` + +```javascript +export default { + data() { + return { + value: '123', + showKeyboard: true, + errorInfo: '' + }; + }, + + methods: { + onInput(key) { + this.value = (this.value + key).slice(0, 6); + if (this.value.length === 6) { + this.errorInfo = '密码错误'; + } else { + this.errorInfo = ''; + } + }, + onDelete() { + this.value = this.value.slice(0, this.value.length - 1); + } + } +} +``` + ## API ### Props diff --git a/src/password-input/demo/index.vue b/src/password-input/demo/index.vue index 41f3c25b2..488149015 100644 --- a/src/password-input/demo/index.vue +++ b/src/password-input/demo/index.vue @@ -34,6 +34,15 @@ @focus="keyboard = 'value3'" /> + + + + @@ -43,12 +52,16 @@ export default { 'zh-CN': { info: '密码为 6 位数字', customLength: '自定义长度', - removeMask: '明文展示' + removeMask: '明文展示', + hintError: '错误提示', + errorInfo: '密码错误' }, 'en-US': { info: 'Some tips', customLength: 'Custom Length', - removeMask: 'Remove Mask' + removeMask: 'Remove Mask', + hintError: 'Hint Error', + errorInfo: 'Password Mistake' } }, @@ -57,7 +70,9 @@ export default { value1: '123', value2: '123', value3: '123', - keyboard: 'value1' + value4: '123', + keyboard: 'value1', + errorInfo: '' }; }, @@ -65,6 +80,11 @@ export default { onInput(key) { const { keyboard } = this; this[keyboard] = (this[keyboard] + key).slice(0, 6); + if (this[keyboard].length === 6) { + this.errorInfo = this.$t('errorInfo'); + } else { + this.errorInfo = ''; + } }, onDelete() { diff --git a/src/password-input/test/__snapshots__/demo.spec.js.snap b/src/password-input/test/__snapshots__/demo.spec.js.snap index 46cc5c6da..ce7e83eda 100644 --- a/src/password-input/test/__snapshots__/demo.spec.js.snap +++ b/src/password-input/test/__snapshots__/demo.spec.js.snap @@ -42,5 +42,17 @@ exports[`renders demo correctly 1`] = ` +
+
+
    +
    • +
    • +
    • +
    • +
    • +
    • +
+
+
`; From 25574aab723ffc694aa6f142512d19ac7ca4cfa4 Mon Sep 17 00:00:00 2001 From: neverland Date: Tue, 14 Jan 2020 10:43:27 +0800 Subject: [PATCH 13/15] chore(AddressEdit): update confirm delete message (#5568) --- src/locale/lang/zh-CN.ts | 2 +- src/locale/lang/zh-HK.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/locale/lang/zh-CN.ts b/src/locale/lang/zh-CN.ts index 4fdfa3c24..2dc75aa53 100644 --- a/src/locale/lang/zh-CN.ts +++ b/src/locale/lang/zh-CN.ts @@ -10,7 +10,7 @@ export default { telEmpty: '请填写电话', nameEmpty: '请填写姓名', nameInvalid: '请输入正确的姓名', - confirmDelete: '确定要删除么', + confirmDelete: '确定要删除吗', telInvalid: '请输入正确的手机号', vanCalendar: { end: '结束', diff --git a/src/locale/lang/zh-HK.ts b/src/locale/lang/zh-HK.ts index 8f3bd734d..bbcbec391 100644 --- a/src/locale/lang/zh-HK.ts +++ b/src/locale/lang/zh-HK.ts @@ -10,7 +10,7 @@ export default { telEmpty: '請填寫電話', nameEmpty: '請填寫姓名', nameInvalid: '請輸入正確的姓名', - confirmDelete: '確定要刪除麽', + confirmDelete: '確定要刪除嗎', telInvalid: '請填寫正確的電話', vanCalendar: { end: '結束', From 2047db68d95f3a4ac3d6aed76a79aeff55d1cd32 Mon Sep 17 00:00:00 2001 From: neverland Date: Tue, 14 Jan 2020 10:52:39 +0800 Subject: [PATCH 14/15] fix(Calendar): incorrect month title after auto scroll (#5569) --- src/calendar/components/Month.js | 8 +++++++- src/calendar/index.js | 2 +- src/calendar/test/index.spec.js | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/calendar/components/Month.js b/src/calendar/components/Month.js index 422e93af9..26d25c498 100644 --- a/src/calendar/components/Month.js +++ b/src/calendar/components/Month.js @@ -80,6 +80,10 @@ export default createComponent({ }, methods: { + scrollIntoView() { + this.$refs.days.scrollIntoView(); + }, + getDayType(day) { const { type, minDate, maxDate, currentDate } = this; @@ -166,12 +170,14 @@ export default createComponent({ genDays() { if (this.visible) { return ( -
+
{this.genMark()} {this.days.map(this.genDay)}
); } + + return
; }, genDay(item, index) { diff --git a/src/calendar/index.js b/src/calendar/index.js index 501ec8954..efb294581 100644 --- a/src/calendar/index.js +++ b/src/calendar/index.js @@ -158,7 +158,7 @@ export default createComponent({ this.months.some((month, index) => { if (compareMonth(month, targetDate) === 0) { - this.$refs.months[index].$el.scrollIntoView(); + this.$refs.months[index].scrollIntoView(); return true; } diff --git a/src/calendar/test/index.spec.js b/src/calendar/test/index.spec.js index 62fbfde2c..b95ad7398 100644 --- a/src/calendar/test/index.spec.js +++ b/src/calendar/test/index.spec.js @@ -419,7 +419,7 @@ test('should scroll to current month when show', async done => { }); Element.prototype.scrollIntoView = function() { - expect(this).toEqual(wrapper.findAll('.van-calendar__month').at(3).element); + expect(this.parentNode).toEqual(wrapper.findAll('.van-calendar__month').at(3).element); done(); }; From 17d46a71ca55cc1b59ceafed5c454b7f3cf3cf86 Mon Sep 17 00:00:00 2001 From: neverland Date: Tue, 14 Jan 2020 11:11:09 +0800 Subject: [PATCH 15/15] feat(ImagePreview): improve error image style (#5570) --- src/image-preview/index.less | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/image-preview/index.less b/src/image-preview/index.less index 285fd6b5a..0cf424b5f 100644 --- a/src/image-preview/index.less +++ b/src/image-preview/index.less @@ -30,8 +30,19 @@ -webkit-user-drag: none; } - .van-image__loading { - background-color: transparent; + .van-image { + &__error { + top: 30%; + height: 40%; + } + + &__error-icon { + font-size: 36px; + } + + &__loading { + background-color: transparent; + } } }