@xuda.io/runtime-bundle 1.0.1413 → 1.0.1414

package/js/xuda-runtime-slim.js

@@ -2187,7 +2187,7 @@ func.runtime.bind.build_datasource_changes = function (dsSessionP, currentRecord
     },
   };
 };
-func.runtime.bind.resolve_field = async function (SESSION_ID, prog_id, dsSessionP, field_id) {
+func.runtime.bind.resolve_field = async function (SESSION_ID, prog_id, dsSessionP, field_id, iterate_info) {
   let _prog_id = prog_id;
   let _dsP = dsSessionP;
   let is_dynamic_field = false;
@@ -2203,7 +2203,20 @@ func.runtime.bind.resolve_field = async function (SESSION_ID, prog_id, dsSession
 
   if (['_FOR_VAL', '_FOR_KEY'].includes(field_id)) {
     is_dynamic_field = true;
-    field_prop = SESSION_OBJ[SESSION_ID]?.DS_GLB?.[_dsP]?.dynamic_fields?.[field_id];
+    if (iterate_info && (iterate_info.iterator_val === field_id || iterate_info.iterator_key === field_id)) {
+      const iter_value = iterate_info.iterator_val === field_id ? iterate_info._val : iterate_info._key;
+      const toType = function (obj) {
+        return {}.toString.call(obj).match(/\s([a-zA-Z]+)/)[1].toLowerCase();
+      };
+      field_prop = {
+        id: field_id,
+        data: { type: 'virtual', field_id },
+        props: { fieldType: typeof iter_value !== 'undefined' ? toType(iter_value) : 'string' },
+        value: iter_value,
+      };
+    } else {
+      field_prop = SESSION_OBJ[SESSION_ID]?.DS_GLB?.[_dsP]?.dynamic_fields?.[field_id];
+    }
   } else {
     field_prop = await find_in_view(field_id, _prog_id);
     if (!field_prop) {
@@ -2287,7 +2300,7 @@ func.runtime.bind.update_reference_source_array = async function (options) {
   if (field_type === 'object' && options.val_is_reference_field) {
     let obj_item = new_arr[arr_idx];
     let e_exp = options.expression_value.replace(options.bind_field_id, 'obj_item');
-    eval(e_exp + (options.input_field_type === 'string' ? `="${options.value}"` : `=${options.value}`));
+    eval(e_exp + `=${JSON.stringify(options.value)}`);
     new_arr[arr_idx] = obj_item;
   } else {
     new_arr[arr_idx] = options.value;
@@ -11214,7 +11227,6 @@ func.UI.worker.execute = async function (SESSION_ID, queue_obj) {
       const perf_end = func.runtime?.perf?.start?.(SESSION_ID, 'execute_xu_render_attributes');
       const live_context = fx.get_live_element_context(queue_obj.paramsP?.elem_key, queue_obj.elementP || queue_obj.paramsP?.elem_val?.$elm, queue_obj.paramsP);
       const _data = live_context.data;
-      console.log('[xu-render EXEC]', { attr_value: queue_obj.paramsP.attr_value, has_data: !!_data?.xuData?.paramsP, elem_key: queue_obj.paramsP?.elem_key, tagName: live_context.$elm?.[0]?.tagName, elm_length: live_context.$elm?.length });
       try {
         if (_data?.xuData?.paramsP) {
           const live_xu_data = _data.xuData;
@@ -12154,7 +12166,7 @@ func.runtime.ui.init_screen = async function (options) {
     $rootFrame.css('display', 'contents');
   }
 
-  func.UI.utils.indicator.screen.busy();
+  if (!is_panelP) func.UI.utils.indicator.screen.busy();
 
   const ret = await func.datasource.create(
     SESSION_ID,
@@ -12170,7 +12182,7 @@ func.runtime.ui.init_screen = async function (options) {
     null,
     null,
     null,
-    null,
+    is_panelP,
     parameters_obj_inP,
   );
 
@@ -12197,7 +12209,7 @@ func.runtime.ui.init_screen = async function (options) {
   if (!node.length) return console.warn('ui node empty');
   const ret_render_$container = await func.runtime.render.render_ui_tree(SESSION_ID, $rootFrame, node[0], null, params, jobNoP, null, null, null, null, null, $rootFrame);
 
-  func.UI.utils.indicator.screen.normal();
+  if (!is_panelP) func.UI.utils.indicator.screen.normal();
 
   return await func.runtime.ui.screen_loading_done({
     SESSION_ID,
@@ -12722,6 +12734,7 @@ func.runtime.render = func.runtime.render || {};
 // Browser-only panel rendering helpers live here so generic view rendering can stay focused.
 
 func.runtime.ui.render_panel_node = async function (options) {
+
   const $wrapper = $('<div>');
   const $div = await func.runtime.ui.create_container({
     SESSION_ID: options.SESSION_ID,
@@ -13295,7 +13308,7 @@ func.runtime.ui.normalize_refresh_field_reference = function (field_ref) {
 
   return [...normalized].filter(Boolean);
 };
-func.runtime.ui.extract_expression_refresh_fields = function (elm_data, expression_text, without_var) {
+func.runtime.ui.extract_expression_refresh_fields = function (elm_data, expression_text, without_var, _visited) {
   const fields = new Set();
   if (!expression_text) {
     return fields;
@@ -13326,8 +13339,12 @@ func.runtime.ui.extract_expression_refresh_fields = function (elm_data, expressi
 
   const parameters_raw_obj = elm_data?.xuData?.paramsP?.parameters_raw_obj || {};
   const parameter_keys = Object.keys(parameters_raw_obj);
+  const visited = _visited || new Set();
   for (let index = 0; index < parameter_keys.length; index++) {
     const param_key = parameter_keys[index];
+    if (visited.has(param_key)) {
+      continue;
+    }
     const param_val = parameters_raw_obj[param_key];
     if (!param_val?.includes?.('@')) {
       continue;
@@ -13336,7 +13353,8 @@ func.runtime.ui.extract_expression_refresh_fields = function (elm_data, expressi
     if (!text.includes(param_token)) {
       continue;
     }
-    const nested_fields = func.runtime.ui.extract_expression_refresh_fields(elm_data, param_val, false);
+    visited.add(param_key);
+    const nested_fields = func.runtime.ui.extract_expression_refresh_fields(elm_data, param_val, false, visited);
     nested_fields.forEach(function (field_id) {
       add_field(field_id);
     });
@@ -16987,7 +17005,7 @@ func.runtime.render.handle_xu_bind = async function (options) {
   };
 
   try {
-    const bind_field = await func.runtime.bind.resolve_field(options.SESSION_ID, _prog_id, _dsP, bind_expression.split('.')[0]);
+    const bind_field = await func.runtime.bind.resolve_field(options.SESSION_ID, _prog_id, _dsP, bind_expression.split('.')[0], xuData.iterate_info);
     bind_field_id = bind_field.bind_field_id;
     field_prop = bind_field.field_prop;
     is_dynamic_field = bind_field.is_dynamic_field;
@@ -17063,11 +17081,16 @@ func.runtime.render.handle_xu_bind = async function (options) {
     let value;
     try {
       if (val_is_reference_field) {
-        const resolved_value = await func.datasource.get_value(options.SESSION_ID, bind_field_id, _dsP, target_record_id);
-        if (resolved_value?.found) {
-          value = resolved_value.ret.value;
+        const iter = xuData.iterate_info;
+        if (iter && is_dynamic_field && (iter.iterator_val === bind_field_id || iter.iterator_key === bind_field_id)) {
+          value = iter.iterator_val === bind_field_id ? iter._val : iter._key;
         } else {
-          value = func.runtime.bind.get_source_value(_ds, bind_field_id, is_dynamic_field);
+          const resolved_value = await func.datasource.get_value(options.SESSION_ID, bind_field_id, _dsP, target_record_id);
+          if (resolved_value?.found) {
+            value = resolved_value.ret.value;
+          } else {
+            value = func.runtime.bind.get_source_value(_ds, bind_field_id, is_dynamic_field);
+          }
         }
         value = func.runtime.bind.format_display_value($elm, field_prop, bind_field_id, bind_expression, value, input_field_type);
       } else {
@@ -17421,7 +17444,11 @@ func.runtime.render.handle_modern_xu_render = async function (options) {
   };
 
   const post_render = async function () {
-    const nodeP = func.runtime.ui.get_data(options.$container).xuData.node.children[options.keyP];
+    const container_data = func.runtime.ui.get_data(options.$container);
+    if (!container_data?.xuData?.node?.children?.[options.keyP]) {
+      return;
+    }
+    const nodeP = container_data.xuData.node.children[options.keyP];
     nodeP.xu_render_made = value;
     if (value) {
       try {
@@ -17472,7 +17499,6 @@ func.runtime.render.handle_modern_xu_render = async function (options) {
           func.runtime.ui.remove(options.$elm);
         }
       } catch (error) {
-        console.error('[xu-render post_render ERROR]', error, { keyP: options.keyP, container_tag: options.$container?.[0]?.tagName, has_node: !!nodeP, xu_ui_id: func.runtime.ui.get_attr(options.$elm, 'xu-ui-id') });
         func.events.delete_job(options.SESSION_ID, options.jobNoP);
       }
       return;

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

@@ -2188,7 +2188,7 @@ func.runtime.bind.build_datasource_changes = function (dsSessionP, currentRecord
     },
   };
 };
-func.runtime.bind.resolve_field = async function (SESSION_ID, prog_id, dsSessionP, field_id) {
+func.runtime.bind.resolve_field = async function (SESSION_ID, prog_id, dsSessionP, field_id, iterate_info) {
   let _prog_id = prog_id;
   let _dsP = dsSessionP;
   let is_dynamic_field = false;
@@ -2204,7 +2204,20 @@ func.runtime.bind.resolve_field = async function (SESSION_ID, prog_id, dsSession
 
   if (['_FOR_VAL', '_FOR_KEY'].includes(field_id)) {
     is_dynamic_field = true;
-    field_prop = SESSION_OBJ[SESSION_ID]?.DS_GLB?.[_dsP]?.dynamic_fields?.[field_id];
+    if (iterate_info && (iterate_info.iterator_val === field_id || iterate_info.iterator_key === field_id)) {
+      const iter_value = iterate_info.iterator_val === field_id ? iterate_info._val : iterate_info._key;
+      const toType = function (obj) {
+        return {}.toString.call(obj).match(/\s([a-zA-Z]+)/)[1].toLowerCase();
+      };
+      field_prop = {
+        id: field_id,
+        data: { type: 'virtual', field_id },
+        props: { fieldType: typeof iter_value !== 'undefined' ? toType(iter_value) : 'string' },
+        value: iter_value,
+      };
+    } else {
+      field_prop = SESSION_OBJ[SESSION_ID]?.DS_GLB?.[_dsP]?.dynamic_fields?.[field_id];
+    }
   } else {
     field_prop = await find_in_view(field_id, _prog_id);
     if (!field_prop) {
@@ -2288,7 +2301,7 @@ func.runtime.bind.update_reference_source_array = async function (options) {
   if (field_type === 'object' && options.val_is_reference_field) {
     let obj_item = new_arr[arr_idx];
     let e_exp = options.expression_value.replace(options.bind_field_id, 'obj_item');
-    eval(e_exp + (options.input_field_type === 'string' ? `="${options.value}"` : `=${options.value}`));
+    eval(e_exp + `=${JSON.stringify(options.value)}`);
     new_arr[arr_idx] = obj_item;
   } else {
     new_arr[arr_idx] = options.value;
@@ -11215,7 +11228,6 @@ func.UI.worker.execute = async function (SESSION_ID, queue_obj) {
       const perf_end = func.runtime?.perf?.start?.(SESSION_ID, 'execute_xu_render_attributes');
       const live_context = fx.get_live_element_context(queue_obj.paramsP?.elem_key, queue_obj.elementP || queue_obj.paramsP?.elem_val?.$elm, queue_obj.paramsP);
       const _data = live_context.data;
-      console.log('[xu-render EXEC]', { attr_value: queue_obj.paramsP.attr_value, has_data: !!_data?.xuData?.paramsP, elem_key: queue_obj.paramsP?.elem_key, tagName: live_context.$elm?.[0]?.tagName, elm_length: live_context.$elm?.length });
       try {
         if (_data?.xuData?.paramsP) {
           const live_xu_data = _data.xuData;
@@ -12155,7 +12167,7 @@ func.runtime.ui.init_screen = async function (options) {
     $rootFrame.css('display', 'contents');
   }
 
-  func.UI.utils.indicator.screen.busy();
+  if (!is_panelP) func.UI.utils.indicator.screen.busy();
 
   const ret = await func.datasource.create(
     SESSION_ID,
@@ -12171,7 +12183,7 @@ func.runtime.ui.init_screen = async function (options) {
     null,
     null,
     null,
-    null,
+    is_panelP,
     parameters_obj_inP,
   );
 
@@ -12198,7 +12210,7 @@ func.runtime.ui.init_screen = async function (options) {
   if (!node.length) return console.warn('ui node empty');
   const ret_render_$container = await func.runtime.render.render_ui_tree(SESSION_ID, $rootFrame, node[0], null, params, jobNoP, null, null, null, null, null, $rootFrame);
 
-  func.UI.utils.indicator.screen.normal();
+  if (!is_panelP) func.UI.utils.indicator.screen.normal();
 
   return await func.runtime.ui.screen_loading_done({
     SESSION_ID,
@@ -12723,6 +12735,7 @@ func.runtime.render = func.runtime.render || {};
 // Browser-only panel rendering helpers live here so generic view rendering can stay focused.
 
 func.runtime.ui.render_panel_node = async function (options) {
+
   const $wrapper = $('<div>');
   const $div = await func.runtime.ui.create_container({
     SESSION_ID: options.SESSION_ID,
@@ -13296,7 +13309,7 @@ func.runtime.ui.normalize_refresh_field_reference = function (field_ref) {
 
   return [...normalized].filter(Boolean);
 };
-func.runtime.ui.extract_expression_refresh_fields = function (elm_data, expression_text, without_var) {
+func.runtime.ui.extract_expression_refresh_fields = function (elm_data, expression_text, without_var, _visited) {
   const fields = new Set();
   if (!expression_text) {
     return fields;
@@ -13327,8 +13340,12 @@ func.runtime.ui.extract_expression_refresh_fields = function (elm_data, expressi
 
   const parameters_raw_obj = elm_data?.xuData?.paramsP?.parameters_raw_obj || {};
   const parameter_keys = Object.keys(parameters_raw_obj);
+  const visited = _visited || new Set();
   for (let index = 0; index < parameter_keys.length; index++) {
     const param_key = parameter_keys[index];
+    if (visited.has(param_key)) {
+      continue;
+    }
     const param_val = parameters_raw_obj[param_key];
     if (!param_val?.includes?.('@')) {
       continue;
@@ -13337,7 +13354,8 @@ func.runtime.ui.extract_expression_refresh_fields = function (elm_data, expressi
     if (!text.includes(param_token)) {
       continue;
     }
-    const nested_fields = func.runtime.ui.extract_expression_refresh_fields(elm_data, param_val, false);
+    visited.add(param_key);
+    const nested_fields = func.runtime.ui.extract_expression_refresh_fields(elm_data, param_val, false, visited);
     nested_fields.forEach(function (field_id) {
       add_field(field_id);
     });
@@ -16988,7 +17006,7 @@ func.runtime.render.handle_xu_bind = async function (options) {
   };
 
   try {
-    const bind_field = await func.runtime.bind.resolve_field(options.SESSION_ID, _prog_id, _dsP, bind_expression.split('.')[0]);
+    const bind_field = await func.runtime.bind.resolve_field(options.SESSION_ID, _prog_id, _dsP, bind_expression.split('.')[0], xuData.iterate_info);
     bind_field_id = bind_field.bind_field_id;
     field_prop = bind_field.field_prop;
     is_dynamic_field = bind_field.is_dynamic_field;
@@ -17064,11 +17082,16 @@ func.runtime.render.handle_xu_bind = async function (options) {
     let value;
     try {
       if (val_is_reference_field) {
-        const resolved_value = await func.datasource.get_value(options.SESSION_ID, bind_field_id, _dsP, target_record_id);
-        if (resolved_value?.found) {
-          value = resolved_value.ret.value;
+        const iter = xuData.iterate_info;
+        if (iter && is_dynamic_field && (iter.iterator_val === bind_field_id || iter.iterator_key === bind_field_id)) {
+          value = iter.iterator_val === bind_field_id ? iter._val : iter._key;
         } else {
-          value = func.runtime.bind.get_source_value(_ds, bind_field_id, is_dynamic_field);
+          const resolved_value = await func.datasource.get_value(options.SESSION_ID, bind_field_id, _dsP, target_record_id);
+          if (resolved_value?.found) {
+            value = resolved_value.ret.value;
+          } else {
+            value = func.runtime.bind.get_source_value(_ds, bind_field_id, is_dynamic_field);
+          }
         }
         value = func.runtime.bind.format_display_value($elm, field_prop, bind_field_id, bind_expression, value, input_field_type);
       } else {
@@ -17422,7 +17445,11 @@ func.runtime.render.handle_modern_xu_render = async function (options) {
   };
 
   const post_render = async function () {
-    const nodeP = func.runtime.ui.get_data(options.$container).xuData.node.children[options.keyP];
+    const container_data = func.runtime.ui.get_data(options.$container);
+    if (!container_data?.xuData?.node?.children?.[options.keyP]) {
+      return;
+    }
+    const nodeP = container_data.xuData.node.children[options.keyP];
     nodeP.xu_render_made = value;
     if (value) {
       try {
@@ -17473,7 +17500,6 @@ func.runtime.render.handle_modern_xu_render = async function (options) {
           func.runtime.ui.remove(options.$elm);
         }
       } catch (error) {
-        console.error('[xu-render post_render ERROR]', error, { keyP: options.keyP, container_tag: options.$container?.[0]?.tagName, has_node: !!nodeP, xu_ui_id: func.runtime.ui.get_attr(options.$elm, 'xu-ui-id') });
         func.events.delete_job(options.SESSION_ID, options.jobNoP);
       }
       return;