@xuda.io/runtime-bundle 1.0.1131 → 1.0.1133

package/js/xuda-runtime-bundle.js

@@ -26960,66 +26960,67 @@ func.UI.utils.get_nodeId = function (SESSION_ID, dsSessionP, ui_idP, $container,
     return $elm.attr('nodeId');
   }
 };
-func.UI.utils.get_element_info = function (SESSION_ID, dsSessionP, ui_idP, $container, is_app_panel, ui_type, functionP) {
-  var $elm = func.UI.utils.get_node_elm(SESSION_ID, dsSessionP, ui_idP, $container, is_app_panel, ui_type, functionP);
-  var ret = {};
-  if ($elm?.length) {
-    //length added 20210209
-    // if (is_app_panel) {
-    //   if ($elm?.data()?.xuData.panel_info) {
-    //     ret.nodeId = $elm.data().xuData.panel_info.prop.id;
-    //   } else {
-    //     ret.nodeId = $elm.data().xuData.properties.id;
-    //   }
-    // } else {
-    // ret.nodeId = $elm.data().xuData.nodeId;
-    ret.nodeId = $elm.data().xuData.xu_id;
-    // ret.nodeId = $elm.attr('xu-ui-id');
-    // }
-  }
-  ret.$elm = $elm;
-  return ret;
-};
+// func.UI.utils.get_element_info = function (SESSION_ID, dsSessionP, ui_idP, $container, is_app_panel, ui_type, functionP) {
+//   var $elm = func.UI.utils.get_node_elm(SESSION_ID, dsSessionP, ui_idP, $container, is_app_panel, ui_type, functionP);
+//   var ret = {};
+//   if ($elm?.length) {
+//     //length added 20210209
+//     // if (is_app_panel) {
+//     //   if ($elm?.data()?.xuData.panel_info) {
+//     //     ret.nodeId = $elm.data().xuData.panel_info.prop.id;
+//     //   } else {
+//     //     ret.nodeId = $elm.data().xuData.properties.id;
+//     //   }
+//     // } else {
+//     // ret.nodeId = $elm.data().xuData.nodeId;
+//     ret.nodeId = $elm.data().xuData.xu_id;
+
+//     // ret.nodeId = $elm.attr('xu-ui-id');
+//     // }
+//   }
+//   ret.$elm = $elm;
+//   return ret;
+// };
 func.UI.utils.get_ui_id_count = function (SESSION_ID, dsSessionP, ui_idP, $container) {
   return func.UI.utils.get_node_elm(SESSION_ID, dsSessionP, ui_idP, $container, null, null).length;
 };
