@nocobase/plugin-field-sort 1.5.0-beta.8 → 1.5.0

package/dist/externalVersion.js

@@ -8,12 +8,12 @@
  */
 
 module.exports = {
-  "@nocobase/client": "1.5.0-beta.8",
-  "@nocobase/database": "1.5.0-beta.8",
-  "@nocobase/actions": "1.5.0-beta.8",
-  "@nocobase/server": "1.5.0-beta.8",
-  "@nocobase/data-source-manager": "1.5.0-beta.8",
+  "@nocobase/client": "1.5.0",
   "lodash": "4.17.21",
+  "@nocobase/database": "1.5.0",
+  "@nocobase/actions": "1.5.0",
+  "@nocobase/server": "1.5.0",
+  "@nocobase/data-source-manager": "1.5.0",
   "sequelize": "6.35.2",
-  "@nocobase/lock-manager": "1.5.0-beta.8"
+  "@nocobase/lock-manager": "1.5.0"
 };

package/dist/server/action.js

@@ -30,6 +30,7 @@ __export(action_exports, {
   move: () => move
 });
 module.exports = __toCommonJS(action_exports);
+var import_lodash = require("lodash");
 var import_database = require("@nocobase/database");
 var import_sort_field = require("./sort-field");
 async function move(ctx, next) {
@@ -78,42 +79,42 @@ class SortableCollection {
   }
   // insert source position to target position
   async move(sourceInstanceId, targetInstanceId, options = {}) {
-    const sourceInstance = await this.collection.repository.findByTargetKey(sourceInstanceId);
+    let sourceInstance = await this.collection.repository.findByTargetKey(sourceInstanceId);
     const targetInstance = await this.collection.repository.findByTargetKey(targetInstanceId);
     if (this.scopeKey && sourceInstance.get(this.scopeKey) !== targetInstance.get(this.scopeKey)) {
-      await sourceInstance.update({
-        [this.scopeKey]: targetInstance.get(this.scopeKey)
+      [sourceInstance] = await this.collection.repository.update({
+        filterByTk: sourceInstanceId,
+        values: {
+          [this.scopeKey]: targetInstance.get(this.scopeKey)
+        }
       });
     }
     await this.sameScopeMove(sourceInstance, targetInstance, options);
   }
   async changeScope(sourceInstanceId, targetScope, method) {
-    const sourceInstance = await this.collection.repository.findByTargetKey(sourceInstanceId);
+    let sourceInstance = await this.collection.repository.findByTargetKey(sourceInstanceId);
     const targetScopeValue = targetScope[this.scopeKey];
     if (targetScopeValue && sourceInstance.get(this.scopeKey) !== targetScopeValue) {
-      await sourceInstance.update(
-        {
+      [sourceInstance] = await this.collection.repository.update({
+        filterByTk: sourceInstanceId,
+        values: {
           [this.scopeKey]: targetScopeValue
         },
-        {
-          silent: false
-        }
-      );
+        silent: false
+      });
       if (method === "prepend") {
         await this.sticky(sourceInstanceId);
       }
     }
   }
   async sticky(sourceInstanceId) {
-    const sourceInstance = await this.collection.repository.findByTargetKey(sourceInstanceId);
-    await sourceInstance.update(
-      {
+    await this.collection.repository.update({
+      filterByTk: sourceInstanceId,
+      values: {
         [this.field.get("name")]: 0
       },
-      {
-        silent: true
-      }
-    );
+      silent: true
+    });
   }
   async sameScopeMove(sourceInstance, targetInstance, options) {
     const fieldName = this.field.get("name");
@@ -151,14 +152,13 @@ class SortableCollection {
       by: change,
       silent: true
     });
-    await sourceInstance.update(
-      {
+    await this.collection.repository.update({
+      filterByTk: this.collection.isMultiFilterTargetKey() ? (0, import_lodash.pick)(sourceInstance, this.collection.filterTargetKey) : sourceInstance.get(this.collection.filterTargetKey),
+      values: {
         [fieldName]: targetSort
       },
-      {
-        silent: true
-      }
-    );
+      silent: true
+    });
   }
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/server/sort-field.js

@@ -68,16 +68,6 @@ class SortField extends import_database.Field {
   };
   initRecordsSortValue = async (options) => {
     const { transaction } = options;
-    const orderField = (() => {
-      const model = this.collection.model;
-      if (model.primaryKeyAttribute) {
-        return model.primaryKeyAttribute;
-      }
-      if (model.rawAttributes["createdAt"]) {
-        return model.rawAttributes["createdAt"].field;
-      }
-      throw new Error(`can not find order key for collection ${this.collection.name}`);
-    })();
     const needInit = async (scopeKey2 = null, scopeValue = null) => {
       const filter = {};
       if (scopeKey2 && scopeValue) {
@@ -97,6 +87,19 @@ class SortField extends import_database.Field {
       return emptyCount === totalCount && emptyCount > 0;
     };
     const doInit = async (scopeKey2 = null, scopeValue = null) => {
+      const orderField = (() => {
+        const model = this.collection.model;
+        if (model.primaryKeyAttribute) {
+          const primaryKeyAttribute = model.rawAttributes[model.primaryKeyAttribute];
+          if (primaryKeyAttribute.autoIncrement) {
+            return primaryKeyAttribute.field;
+          }
+        }
+        if (model.rawAttributes["createdAt"]) {
+          return model.rawAttributes["createdAt"].field;
+        }
+        throw new Error(`can not find order key for collection ${this.collection.name}`);
+      })();
       const queryInterface = this.collection.db.sequelize.getQueryInterface();
       if (scopeKey2) {
         const scopeAttribute = this.collection.model.rawAttributes[scopeKey2];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-field-sort",
-  "version": "1.5.0-beta.8",
+  "version": "1.5.0",
   "license": "AGPL-3.0",
   "displayName": "Collection field: Sort",
   "displayName.zh-CN": "数据表字段：排序",
@@ -20,5 +20,5 @@
   "keywords": [
     "Collection fields"
   ],
-  "gitHead": "eb7db7301ac5eed305e73540884611832bc761f6"
+  "gitHead": "1eae52e1fc837e9b1c6b63fc31bda7945b6101e9"
 }