@mpxjs/webpack-plugin 2.9.35 → 2.9.36

package/lib/runtime/components/web/event.js

@@ -89,9 +89,17 @@ function MpxEvent (layer) {
     this.addListener()
 }
 
-if (isBrowser) {
-    document.addEventListener('DOMContentLoaded', function () {
-        // eslint-disable-next-line no-new
-        new MpxEvent(document.body)
-    }, false)
+export function createEvent () {
+    if (isBrowser && !global.__mpxCreatedEvent) {
+        global.__mpxCreatedEvent = true
+        if (document.readyState === 'complete' || document.readyState === 'interactive') {
+            // eslint-disable-next-line no-new
+            new MpxEvent(document.body)
+        } else {
+            document.addEventListener('DOMContentLoaded', function () {
+                // eslint-disable-next-line no-new
+                new MpxEvent(document.body)
+            }, false)
+        }
+    }
 }

package/lib/runtime/components/web/getInnerListeners.js

@@ -8,8 +8,8 @@ function processModel (listeners, context) {
   if (modelEvent) {
     // 对于modelEvent，内部获得时间后向外部转发，触发外部listener的同时转发为mpxModel事件
     listeners[modelEvent] = function (e) {
-      context.$emit(modelEvent, e)
       context.$emit('mpxModel', e)
+      context.$emit(modelEvent, e)
     }
     // 内部listener不需要mpxModel
     delete listeners.mpxModel

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

@@ -2,16 +2,31 @@
   import getInnerListeners from './getInnerListeners'
   import { processSize } from '../../utils'
 
-  let defaultColor = {
-    success: '#09BB07',
-    'success_no_circle': '#09BB07',
-    info: '#10AEFF',
-    warn: '#F76260',
-    waiting: '#10AEFF',
-    cancel: '#F43530',
-    download: '#09BB07',
-    search: '#B2B2B2',
-    clear: '#B2B2B2'
+  let defaultColor
+  if (global.__style === 'v2') {
+    defaultColor = {
+      success: '#07c160',
+      'success_no_circle': '#07c160',
+      info: '#10AEFF',
+      warn: '#F76260',
+      waiting: '#10AEFF',
+      cancel: '#F43530',
+      download: '#13bf69',
+      search: '#7d7979',
+      clear: '#B2B2B2'
+    }
+  } else {
+    defaultColor = {
+      success: '#09BB07',
+      'success_no_circle': '#09BB07',
+      info: '#10AEFF',
+      warn: '#F76260',
+      waiting: '#10AEFF',
+      cancel: '#F43530',
+      download: '#09BB07',
+      search: '#B2B2B2',
+      clear: '#B2B2B2'
+    }
   }
 
   export default {
@@ -52,17 +67,6 @@
               width: sizeStr,
               height: sizeStr
             }
-            defaultColor = {
-              success: '#07c160',
-              'success_no_circle': '#07c160',
-              info: '#10AEFF',
-              warn: '#F76260',
-              waiting: '#10AEFF',
-              cancel: '#F43530',
-              download: '#13bf69',
-              search: '#7d7979',
-              clear: '#B2B2B2'
-            }
         }
       }
       const data = {
@@ -118,11 +122,8 @@
     &.mpx-icon-waiting-v2,
     &.mpx-icon-search-v2,
     &.mpx-icon-clear-v2,
-    &.mpx-icon-success_no_circle-v2,
-    &.mpx-icon-download-v2
+    &.mpx-icon-success_no_circle-v2
       display: inline-block
-      width: 64px
-      height: 64px
       mask-position: 50% 50%
       -webkit-mask-position: 50% 50%
       -webkit-mask-repeat: no-repeat

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

@@ -33,7 +33,15 @@
           console.error('访问页面域名不符合domainWhiteLists白名单配置，请确认是否正确配置该域名白名单')
           return ''
         }
-        return this.src
+        let src
+        const srcQueryIndex = this.src.indexOf('?')
+        // webview与被打开页面通过_uid确定关联关系
+        if (srcQueryIndex > -1) {
+          src = `${this.src.substring(0, srcQueryIndex + 1)}mpx_webview_id=${this._uid}&${this.src.substring(srcQueryIndex + 1)}`
+        } else {
+          src = `${this.src}?mpx_webview_id=${this._uid}`
+        }
+        return src
       },
       loadData () {
         return {
@@ -95,6 +103,10 @@
       messageCallback (event) {
         const hostValidate = this.hostValidate(event.origin)
         const data = event.data
+        // 判断number类型，防止undefined导致触发return逻辑
+        if (data.clientUid !== undefined && +data.clientUid !== this._uid) {
+          return
+        }
         let value = data.payload
         if (!hostValidate) {
           return

package/lib/runtime/optionProcessor.js

@@ -2,6 +2,9 @@ import { hasOwn, isEmptyObject } from './utils'
 import { isBrowser } from './env'
 import transRpxStyle from './transRpxStyle'
 import animation from './animation'
+import { createEvent } from './components/web/event'
+
+createEvent()
 
 export function processComponentOption (
   {
@@ -138,7 +141,18 @@ function createApp ({ componentsMap, Vue, pagesMap, firstPage, VueRouter, App, t
       ...webRouteConfig,
       routes: routes
     })
-    global.__mpxRouter.stack = []
+    let mpxStackPath = []
+    if (isBrowser) {
+      // 解决webview被刷新导致路由栈丢失后产生错乱问题
+      const sessionStorage = window.sessionStorage
+      try {
+        if (sessionStorage) {
+          mpxStackPath = JSON.parse(sessionStorage.getItem('_mpx_stack_path_'))
+        }
+      } catch (e) {
+      }
+    }
+    global.__mpxRouter.stack = mpxStackPath
     global.__mpxRouter.lastStack = null
     global.__mpxRouter.needCache = null
     global.__mpxRouter.needRemove = []
@@ -252,6 +266,17 @@ function createApp ({ componentsMap, Vue, pagesMap, firstPage, VueRouter, App, t
             global.__mpxRouter.needCache = insertItem
           }
       }
+      if (isBrowser) {
+        const sessionStorage = window.sessionStorage
+        if (sessionStorage) {
+          const stackStorage = global.__mpxRouter.stack.slice(0, global.__mpxRouter.stack.length - 1).map((item) => {
+            return {
+              path: item.path
+            }
+          })
+          sessionStorage.setItem('_mpx_stack_path_', JSON.stringify(stackStorage))
+        }
+      }
       next()
     })
     // 处理visibilitychange时触发当前活跃页面组件的onshow/onhide

package/lib/web/processMainScript.js

@@ -2,7 +2,7 @@
 const addQuery = require('../utils/add-query')
 const normalize = require('../utils/normalize')
 const optionProcessorPath = normalize.lib('runtime/optionProcessor')
-const eventPath = normalize.lib('runtime/components/web/event')
+
 const {
   buildComponentsMap,
   buildPagesMap,
@@ -66,8 +66,6 @@ module.exports = function (script, {
     globalTabBar
   })
 
-  output += `\n  require(${stringifyRequest(loaderContext, eventPath)})\n`
-
   output += `\n  var App = require(${stringifyRequest(loaderContext, addQuery(resource, { isApp: true }))}).default\n`
 
   output += `

package/lib/web/processScript.js

@@ -18,7 +18,7 @@ module.exports = function (script, {
   wxsModuleMap,
   localComponentsMap
 }, callback) {
-  const { projectRoot, appInfo } = loaderContext.getMpx()
+  const { projectRoot, appInfo, webConfig } = loaderContext.getMpx()
 
   const stringifyRequest = r => loaderUtils.stringifyRequest(loaderContext, r)
 
@@ -73,7 +73,7 @@ module.exports = function (script, {
           })
       }
 
-      content += buildGlobalParams({ moduleId, scriptSrcMode, loaderContext, isProduction })
+      content += buildGlobalParams({ moduleId, scriptSrcMode, loaderContext, isProduction, webConfig, hasApp })
       content += getRequireScript({ ctorType, script, loaderContext })
       content += `
   export default processComponentOption({

package/lib/web/script-helper.js

@@ -144,7 +144,8 @@ function buildGlobalParams ({
   jsonConfig,
   webConfig,
   isMain,
-  globalTabBar
+  globalTabBar,
+  hasApp
 }) {
   let content = ''
   if (isMain) {
@@ -175,6 +176,11 @@ function buildGlobalParams ({
     if (globalTabBar) {
       content += globalTabBar
     }
+  } else if (!hasApp) {
+    content += `
+  global.__mpxGenericsMap = global.__mpxGenericsMap || {}
+  global.__mpxOptionsMap = global.__mpxOptionsMap || {}
+  global.__mpxTransRpxFn = ${webConfig.transRpxFn} \n`
   }
   content += `  global.currentModuleId = ${JSON.stringify(moduleId)}\n`
   content += `  global.currentSrcMode = ${JSON.stringify(scriptSrcMode)}\n`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/webpack-plugin",
-  "version": "2.9.35",
+  "version": "2.9.36",
   "description": "mpx compile core",
   "keywords": [
     "mpx"
@@ -82,5 +82,5 @@
   "engines": {
     "node": ">=14.14.0"
   },
-  "gitHead": "eb9647625e82c7dc7058fa35f5d1fe2233d40142"
+  "gitHead": "23c1e87cde0eafbb4a6526d83551eb5e12740ba8"
 }