diff --git a/packages/webpack-uni-pages-loader/lib/index-new.js b/packages/webpack-uni-pages-loader/lib/index-new.js index d59f81e040e83e24f8c02e7c74d7ba6b6372f051..752f4b20668b47cee8fc78c63383042caa9461d2 100644 --- a/packages/webpack-uni-pages-loader/lib/index-new.js +++ b/packages/webpack-uni-pages-loader/lib/index-new.js @@ -39,9 +39,11 @@ const { // 将开发者手动设置的 usingComponents 调整名称,方便与自动解析到的 usingComponents 做最后合并 function renameUsingComponents (jsonObj) { - if (jsonObj.usingComponents) { - jsonObj.customUsingComponents = jsonObj.usingComponents + if (jsonObj.usingComponents || jsonObj.usingSwanComponents) { + // 暂定 usingComponents 优先级高于 usingSwanComponents + jsonObj.customUsingComponents = Object.assign({}, jsonObj.usingSwanComponents, jsonObj.usingComponents) delete jsonObj.usingComponents + delete jsonObj.usingSwanComponents } return jsonObj } diff --git a/packages/webpack-uni-pages-loader/lib/platforms/mp.js b/packages/webpack-uni-pages-loader/lib/platforms/mp.js index 6a2250d11ef74b82ca759e086dc2c440f5302399..f948fe0176f3fe9d2c823abc110a69e3a605c0d1 100644 --- a/packages/webpack-uni-pages-loader/lib/platforms/mp.js +++ b/packages/webpack-uni-pages-loader/lib/platforms/mp.js @@ -49,9 +49,11 @@ function deepCopy (name, value, json) { const pagesJson2AppJson = { globalStyle: function (name, value, json) { json.window = parseStyle(value) - if (json.window.usingComponents) { - json.usingComponents = json.window.usingComponents + if (json.window.usingComponents || json.window.usingSwanComponents) { + // 暂定 usingComponents 优先级高于 usingSwanComponents + json.usingComponents = Object.assign({}, json.window.usingSwanComponents, json.window.usingComponents) delete json.window.usingComponents + delete json.window.usingSwanComponents } else { json.usingComponents = {} }