@xuda.io/runtime-bundle 1.0.1249 → 1.0.1250

package/js/xuda-runtime-slim.js

@@ -14756,162 +14756,312 @@ func.UI.screen.panel_post_render_handler = async function (
   return jobNoP;
 };
 
+// const generate_xu_ui_id = async function (SESSION_ID, nodeP, $container, paramsP, keyP) {
+//   // const _paramsP = _.cloneDeep(paramsP);
+//   const _paramsP = klona.klona(paramsP);
+//   var _ds = SESSION_OBJ[SESSION_ID].DS_GLB[_paramsP.dsSessionP];
+
+//   const currentRecordId = $container?.data?.()?.xuData?.recordid || (_ds ? _ds.currentRecordId : '');
+//   const key_path = `${$container?.data()?.xuData?.key_path || '0'}-${keyP || '0'}`;
+//   const elem_key = `${nodeP.xu_tree_id || nodeP.id}-${key_path}-${currentRecordId}`;
+//   let ui_id = `${nodeP.id}-${elem_key}-${_paramsP?.dsSessionP?.toString() || ''}`; //nodeP.xu_tree_id ||
+
+//   const new_ui_id = await func.common.sha256(ui_id);
+//   return new_ui_id;
+// };
+
 const generate_xu_ui_id = async function (SESSION_ID, nodeP, $container, paramsP, keyP) {
-  // const _paramsP = _.cloneDeep(paramsP);
-  const _paramsP = klona.klona(paramsP);
-  var _ds = SESSION_OBJ[SESSION_ID].DS_GLB[_paramsP.dsSessionP];
+  // Avoid cloning if we only need dsSessionP
+  const dsSessionP = paramsP.dsSessionP;
+  const _ds = SESSION_OBJ[SESSION_ID].DS_GLB[dsSessionP];
+
+  // Cache container data access
+  const containerXuData = $container?.data?.()?.xuData;
+  const currentRecordId = containerXuData?.recordid || _ds?.currentRecordId || '';
 
-  const currentRecordId = $container?.data?.()?.xuData?.recordid || (_ds ? _ds.currentRecordId : '');
-  const key_path = `${$container?.data()?.xuData?.key_path || '0'}-${keyP || '0'}`;
-  const elem_key = `${nodeP.xu_tree_id || nodeP.id}-${key_path}-${currentRecordId}`;
-  let ui_id = `${nodeP.id}-${elem_key}-${_paramsP?.dsSessionP?.toString() || ''}`; //nodeP.xu_tree_id ||
+  // Build strings efficiently
+  const key_path = `${containerXuData?.key_path || '0'}-${keyP || '0'}`;
+  const nodeId = nodeP.xu_tree_id || nodeP.id;
+  const elem_key = `${nodeId}-${key_path}-${currentRecordId}`;
+  const ui_id = `${nodeP.id}-${elem_key}-${dsSessionP?.toString() || ''}`;
 
-  const new_ui_id = await func.common.sha256(ui_id);
-  return new_ui_id;
+  return await func.common.fastHash(ui_id);
 };
 