-func.UI.utils.get_ui_info_tree_scope = function (SESSION_ID, dsP, ui_id, is_app_panel, ui_type, $container, functionP) {
-  var drill_parent = function () {
-    if (SESSION_OBJ[SESSION_ID].DS_GLB[dsP].parentDataSourceNo) {
-      return func.UI.utils.get_ui_info_tree_scope(SESSION_ID, SESSION_OBJ[SESSION_ID].DS_GLB[dsP].parentDataSourceNo, ui_id, is_app_panel, ui_type);
-    } else if (ui_type === 'xu-app-page') {
-      if (elm_info.$elm.length) {
-        return {
-          ds: dsP,
-          id: id,
-          $elm: elm_info.$elm,
-        };
-      }
-    }
-  };
-  if (!SESSION_OBJ[SESSION_ID].DS_GLB[dsP]) return;
+// func.UI.utils.get_ui_info_tree_scope = function (SESSION_ID, dsP, ui_id, is_app_panel, ui_type, $container, functionP) {
+//   var drill_parent = function () {
+//     if (SESSION_OBJ[SESSION_ID].DS_GLB[dsP].parentDataSourceNo) {
+//       return func.UI.utils.get_ui_info_tree_scope(SESSION_ID, SESSION_OBJ[SESSION_ID].DS_GLB[dsP].parentDataSourceNo, ui_id, is_app_panel, ui_type);
+//     } else if (ui_type === 'xu-app-page') {
+//       if (elm_info.$elm.length) {
+//         return {
+//           ds: dsP,
+//           id: id,
+//           $elm: elm_info.$elm,
+//         };
+//       }
+//     }
+//   };
+//   if (!SESSION_OBJ[SESSION_ID].DS_GLB[dsP]) return;
 
-  var elm_info = func.UI.utils.get_element_info(SESSION_ID, dsP, ui_id, $container, is_app_panel, ui_type, functionP);
-  var id = elm_info.nodeId;
+//   var elm_info = func.UI.utils.get_element_info(SESSION_ID, dsP, ui_id, $container, is_app_panel, ui_type, functionP);
+//   var id = elm_info.nodeId;
 
-  if (!id) {
-    return drill_parent();
-  } else {
-    if (is_app_panel) {
-      return {
-        ds: func.UI.utils.get_node_elm(SESSION_ID, dsP, ui_id, $container, is_app_panel).data().xuData.paramsP.dsSessionP,
-        id: id,
-        $elm: elm_info.$elm,
-      };
-    } else {
-      return {
-        ds: dsP,
-        id: id,
-        $elm: elm_info.$elm,
-      };
-    }
-  }
-};
+//   if (!id) {
+//     return drill_parent();
+//   } else {
+//     if (is_app_panel) {
+//       return {
+//         ds: func.UI.utils.get_node_elm(SESSION_ID, dsP, ui_id, $container, is_app_panel).data().xuData.paramsP.dsSessionP,
+//         id: id,
+//         $elm: elm_info.$elm,
+//       };
+//     } else {
+//       return {
+//         ds: dsP,
+//         id: id,
+//         $elm: elm_info.$elm,
+//       };
+//     }
+//   }
+// };
 
 func.UI.utils.clean_node_busy = function (node) {
   var run_node = function (node) {
@@ -27032,34 +27033,34 @@ func.UI.utils.clean_node_busy = function (node) {
   return node;
 };
 
-func.UI.utils.get_ui_info_tree_scope_sync = function (SESSION_ID, dsP, ui_id, ui_type, callback, $container, functionP) {
-  var ret;
-  var is_app_panel = false;
-  if (ui_type === 'xu-panel') {
-    is_app_panel = true;
-  }
+// func.UI.utils.get_ui_info_tree_scope_sync = function (SESSION_ID, dsP, ui_id, ui_type, callback, $container, functionP) {
+//   var ret;
+//   var is_app_panel = false;
+//   if (ui_type === 'xu-panel') {
+//     is_app_panel = true;
+//   }
 
-  ret = func.UI.utils.get_ui_info_tree_scope(SESSION_ID, dsP, ui_id, is_app_panel, ui_type, $container, functionP);
+//   ret = func.UI.utils.get_ui_info_tree_scope(SESSION_ID, dsP, ui_id, is_app_panel, ui_type, $container, functionP);
 
-  if (!ret) {
-    var attempts = 0;
-    const run = function () {
-      ret = func.UI.utils.get_ui_info_tree_scope(SESSION_ID, dsP, ui_id, is_app_panel, ui_type, $container, functionP);
-      if (ret || attempts > 10) {
-        callback(ret);
-      } else {
-        attempts++;
-        console.log(attempts, dsP, ui_id, is_app_panel);
-        setTimeout(function () {
-          run();
-        }, 100);
-      }
-    };
-    run();
-  } else {
-    callback(ret);
-  }
-};
+//   if (!ret) {
+//     var attempts = 0;
+//     const run = function () {
+//       ret = func.UI.utils.get_ui_info_tree_scope(SESSION_ID, dsP, ui_id, is_app_panel, ui_type, $container, functionP);
+//       if (ret || attempts > 10) {
+//         callback(ret);
+//       } else {
+//         attempts++;
+//         console.log(attempts, dsP, ui_id, is_app_panel);
+//         setTimeout(function () {
+//           run();
+//         }, 100);
+//       }
+//     };
+//     run();
+//   } else {
+//     callback(ret);
+//   }
+// };
 
 func.UI.utils.live_preview_element_inspect_on = function (SESSION_ID, service) {
   $.each($('[xu-ui-id]'), function (key, val) {
@@ -27838,12 +27839,12 @@ func.UI.worker.execute = async function (SESSION_ID, queue_obj) {
         return func.UI.worker.delete_job(SESSION_ID, queue_obj.job_num);
       };
 
-      var $elm = func.UI.utils.find_in_element_data('xuData', $(SESSION_OBJ[SESSION_ID].root_element), 'xu_id', queue_obj.paramsP.elem_key);
-      // var $elm = $(`[xu-ui-id="${queue_obj.paramsP.elem_key}"]`);
+      // var $elm = func.UI.utils.find_in_element_data('xuData', $(SESSION_OBJ[SESSION_ID].root_element), 'xu_id', queue_obj.paramsP.elem_key);
+      var $elm = $(`[xu-ui-id="${queue_obj.paramsP.elem_key}"]`);
 
-      if (glb.new_xu_render) {
-        $elm = $(`[xu-ui-id="${queue_obj.paramsP.elem_key}"]`);
-      }
+      // if (glb.new_xu_render) {
+      //   $elm = $(`[xu-ui-id="${queue_obj.paramsP.elem_key}"]`);
+      // }
 
       if (!$elm.length) {
         return done();
@@ -31293,7 +31294,9 @@ func.UI.screen.refresh_xu_attributes = async function (SESSION_ID, fields_arr, j
             }
           });
 
-          const selector_id = glb.new_xu_render ? $(this).data()?.xuData?.ui_id : $(this).data()?.xuData?.xu_id;
+          // const selector_id = glb.new_xu_render ? $(this).data()?.xuData?.ui_id : $(this).data()?.xuData?.xu_id;
+
+          const selector_id = $(this).attr('xu-ui-id');
 
           if (attr.length) {
             selectors[selector_id] = selectors[selector_id];
@@ -31451,7 +31454,7 @@ func.UI.screen.refresh_xu_attributes = async function (SESSION_ID, fields_arr, j
       for (let item of node) {
         if (!_.isEmpty(item.attributes)) {
           const parent_element_ui_id = node_id;
-          const _$elem = $(`[xu-node-id="${parent_element_ui_id}"]`);
+          // const _$elem = $(`[xu-node-id="${parent_element_ui_id}"]`);
           for await (const [attr, val] of Object.entries(item.attributes)) {
             if (attr === 'xu-exp:xu-for' || attr === 'xu-for') {
               if (val?.includes(field_id)) {
@@ -31459,8 +31462,9 @@ func.UI.screen.refresh_xu_attributes = async function (SESSION_ID, fields_arr, j
                 // debugger;
                 // let _$elem = $(`[xu-ui-id^=${parent_element_ui_id}]`);
                 // let _$elem = $(`[xu-node-id=${parent_element_ui_id}]`);
-
-                const _elem_key = parent_element_ui_id;
+                const _$elem = func.UI.utils.find_in_element_data('xuData', 'body', 'nodeid', parent_element_ui_id);
+                // const _elem_key = parent_element_ui_id;
+                const _elem_key = _$elem.attr('xu-ui-id');
                 const _elem_val = { attributes: [], $elm: _$elem };
                 if (!_$elem?.length) continue;
 
@@ -31488,44 +31492,44 @@ func.UI.screen.refresh_xu_attributes = async function (SESSION_ID, fields_arr, j
               }
             }
 
-            if (glb.new_xu_render) {
-              if (attr === 'xu-exp:xu-render') {
-                //|| attr === 'xu-render'
-                for await (const [key, val] of Object.entries(_$elem)) {
-                  if (key === 'length') break;
-                  if ($(val).data().xuData.node) {
-                    for await (const node of $(val).data().xuData.node.children) {
-                      if (item.id !== node.id) continue;
-
-                      if (typeof node.xu_render_made !== 'undefined' && !node.xu_render_made) {
-                        const node_data = UI_WORKER_OBJ.xu_render_cache[node.xu_render_xu_ui_id + node.xu_render_cache_id];
-                        parent_element_ui_id;
-                        const elem_key = node.xu_render_xu_ui_id;
-                        const elem_val = { attributes: [attr], $elm: node_data.$div, data: node_data.data };
-                        if (!elem_val.data?.xuData) continue;
-                        elem_val.data.xuData.parent_element_ui_id = $(val).attr('xu-ui-id');
-                        var res = await func.expression.get(SESSION_ID, elem_val.data.xuAttributes['xu-exp:xu-render'], elem_val.data.xuData.paramsP.dsSessionP, 'UI Property EXP', elem_val.data.xuData.recordid);
-
-                        var attr_value = await func.common.get_cast_val(SESSION_ID, 'refresh xu-attributes', 'xu-render', 'bool', res.result);
-                        try {
-                          const obj = {
-                            ui_type: elem_val.data.xuData.ui_type,
-                            SESSION_ID,
-                            elem_key,
-                            elem_val,
-                            fields_arr,
-                            attr_value,
-                          };
-                          func.UI.worker.add_to_queue(SESSION_ID, 'gui event', 'execute_xu_render_attributes', obj, new_job, elem_val.$elm, elem_val.data.xuData.paramsP.dsSessionP);
-                        } catch (error) {
-                          debugger;
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            }
+            // if (glb.new_xu_render) {
+            //   if (attr === 'xu-exp:xu-render') {
+            //     //|| attr === 'xu-render'
+            //     for await (const [key, val] of Object.entries(_$elem)) {
+            //       if (key === 'length') break;
+            //       if ($(val).data().xuData.node) {
+            //         for await (const node of $(val).data().xuData.node.children) {
+            //           if (item.id !== node.id) continue;
+
+            //           if (typeof node.xu_render_made !== 'undefined' && !node.xu_render_made) {
+            //             const node_data = UI_WORKER_OBJ.xu_render_cache[node.xu_render_xu_ui_id + node.xu_render_cache_id];
+            //             parent_element_ui_id;
+            //             const elem_key = node.xu_render_xu_ui_id;
+            //             const elem_val = { attributes: [attr], $elm: node_data.$div, data: node_data.data };
+            //             if (!elem_val.data?.xuData) continue;
+            //             elem_val.data.xuData.parent_element_ui_id = $(val).attr('xu-ui-id');
+            //             var res = await func.expression.get(SESSION_ID, elem_val.data.xuAttributes['xu-exp:xu-render'], elem_val.data.xuData.paramsP.dsSessionP, 'UI Property EXP', elem_val.data.xuData.recordid);
+
+            //             var attr_value = await func.common.get_cast_val(SESSION_ID, 'refresh xu-attributes', 'xu-render', 'bool', res.result);
+            //             try {
+            //               const obj = {
+            //                 ui_type: elem_val.data.xuData.ui_type,
+            //                 SESSION_ID,
+            //                 elem_key,
+            //                 elem_val,
+            //                 fields_arr,
+            //                 attr_value,
+            //               };
+            //               func.UI.worker.add_to_queue(SESSION_ID, 'gui event', 'execute_xu_render_attributes', obj, new_job, elem_val.$elm, elem_val.data.xuData.paramsP.dsSessionP);
+            //             } catch (error) {
+            //               debugger;
+            //             }
+            //           }
+            //         }
+            //       }
+            //     }
+            //   }
+            // }
           }
         }
         if (found) break;