@nocobase/plugin-field-m2m-array 2.0.0-alpha.9 → 2.0.0-beta.1

package/dist/externalVersion.js

@@ -11,10 +11,11 @@ module.exports = {
   "@formily/react": "2.3.7",
   "antd": "5.24.2",
   "react": "18.2.0",
-  "@nocobase/client": "2.0.0-alpha.9",
+  "@nocobase/client": "2.0.0-beta.1",
   "react-router-dom": "6.30.1",
-  "@nocobase/utils": "2.0.0-alpha.9",
-  "@nocobase/database": "2.0.0-alpha.9",
-  "@nocobase/server": "2.0.0-alpha.9",
-  "@nocobase/data-source-manager": "2.0.0-alpha.9"
+  "@nocobase/utils": "2.0.0-beta.1",
+  "@nocobase/database": "2.0.0-beta.1",
+  "lodash": "4.17.21",
+  "@nocobase/server": "2.0.0-beta.1",
+  "@nocobase/data-source-manager": "2.0.0-beta.1"
 };

package/dist/locale/de-DE.json

@@ -1,4 +1,4 @@
 {
   "Many to many (array)": "Viele-zu-viele (Array)",
   "Many to many (array) description": "Ermöglicht die Erstellung von Viele-zu-viele-Beziehungen zwischen zwei Modellen durch Speicherung eines Arrays eindeutiger Schlüssel des Zielmodells."
-}
+}

package/dist/locale/en-US.json

@@ -1,4 +1,4 @@
 {
   "Many to many (array)": "Many to many (array)",
   "Many to many (array) description": "Allows to create many to many relationships between two models by storing an array of unique keys of the target model."
-}
+}

package/dist/locale/es-ES.json

@@ -0,0 +1,4 @@
+{
+  "Many to many (array)": "Many to many (array)",
+  "Many to many (array) description": "Allows to create many to many relationships between two models by storing an array of unique keys of the target model."
+}

package/dist/locale/fr-FR.json

@@ -0,0 +1,4 @@
+{
+  "Many to many (array)": "Many to many (array)",
+  "Many to many (array) description": "Allows to create many to many relationships between two models by storing an array of unique keys of the target model."
+}

package/dist/locale/hu-HU.json

@@ -0,0 +1,4 @@
+{
+  "Many to many (array)": "Több a többhöz (tömb)",
+  "Many to many (array) description": "Lehetővé teszi több a többhöz kapcsolatok létrehozását két modell között a cél modell egyedi kulcsainak tárolásával tömbben."
+}

package/dist/locale/id-ID.json

@@ -0,0 +1,4 @@
+{
+  "Many to many (array)": "Banyak ke banyak (array)",
+  "Many to many (array) description": "Memungkinkan untuk membuat hubungan banyak ke banyak antara dua model dengan menyimpan array kunci unik dari model target."
+}

package/dist/locale/it-IT.json

@@ -1,4 +1,4 @@
 {
   "Many to many (array)": "Molti a molti (array)",
   "Many to many (array) description": "Consente di creare relazioni molti a molti tra due modelli memorizzando un array di chiavi univoche del modello di destinazione."
-}
+}

package/dist/locale/ko-KR.json

@@ -0,0 +1,4 @@
+{
+  "Many to many (array)": "다 대 다(배열)",
+  "Many to many (array) description": "대상 모델의 고유 키 배열을 저장하여 두 모델 간의 다대다 관계를 생성할 수 있습니다."
+}

package/dist/locale/nl-NL.json

@@ -1,4 +1,4 @@
 {
-    "Many to many (array)": "Veel-op-veel (array)",
-    "Many to many (array) description": "Hiermee kan je veel-op-veel-relaties tussen twee modellen maken door een array met unieke sleutels van het doelmodel op te slaan."
+  "Many to many (array)": "Veel-op-veel (array)",
+  "Many to many (array) description": "Hiermee kan je veel-op-veel-relaties tussen twee modellen maken door een array met unieke sleutels van het doelmodel op te slaan."
 }

package/dist/locale/pt-BR.json

@@ -0,0 +1,4 @@
+{
+  "Many to many (array)": "Many to many (array)",
+  "Many to many (array) description": "Allows to create many to many relationships between two models by storing an array of unique keys of the target model."
+}

package/dist/locale/ru-RU.json

@@ -0,0 +1,4 @@
+{
+  "Many to many (array)": "Многие ко многим (Many to many (array))",
+  "Many to many (array) description": "Позволяет создавать отношения многие-ко-многим между двумя моделями, сохраняя массив (array) уникальных ключей целевой модели."
+}

package/dist/locale/tr-TR.json

@@ -0,0 +1,4 @@
+{
+  "Many to many (array)": "Many to many (array)",
+  "Many to many (array) description": "Allows to create many to many relationships between two models by storing an array of unique keys of the target model."
+}

package/dist/locale/uk-UA.json

