@xuda.io/runtime-bundle 1.0.521 → 1.0.523

package/js/xuda-runtime-slim.js

@@ -5326,7 +5326,7 @@ func.datasource.update = async function (SESSION_ID, datasource_changes, update_
     let client_datasource_changes = {};
     let server_datasource_changes = {};
 
-    const update_xu_ref = function (dataSource, field_id) {
+    const update_xu_ref = function (dataSource) {
       let ret;
       let _ds_0 = _session.DS_GLB[0];
       for ([ref_name, val] of Object.entries(_ds_0.data_system['SYS_GLOBAL_OBJ_REFS'])) {
@@ -5351,7 +5351,7 @@ func.datasource.update = async function (SESSION_ID, datasource_changes, update_
           // mechanism to make update directly on the datasource object
           if (record_id === 'datasource_main') {
             _.set(_ds, field_id, value);
-            const ret = update_xu_ref(dataSource, field_id);
+            const ret = update_xu_ref(dataSource);
             if (ret) {
               fields_changed.push(field_id);
               datasource_changed.push(dataSource);
@@ -5372,7 +5372,7 @@ func.datasource.update = async function (SESSION_ID, datasource_changes, update_
               await set_fieldComputed_dependencies(dataSource, field_id, null);
 
               // search the field in refs
-              update_xu_ref(dataSource, field_id);
+              update_xu_ref(dataSource);
 
               if (!update_local_scope_only) {
                 let tree_ret = await func.utils.TREE_OBJ.get(SESSION_ID, _ds.prog_id);
@@ -12389,12 +12389,19 @@ func.UI.screen.refresh_screen = async function (SESSION_ID, fields_changed_arr,
 
       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 + "']").remove();
+          $("[xu-ui-id='" + val + "']").attr('xu-ui-id', val + ts);
         });
 
+        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;
+        }
+
         const new_$div = await func.UI.screen.render_ui_tree(
           SESSION_ID,
           $div_elm, // the wrapper
@@ -12404,11 +12411,16 @@ func.UI.screen.refresh_screen = async function (SESSION_ID, fields_changed_arr,
           null,
           null,
           wrapper_data.xuData.key, // the wrapper key
-          panel_val._ds.dsSession, // the refreshed_ds
+          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();
+        });
       } catch (error) {
         debugger;
       }

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

@@ -5327,7 +5327,7 @@ func.datasource.update = async function (SESSION_ID, datasource_changes, update_
     let client_datasource_changes = {};
     let server_datasource_changes = {};
 
-    const update_xu_ref = function (dataSource, field_id) {
+    const update_xu_ref = function (dataSource) {
       let ret;
       let _ds_0 = _session.DS_GLB[0];
       for ([ref_name, val] of Object.entries(_ds_0.data_system['SYS_GLOBAL_OBJ_REFS'])) {
@@ -5352,7 +5352,7 @@ func.datasource.update = async function (SESSION_ID, datasource_changes, update_
           // mechanism to make update directly on the datasource object
           if (record_id === 'datasource_main') {
             _.set(_ds, field_id, value);
-            const ret = update_xu_ref(dataSource, field_id);
+            const ret = update_xu_ref(dataSource);
             if (ret) {
               fields_changed.push(field_id);
               datasource_changed.push(dataSource);
@@ -5373,7 +5373,7 @@ func.datasource.update = async function (SESSION_ID, datasource_changes, update_
               await set_fieldComputed_dependencies(dataSource, field_id, null);
 
               // search the field in refs
-              update_xu_ref(dataSource, field_id);
+              update_xu_ref(dataSource);
 
               if (!update_local_scope_only) {
                 let tree_ret = await func.utils.TREE_OBJ.get(SESSION_ID, _ds.prog_id);
@@ -10121,12 +10121,19 @@ func.UI.screen.refresh_screen = async function (SESSION_ID, fields_changed_arr,
 
       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 + "']").remove();
+          $("[xu-ui-id='" + val + "']").attr('xu-ui-id', val + ts);
         });
 
+        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;
+        }
+
         const new_$div = await func.UI.screen.render_ui_tree(
           SESSION_ID,
           $div_elm, // the wrapper
@@ -10136,11 +10143,16 @@ func.UI.screen.refresh_screen = async function (SESSION_ID, fields_changed_arr,
           null,
           null,
           wrapper_data.xuData.key, // the wrapper key
-          panel_val._ds.dsSession, // the refreshed_ds
+          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();
+        });
       } catch (error) {
         debugger;
       }