@cloudbase/framework-plugin-low-code 0.6.30 → 0.6.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/framework-plugin-low-code",
-  "version": "0.6.30",
+  "version": "0.6.31",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",

package/template/src/handlers/FieldMiddleware/renderer.jsx

@@ -63,7 +63,7 @@ export const CompRenderer = observer(function (props) {
 
   // 组件最终用于执行的事件函数
   const emit = useCallback(
-    (trigger, event, forItems, scopeContext) => {
+    (trigger, eventDetail, forItems, scopeContext) => {
       const listeners = listenerInstances || [];
 
       // 如果是数据容器，则将传过来的data，赋值给容器上下文context
@@ -83,7 +83,7 @@ export const CompRenderer = observer(function (props) {
         });
       }
 
-      event = { detail: event, name: trigger };
+      let event = { detail: eventDetail, name: trigger };
       forItems = {
         ...forItems,
         forIndexes: getForIndexes(forItems, widgetsData),
@@ -105,14 +105,14 @@ export const CompRenderer = observer(function (props) {
 
   // 选区最终用于执行的事件函数
   const emitSB = useCallback(
-    (trigger, event, forItems, scopeContext, fieldData) => {
+    (trigger, eventDetail, forItems, scopeContext, fieldData) => {
       const listeners =
         indexRef?.current !== undefined &&
         typeRef?.current &&
         fieldData?.[typeRef.current]?.[indexRef.current]?.selectableBlock?.[
           'x-props'
         ]?.listenerInstances;
-      event = { detail: event, name: trigger };
+      let event = { detail: eventDetail, name: trigger };
       forItems = {
         ...forItems,
         forIndexes: getForIndexes(forItems, widgetsData),
@@ -164,7 +164,9 @@ export const CompRenderer = observer(function (props) {
   try {
     // 绑定了 for 变量，但计算值错误时，应当空数组兜底
     forList =
-      dataBinds && dataBinds._waFor && (dataBinds._waFor(parentForItems, undefined, context) || []);
+      dataBinds &&
+      dataBinds._waFor &&
+      (dataBinds._waFor(parentForItems, undefined, context) || []);
   } catch (e) {
     // 计算值出错则使用空数组兜底
     forList = [];
@@ -305,7 +307,10 @@ export const CompRenderer = observer(function (props) {
 
   return (
     <Field
-      data={{ ...fieldData, _selectableBlockEvents: _selectableBlockEventsWithItem }}
+      data={{
+        ...fieldData,
+        _selectableBlockEvents: _selectableBlockEventsWithItem,
+      }}
       id={compId}
       {...componentProps}
       emit={emitWithForItems}

package/template/src/handlers/actionHandler/utils.js

@@ -11,31 +11,44 @@ export function getMetaInfoBySourceKey(sourceKey) {
   };
 }
 
-export function emitEvent(trigger, listeners = [], args, scopeContext = {}, context) {
+export function emitEvent(
+  trigger,
+  listeners = [],
+  args,
+  scopeContext = {},
+  context
+) {
   const targetListeners = listeners.filter((l) => l.trigger === trigger);
   targetListeners.forEach(async (listener) => {
     // 当前非捕获Event，再判断冒泡行为
-    if (
-      !args?.customEventData?.detail?.isCapturePhase &&
-      listener.noPropagation
-    ) {
-      args?.customEventData?.detail?.stopPropagation();
+    if (!args?.event?.isCapturePhase && listener.noPropagation) {
+      args?.customEventData?.stopPropagation();
     }
 
     // 判断捕获的执行，只有执行的捕获与配置的捕获一致时。才会执行。
     if (
       (listener?.isCapturePhase || false) ===
-      (args?.customEventData?.detail?.isCapturePhase || false)
+      (args?.customEventData?.isCapturePhase || false)
     ) {
       try {
         const res = await invokeListener(listener, args, scopeContext, context);
         const eventName = `${listener.key}.success`;
         const event = {
-          detail: {
-            value: res,
-            origin: args.event,
-            isCapturePhase: !!args.event?.isCapturePhase,
-          },
+          detail:
+            typeof res === 'object' && res !== null && !Array.isArray(res)
+              ? {
+                  ...res,
+                  /**
+                   * @deprecated 历史bug
+                   * value,origin,isCapturePhase
+                   */
+                  value: res,
+                  origin: args.event,
+                  isCapturePhase: !!args.event?.isCapturePhase,
+                }
+              : res,
+          origin: args.event,
+          isCapturePhase: !!args.event?.isCapturePhase,
           name: eventName,
         };
         emitEvent(
@@ -49,14 +62,22 @@ export function emitEvent(trigger, listeners = [], args, scopeContext = {}, cont
           scopeContext,
           context
         );
+        if (res) {
+          console.warn(
+            `@deprecated 事件编排中后续事件(${eventName}) event.detail.value.xxx 已废弃，建议使用 event.detail 直接访问前一动作返回值`
+          );
+        }
       } catch (e) {
         const eventName = `${listener.key}.fail`;
+        try {
+          e.value = e;
+          e.origin = args.event;
+          e.isCapturePhase = !!args.event?.isCapturePhase;
+        } catch (e) {}
         const event = {
-          detail: {
-            value: e,
-            origin: args.event,
-            isCapturePhase: !!args.event?.isCapturePhase,
-          },
+          detail: e,
+          origin: args.event,
+          isCapturePhase: !!args.event?.isCapturePhase,
           name: eventName,
         };
         emitEvent(
@@ -70,6 +91,9 @@ export function emitEvent(trigger, listeners = [], args, scopeContext = {}, cont
           scopeContext,
           context
         );
+        console.warn(
+          `@deprecated 事件编排中后续事件(${eventName}) event.detail.value.xxx 已废弃，建议使用 event.detail 直接访问前一动作返回值`
+        );
         // 之前 invoke 内部catch 了错误，不会抛错
         // throw e
       }