fix: 修复事件流传参问题

JackySoft · Sep 2, 2024 · 7b3fc07 · 7b3fc07
1 parent 55af774
commit 7b3fc07
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/packages/editor/src/components/VariableBind/VariableSelect.tsx b/packages/editor/src/components/VariableBind/VariableSelect.tsx
@@ -125,8 +125,8 @@ const SelectVariableModal = ({ onSelect }: { onSelect: (record: any) => void },
     } else if (type === 'function') {
       form.setFieldValue(
         'expression',
-        `function run(eventParams) {
-    return '';
+        `function run() {
+    return context.eventParams;
 }`,
       );
     }

diff --git a/packages/editor/src/packages/utils/util.ts b/packages/editor/src/packages/utils/util.ts
@@ -341,7 +341,7 @@ export const handleArrayVariable = (list: any = [], data: any = {}) => {
           }
         } else {
           // 变量不支持模板字符串语法
-          const result = renderFormula(next.value.value);
+          const result = renderFormula(next.value.value, data);
           prev[next.key] = isNotEmpty(result) ? result : undefined;
         }
       }

diff --git a/packages/materials/utils/util.ts b/packages/materials/utils/util.ts
@@ -341,7 +341,7 @@ export const handleArrayVariable = (list: any = [], data: any = {}) => {
           }
         } else {
           // 变量不支持模板字符串语法
-          const result = renderFormula(next.value.value);
+          const result = renderFormula(next.value.value, data);
           prev[next.key] = isNotEmpty(result) ? result : undefined;
         }
       }