@nocobase/server 2.0.11 → 2.0.13

package/lib/helper.js

@@ -239,14 +239,46 @@ function isNumeric(str) {
   return !isNaN(str) && !isNaN(parseFloat(str));
 }
 __name(isNumeric, "isNumeric");
+function getFieldFromCollectionManager(ctx, resourceName, fieldPath) {
+  var _a;
+  const collectionManager = (_a = ctx.dataSource) == null ? void 0 : _a.collectionManager;
+  if (!(collectionManager == null ? void 0 : collectionManager.getCollection)) {
+    return;
+  }
+  const collection = collectionManager.getCollection(resourceName);
+  if (!(collection == null ? void 0 : collection.getField)) {
+    return;
+  }
+  const [firstName, ...others] = fieldPath.split(".");
+  let field = collection.getField(firstName);
+  if (!field || !others.length) {
+    return field;
+  }
+  let currentCollection = typeof field.targetCollection === "function" ? field.targetCollection() : field.targetCollection;
+  for (const name of others) {
+    if (!(currentCollection == null ? void 0 : currentCollection.getField)) {
+      return;
+    }
+    field = currentCollection.getField(name);
+    if (!field) {
+      return;
+    }
+    currentCollection = typeof field.targetCollection === "function" ? field.targetCollection() : field.targetCollection;
+  }
+  return field;
+}
+__name(getFieldFromCollectionManager, "getFieldFromCollectionManager");
 function createContextVariablesScope(ctx) {
   const state = JSON.parse(JSON.stringify(ctx.state));
   return {
     timezone: ctx.get("x-timezone"),
     now: (/* @__PURE__ */ new Date()).toISOString(),
     getField: /* @__PURE__ */ __name((path) => {
-      const fieldPath = path.split(".").filter((p) => !p.startsWith("$") && !isNumeric(p)).join(".");
       const { resourceName } = ctx.action;
+      const fieldPath = path.split(".").filter((p) => !p.startsWith("$") && !isNumeric(p)).join(".");
+      if (!ctx.database) {
+        return getFieldFromCollectionManager(ctx, resourceName, fieldPath);
+      }
       return ctx.database.getFieldByPath(`${resourceName}.${fieldPath}`);
     }, "getField"),
     vars: {

package/lib/plugin-manager/options/resource.js

@@ -47,6 +47,7 @@ var import_fs = __toESM(require("fs"));
 var import_fs_extra = __toESM(require("fs-extra"));
 var import_path = __toESM(require("path"));
 var import_crypto = __toESM(require("crypto"));
+var import_package = __toESM(require("../../../package.json"));
 const _PackageUrls = class _PackageUrls {
   static async get(packageName) {
     if (!this.items[packageName]) {
@@ -73,7 +74,9 @@ const _PackageUrls = class _PackageUrls {
           }
         } catch (error) {
         }
-        const hash = import_crypto.default.createHash("sha256").update(fsState.mtime.getTime() + appKey + version).digest("hex").slice(0, 8);
+        const appVersion = import_package.default.version;
+        const salt = process.env.PLUGIN_URL_HASH_SALT || "";
+        const hash = import_crypto.default.createHash("sha256").update(fsState.mtime.getTime() + appKey + version + appVersion + salt).digest("hex").slice(0, 8);
         t = `?hash=${hash}`;
       }
       const cdnBaseUrl = process.env.CDN_BASE_URL.replace(/\/+$/, "");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/server",
-  "version": "2.0.11",
+  "version": "2.0.13",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
@@ -10,21 +10,21 @@
     "@koa/cors": "^5.0.0",
     "@koa/multer": "^3.1.0",
     "@koa/router": "^13.1.0",
-    "@nocobase/acl": "2.0.11",
-    "@nocobase/actions": "2.0.11",
-    "@nocobase/ai": "2.0.11",
-    "@nocobase/auth": "2.0.11",
-    "@nocobase/cache": "2.0.11",
-    "@nocobase/data-source-manager": "2.0.11",
-    "@nocobase/database": "2.0.11",
-    "@nocobase/evaluators": "2.0.11",
-    "@nocobase/lock-manager": "2.0.11",
-    "@nocobase/logger": "2.0.11",
-    "@nocobase/resourcer": "2.0.11",
-    "@nocobase/sdk": "2.0.11",
-    "@nocobase/snowflake-id": "2.0.11",
-    "@nocobase/telemetry": "2.0.11",
-    "@nocobase/utils": "2.0.11",
+    "@nocobase/acl": "2.0.13",
+    "@nocobase/actions": "2.0.13",
+    "@nocobase/ai": "2.0.13",
+    "@nocobase/auth": "2.0.13",
+    "@nocobase/cache": "2.0.13",
+    "@nocobase/data-source-manager": "2.0.13",
+    "@nocobase/database": "2.0.13",
+    "@nocobase/evaluators": "2.0.13",
+    "@nocobase/lock-manager": "2.0.13",
+    "@nocobase/logger": "2.0.13",
+    "@nocobase/resourcer": "2.0.13",
+    "@nocobase/sdk": "2.0.13",
+    "@nocobase/snowflake-id": "2.0.13",
+    "@nocobase/telemetry": "2.0.13",
+    "@nocobase/utils": "2.0.13",
     "@types/decompress": "4.2.7",
     "@types/ini": "^1.3.31",
     "@types/koa-send": "^4.1.3",
@@ -61,5 +61,5 @@
     "@types/serve-handler": "^6.1.1",
     "@types/ws": "^8.5.5"
   },
-  "gitHead": "657733e68b31cbb788f8b1b7c4926383c96b5889"
+  "gitHead": "3486d15dd3f821411f514b7e0b57e44d942917c9"
 }