@xuda.io/runtime-bundle 1.0.701 → 1.0.703

package/js/xuda-runtime-slim.js

@@ -2899,7 +2899,7 @@ func.datasource.create = async function (
   rowIdP,
   jobNoP,
   calling_trigger_prop,
-  screen_param,
+  parameters_raw_obj,
   NA_isInitP,
   NA_callingSourceP,
   calling_jobP,
@@ -2932,6 +2932,7 @@ func.datasource.create = async function (
       parameters_obj_inP,
       static_refreshP,
       worker_id,
+      parameters_raw_obj,
     };
 
     var IS_DATASOURCE_REFRESH = null;
@@ -9373,7 +9374,7 @@ func.events.execute = async function (
     var params_obj = {};
     if (_prog?.properties?.progParams) {
       for await (const [key, val] of Object.entries(_prog.properties.progParams)) {
-        if (!val.data.dir === 'in') continue;
+        if (val.data.dir !== 'in') continue;
         if (typeof args.parameters_obj_inP?.[val.data.parameter] !== 'undefined') {
           if (args.parameters_obj_inP?.[val.data.parameter].fx) {
             let ret = await func.expression.get(SESSION_ID, args.parameters_obj_inP?.[val.data.parameter].fx, dsSession, 'parameters');
@@ -11161,7 +11162,7 @@ func.expression.secure_eval = async function (SESSION_ID, sourceP, val, job_id,
   }
 };
  func.UI.screen = {};
-func.UI.screen.init = async function (SESSION_ID, prog_id, sourceScreenP, callingDataSource_objP, $callingContainerP, triggerIdP, rowIdP, jobNoP, is_panelP, parameters_obj_inP, source_functionP, call_screen_propertiesP, refreshed_ds) {
+func.UI.screen.init = async function (SESSION_ID, prog_id, sourceScreenP, callingDataSource_objP, $callingContainerP, triggerIdP, rowIdP, jobNoP, is_panelP, parameters_obj_inP, source_functionP, call_screen_propertiesP, refreshed_ds, parameters_raw_obj) {
   if (!prog_id) return console.error('program is empty');
   let screen_ret = await func.utils.get_screen_obj(SESSION_ID, prog_id);
   if (!screen_ret) return console.error('program is not a screen object');
@@ -11214,6 +11215,7 @@ func.UI.screen.init = async function (SESSION_ID, prog_id, sourceScreenP, callin
     screenInfo,
     call_screen_propertiesP,
     parentDataSourceNoP: _session.DS_GLB?.[callingDataSource_objP?.dsSession]?.dsSession || callingDataSource_objP?.parentDataSourceNo || 0,
+    parameters_raw_obj,
   };
 
   switch (screen_type) {
@@ -11380,7 +11382,7 @@ func.UI.screen.init = async function (SESSION_ID, prog_id, sourceScreenP, callin
     rowIdP,
     jobNoP,
     null,
-    null,
+    parameters_raw_obj,
     null,
     null,
     null,
@@ -11893,6 +11895,13 @@ func.UI.screen.refresh_screen = async function (SESSION_ID, fields_changed_arr,
             //   $("[xu-ui-id='" + elm_to_delete + "']").remove();
             // });
 
+            if (_session.engine_mode === 'live_preview') {
+              console.info('========= refresh main info ==============');
+              console.info('reason:', refresh_reason);
+              console.info('element:', $elm);
+              console.info('==========================================');
+            }
+
             return;
           }
         }
@@ -12149,43 +12158,32 @@ const get_params_obj_new = async function (SESSION_ID, prog_id, nodeP, dsSession
   if (!_prog) return;
 
   // get in parameters
-  var params_obj = {};
+  let params_res = {},
+    params_raw = {};
   if (_prog?.properties?.progParams) {
     for await (const [key, val] of Object.entries(_prog.properties.progParams)) {
       if (!['in', 'out'].includes(val.data.dir)) continue;
 
       if (nodeP.attributes) {
         if (nodeP.attributes[val.data.parameter]) {
-          params_obj[val.data.parameter] = nodeP.attributes[val.data.parameter];
+          params_res[val.data.parameter] = nodeP.attributes[val.data.parameter];
         } else if (nodeP.attributes[`xu-exp:${val.data.parameter}`]) {
           if (val.data.dir == 'out') {
             // only reference
-            params_obj[val.data.parameter] = nodeP.attributes[`xu-exp:${val.data.parameter}`].replaceAll('@', '');
+            params_res[val.data.parameter] = nodeP.attributes[`xu-exp:${val.data.parameter}`].replaceAll('@', '');
           } else {
             // in parameter
             let ret = await func.expression.get(SESSION_ID, nodeP.attributes[`xu-exp:${val.data.parameter}`], dsSession, 'parameters');
-            params_obj[val.data.parameter] = ret.result;
+            params_res[val.data.parameter] = ret.result;
+            params_raw[val.data.parameter] = `xu-exp:${val.data.parameter}`;
           }
         }
-
-        // if (parameters_obj_inP?.[val.data.parameter].fx) {
-        //   let ret = await func.expression.get(
-        //     SESSION_ID,
-        //     parameters_obj_inP?.[val.data.parameter].fx,
-        //     dsSession,
-        //     "parameters"
-        //   );
-        //   params_obj[val.data.parameter] = ret.result;
-        // } else {
-        //   params_obj[val.data.parameter] =
-        //     parameters_obj_inP?.[val.data.parameter].value;
-        // }
         continue;
       }
       console.warn(`Warning: Program ${_prog.properties.menuName} expected In parameter: ${val.data.parameter} but received null instead`);
     }
   }
-  return params_obj;
+  return { params_res, params_raw };
 };
 
 func.UI.screen.execute_xu_functions = async function (SESSION_ID, is_skeleton, $root_container, nodeP, $container, paramsP, parent_infoP, jobNoP, keyP, parent_nodeP, xu_func, $elm, val, is_init, refreshed_ds) {
@@ -12202,8 +12200,8 @@ func.UI.screen.execute_xu_functions = async function (SESSION_ID, is_skeleton, $
         const init_program = async function () {
           async function render_panel() {
             const prog_id = val.value?.prog || val.value;
-            const param_obj = await get_params_obj_new(SESSION_ID, prog_id, nodeP, paramsP.dsSessionP);
-            let ret_panel = await func.UI.screen.init(SESSION_ID, prog_id, paramsP.screenId, _ds, $elm, null, _ds.currentRecordId, null, true, param_obj, 'initXu_panel', undefined, prog_id !== _ds.prog_id ? null : refreshed_ds);
+            const params_obj = await get_params_obj_new(SESSION_ID, prog_id, nodeP, paramsP.dsSessionP);
+            let ret_panel = await func.UI.screen.init(SESSION_ID, prog_id, paramsP.screenId, _ds, $elm, null, _ds.currentRecordId, null, true, params_obj.param_res, 'initXu_panel', undefined, prog_id !== _ds.prog_id ? null : refreshed_ds, params_obj.param_raw);
             ret = { $new_div: ret_panel };
             $container.data().xuData.xuPanelProps = $elm.data().xuAttributes;
             $container.data().xuData.xuPanelData = ret_panel.data();
@@ -12252,8 +12250,8 @@ func.UI.screen.execute_xu_functions = async function (SESSION_ID, is_skeleton, $
             const program = val.value?.prog || val.value;
             var $wrapper = $('<div>');
             var $div = func.UI.screen.create_container(SESSION_ID, $root_container, nodeP, $container, paramsP, parent_infoP, jobNoP, keyP, parent_nodeP, nodeP.attributes, null, null, null, $wrapper, '');
-            const param_obj = await get_params_obj_new(SESSION_ID, program, nodeP, paramsP.dsSessionP);
-            let ret_init = await func.UI.screen.init(SESSION_ID, program, paramsP.screenId, _ds, $div, null, _ds.currentRecordId, jobNoP, true, param_obj, 'alterXu_panel');
+            const params_obj = await get_params_obj_new(SESSION_ID, program, nodeP, paramsP.dsSessionP);
+            let ret_init = await func.UI.screen.init(SESSION_ID, program, paramsP.screenId, _ds, $div, null, _ds.currentRecordId, jobNoP, true, params_obj.param_res, 'alterXu_panel', undefined, undefined, params_obj.param_raw);
             ret = {
               $new_div: ret_init,
               abort: true,

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

@@ -2900,7 +2900,7 @@ func.datasource.create = async function (
   rowIdP,
   jobNoP,
   calling_trigger_prop,
-  screen_param,
+  parameters_raw_obj,
   NA_isInitP,
   NA_callingSourceP,
   calling_jobP,
@@ -2933,6 +2933,7 @@ func.datasource.create = async function (
       parameters_obj_inP,
       static_refreshP,
       worker_id,
+      parameters_raw_obj,
     };
 
     var IS_DATASOURCE_REFRESH = null;
@@ -8883,7 +8884,7 @@ func.UI.find_field_in_progUi_attributes = function (progUi, field_id, prop, tag_
   return elm_nodes;
 };
  func.UI.screen = {};
-func.UI.screen.init = async function (SESSION_ID, prog_id, sourceScreenP, callingDataSource_objP, $callingContainerP, triggerIdP, rowIdP, jobNoP, is_panelP, parameters_obj_inP, source_functionP, call_screen_propertiesP, refreshed_ds) {
+func.UI.screen.init = async function (SESSION_ID, prog_id, sourceScreenP, callingDataSource_objP, $callingContainerP, triggerIdP, rowIdP, jobNoP, is_panelP, parameters_obj_inP, source_functionP, call_screen_propertiesP, refreshed_ds, parameters_raw_obj) {
   if (!prog_id) return console.error('program is empty');
   let screen_ret = await func.utils.get_screen_obj(SESSION_ID, prog_id);
   if (!screen_ret) return console.error('program is not a screen object');
@@ -8936,6 +8937,7 @@ func.UI.screen.init = async function (SESSION_ID, prog_id, sourceScreenP, callin
     screenInfo,
     call_screen_propertiesP,
     parentDataSourceNoP: _session.DS_GLB?.[callingDataSource_objP?.dsSession]?.dsSession || callingDataSource_objP?.parentDataSourceNo || 0,
+    parameters_raw_obj,
   };
 
   switch (screen_type) {
@@ -9102,7 +9104,7 @@ func.UI.screen.init = async function (SESSION_ID, prog_id, sourceScreenP, callin
     rowIdP,
     jobNoP,
     null,
-    null,
+    parameters_raw_obj,
     null,
     null,
     null,
@@ -9615,6 +9617,13 @@ func.UI.screen.refresh_screen = async function (SESSION_ID, fields_changed_arr,
             //   $("[xu-ui-id='" + elm_to_delete + "']").remove();
             // });
 
+            if (_session.engine_mode === 'live_preview') {
+              console.info('========= refresh main info ==============');
+              console.info('reason:', refresh_reason);
+              console.info('element:', $elm);
+              console.info('==========================================');
+            }
+
             return;
           }
         }
@@ -9871,43 +9880,32 @@ const get_params_obj_new = async function (SESSION_ID, prog_id, nodeP, dsSession
   if (!_prog) return;
 
   // get in parameters
-  var params_obj = {};
+  let params_res = {},
+    params_raw = {};
   if (_prog?.properties?.progParams) {
     for await (const [key, val] of Object.entries(_prog.properties.progParams)) {
       if (!['in', 'out'].includes(val.data.dir)) continue;
 
       if (nodeP.attributes) {
         if (nodeP.attributes[val.data.parameter]) {
-          params_obj[val.data.parameter] = nodeP.attributes[val.data.parameter];
+          params_res[val.data.parameter] = nodeP.attributes[val.data.parameter];
         } else if (nodeP.attributes[`xu-exp:${val.data.parameter}`]) {
           if (val.data.dir == 'out') {
             // only reference
-            params_obj[val.data.parameter] = nodeP.attributes[`xu-exp:${val.data.parameter}`].replaceAll('@', '');
+            params_res[val.data.parameter] = nodeP.attributes[`xu-exp:${val.data.parameter}`].replaceAll('@', '');
           } else {
             // in parameter
             let ret = await func.expression.get(SESSION_ID, nodeP.attributes[`xu-exp:${val.data.parameter}`], dsSession, 'parameters');
-            params_obj[val.data.parameter] = ret.result;
+            params_res[val.data.parameter] = ret.result;
+            params_raw[val.data.parameter] = `xu-exp:${val.data.parameter}`;
           }
         }
-
-        // if (parameters_obj_inP?.[val.data.parameter].fx) {
-        //   let ret = await func.expression.get(
-        //     SESSION_ID,
-        //     parameters_obj_inP?.[val.data.parameter].fx,
-        //     dsSession,
-        //     "parameters"
-        //   );
-        //   params_obj[val.data.parameter] = ret.result;
-        // } else {
-        //   params_obj[val.data.parameter] =
-        //     parameters_obj_inP?.[val.data.parameter].value;
-        // }
         continue;
       }
       console.warn(`Warning: Program ${_prog.properties.menuName} expected In parameter: ${val.data.parameter} but received null instead`);
     }
   }
-  return params_obj;
+  return { params_res, params_raw };
 };
 
 func.UI.screen.execute_xu_functions = async function (SESSION_ID, is_skeleton, $root_container, nodeP, $container, paramsP, parent_infoP, jobNoP, keyP, parent_nodeP, xu_func, $elm, val, is_init, refreshed_ds) {
@@ -9924,8 +9922,8 @@ func.UI.screen.execute_xu_functions = async function (SESSION_ID, is_skeleton, $
         const init_program = async function () {
           async function render_panel() {
             const prog_id = val.value?.prog || val.value;
-            const param_obj = await get_params_obj_new(SESSION_ID, prog_id, nodeP, paramsP.dsSessionP);
-            let ret_panel = await func.UI.screen.init(SESSION_ID, prog_id, paramsP.screenId, _ds, $elm, null, _ds.currentRecordId, null, true, param_obj, 'initXu_panel', undefined, prog_id !== _ds.prog_id ? null : refreshed_ds);
+            const params_obj = await get_params_obj_new(SESSION_ID, prog_id, nodeP, paramsP.dsSessionP);
+            let ret_panel = await func.UI.screen.init(SESSION_ID, prog_id, paramsP.screenId, _ds, $elm, null, _ds.currentRecordId, null, true, params_obj.param_res, 'initXu_panel', undefined, prog_id !== _ds.prog_id ? null : refreshed_ds, params_obj.param_raw);
             ret = { $new_div: ret_panel };
             $container.data().xuData.xuPanelProps = $elm.data().xuAttributes;
             $container.data().xuData.xuPanelData = ret_panel.data();
@@ -9974,8 +9972,8 @@ func.UI.screen.execute_xu_functions = async function (SESSION_ID, is_skeleton, $
             const program = val.value?.prog || val.value;
             var $wrapper = $('<div>');
             var $div = func.UI.screen.create_container(SESSION_ID, $root_container, nodeP, $container, paramsP, parent_infoP, jobNoP, keyP, parent_nodeP, nodeP.attributes, null, null, null, $wrapper, '');
-            const param_obj = await get_params_obj_new(SESSION_ID, program, nodeP, paramsP.dsSessionP);
-            let ret_init = await func.UI.screen.init(SESSION_ID, program, paramsP.screenId, _ds, $div, null, _ds.currentRecordId, jobNoP, true, param_obj, 'alterXu_panel');
+            const params_obj = await get_params_obj_new(SESSION_ID, program, nodeP, paramsP.dsSessionP);
+            let ret_init = await func.UI.screen.init(SESSION_ID, program, paramsP.screenId, _ds, $div, null, _ds.currentRecordId, jobNoP, true, params_obj.param_res, 'alterXu_panel', undefined, undefined, params_obj.param_raw);
             ret = {
               $new_div: ret_init,
               abort: true,
@@ -13466,7 +13464,7 @@ func.events.execute = async function (
     var params_obj = {};
     if (_prog?.properties?.progParams) {
       for await (const [key, val] of Object.entries(_prog.properties.progParams)) {
-        if (!val.data.dir === 'in') continue;
+        if (val.data.dir !== 'in') continue;
         if (typeof args.parameters_obj_inP?.[val.data.parameter] !== 'undefined') {
           if (args.parameters_obj_inP?.[val.data.parameter].fx) {
             let ret = await func.expression.get(SESSION_ID, args.parameters_obj_inP?.[val.data.parameter].fx, dsSession, 'parameters');