From 6b46f26077d3efc2e38a79ab5f75416aa41dc8dc Mon Sep 17 00:00:00 2001 From: qiang Date: Thu, 21 May 2020 17:22:14 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=20addStylesClient=20=E5=8E=BB=E9=99=A4?= =?UTF-8?q?=20flags=20s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../packages/app-vue-style-loader/lib/addStylesClient.js | 2 +- .../packages/h5-vue-style-loader/lib/addStylesClient.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/vue-cli-plugin-uni/packages/app-vue-style-loader/lib/addStylesClient.js b/packages/vue-cli-plugin-uni/packages/app-vue-style-loader/lib/addStylesClient.js index c5cf094ba..3dd75df1e 100644 --- a/packages/vue-cli-plugin-uni/packages/app-vue-style-loader/lib/addStylesClient.js +++ b/packages/vue-cli-plugin-uni/packages/app-vue-style-loader/lib/addStylesClient.js @@ -242,7 +242,7 @@ function processCss(css) { .replace(VAR_WINDOW_TOP, offset.top + 'px') .replace(VAR_WINDOW_BOTTOM, offset.bottom + 'px') } - return css.replace(/\{.+?\}/gs, function (css) { + return css.replace(/\{[\s\S]+?\}/g, function (css) { return css.replace(UPX_RE, function (a, b) { return uni.upx2px(b) + 'px' }) diff --git a/packages/vue-cli-plugin-uni/packages/h5-vue-style-loader/lib/addStylesClient.js b/packages/vue-cli-plugin-uni/packages/h5-vue-style-loader/lib/addStylesClient.js index a427d6600..780837cd6 100644 --- a/packages/vue-cli-plugin-uni/packages/h5-vue-style-loader/lib/addStylesClient.js +++ b/packages/vue-cli-plugin-uni/packages/h5-vue-style-loader/lib/addStylesClient.js @@ -250,7 +250,7 @@ function processCss(css) { .replace(BODY_SCOPED_RE, page) .replace(BODY_RE, '') .replace(PAGE_SCOPED_RE, 'body.' + page + ' uni-page-body') - .replace(/\{.+?\}/gs, function (css) { + .replace(/\{[\s\S]+?\}/g, function (css) { return css.replace(UPX_RE, function (a, b) { return uni.upx2px(b) + 'px' }) -- GitLab