@xuda.io/runtime-bundle 1.0.1253 → 1.0.1255

package/js/xuda-runtime-bundle.js

@@ -36370,7 +36370,7 @@ func.UI.screen.render_ui_tree = async function (SESSION_ID, $container, nodeP, p
   };
 
   const render_screen_type = async function ($div) {
-    const set_call_screen_properties_values = async function (ui_framework) {
+    const set_call_screen_properties_values = async function (ui_framework, params) {
       params.properties = {};
 
       const get_values = async function (property) {
@@ -36409,7 +36409,6 @@ func.UI.screen.render_ui_tree = async function (SESSION_ID, $container, nodeP, p
 
     let $ret = $div;
     const $nav = $(SESSION_OBJ[SESSION_ID].root_element).find('xu-nav');
-    let params;
 
     switch (paramsP.screen_type) {
       case 'modal':
@@ -36423,7 +36422,7 @@ func.UI.screen.render_ui_tree = async function (SESSION_ID, $container, nodeP, p
 
         let controller_params = $(xu_modal_controller).data('xuControllerParams') || {};
 
-        params = {
+        const modalParams = {
           screenId: paramsP.screenId,
           $dialogDiv: $div.children(),
           $container: $container,
@@ -36434,40 +36433,40 @@ func.UI.screen.render_ui_tree = async function (SESSION_ID, $container, nodeP, p
           paramsP,
         };
 
-        controller_params[modal_id] = params;
+        controller_params[modal_id] = modalParams;
         $(xu_modal_controller).data('xuControllerParams', controller_params);
 
         const modalController = new UI_FRAMEWORK_PLUGIN.modal();
-        await set_call_screen_properties_values(modalController);
+        await set_call_screen_properties_values(modalController, modalParams);
 
         if (!APP_MODAL_OBJ[modal_id]) {
-          APP_MODAL_OBJ[modal_id] = await modalController.create(params);
+          APP_MODAL_OBJ[modal_id] = await modalController.create(modalParams);
         } else {
           $(modal_id).empty();
         }
-        await modalController.init(params);
+        await modalController.init(modalParams);
         break;
 
       case 'popover':
         const xu_popover_controller = func.UI.component.create_app_popover_component(SESSION_ID);
-        params = {
+        const popoverParams = {
           menuTitle: paramsP.screenInfo.properties?.menuTitle,
           screenId: paramsP.screenId,
           $dialogDiv: $div.children(),
           $container: $container,
         };
 
-        $(xu_popover_controller).data('xuControllerParams', params);
+        $(xu_popover_controller).data('xuControllerParams', popoverParams);
         const popover = new UI_FRAMEWORK_PLUGIN.popover(SESSION_ID);
-        await set_call_screen_properties_values(popover);
-        await popover.open(params);
+        await set_call_screen_properties_values(popover, popoverParams);
+        await popover.open(popoverParams);
         CURRENT_APP_POPOVER = popover;
         func.UI.utils.screen_blocker(false, `${paramsP.prog_id}_${paramsP.sourceScreenP}`);
         break;
 
       case 'page':
         const nav = $nav[0];
-        params = {
+        const pageParams = {
           div: $div_content,
           name: paramsP.screenInfo.properties?.menuTitle,
           screenId: paramsP.screenId,
@@ -36487,19 +36486,19 @@ func.UI.screen.render_ui_tree = async function (SESSION_ID, $container, nodeP, p
 
         // Restore validate
         if (navXuData.params?.[paramsP.dsSessionP]) {
-          params.$container.data().xuData.validate_screen_ready = navXuData.params[paramsP.dsSessionP].$container.data().xuData.validate_screen_ready;
+          pageParams.$container.data().xuData.validate_screen_ready = navXuData.params[paramsP.dsSessionP].$container.data().xuData.validate_screen_ready;
         }
 
         if (!navXuData) return;
-        navXuData.nav_params[paramsP.dsSessionP] = params;
+        navXuData.nav_params[paramsP.dsSessionP] = pageParams;
 
         if (!$(component_name).length) {
           await func.UI.component.create_app_page_component(SESSION_ID, paramsP.dsSessionP);
           const page = new UI_FRAMEWORK_PLUGIN.page();
-          await set_call_screen_properties_values(page);
-          await page.create(params);
-          await page.init(params);
-          nav.push(component_name, { params });
+          await set_call_screen_properties_values(page, pageParams);
+          await page.create(pageParams);
+          await page.init(pageParams);
+          nav.push(component_name, { params: pageParams });
         } else {
           $(component_name).empty();
           await UI_FRAMEWORK_PLUGIN.page(SESSION_ID, paramsP.dsSessionP);
@@ -36513,14 +36512,22 @@ func.UI.screen.render_ui_tree = async function (SESSION_ID, $container, nodeP, p
         break;
 
       default:
-        if (!$nav?.length) {
-          $nav = $('<xu-nav>');
-          $container.append($nav);
-          func.UI.component.init_xu_nav($container, $nav);
+        let $activeNav = $nav;
+        if (!$activeNav?.length) {
+          $activeNav = $('<xu-nav>');
+          $container.append($activeNav);
+          func.UI.component.init_xu_nav($container, $activeNav);
         }
 
-        $nav.data().xuData.$div = $div_content;
-        await $nav[0].setRoot(`xu-root-component-${SESSION_ID}`);
+        const navData = $activeNav.data().xuData;
+        if (navData) {
+          navData.$div = $div_content;
+        }
+
+        const navElement = $activeNav[0];
+        if (navElement && navElement.setRoot) {
+          await navElement.setRoot(`xu-root-component-${SESSION_ID}`);
+        }
         $ret = $container;
         break;
     }