fix: processShowStyle 添加是否为 virtualHost 的判断

didi · Dec 23, 2024 · b058934 · b058934
1 parent f9a64b4
commit b058934
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/packages/webpack-plugin/lib/template-compiler/compiler.js b/packages/webpack-plugin/lib/template-compiler/compiler.js
@@ -2189,6 +2189,10 @@ function isComponentNode (el, options) {
   return usingComponents.indexOf(el.tag) !== -1 || el.tag === 'component'
 }
 
+function isVirtualHostNode (el, options) {
+  return options.usingComponentsInfo[el.tag]?.hvh
+}
+
 function isReactComponent (el, options) {
   return !isComponentNode(el, options) && isRealNode(el) && !el.isBuiltIn
 }
@@ -2416,7 +2420,7 @@ function processShow (el, options, root) {
     show = has ? `{{${parseMustacheWithContext(show).result}&&mpxShow}}` : '{{mpxShow}}'
   }
   if (show === undefined) return
-  if (isComponentNode(el, options)) {
+  if (isComponentNode(el, options) && isVirtualHostNode(el, options)) {
     if (show === '') {
       show = '{{false}}'
     }

diff --git a/packages/webpack-plugin/lib/utils/pre-process-json.js b/packages/webpack-plugin/lib/utils/pre-process-json.js
@@ -6,6 +6,7 @@ const addQuery = require('./add-query')
 const resolve = require('./resolve')
 const getJSONContent = require('./get-json-content')
 const getRulesRunner = require('../platform')
+const { matchCondition } = require('./match-condition')
 const async = require('async')
 
 module.exports = function ({
@@ -19,8 +20,7 @@ module.exports = function ({
 }, callback) {
   const mpx = loaderContext.getMpx()
   const context = loaderContext.context
-  const mode = mpx.mode
-  const pagesMap = mpx.pagesMap
+  const { mode, pagesMap, autoVirtualHostRules } = mpx
   async.waterfall([
     (callback) => {
       getJSONContent(json, null, loaderContext, callback)
@@ -78,8 +78,11 @@ module.exports = function ({
           componentGenerics = Object.assign({}, ret.componentGenerics)
         }
         if (usingComponents) {
-          const setUsingComponentInfo = (name, moduleId) => {
-            usingComponentsInfo[name] = { mid: moduleId }
+          const setUsingComponentInfo = (name, moduleId, hasVirtualHost) => {
+            usingComponentsInfo[name] = {
+              mid: moduleId,
+              hvh: hasVirtualHost
+            }
           }
           async.eachOf(usingComponents, (component, name, callback) => {
             if (ctorType === 'app') {
@@ -96,7 +99,8 @@ module.exports = function ({
               if (err) return callback(err)
               const { rawResourcePath } = parseRequest(resource)
               const moduleId = mpx.getModuleId(rawResourcePath, ctorType === 'app')
-              setUsingComponentInfo(name, moduleId)
+              const hasVirtualHost = matchCondition(rawResourcePath, autoVirtualHostRules)
+              setUsingComponentInfo(name, moduleId, hasVirtualHost)
               callback()
             })
           }, (err) => {