wip(app): uni-app-plus

packages/uni-app-plus/dist/uni-app-view.umd.js

@@ -15494,7 +15494,12 @@
     return info;
   }
   function findElm(component, pageVm2) {
-    return component ? component.$el : pageVm2.$el;
+    if (!component) {
+      return pageVm2.$el;
+    }
+    {
+      return window.__$__(component).$;
+    }
   }
   function getNodesInfo(pageVm2, component, selector, single, fields) {
     const parentElement = findElm(component, pageVm2).parentElement;
@@ -15551,6 +15556,7 @@
   window.uni = uni$1;
   window.UniViewJSBridge = UniViewJSBridge$1;
   window.rpx2px = upx2px;
+  window.__$__ = $;
   function onWebviewReady() {
     initView();
     initSubscribeHandlers();

packages/uni-app-plus/src/service/api/index.ts

@@ -55,28 +55,27 @@ export * from './ad/interactiveAd'
 export * from './route/navigateTo'
 export * from './route/navigateBack'
 
-// TODO
-// export {
-//   upx2px,
-//   addInterceptor,
-//   removeInterceptor,
-//   promiseInterceptor,
-//   arrayBufferToBase64,
-//   base64ToArrayBuffer,
-//   createIntersectionObserver,
-//   createMediaQueryObserver,
-//   createSelectorQuery,
-//   createVideoContext,
-//   createMapContext,
-//   createAnimation,
-//   onTabBarMidButtonTap,
-//   createCanvasContext,
-//   canvasGetImageData,
-//   canvasPutImageData,
-//   canvasToTempFilePath,
-//   getSelectedTextRange,
-//   $on,
-//   $off,
-//   $once,
-//   $emit,
-// } from '@dcloudio/uni-api'
+export {
+  upx2px,
+  addInterceptor,
+  removeInterceptor,
+  promiseInterceptor,
+  arrayBufferToBase64,
+  base64ToArrayBuffer,
+  createIntersectionObserver,
+  createMediaQueryObserver,
+  createSelectorQuery,
+  createVideoContext,
+  createMapContext,
+  createAnimation,
+  onTabBarMidButtonTap,
+  createCanvasContext,
+  canvasGetImageData,
+  canvasPutImageData,
+  canvasToTempFilePath,
+  getSelectedTextRange,
+  $on,
+  $off,
+  $once,
+  $emit,
+} from '@dcloudio/uni-api'

packages/uni-app-plus/src/service/api/ui/requestComponentInfo.ts

@@ -9,7 +9,12 @@ export function requestComponentInfo(
   UniServiceJSBridge.invokeViewMethod(
     'requestComponentInfo',
     {
-      reqs,
+      reqs: reqs.map((req) => {
+        if (req.component) {
+          req.component = req.component.$el.nodeId
+        }
+        return req
+      }),
     },
     callback,
     page.$page.id

packages/uni-app-plus/src/service/framework/page/setup.ts

@@ -16,6 +16,7 @@ export function setupPage(component: VuePageComponent) {
     const instance = getCurrentInstance()!
     const pageVm = instance.proxy!
     pageVm.$page = __pageInstance as Page.PageInstance['$page']
+    pageVm.$vm = pageVm
     addCurrentPage(initScope(__pageId as number, pageVm))
     if (oldSetup) {
       return oldSetup(__pageQuery as any, ctx)

packages/uni-app-plus/src/view/index.ts

@@ -6,9 +6,11 @@ import { UniViewJSBridge } from './bridge'
 import * as uni from './api'
 import { preventDoubleTap } from './framework/gesture'
 import { initSubscribeHandlers } from './framework/subscriber'
+import { $ } from './framework/dom/page'
 ;(window as any).uni = uni
 ;(window as any).UniViewJSBridge = UniViewJSBridge
 ;(window as any).rpx2px = uni.upx2px
+;(window as any).__$__ = $
 
 function onWebviewReady() {
   initView()

packages/uni-h5/dist/uni-h5.es.js

@@ -2047,7 +2047,10 @@ function getNodeInfo(el, fields2) {
   return info;
 }
 function findElm(component, pageVm) {
-  return component ? component.$el : pageVm.$el;
+  if (!component) {
+    return pageVm.$el;
+  }
+  return component.$el;
 }
 function getNodesInfo(pageVm, component, selector, single, fields2) {
   const parentElement = findElm(component, pageVm).parentElement;

packages/uni-h5/src/service/api/ui/requestComponentInfo.ts

@@ -100,7 +100,14 @@ export function findElm(
   component: ComponentPublicInstance | undefined | null,
   pageVm: ComponentPublicInstance
 ): HTMLElement {
-  return component ? component.$el : pageVm.$el
+  if (!component) {
+    return pageVm.$el
+  }
+  if (__APP_VIEW__) {
+    // App 端，传入的是 nodeId
+    return (window as any).__$__(component).$
+  }
+  return component.$el
 }
 
 function getNodesInfo(