@xuda.io/runtime-bundle 1.0.714 → 1.0.715

package/js/xuda-runtime-bundle.js

@@ -30870,7 +30870,7 @@ func.datasource.get_args_property_value = async function (SESSION_ID, dsSession,
   return _value;
 };
  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');
@@ -30923,6 +30923,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) {
@@ -31089,7 +31090,7 @@ func.UI.screen.init = async function (SESSION_ID, prog_id, sourceScreenP, callin
     rowIdP,
     jobNoP,
     null,
-    null,
+    parameters_raw_obj,
     null,
     null,
     null,
@@ -31550,71 +31551,71 @@ func.UI.screen.refresh_screen = async function (SESSION_ID, fields_changed_arr,
     }
   };
 
-  // check the main program
-  if (fields_changed_datasource) {
-    const _session = SESSION_OBJ[SESSION_ID];
-    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, null, true);
-      if (found) {
-        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('xu-root-component-' + SESSION_ID).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
-            );
-
-            // // remove old screen content
-            // $.each(elm_to_delete, async function (key, val) {
-            //   $("[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;
-          }
-        }
-      }
-    }
-  }
+  // // check the main program
+  // if (fields_changed_datasource) {
+  //   const _session = SESSION_OBJ[SESSION_ID];
+  //   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, null, true);
+  //     if (found) {
+  //       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('xu-root-component-' + SESSION_ID).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
+  //           );
+
+  //           // // remove old screen content
+  //           // $.each(elm_to_delete, async function (key, val) {
+  //           //   $("[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;
+  //         }
+  //       }
+  //     }
+  //   }
+  // }
 
   const panels_obj = await func.UI.utils.get_panels_wrapper_from_dom(SESSION_ID, $(SESSION_OBJ[SESSION_ID].root_element), false);
 
@@ -31865,43 +31866,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] = nodeP.attributes[`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) {
@@ -31918,8 +31908,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.params_res, 'initXu_panel', undefined, prog_id !== _ds.prog_id ? null : refreshed_ds, params_obj.params_raw);
             ret = { $new_div: ret_panel };
             $container.data().xuData.xuPanelProps = $elm.data().xuAttributes;
             $container.data().xuData.xuPanelData = ret_panel.data();
@@ -31968,8 +31958,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.params_res, 'alterXu_panel', undefined, undefined, params_obj.params_raw);
             ret = {
               $new_div: ret_init,
               abort: true,