chore: merge

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

@@ -12357,6 +12357,24 @@
     }
     return rawName;
   }
+  var JSON_PROTOCOL_LEN = JSON_PROTOCOL.length;
+  function decodeAttr(el, value) {
+    if (!isString(value)) {
+      return value;
+    }
+    if (value.indexOf(JSON_PROTOCOL) === 0) {
+      value = JSON.parse(value.substr(JSON_PROTOCOL_LEN));
+    } else if (value.indexOf(WXS_PROTOCOL) === 0) {
+      value = invokeWxs(el, value);
+    }
+    return value;
+  }
+  function isCssVar(name) {
+    return name.indexOf("--") === 0;
+  }
+  function isUniComponent(el) {
+    return !!el.addWxsEvent;
+  }
   function removeEventListener(el, type) {
     var listener = el.__listeners[type];
     if (listener) {
@@ -12414,28 +12432,13 @@
   }
   function createWxsEventInvoker(el, wxsEvent, flag) {
     var invoker = (evt) => {
-      invokeWxsEvent(el, wxsEvent, $nne(evt)[0]);
+      invokeWxsEvent(isUniComponent(el) ? el.$ : el, wxsEvent, $nne(evt)[0]);
     };
     if (!flag) {
       return invoker;
     }
     return withModifiers(invoker, resolveModifier(flag));
   }
-  var JSON_PROTOCOL_LEN = JSON_PROTOCOL.length;
-  function decodeAttr(el, value) {
-    if (!isString(value)) {
-      return value;
-    }
-    if (value.indexOf(JSON_PROTOCOL) === 0) {
-      value = JSON.parse(value.substr(JSON_PROTOCOL_LEN));
-    } else if (value.indexOf(WXS_PROTOCOL) === 0) {
-      value = invokeWxs(el, value);
-    }
-    return value;
-  }
-  function isCssVar(name) {
-    return name.indexOf("--") === 0;
-  }
   function patchVShow(el, value) {
     el._vod = el.style.display === "none" ? "" : el.style.display;
     el.style.display = value ? el._vod : "none";
@@ -21076,7 +21079,7 @@
       (this.$holder || this.$).textContent = text2;
     }
     addWxsEvent(name, wxsEvent, flag) {
-      this.$props[name] = createWxsEventInvoker(this.$, wxsEvent, flag);
+      this.$props[name] = createWxsEventInvoker(this, wxsEvent, flag);
     }
     addEvent(name, value) {
       this.$props[name] = createInvoker(this.id, value, parseEventName(name)[1]);

packages/uni-app-plus/src/view/framework/dom/components/UniComponent.ts

@@ -96,7 +96,8 @@ export class UniComponent extends UniNode {
     ;(this.$holder || this.$).textContent = text
   }
   addWxsEvent(name: string, wxsEvent: string, flag: number) {
-    this.$props[name] = createWxsEventInvoker(this.$, wxsEvent, flag)
+    // 此时 $ 还不存在，故传入 this，等事件触发时，再获取 $
+    this.$props[name] = createWxsEventInvoker(this, wxsEvent, flag)
   }
   addEvent(name: string, value: number) {
     this.$props[name] = createInvoker(this.id, value, parseEventName(name)[1])

packages/uni-app-plus/src/view/framework/dom/modules/events.ts

@@ -10,6 +10,8 @@ import {
 import { VD_SYNC } from '../../../../constants'
 import { UniCustomElement } from '../components'
 import { invokeWxsEvent } from '../wxs'
+import type { UniComponent } from '../components/UniComponent'
+import { isUniComponent } from '../utils'
 
 function removeEventListener(el: UniCustomElement, type: string) {
   const listener = el.__listeners[type]
@@ -108,13 +110,13 @@ export function patchWxsEvent(
 }
 
 export function createWxsEventInvoker(
-  el: UniCustomElement,
+  el: UniCustomElement | UniComponent,
   wxsEvent: string,
   flag: number
 ) {
   const invoker = (evt: Event) => {
     invokeWxsEvent(
-      el,
+      isUniComponent(el) ? el.$ : el,
       wxsEvent,
       normalizeNativeEvent(evt)[0] as Record<string, any>
     )

packages/uni-app-plus/src/view/framework/dom/utils.ts

 import { JSON_PROTOCOL, WXS_PROTOCOL } from '@dcloudio/uni-shared'
 import { isString } from '@vue/shared'
-import { UniCustomElement } from './components'
+import type { UniCustomElement } from './components'
+import type { UniComponent } from './components/UniComponent'
 import { invokeWxs } from './wxs'
 
 const JSON_PROTOCOL_LEN = JSON_PROTOCOL.length
@@ -20,3 +21,10 @@ export function decodeAttr(el: UniCustomElement, value: unknown) {
 export function isCssVar(name: string) {
   return name.indexOf('--') === 0
 }
+
+export function isUniComponent(
+  el: UniCustomElement | UniComponent
+): el is UniComponent {
+  // 不使用 instanceof 判断，因为需要引入 UniComponent，两者循环依赖
+  return !!(el as UniComponent).addWxsEvent
+}