@xuda.io/xuda-worker-bundle 1.3.2684 → 1.3.2686

package/index.js

@@ -196,6 +196,23 @@ func.runtime.platform = {
       return false;
     }
   },
+  get_cookie_item: function (key) {
+    if (!key) {
+      return null;
+    }
+    const doc = func.runtime.platform.get_document();
+    const cookie_string = doc?.cookie;
+    if (!cookie_string) {
+      return null;
+    }
+    const cookie_entry = cookie_string.split('; ').find(function (cookie) {
+      return cookie.startsWith(key + '=');
+    });
+    if (!cookie_entry) {
+      return null;
+    }
+    return cookie_entry.split('=').slice(1).join('=') || null;
+  },
   get_url_href: function () {
     return func.runtime.platform.get_location()?.href || '';
   },
@@ -2549,6 +2566,9 @@ func.runtime.ui.get_meta_by_element_id = function (element_id) {
 func.runtime.ui.find_element_by_id = function () {
   return null;
 };
+func.runtime.ui.get_parent_element_id = function () {
+  return null;
+};
 func.runtime.ui.get_session_root = function () {
   return null;
 };
@@ -2606,8 +2626,30 @@ func.runtime.ui.get_children = function (target) {
   if (target?._v_id) return target.children.slice();
   return [];
 };
+func.runtime.ui._wrap_matches = function (matches) {
+  if (!matches) matches = [];
+  const result = {
+    length: matches.length,
+    toArray: function () { return matches.slice(); },
+  };
+  for (let i = 0; i < matches.length; i++) {
+    result[i] = matches[i];
+  }
+  result[Symbol.iterator] = function () {
+    let idx = 0;
+    return {
+      next: function () {
+        if (idx < matches.length) {
+          return { value: matches[idx++], done: false };
+        }
+        return { done: true };
+      },
+    };
+  };
+  return result;
+};
 func.runtime.ui.find_by_selector = function () {
-  return { length: 0, toArray: function () { return []; } };
+  return func.runtime.ui._wrap_matches([]);
 };
 func.runtime.ui.insert_before = function ($element) { return $element; };
 func.runtime.ui.insert_after = function ($element) { return $element; };
@@ -2717,6 +2759,9 @@ func.runtime.ui.remove_xu_ui = function (xu_ui_id) {
   func.runtime.ui.delete_meta(xu_ui_id);
   return true;
 };
+func.runtime.ui.find_xu_ui_in_root = function () {
+  return func.runtime.ui._wrap_matches([]);
+};
 func.runtime.ui.build_debug_info = function (nodeP, $container, items) {
   const container_data = func.runtime.ui.get_data($container);
   return {
@@ -4622,8 +4667,9 @@ func.datasource.clean = function (SESSION_ID, screenIdP) {
   var arr = [];
   for (const [key, val] of Object.entries(SESSION_OBJ[SESSION_ID].DS_GLB)) {
     try {
-      const _screen_el = val.screenId ? document.getElementById(val.screenId) : null;
-      const screen_parent_id = _screen_el?.parentElement?.id || null;
+      const screen_parent_id = val.screenId && func.runtime?.ui?.get_parent_element_id
+        ? func.runtime.ui.get_parent_element_id(val.screenId)
+        : null;
       if (
         Number(key) > 0 &&
         (val.screenId === screenIdP ||
@@ -4632,7 +4678,7 @@ func.datasource.clean = function (SESSION_ID, screenIdP) {
           (val && val.parentDataSourceNo && arr.includes(val.parentDataSourceNo.toString())))
       ) {
         arr.push(key);
-        if (val.screenId) func.UI.utils.screen_blocker(false, val.screenId);
+        if (val.screenId && func.UI?.utils?.screen_blocker) func.UI.utils.screen_blocker(false, val.screenId);
       }
     } catch (err) {
       console.warn('func.datasource.clean failed');
@@ -8735,6 +8781,7 @@ func.events.execute = async function (
     },
     execute_native_javascript: async function () {
       const module = await func.common.get_module(SESSION_ID, 'xuda-event-javascript-module.mjs');
+      const resolved_element_expr = `(func.runtime.ui && func.runtime.ui.find_xu_ui_in_root && func.runtime.ui.get_first_node ? func.runtime.ui.get_first_node(func.runtime.ui.find_xu_ui_in_root(SESSION_ID, ${JSON.stringify(elementP)})) : null)`;
 
       const result = await module.run_javascript(
         SESSION_ID,
@@ -8742,7 +8789,7 @@ func.events.execute = async function (
         dsSession,
         `(async function(el,evt) {
           ${refIdP.value}
-          })(document.querySelector(\`[xu-ui-id="${elementP}"]\`),evt)`,
+          })(${resolved_element_expr},evt)`,
         null,
         null,
         null,
@@ -8755,6 +8802,7 @@ func.events.execute = async function (
     },
     execute_evaluate_javascript: async function () {
       const module = await func.common.get_module(SESSION_ID, 'xuda-event-javascript-module.mjs');
+      const resolved_element_expr = `(func.runtime.ui && func.runtime.ui.find_xu_ui_in_root && func.runtime.ui.get_first_node ? func.runtime.ui.get_first_node(func.runtime.ui.find_xu_ui_in_root(SESSION_ID, ${JSON.stringify(elementP)})) : null)`;
 
       const result = await module.run_javascript(
         SESSION_ID,
@@ -8762,7 +8810,7 @@ func.events.execute = async function (
         dsSession,
         `(async function(el,evt) {
           ${refIdP.value}
-          })(document.querySelector(\`[xu-ui-id="${elementP}"]\`),evt)`,
+          })(${resolved_element_expr},evt)`,
         true,
         null,
         null,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xuda.io/xuda-worker-bundle",
-  "version": "1.3.2684",
+  "version": "1.3.2686",
   "description": "xuda framework",
   "main": "index.js",
   "scripts": {