@xuda.io/xuda-worker-bundle-min 1.3.261 → 1.3.263

package/index.js

@@ -956,40 +956,6 @@ var STUDIO_PEER_CONN_MSG_QUEUE = [];
 
 var CLIENT_ACTIVITY_TS;
 
-// func.GLB.validate_boolean = function (dataP) {
-//   if (
-//     (dataP === 1) |
-//     (dataP === "true") |
-//     (dataP === true) |
-//     (dataP === 1) |
-//     (dataP === "Y") |
-//     (dataP === "y")
-//   )
-//     return true;
-//   else return false;
-// };
-
-// func.GLB.get_dateShort = function (dateP, yearFirstP) {
-//   var d;
-//   if (dateP) {
-//     try {
-//       var sDate;
-//       if (typeof dateP === "object") sDate = dateP;
-//       else {
-//         if (dateP.indexOf("Z") > -1) sDate = new Date(Date.parse(dateP));
-//         else sDate = new Date(Date.parse(dateP.replace(/-/g, "/")));
-//       }
-//       if (!isNaN(sDate.valueOf())) {
-//         var mm1 = _.padStart(sDate.getMonth() + 1, 2, "0");
-//         var dd1 = _.padStart(sDate.getDate(), 2, "0");
-//         d = mm1 + "-" + dd1 + "-" + sDate.getFullYear();
-//         if (yearFirstP) d = sDate.getFullYear() + "-" + mm1 + "-" + dd1;
-//       }
-//     } catch (err) {}
-//   }
-//   return d;
-// };
-
 glb.REFERENCE_LESS_FUNCTIONS = [
   "update",
   "raise_event",
@@ -1019,26 +985,13 @@ var LOADER_ACTIVE = false;
 var LOADER_TEXT = "";
 var REFRESHER_IN_PROGRESS = false;
 
-// var FIELD_INPUT_TYPE = [
-//   "input",
-//   "select",
-//   "ion-input",
-//   "ion-toggle",
-//   "ion-range",
-//   "ion-checkbox",
-//   "ion-radio",
-//   "ion-select",
-// ];
-
-// var CALL_STACK = [];
-
 glb.screen_num = 0;
 var RESPONSE_FROM_STUDIO_QUEUE = {};
 
 var SCREEN_BLOCKER_OBJ = {};
 var IS_PROGRESS_SCREEN_OPEN = null;
 // var UI_ENGINE_OBJ = null;
-// var CSS_CLASS_CACHE = [];
+
 var UI_WORKER_OBJ = { jobs: [], num: 9000 };
 
 glb.html5_events_handler = [
@@ -1460,6 +1413,7 @@ func.datasource.prepare = async function (
     if (!_ds.data_system) _ds.data_system = {};
     _ds.data_system["SYS_GLOBAL_UTC"] = -new Date().getTimezoneOffset() / 60;
     _ds.data_system["SYS_GLOBAL_STR_APP_ID"] = APP_OBJ[_session.APP_ID]._id;
+    _ds.data_system["SYS_GLOBAL_STR_SESSION_ID"] = SESSION_ID;
     _ds.data_system["SYS_GLOBAL_STR_LOGIN_USER_ID"] = _session.USR_OBJ._id;
 
     if (
@@ -1804,6 +1758,104 @@ func.datasource.execute = async function (
     );
   }
 
+  const get_data_from_source = async function () {
+    switch (prog_obj.progDataSource.dataSourceSrcType) {
+      case "input": {
+        const { result, error } = await func.expression.get(
+          SESSION_ID,
+          prog_obj.progDataSource.progDataSourcev,
+          dataSourceSession,
+          "datasource select"
+        );
+        if (error) {
+          func.utils.debug_report(
+            SESSION_ID,
+            "Data source",
+            `Datasource parse error using ${prog_obj.progDataSource?.dataSourceType} input`,
+            "E"
+          );
+          return null;
+        }
+
+        return result;
+        break;
+      }
+      case "url": {
+        break;
+      }
+      default:
+        break;
+    }
+
+    var val;
+
+    // if (v.viewDataSourceSelect === "url") {
+    //   $_ajax({
+    //     url: val,
+    //     dataType: "json",
+    //     type: "GET",
+    //     success: function (json) {
+    //       callbackP(json);
+    //     },
+    //     fail: function (jqXHR, textStatus) {
+    //       func.common.debug.report(
+    //         "datasource json/array url call error",
+    //         textStatus,
+    //         "E"
+    //       );
+    //       callbackP(textStatus);
+    //     },
+    //     error: function (jqXHR, textStatus, errorThrown) {
+    //       func.common.debug.report(
+    //         "datasource json/array url call error",
+    //         textStatus,
+    //         "E"
+    //       );
+    //       callbackP(textStatus);
+    //     },
+    //     timeout: 60000, //60 seconds timeout
+    //   });
+    // } else callbackP(val);
+
+    // get_val(function (valP) {
+    //   if (
+    //     ["array", "json"].includes(prog_obj.progDataSource.dataSourceSrcType)
+    //   ) {
+    //     if (typeof valP === "object") callbackP(valP);
+    //     else
+    //       try {
+    //         var val_to_parse = valP;
+    //         if (
+    //           valP &&
+    //           valP.substr(0, 1) === "(" &&
+    //           valP.substr(valP.length - 1, 1) === ")"
+    //         )
+    //           val_to_parse = valP.substr(1, valP.length - 2);
+    //         var obj = {};
+    //         if (v.viewDataSourceType === "json") {
+    //           var tmp_obj = JSON.parse(val_to_parse);
+    //           Object.keys(tmp_obj)
+    //             .sort()
+    //             .forEach(function (v, i) {
+    //               obj[v] = tmp_obj[v];
+    //             });
+    //         } else obj = JSON.parse(val_to_parse);
+    //         callbackP(obj);
+    //       } catch (e) {
+    //         func.common.debug.report(
+    //           "datasource json/array parse error",
+    //           e,
+    //           "E"
+    //         );
+    //         callbackP();
+    //       }
+    //   }
+    //   if (v.viewDataSourceType === "csv") {
+    //     callbackP(valP.split(","));
+    //   }
+    // });
+  };
+
   switch (prog_obj.progDataSource?.dataSourceType) {
     case "table":
       _ds._dataSourceTableId = prog_obj.progDataSource?.dataSourceTableId; // get file id
@@ -1873,9 +1925,10 @@ func.datasource.execute = async function (
 
       break;
 
-    case "array":
-      var dataP = await get_arr();
+    case "array": {
+      let data = await get_data_from_source();
       break;
+    }
 
     case "json":
       break;

package/package.json

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