@mpxjs/core 2.10.18-beta.1 → 2.10.19

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/LICENSE

@@ -0,0 +1,433 @@
+                              Apache License
+
+                        Version 2.0, January 2004
+
+                     http://www.apache.org/licenses/
+
+
+
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+
+
+
+1. Definitions.
+
+
+
+
+   "License" shall mean the terms and conditions for use, reproduction,
+
+   and distribution as defined by Sections 1 through 9 of this document.
+
+
+
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+
+   the copyright owner that is granting the License.
+
+
+
+
+   "Legal Entity" shall mean the union of the acting entity and all
+
+   other entities that control, are controlled by, or are under common
+
+   control with that entity. For the purposes of this definition,
+
+   "control" means (i) the power, direct or indirect, to cause the
+
+   direction or management of such entity, whether by contract or
+
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+
+
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+
+   exercising permissions granted by this License.
+
+
+
+
+   "Source" form shall mean the preferred form for making modifications,
+
+   including but not limited to software source code, documentation
+
+   source, and configuration files.
+
+
+
+
+   "Object" form shall mean any form resulting from mechanical
+
+   transformation or translation of a Source form, including but
+
+   not limited to compiled object code, generated documentation,
+
+   and conversions to other media types.
+
+
+
+
+   "Work" shall mean the work of authorship, whether in Source or
+
+   Object form, made available under the License, as indicated by a
+
+   copyright notice that is included in or attached to the work
+
+   (an example is provided in the Appendix below).
+
+
+
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+
+   form, that is based on (or derived from) the Work and for which the
+
+   editorial revisions, annotations, elaborations, or other modifications
+
+   represent, as a whole, an original work of authorship. For the purposes
+
+   of this License, Derivative Works shall not include works that remain
+
+   separable from, or merely link (or bind by name) to the interfaces of,
+
+   the Work and Derivative Works thereof.
+
+
+
+
+   "Contribution" shall mean any work of authorship, including
+
+   the original version of the Work and any modifications or additions
+
+   to that Work or Derivative Works thereof, that is intentionally
+
+   submitted to Licensor for inclusion in the Work by the copyright owner
+
+   or by an individual or Legal Entity authorized to submit on behalf of
+
+   the copyright owner. For the purposes of this definition, "submitted"
+
+   means any form of electronic, verbal, or written communication sent
+
+   to the Licensor or its representatives, including but not limited to
+
+   communication on electronic mailing lists, source code control systems,
+
+   and issue tracking systems that are managed by, or on behalf of, the
+
+   Licensor for the purpose of discussing and improving the Work, but
+
+   excluding communication that is conspicuously marked or otherwise
+
+   designated in writing by the copyright owner as "Not a Contribution."
+
+
+
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+
+   on behalf of whom a Contribution has been received by Licensor and
+
+   subsequently incorporated within the Work.
+
+
+
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+
+   this License, each Contributor hereby grants to You a perpetual,
+
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+
+   copyright license to reproduce, prepare Derivative Works of,
+
+   publicly display, publicly perform, sublicense, and distribute the
+
+   Work and such Derivative Works in Source or Object form.
+
+
+
+
+3. Grant of Patent License. Subject to the terms and conditions of
+
+   this License, each Contributor hereby grants to You a perpetual,
+
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+
+   (except as stated in this section) patent license to make, have made,
+
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+
+   where such license applies only to those patent claims licensable
+
+   by such Contributor that are necessarily infringed by their
+
+   Contribution(s) alone or by combination of their Contribution(s)
+
+   with the Work to which such Contribution(s) was submitted. If You
+
+   institute patent litigation against any entity (including a
+
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+
+   or a Contribution incorporated within the Work constitutes direct
+
+   or contributory patent infringement, then any patent licenses
+
+   granted to You under this License for that Work shall terminate
+
+   as of the date such litigation is filed.
+
+
+
+
+4. Redistribution. You may reproduce and distribute copies of the
+
+   Work or Derivative Works thereof in any medium, with or without
+
+   modifications, and in Source or Object form, provided that You
+
+   meet the following conditions:
+
+
+
+
+   (a) You must give any other recipients of the Work or
+
+       Derivative Works a copy of this License; and
+
+
+
+
+   (b) You must cause any modified files to carry prominent notices
+
+       stating that You changed the files; and
+
+
+
+
+   (c) You must retain, in the Source form of any Derivative Works
+
+       that You distribute, all copyright, patent, trademark, and
+
+       attribution notices from the Source form of the Work,
+
+       excluding those notices that do not pertain to any part of
+
+       the Derivative Works; and
+
+
+
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+
+       distribution, then any Derivative Works that You distribute must
+
+       include a readable copy of the attribution notices contained
+
+       within such NOTICE file, excluding those notices that do not
+
+       pertain to any part of the Derivative Works, in at least one
+
+       of the following places: within a NOTICE text file distributed
+
+       as part of the Derivative Works; within the Source form or
+
+       documentation, if provided along with the Derivative Works; or,
+
+       within a display generated by the Derivative Works, if and
+
+       wherever such third-party notices normally appear. The contents
+
+       of the NOTICE file are for informational purposes only and
+
+       do not modify the License. You may add Your own attribution
+
+       notices within Derivative Works that You distribute, alongside
+
+       or as an addendum to the NOTICE text from the Work, provided
+
+       that such additional attribution notices cannot be construed
+
+       as modifying the License.
+
+
+
+
+   You may add Your own copyright statement to Your modifications and
+
+   may provide additional or different license terms and conditions
+
+   for use, reproduction, or distribution of Your modifications, or
+
+   for any such Derivative Works as a whole, provided Your use,
+
+   reproduction, and distribution of the Work otherwise complies with
+
+   the conditions stated in this License.
+
+
+
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+
+   any Contribution intentionally submitted for inclusion in the Work
+
+   by You to the Licensor shall be under the terms and conditions of
+
+   this License, without any additional terms or conditions.
+
+   Notwithstanding the above, nothing herein shall supersede or modify
+
+   the terms of any separate license agreement you may have executed
+
+   with Licensor regarding such Contributions.
+
+
+
+
+6. Trademarks. This License does not grant permission to use the trade
+
+   names, trademarks, service marks, or product names of the Licensor,
+
+   except as required for reasonable and customary use in describing the
+
+   origin of the Work and reproducing the content of the NOTICE file.
+
+
+
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+
+   agreed to in writing, Licensor provides the Work (and each
+
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+
+   implied, including, without limitation, any warranties or conditions
+
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+
+   appropriateness of using or redistributing the Work and assume any
+
+   risks associated with Your exercise of permissions under this License.
+
+
+
+
+8. Limitation of Liability. In no event and under no legal theory,
+
+   whether in tort (including negligence), contract, or otherwise,
+
+   unless required by applicable law (such as deliberate and grossly
+
+   negligent acts) or agreed to in writing, shall any Contributor be
+
+   liable to You for damages, including any direct, indirect, special,
+
+   incidental, or consequential damages of any character arising as a
+
+   result of this License or out of the use or inability to use the
+
+   Work (including but not limited to damages for loss of goodwill,
+
+   work stoppage, computer failure or malfunction, or any and all
+
+   other commercial damages or losses), even if such Contributor
+
+   has been advised of the possibility of such damages.
+
+
+
+
+9. Accepting Warranty or Additional Liability. While redistributing
+
+   the Work or Derivative Works thereof, You may choose to offer,
+
+   and charge a fee for, acceptance of support, warranty, indemnity,
+
+   or other liability obligations and/or rights consistent with this
+
+   License. However, in accepting such obligations, You may act only
+
+   on Your own behalf and on Your sole responsibility, not on behalf
+
+   of any other Contributor, and only if You agree to indemnify,
+
+   defend, and hold each Contributor harmless for any liability
+
+   incurred by, or claims asserted against, such Contributor by reason
+
+   of your accepting any such warranty or additional liability.
+
+
+
+
+END OF TERMS AND CONDITIONS
+
+
+
+
+APPENDIX: How to apply the Apache License to your work.
+
+
+
+
+   To apply the Apache License to your work, attach the following
+
+   boilerplate notice, with the fields enclosed by brackets "{}"
+
+   replaced with your own identifying information. (Don't include
+
+   the brackets!)  The text should be enclosed in the appropriate
+
+   comment syntax for the file format. We also recommend that a
+
+   file or class name and description of purpose be included on the
+
+   same "printed page" as the copyright notice for easier
+
+   identification within third-party archives.
+
+
+
+
+Copyright (C) 2017 Beijing Didi Infinity Technology and Development Co.,Ltd. All rights reserved.
+
+
+
+
+Licensed under the Apache License, Version 2.0 (the "License");
+
+you may not use this file except in compliance with the License.
+
+You may obtain a copy of the License at
+
+
+
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+
+
+
+Unless required by applicable law or agreed to in writing, software
+
+distributed under the License is distributed on an "AS IS" BASIS,
+
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+
+See the License for the specific language governing permissions and
+
+limitations under the License.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/core",
-  "version": "2.10.18-beta.1",
+  "version": "2.10.19",
   "description": "mpx runtime core",
   "keywords": [
     "miniprogram",
@@ -113,5 +113,5 @@
     "url": "https://github.com/didi/mpx/issues"
   },
   "sideEffects": false,
-  "gitHead": "2d37697869b9bdda3efab92dda8c910b68fd05c0"
+  "gitHead": "ca50ba6b1361f3c7790746476dd8b8e6be802ea3"
 }

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/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) {

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
         })
       }
