@xuda.io/runtime-bundle 1.0.715 → 1.0.716

package/js/xuda-runtime-bundle.js

@@ -31469,7 +31469,7 @@ 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) {
+func.UI.screen.refresh_screen_bad = async function (SESSION_ID, fields_changed_arr, datasource_changed, fields_changed_datasource) {
   var found, refresh_reason, refresh_details;
   const validate_change = function (prog_doc, panelXuAttributes, skip_ui_check) {
     found = null;
@@ -31551,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);
 
@@ -31697,169 +31697,168 @@ 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 = 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;
-
-//               break;
-//             }
+            if (found) {
+              refresh_reason = `field ${field_id} in progDataSource parameter_in changed`;
+              refresh_details = panel_val?.prog_doc?.progDataSource;
 
-//             // 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;
+              break;
+            }
 
-//             if (found) {
-//               refresh_reason = `field ${field_id} in progUi xu-for parameter_in changed`;
-//               refresh_details = found;
+            // 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;
 
-//               break;
-//             }
-//           }
-//         }
+            if (found) {
+              refresh_reason = `field ${field_id} in progUi xu-for parameter_in changed`;
+              refresh_details = found;
+
+              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();
-
-//       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();
-//         });
+        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();
 
-//         let refreshed_ds;
-//         // check if ds exist and deleted by garbage collector
+      if (_.isEmpty(wrapper_data)) 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;
+      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();
+        });
 
-//           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
-//           );
-//         }
+        let refreshed_ds;
+        // check if ds exist and deleted by garbage collector
 
-//         // remove old panel content
-//         $.each(panel_val.ids, async function (key, val) {
-//           $("[xu-ui-id='" + val + ts + "']").remove();
-//         });
-//       } catch (error) {
-//         debugger;
-//       }
-//       // 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
+          );
+        }
+
+        // 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);