@nocobase/plugin-field-sort 1.9.0-beta.3 → 1.9.0-beta.5

package/dist/externalVersion.js

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

package/dist/server/sort-field.d.ts

@@ -12,9 +12,10 @@ import { LockManager } from '@nocobase/lock-manager';
 export declare class SortField extends Field {
     static lockManager: LockManager;
     get dataType(): DataTypes.BigIntDataTypeConstructor;
-    setSortValue: (instances: any, options: any) => Promise<void>;
+    setSortValue: (instances: any, options: any, from: 'create' | 'update') => Promise<void>;
     onScopeChange: (instance: any, options: any) => Promise<void>;
     initRecordsSortValue: (options: any) => Promise<void>;
+    setSortValueListener: (instances: any, options: any) => Promise<void>;
     bind(): void;
     unbind(): void;
 }

package/dist/server/sort-field.js

@@ -37,11 +37,14 @@ class SortField extends import_database.Field {
   get dataType() {
     return import_sequelize.DataTypes.BIGINT;
   }
-  setSortValue = async (instances, options) => {
+  setSortValue = async (instances, options, from) => {
     const { name, scopeKey } = this.options;
     const { model } = this.context.collection;
     instances = Array.isArray(instances) ? instances : [instances];
     for (const instance of instances) {
+      if (from == "create" && (0, import_lodash.isNumber)(instance.get(name))) {
+        continue;
+      }
       if ((0, import_lodash.isNumber)(instance.get(name)) && instance._previousDataValues[scopeKey] == instance[scopeKey]) {
         continue;
       }
@@ -66,7 +69,7 @@ class SortField extends import_database.Field {
   onScopeChange = async (instance, options) => {
     const { scopeKey } = this.options;
     if (scopeKey && !instance.isNewRecord && instance._previousDataValues[scopeKey] != instance[scopeKey]) {
-      await this.setSortValue(instance, options);
+      await this.setSortValue(instance, options, "update");
     }
   };
   initRecordsSortValue = async (options) => {
@@ -184,19 +187,20 @@ class SortField extends import_database.Field {
       await doInit();
     }
   };
+  setSortValueListener = async (instances, options) => await this.setSortValue(instances, options, "create");
   bind() {
     super.bind();
     this.on("afterSync", this.initRecordsSortValue);
     this.on("beforeUpdate", this.onScopeChange);
-    this.on("beforeCreate", this.setSortValue);
-    this.on("beforeBulkCreate", this.setSortValue);
+    this.on("beforeCreate", this.setSortValueListener);
+    this.on("beforeBulkCreate", this.setSortValueListener);
   }
   unbind() {
     super.unbind();
     this.off("beforeUpdate", this.onScopeChange);
-    this.off("beforeCreate", this.setSortValue);
+    this.off("beforeCreate", this.setSortValueListener);
     this.off("afterSync", this.initRecordsSortValue);
-    this.off("beforeBulkCreate", this.setSortValue);
+    this.off("beforeBulkCreate", this.setSortValueListener);
   }
 }
 // Annotate the CommonJS export names for ESM import in node:

package/package.json

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