fix(core): mixin 数组被转换成了对象 (eleme#117)

mor-docs · Oct 30, 2023 · c895e30 · c895e30
1 parent 0b63312
commit c895e30
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/packages/core/src/component.ts b/packages/core/src/component.ts
@@ -506,7 +506,10 @@ function processMixinsOrBehaviors<
         // 合并 数据
         // 如 props/properties/data/methods
         if (typeof current[name] === 'object') {
-          result[name] = { ...result[name], ...current[name] }
+          // 对象类型还可能包含数组，对数组做单独处理
+          if (Array.isArray(curr[name])) {
+            result[name] = [...(result[name] || []), ...curr[name]]
+          } else result[name] = { ...result[name], ...current[name] }
         }
         // 合并 方法
         else if (typeof current[name] === 'function') {

diff --git a/packages/core/src/page.ts b/packages/core/src/page.ts
@@ -345,7 +345,10 @@ function processMixins(
     Object.keys(curr).forEach((name) => {
       // 合并 数据
       if (typeof curr[name] === 'object') {
-        result[name] = { ...result[name], ...curr[name] }
+        // 对象类型还可能包含数组，对数组做单独处理
+        if (Array.isArray(curr[name])) {
+          result[name] = [...(result[name] || []), ...curr[name]]
+        } else result[name] = { ...result[name], ...curr[name] }
       }
       // 合并 方法
       else if (typeof curr[name] === 'function') {