@xuda.io/xuda-worker-bundle-min 1.3.788 → 1.3.790

package/index.js

@@ -1899,6 +1899,8 @@ func.datasource.prepare = async function (
       IS_DATASOURCE_REFRESH = true;
 
       try {
+        if (!_ds.v) _ds.v = {};
+
         delete _ds.v.old_dataSource; // to eliminate parse error
         delete _ds.rows_found;
         _ds.raw_data = {};
@@ -2065,7 +2067,7 @@ func.datasource.execute = async function (
     if (tree_ret.menuType === "get_data") {
       return 1;
     }
-    ret = _ds.v.progDataSource?.dataSourceLimit;
+    ret = _ds.progDataSource?.dataSourceLimit;
 
     if (prog_obj.progDataSource?.dataSourceLoopExp) {
       ret = (
@@ -2084,7 +2086,7 @@ func.datasource.execute = async function (
   const calc_batch_loops = async () => {
     if (
       !prog_obj.progDataSource?.dataSourceType ||
-      _ds.v.progDataSource.dataSourceType === "none"
+      _ds.progDataSource.dataSourceType === "none"
     ) {
       _ds.v.batch_loops = await get_limit();
       return false;
@@ -2408,7 +2410,7 @@ func.datasource.execute = async function (
           0,
           _ds.api_rendered_output.length - 1
         );
-        if (Number(_ds.v.progDataSource?.dataSourceLimit) === 1) {
+        if (Number(_ds.progDataSource?.dataSourceLimit) === 1) {
           _ds.api_rendered_output = str;
         } else {
           _ds.api_rendered_output = "[" + str + "]";
@@ -2493,7 +2495,7 @@ func.datasource.execute = async function (
     case "set_data":
       if (
         !prog_obj.progDataSource?.dataSourceType ||
-        _ds.v.progDataSource.dataSourceType !== "table" ||
+        _ds.progDataSource.dataSourceType !== "table" ||
         !_ds._dataSourceTableId
       ) {
         return func.utils.debug_report(
@@ -2729,7 +2731,7 @@ func.datasource.render_fields_dataset = async function (
     var fieldType = view_field_obj?.props?.fieldType;
     let table_field_obj;
     if (view_field_obj.data.type === "table" && field_id !== "REDUCE_VALUE") {
-      if (!_ds.v.progDataSource?.dataSourceTableId) {
+      if (!_ds.progDataSource?.dataSourceTableId) {
         return func.utils.debug_report(
           SESSION_ID,
           "Datasource",
@@ -2850,7 +2852,7 @@ func.datasource.render_fields_form = async function (
   data
 ) {
   var _ds = SESSION_OBJ[SESSION_ID].DS_GLB[dataSourceSession];
-  var v = _ds.v;
+  // var v = _ds.v;
 
   const _progFields = await func.datasource.get_progFields(
     SESSION_ID,
@@ -3007,7 +3009,7 @@ func.datasource.run_rows_form = async function (
 ) {
   var _ds = SESSION_OBJ[SESSION_ID].DS_GLB[dataSourceSession];
   if (!_ds) return;
-  var v = _ds.v;
+  // var v = _ds.v;
 
   var val = _ds.v.raw_data.rows[rowIdxP];
 
@@ -3039,7 +3041,7 @@ func.datasource.run_rows_form = async function (
           SESSION_ID,
           dataSourceSession,
           "form",
-          _ds.v.progDataSource.dataSourceSortScript,
+          _ds.progDataSource.dataSourceSortScript,
           idx,
           sort_index
         );
@@ -3047,7 +3049,7 @@ func.datasource.run_rows_form = async function (
           SESSION_ID,
           dataSourceSession,
           "form",
-          _ds.v.progDataSource.dataSourceGroupByScript,
+          _ds.progDataSource.dataSourceGroupByScript,
           idx,
           sort_index
         );
@@ -3063,10 +3065,10 @@ func.datasource.run_rows_form = async function (
         _ds.rows_found--;
         _ds.viewRangeExp_rows_deleted++;
       };
-      if (_ds.v.progDataSource?.dataSourceFiltersScript) {
+      if (_ds.progDataSource?.dataSourceFiltersScript) {
         var res = await func.datasource.validate_viewRange(
           SESSION_ID,
-          _ds.v.progDataSource.dataSourceFiltersScript,
+          _ds.progDataSource.dataSourceFiltersScript,
           dataSourceSession,
           idx,
           "form"
@@ -3082,10 +3084,10 @@ func.datasource.run_rows_form = async function (
       }
       await sort_form();
 
-      if (_ds.v.progDataSource?.dataSourceLocateScript) {
+      if (_ds.progDataSource?.dataSourceLocateScript) {
         var res = func.datasource.validate_viewLocate(
           SESSION_ID,
-          _ds.v.progDataSource.dataSourceLocateScript,
+          _ds.progDataSource.dataSourceLocateScript,
           dataSourceSession,
           idx,
           "form"
@@ -3094,7 +3096,7 @@ func.datasource.run_rows_form = async function (
           _ds.locatedRecordId = idx;
         }
       }
-      if (_ds.v.progDataSource?.dataSourceFiltersScript) {
+      if (_ds.progDataSource?.dataSourceFiltersScript) {
         return;
       }
     };
@@ -3553,7 +3555,7 @@ func.datasource.get_event_interval_arr = function (
   typeP
 ) {
   var _ds = SESSION_OBJ[SESSION_ID].DS_GLB[dataSourceSession];
-  var v = _ds.v;
+  // var v = _ds.v;
   var arr = [];
 
   var ret = 0;
@@ -4487,8 +4489,8 @@ func.datasource.interval = function (session_id, dsSessionP, typeP) {
   var SESSION_ID = session_id;
   var interval = [];
   var _ds = SESSION_OBJ[SESSION_ID].DS_GLB[dsSessionP];
-  var ds = _ds;
-  var v = ds.v;
+  // var ds = _ds;
+  // var v = ds.v;
   // var arr = func.datasource.get_event_interval_arr(
   //   SESSION_ID,
   //   dsSessionP,
@@ -4555,8 +4557,8 @@ func.datasource.interval = function (session_id, dsSessionP, typeP) {
 func.datasource.server_cron = function (session_id) {
   var SESSION_ID = session_id;
   var jobs = [];
-  var ds = SESSION_OBJ[SESSION_ID].DS_GLB[0];
-  var v = ds.v;
+  // var ds = SESSION_OBJ[SESSION_ID].DS_GLB[0];
+  // var v = ds.v;
   var arr = func.datasource.get_event_interval_arr(
     SESSION_ID,
     0,
@@ -4624,14 +4626,14 @@ func.datasource.get_viewLoops = async function (
   if (batch_source === "db_data") ret = _.size(data.rows);
   if (batch_source === "array" || batch_source === "csv") ret = data.length;
   if (batch_source === "json") ret = Object.keys(data).length;
-  if (_ds.v.progDataSource?.dataSourceLimit) {
+  if (_ds.progDataSource?.dataSourceLimit) {
     if (
       batch_source !== "no_data" &&
-      Number(_ds.v.progDataSource?.dataSourceLimit) < ret
+      Number(_ds.progDataSource?.dataSourceLimit) < ret
     ) {
-      ret = Number(_ds.v.progDataSource.dataSourceLimit);
+      ret = Number(_ds.progDataSource.dataSourceLimit);
     }
-    if (!batch_source) ret = Number(_ds.v.progDataSource.dataSourceLimit);
+    if (!batch_source) ret = Number(_ds.progDataSource.dataSourceLimit);
   }
   if (prog_obj.progDataSource?.dataSourceLoopExp) {
     var n = (
@@ -4666,7 +4668,7 @@ func.datasource.set_VIEW_data = async function (SESSION_ID, args, _ds) {
   _ds.v.dataSourceSrcType = view.dataSourceSrcType;
   _ds.v.viewExitExp = view.dataSourceExitScript;
 
-  if (view.progDataSource) _ds.v.progDataSource = view.progDataSource;
+  if (view.progDataSource) _ds.progDataSource = view.progDataSource;
 
   _ds.v.viewIndex = view?.progDataSource?.dataSourceIndexesObj;
 
@@ -4684,8 +4686,8 @@ func.datasource.set_VIEW_data = async function (SESSION_ID, args, _ds) {
   if (view.progEvents) _ds.v.progEvents = view.progEvents;
 
   _ds._progDataSource_fields = [];
-  if (_ds.v.progDataSource) {
-    let ret = func.expression.parse(JSON.stringify(_ds.v.progDataSource));
+  if (_ds.progDataSource) {
+    let ret = func.expression.parse(JSON.stringify(_ds.progDataSource));
     _ds._progDataSource_fields = ret.map((e) => {
       if (e.fieldId) return e.fieldId;
     });
@@ -8370,18 +8372,29 @@ func.events.execute = async function (
         SESSION_ID,
         "xuda-event-javascript-module.mjs"
       );
-      return await module.run_javascript(SESSION_ID, jobNoP, refIdP, dsSession);
+
+      return await module.run_javascript(
+        SESSION_ID,
+        jobNoP,
+        dsSession,
+        `(async function($elm) {
+          ${refIdP.value}
+          })(document.querySelector(\`[xu-ui-id=${elementP}]\`))`
+      );
     },
     execute_evaluate_javascript: async function () {
       const module = await func.common.get_module(
         SESSION_ID,
         "xuda-event-javascript-module.mjs"
       );
+
       return await module.run_javascript(
         SESSION_ID,
         jobNoP,
-        refIdP,
         dsSession,
+        `(async function($elm) {
+          ${refIdP.value}
+          })(document.querySelector(\`[xu-ui-id=${elementP}]\`))`,
         true
       );
     },

package/package.json

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