@nocobase/plugin-field-sort 2.1.0-alpha.46 → 2.1.0-alpha.47

package/dist/externalVersion.js

@@ -8,16 +8,16 @@
  */
 
 module.exports = {
-  "@nocobase/client": "2.1.0-alpha.46",
-  "@nocobase/client-v2": "2.1.0-alpha.46",
+  "@nocobase/client": "2.1.0-alpha.47",
+  "@nocobase/client-v2": "2.1.0-alpha.47",
   "antd": "5.24.2",
   "react": "18.2.0",
-  "@nocobase/flow-engine": "2.1.0-alpha.46",
+  "@nocobase/flow-engine": "2.1.0-alpha.47",
   "lodash": "4.18.1",
-  "@nocobase/database": "2.1.0-alpha.46",
-  "@nocobase/actions": "2.1.0-alpha.46",
-  "@nocobase/server": "2.1.0-alpha.46",
-  "@nocobase/data-source-manager": "2.1.0-alpha.46",
+  "@nocobase/database": "2.1.0-alpha.47",
+  "@nocobase/actions": "2.1.0-alpha.47",
+  "@nocobase/server": "2.1.0-alpha.47",
+  "@nocobase/data-source-manager": "2.1.0-alpha.47",
   "sequelize": "6.35.2",
-  "@nocobase/lock-manager": "2.1.0-alpha.46"
+  "@nocobase/lock-manager": "2.1.0-alpha.47"
 };

package/dist/server/sort-field.js

@@ -41,30 +41,37 @@ class SortField extends import_database.Field {
     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;
-      }
-      const where = {};
-      if (scopeKey) {
-        const value = instance.get(scopeKey);
-        if (value !== void 0 && value !== null) {
-          where[scopeKey] = value;
-        }
-      }
-      await this.constructor.lockManager.runExclusive(
-        this.context.collection.name,
-        async () => {
-          const max = await model.max(name, { ...options, where });
-          const newValue = (max || 0) + 1;
+    await this.constructor.lockManager.runExclusive(
+      this.context.collection.name,
+      async () => {
+        const maxCache = /* @__PURE__ */ new Map();
+        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;
+          }
+          const where = {};
+          let cacheKey = "__default__";
+          if (scopeKey) {
+            const value = instance.get(scopeKey);
+            if (value !== void 0 && value !== null) {
+              where[scopeKey] = value;
+              cacheKey = `${typeof value}:${String(value)}`;
+            }
+          }
+          if (!maxCache.has(cacheKey)) {
+            const max = await model.max(name, { ...options, where });
+            maxCache.set(cacheKey, max || 0);
+          }
+          const newValue = (maxCache.get(cacheKey) ?? 0) + 1;
+          maxCache.set(cacheKey, newValue);
           instance.set(name, newValue);
-        },
-        2e3
-      );
-    }
+        }
+      },
+      2e3
+    );
   };
   onScopeChange = async (instance, options) => {
     const { scopeKey } = this.options;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-field-sort",
-  "version": "2.1.0-alpha.46",
+  "version": "2.1.0-alpha.47",
   "license": "Apache-2.0",
   "displayName": "Collection field: Sort",
   "displayName.ru-RU": "Поле коллекции: Сортировка",
@@ -24,5 +24,5 @@
   "keywords": [
     "Collection fields"
   ],
-  "gitHead": "42b269944cdd1908d7a848c0af4936fe94c03bb7"
+  "gitHead": "66196b57f9043ea0ac6ebdafbc732bfb98af1396"
 }