@xuda.io/runtime-bundle 1.0.778 → 1.0.780

package/js/xuda-runtime-bundle.js

@@ -24501,19 +24501,19 @@ func.api.call_javascript = async function (prog_id, params, evaluate) {
   return await api_utils.call_javascript(prog_id, params, evaluate);
 };
 
-func.api.call_javascript = async function (prog_id, params, evaluate) {
-  const SESSION_ID = Object.keys(SESSION_OBJ)[0];
-  const api_utils = await func.common.get_module(SESSION_ID, 'xuda-api-library.mjs', {
-    func,
-    glb,
-    SESSION_OBJ,
-    SESSION_ID,
-    APP_OBJ,
-    dsSession: func.utils.get_last_datasource_no(SESSION_ID),
-  });
+// func.api.call_javascript = async function (prog_id, params, evaluate) {
+//   const SESSION_ID = Object.keys(SESSION_OBJ)[0];
+//   const api_utils = await func.common.get_module(SESSION_ID, 'xuda-api-library.mjs', {
+//     func,
+//     glb,
+//     SESSION_OBJ,
+//     SESSION_ID,
+//     APP_OBJ,
+//     dsSession: func.utils.get_last_datasource_no(SESSION_ID),
+//   });
 
-  return await api_utils.call_javascript(prog_id, params, evaluate);
-};
+//   return await api_utils.call_javascript(prog_id, params, evaluate);
+// };
 
 glb.rpi_request_queue_num = 0;
 func.common.perform_rpi_request = async function (SESSION_ID, serviceP, opt = {}, data) {
@@ -27848,7 +27848,6 @@ func.UI.worker.find_job_index = function (SESSION_ID, jobNoP) {
 };
 
 func.UI.ds_garbage_collector = function (SESSION_ID = Object.keys(SESSION_OBJ)[0], re_check) {
-  return;
   let _session = SESSION_OBJ[SESSION_ID];
 
   const _data_system = _session?.DS_GLB?.[0]?.data_system;
@@ -27902,7 +27901,6 @@ func.UI.ds_garbage_collector = function (SESSION_ID = Object.keys(SESSION_OBJ)[0
   }
 };
 func.UI.refs_garbage_collector = function (SESSION_ID = Object.keys(SESSION_OBJ)[0]) {
-  return;
   if (!_.isEmpty(SCREEN_BLOCKER_OBJ)) {
     // let dom  to finish build
     return;
@@ -35377,271 +35375,271 @@ func.expression.get = async function (SESSION_ID, valP, dsSessionP, sourceP, row
   return new_class.get();
 };
 
-func.expression.get_bad1 = async function (SESSION_ID, valP, dsSessionP, sourceP, rowIdP, sourceActionP, secondPassP, calling_fieldIdP, fieldsP = {}, debug_infoP, iterate_info, js_script_callback, jobNo, api_output_type) {
-  const evalJson = (text) => eval(`(${text})`);
-  const replaceQuotes = (str) => {
-    for (const [key, val] of Object.entries(fields)) {
-      if (typeof val === 'string') str = str.replace(`"${val}"`, val.replace(/"/g, ''));
-    }
-    return str;
-  };
+// func.expression.get_bad1 = async function (SESSION_ID, valP, dsSessionP, sourceP, rowIdP, sourceActionP, secondPassP, calling_fieldIdP, fieldsP = {}, debug_infoP, iterate_info, js_script_callback, jobNo, api_output_type) {
+//   const evalJson = (text) => eval(`(${text})`);
+//   const replaceQuotes = (str) => {
+//     for (const [key, val] of Object.entries(fields)) {
+//       if (typeof val === 'string') str = str.replace(`"${val}"`, val.replace(/"/g, ''));
+//     }
+//     return str;
+//   };
 
-  let ret, error, warning, var_error_found;
-  const fields = { ...fieldsP };
+//   let ret, error, warning, var_error_found;
+//   const fields = { ...fieldsP };
 
-  // Initial value processing
-  if (valP === null || typeof valP === 'undefined') ret = '';
-  else if (typeof valP === 'boolean') ret = valP ? 'Y' : 'N';
-  else ret = valP.toString();
+//   // Initial value processing
+//   if (valP === null || typeof valP === 'undefined') ret = '';
+//   else if (typeof valP === 'boolean') ret = valP ? 'Y' : 'N';
+//   else ret = valP.toString();
 
-  ret = ret.replace(/\&/g, '&');
-  ret = func.utils.replace_studio_drive_url(SESSION_ID, ret);
+//   ret = ret.replace(/\&/g, '&');
+//   ret = func.utils.replace_studio_drive_url(SESSION_ID, ret);
 
-  // End results helper
-  const endResults = () => {
-    if (['update', 'javascript'].includes(sourceP) && typeof ret === 'string') {
-      ret = replaceQuotes(ret);
-    }
-    if ((error || warning) && SESSION_OBJ[SESSION_ID]?.DS_GLB[dsSessionP]) {
-      func.utils.debug.log(SESSION_ID, SESSION_OBJ[SESSION_ID].DS_GLB[dsSessionP].nodeId, {
-        module: 'expression',
-        action: sourceP,
-        source: calling_fieldIdP,
-        prop: ret,
-        details: ret,
-        result: ret,
-        error,
-        warning,
-        fields: null,
-        type: 'exp',
-        prog_id: SESSION_OBJ[SESSION_ID].DS_GLB[dsSessionP].prog_id,
-        debug_info: debug_infoP,
-      });
-    }
-    return { result: ret, fields, error, warning, req: valP, var_error_found };
-  };
+//   // End results helper
+//   const endResults = () => {
+//     if (['update', 'javascript'].includes(sourceP) && typeof ret === 'string') {
+//       ret = replaceQuotes(ret);
+//     }
+//     if ((error || warning) && SESSION_OBJ[SESSION_ID]?.DS_GLB[dsSessionP]) {
+//       func.utils.debug.log(SESSION_ID, SESSION_OBJ[SESSION_ID].DS_GLB[dsSessionP].nodeId, {
+//         module: 'expression',
+//         action: sourceP,
+//         source: calling_fieldIdP,
+//         prop: ret,
+//         details: ret,
+//         result: ret,
+//         error,
+//         warning,
+//         fields: null,
+//         type: 'exp',
+//         prog_id: SESSION_OBJ[SESSION_ID].DS_GLB[dsSessionP].prog_id,
+//         debug_info: debug_infoP,
+//       });
+//     }
+//     return { result: ret, fields, error, warning, req: valP, var_error_found };
+//   };
 
-  // Handle non-variable cases
-  const handleNonVariable = async () => {
-    try {
-      if (sourceP !== 'arguments') {
-        if (ret.startsWith('_DATE_')) ret = ret.slice(6);
-        else if (/^\d{4}-\d{2}-\d{2}$/.test(ret) || ret === 'self') return endResults();
-        else ret = await func.expression.secure_eval(SESSION_ID, sourceP, ret, jobNo, dsSessionP, js_script_callback);
-      } else {
-        ret = ret.replace(/_NULL/gi, '');
-      }
-      return endResults();
-    } catch (err) {
-      error = err.message;
-      return endResults();
-    }
-  };
+//   // Handle non-variable cases
+//   const handleNonVariable = async () => {
+//     try {
+//       if (sourceP !== 'arguments') {
+//         if (ret.startsWith('_DATE_')) ret = ret.slice(6);
+//         else if (/^\d{4}-\d{2}-\d{2}$/.test(ret) || ret === 'self') return endResults();
+//         else ret = await func.expression.secure_eval(SESSION_ID, sourceP, ret, jobNo, dsSessionP, js_script_callback);
+//       } else {
+//         ret = ret.replace(/_NULL/gi, '');
+//       }
+//       return endResults();
+//     } catch (err) {
+//       error = err.message;
+//       return endResults();
+//     }
+//   };
 
-  // Early return for simple cases
-  if (!func.expression.validate_variables(valP)) return await handleNonVariable();
-  if (glb.emailRegex.test(await func.expression.secure_eval(SESSION_ID, sourceP, valP, jobNo, dsSessionP, js_script_callback))) {
-    return await handleNonVariable();
-  }
+//   // Early return for simple cases
+//   if (!func.expression.validate_variables(valP)) return await handleNonVariable();
+//   if (glb.emailRegex.test(await func.expression.secure_eval(SESSION_ID, sourceP, valP, jobNo, dsSessionP, js_script_callback))) {
+//     return await handleNonVariable();
+//   }
 
-  // Parse and process variables
-  const split = func.expression.parse(ret) || [];
-  const var_Arr = await Promise.all(
-    split.map(async (val, key) => {
-      const result = { value: val.value, fieldId: val.fieldId };
+//   // Parse and process variables
+//   const split = func.expression.parse(ret) || [];
+//   const var_Arr = await Promise.all(
+//     split.map(async (val, key) => {
+//       const result = { value: val.value, fieldId: val.fieldId };
 
-      if (!val.fieldId) return result;
+//       if (!val.fieldId) return result;
 
-      // Handle _THIS substitution
-      if (val.fieldId.startsWith('_THIS') && calling_fieldIdP) {
-        result.fieldId = val.fieldId.length === 5 ? calling_fieldIdP : calling_fieldIdP + val.fieldId.slice(5);
-      }
+//       // Handle _THIS substitution
+//       if (val.fieldId.startsWith('_THIS') && calling_fieldIdP) {
+//         result.fieldId = val.fieldId.length === 5 ? calling_fieldIdP : calling_fieldIdP + val.fieldId.slice(5);
+//       }
 
-      // Fetch value from datasource
-      const { ret: fetchedValue, fieldIdP } = await func.datasource.get_value(SESSION_ID, result.fieldId, dsSessionP, rowIdP);
-      result.value = fetchedValue?.value ?? (sourceP === 'exp' ? fetchedValue?.value : '""');
-      result.type = fetchedValue?.type;
+//       // Fetch value from datasource
+//       const { ret: fetchedValue, fieldIdP } = await func.datasource.get_value(SESSION_ID, result.fieldId, dsSessionP, rowIdP);
+//       result.value = fetchedValue?.value ?? (sourceP === 'exp' ? fetchedValue?.value : '""');
+//       result.type = fetchedValue?.type;
 
-      // Handle iteration
-      if (iterate_info) {
-        if (iterate_info.iterator_key === fieldIdP) result.value = iterate_info._key;
-        if (iterate_info.iterator_val === fieldIdP) result.value = iterate_info._val;
-      }
+//       // Handle iteration
+//       if (iterate_info) {
+//         if (iterate_info.iterator_key === fieldIdP) result.value = iterate_info._key;
+//         if (iterate_info.iterator_val === fieldIdP) result.value = iterate_info._val;
+//       }
 
-      // Process nested properties
-      if (val.value.includes('[') || val.value.includes('.')) {
-        const { property1, property2 } = await func.expression.get_property(val.value);
-        const data = fetchedValue?.type === 'object' ? fetchedValue.value : fetchedValue?.prop;
+//       // Process nested properties
+//       if (val.value.includes('[') || val.value.includes('.')) {
+//         const { property1, property2 } = await func.expression.get_property(val.value);
+//         const data = fetchedValue?.type === 'object' ? fetchedValue.value : fetchedValue?.prop;
 
-        if (key > 0 && val.value.includes(']') && !val.value.includes('[') && split[key - 1].value) {
-          const prevData = split[key - 1].value;
-          result.value = prevData[fieldIdP];
-          if (val.value.includes('.') && prevData[fieldIdP]) {
-            result.value = prevData[fieldIdP][property2] ?? '';
-          }
-        } else if (data) {
-          if (property1) result.value = data[property1] ?? '';
-          if (property2) result.value = (property1 ? data[property1]?.[property2] : data[property2]) ?? '';
-        }
-      }
+//         if (key > 0 && val.value.includes(']') && !val.value.includes('[') && split[key - 1].value) {
+//           const prevData = split[key - 1].value;
+//           result.value = prevData[fieldIdP];
+//           if (val.value.includes('.') && prevData[fieldIdP]) {
+//             result.value = prevData[fieldIdP][property2] ?? '';
+//           }
+//         } else if (data) {
+//           if (property1) result.value = data[property1] ?? '';
+//           if (property2) result.value = (property1 ? data[property1]?.[property2] : data[property2]) ?? '';
+//         }
+//       }
 
-      fields[fieldIdP] = result.value;
-      return result;
-    }),
-  );
+//       fields[fieldIdP] = result.value;
+//       return result;
+//     }),
+//   );
 
-  // Final evaluation
-  try {
-    const res = var_Arr.map((val, key) => {
-      if (sourceP === 'UI Property EXP' || sourceP === 'UI Attr EXP') {
-        const { changed, value } = func.utils.get_drive_url(SESSION_ID, val.value, sourceP === 'UI Attr EXP' && var_Arr.length > 1);
-        if (changed) return value;
-      }
+//   // Final evaluation
+//   try {
+//     const res = var_Arr.map((val, key) => {
+//       if (sourceP === 'UI Property EXP' || sourceP === 'UI Attr EXP') {
+//         const { changed, value } = func.utils.get_drive_url(SESSION_ID, val.value, sourceP === 'UI Attr EXP' && var_Arr.length > 1);
+//         if (changed) return value;
+//       }
 
-      let value = val.value;
-      if (var_Arr.length > 1) {
-        if (!['DbQuery', 'alert', 'exp', 'api_rendered_output'].includes(sourceP) && ['string', 'date'].includes(val.type)) {
-          value = `\`${value}\``;
-        } else if (sourceP === 'api_rendered_output' && api_output_type === 'json' && ['string', 'date'].includes(val.type)) {
-          value = `"${value}"`;
-        }
-      }
+//       let value = val.value;
+//       if (var_Arr.length > 1) {
+//         if (!['DbQuery', 'alert', 'exp', 'api_rendered_output'].includes(sourceP) && ['string', 'date'].includes(val.type)) {
+//           value = `\`${value}\``;
+//         } else if (sourceP === 'api_rendered_output' && api_output_type === 'json' && ['string', 'date'].includes(val.type)) {
+//           value = `"${value}"`;
+//         }
+//       }
 
-      if (val.fieldId && typeof value === 'string') {
-        if (['query', 'condition', 'range', 'sort', 'locate'].includes(sourceP)) value = value.replace(/↵|\r\n|\n|\r/g, '');
-        if (['init', 'update', 'virtual'].includes(sourceP)) value = value.replace(/↵|\r\n|\n|\r/g, '\\n');
-        if (typeof IS_PROCESS_SERVER !== 'undefined') value = value.replace(/↵|\r\n|\n|\r/g, '<br>');
-        fields[val.fieldId] = value;
-      }
+//       if (val.fieldId && typeof value === 'string') {
+//         if (['query', 'condition', 'range', 'sort', 'locate'].includes(sourceP)) value = value.replace(/↵|\r\n|\n|\r/g, '');
+//         if (['init', 'update', 'virtual'].includes(sourceP)) value = value.replace(/↵|\r\n|\n|\r/g, '\\n');
+//         if (typeof IS_PROCESS_SERVER !== 'undefined') value = value.replace(/↵|\r\n|\n|\r/g, '<br>');
+//         fields[val.fieldId] = value;
+//       }
 
-      if (typeof value === 'object' && var_Arr.length > 1) {
-        value = Array.isArray(value) || var_Arr[key + 1]?.value?.includes('.') ? JSON.stringify(value) : `(${JSON.stringify(value)})`;
-      }
+//       if (typeof value === 'object' && var_Arr.length > 1) {
+//         value = Array.isArray(value) || var_Arr[key + 1]?.value?.includes('.') ? JSON.stringify(value) : `(${JSON.stringify(value)})`;
+//       }
 
-      if (!val.type === 'exp' && sourceP !== 'exp' && typeof value === 'string' && value.startsWith('@')) {
-        warning = `Error encoding ${value}`;
-        var_error_found = true;
-        return '0';
-      }
-      return value;
-    });
+//       if (!val.type === 'exp' && sourceP !== 'exp' && typeof value === 'string' && value.startsWith('@')) {
+//         warning = `Error encoding ${value}`;
+//         var_error_found = true;
+//         return '0';
+//       }
+//       return value;
+//     });
 
-    ret = res.length === 1 ? res[0] : res.join('');
-    if (var_Arr.some((v) => v.type === 'exp') && sourceP !== 'exp' && !secondPassP) {
-      const exp = await func.expression.get(SESSION_ID, ret, dsSessionP, sourceP, rowIdP, sourceActionP, true, calling_fieldIdP, fields, debug_infoP);
-      ret = exp.res?.[0] ?? exp.result;
-      Object.assign(fields, exp.fields);
-    } else if (!secondPassP && !['arguments', 'api_rendered_output', 'DbQuery'].includes(sourceP)) {
-      ret = await func.expression.secure_eval(SESSION_ID, sourceP, ret, jobNo, dsSessionP, js_script_callback);
-    } else if (sourceP === 'DbQuery') {
-      ret = JSON.stringify(evalJson(ret));
-    }
+//     ret = res.length === 1 ? res[0] : res.join('');
+//     if (var_Arr.some((v) => v.type === 'exp') && sourceP !== 'exp' && !secondPassP) {
+//       const exp = await func.expression.get(SESSION_ID, ret, dsSessionP, sourceP, rowIdP, sourceActionP, true, calling_fieldIdP, fields, debug_infoP);
+//       ret = exp.res?.[0] ?? exp.result;
+//       Object.assign(fields, exp.fields);
+//     } else if (!secondPassP && !['arguments', 'api_rendered_output', 'DbQuery'].includes(sourceP)) {
+//       ret = await func.expression.secure_eval(SESSION_ID, sourceP, ret, jobNo, dsSessionP, js_script_callback);
+//     } else if (sourceP === 'DbQuery') {
+//       ret = JSON.stringify(evalJson(ret));
+//     }
 
-    if (typeof ret === 'string' && ret.startsWith('@')) {
-      error = 'Error encoding @ var';
-      var_error_found = true;
-    }
-  } catch (err) {
-    error = err.message;
-  }
+//     if (typeof ret === 'string' && ret.startsWith('@')) {
+//       error = 'Error encoding @ var';
+//       var_error_found = true;
+//     }
+//   } catch (err) {
+//     error = err.message;
+//   }
 
-  return endResults();
-};
+//   return endResults();
+// };
 
-func.expression.parse_org = function (strP) {
-  var extract_str = function (strP, posP) {
-    if (!posP) posP = 0;
-    var clean_split_str = function (arrP) {
-      var arr = [];
-      if (arrP && arrP.length > 1 && arrP[0] === '' && arrP[1].indexOf('@') > -1) {
-        for (var i = 1; i <= arrP.length; i++) {
-          arr.push(arrP[i]);
-        }
-        return arr;
-      } else return arrP;
-    };
-    var nonLettersPatt = /\W/; // non letters
-    var validSymbolsNoArray = /[^.@\[]/; //valid symbols no array /[^.@\[\]\]]/
-    var validSymbolsWithArray = /[^.@"'\[\]]/; //valid symbols with array
-    var validSymbols = validSymbolsNoArray;
-    var splitTmp = strP.replace(/@/g, '^^@').split('^^');
-    var split = clean_split_str(splitTmp);
-    var obj = [];
-    if (split) {
-      for (let val of split) {
-        // run on @ segments
-        if (val) {
-          var pos = strP.indexOf(val);
-          if (val && val.substr(0, 1) === '@') {
-            var tmpStr = '';
-            var word_start_pos = undefined;
-            var word_end_pos = undefined;
-            // run on @ segment string
-            for (var i = 0; i <= val.length; i++) {
-              var key1 = i;
-              var val1 = val.substr(i, 1);
-              if (
-                val1 === '.' &&
-                !word_start_pos // find first dot
-              )
-                word_start_pos = key1;
-              if (
-                word_start_pos &&
-                key1 > word_start_pos &&
-                nonLettersPatt.test(val1) // find any sign character to mark the end of word
-              )
-                word_end_pos = key1;
-              if (word_start_pos && word_start_pos >= 0 && word_end_pos && word_end_pos >= 0) {
-                // find the word
-                var word = val.substr(word_start_pos + 1, word_end_pos - word_start_pos - 1); // get the word
-                // if (glb.ALL_PROPERTIES_ARR.indexOf(word) === -1) {
-                // compare with internal properties
-                tmpStr = tmpStr.substr(0, word_start_pos) + '^^' + tmpStr.substr(word_start_pos, word_end_pos);
-                // }
-                if (val.substr(word_end_pos, 1) === '.') word_start_pos = word_end_pos;
-                else word_start_pos = null;
-                word_end_pos = null;
-              }
-              if (val1 === '[') validSymbols = validSymbolsWithArray;
-              if (nonLettersPatt.test(val1) && validSymbols.test(val1) && tmpStr.indexOf('^^') === -1) {
-                tmpStr += '^^' + val1;
-              } else tmpStr += val1;
-            }
-            //                        });
-            if (tmpStr.indexOf('^^') > -1) {
-              var obj1 = extract_str(tmpStr, pos);
-              obj = obj.concat(obj1);
-            } else {
-              // push clean @var
-              var fieldId = undefined;
-              if (val) {
-                fieldId = val.substr(1, val.length);
-                if (val.indexOf('.') > -1) fieldId = val.substr(1, val.indexOf('.') - 1);
-                if (val.indexOf('[') > -1) fieldId = val.substr(1, val.indexOf('[') - 1);
-                //
-                //                                  if (val.indexOf("]") > -1)
-                //                                    fieldId = val.substr(1, val.indexOf("]") - 1);
-              }
-              obj.push({
-                value: val,
-                fieldId: fieldId,
-                pos: pos + posP,
-              });
-            }
-          } else {
-            obj.push({
-              value: val,
-              pos: pos + posP,
-            });
-          }
-        }
-      }
-      return obj;
-    }
-  };
-  var res = extract_str(strP);
-  return res;
-};
+// func.expression.parse_org = function (strP) {
+//   var extract_str = function (strP, posP) {
+//     if (!posP) posP = 0;
+//     var clean_split_str = function (arrP) {
+//       var arr = [];
+//       if (arrP && arrP.length > 1 && arrP[0] === '' && arrP[1].indexOf('@') > -1) {
+//         for (var i = 1; i <= arrP.length; i++) {
+//           arr.push(arrP[i]);
+//         }
+//         return arr;
+//       } else return arrP;
+//     };
+//     var nonLettersPatt = /\W/; // non letters
+//     var validSymbolsNoArray = /[^.@\[]/; //valid symbols no array /[^.@\[\]\]]/
+//     var validSymbolsWithArray = /[^.@"'\[\]]/; //valid symbols with array
+//     var validSymbols = validSymbolsNoArray;
+//     var splitTmp = strP.replace(/@/g, '^^@').split('^^');
+//     var split = clean_split_str(splitTmp);
+//     var obj = [];
+//     if (split) {
+//       for (let val of split) {
+//         // run on @ segments
+//         if (val) {
+//           var pos = strP.indexOf(val);
+//           if (val && val.substr(0, 1) === '@') {
+//             var tmpStr = '';
+//             var word_start_pos = undefined;
+//             var word_end_pos = undefined;
+//             // run on @ segment string
+//             for (var i = 0; i <= val.length; i++) {
+//               var key1 = i;
+//               var val1 = val.substr(i, 1);
+//               if (
+//                 val1 === '.' &&
+//                 !word_start_pos // find first dot
+//               )
+//                 word_start_pos = key1;
+//               if (
+//                 word_start_pos &&
+//                 key1 > word_start_pos &&
+//                 nonLettersPatt.test(val1) // find any sign character to mark the end of word
+//               )
+//                 word_end_pos = key1;
+//               if (word_start_pos && word_start_pos >= 0 && word_end_pos && word_end_pos >= 0) {
+//                 // find the word
+//                 var word = val.substr(word_start_pos + 1, word_end_pos - word_start_pos - 1); // get the word
+//                 // if (glb.ALL_PROPERTIES_ARR.indexOf(word) === -1) {
+//                 // compare with internal properties
+//                 tmpStr = tmpStr.substr(0, word_start_pos) + '^^' + tmpStr.substr(word_start_pos, word_end_pos);
+//                 // }
+//                 if (val.substr(word_end_pos, 1) === '.') word_start_pos = word_end_pos;
+//                 else word_start_pos = null;
+//                 word_end_pos = null;
+//               }
+//               if (val1 === '[') validSymbols = validSymbolsWithArray;
+//               if (nonLettersPatt.test(val1) && validSymbols.test(val1) && tmpStr.indexOf('^^') === -1) {
+//                 tmpStr += '^^' + val1;
+//               } else tmpStr += val1;
+//             }
+//             //                        });
+//             if (tmpStr.indexOf('^^') > -1) {
+//               var obj1 = extract_str(tmpStr, pos);
+//               obj = obj.concat(obj1);
+//             } else {
+//               // push clean @var
+//               var fieldId = undefined;
+//               if (val) {
+//                 fieldId = val.substr(1, val.length);
+//                 if (val.indexOf('.') > -1) fieldId = val.substr(1, val.indexOf('.') - 1);
+//                 if (val.indexOf('[') > -1) fieldId = val.substr(1, val.indexOf('[') - 1);
+//                 //
+//                 //                                  if (val.indexOf("]") > -1)
+//                 //                                    fieldId = val.substr(1, val.indexOf("]") - 1);
+//               }
+//               obj.push({
+//                 value: val,
+//                 fieldId: fieldId,
+//                 pos: pos + posP,
+//               });
+//             }
+//           } else {
+//             obj.push({
+//               value: val,
+//               pos: pos + posP,
+//             });
+//           }
+//         }
+//       }
+//       return obj;
+//     }
+//   };
+//   var res = extract_str(strP);
+//   return res;
+// };
 
 func.expression.parse = function (input) {
   if (typeof input !== 'string') return [];
@@ -35710,50 +35708,50 @@ func.expression.get_property = async function (valP) {
   };
 };
 
-func.expression.get_property_bad = async function (valP) {
-  if (typeof valP !== 'string') return { property1: undefined, property2: undefined };
+// func.expression.get_property_bad = async function (valP) {
+//   if (typeof valP !== 'string') return { property1: undefined, property2: undefined };
 
-  const secureEval = async (expr) => {
-    if (typeof IS_PROCESS_SERVER === 'undefined') {
-      try {
-        return eval(expr);
-      } catch (err) {
-        console.error(err);
-        return undefined;
-      }
-    }
-    try {
-      const vm = new VM.VM({
-        sandbox: {
-          func,
-          SESSION_ID,
-          SESSION_OBJ: { [SESSION_ID]: SESSION_OBJ[SESSION_ID] },
-        },
-        timeout: 1000,
-        allowAsync: false,
-      });
-      return await vm.run(expr);
-    } catch {
-      return undefined; // Simplified error handling
-    }
-  };
+//   const secureEval = async (expr) => {
+//     if (typeof IS_PROCESS_SERVER === 'undefined') {
+//       try {
+//         return eval(expr);
+//       } catch (err) {
+//         console.error(err);
+//         return undefined;
+//       }
+//     }
+//     try {
+//       const vm = new VM.VM({
+//         sandbox: {
+//           func,
+//           SESSION_ID,
+//           SESSION_OBJ: { [SESSION_ID]: SESSION_OBJ[SESSION_ID] },
+//         },
+//         timeout: 1000,
+//         allowAsync: false,
+//       });
+//       return await vm.run(expr);
+//     } catch {
+//       return undefined; // Simplified error handling
+//     }
+//   };
 
-  let property1, property2;
-  const bracketStart = valP.indexOf('[');
-  const bracketEnd = valP.indexOf(']');
+//   let property1, property2;
+//   const bracketStart = valP.indexOf('[');
+//   const bracketEnd = valP.indexOf(']');
 
-  if (bracketStart > -1 && bracketEnd > bracketStart) {
-    const expr = valP.slice(bracketStart + 1, bracketEnd);
-    property1 = await secureEval(expr);
-  }
+//   if (bracketStart > -1 && bracketEnd > bracketStart) {
+//     const expr = valP.slice(bracketStart + 1, bracketEnd);
+//     property1 = await secureEval(expr);
+//   }
 
-  const dotIndex = valP.indexOf('.');
-  if (dotIndex > -1) {
-    property2 = valP.slice(dotIndex + 1);
-  }
+//   const dotIndex = valP.indexOf('.');
+//   if (dotIndex > -1) {
+//     property2 = valP.slice(dotIndex + 1);
+//   }
 
-  return { property1, property2 };
-};
+//   return { property1, property2 };
+// };
 
 func.expression.validate_constant = function (valP) {
   var patt = /["']/;
@@ -35781,107 +35779,107 @@ func.expression.remove_quotes = function (valP) {
 //   func.expression.validate_constant(valP) && typeof valP === 'string' ? valP.slice(1, -1) : valP;
 // };
 
-func.expression.secure_eval_org = async function (SESSION_ID, sourceP, val, job_id, dsSessionP, js_script_callback, evt) {
-  const api_utils = await func.common.get_module(SESSION_ID, 'xuda-api-library.mjs', {
-    func,
-    glb,
-    SESSION_OBJ,
-    SESSION_ID,
-    APP_OBJ,
-    dsSession: dsSessionP,
-    job_id,
-  });
-
-  const xu = api_utils;
-
-  if (typeof IS_PROCESS_SERVER === 'undefined' && typeof IS_DOCKER === 'undefined') {
-    try {
-      return eval(val);
-    } catch (err) {
-      try {
-        return JSON5.parse(val);
-      } catch (err) {
-        // console.error(err);
-        return val;
-      }
-    }
-  }
-  // server side execution
-  if (sourceP === 'javascript') {
-    process.on('uncaughtException', (err) => {
-      console.error('Asynchronous error caught.', err);
+// func.expression.secure_eval_org = async function (SESSION_ID, sourceP, val, job_id, dsSessionP, js_script_callback, evt) {
+//   const api_utils = await func.common.get_module(SESSION_ID, 'xuda-api-library.mjs', {
+//     func,
+//     glb,
+//     SESSION_OBJ,
+//     SESSION_ID,
+//     APP_OBJ,
+//     dsSession: dsSessionP,
+//     job_id,
+//   });
 
-      func.events.delete_job(SESSION_ID, job_id);
-      if (typeof IS_PROCESS_SERVER !== 'undefined' || typeof IS_DOCKER !== 'undefined') {
-        if (SESSION_OBJ[SESSION_ID].crawler) return;
-        return __.rpi.write_log(SESSION_OBJ[SESSION_ID].app_id, 'error', 'worker', 'vm error', err, null, val, 'func.expression.get.secure_eval');
-      }
-    });
-    try {
-      const dir = path.join(_conf.studio_drive_path, SESSION_OBJ[SESSION_ID].app_id, 'node_modules', '/');
-      const script = new VM.VMScript(`try{${val}}catch(e){func.api.error(SESSION_ID, "nodejs error", e); console.error(e); func.events.delete_job(SESSION_ID, job_id);}`, { filename: dir, dirname: dir });
-      let vm = new VM.NodeVM({
-        require: {
-          external: true,
-        },
-        sandbox: {
-          func,
-          xu,
-          SESSION_ID,
-          SESSION_OBJ: { [`${SESSION_ID}`]: SESSION_OBJ[SESSION_ID] },
-          callback: js_script_callback,
-          job_id,
-          axios,
-          got,
-          FormData,
-        },
-        timeout: 60000,
-      });
-      return await vm.run(script, {
-        filename: dir,
-        dirname: dir,
-      });
-    } catch (err) {
-      console.error('Failed to execute script.', err);
+//   const xu = api_utils;
+
+//   if (typeof IS_PROCESS_SERVER === 'undefined' && typeof IS_DOCKER === 'undefined') {
+//     try {
+//       return eval(val);
+//     } catch (err) {
+//       try {
+//         return JSON5.parse(val);
+//       } catch (err) {
+//         // console.error(err);
+//         return val;
+//       }
+//     }
+//   }
+//   // server side execution
+//   if (sourceP === 'javascript') {
+//     process.on('uncaughtException', (err) => {
+//       console.error('Asynchronous error caught.', err);
+
+//       func.events.delete_job(SESSION_ID, job_id);
+//       if (typeof IS_PROCESS_SERVER !== 'undefined' || typeof IS_DOCKER !== 'undefined') {
+//         if (SESSION_OBJ[SESSION_ID].crawler) return;
+//         return __.rpi.write_log(SESSION_OBJ[SESSION_ID].app_id, 'error', 'worker', 'vm error', err, null, val, 'func.expression.get.secure_eval');
+//       }
+//     });
+//     try {
+//       const dir = path.join(_conf.studio_drive_path, SESSION_OBJ[SESSION_ID].app_id, 'node_modules', '/');
+//       const script = new VM.VMScript(`try{${val}}catch(e){func.api.error(SESSION_ID, "nodejs error", e); console.error(e); func.events.delete_job(SESSION_ID, job_id);}`, { filename: dir, dirname: dir });
+//       let vm = new VM.NodeVM({
+//         require: {
+//           external: true,
+//         },
+//         sandbox: {
+//           func,
+//           xu,
+//           SESSION_ID,
+//           SESSION_OBJ: { [`${SESSION_ID}`]: SESSION_OBJ[SESSION_ID] },
+//           callback: js_script_callback,
+//           job_id,
+//           axios,
+//           got,
+//           FormData,
+//         },
+//         timeout: 60000,
+//       });
+//       return await vm.run(script, {
+//         filename: dir,
+//         dirname: dir,
+//       });
+//     } catch (err) {
+//       console.error('Failed to execute script.', err);
 
-      if (typeof IS_PROCESS_SERVER !== 'undefined') {
-        func.events.delete_job(SESSION_ID, jobNo);
-        return __.db.add_error_log(SESSION_OBJ[SESSION_ID].app_id, 'api', err);
-      }
-    }
-  } else {
-    try {
-      try {
-        let vm = new VM.VM({
-          sandbox: {
-            xu,
-            func,
-            SESSION_ID,
-            SESSION_OBJ: { [`${SESSION_ID}`]: SESSION_OBJ[SESSION_ID] },
-            callback: js_script_callback,
-            job_id,
-          },
-          timeout: 1000,
-          allowAsync: false,
-        });
-        let ret = val;
-        if (typeof val === 'string') {
-          ret = await vm.run(val);
-        }
-        return ret;
-      } catch (err) {
-        throw '';
-      }
-    } catch (err) {
-      try {
-        return JSON5.parse(val);
-      } catch (err) {
-        // console.error(err);
-        return val;
-      }
-    }
-  }
-};
+//       if (typeof IS_PROCESS_SERVER !== 'undefined') {
+//         func.events.delete_job(SESSION_ID, jobNo);
+//         return __.db.add_error_log(SESSION_OBJ[SESSION_ID].app_id, 'api', err);
+//       }
+//     }
+//   } else {
+//     try {
+//       try {
+//         let vm = new VM.VM({
+//           sandbox: {
+//             xu,
+//             func,
+//             SESSION_ID,
+//             SESSION_OBJ: { [`${SESSION_ID}`]: SESSION_OBJ[SESSION_ID] },
+//             callback: js_script_callback,
+//             job_id,
+//           },
+//           timeout: 1000,
+//           allowAsync: false,
+//         });
+//         let ret = val;
+//         if (typeof val === 'string') {
+//           ret = await vm.run(val);
+//         }
+//         return ret;
+//       } catch (err) {
+//         throw '';
+//       }
+//     } catch (err) {
+//       try {
+//         return JSON5.parse(val);
+//       } catch (err) {
+//         // console.error(err);
+//         return val;
+//       }
+//     }
+//   }
+// };
 
 func.expression.secure_eval = async function (SESSION_ID, sourceP, val, job_id, dsSessionP, js_script_callback, evt) {
   if (typeof val !== 'string') return val;
@@ -36708,14 +36706,14 @@ func.events.execute = async function (
 
     call_native_javascript: async function () {
       const module = await func.common.get_module(SESSION_ID, 'xuda-event-javascript-module.mjs');
-      const result = await module.call_javascript(SESSION_ID, jobNoP, refIdP, dsSession);
+      const result = await module.call_javascript(SESSION_ID, jobNoP, refIdP, dsSession, false, $(containerP));
       await func.datasource.set_outputField(SESSION_ID, dsSessionP, result, args);
 
       return result;
     },
     call_evaluate_javascript: async function () {
       const module = await func.common.get_module(SESSION_ID, 'xuda-event-javascript-module.mjs');
-      const result = await module.call_javascript(SESSION_ID, jobNoP, refIdP, dsSession, true);
+      const result = await module.call_javascript(SESSION_ID, jobNoP, refIdP, dsSession, true, $(containerP));
       await func.datasource.set_outputField(SESSION_ID, dsSessionP, result, args);
 
       return result;
@@ -36734,6 +36732,7 @@ func.events.execute = async function (
         null,
         null,
         evt,
+        $(containerP),
       );
       await func.datasource.set_outputField(SESSION_ID, dsSessionP, result, args);
 
@@ -36753,6 +36752,7 @@ func.events.execute = async function (
         null,
         null,
         evt,
+        $(containerP),
       );
       await func.datasource.set_outputField(SESSION_ID, dsSessionP, result, args);