@xuda.io/runtime-bundle 1.0.1423 → 1.0.1425

package/js/xuda-runtime-slim.js

@@ -16053,10 +16053,11 @@ func.runtime.render.bind_xu_event = function (options) {
         evt[val.event_modifiers]();
       }
 
-      if (val.workflow) {
-        const workflow_keys = Object.keys(val.workflow);
+      const workflow = val.workflow || val.event;
+      if (workflow) {
+        const workflow_keys = Object.keys(workflow);
         for (let workflow_index = 0; workflow_index < workflow_keys.length; workflow_index++) {
-          const val2 = val.workflow[workflow_keys[workflow_index]];
+          const val2 = workflow[workflow_keys[workflow_index]];
           if (!val2.data.enabled) continue;
 
           func.events.add_to_queue(
@@ -16768,7 +16769,7 @@ func.runtime.render.normalize_node_attributes = function (nodeP) {
         {
           handler: 'custom',
           props: {},
-          event: [
+          workflow: [
             {
               id: Date.now(),
               data: {
@@ -20158,6 +20159,25 @@ func.expression.get = async function (SESSION_ID, valP, dsSessionP, sourceP, row
 
       // var split = [];
       var var_Arr = [];
+      const get_iterate_value_ret = function (fieldIdP) {
+        if (!iterate_info || (iterate_info.iterator_key !== fieldIdP && iterate_info.iterator_val !== fieldIdP)) {
+          return null;
+        }
+
+        const iter_value = iterate_info.iterator_key === fieldIdP ? iterate_info._key : iterate_info._val;
+        const iter_type = typeof iter_value !== 'undefined' ? {}.toString.call(iter_value).match(/\s([a-zA-Z]+)/)[1].toLowerCase() : 'string';
+
+        return {
+          ret: {
+            value: iter_value,
+            type: iter_type,
+            prop: ['array', 'object'].includes(iter_type) ? iter_value : null,
+          },
+          fieldIdP,
+          currentRecordId: rowIdP,
+          found: typeof iter_value !== 'undefined',
+        };
+      };
       const split = func.expression.parse(ret) || [];
       // console.log(valP, split);
       const split_entries = Object.entries(split);
@@ -20254,7 +20274,7 @@ func.expression.get = async function (SESSION_ID, valP, dsSessionP, sourceP, row
           } // put default
           fields[val.fieldId] = var_Arr[key].value;
 
-          const ret = await func.datasource.get_value(SESSION_ID, val.fieldId, dsSessionP, rowIdP); // find field in dataSources
+          const ret = get_iterate_value_ret(val.fieldId) || (await func.datasource.get_value(SESSION_ID, val.fieldId, dsSessionP, rowIdP)); // find field in dataSources
 
           await replace_value_in_string(ret.ret, ret.fieldIdP);
         }

package/js/xuda-runtime-slim.min.es.js

@@ -15979,10 +15979,11 @@ func.runtime.render.bind_xu_event = function (options) {
         evt[val.event_modifiers]();
       }
 
-      if (val.workflow) {
-        const workflow_keys = Object.keys(val.workflow);
+      const workflow = val.workflow || val.event;
+      if (workflow) {
+        const workflow_keys = Object.keys(workflow);
         for (let workflow_index = 0; workflow_index < workflow_keys.length; workflow_index++) {
-          const val2 = val.workflow[workflow_keys[workflow_index]];
+          const val2 = workflow[workflow_keys[workflow_index]];
           if (!val2.data.enabled) continue;
 
           func.events.add_to_queue(
@@ -16694,7 +16695,7 @@ func.runtime.render.normalize_node_attributes = function (nodeP) {
         {
           handler: 'custom',
           props: {},
-          event: [
+          workflow: [
             {
               id: Date.now(),
               data: {
@@ -20849,6 +20850,25 @@ func.expression.get = async function (SESSION_ID, valP, dsSessionP, sourceP, row
 
       // var split = [];
       var var_Arr = [];
+      const get_iterate_value_ret = function (fieldIdP) {
+        if (!iterate_info || (iterate_info.iterator_key !== fieldIdP && iterate_info.iterator_val !== fieldIdP)) {
+          return null;
+        }
+
+        const iter_value = iterate_info.iterator_key === fieldIdP ? iterate_info._key : iterate_info._val;
+        const iter_type = typeof iter_value !== 'undefined' ? {}.toString.call(iter_value).match(/\s([a-zA-Z]+)/)[1].toLowerCase() : 'string';
+
+        return {
+          ret: {
+            value: iter_value,
+            type: iter_type,
+            prop: ['array', 'object'].includes(iter_type) ? iter_value : null,
+          },
+          fieldIdP,
+          currentRecordId: rowIdP,
+          found: typeof iter_value !== 'undefined',
+        };
+      };
       const split = func.expression.parse(ret) || [];
       // console.log(valP, split);
       const split_entries = Object.entries(split);
@@ -20945,7 +20965,7 @@ func.expression.get = async function (SESSION_ID, valP, dsSessionP, sourceP, row
           } // put default
           fields[val.fieldId] = var_Arr[key].value;
 
-          const ret = await func.datasource.get_value(SESSION_ID, val.fieldId, dsSessionP, rowIdP); // find field in dataSources
+          const ret = get_iterate_value_ret(val.fieldId) || (await func.datasource.get_value(SESSION_ID, val.fieldId, dsSessionP, rowIdP)); // find field in dataSources
 
           await replace_value_in_string(ret.ret, ret.fieldIdP);
         }