@nocobase/plugin-departments 2.1.0-alpha.20 → 2.1.0-alpha.22

package/dist/externalVersion.js

@@ -8,24 +8,24 @@
  */
 
 module.exports = {
-  "@nocobase/client": "2.1.0-alpha.20",
+  "@nocobase/client": "2.1.0-alpha.22",
   "react": "18.2.0",
   "@formily/react": "2.3.7",
   "@formily/core": "2.3.7",
-  "@nocobase/utils": "2.1.0-alpha.20",
-  "@nocobase/plugin-acl": "2.1.0-alpha.20",
+  "@nocobase/utils": "2.1.0-alpha.22",
+  "@nocobase/plugin-acl": "2.1.0-alpha.22",
   "react-i18next": "11.18.6",
-  "@nocobase/database": "2.1.0-alpha.20",
+  "@nocobase/database": "2.1.0-alpha.22",
   "lodash": "4.18.1",
-  "@nocobase/plugin-user-data-sync": "2.1.0-alpha.20",
-  "@nocobase/cache": "2.1.0-alpha.20",
-  "@nocobase/server": "2.1.0-alpha.20",
-  "@nocobase/data-source-manager": "2.1.0-alpha.20",
-  "@nocobase/plugin-error-handler": "2.1.0-alpha.20",
+  "@nocobase/plugin-user-data-sync": "2.1.0-alpha.22",
+  "@nocobase/cache": "2.1.0-alpha.22",
+  "@nocobase/server": "2.1.0-alpha.22",
+  "@nocobase/data-source-manager": "2.1.0-alpha.22",
+  "@nocobase/plugin-error-handler": "2.1.0-alpha.22",
   "sequelize": "6.35.2",
   "antd": "5.24.2",
   "@ant-design/icons": "5.6.1",
   "@formily/shared": "2.3.7",
   "@emotion/css": "11.13.0",
-  "@nocobase/actions": "2.1.0-alpha.20"
+  "@nocobase/actions": "2.1.0-alpha.22"
 };

package/dist/server/department-data-sync-resource.d.ts

@@ -16,6 +16,8 @@ export declare class DepartmentDataSyncResource extends UserDataResource {
     get deptRepo(): import("@nocobase/database").Repository<any, any>;
     get deptUserRepo(): import("@nocobase/database").Repository<any, any>;
     getFlteredSourceDepartment(sourceDepartment: FormatDepartment): lodash.Omit<FormatDepartment, string>;
+    updateDepartmentIsLeaf(parentId: PrimaryKey | null | undefined): Promise<void>;
+    markDepartmentAsNonLeaf(parentId: PrimaryKey | null | undefined): Promise<void>;
     update(record: OriginRecord, resourcePks: PrimaryKey[]): Promise<RecordResourceChanged[]>;
     create(record: OriginRecord): Promise<RecordResourceChanged[]>;
     getDepartmentIdsBySourceUks(sourceUks: PrimaryKey[], sourceName: string): Promise<any>;

package/dist/server/department-data-sync-resource.js

@@ -59,7 +59,6 @@ class DepartmentDataSyncResource extends import_plugin_user_data_sync.UserDataRe
       "uid",
       "createdAt",
       "updatedAt",
-      "sort",
       "createdById",
       "updatedById",
       "isDeleted",
@@ -68,6 +67,33 @@ class DepartmentDataSyncResource extends import_plugin_user_data_sync.UserDataRe
     ];
     return import_lodash.default.omit(sourceDepartment, deleteProps);
   }
+  async updateDepartmentIsLeaf(parentId) {
+    if (!parentId) {
+      return;
+    }
+    const hasChild = await this.deptRepo.count({
+      filter: {
+        parentId
+      }
+    });
+    await this.deptRepo.update({
+      filterByTk: parentId,
+      values: {
+        isLeaf: !hasChild
+      }
+    });
+  }
+  async markDepartmentAsNonLeaf(parentId) {
+    if (!parentId) {
+      return;
+    }
+    await this.deptRepo.update({
+      filterByTk: parentId,
+      values: {
+        isLeaf: false
+      }
+    });
+  }
   async update(record, resourcePks) {
     const { dataType, metaData, sourceName } = record;
     if (dataType === "user") {
@@ -267,7 +293,9 @@ class DepartmentDataSyncResource extends import_plugin_user_data_sync.UserDataRe
   }
   async updateDepartment(department, sourceDepartment, sourceName) {
     if (sourceDepartment.isDeleted) {
+      const parentId = department.get("parentId");
       await department.destroy();
+      await this.updateDepartmentIsLeaf(parentId);
       return;
     }
     let dataChanged = false;
@@ -286,17 +314,22 @@ class DepartmentDataSyncResource extends import_plugin_user_data_sync.UserDataRe
   async createDepartment(sourceDepartment, sourceName) {
     const filteredSourceDepartment = this.getFlteredSourceDepartment(sourceDepartment);
     const department = await this.deptRepo.create({
-      values: filteredSourceDepartment
+      values: {
+        isLeaf: true,
+        ...filteredSourceDepartment
+      }
     });
     await this.updateParentDepartment(department, sourceDepartment.parentUid, sourceName);
     return department.id;
   }
   async updateParentDepartment(department, parentUid, sourceName) {
     var _a;
+    const oldParentId = department.get("parentId");
     if (!parentUid) {
       const parentDepartment = await department.getParent();
       if (parentDepartment) {
         await department.setParent(null);
+        await this.updateDepartmentIsLeaf(oldParentId);
       }
     } else {
       const syncDepartmentRecord = await this.syncRecordRepo.findOne({
@@ -314,18 +347,25 @@ class DepartmentDataSyncResource extends import_plugin_user_data_sync.UserDataRe
         });
         if (!parentDepartment) {
           await department.setParent(null);
+          await this.updateDepartmentIsLeaf(oldParentId);
           return;
         }
         const parent = await department.getParent();
         if (parent) {
           if (parentDepartment.id !== parent.id) {
             await department.setParent(parentDepartment);
+            await Promise.all([
+              this.updateDepartmentIsLeaf(oldParentId),
+              this.markDepartmentAsNonLeaf(parentDepartment.id)
+            ]);
           }
         } else {
           await department.setParent(parentDepartment);
+          await this.markDepartmentAsNonLeaf(parentDepartment.id);
         }
       } else {
         await department.setParent(null);
+        await this.updateDepartmentIsLeaf(oldParentId);
       }
     }
   }

package/package.json

@@ -6,7 +6,7 @@
   "description": "Organize users by departments, set hierarchical relationships, link roles to control permissions, and use departments as variables in workflows and expressions.",
   "description.ru-RU": "Организация пользователей по подразделениям, установление иерархических связей, привязка ролей для управления правами и использование подразделений в качестве переменных в рабочих процессах и выражениях.",
   "description.zh-CN": "以部门来组织用户，设定上下级关系，绑定角色控制权限，并支持作为变量用于工作流和表达式。",
-  "version": "2.1.0-alpha.20",
+  "version": "2.1.0-alpha.22",
   "main": "dist/server/index.js",
   "peerDependencies": {
     "@nocobase/actions": "2.x",
@@ -20,6 +20,6 @@
   "keywords": [
     "Users & permissions"
   ],
-  "gitHead": "3d1535db6bf93ca23257faf474afee0d565f54c6",
+  "gitHead": "81ed83f158f172cca607b36beaf8428b14ba16ad",
   "license": "Apache-2.0"
 }