@@ -0,0 +1,4 @@
+{
+  "Many to many (array)": "Many to many (array)",
+  "Many to many (array) description": "Allows to create many to many relationships between two models by storing an array of unique keys of the target model."
+}

package/dist/locale/vi-VN.json

@@ -0,0 +1,4 @@
+{
+  "Many to many (array)": "Many to many (array)",
+  "Many to many (array) description": "Allows to create many to many relationships between two models by storing an array of unique keys of the target model."
+}

package/dist/locale/zh-CN.json

@@ -1,4 +1,4 @@
 {
   "Many to many (array)": "多对多（数组）",
   "Many to many (array) description": "支持通过在数组中存储目标表唯一键的方式建立多对多关系。"
-}
+}

package/dist/locale/zh-TW.json

@@ -0,0 +1,4 @@
+{
+  "Many to many (array)": "Many to many (array)",
+  "Many to many (array) description": "Allows to create many to many relationships between two models by storing an array of unique keys of the target model."
+}

package/dist/server/belongs-to-array-field.d.ts

@@ -11,6 +11,7 @@ export declare const elementTypeMap: {
     nanoid: string;
     sequence: string;
     uid: string;
+    snowflakeId: string;
 };
 export declare class BelongsToArrayField extends RelationField {
     get dataType(): string;

package/dist/server/belongs-to-array-field.js

@@ -7,9 +7,11 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -23,6 +25,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var belongs_to_array_field_exports = {};
 __export(belongs_to_array_field_exports, {
@@ -31,23 +41,32 @@ __export(belongs_to_array_field_exports, {
 });
 module.exports = __toCommonJS(belongs_to_array_field_exports);
 var import_database = require("@nocobase/database");
+var import_lodash = __toESM(require("lodash"));
 const elementTypeMap = {
   nanoid: "string",
   sequence: "string",
-  uid: "string"
+  uid: "string",
+  snowflakeId: "bigInt"
 };
 class BelongsToArrayField extends import_database.RelationField {
   get dataType() {
     return "BelongsToArray";
   }
-  setForeignKeyArray = async (model, { values, transaction }) => {
-    const { name, foreignKey, target, targetKey } = this.options;
-    if (!values || values[name] === void 0) {
+  setForeignKeyArray = async (model, { values, transaction, inputValues }) => {
+    const { type, name, foreignKey, target, targetKey } = this.options;
+    if (type !== "belongsToArray") {
       return;
     }
-    let value = values[name] || [];
-    if (!Array.isArray(value)) {
-      value = [value];
+    let value;
+    const valuesInParams = (inputValues ?? values ?? {})[name];
+    if (valuesInParams !== void 0) {
+      value = import_lodash.default.castArray(valuesInParams || []);
+    } else {
+      return;
+    }
+    if (value.length === 0) {
+      model.set(foreignKey, []);
+      return;
     }
     const tks = [];
     const items = [];
@@ -67,10 +86,19 @@ class BelongsToArrayField extends import_database.RelationField {
       transaction
     });
     tks.push(...instances.map((instance) => instance[targetKey]));
-    const toCreate = items.filter((item) => !item[targetKey] || !tks.includes(item[targetKey]));
     const m = this.database.getModel(target);
+    const toCreate = items.filter((item) => !item[targetKey] || !tks.includes(item[targetKey]));
     const newInstances = await m.bulkCreate(toCreate, { transaction });
     tks.push(...newInstances.map((instance) => instance[targetKey]));
+    const toUpdate = items.filter((item) => item[targetKey] && tks.includes(item[targetKey]));
+    for (const item of toUpdate) {
+      await m.update(item, {
+        where: {
+          [targetKey]: item[targetKey]
+        },
+        transaction
+      });
+    }
     model.set(foreignKey, tks);
   };
   checkTargetCollection() {

package/package.json

@@ -1,10 +1,12 @@
 {
   "name": "@nocobase/plugin-field-m2m-array",
   "displayName": "Collection field: Many to many (array)",
+  "displayName.ru-RU": "Связь коллекций: «многие ко многим» (массив)",
   "displayName.zh-CN": "数据表字段：多对多 (数组)",
   "description": "Allows to create many to many relationships between two models by storing an array of unique keys of the target model.",
+  "description.ru-RU": "Позволяет создавать отношения «многие ко многим» между двумя моделями, сохраняя массив уникальных ключей целевой модели.",
   "description.zh-CN": "支持通过在数组中存储目标表唯一键的方式建立多对多关系。",
-  "version": "2.0.0-alpha.9",
+  "version": "2.0.0-beta.1",
   "main": "dist/server/index.js",
   "peerDependencies": {
     "@nocobase/client": "2.x",
@@ -14,5 +16,5 @@
   "keywords": [
     "Collection fields"
   ],
-  "gitHead": "4a9acf96f21a3aa35bccbd188b942595b09da0a9"
+  "gitHead": "b3d1f65848fc91e673372ee734dafe6b1cf80586"
 }