@xuda.io/xuda-worker-bundle-min 1.3.709 → 1.3.711

package/index.js

@@ -168,46 +168,46 @@ glb.API_OUTPUT_ARR = ["json", "html", "xml", "text", "css"];
 
 const PROTECTED_NAMES_ARR = ["THIS", "ROWID"]; //tbd
 
-func.common.get_custom_icon = async function (
-  SESSION_ID,
-  menuIdP,
-  fromTreeP,
-  get_image_onlyP
-) {
-  var ret = "";
-  var iconItemId;
-  let tree_ret = await func.utils.TREE_OBJ.get(SESSION_ID, menuIdP);
-  if (tree_ret) {
-    if (tree_ret.menuType === "icon") {
-      iconItemId = menuIdP;
-    } else {
-      if (tree_ret.rICN) iconItemId = tree_ret.rICN;
-    }
-    if (iconItemId) {
-      let tree_ret2 = await func.utils.TREE_OBJ.get(SESSION_ID, iconItemId);
-      if (tree_ret2) {
-        if (get_image_onlyP) {
-          return tree_ret2.rPTH;
-        } else {
-          const app_obj = APP_OBJ[SESSION_OBJ[SESSION_ID].app_id];
-          const url = func.common.get_url(
-            SESSION_ID,
-            "studio-drive",
-            `${app_obj.app_replicate ? app_obj.app_replicate : app_obj._id}/${
-              tree_ret2.rPTH
-            }`
-          );
-          return url;
-        }
-        // }
-      } else {
-        return ret;
-      }
-    } else {
-      return ret;
-    }
-  } else return ret;
-};
+// func.common.get_custom_icon = async function (
+//   SESSION_ID,
+//   menuIdP,
+//   fromTreeP,
+//   get_image_onlyP
+// ) {
+//   var ret = "";
+//   var iconItemId;
+//   let tree_ret = await func.utils.TREE_OBJ.get(SESSION_ID, menuIdP);
+//   if (tree_ret) {
+//     if (tree_ret.menuType === "icon") {
+//       iconItemId = menuIdP;
+//     } else {
+//       if (tree_ret.rICN) iconItemId = tree_ret.rICN;
+//     }
+//     if (iconItemId) {
+//       let tree_ret2 = await func.utils.TREE_OBJ.get(SESSION_ID, iconItemId);
+//       if (tree_ret2) {
+//         if (get_image_onlyP) {
+//           return tree_ret2.rPTH;
+//         } else {
+//           const app_obj = APP_OBJ[SESSION_OBJ[SESSION_ID].app_id];
+//           const url = func.common.get_url(
+//             SESSION_ID,
+//             "studio-drive",
+//             `${app_obj.app_replicate ? app_obj.app_replicate : app_obj._id}/${
+//               tree_ret2.rPTH
+//             }`
+//           );
+//           return url;
+//         }
+//         // }
+//       } else {
+//         return ret;
+//       }
+//     } else {
+//       return ret;
+//     }
+//   } else return ret;
+// };
 
 func.common.db = async function (
   SESSION_ID,
@@ -9227,8 +9227,6 @@ func.expression.get = async function (
         }
       }
 
-      const is_email = glb.emailRegex.test(valP);
-
       ret = ret.replace(/\&/g, "&");
       ret = func.utils.replace_studio_drive_url(SESSION_ID, ret);
 
@@ -9313,9 +9311,27 @@ func.expression.get = async function (
           return end_results();
         }
       };
-      if (!func.expression.validate_variables(valP) || is_email) {
+      if (!func.expression.validate_variables(valP)) {
         return await variable_not_exist();
       }
+
+      const validate_email = async function () {
+        const ret = await func.expression.secure_eval(
+          SESSION_ID,
+          sourceP,
+          valP,
+          jobNo,
+          dsSessionP,
+          js_script_callback
+        );
+
+        return glb.emailRegex.test(ret);
+      };
+
+      if (await validate_email()) {
+        return await variable_not_exist();
+      }
+
       var split = [];
       var var_Arr = [];
       split = func.expression.parse(ret);

package/package.json

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