1
0
Эх сурвалжийг харах

fix: error when using the javascript code block

Ahmad Kholid 3 жил өмнө
parent
commit
ebfe1420a8

+ 4 - 6
src/background/workflow-engine/blocks-handler/handler-interaction-block.js

@@ -3,14 +3,12 @@ import { getBlockConnection } from '../helper';
 
 async function interactionHandler(block, { refData }) {
   const nextBlockId = getBlockConnection(block);
+  const messagePayload = { ...block, refData };
 
   try {
-    const data = await this._sendMessageToTab(
-      { ...block, refData },
-      {
-        frameId: this.frameId || 0,
-      }
-    );
+    const data = await this._sendMessageToTab(messagePayload, {
+      frameId: this.frameId || 0,
+    });
 
     if (block.name === 'link')
       await new Promise((resolve) => setTimeout(resolve, 5000));

+ 1 - 1
src/background/workflow-engine/engine.js

@@ -335,7 +335,7 @@ class WorkflowEngine {
     if (handler) {
       const refData = {
         prevBlockData,
-        data: this.data,
+        dataColumns: this.data,
         loopData: this.loopData,
         globalData: this.globalData,
         activeTabUrl: this.activeTabUrl,

+ 0 - 6
src/content/blocks-handler/handler-javascript-code.js

@@ -1,5 +1,4 @@
 import { sendMessage } from '@/utils/message';
-import { generateJSON } from '@/utils/data-exporter';
 
 function getAutomaScript(blockId) {
   return `
@@ -38,11 +37,6 @@ function automaRefData(keyword, path = '') {
 }
 
 function javascriptCode(block) {
-  block.refData.dataColumns = generateJSON(
-    Object.keys(block.refData.dataColumns),
-    block.refData.dataColumns
-  );
-
   sessionStorage.setItem(`automa--${block.id}`, JSON.stringify(block.refData));
   const automaScript = getAutomaScript(block.id);
 

+ 1 - 1
src/utils/reference-data.js

@@ -27,7 +27,7 @@ export function parseKey(key) {
 
   if (dataPath.endsWith('.')) dataPath = dataPath.slice(0, -1);
 
-  return { dataKey: 'data', path: dataPath };
+  return { dataKey: 'dataColumns', path: dataPath };
 }
 export function replaceMustacheHandler(match, data) {
   const key = match.slice(2, -2).replace(/\s/g, '');