@nocobase/plugin-client 1.9.0-beta.8 → 2.0.0-alpha.10

package/dist/server/server.js

@@ -66,22 +66,6 @@ class PluginClientServer extends import_server.Plugin {
   async beforeLoad() {
   }
   async install() {
-    const uiSchemas = this.db.getRepository("uiSchemas");
-    await uiSchemas.insert({
-      type: "void",
-      "x-uid": "nocobase-admin-menu",
-      "x-component": "Menu",
-      "x-designer": "Menu.Designer",
-      "x-initializer": "MenuItemInitializers",
-      "x-component-props": {
-        mode: "mix",
-        theme: "dark",
-        // defaultSelectedUid: 'u8',
-        onSelect: "{{ onSelect }}",
-        sideMenuRefScopeKey: "sideMenuRef"
-      },
-      properties: {}
-    });
   }
   async load() {
     this.app.localeManager.setLocaleFn("antd", async (lang) => (0, import_antd.getAntdLocale)(lang));
@@ -188,6 +172,7 @@ class PluginClientServer extends import_server.Plugin {
       actions: ["desktopRoutes:list", "roles.desktopRoutes:*"]
     });
     this.app.acl.allow("desktopRoutes", "listAccessible", "loggedIn");
+    this.app.acl.allow("desktopRoutes", "getAccessible", "loggedIn");
   }
   /**
    * used to implement: roles with permission (allowNewMenu is true) can directly access the newly created menu
@@ -199,7 +184,31 @@ class PluginClientServer extends import_server.Plugin {
         instance.allowNewMenu === void 0 ? ["admin", "member"].includes(instance.name) : !!instance.allowNewMenu
       );
     });
-    this.app.db.on("desktopRoutes.afterCreate", async (instance, { transaction }) => {
+    this.db.on("desktopRoutes.afterDestroy", async (instance, { transaction }) => {
+      const r = this.db.getRepository("flowModels");
+      if (r) {
+        await r.destroy({
+          filter: {
+            uid: instance.get("schemaUid")
+          },
+          transaction
+        });
+      }
+    });
+    this.db.on("desktopRoutes.afterCreate", async (instance, { transaction }) => {
+      const r = this.db.getRepository("flowModels");
+      if (r) {
+        await r.create({
+          transaction,
+          values: {
+            uid: instance.get("schemaUid"),
+            name: instance.get("schemaUid"),
+            schema: {
+              use: "RouteModel"
+            }
+          }
+        });
+      }
       const addNewMenuRoles = await this.app.db.getRepository("roles").find({
         filter: {
           allowNewMenu: true
@@ -255,10 +264,12 @@ class PluginClientServer extends import_server.Plugin {
     this.app.resourceManager.registerActionHandler("desktopRoutes:listAccessible", async (ctx, next) => {
       const desktopRoutesRepository = ctx.db.getRepository("desktopRoutes");
       const rolesRepository = ctx.db.getRepository("roles");
+      const { filter } = ctx.action.params;
       if (ctx.state.currentRoles.includes("root")) {
         ctx.body = await desktopRoutesRepository.find({
           tree: true,
-          ...ctx.query
+          sort: "sort",
+          filter
         });
         return await next();
       }
@@ -271,8 +282,9 @@ class PluginClientServer extends import_server.Plugin {
         const ids = (await Promise.all(desktopRoutesId)).flat();
         const result = await desktopRoutesRepository.find({
           tree: true,
-          ...ctx.query,
+          sort: "sort",
           filter: {
+            ...filter,
             id: ids
           }
         });
@@ -280,6 +292,37 @@ class PluginClientServer extends import_server.Plugin {
       }
       await next();
     });
+    this.app.resourceManager.registerActionHandler("desktopRoutes:getAccessible", async (ctx, next) => {
+      const desktopRoutesRepository = ctx.db.getRepository("desktopRoutes");
+      const rolesRepository = ctx.db.getRepository("roles");
+      const { filter } = ctx.action.params;
+      if (ctx.state.currentRoles.includes("root")) {
+        ctx.body = await desktopRoutesRepository.findOne({
+          sort: "sort",
+          ...ctx.action.params
+        });
+        return await next();
+      }
+      const roles = await rolesRepository.find({
+        filterByTk: ctx.state.currentRoles,
+        appends: ["desktopRoutes"]
+      });
+      const desktopRoutesId = roles.flatMap((x) => x.get("desktopRoutes")).map((item) => item.id);
+      if (desktopRoutesId && desktopRoutesId.length > 0) {
+        const ids = (await Promise.all(desktopRoutesId)).flat();
+        const result = await desktopRoutesRepository.findOne({
+          filter: {
+            ...filter,
+            id: ids
+          },
+          ...ctx.action.params
+        });
+        ctx.body = result;
+      } else {
+        ctx.body = null;
+      }
+      await next();
+    });
     this.app.resourceManager.registerActionHandler("roles.desktopRoutes:set", async (ctx, next) => {
       let { values } = ctx.action.params;
       if (values.length) {

package/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "WEB 客户端",
   "description": "Provides a client interface for the NocoBase server",
   "description.zh-CN": "为 NocoBase 服务端提供客户端界面",
-  "version": "1.9.0-beta.8",
+  "version": "2.0.0-alpha.10",
   "main": "./dist/server/index.js",
   "license": "AGPL-3.0",
   "devDependencies": {
@@ -14,12 +14,12 @@
     "koa-static": "^5.0.0"
   },
   "peerDependencies": {
-    "@nocobase/client": "1.x",
-    "@nocobase/database": "1.x",
-    "@nocobase/plugin-localization": "1.x",
-    "@nocobase/server": "1.x",
-    "@nocobase/test": "1.x",
-    "@nocobase/utils": "1.x"
+    "@nocobase/client": "2.x",
+    "@nocobase/database": "2.x",
+    "@nocobase/plugin-localization": "2.x",
+    "@nocobase/server": "2.x",
+    "@nocobase/test": "2.x",
+    "@nocobase/utils": "2.x"
   },
-  "gitHead": "f3d4f3d1ba7adbf4d4c60e656c23da45565769c8"
+  "gitHead": "6422cfb6fa6c8450de2efa3294fd29a28b228990"
 }