@mpxjs/core 2.10.18-beta.4 → 2.10.19-beta.1

package/@types/index.d.ts

@@ -387,7 +387,37 @@ export interface RnConfig {
    * @platform android
    * @default true
    */
-  enableNativeKeyboardAvoiding?: boolean
+  enableNativeKeyboardAvoiding?: boolean,
+
+  /**
+   * 自定义蓝牙权限检查函数，用于在调用 openBluetoothAdapter 时替代默认的权限检查逻辑。
+   *
+   * Mpx 在 iOS 上默认返回 true（假定权限由系统弹窗处理），在 Android 上会请求 ACCESS_FINE_LOCATION 或 BLUETOOTH_SCAN/CONNECT 权限。
+   * 如果需要自定义权限申请逻辑（例如在某些定制 Android 设备上），可配置此函数。
+   *
+   * @returns Promise<boolean> Resolves 为 true 表示权限获取成功，false 表示失败。
+   */
+  bluetoothPermission?: () => Promise<boolean>
+
+  /**
+   * 自定义 Wi-Fi 权限检查函数，用于在调用 startWifi 时替代默认的权限检查逻辑。
+   *
+   * Mpx 在 Android 上默认会请求 ACCESS_FINE_LOCATION 权限。
+   * 如果需要自定义权限申请逻辑，可配置此函数。
+   *
+   * @returns Promise<boolean> Resolves 为 true 表示权限获取成功，false 表示失败。
+   */
+  wifiPermission?: () => Promise<boolean>
+
+  /**
+   * 自定义相机权限检查函数，用于在渲染 Camera 组件前进行权限检查。
+   *
+   * 默认情况下，Mpx 会直接渲染 Camera 组件。
+   * 如果配置了此函数，Camera 组件会等待该函数返回 true 后再进行渲染。
+   *
+   * @returns Promise<boolean> Resolves 为 true 表示权限获取成功，false 表示失败。
+   */
+  cameraPermission?: () => Promise<boolean>
 }
 
 interface MpxConfig {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/core",
-  "version": "2.10.18-beta.4",
+  "version": "2.10.19-beta.1",
   "description": "mpx runtime core",
   "keywords": [
     "miniprogram",
@@ -24,9 +24,8 @@
     "miniprogram-api-typings": "^3.10.0"
   },
   "peerDependencies": {
-    "@d11/react-native-fast-image": "*",
     "@mpxjs/api-proxy": "^2.9.0",
-    "@mpxjs/store": "^2.9.0",
+    "@d11/react-native-fast-image": "*",
     "@react-navigation/native": "*",
     "@react-navigation/native-stack": "*",
     "react": "*",
@@ -38,22 +37,23 @@
     "react-native-screens": "*",
     "react-native-video": "*",
     "react-native-webview": "*",
+    "react-native-vision-camera": "*",
     "vue": "^2.7.10",
     "vue-demi": "^0.14.6",
     "vue-i18n": "^8.27.2",
     "vue-i18n-bridge": "^9.2.2"
   },
   "peerDependenciesMeta": {
-    "vue": {
+    "@mpxjs/api-proxy": {
       "optional": true
     },
-    "vue-demi": {
+    "@d11/react-native-fast-image": {
       "optional": true
     },
-    "vue-i18n": {
+    "@react-navigation/native": {
       "optional": true
     },
-    "vue-i18n-bridge": {
+    "@react-navigation/native-stack": {
       "optional": true
     },
     "react": {
@@ -62,13 +62,13 @@
     "react-native": {
       "optional": true
     },
-    "react-native-reanimated": {
+    "react-native-gesture-handler": {
       "optional": true
     },
-    "@react-navigation/native": {
+    "react-native-linear-gradient": {
       "optional": true
     },
-    "@react-navigation/native-stack": {
+    "react-native-reanimated": {
       "optional": true
     },
     "react-native-safe-area-context": {
@@ -77,19 +77,25 @@
     "react-native-screens": {
       "optional": true
     },
+    "react-native-video": {
+      "optional": true
+    },
     "react-native-webview": {
       "optional": true
     },
-    "react-native-gesture-handler": {
+    "react-native-vision-camera": {
       "optional": true
     },
-    "react-native-linear-gradient": {
+    "vue": {
       "optional": true
     },
-    "@d11/react-native-fast-image": {
+    "vue-demi": {
       "optional": true
     },
-    "react-native-video": {
+    "vue-i18n": {
+      "optional": true
+    },
+    "vue-i18n-bridge": {
       "optional": true
     }
   },

package/src/index.js

@@ -110,7 +110,6 @@ function use (plugin, options = {}) {
   extendProps(Mpx, proxyMpx, rawProps, options)
   extendProps(Mpx.prototype, proxyMpx.prototype, rawPrototypeProps, options)
   installedPlugins.push(plugin)
-  plugin.__installed = true
   return this
 }
 

package/src/platform/builtInMixins/index.js

@@ -26,7 +26,8 @@ export default function getBuiltInMixins ({ type, rawOptions = {} }) {
       refsMixin(),
       i18nMixin(),
       relationsMixin(type),
-      pageRouteMixin(type)
+      pageRouteMixin(type),
+      pageScrollMixin(type)
     ]
   } else if (isWeb) {
     bulitInMixins = [

package/src/platform/builtInMixins/pageScrollMixin.ios.js

@@ -0,0 +1,142 @@
+import { warn } from '@mpxjs/utils'
+import { CREATED } from '../../core/innerLifecycle'
+
+/**
+ * React Native 页面滚动 Mixin
+ * 提供页面级别的 pageScrollTo 方法
+ * 使用该功能需在页面的 scroll-view 组件上声明 wx:ref="pageScrollView"
+ */
+export default function pageScrollMixin (mixinType) {
+  if (mixinType !== 'page') {
+    return
+  }
+
+  return {
+    [CREATED] () {
+      this.__registerPageScrollTo()
+    },
+    beforeUnmount () {
+      const navigation = this.__props?.navigation
+      if (navigation && navigation.pageScrollTo) {
+        delete navigation.pageScrollTo
+      }
+    },
+    methods: {
+      /**
+       * 注册 pageScrollTo 方法到 navigation 对象
+       */
+      __registerPageScrollTo () {
+        const navigation = this.__props?.navigation
+
+        // navigation.pageScrollTo 不存在时才注册，避免重复
+        if (navigation && !navigation.pageScrollTo) {
+          navigation.pageScrollTo = (options) => {
+            this.__pageScrollTo(options)
+          }
+        }
+      },
+
+      /**
+       * 获取页面滚动视图节点（通过固定 ref 名称 pageScrollView）
+       * @returns {Object|null} 滚动视图的节点实例
+       */
+      __findScrollableNode () {
+        const ref = this.__refs?.pageScrollView?.[0]
+        if (!ref || ref.type !== 'node' || !ref.instance?.getNodeInstance) return null
+        return ref.instance.getNodeInstance()
+      },
+
+      /**
+       * 页面滚动到指定位置
+       * @param {Object} options - 配置选项
+       * @param {number} options.scrollTop - 滚动到页面的目标位置（单位 px）
+       * @param {number} options.duration - 滚动动画的时长（单位 ms）
+       * @param {string} options.selector - 选择器
+       * @param {number} options.offsetTop - 偏移距离
+       * @param {Function} options.onSuccess - 成功回调
+       * @param {Function} options.onFail - 失败回调
+       */
+      __pageScrollTo (options = {}) {
+        const {
+          scrollTop,
+          duration = 300,
+          selector,
+          offsetTop = 0,
+          onSuccess,
+          onFail
+        } = options
+
+        try {
+          const nodeInstance = this.__findScrollableNode()
+
+          if (nodeInstance) {
+            this.__executeScroll(nodeInstance, scrollTop, duration, selector, offsetTop, onSuccess, onFail)
+            return
+          }
+
+          // 没找到可滚动视图
+          const errMsg = 'pageScrollTo:fail scrollable view not found. Please add wx:ref="pageScrollView" to the scroll-view component in your page'
+          warn(errMsg)
+          onFail && onFail(errMsg)
+        } catch (e) {
+          const errMsg = `pageScrollTo:fail ${e.message}`
+          warn(errMsg)
+          onFail && onFail(errMsg)
+        }
+      },
+
+      /**
+       * 执行滚动操作
+       */
+      __executeScroll (scrollViewNodeInstance, scrollTop, duration, selector, offsetTop, onSuccess, onFail) {
+        try {
+          const scrollViewNode = scrollViewNodeInstance.instance.node
+
+          // 如果提供了 selector，使用 scrollIntoView
+          if (selector) {
+            if (scrollViewNode.scrollIntoView) {
+              scrollViewNode.scrollIntoView(selector, {
+                offset: offsetTop,
+                animated: duration > 0,
+                duration
+              })
+              onSuccess && onSuccess()
+            } else {
+              const errMsg = 'pageScrollTo:fail scrollIntoView method not available'
+              warn(errMsg)
+              onFail && onFail(errMsg)
+            }
+            return
+          }
+
+          // 使用 scrollTop 进行滚动
+          if (scrollTop !== undefined) {
+            if (scrollViewNode.scrollTo) {
+              scrollViewNode.scrollTo({
+                top: scrollTop,
+                left: 0,
+                animated: duration > 0,
+                duration
+              })
+              onSuccess && onSuccess()
+            } else {
+              const errMsg = 'pageScrollTo:fail scrollTo method not available'
+              warn(errMsg)
+              onFail && onFail(errMsg)
+            }
+            return
+          }
+
+          // 既没有 scrollTop 也没有 selector
+          const errMsg = 'pageScrollTo:fail scrollTop or selector is required'
+          warn(errMsg)
+          onFail && onFail(errMsg)
+        } catch (e) {
+          const errMsg = `pageScrollTo:fail ${e.message}`
+          warn(errMsg)
+          onFail && onFail(errMsg)
+        }
+      }
+    }
+  }
+}

package/src/platform/builtInMixins/proxyEventMixin.web.js

@@ -27,8 +27,9 @@ export default function proxyEventMixin () {
           } catch (e) {}
         }
         const location = this.__mpxProxy.options.mpxFileResource
+        const isObjectEvent = rawEvent && typeof rawEvent === 'object'
 
-        if (rawEvent.target && !rawEvent.target._datasetProcessed) {
+        if (isObjectEvent && rawEvent.target && !rawEvent.target._datasetProcessed) {
           const originalDataset = rawEvent.target.dataset
           Object.defineProperty(rawEvent.target, 'dataset', {
             get: () => parseDataset(originalDataset),
@@ -37,7 +38,7 @@ export default function proxyEventMixin () {
           })
           rawEvent.target._datasetProcessed = true
         }
-        if (rawEvent.currentTarget && !rawEvent.currentTarget._datasetProcessed) {
+        if (isObjectEvent && rawEvent.currentTarget && !rawEvent.currentTarget._datasetProcessed) {
           const originalDataset = rawEvent.currentTarget.dataset
           Object.defineProperty(rawEvent.currentTarget, 'dataset', {
             get: () => parseDataset(originalDataset),

package/src/platform/builtInMixins/styleHelperMixin.ios.js

@@ -257,7 +257,7 @@ export default function styleHelperMixin () {
         const isNativeStaticStyle = staticStyle && isNativeStyle(staticStyle)
         let result = isNativeStaticStyle ? [] : {}
         const mergeResult = isNativeStaticStyle ? (...args) => result.push(...args) : (...args) => Object.assign(result, ...args)
-
+        // 使用一下 __getSizeCount 触发其 get
         this.__getSizeCount()
 
         if (staticClass || dynamicClass) {
@@ -268,13 +268,13 @@ export default function styleHelperMixin () {
             let localStyle, appStyle
             if (localStyle = this.__getClassStyle?.(className)) {
               if (localStyle._media?.length) {
-                mergeResult(localStyle._default, getMediaStyle(localStyle._media))
+                mergeResult(localStyle, getMediaStyle(localStyle._media))
               } else {
                 mergeResult(localStyle)
               }
             } else if (appStyle = global.__getAppClassStyle?.(className)) {
               if (appStyle._media?.length) {
-                mergeResult(appStyle._default, getMediaStyle(appStyle._media))
+                mergeResult(appStyle, getMediaStyle(appStyle._media))
               } else {
                 mergeResult(appStyle)
               }

package/src/platform/createApp.ios.js

@@ -76,6 +76,7 @@ export default function createApp (options) {
         return createElement(Stack.Screen, {
           name: key,
           getComponent,
+          initialParams,
           layout: headerLayout
         })
       }
@@ -119,7 +120,7 @@ export default function createApp (options) {
           const current = state.routes[state.index]
           options = {
             path: current.name,
-            query: current.name === global.__mpxInitialRouteName ? global.__mpxInitialRunParams : current.params,
+            query: current.params,
             scene: 0,
             shareTicket: '',
             referrerInfo: {}
@@ -179,7 +180,7 @@ export default function createApp (options) {
         const current = state.routes[state.index]
         const options = {
           path: current.name,
-          query: current.name === global.__mpxInitialRouteName ? global.__mpxInitialRunParams : current.params,
+          query: current.params,
           scene: 0,
           shareTicket: '',
           referrerInfo: {},
@@ -210,10 +211,6 @@ export default function createApp (options) {
     }, [])
 
     const { initialRouteName, initialParams } = initialRouteRef.current
-    if (!global.__mpxAppHotLaunched) {
-      global.__mpxInitialRouteName = initialRouteName
-      global.__mpxInitialRunParams = initialParams
-    }
     const navScreenOpts = {
       headerShown: false,
       statusBarTranslucent: Mpx.config.rnConfig.statusBarTranslucent ?? true,

package/src/platform/env/vuePlugin.js

@@ -1,4 +1,4 @@
-import { walkChildren, parseSelector, error, hasOwn, collectDataset } from '@mpxjs/utils'
+import { walkChildren, parseSelector, error, hasOwn, collectDataset, getByPath } from '@mpxjs/utils'
 import { createSelectorQuery, createIntersectionObserver } from '@mpxjs/api-proxy'
 import { EffectScope } from 'vue'
 import { PausedState } from '../../helper/const'
@@ -56,6 +56,17 @@ const hackEffectScope = () => {
 }
 
 export default function install (Vue) {
+  const originalWatch = Vue.prototype.$watch
+  Vue.prototype.$watch = function (expOrFn, cb, options) {
+    if (typeof expOrFn === 'string' && expOrFn.indexOf(',') > -1) {
+      const keys = expOrFn.split(',').map(key => key.trim())
+      expOrFn = function () {
+        return keys.map(key => getByPath(this, key))
+      }
+    }
+    return originalWatch.call(this, expOrFn, cb, options)
+  }
+
   Object.defineProperties(Vue.prototype, {
     data: {
       get () {

package/src/platform/patch/getDefaultOptions.ios.js

@@ -295,17 +295,13 @@ function createInstance ({ propsRef, type, rawOptions, currentInject, validProps
       instance[key] = method.bind(instance)
     })
   }
-  const loadParams = {}
+
   if (type === 'page') {
     const props = propsRef.current
     instance.route = props.route.name
     global.__mpxPagesMap = global.__mpxPagesMap || {}
     global.__mpxPagesMap[props.route.key] = [instance, props.navigation]
     setFocusedNavigation(props.navigation)
-
-    if (!global.__mpxAppHotLaunched && global.__mpxInitialRunParams) {
-      Object.assign(loadParams, global.__mpxInitialRunParams)
-    }
     set(global.__mpxPageSizeCountMap, pageId, global.__mpxSizeCount)
     // App onLaunch 在 Page created 之前执行
     if (!global.__mpxAppHotLaunched && global.__mpxAppOnLaunch) {
@@ -315,10 +311,11 @@ function createInstance ({ propsRef, type, rawOptions, currentInject, validProps
 
   const proxy = instance.__mpxProxy = new MpxProxy(rawOptions, instance)
   proxy.created()
+
   if (type === 'page') {
     const props = propsRef.current
     const decodedQuery = {}
-    const rawQuery = Object.assign({}, loadParams, props.route.params || {})
+    const rawQuery = props.route.params || {}
     if (isObject(rawQuery)) {
       for (const key in rawQuery) {
         decodedQuery[key] = decodeURIComponent(rawQuery[key])