@@ -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])
@@ -401,7 +398,7 @@ const triggerResizeEvent = (mpxProxy, sizeRef) => {
   }
 }
 
-function usePageEffect (mpxProxy, pageId, type) {
+function usePageEffect (mpxProxy, pageId) {
   const sizeRef = useRef(getSystemInfo())
 
   useEffect(() => {
@@ -418,7 +415,7 @@ function usePageEffect (mpxProxy, pageId, type) {
             triggerResizeEvent(mpxProxy, sizeRef)
 
             // 如果当前全局size与pagesize不一致，在show之后触发一次resize事件
-            if (type === 'page' && newVal === 'show' && global.__mpxPageSizeCountMap[pageId] !== global.__mpxSizeCount) {
+            if (newVal === 'show' && global.__mpxPageSizeCountMap[pageId] !== global.__mpxSizeCount) {
               // 刷新__mpxPageSizeCountMap, 每个页面仅会执行一次，直接驱动render刷新
               global.__mpxPageSizeCountMap[pageId] = global.__mpxSizeCount
             }
@@ -430,9 +427,7 @@ function usePageEffect (mpxProxy, pageId, type) {
     }
     return () => {
       unWatch && unWatch()
-      if (type === 'page') {
-        del(global.__mpxPageSizeCountMap, pageId)
-      }
+      del(global.__mpxPageSizeCountMap, pageId)
     }
   }, [])
 }
@@ -702,7 +697,7 @@ export function getDefaultOptions ({ type, rawOptions = {}, currentInject }) {
       }
     })
 
-    usePageEffect(proxy, pageId, type)
+    usePageEffect(proxy, pageId)
     useEffect(() => {
       proxy.mounted()
       return () => {