+// func.UI.screen.create_container = async function (SESSION_ID, $root_container, nodeP, $container, paramsP, parent_infoP, jobNoP, keyP, parent_nodeP, prop, classP, elem_propP, div_typeP, $appendToP, attr_str, is_placeholder) {
+//   // const _paramsP = _.cloneDeep(paramsP);
+//   const _paramsP = klona.klona(paramsP);
+//   var _ds = SESSION_OBJ[SESSION_ID].DS_GLB[_paramsP.dsSessionP];
+//   var $appendTo = $container;
+//   if ($appendToP) $appendTo = $appendToP;
+//   if (!$appendTo || !$appendTo.length) return null; // screen closed or not exist abort build
+//   var div = 'div';
+//   if (div_typeP) div = div_typeP;
+//   var items = [];
+//   if (nodeP.children)
+//     items = nodeP.children.map(function (val) {
+//       return val.xu_tree_id || val.id;
+//     });
+//   var currentRecordId = $container?.data?.()?.xuData?.recordid || (_ds ? _ds.currentRecordId : '');
+//   // var xu_id = (glb.screen_num++).toString();
+//   // xu_id = xu_id += '_' + currentRecordId;
+
+//   try {
+//     const key_path = `${$container?.data()?.xuData?.key_path || '0'}-${keyP || '0'}`;
+//     const elem_key = `${nodeP.xu_tree_id || nodeP.id}-${key_path}-${currentRecordId}`;
+//     // let ui_id = `${nodeP.id}-${elem_key}-${_paramsP?.dsSessionP?.toString() || ''}`; //nodeP.xu_tree_id ||
+
+//     /////////////////////////////////
+
+//     var $div;
+
+//     if (div === 'svg') {
+//       const draw_svg = function (element) {
+//         const get_tag_str = function (element, prop, val) {
+//           let class_str = '';
+//           let attr_str = '';
+//           for (const [key, val] of Object.entries(prop)) {
+//             if (key.substr(0, 2) !== 'xu') {
+//               attr_str += ` ${key}="${val}" `;
+//             }
+//           }
+//           if (element === 'svg') {
+//             return `<${element}  ${attr_str} > `;
+//           }
+//           let ret = '';
+//           if (val?.children?.length) {
+//             ret = iterate_svg(val);
+//           }
+
+//           return `<${element} ${class_str} ${attr_str} > ${ret} </${element}>`;
+//         };
+//         let svg_str = get_tag_str(element, prop);
+//         let inner_str = '';
+//         const iterate_svg = function (node) {
+//           let ret = '';
+//           if (node.children) {
+//             for (let val of node.children) {
+//               let prop = val.attributes;
+//               ret += get_tag_str(val.tagName, prop, val);
+//             }
+//           }
+//           return ret;
+//         };
+//         inner_str = iterate_svg(nodeP);
+
+//         $div = $(svg_str + inner_str + '</svg>').appendTo($appendTo);
+//       };
+
+//       draw_svg(div_typeP);
+//     } else {
+//       $div = $(`<${div} ${attr_str ? attr_str : ''}>`);
+//     }
+
+//     // // Returns a 32-bit unsigned integer hash of a string (FNV-1a)
+//     // function hash32(str) {
+//     //   let h = 0x811c9dc5; // FNV offset basis
+//     //   for (let i = 0; i < str.length; i++) {
+//     //     h ^= str.charCodeAt(i);
+//     //     // multiply by FNV prime (2^24 + 2^8 + 0x93) with 32-bit overflow
+//     //     h += (h << 1) + (h << 4) + (h << 7) + (h << 8) + (h << 24);
+//     //   }
+//     //   // Convert to unsigned 32-bit
+//     //   return h >>> 0;
+//     // }
+
+//     // function hash32hex(str) {
+//     //   return (hash32(str) >>> 0).toString(16).padStart(8, '0');
+//     // }
+
+//     // const new_ui_id = hash32hex(ui_id);
+//     // const new_ui_id = await func.common.sha256(ui_id);
+//     const new_ui_id = await generate_xu_ui_id(SESSION_ID, nodeP, $container, paramsP, keyP);
+
+//     $div
+//       .attr('xu-ui-id', new_ui_id)
+//       // .attr('xu-node-id', nodeP.id)
+//       .data({
+//         xuData: {
+//           prog_id: _paramsP.prog_id,
+//           nodeid: nodeP.id,
+//           ui_type: nodeP.tagName,
+//           // xu_id,
+//           recordid: currentRecordId,
+//           paramsP: _paramsP,
+//           key: keyP,
+//           key_path, //:($container?.data()?.xuData?.key || "0") + "-" + (keyP || "0"),
+//           screenId: _paramsP.screenId,
+//           parent_container: $container?.attr('id'),
+//           elem_key,
+//           properties: prop,
+//           node: nodeP,
+//           node_org: _.cloneDeep(nodeP),
+//           is_panelP: _paramsP.is_panelP,
+//           ui_id: new_ui_id,
+//           elem_prop: elem_propP,
+//           debug_info: {
+//             id: nodeP.id,
+//             parent_id: $container?.data()?.xuData?.ui_id,
+//             items: items,
+//           },
+//           parent_node: parent_nodeP,
+//           currentRecordId: currentRecordId,
+//           $root_container: $root_container,
+//           parent_element_ui_id: $container?.data()?.xuData?.ui_id,
+//         },
+//         xuAttributes: {},
+//       });
+//     if (is_placeholder) {
+//       $div.addClass('display_none');
+//     }
+
+//     if (div_typeP !== 'svg') {
+//       $div.appendTo($appendTo);
+//     }
+//   } catch (e) {
+//     console.error(e);
+//   }
+
+//   if (parent_infoP?.iterate_info) {
+//     $div.data().xuData.iterate_info = parent_infoP.iterate_info;
+//   }
+
+//   if (classP) $div.addClass(classP);
+
+//   return $div;
+// };
+
 func.UI.screen.create_container = async function (SESSION_ID, $root_container, nodeP, $container, paramsP, parent_infoP, jobNoP, keyP, parent_nodeP, prop, classP, elem_propP, div_typeP, $appendToP, attr_str, is_placeholder) {
-  // const _paramsP = _.cloneDeep(paramsP);
   const _paramsP = klona.klona(paramsP);
-  var _ds = SESSION_OBJ[SESSION_ID].DS_GLB[_paramsP.dsSessionP];
-  var $appendTo = $container;
-  if ($appendToP) $appendTo = $appendToP;
-  if (!$appendTo || !$appendTo.length) return null; // screen closed or not exist abort build
-  var div = 'div';
-  if (div_typeP) div = div_typeP;
-  var items = [];
-  if (nodeP.children)
-    items = nodeP.children.map(function (val) {
-      return val.xu_tree_id || val.id;
-    });
-  var currentRecordId = $container?.data?.()?.xuData?.recordid || (_ds ? _ds.currentRecordId : '');
-  // var xu_id = (glb.screen_num++).toString();
-  // xu_id = xu_id += '_' + currentRecordId;
+  const _ds = SESSION_OBJ[SESSION_ID].DS_GLB[_paramsP.dsSessionP];
+  const $appendTo = $appendToP || $container;
+
+  // Early exit if container doesn't exist
+  if (!$appendTo?.length) return null;
+
+  const div = div_typeP || 'div';
+
+  // Cache container data to avoid repeated access
+  const containerData = $container?.data?.();
+  const containerXuData = containerData?.xuData;
+  const currentRecordId = containerXuData?.recordid || (_ds ? _ds.currentRecordId : '');
+
+  // Pre-compute items array
+  const items = nodeP.children ? nodeP.children.map((val) => val.xu_tree_id || val.id) : [];
 
   try {
-    const key_path = `${$container?.data()?.xuData?.key_path || '0'}-${keyP || '0'}`;
+    const key_path = `${containerXuData?.key_path || '0'}-${keyP || '0'}`;
     const elem_key = `${nodeP.xu_tree_id || nodeP.id}-${key_path}-${currentRecordId}`;
-    // let ui_id = `${nodeP.id}-${elem_key}-${_paramsP?.dsSessionP?.toString() || ''}`; //nodeP.xu_tree_id ||
-
-    /////////////////////////////////
 
-    var $div;
+    let $div;
 
+    // Handle SVG creation
     if (div === 'svg') {
       const draw_svg = function (element) {
         const get_tag_str = function (element, prop, val) {
-          let class_str = '';
-          let attr_str = '';
-          for (const [key, val] of Object.entries(prop)) {
-            if (key.substr(0, 2) !== 'xu') {
-              attr_str += ` ${key}="${val}" `;
+          const attrs = [];
+
+          for (const [key, value] of Object.entries(prop)) {
+            if (!key.startsWith('xu')) {
+              attrs.push(`${key}="${value}"`);
             }
           }
+
+          const attr_str = attrs.join(' ');
+
           if (element === 'svg') {
-            return `<${element}  ${attr_str} > `;
-          }
-          let ret = '';
-          if (val?.children?.length) {
-            ret = iterate_svg(val);
+            return `<${element} ${attr_str}>`;
           }
 
-          return `<${element} ${class_str} ${attr_str} > ${ret} </${element}>`;
+          const inner = val?.children?.length ? iterate_svg(val) : '';
+          return `<${element} ${attr_str}>${inner}</${element}>`;
         };
-        let svg_str = get_tag_str(element, prop);
-        let inner_str = '';
+
         const iterate_svg = function (node) {
-          let ret = '';
-          if (node.children) {
-            for (let val of node.children) {
-              let prop = val.attributes;
-              ret += get_tag_str(val.tagName, prop, val);
-            }
-          }
-          return ret;
+          if (!node.children) return '';
+
+          return node.children.map((val) => get_tag_str(val.tagName, val.attributes, val)).join('');
         };
-        inner_str = iterate_svg(nodeP);
+
+        const svg_str = get_tag_str(element, prop);
+        const inner_str = iterate_svg(nodeP);
 
         $div = $(svg_str + inner_str + '</svg>').appendTo($appendTo);
       };
 
       draw_svg(div_typeP);
     } else {
-      $div = $(`<${div} ${attr_str ? attr_str : ''}>`);
+      $div = $(`<${div}${attr_str ? ' ' + attr_str : ''}>`);
     }
 
-    // // Returns a 32-bit unsigned integer hash of a string (FNV-1a)
-    // function hash32(str) {
-    //   let h = 0x811c9dc5; // FNV offset basis
-    //   for (let i = 0; i < str.length; i++) {
-    //     h ^= str.charCodeAt(i);
-    //     // multiply by FNV prime (2^24 + 2^8 + 0x93) with 32-bit overflow
-    //     h += (h << 1) + (h << 4) + (h << 7) + (h << 8) + (h << 24);
-    //   }
-    //   // Convert to unsigned 32-bit
-    //   return h >>> 0;
-    // }
+    // Generate UI ID
+    const new_ui_id = await generate_xu_ui_id(SESSION_ID, nodeP, $container, paramsP, keyP);
 
-    // function hash32hex(str) {
-    //   return (hash32(str) >>> 0).toString(16).padStart(8, '0');
-    // }
+    // Set attributes and data in one go
+    $div.attr('xu-ui-id', new_ui_id);
+
+    // Build xuData object efficiently
+    const xuData = {
+      prog_id: _paramsP.prog_id,
+      nodeid: nodeP.id,
+      ui_type: nodeP.tagName,
+      recordid: currentRecordId,
+      paramsP: _paramsP,
+      key: keyP,
+      key_path,
+      screenId: _paramsP.screenId,
+      parent_container: containerData?.id,
+      elem_key,
+      properties: prop,
+      node: nodeP,
+      node_org: _.cloneDeep(nodeP),
+      is_panelP: _paramsP.is_panelP,
+      ui_id: new_ui_id,
+      elem_prop: elem_propP,
+      debug_info: {
+        id: nodeP.id,
+        parent_id: containerXuData?.ui_id,
+        items: items,
+      },
+      parent_node: parent_nodeP,
+      currentRecordId: currentRecordId,
+      $root_container: $root_container,
+      parent_element_ui_id: containerXuData?.ui_id,
+    };
 
-    // const new_ui_id = hash32hex(ui_id);
-    // const new_ui_id = await func.common.sha256(ui_id);
-    const new_ui_id = await generate_xu_ui_id(SESSION_ID, nodeP, $container, paramsP, keyP);
+    // Add iterate_info if present
+    if (parent_infoP?.iterate_info) {
+      xuData.iterate_info = parent_infoP.iterate_info;
+    }
 
-    $div
-      .attr('xu-ui-id', new_ui_id)
-      // .attr('xu-node-id', nodeP.id)
-      .data({
-        xuData: {
-          prog_id: _paramsP.prog_id,
-          nodeid: nodeP.id,
-          ui_type: nodeP.tagName,
-          // xu_id,
-          recordid: currentRecordId,
-          paramsP: _paramsP,
-          key: keyP,
-          key_path, //:($container?.data()?.xuData?.key || "0") + "-" + (keyP || "0"),
-          screenId: _paramsP.screenId,
-          parent_container: $container?.attr('id'),
-          elem_key,
-          properties: prop,
-          node: nodeP,
-          node_org: _.cloneDeep(nodeP),
-          is_panelP: _paramsP.is_panelP,
-          ui_id: new_ui_id,
-          elem_prop: elem_propP,
-          debug_info: {
-            id: nodeP.id,
-            parent_id: $container?.data()?.xuData?.ui_id,
-            items: items,
-          },
-          parent_node: parent_nodeP,
-          currentRecordId: currentRecordId,
-          $root_container: $root_container,
-          parent_element_ui_id: $container?.data()?.xuData?.ui_id,
-        },
-        xuAttributes: {},
-      });
+    // Set data once
+    $div.data({
+      xuData: xuData,
+      xuAttributes: {},
+    });
+
+    // Apply placeholder class if needed
     if (is_placeholder) {
       $div.addClass('display_none');
     }
 
+    // Apply custom class if provided
+    if (classP) {
+      $div.addClass(classP);
+    }
+
+    // Append to DOM (only for non-SVG elements)
     if (div_typeP !== 'svg') {
       $div.appendTo($appendTo);
     }
-  } catch (e) {
-    console.error(e);
-  }
 
-  if (parent_infoP?.iterate_info) {
-    $div.data().xuData.iterate_info = parent_infoP.iterate_info;
+    return $div;
+  } catch (e) {
+    console.error('create_container error:', e);
+    return null;
   }
-
-  if (classP) $div.addClass(classP);
-
-  return $div;
 };
+
 func.UI.screen.execute_screen_ready_events = async function (SESSION_ID, paramsP, sourceP, $div, jobNoP, $div_objP) {
   var _ds = SESSION_OBJ[SESSION_ID].DS_GLB[paramsP.dsSessionP];
   if (!_ds) return;