@xuda.io/runtime-bundle 1.0.694 → 1.0.696

package/js/xuda-runtime-bundle.js

@@ -31441,7 +31441,7 @@ 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) {
   var found, refresh_reason, refresh_details;
-  const validate_change = function (prog_doc, panelXuAttributes) {
+  const validate_change = function (prog_doc, panelXuAttributes, skip_ui_check) {
     found = null;
     refresh_reason = null;
     refresh_details = null;
@@ -31482,14 +31482,15 @@ func.UI.screen.refresh_screen = async function (SESSION_ID, fields_changed_arr,
 
             break;
           }
+          if (!skip_ui_check) {
+            found = func.UI.find_field_in_progUi_attributes(prog_doc.progUi, parameter_in_field_id, 'xu-for').length;
 
-          found = func.UI.find_field_in_progUi_attributes(prog_doc.progUi, parameter_in_field_id, 'xu-for').length;
+            if (found) {
+              refresh_reason = `field ${field_id} in progUi xu-for parameter_in changed`;
+              refresh_details = found;
 
-          if (found) {
-            refresh_reason = `field ${field_id} in progUi xu-for parameter_in changed`;
-            refresh_details = found;
-
-            break;
+              break;
+            }
           }
         }
       }
@@ -31504,13 +31505,14 @@ func.UI.screen.refresh_screen = async function (SESSION_ID, fields_changed_arr,
 
         break;
       }
+      if (!skip_ui_check) {
+        found = func.UI.find_field_in_progUi_attributes(prog_doc.progUi, field_id, 'xu-for').length;
+        if (found) {
+          refresh_reason = `field ${field_id} in progUi xu-for changed`;
+          refresh_details = found;
 
-      found = func.UI.find_field_in_progUi_attributes(prog_doc.progUi, field_id, 'xu-for').length;
-      if (found) {
-        refresh_reason = `field ${field_id} in progUi xu-for changed`;
-        refresh_details = found;
-
-        break;
+          break;
+        }
       }
 
       if (found) {
@@ -31525,51 +31527,53 @@ func.UI.screen.refresh_screen = async function (SESSION_ID, fields_changed_arr,
     const _ds = _session.DS_GLB[fields_changed_datasource];
     const prog_doc = await func.utils.DOCS_OBJ.get(SESSION_ID, _ds.prog_id);
     if (prog_doc.progUi) {
-      validate_change(prog_doc);
+      validate_change(prog_doc, null, true);
       if (found) {
-        const $elm = $('#container_5b1_cmp_3700419d8179_0');
-        const elm_data = $elm.data();
-        const $wrapper = $elm.parent();
-        const wrapper_data = $wrapper.data();
-        const refreshed_ds = _ds.dsSession;
-
-        // let elm_to_delete = [];
-        // const ts = Date.now();
-        // $.each($elm.find('*'), function (key, val) {
-        //   let xu_ui_id = $(val).attr('xu-ui-id');
-        //   if (xu_ui_id) {
-        //     let new_id = xu_ui_id + ts;
-        //     elm_to_delete.push(new_id);
-
-        //     $(val).attr('xu-ui-id', new_id).removeData();
-        //   } else {
-        //     $(val).remove();
-        //   }
-        // });
+        const $elm = $(`#container_${_ds.prog_id}_0`);
+        if ($elm?.length) {
+          const elm_data = $elm.data();
+          const $wrapper = $elm.parent();
+          const wrapper_data = $wrapper.data();
+          const refreshed_ds = _ds.dsSession;
+
+          // let elm_to_delete = [];
+          // const ts = Date.now();
+          // $.each($elm.find('*'), function (key, val) {
+          //   let xu_ui_id = $(val).attr('xu-ui-id');
+          //   if (xu_ui_id) {
+          //     let new_id = xu_ui_id + ts;
+          //     elm_to_delete.push(new_id);
+
+          //     $(val).attr('xu-ui-id', new_id).removeData();
+          //   } else {
+          //     $(val).remove();
+          //   }
+          // });
 
-        $elm.empty();
-        if ($elm.data()) {
-          const new_$div = await func.UI.screen.render_ui_tree(
-            SESSION_ID,
-            $elm, // the wrapper
-            _.cloneDeep($elm.data().xuData.node), // the xu-panel node
-            {},
-            elm_data.xuData.paramsP, // the wrapper params
-            null,
-            null,
-            elm_data.xuData.key, // the wrapper key
-            refreshed_ds, // the refreshed_ds
-            elm_data.xuData.parent_node, // the wrapper parent node
-            null,
-            elm_data.xuData.$root_container, // the wrapper root container
-          );
+          $elm.empty();
+          if ($elm.data()) {
+            const new_$div = await func.UI.screen.render_ui_tree(
+              SESSION_ID,
+              $elm, // the wrapper
+              _.cloneDeep($elm.data().xuData.node), // the xu-panel node
+              {},
+              elm_data.xuData.paramsP, // the wrapper params
+              null,
+              null,
+              elm_data.xuData.key, // the wrapper key
+              refreshed_ds, // the refreshed_ds
+              elm_data.xuData.parent_node, // the wrapper parent node
+              null,
+              elm_data.xuData.$root_container, // the wrapper root container
+            );
 
-          // // remove old screen content
-          // $.each(elm_to_delete, async function (key, val) {
-          //   $("[xu-ui-id='" + elm_to_delete + "']").remove();
-          // });
+            // // remove old screen content
+            // $.each(elm_to_delete, async function (key, val) {
+            //   $("[xu-ui-id='" + elm_to_delete + "']").remove();
+            // });
 
-          return;
+            return;
+          }
         }
       }
     }