@xuda.io/runtime-bundle 1.0.1423 → 1.0.1424

package/js/xuda-runtime-bundle.js

@@ -41513,6 +41513,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);
@@ -41609,7 +41628,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);
         }