@nocobase/plugin-field-m2m-array 2.0.0-alpha.43 → 2.0.0-alpha.44

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.43",
+  "@nocobase/client": "2.0.0-alpha.44",
   "react-router-dom": "6.30.1",
-  "@nocobase/utils": "2.0.0-alpha.43",
-  "@nocobase/database": "2.0.0-alpha.43",
-  "@nocobase/server": "2.0.0-alpha.43",
-  "@nocobase/data-source-manager": "2.0.0-alpha.43"
+  "@nocobase/utils": "2.0.0-alpha.44",
+  "@nocobase/database": "2.0.0-alpha.44",
+  "lodash": "4.17.21",
+  "@nocobase/server": "2.0.0-alpha.44",
+  "@nocobase/data-source-manager": "2.0.0-alpha.44"
 };

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,6 +41,7 @@ __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",
@@ -40,14 +51,32 @@ 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, context, transaction, associationKey }) => {
+    var _a, _b, _c, _d;
+    const { type, name, foreignKey, target, targetKey } = this.options;
+    if (type !== "belongsToArray") {
       return;
     }
-    let value = values[name] || [];
-    if (!Array.isArray(value)) {
-      value = [value];
+    let value;
+    let valuesInParams = values;
+    let valuesInCtx = (_b = (_a = context == null ? void 0 : context.action) == null ? void 0 : _a.params) == null ? void 0 : _b.values;
+    if (associationKey) {
+      valuesInParams = (_c = values == null ? void 0 : values[associationKey]) == null ? void 0 : _c[name];
+      valuesInCtx = (_d = valuesInCtx == null ? void 0 : valuesInCtx[associationKey]) == null ? void 0 : _d[name];
+    } else {
+      valuesInParams = values == null ? void 0 : values[name];
+      valuesInCtx = valuesInCtx == null ? void 0 : valuesInCtx[name];
+    }
+    if (valuesInParams !== void 0) {
+      value = import_lodash.default.castArray(valuesInParams || []);
+    } else if (valuesInCtx !== void 0) {
+      value = import_lodash.default.castArray(valuesInCtx || []);
+    } else {
+      return;
+    }
+    if (value.length === 0) {
+      model.set(foreignKey, []);
+      return;
     }
     const tks = [];
     const items = [];
@@ -67,10 +96,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

@@ -6,7 +6,7 @@
   "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.43",
+  "version": "2.0.0-alpha.44",
   "main": "dist/server/index.js",
   "peerDependencies": {
     "@nocobase/client": "2.x",
@@ -16,5 +16,5 @@
   "keywords": [
     "Collection fields"
   ],
-  "gitHead": "5e1b7446db50446b80427240a38a9417f3742c05"
+  "gitHead": "075bd484c270740fe9b02f1989818da91139b6b9"
 }