@xuda.io/xuda-worker-bundle-min 1.3.1261 → 1.3.1263

package/index.js

@@ -1035,7 +1035,7 @@ func.api.set_field_value = async function (field_id, value) {
       SESSION_OBJ,
       SESSION_ID,
       APP_OBJ,
-      dsSession: Object.keys(SESSION_OBJ[SESSION_ID].DS_GLB).at(-1),
+      dsSession: func.utils.get_last_datasource_no(SESSION_ID),
     }
   );
 
@@ -1052,7 +1052,7 @@ func.api.get_field_value = async function (field_id) {
       SESSION_OBJ,
       SESSION_ID,
       APP_OBJ,
-      dsSession: Object.keys(SESSION_OBJ[SESSION_ID].DS_GLB).at(-1),
+      dsSession: func.utils.get_last_datasource_no(SESSION_ID),
     }
   );
 
@@ -1069,7 +1069,7 @@ func.api.invoke_event = async function (event_id) {
       SESSION_OBJ,
       SESSION_ID,
       APP_OBJ,
-      dsSession: Object.keys(SESSION_OBJ[SESSION_ID].DS_GLB).at(-1),
+      dsSession: func.utils.get_last_datasource_no(SESSION_ID),
     }
   );
 
@@ -1086,7 +1086,7 @@ func.api.call_project_api = async function (prog_id, params) {
       SESSION_OBJ,
       SESSION_ID,
       APP_OBJ,
-      dsSession: Object.keys(SESSION_OBJ[SESSION_ID].DS_GLB).at(-1),
+      dsSession: func.utils.get_last_datasource_no(SESSION_ID),
     }
   );
 
@@ -1103,7 +1103,7 @@ func.api.call_system_api = async function (api_method, payload) {
       SESSION_OBJ,
       SESSION_ID,
       APP_OBJ,
-      dsSession: Object.keys(SESSION_OBJ[SESSION_ID].DS_GLB).at(-1),
+      dsSession: func.utils.get_last_datasource_no(SESSION_ID),
     }
   );
 
@@ -1121,7 +1121,7 @@ func.api.dbs_create = async function (table_id, data, cb) {
       SESSION_OBJ,
       SESSION_ID,
       APP_OBJ,
-      dsSession: Object.keys(SESSION_OBJ[SESSION_ID].DS_GLB).at(-1),
+      dsSession: func.utils.get_last_datasource_no(SESSION_ID),
     }
   );
 
@@ -1138,7 +1138,7 @@ func.api.dbs_read = async function (table_id, selector, fields, sort, limit, ski
       SESSION_OBJ,
       SESSION_ID,
       APP_OBJ,
-      dsSession: Object.keys(SESSION_OBJ[SESSION_ID].DS_GLB).at(-1),
+      dsSession: func.utils.get_last_datasource_no(SESSION_ID),
     }
   );
 
@@ -1155,7 +1155,7 @@ func.api.dbs_update = async function (table_id, row_id, data) {
       SESSION_OBJ,
       SESSION_ID,
       APP_OBJ,
-      dsSession: Object.keys(SESSION_OBJ[SESSION_ID].DS_GLB).at(-1),
+      dsSession: func.utils.get_last_datasource_no(SESSION_ID),
     }
   );
 
@@ -1172,7 +1172,7 @@ func.api.dbs_delete = async function (table_id, row_id, cb) {
       SESSION_OBJ,
       SESSION_ID,
       APP_OBJ,
-      dsSession: Object.keys(SESSION_OBJ[SESSION_ID].DS_GLB).at(-1),
+      dsSession: func.utils.get_last_datasource_no(SESSION_ID),
     }
   );
 
@@ -1190,7 +1190,7 @@ func.api.call_javascript = async function (prog_id, params, evaluate) {
       SESSION_OBJ,
       SESSION_ID,
       APP_OBJ,
-      dsSession: Object.keys(SESSION_OBJ[SESSION_ID].DS_GLB).at(-1),
+      dsSession: func.utils.get_last_datasource_no(SESSION_ID),
     }
   );
 
@@ -1208,7 +1208,7 @@ func.api.call_javascript = async function (prog_id, params, evaluate) {
       SESSION_OBJ,
       SESSION_ID,
       APP_OBJ,
-      dsSession: Object.keys(SESSION_OBJ[SESSION_ID].DS_GLB).at(-1),
+      dsSession: func.utils.get_last_datasource_no(SESSION_ID),
     }
   );
 
@@ -1408,6 +1408,7 @@ func.common.get_data_from_websocket = async function (
     dbs_calls();
   });
 };
+
  glb.DEBUG_INFO_OBJ = {};
 // var CONNECTION_ATTEMPTS = 0;
 glb.APP_INFO = {};
@@ -1575,7 +1576,7 @@ glb.lifecycle = {
         SESSION_OBJ,
         SESSION_ID,
         APP_OBJ,
-        dsSession: Object.keys(SESSION_OBJ[SESSION_ID].DS_GLB).at(-1),
+        dsSession: func.utils.get_last_datasource_no(),
       }
     );
 
@@ -1612,9 +1613,6 @@ glb.attr_abbreviations_arr = [
   "xu-dblclick",
   "xu-contextmenu",
   "xu-focus",
-  "xu-dragout",
-  "xu-dragin",
-  "xu-dragdrop",
   "xu-keyup",
   "xu-change",
   "xu-blur",
@@ -8015,6 +8013,13 @@ func.utils.set_SYS_GLOBAL_OBJ_WIDGET_INFO = async function (SESSION_ID, docP) {
   await func.datasource.update(SESSION_ID, datasource_changes);
 };
 
+
+func.utils.get_last_datasource_no = function () {
+
+  const filtered = Object.values(SESSION_OBJ[SESSION_ID].DS_GLB).filter(e => e.tree_obj.menuType !== 'api')
+
+  return filtered.at(-1).dssession;
+}
  func.events = {};
 func.events.validate = async function (
   SESSION_ID,

package/package.json

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