@xuda.io/runtime-bundle 1.0.719 → 1.0.720

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;
@@ -3067,7 +3068,7 @@ func.datasource.create = async function (
         args.rowIdP,
         args.jobNoP,
         args.calling_trigger_prop,
-        null,
+        args.parameters_raw_obj,
         null,
         null,
         args.calling_jobP,
@@ -3108,7 +3109,7 @@ func.datasource.create = async function (
     return done(SESSION_ID, jsonP.dsSession, true);
   });
 };
-func.datasource.prepare = async function (SESSION_ID, prog_id, dataSourceNoP, parentDataSourceNoP, containerIdP, rowIdP, jobNoP, calling_trigger_prop, NA_screen_param, NA_isInitP, callingSourceP, calling_jobP, NA_screen_dsP, is_panelP, parameters_obj_inP, static_refreshP, run_atP, worker_id) {
+func.datasource.prepare = async function (SESSION_ID, prog_id, dataSourceNoP, parentDataSourceNoP, containerIdP, rowIdP, jobNoP, calling_trigger_prop, parameters_raw_obj, NA_isInitP, callingSourceP, calling_jobP, NA_screen_dsP, is_panelP, parameters_obj_inP, static_refreshP, run_atP, worker_id) {
   const set_parameters = async function () {
     var _session = SESSION_OBJ[SESSION_ID];
     const get_Out_parameters = async function (fieldIdP, located_field_param_idxP, param_row_idP) {
@@ -3237,6 +3238,7 @@ func.datasource.prepare = async function (SESSION_ID, prog_id, dataSourceNoP, pa
     static_refreshP,
     run_atP,
     worker_id,
+    parameters_raw_obj,
   };
 
   var dataSourceSession = null;
@@ -4155,7 +4157,7 @@ func.datasource.run_events_functions = async function (SESSION_ID, dataSourceSes
                   clearInterval(interval);
                   resolve(job_num);
                 }
-                if (i > 20) {
+                if (i > 50) {
                   console.error('deadlock detected');
                   clearInterval(interval);
                   resolve(job_num);
@@ -4893,6 +4895,18 @@ func.datasource.update = async function (SESSION_ID, datasource_changes, update_
 
                 if (!fields_changed.includes(field_id)) {
                   fields_changed.push(field_id);
+
+                  ///// REFRESH PARAMETERS IN
+                  // for (const [_dsSession, _ds] of Object.entries(_session.DS_GLB)) {
+                  //   if (_ds.args.parameters_raw_obj) {
+                  //     for (const [key, exp] of Object.entries(_ds.args.parameters_raw_obj)) {
+                  //       if (exp.includes(field_id)) {
+                  //         let ret = await func.expression.get(SESSION_ID, exp, _dsSession, 'parameters');
+                  //         _ds.in_parameters[key].value = ret.result;
+                  //       }
+                  //     }
+                  //   }
+                  // }
                 }
                 if (!datasource_changed.includes(dataSource)) {
                   datasource_changed.push(dataSource);
@@ -4939,6 +4953,19 @@ func.datasource.update = async function (SESSION_ID, datasource_changes, update_
           datasource_changed[0], // refresh the current datasource only
         );
       }
+      // ///// REFRESH PARAMETERS IN
+      // if (fields_changed.length) {
+      //   for (const [_dsSession, _ds] of Object.entries(_session.DS_GLB)) {
+      //     if (_ds.args.parameters_raw_obj) {
+      //       for (const [key, val] of Object.entries(_ds.args.parameters_raw_obj)) {
+      //         if (fields_changed.includes(val)) {
+      //           let ret = await func.expression.get(SESSION_ID, '@' + val, _dsSession, 'parameters');
+      //           _ds.in_parameters[val].value = ret.result;
+      //         }
+      //       }
+      //     }
+      //   }
+      // }
     }
     resolve();
   });
@@ -11162,7 +11189,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');
@@ -11215,6 +11242,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) {
@@ -11381,7 +11409,7 @@ func.UI.screen.init = async function (SESSION_ID, prog_id, sourceScreenP, callin
     rowIdP,
     jobNoP,
     null,
-    null,
+    parameters_raw_obj,
     null,
     null,
     null,
@@ -11988,212 +12016,200 @@ func.UI.screen.refresh_screen = async function (SESSION_ID, fields_changed_arr,
   }
 };
 
-// func.UI.screen.refresh_screen = async function (SESSION_ID, fields_changed_arr, datasource_changed, fields_changed_datasource) {
-//   // 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);
-//     const progDataSource_str = JSON.stringify(prog_doc.progDataSource);
-//     for (const field_id of fields_changed_arr || []) {
-
-//     }
-//   }
+func.UI.screen.refresh_screen_old = async function (SESSION_ID, fields_changed_arr, datasource_changed, fields_changed_datasource) {
+  // 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);
+    const progDataSource_str = JSON.stringify(prog_doc.progDataSource);
+    for (const field_id of fields_changed_arr || []) {
+    }
+  }
 
-//   const panels_obj = await func.UI.utils.get_panels_wrapper_from_dom(SESSION_ID, $(SESSION_OBJ[SESSION_ID].root_element), false);
+  const panels_obj = await func.UI.utils.get_panels_wrapper_from_dom(SESSION_ID, $(SESSION_OBJ[SESSION_ID].root_element), false);
 
-//   for await (const [parent_element_ui_id, panel_val] of Object.entries(panels_obj)) {
-//     const progDataSource_str = JSON.stringify(panel_val.prog_doc.progDataSource);
+  for await (const [parent_element_ui_id, panel_val] of Object.entries(panels_obj)) {
+    const progDataSource_str = JSON.stringify(panel_val.prog_doc.progDataSource);
 
-//     var found, refresh_reason, refresh_details;
-//     if (fields_changed_arr) {
-//       if (fields_changed_datasource && panel_val._ds.dsSession <= Number(fields_changed_datasource)) {
-//         continue;
-//       }
-//       for (const field_id of fields_changed_arr) {
-//         // get panel attributes
-//         const _attributes = panel_val?.panelXuAttributes || {};
+    var found, refresh_reason, refresh_details;
+    if (fields_changed_arr) {
+      if (fields_changed_datasource && panel_val._ds.dsSession <= Number(fields_changed_datasource)) {
+        continue;
+      }
+      for (const field_id of fields_changed_arr) {
+        // get panel attributes
+        const _attributes = panel_val?.panelXuAttributes || {};
 
-//         // detect if program changed
-//         found = _attributes['xu-exp:program']?.includes('@' + field_id);
+        // detect if program changed
+        found = _attributes['xu-exp:program']?.includes('@' + field_id);
 
-//         if (found) {
-//           refresh_reason = `program ${_attributes['xu-exp:program']} ${field_id} changed `;
-//           refresh_details = _attributes;
-//           break;
-//         }
+        if (found) {
+          refresh_reason = `program ${_attributes['xu-exp:program']} ${field_id} changed `;
+          refresh_details = _attributes;
+          break;
+        }
 
-//         // _attributes holds also info of parameters in code_in: @code
-//         // search field changed in panel call send parameters exp
-//         for (const [attr, value] of Object.entries(_attributes)) {
-//           const pattern = /xu-exp:(\w+)/;
-//           const match = attr.match(pattern);
+        // _attributes holds also info of parameters in code_in: @code
+        // search field changed in panel call send parameters exp
+        for (const [attr, value] of Object.entries(_attributes)) {
+          const pattern = /xu-exp:(\w+)/;
+          const match = attr.match(pattern);
 
-//           if (!match) {
-//             // continue if attribute is not expression
-//             continue;
-//           }
-//           // code_in
-//           const parameter_in_field_id = match?.[1];
-//           // @code
-//           if (value.includes(field_id)) {
-//             // search parameter in field in the target program's progDataSource
-//             found = progDataSource_str?.includes('@' + parameter_in_field_id);
+          if (!match) {
+            // continue if attribute is not expression
+            continue;
+          }
+          // code_in
+          const parameter_in_field_id = match?.[1];
+          // @code
+          if (value.includes(field_id)) {
+            // search parameter in field in the target program's progDataSource
+            found = progDataSource_str?.includes('@' + parameter_in_field_id);
 
-//             if (found) {
-//               refresh_reason = `field ${field_id} in progDataSource parameter_in changed`;
-//               refresh_details = panel_val?.prog_doc?.progDataSource;
+            if (found) {
+              refresh_reason = `field ${field_id} in progDataSource parameter_in changed`;
+              refresh_details = panel_val?.prog_doc?.progDataSource;
 
-//               break;
-//             }
+              break;
+            }
 
-//             // found = find_field_in_progUi(prog_doc.progUi, parameter_in_field_id, 'xu-for');
-//             found = func.UI.find_field_in_progUi_attributes(panel_val.prog_doc.progUi, parameter_in_field_id, 'xu-for').length;
+            // found = find_field_in_progUi(prog_doc.progUi, parameter_in_field_id, 'xu-for');
+            found = func.UI.find_field_in_progUi_attributes(panel_val.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;
+            }
+          }
+        }
 
-//         if (found) break;
+        if (found) break;
 
-//         // search field changed in the target program's progDataSource  // @code
-//         found = progDataSource_str?.includes('@' + field_id);
-//         if (found) {
-//           refresh_reason = `field ${field_id} in progDataSource changed`;
-//           refresh_details = panel_val?.prog_doc?.progDataSource;
+        // search field changed in the target program's progDataSource  // @code
+        found = progDataSource_str?.includes('@' + field_id);
+        if (found) {
+          refresh_reason = `field ${field_id} in progDataSource changed`;
+          refresh_details = panel_val?.prog_doc?.progDataSource;
 
-//           break;
-//         }
+          break;
+        }
 
-//         found = func.UI.find_field_in_progUi_attributes(panel_val.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(panel_val.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) {
-//           break;
-//         }
-//       }
-//     }
+        if (found) {
+          break;
+        }
+      }
+    }
 
-//     if (datasource_changed) {
-//       if (panel_val._ds.dsSession == datasource_changed) {
-//         refresh_reason = `panel datasource ${datasource_changed} changed`;
-//         refresh_details = '';
+    if (datasource_changed) {
+      if (panel_val._ds.dsSession == datasource_changed) {
+        refresh_reason = `panel datasource ${datasource_changed} changed`;
+        refresh_details = '';
 
-//         found = true;
-//       }
-//     }
-//     if (found) {
-//       const _session = SESSION_OBJ[SESSION_ID];
-//       if (_session.engine_mode === 'live_preview') {
-//         console.info('========= refresh info ==============');
-//         console.info('reason:', refresh_reason);
-//         console.info('details:', refresh_details);
-//         console.info('panel:', panel_val);
-//         console.info('=====================================');
-//       }
-//       const $div_elm = panel_val.$panel_div;
-//       const wrapper_data = $div_elm.data();
+        found = true;
+      }
+    }
+    if (found) {
+      const _session = SESSION_OBJ[SESSION_ID];
+      if (_session.engine_mode === 'live_preview') {
+        console.info('========= refresh info ==============');
+        console.info('reason:', refresh_reason);
+        console.info('details:', refresh_details);
+        console.info('panel:', panel_val);
+        console.info('=====================================');
+      }
+      const $div_elm = panel_val.$panel_div;
+      const wrapper_data = $div_elm.data();
 
-//       if (_.isEmpty(wrapper_data)) continue;
+      if (_.isEmpty(wrapper_data)) continue;
 
-//       try {
-//         const ts = Date.now();
-//         // remove old panel content
-//         $.each(panel_val.ids, async function (key, val) {
-//           $("[xu-ui-id='" + val + "']")
-//             .attr('xu-ui-id', val + ts)
-//             .removeData();
-//         });
+      try {
+        const ts = Date.now();
+        // remove old panel content
+        $.each(panel_val.ids, async function (key, val) {
+          $("[xu-ui-id='" + val + "']")
+            .attr('xu-ui-id', val + ts)
+            .removeData();
+        });
 
-//         let refreshed_ds;
-//         // check if ds exist and deleted by garbage collector
+        let refreshed_ds;
+        // check if ds exist and deleted by garbage collector
 
-//         if (_session.DS_GLB[panel_val._ds.dsSession]) {
-//           refreshed_ds = panel_val._ds.dsSession;
-//         }
-//         for await (const item of wrapper_data.xuData.node_org.children) {
-//           if (item.tagName !== 'xu-panel') continue;
+        if (_session.DS_GLB[panel_val._ds.dsSession]) {
+          refreshed_ds = panel_val._ds.dsSession;
+        }
+        for await (const item of wrapper_data.xuData.node_org.children) {
+          if (item.tagName !== 'xu-panel') continue;
 
-//           const new_$div = await func.UI.screen.render_ui_tree(
-//             SESSION_ID,
-//             $div_elm, // the wrapper
-//             _.cloneDeep(item), // _.cloneDeep(wrapper_data.xuData.node_org.children[0]), // the xu-panel node
-//             {},
-//             wrapper_data.xuData.paramsP, // the wrapper params
-//             null,
-//             null,
-//             wrapper_data.xuData.key, // the wrapper key
-//             refreshed_ds, // the refreshed_ds
-//             wrapper_data.xuData.parent_node, // the wrapper parent node
-//             null,
-//             wrapper_data.xuData.$root_container, // the wrapper root container
-//           );
-//         }
+          const new_$div = await func.UI.screen.render_ui_tree(
+            SESSION_ID,
+            $div_elm, // the wrapper
+            _.cloneDeep(item), // _.cloneDeep(wrapper_data.xuData.node_org.children[0]), // the xu-panel node
+            {},
+            wrapper_data.xuData.paramsP, // the wrapper params
+            null,
+            null,
+            wrapper_data.xuData.key, // the wrapper key
+            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;
-//       }
-//       // continue;
-//     }
-//   }
-// };
+        // remove old panel content
+        $.each(panel_val.ids, async function (key, val) {
+          $("[xu-ui-id='" + val + ts + "']").remove();
+        });
+      } catch (error) {
+        debugger;
+      }
+      // continue;
+    }
+  }
+};
 
 const get_params_obj_new = async function (SESSION_ID, prog_id, nodeP, dsSession) {
   const _prog = await func.utils.VIEWS_OBJ.get(SESSION_ID, prog_id);
   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) {
@@ -12210,8 +12226,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();
@@ -12260,8 +12276,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,