@mpxjs/webpack-plugin 2.9.15 → 2.9.16

package/lib/platform/template/wx/index.js

@@ -201,19 +201,30 @@ module.exports = function getSpec ({ warn, error }) {
       {
         // 样式类名绑定
         test: /^(class|wx:class)$/,
-        web ({ value }, { el }) {
-          if (el.isClassParsed) {
-            return false
-          }
+        web ({ name, value }, { el }) {
+          if (el.classMerged) return false
           const classBinding = []
-          el.isClassParsed = true
-          el.attrsList.filter(item => this.test.test(item.name)).forEach((item) => {
-            const parsed = parseMustacheWithContext(item.value)
-            classBinding.push(parsed.result)
+          el.attrsList.filter(item => this.test.test(item.name)).forEach(({ name, value }) => {
+            const parsed = parseMustacheWithContext(value)
+            if (name === 'wx:class') {
+              classBinding.push(parsed.result)
+            } else if (name === 'class' && parsed.hasBinding === true) {
+              el.classMerged = true
+              classBinding.push(parsed.result)
+            }
           })
-          return {
-            name: ':class',
-            value: `[${classBinding}]`
+
+          if (el.classMerged) {
+            return {
+              name: ':class',
+              value: `[${classBinding}]`
+            }
+          } else if (name === 'wx:class') {
+            // 对于纯静态class不做合并转换
+            return {
+              name: ':class',
+              value: classBinding[0]
+            }
           }
         }
       },

package/lib/runtime/components/web/mpx-navigator.vue

@@ -50,6 +50,11 @@
                 url: this.url
               })
               break
+            case 'switchTab':
+              mpx.switchTab && mpx.switchTab({
+                url: this.url
+              })
+              break
           }
         }
       })

package/lib/template-compiler/compiler.js

@@ -1715,7 +1715,7 @@ function processWebExternalClassesHack (el, options) {
 
       addAttrs(el, [{
         name: ':class',
-        value: `[${replacements.join(',')}]`
+        value: `[${replacements}]`
       }])
     }
   }
@@ -1742,7 +1742,7 @@ function processWebExternalClassesHack (el, options) {
 
         addAttrs(el, [{
           name: ':' + classLikeAttrName,
-          value: `[${replacements.join(',')}].join(' ')`
+          value: `[${replacements}].join(' ')`
         }])
       }
     })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/webpack-plugin",
-  "version": "2.9.15",
+  "version": "2.9.16",
   "description": "mpx compile core",
   "keywords": [
     "mpx"
@@ -83,5 +83,5 @@
   "engines": {
     "node": ">=14.14.0"
   },
-  "gitHead": "f3dcf3425dc3e0ad2378b2f35ca020aa9cdd1fb2"
+  "gitHead": "60cfd1708a61c925d5fc08cca0b31a06b2c4c160"
 }