@xuda.io/runtime-bundle 1.0.681 → 1.0.683

package/js/xuda-runtime-bundle.js

@@ -28966,7 +28966,8 @@ func.datasource.execute = async function (SESSION_ID, dataSourceSession, IS_DATA
       }
 
       // initiated with Update but no rows found
-      if (tree_obj.crudMode === 'U' && tree_obj.allowCreate && !_ds?.data_feed?.rows?.length) {
+      // if (tree_obj.crudMode === 'U' && tree_obj.allowCreate && !_ds?.data_feed?.rows?.length) {
+      if (tree_obj.crudMode === 'U' && tree_obj.allowCreate && !_raw_data_rows?.length) {
         _ds.set_mode = 'C';
         // _raw_data_rows[glb.newRecord] = [{ _ROWID: "newRecord" }];
 
@@ -31439,88 +31440,104 @@ func.UI.screen.refresh_xu_attributes = async function (SESSION_ID, fields_arr, j
 };
 
 func.UI.screen.refresh_screen = async function (SESSION_ID, fields_changed_arr, datasource_changed, fields_changed_datasource) {
-  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);
-
-    var found, refresh_reason, refresh_details;
-    if (fields_changed_arr) {
-      if (fields_changed_datasource && panel_val._ds.dsSession <= Number(fields_changed_datasource)) {
-        continue;
+  var found, refresh_reason, refresh_details;
+  const validate_change = function (prog_doc, panelXuAttributes) {
+    found = null;
+    refresh_reason = null;
+    refresh_details = null;
+    const progDataSource_str = JSON.stringify(prog_doc.progDataSource);
+    for (const field_id of fields_changed_arr) {
+      // get panel attributes
+      const _attributes = panelXuAttributes || {};
+
+      // 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;
       }
-      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);
+      // _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 (found) {
-          refresh_reason = `program ${_attributes['xu-exp:program']} ${field_id} changed `;
-          refresh_details = _attributes;
-          break;
+        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);
 
-        // _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 (found) {
+            refresh_reason = `field ${field_id} in progDataSource parameter_in changed`;
+            refresh_details = prog_doc?.progDataSource;
 
-          if (!match) {
-            // continue if attribute is not expression
-            continue;
+            break;
           }
-          // 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;
+          found = func.UI.find_field_in_progUi_attributes(prog_doc.progUi, parameter_in_field_id, 'xu-for').length;
 
-              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;
+          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 = 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(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;
+      }
+    }
+  };
+
+  // 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);
+    validate_change(prog_doc);
+  }
+
+  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);
+
+    if (fields_changed_arr) {
+      if (fields_changed_datasource && panel_val._ds.dsSession <= Number(fields_changed_datasource)) {
+        continue;
       }
+      validate_change(panel_val.prog_doc, panel_val?.panelXuAttributes);
     }
 
     if (datasource_changed) {
@@ -31591,25 +31608,40 @@ func.UI.screen.refresh_screen = async function (SESSION_ID, fields_changed_arr,
   }
 };
 
-// func.UI.screen.refresh_screen_old = async function (SESSION_ID, fields_changed_arr, datasource_changed, fields_changed_datasource) {
-//   const panels_obj = func.UI.utils.get_panels_from_dom(SESSION_ID, false);
+// 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 || []) {
+
+//     }
+//   }
+
+//   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 prog_doc = await func.utils.DOCS_OBJ.get(SESSION_ID, panel_val._ds.prog_id);
-//     const progDataSource_str = JSON.stringify(prog_doc.progDataSource);
+//     const progDataSource_str = JSON.stringify(panel_val.prog_doc.progDataSource);
 
-//     var found;
+//     var found, refresh_reason, refresh_details;
 //     if (fields_changed_arr) {
-//       if (fields_changed_datasource && panel_val._ds.dsSession < fields_changed_datasource) {
+//       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?.$div?.data()?.xuPanelData?.node?.attributes || {};
+//         const _attributes = panel_val?.panelXuAttributes || {};
 
 //         // detect if program changed
 //         found = _attributes['xu-exp:program']?.includes('@' + field_id);
-//         if (found) 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
@@ -31627,11 +31659,23 @@ func.UI.screen.refresh_screen = async function (SESSION_ID, fields_changed_arr,
 //           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) break;
+
+//             if (found) {
+//               refresh_reason = `field ${field_id} in progDataSource parameter_in changed`;
+//               refresh_details = panel_val?.prog_doc?.progDataSource;
+
+//               break;
+//             }
 
 //             // found = find_field_in_progUi(prog_doc.progUi, parameter_in_field_id, 'xu-for');
-//             found = func.UI.find_field_in_progUi_attributes(prog_doc.progUi, parameter_in_field_id, 'xu-for').length;
-//             if (found) break;
+//             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;
+
+//               break;
+//             }
 //           }
 //         }
 
@@ -31639,63 +31683,93 @@ func.UI.screen.refresh_screen = async function (SESSION_ID, fields_changed_arr,
 
 //         // search field changed in the target program's progDataSource  // @code
 //         found = progDataSource_str?.includes('@' + field_id);
-//         if (found) break;
+//         if (found) {
+//           refresh_reason = `field ${field_id} in progDataSource changed`;
+//           refresh_details = panel_val?.prog_doc?.progDataSource;
+
+//           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;
+
+//           break;
+//         }
+
+//         if (found) {
+//           break;
+//         }
 //       }
 //     }
 
 //     if (datasource_changed) {
 //       if (panel_val._ds.dsSession == datasource_changed) {
+//         refresh_reason = `panel datasource ${datasource_changed} changed`;
+//         refresh_details = '';
+
 //         found = true;
 //       }
 //     }
 //     if (found) {
-//       var $div_elm = panel_val.$div
-//         .parent()
-//         .parent()
-//         .find("[xu-ui-id='" + parent_element_ui_id + "']");
+//       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;
 
-//       // restore original panel
 //       try {
-//         // const $org_panel = panel_val.$div.data().xuPanelData.$panel_div;
+//         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();
+//         });
 
-//         const new_$div = await func.UI.screen.render_ui_tree(SESSION_ID, $div_elm, _.cloneDeep(panel_val.$div.data().xuPanelData.node), {}, $div_elm.data().xuData.paramsP, null, null, $div_elm.data().xuData.key, null, $div_elm.data().xuData.parent_node, null, $div_elm.data().xuData.$root_container);
+//         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;
+
+//           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 + "']").remove();
+//           $("[xu-ui-id='" + val + ts + "']").remove();
 //         });
 //       } catch (error) {
 //         debugger;
 //       }
-//       break;
-//     }
-//   }
-// };
-
-// const get_params_obj = async function (SESSION_ID, prog_id, parameters_obj_inP) {
-//   const _prog = await func.utils.VIEWS_OBJ.get(SESSION_ID, prog_id);
-//   if (!_prog) {
-//     return;
-//   }
-
-//   // get in parameters
-//   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 (typeof parameters_obj_inP?.[val.data.parameter] !== 'undefined') {
-//         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`);
+//       // continue;
 //     }
 //   }
-//   return params_obj;
 // };
 
 const get_params_obj_new = async function (SESSION_ID, prog_id, nodeP, dsSession) {