@xuda.io/runtime-bundle 1.0.428 → 1.0.429

package/js/xuda-runtime-slim.js

@@ -8635,28 +8635,34 @@ func.UI.utils.get_panels_wrapper_from_dom = async function (SESSION_ID, $xu_embe
   // set panels_obj
   for (const [elem_key, elem_val] of Object.entries($elm)) {
     if (elem_key === 'length') break;
-    var $div = $(elem_val);
+    var $panel_div = $(elem_val);
 
-    const panelXuAttributes = $div?.data().xuPanelWrapper?.panelXuAttributes;
+    const panelXuAttributes = $panel_div?.data().xuPanelWrapper?.panelXuAttributes;
 
     if (!panelXuAttributes) continue; // skip if no longer in dom
 
-    let prog_id = panelXuAttributes?.program;
-    const exp = panelXuAttributes?.['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);
-    }
+    // let prog_id = panelXuAttributes?.program;
+    // const exp = panelXuAttributes?.['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);
+    // }
     let prog_doc = await func.utils.DOCS_OBJ.get(SESSION_ID, prog_id);
     if (!ignore_disableAutoRefresh && prog_doc.properties.disableAutoRefresh) {
       continue;
     }
-    const xu_ui_id = $div.attr('xu-ui-id');
+    const xu_ui_id = $panel_div.attr('xu-ui-id');
+
     if (!panels_obj[xu_ui_id]) {
+      var _session = SESSION_OBJ[SESSION_ID];
+      let _ds = _session?.DS_GLB[$panel_div.data().xuData.dsSessionP];
       panels_obj[xu_ui_id] = {
-        prog_id,
+        // prog_id,
         panelXuAttributes,
         progUi: prog_doc.progUi,
+        prog_doc,
+        $panel_div,
+        _ds,
       };
     }
   }
@@ -11595,13 +11601,38 @@ func.UI.screen.refresh_xu_attributes = async function (SESSION_ID, fields_arr, j
               if (val?.includes(field_id)) {
                 const parent_element_ui_id = node_id;
 
-                const _$elem = $(`[xu-ui-id^=${parent_element_ui_id}]`);
+                let _$elem = $(`[xu-ui-id^=${parent_element_ui_id}]`);
 
-                if (refreshed_ids.includes(_$elem.attr('xu-ui-id'))) break;
-
-                if (!_$elem?.length) continue;
                 const _elem_key = parent_element_ui_id;
                 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) {
                   _elem_val.attributes.push(key);
@@ -11662,7 +11693,7 @@ func.UI.screen.refresh_xu_attributes = async function (SESSION_ID, fields_arr, j
       }
     }
     // run panels
-    for await (const [parent_element_ui_id, panel_val] of Object.entries(panels_obj)) {
+    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);
     }
@@ -11678,6 +11709,86 @@ func.UI.screen.refresh_xu_attributes = async function (SESSION_ID, fields_arr, j
 };
 
 func.UI.screen.refresh_screen = async function (SESSION_ID, fields_changed_arr, datasource_changed, fields_changed_datasource) {
+  const panels_obj = func.UI.utils.get_panels_wrapper_from_dom(SESSION_ID, $(SESSION_OBJ[SESSION_ID].root_element), false);
+
+  for await (const [parent_element_ui_id, panel_val] of Object.entries(panels_obj)) {
+    const progDataSource_str = JSON.stringify(panel_val.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?.panelXuAttributes || {};
+
+        // 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;
+
+        // 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 + "']");
+
+      // 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);
+
+        // remove old panel content
+        $.each(panel_val.ids, async function (key, val) {
+          $("[xu-ui-id='" + val + "']").remove();
+        });
+      } catch (error) {
+        debugger;
+      }
+      break;
+    }
+  }
+};
+
+func.UI.screen.refresh_screen_old = async function (SESSION_ID, fields_changed_arr, datasource_changed, fields_changed_datasource) {
   // const $elm = func.UI.utils.find_in_element_data('xuPanelData', $(SESSION_OBJ[SESSION_ID].root_element), 'parent_element_ui_id');
 
   const panels_obj = func.UI.utils.get_panels_from_dom(SESSION_ID, false);

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

@@ -8636,28 +8636,34 @@ func.UI.utils.get_panels_wrapper_from_dom = async function (SESSION_ID, $xu_embe
   // set panels_obj
   for (const [elem_key, elem_val] of Object.entries($elm)) {
     if (elem_key === 'length') break;
-    var $div = $(elem_val);
+    var $panel_div = $(elem_val);
 
-    const panelXuAttributes = $div?.data().xuPanelWrapper?.panelXuAttributes;
+    const panelXuAttributes = $panel_div?.data().xuPanelWrapper?.panelXuAttributes;
 
     if (!panelXuAttributes) continue; // skip if no longer in dom
 
-    let prog_id = panelXuAttributes?.program;
-    const exp = panelXuAttributes?.['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);
-    }
+    // let prog_id = panelXuAttributes?.program;
+    // const exp = panelXuAttributes?.['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);
+    // }
     let prog_doc = await func.utils.DOCS_OBJ.get(SESSION_ID, prog_id);
     if (!ignore_disableAutoRefresh && prog_doc.properties.disableAutoRefresh) {
       continue;
     }
-    const xu_ui_id = $div.attr('xu-ui-id');
+    const xu_ui_id = $panel_div.attr('xu-ui-id');
+
     if (!panels_obj[xu_ui_id]) {
+      var _session = SESSION_OBJ[SESSION_ID];
+      let _ds = _session?.DS_GLB[$panel_div.data().xuData.dsSessionP];
       panels_obj[xu_ui_id] = {
-        prog_id,
+        // prog_id,
         panelXuAttributes,
         progUi: prog_doc.progUi,
+        prog_doc,
+        $panel_div,
+        _ds,
       };
     }
   }
@@ -9668,13 +9674,38 @@ func.UI.screen.refresh_xu_attributes = async function (SESSION_ID, fields_arr, j
               if (val?.includes(field_id)) {
                 const parent_element_ui_id = node_id;
 
-                const _$elem = $(`[xu-ui-id^=${parent_element_ui_id}]`);
+                let _$elem = $(`[xu-ui-id^=${parent_element_ui_id}]`);
 
-                if (refreshed_ids.includes(_$elem.attr('xu-ui-id'))) break;
-
-                if (!_$elem?.length) continue;
                 const _elem_key = parent_element_ui_id;
                 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) {
                   _elem_val.attributes.push(key);
@@ -9735,7 +9766,7 @@ func.UI.screen.refresh_xu_attributes = async function (SESSION_ID, fields_arr, j
       }
     }
     // run panels
-    for await (const [parent_element_ui_id, panel_val] of Object.entries(panels_obj)) {
+    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);
     }
@@ -9751,6 +9782,86 @@ func.UI.screen.refresh_xu_attributes = async function (SESSION_ID, fields_arr, j
 };
 
 func.UI.screen.refresh_screen = async function (SESSION_ID, fields_changed_arr, datasource_changed, fields_changed_datasource) {
+  const panels_obj = func.UI.utils.get_panels_wrapper_from_dom(SESSION_ID, $(SESSION_OBJ[SESSION_ID].root_element), false);
+
+  for await (const [parent_element_ui_id, panel_val] of Object.entries(panels_obj)) {
+    const progDataSource_str = JSON.stringify(panel_val.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?.panelXuAttributes || {};
+
+        // 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;
+
+        // 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 + "']");
+
+      // 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);
+
+        // remove old panel content
+        $.each(panel_val.ids, async function (key, val) {
+          $("[xu-ui-id='" + val + "']").remove();
+        });
+      } catch (error) {
+        debugger;
+      }
+      break;
+    }
+  }
+};
+
+func.UI.screen.refresh_screen_old = async function (SESSION_ID, fields_changed_arr, datasource_changed, fields_changed_datasource) {
   // const $elm = func.UI.utils.find_in_element_data('xuPanelData', $(SESSION_OBJ[SESSION_ID].root_element), 'parent_element_ui_id');
 
   const panels_obj = func.UI.utils.get_panels_from_dom(SESSION_ID, false);