@xuda.io/xuda-worker-bundle-min 1.3.1078 → 1.3.1080

package/index.js

@@ -2368,10 +2368,32 @@ func.datasource.execute = async function (
         _ds.v,
         _ds
       );
+
+      let filterModelMongo = _ds.progDataSource.filterModelMongo;
+      if (_ds.progDataSource.filterModelMongoFx) {
+        let ret = await func.expression.get(
+          SESSION_ID,
+          _ds.progDataSource.filterModelMongoFx,
+          dataSourceSession,
+          "query"
+        );
+        filterModelMongo = ret.result;
+      }
+      let filterModelSql = _ds.progDataSource.filterModelSql;
+      if (_ds.progDataSource.filterModelSqlFx) {
+        let ret = await func.expression.get(
+          SESSION_ID,
+          _ds.progDataSource.filterModelSqlFx,
+          dataSourceSession,
+          "query"
+        );
+        filterModelSql = ret.result;
+      }
+
       const filterModel = {
         filterModelNative: _ds.progDataSource.filterModelNative,
-        filterModelMongo: _ds.progDataSource.filterModelMongo,
-        filterModelSql: _ds.progDataSource.filterModelSql,
+        filterModelMongo,
+        filterModelSql,
         filterModelUserMongo: _ds.progDataSource.filterModelUserMongo,
         filterModelUserSql: _ds.progDataSource.filterModelUserSql,
       };
@@ -8194,7 +8216,13 @@ func.events.execute = async function (
           );
         };
         const get_property_value = async function (fieldIdP, val) {
-          var value = props[fieldIdP];
+          // var value = props[fieldIdP];
+
+          var value =
+            props[fieldIdP] ||
+            (typeof val.defaultValue === "function"
+              ? val?.defaultValue?.()
+              : val?.defaultValue);
 
           if (props[`xu-exp:${fieldIdP}`]) {
             value = (
@@ -9496,11 +9524,20 @@ func.expression.get = async function (
             !["DbQuery", "alert", "exp", "api_rendered_output"].includes(
               sourceP
             ) &&
-            ["string", "date", "time"].includes(val.type) &&
+            ["string", "date"].includes(val.type) &&
+            var_Arr.length > 1
+          ) {
+            res[key] = "`" + val.value + "`";
+          }
+          // new Dec 18 2024 for Ishai
+          if (
+            ["api_rendered_output"].includes(sourceP) &&
+            ["string", "date"].includes(val.type) &&
             var_Arr.length > 1
           ) {
-            res[key] = "`" + val.value + "`"; //res[key] = "'" + val.value + "'"; //
+            res[key] = `"` + val.value + `"`;
           }
+
           if (val.fieldId && val.value && typeof val.value === "string") {
             if (
               ["query", "condition", "range", "sort", "locate"].includes(

package/package.json

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