From a00f4292ceff523fb5c83477064ae983047288ba Mon Sep 17 00:00:00 2001
From: fxy060608 <fxy060608@gmail.com>
Date: Tue, 25 Jan 2022 16:47:35 +0800
Subject: [PATCH] wip(app): nvue styler

---
 packages/uni-app-vue/dist/nvue.runtime.esm.dev.js  | 8 +++++++-
 packages/uni-app-vue/dist/nvue.runtime.esm.prod.js | 8 +++++++-
 packages/uni-app-vue/lib/nvue.runtime.esm.js       | 9 ++++++++-
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/packages/uni-app-vue/dist/nvue.runtime.esm.dev.js b/packages/uni-app-vue/dist/nvue.runtime.esm.dev.js
index 071a9553b..5e515e9ce 100644
--- a/packages/uni-app-vue/dist/nvue.runtime.esm.dev.js
+++ b/packages/uni-app-vue/dist/nvue.runtime.esm.dev.js
@@ -10999,7 +10999,13 @@ export function nvueFactory(exports, document) {
 
       if (isArray(styles)) {
         styles.forEach(style => {
-          extend(normalizedStyles, style);
+          Object.keys(style).forEach(name => {
+            if (hasOwn(normalizedStyles, name)) {
+              extend(normalizedStyles[name], style[name]);
+            } else {
+              normalizedStyles[name] = style[name];
+            }
+          });
         });
       }
 
diff --git a/packages/uni-app-vue/dist/nvue.runtime.esm.prod.js b/packages/uni-app-vue/dist/nvue.runtime.esm.prod.js
index ce3e82d38..f535aef0c 100644
--- a/packages/uni-app-vue/dist/nvue.runtime.esm.prod.js
+++ b/packages/uni-app-vue/dist/nvue.runtime.esm.prod.js
@@ -9174,7 +9174,13 @@ export function nvueFactory(exports, document) {
 
       if (isArray(styles)) {
         styles.forEach(style => {
-          extend(normalizedStyles, style);
+          Object.keys(style).forEach(name => {
+            if (hasOwn(normalizedStyles, name)) {
+              extend(normalizedStyles[name], style[name]);
+            } else {
+              normalizedStyles[name] = style[name];
+            }
+          });
         });
       }
 
diff --git a/packages/uni-app-vue/lib/nvue.runtime.esm.js b/packages/uni-app-vue/lib/nvue.runtime.esm.js
index 4e5af36ab..01834880e 100644
--- a/packages/uni-app-vue/lib/nvue.runtime.esm.js
+++ b/packages/uni-app-vue/lib/nvue.runtime.esm.js
@@ -8884,7 +8884,14 @@ function parseStylesheet({ type }) {
         const normalizedStyles = {};
         if (isArray(styles)) {
             styles.forEach(style => {
-                extend(normalizedStyles, style);
+                Object.keys(style).forEach(name => {
+                    if (hasOwn(normalizedStyles, name)) {
+                        extend(normalizedStyles[name], style[name]);
+                    }
+                    else {
+                        normalizedStyles[name] = style[name];
+                    }
+                });
             });
         }
         type.__styles = normalizedStyles;
-- 
GitLab