@xuda.io/runtime-bundle 1.0.607 → 1.0.609

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

@@ -8501,40 +8501,40 @@ func.UI.utils.init_ui_framework = async function (SESSION_ID, prog_id) {
   }
 };
 // old
-func.UI.utils.get_panels_from_dom = function (SESSION_ID, ignore_disableAutoRefresh) {
-  const $elm = func.UI.utils.find_in_element_data('xuPanelData', $(SESSION_OBJ[SESSION_ID].root_element), 'parent_element_ui_id');
-  var panels_obj = {};
+// func.UI.utils.get_panels_from_dom = function (SESSION_ID, ignore_disableAutoRefresh) {
+//   const $elm = func.UI.utils.find_in_element_data('xuPanelData', $(SESSION_OBJ[SESSION_ID].root_element), 'parent_element_ui_id');
+//   var panels_obj = {};
 
-  // set panels_obj
-  for (const [elem_key, elem_val] of Object.entries($elm)) {
-    if (elem_key === 'length') break;
-    var $div = $(elem_val);
-    let xuData = $div.data().xuData;
+//   // set panels_obj
+//   for (const [elem_key, elem_val] of Object.entries($elm)) {
+//     if (elem_key === 'length') break;
+//     var $div = $(elem_val);
+//     let xuData = $div.data().xuData;
 
-    if (!$div.data().xuPanelData) continue;
+//     if (!$div.data().xuPanelData) continue;
 
-    let dsSession = xuData.paramsP.dsSessionP;
-    var _session = SESSION_OBJ[SESSION_ID];
-    let _ds = _session?.DS_GLB[dsSession];
-    if (!_ds) continue;
+//     let dsSession = xuData.paramsP.dsSessionP;
+//     var _session = SESSION_OBJ[SESSION_ID];
+//     let _ds = _session?.DS_GLB[dsSession];
+//     if (!_ds) continue;
 
-    if (!ignore_disableAutoRefresh && _ds.tree_obj.disableAutoRefresh) {
-      continue;
-    }
+//     if (!ignore_disableAutoRefresh && _ds.tree_obj.disableAutoRefresh) {
+//       continue;
+//     }
 
-    const parent_element_ui_id = $div.data().xuPanelData.parent_element_ui_id;
-    if (!panels_obj[parent_element_ui_id]) {
-      panels_obj[parent_element_ui_id] = {
-        _ds,
-        $div,
-        ids: [],
-      };
-    }
-    panels_obj[parent_element_ui_id].ids.push($div.attr('xu-ui-id'));
-  }
+//     const parent_element_ui_id = $div.data().xuPanelData.parent_element_ui_id;
+//     if (!panels_obj[parent_element_ui_id]) {
+//       panels_obj[parent_element_ui_id] = {
+//         _ds,
+//         $div,
+//         ids: [],
+//       };
+//     }
+//     panels_obj[parent_element_ui_id].ids.push($div.attr('xu-ui-id'));
+//   }
 
-  return panels_obj;
-};
+//   return panels_obj;
+// };
 
 func.UI.utils.get_panels_wrapper_from_dom = async function (SESSION_ID, $xu_embed_container, ignore_disableAutoRefresh) {
   const $elm = func.UI.utils.find_in_element_data('xuPanelWrapper', $(SESSION_OBJ[SESSION_ID].root_element), 'isWrapper');
@@ -9612,7 +9612,7 @@ func.UI.screen.refresh_xu_attributes = async function (SESSION_ID, fields_arr, j
         elem_key: _elem_key,
         elem_val: _elem_val,
         fields_arr,
-        xu_for_item_id: elem_val?.$elm?.data().nodeid,
+        xu_for_item_id: elem_val?.$elm?.data().xuData.nodeid,
       };
       await func.UI.worker.add_to_queue(SESSION_ID, 'gui event', 'execute_xu_for', obj, new_job, _elem_val.$elm, _elem_val.$elm.data().xuData.paramsP.dsSessionP);
 
@@ -9641,31 +9641,6 @@ func.UI.screen.refresh_xu_attributes = async function (SESSION_ID, fields_arr, j
                 const _elem_val = { attributes: [], $elm: _$elem };
                 if (!_$elem?.length) continue;
 
-                // if (!_$elem?.length) {
-                //   // xu-for may exist in the panel root
-                //   if (!panel_wrapper_element_ui_id) continue;
-
-                //   $.each(item.attributes, function (key, val) {
-                //     _elem_val.attributes.push(key);
-                //   });
-                //   // _$elem = $(`[xu-ui-id="${panel_wrapper_element}"]`);
-                //   await func.UI.worker.add_to_queue(
-                //     SESSION_ID,
-                //     'gui event',
-                //     'execute_xu_for',
-                //     {
-                //       ui_type: _elem_val.$elm.data().xuData.ui_type,
-                //       SESSION_ID,
-                //       elem_key: _elem_key,
-                //       elem_val: _elem_val,
-                //       fields_arr,
-                //     },
-                //     new_job,
-                //     _elem_val.$elm,
-                //     _elem_val.$elm.data().xuData.paramsP.dsSessionP,
-                //   );
-                // }
-
                 if (refreshed_ids.includes(_$elem.attr('xu-ui-id'))) break;
 
                 $.each(_$elem.data()?.xuAttributes, function (key, val) {
@@ -9703,7 +9678,6 @@ func.UI.screen.refresh_xu_attributes = async function (SESSION_ID, fields_arr, j
 
   const $xu_embed_container = $('.xu_embed_container');
   const panels_obj = await func.UI.utils.get_panels_wrapper_from_dom(SESSION_ID, $xu_embed_container, true);
-  // let inviable_panels_obj = {};
 
   for await (const field_id of fields_arr) {
     // run root
@@ -9711,29 +9685,12 @@ func.UI.screen.refresh_xu_attributes = async function (SESSION_ID, fields_arr, j
       const progUi = $xu_embed_container?.data()?.xuData?.screenInfo?.progUi;
       if (progUi) {
         await iterate_field_in_progUi(progUi, field_id);
-        // // find invisible panels
-        // const inviable_panels_arr = func.UI.find_field_in_progUi_attributes(progUi, field_id, null, 'xu-panel');
-        // console.log('inviable_panels_arr', inviable_panels_arr);
-        // let prog_id = elm_node?.attributes?.program;
-        // const exp = elm_node?.attributes?.['xu-exp:program'];
-        // if (exp) {
-        //   let exp_ret = await func.expression.get(SESSION_ID, exp, $xu_embed_container?.data()?.xuData?.paramsP?.dsSessionP, 'UI Attr EXP');
-        //   prog_id = func.UI.screen.fix_val_defaults('program', exp_ret.result);
-        //   inviable_panels_obj[elm_node.id] = { prog_id };
-        // }
       }
     }
     // run panels
     for await (const [panel_wrapper_element_ui_id, panel_val] of Object.entries(panels_obj)) {
-      // const prog_doc = await func.utils.DOCS_OBJ.get(SESSION_ID, panel_val.prog_id);
       await iterate_field_in_progUi(panel_val.progUi, field_id);
     }
-
-    // // run invisible panels
-    // for await (const [parent_element_ui_id, panel_val] of Object.entries(inviable_panels_obj)) {
-    //   const prog_doc = await func.utils.DOCS_OBJ.get(SESSION_ID, panel_val.prog_id);
-    //   await iterate_field_in_progUi(prog_doc.progUi, field_id);
-    // }
   }
 
   func.events.delete_job(SESSION_ID, jobNoP);
@@ -9751,9 +9708,6 @@ func.UI.screen.refresh_screen = async function (SESSION_ID, fields_changed_arr,
 
     var found, refresh_reason, refresh_details;
     if (fields_changed_arr) {
-      // if (fields_changed_datasource && panel_val._ds.dsSession < fields_changed_datasource) {
-      //   continue;
-      // }
       if (fields_changed_datasource && panel_val._ds.dsSession <= Number(fields_changed_datasource)) {
         continue;
       }
@@ -9854,43 +9808,43 @@ func.UI.screen.refresh_screen = async function (SESSION_ID, fields_changed_arr,
       if (_.isEmpty(wrapper_data)) continue;
 
       try {
-        // const panelDivData = panel_val.$panel_div.data().xuPanelWrapper.panelDivData;
         const ts = Date.now();
         // remove old panel content
         $.each(panel_val.ids, async function (key, val) {
           $("[xu-ui-id='" + val + "']")
             .attr('xu-ui-id', val + ts)
             .removeData();
-          // .css('filter', 'blur(1px)');
         });
 
         let refreshed_ds;
         // check if ds exist and deleted by garbage collector
 
-        // const _session = SESSION_OBJ[SESSION_ID];
         if (_session.DS_GLB[panel_val._ds.dsSession]) {
           refreshed_ds = panel_val._ds.dsSession;
         }
+        for await (item of wrapper_data.xuData.node_org.children) {
+          if (item.tagName !== 'xu-render') continue;
 
-        const new_$div = await func.UI.screen.render_ui_tree(
-          SESSION_ID,
-          $div_elm, // the wrapper
-          _.cloneDeep(wrapper_data.xuData.node_org.children[0]), // the xu-panel node
-          {},
-          wrapper_data.xuData.paramsP, // the wrapper params
-          null,
-          null,
-          wrapper_data.xuData.key, // the wrapper key
-          refreshed_ds, // the refreshed_ds
-          wrapper_data.xuData.parent_node, // the wrapper parent node
-          null,
-          wrapper_data.xuData.$root_container, // the wrapper root container
-        );
+          const new_$div = await func.UI.screen.render_ui_tree(
+            SESSION_ID,
+            $div_elm, // the wrapper
+            _.cloneDeep(item), // _.cloneDeep(wrapper_data.xuData.node_org.children[0]), // the xu-panel node
+            {},
+            wrapper_data.xuData.paramsP, // the wrapper params
+            null,
+            null,
+            wrapper_data.xuData.key, // the wrapper key
+            refreshed_ds, // the refreshed_ds
+            wrapper_data.xuData.parent_node, // the wrapper parent node
+            null,
+            wrapper_data.xuData.$root_container, // the wrapper root container
+          );
 
-        // remove old panel content
-        $.each(panel_val.ids, async function (key, val) {
-          $("[xu-ui-id='" + val + ts + "']").remove();
-        });
+          // remove old panel content
+          $.each(panel_val.ids, async function (key, val) {
+            $("[xu-ui-id='" + val + ts + "']").remove();
+          });
+        }
       } catch (error) {
         debugger;
       }
@@ -9899,86 +9853,86 @@ func.UI.screen.refresh_screen = async function (SESSION_ID, fields_changed_arr,
   }
 };
 
-func.UI.screen.refresh_screen_old = async function (SESSION_ID, fields_changed_arr, datasource_changed, fields_changed_datasource) {
-  const panels_obj = func.UI.utils.get_panels_from_dom(SESSION_ID, false);
-
-  for await (const [parent_element_ui_id, panel_val] of Object.entries(panels_obj)) {
-    const prog_doc = await func.utils.DOCS_OBJ.get(SESSION_ID, panel_val._ds.prog_id);
-    const progDataSource_str = JSON.stringify(prog_doc.progDataSource);
-
-    var found;
-    if (fields_changed_arr) {
-      if (fields_changed_datasource && panel_val._ds.dsSession < fields_changed_datasource) {
-        continue;
-      }
-      for (const field_id of fields_changed_arr) {
-        // get panel attributes
-        const _attributes = panel_val?.$div?.data()?.xuPanelData?.node?.attributes || {};
-
-        // detect if program changed
-        found = _attributes['xu-exp:program']?.includes('@' + field_id);
-        if (found) break;
-
-        // _attributes holds also info of parameters in code_in: @code
-        // search field changed in panel call send parameters exp
-        for (const [attr, value] of Object.entries(_attributes)) {
-          const pattern = /xu-exp:(\w+)/;
-          const match = attr.match(pattern);
+// func.UI.screen.refresh_screen_old = async function (SESSION_ID, fields_changed_arr, datasource_changed, fields_changed_datasource) {
+//   const panels_obj = func.UI.utils.get_panels_from_dom(SESSION_ID, false);
 
-          if (!match) {
-            // continue if attribute is not expression
-            continue;
-          }
-          // code_in
-          const parameter_in_field_id = match?.[1];
-          // @code
-          if (value.includes(field_id)) {
-            // search parameter in field in the target program's progDataSource
-            found = progDataSource_str?.includes('@' + parameter_in_field_id);
-            if (found) break;
+//   for await (const [parent_element_ui_id, panel_val] of Object.entries(panels_obj)) {
+//     const prog_doc = await func.utils.DOCS_OBJ.get(SESSION_ID, panel_val._ds.prog_id);
+//     const progDataSource_str = JSON.stringify(prog_doc.progDataSource);
 
-            // found = find_field_in_progUi(prog_doc.progUi, parameter_in_field_id, 'xu-for');
-            found = func.UI.find_field_in_progUi_attributes(prog_doc.progUi, parameter_in_field_id, 'xu-for').length;
-            if (found) break;
-          }
-        }
+//     var found;
+//     if (fields_changed_arr) {
+//       if (fields_changed_datasource && panel_val._ds.dsSession < fields_changed_datasource) {
+//         continue;
+//       }
+//       for (const field_id of fields_changed_arr) {
+//         // get panel attributes
+//         const _attributes = panel_val?.$div?.data()?.xuPanelData?.node?.attributes || {};
+
+//         // detect if program changed
+//         found = _attributes['xu-exp:program']?.includes('@' + field_id);
+//         if (found) break;
+
+//         // _attributes holds also info of parameters in code_in: @code
+//         // search field changed in panel call send parameters exp
+//         for (const [attr, value] of Object.entries(_attributes)) {
+//           const pattern = /xu-exp:(\w+)/;
+//           const match = attr.match(pattern);
+
+//           if (!match) {
+//             // continue if attribute is not expression
+//             continue;
+//           }
+//           // code_in
+//           const parameter_in_field_id = match?.[1];
+//           // @code
+//           if (value.includes(field_id)) {
+//             // search parameter in field in the target program's progDataSource
+//             found = progDataSource_str?.includes('@' + parameter_in_field_id);
+//             if (found) break;
+
+//             // found = find_field_in_progUi(prog_doc.progUi, parameter_in_field_id, 'xu-for');
+//             found = func.UI.find_field_in_progUi_attributes(prog_doc.progUi, parameter_in_field_id, 'xu-for').length;
+//             if (found) break;
+//           }
+//         }
 
-        if (found) break;
+//         if (found) break;
 
-        // search field changed in the target program's progDataSource  // @code
-        found = progDataSource_str?.includes('@' + field_id);
-        if (found) break;
-      }
-    }
+//         // search field changed in the target program's progDataSource  // @code
+//         found = progDataSource_str?.includes('@' + field_id);
+//         if (found) break;
+//       }
+//     }
 
-    if (datasource_changed) {
-      if (panel_val._ds.dsSession == datasource_changed) {
-        found = true;
-      }
-    }
-    if (found) {
-      var $div_elm = panel_val.$div
-        .parent()
-        .parent()
-        .find("[xu-ui-id='" + parent_element_ui_id + "']");
+//     if (datasource_changed) {
+//       if (panel_val._ds.dsSession == datasource_changed) {
+//         found = true;
+//       }
+//     }
+//     if (found) {
+//       var $div_elm = panel_val.$div
+//         .parent()
+//         .parent()
+//         .find("[xu-ui-id='" + parent_element_ui_id + "']");
 
-      // restore original panel
-      try {
-        // const $org_panel = panel_val.$div.data().xuPanelData.$panel_div;
+//       // restore original panel
+//       try {
+//         // const $org_panel = panel_val.$div.data().xuPanelData.$panel_div;
 
-        const new_$div = await func.UI.screen.render_ui_tree(SESSION_ID, $div_elm, _.cloneDeep(panel_val.$div.data().xuPanelData.node), {}, $div_elm.data().xuData.paramsP, null, null, $div_elm.data().xuData.key, null, $div_elm.data().xuData.parent_node, null, $div_elm.data().xuData.$root_container);
+//         const new_$div = await func.UI.screen.render_ui_tree(SESSION_ID, $div_elm, _.cloneDeep(panel_val.$div.data().xuPanelData.node), {}, $div_elm.data().xuData.paramsP, null, null, $div_elm.data().xuData.key, null, $div_elm.data().xuData.parent_node, null, $div_elm.data().xuData.$root_container);
 
-        // remove old panel content
-        $.each(panel_val.ids, async function (key, val) {
-          $("[xu-ui-id='" + val + "']").remove();
-        });
-      } catch (error) {
-        debugger;
-      }
-      break;
-    }
-  }
-};
+//         // remove old panel content
+//         $.each(panel_val.ids, async function (key, val) {
+//           $("[xu-ui-id='" + val + "']").remove();
+//         });
+//       } catch (error) {
+//         debugger;
+//       }
+//       break;
+//     }
+//   }
+// };
 
 // const get_params_obj = async function (SESSION_ID, prog_id, parameters_obj_inP) {
 //   const _prog = await func.utils.VIEWS_OBJ.get(SESSION_ID, prog_id);