@nocobase/plugin-field-sort 1.6.0-alpha.3 → 1.6.0-alpha.30

package/LICENSE.txt

@@ -1,4 +1,4 @@
-Updated Date: October 15, 2024
+Updated Date: February 20, 2025
 
 NocoBase License Agreement
 
@@ -78,7 +78,7 @@ Except for Third-Party Open Source Software, the Company owns all copyrights, tr
 
 6.1 Obtain a permanent commercial license of the Software.
 
-6.2 Get 12 months of upgrade and exclusive technical support.
+6.2 Get software upgrades and exclusive technical support during the upgrade validity period.
 
 6.3 The licensed Software can be used for commercial purposes with no restrictions on the number of applications and users.
 
@@ -88,7 +88,7 @@ Except for Third-Party Open Source Software, the Company owns all copyrights, tr
 
 6.6 Can sell plugins developed for Software in the Marketplace.
 
-6.7 The User with a Professional or Enterprise Edition License can sell Upper Layer Application to their clients.
+6.7 The User with an Enterprise Edition License can sell Upper Layer Application to their clients.
 
 6.8 Not restricted by the AGPL-3.0 agreement.
 
@@ -106,13 +106,15 @@ Except for Third-Party Open Source Software, the Company owns all copyrights, tr
 
 7.4 It is not allowed to provide any form of no-code, zero-code, low-code platform SaaS products to the public using the original or modified Software.
 
-7.5 It is not allowed for the User with a Standard Edition license to sell Upper Layer Application to clients without a Commercial license.
+7.5 It is not allowed for the User withot an Enterprise Edition license to sell Upper Layer Application to clients without a Commercial license.
 
-7.6 It is not allowed to publicly sell plugins developed for Software outside of the Marketplace.
+7.6 It is not allowed for the User with an Enterprise Edition license to sell Upper Layer Application to clients without a Commercial license with access to further development and configuration.
 
-7.7 If there is a violation of the above obligations or the terms of this Agreement, the rights owned by the User will be immediately terminated, the paid fees will not be refunded, and the Company reserves the right to pursue the User's legal responsibility.
+7.7 It is not allowed to publicly sell plugins developed for Software outside of the Marketplace.
 
-7.8 If there are other agreements in the contract for the above obligations, the contract agreement shall prevail.
+7.8 If there is a violation of the above obligations or the terms of this Agreement, the rights owned by the User will be immediately terminated, the paid fees will not be refunded, and the Company reserves the right to pursue the User's legal responsibility.
+
+7.9 If there are other agreements in the contract for the above obligations, the contract agreement shall prevail.
 
 ======================================
 8. Rights of Commercial Plugin License
@@ -120,11 +122,11 @@ Except for Third-Party Open Source Software, the Company owns all copyrights, tr
 
 8.1 Obtain a permanent Commercial Plugin License for the Commercial Plugin.
 
-8.2 Receive 12 months of upgrades and exclusive technical support.
+8.2 Get plugins upgrades and exclusive technical support during the upgrade validity period.
 
 8.3 Can be used for commercial purposes without restrictions on the number of applications or users.
 
-8.4 The User with a Professional or Enterprise Edition License can use the Commercial Plugin in Upper Layer Applications sold to their customers.
+8.4 The User with an Enterprise Edition License can use the Commercial Plugin in Upper Layer Applications sold to their customers.
 
 8.5 Not restricted by the AGPL-3.0 agreement.
 

package/dist/externalVersion.js

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

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/plugin.js

@@ -42,11 +42,11 @@ class PluginFieldSortServer extends import_server.Plugin {
     class SortFieldClass extends import_sort_field.SortField {
     }
     SortFieldClass.lockManager = lockManager;
-    this.app.db.registerFieldTypes({
-      sort: SortFieldClass
-    });
     this.app.dataSourceManager.beforeAddDataSource((dataSource) => {
       if (dataSource.collectionManager instanceof import_data_source_manager.SequelizeCollectionManager) {
+        dataSource.collectionManager.db.registerFieldTypes({
+          sort: SortFieldClass
+        });
         dataSource.resourceManager.registerActionHandlers({ move: import_action.move });
       }
     });

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.6.0-alpha.3",
+  "version": "1.6.0-alpha.30",
   "license": "AGPL-3.0",
   "displayName": "Collection field: Sort",
   "displayName.zh-CN": "数据表字段：排序",
@@ -20,5 +20,5 @@
   "keywords": [
     "Collection fields"
   ],
-  "gitHead": "205b4aca5556d5af70679fa401394943a9e51670"
+  "gitHead": "4d092cae372fada3df9b57c55705ea3b7dfa6786"
 }