@nocobase/database 1.3.44-beta → 1.3.46-beta

package/lib/interfaces/boolean-interface.js

@@ -58,7 +58,11 @@ const _BooleanInterface = class _BooleanInterface extends import_base_interface.
       const option = enumConfig.find((item) => item.value === value);
       return option == null ? void 0 : option.label;
     } else {
-      return value ? "\u662F" : value === null || value === void 0 ? "" : "\u5426";
+      const label = value ? "True" : value === null || value === void 0 ? "" : "False";
+      if (ctx == null ? void 0 : ctx.t) {
+        return ctx.t(label, { ns: "action-export" });
+      }
+      return label;
     }
   }
 };

package/lib/interfaces/multiple-select-interface.js

@@ -64,7 +64,13 @@ const _MultipleSelectInterface = class _MultipleSelectInterface extends import_b
     const enumConfig = ((_a = this.options.uiSchema) == null ? void 0 : _a.enum) || [];
     return import_lodash.default.castArray(value).map((value2) => {
       const option = enumConfig.find((item) => item.value === value2);
-      return option ? option.label : value2;
+      if (option) {
+        if (ctx == null ? void 0 : ctx.t) {
+          return ctx.t(option.label, { ns: "lm-collections" });
+        }
+        return option.label;
+      }
+      return value2;
     }).join(",");
   }
 };

package/lib/interfaces/select-interface.js

@@ -52,7 +52,13 @@ const _SelectInterface = class _SelectInterface extends import_base_interface.Ba
     var _a;
     const enumConfig = ((_a = this.options.uiSchema) == null ? void 0 : _a.enum) || [];
     const option = enumConfig.find((item) => item.value === value);
-    return (option == null ? void 0 : option.label) || value;
+    if (option) {
+      if (ctx == null ? void 0 : ctx.t) {
+        return ctx.t(option.label, { ns: "lm-collections" });
+      }
+      return option.label;
+    }
+    return value;
   }
 };
 __name(_SelectInterface, "SelectInterface");

package/lib/interfaces/to-one-interface.js

@@ -39,7 +39,7 @@ const _ToOneInterface = class _ToOneInterface extends import_base_interface.Base
     if (!str) {
       return null;
     }
-    const { filterKey, targetCollection, transaction } = ctx;
+    const { filterKey, associationField, targetCollection, transaction } = ctx;
     const targetInstance = await targetCollection.repository.findOne({
       filter: {
         [filterKey]: str
@@ -49,8 +49,8 @@ const _ToOneInterface = class _ToOneInterface extends import_base_interface.Base
     if (!targetInstance) {
       throw new Error(`"${str}" not found in ${targetCollection.model.name} ${filterKey}`);
     }
-    const primaryKeyAttribute = targetCollection.model.primaryKeyAttribute;
-    return targetInstance[primaryKeyAttribute];
+    const targetKey = associationField.targetKey || targetCollection.model.primaryKeyAttribute;
+    return targetInstance[targetKey];
   }
 };
 __name(_ToOneInterface, "ToOneInterface");

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "1.3.44-beta",
+  "version": "1.3.46-beta",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
   "dependencies": {
-    "@nocobase/logger": "1.3.44-beta",
-    "@nocobase/utils": "1.3.44-beta",
+    "@nocobase/logger": "1.3.46-beta",
+    "@nocobase/utils": "1.3.46-beta",
     "async-mutex": "^0.3.2",
     "chalk": "^4.1.1",
     "cron-parser": "4.4.0",
@@ -38,5 +38,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/database"
   },
-  "gitHead": "1d5666123ac1e2997e434e38defef963ba0d9f90"
+  "gitHead": "f63f7433de426ec069b71c1eb9ed24a17784e990"
 }