@nocobase/plugin-mobile 1.3.38-beta → 1.4.0-alpha

package/dist/client/mobile-layout/mobile-tab-bar/styles.d.ts

@@ -29,6 +29,7 @@ export declare const useStyles: (props?: unknown) => import("antd-style").Return
         justifyContent: string;
         flex: number;
         alignItems: string;
+        overflowX: string;
         '.adm-tab-bar-item': {
             maxWidth: string;
             '.adm-tab-bar-item-title': {

package/dist/client/mobile-providers/context/MobileRoutes.d.ts

@@ -7,7 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import { APIClient } from '@nocobase/client';
-import React from 'react';
+import React, { FC } from 'react';
 import type { IResource } from '@nocobase/sdk';
 export interface MobileRouteItem {
     id: number;
@@ -30,6 +30,14 @@ export interface MobileRoutesContextValue {
     api: APIClient;
 }
 export declare const useMobileRoutes: () => MobileRoutesContextValue;
-export declare const MobileRoutesProvider: ({ children }: {
-    children: any;
-}) => React.JSX.Element;
+export declare const MobileRoutesProvider: FC<{
+    /**
+     * list: return all route data, and only administrators can access;
+     * listAccessible: return the route data that the current user can access;
+     *
+     * @default 'listAccessible'
+     */
+    action?: 'list' | 'listAccessible';
+    refreshRef?: any;
+    manual?: boolean;
+}>;

package/dist/externalVersion.js

@@ -8,23 +8,26 @@
  */
 
 module.exports = {
-  "@nocobase/client": "1.3.38-beta",
+  "@emotion/css": "11.13.4",
+  "@formily/core": "2.3.0",
+  "@formily/shared": "2.3.0",
+  "@nocobase/client": "1.4.0-alpha",
+  "@nocobase/plugin-acl": "1.4.0-alpha",
+  "ahooks": "3.7.8",
+  "antd": "5.12.8",
+  "lodash": "4.17.21",
   "react": "18.2.0",
-  "react-router-dom": "6.21.0",
   "react-i18next": "11.18.6",
-  "@nocobase/server": "1.3.38-beta",
-  "@nocobase/test": "1.3.38-beta",
-  "@nocobase/utils": "1.3.38-beta",
+  "react-router-dom": "6.21.0",
+  "@nocobase/database": "1.4.0-alpha",
+  "@nocobase/server": "1.4.0-alpha",
+  "@nocobase/test": "1.4.0-alpha",
+  "@nocobase/utils": "1.4.0-alpha",
   "@formily/react": "2.3.0",
-  "antd": "5.12.8",
-  "@nocobase/plugin-mobile": "1.3.38-beta",
+  "@nocobase/plugin-mobile": "1.4.0-alpha",
   "@ant-design/icons": "5.2.6",
-  "@nocobase/database": "1.3.38-beta",
-  "lodash": "4.17.21",
   "react-dom": "18.2.0",
   "antd-style": "3.4.5",
-  "@nocobase/sdk": "1.3.38-beta",
-  "@formily/antd-v5": "1.1.9",
-  "@formily/shared": "2.3.0",
-  "@emotion/css": "11.13.0"
+  "@nocobase/sdk": "1.4.0-alpha",
+  "@formily/antd-v5": "1.1.9"
 };

package/dist/locale/en-US.json

@@ -21,5 +21,8 @@
   "Icon field is required": "Icon field is required",
   "Desktop data blocks": "Desktop data blocks",
   "Other desktop blocks": "Other desktop blocks",
-  "Settings": "Settings"
+  "Settings": "Settings",
+  "Mobile menu": "Mobile menu",
+  "No accessible pages found": "No accessible pages found",
+  "This might be due to permission configuration issues": "This might be due to permission configuration issues"
 }

package/dist/locale/zh-CN.json

@@ -22,5 +22,8 @@
   "Icon field is required": "图标必填",
   "Desktop data blocks": "桌面端数据区块",
   "Other desktop blocks": "其他桌面端区块",
-  "Settings": "设置"
+  "Settings": "设置",
+  "Mobile menu": "移动端菜单",
+  "No accessible pages found": "没有找到你可以访问的页面",
+  "This might be due to permission configuration issues": "这可能是权限配置的问题"
 }

package/dist/server/collections/extendRoleField.d.ts

@@ -0,0 +1,14 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+declare const _default: {
+    collectionOptions: import("@nocobase/database").CollectionOptions;
+    mergeOptions: import("deepmerge").Options;
+    extend: boolean;
+};
+export default _default;

package/dist/server/collections/extendRoleField.js

@@ -0,0 +1,48 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var extendRoleField_exports = {};
+__export(extendRoleField_exports, {
+  default: () => extendRoleField_default
+});
+module.exports = __toCommonJS(extendRoleField_exports);
+var import_database = require("@nocobase/database");
+var extendRoleField_default = (0, import_database.extendCollection)({
+  name: "roles",
+  fields: [
+    {
+      type: "belongsToMany",
+      name: "mobileRoutes",
+      target: "mobileRoutes",
+      through: "rolesMobileRoutes",
+      onDelete: "CASCADE"
+    },
+    {
+      type: "boolean",
+      name: "allowNewMobileMenu"
+    }
+  ]
+});

package/dist/server/collections/mobileRoutes.js

@@ -314,6 +314,13 @@ var mobileRoutes_default = (0, import_database.defineCollection)({
         "x-validator": "integer",
         title: "sort"
       }
+    },
+    {
+      type: "belongsToMany",
+      name: "roles",
+      through: "rolesMobileRoutes",
+      target: "roles",
+      onDelete: "CASCADE"
     }
   ],
   category: [],

package/dist/server/migrations/202409131546-set-mobileMenuUiSchemas.d.ts

@@ -0,0 +1,14 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+import { Migration } from '@nocobase/server';
+export default class extends Migration {
+    appVersion: string;
+    up(): Promise<void>;
+    down(): Promise<void>;
+}

package/dist/server/migrations/202409131546-set-mobileMenuUiSchemas.js

@@ -0,0 +1,64 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var set_mobileMenuUiSchemas_exports = {};
+__export(set_mobileMenuUiSchemas_exports, {
+  default: () => set_mobileMenuUiSchemas_default
+});
+module.exports = __toCommonJS(set_mobileMenuUiSchemas_exports);
+var import_server = require("@nocobase/server");
+/* istanbul ignore file -- @preserve */
+class set_mobileMenuUiSchemas_default extends import_server.Migration {
+  appVersion = "<1.4.0-beta";
+  async up() {
+    await this.db.sequelize.transaction(async (transaction) => {
+      const mobileRoutes = await this.db.getRepository("mobileRoutes").find({
+        sort: "sort",
+        transaction
+      });
+      const roles = await this.db.getRepository("roles").find({
+        filter: {
+          "allowNewMobileMenu.$isFalsy": true
+        },
+        transaction
+      });
+      const mobileRouteIds = mobileRoutes.map((item) => item.get("id"));
+      for (const role of roles) {
+        if (role.allowNewMobileMenu === false) {
+          continue;
+        }
+        role.allowNewMobileMenu = true;
+        await role.save({ transaction });
+        await this.db.getRepository("roles.mobileRoutes", role.get("name")).add({
+          tk: mobileRouteIds,
+          transaction
+        });
+      }
+    });
+  }
+  async down() {
+  }
+}

package/dist/server/plugin.d.ts

@@ -9,5 +9,11 @@
 import { Plugin } from '@nocobase/server';
 export declare class PluginMobileServer extends Plugin {
     load(): Promise<void>;
+    setACL(): void;
+    /**
+     * used to implement: roles with permission (allowNewMobileMenu is true) can directly access the newly created menu
+     */
+    bindNewMenuToRoles(): void;
+    registerActionHandlers(): void;
 }
 export default PluginMobileServer;

package/dist/server/plugin.js

@@ -33,15 +33,66 @@ module.exports = __toCommonJS(plugin_exports);
 var import_server = require("@nocobase/server");
 class PluginMobileServer extends import_server.Plugin {
   async load() {
+    this.registerActionHandlers();
+    this.bindNewMenuToRoles();
+    this.setACL();
+  }
+  setACL() {
     this.app.acl.registerSnippet({
-      name: `ui.${this.name}`,
+      name: `ui.mobile`,
       actions: ["mobileRoutes:create", "mobileRoutes:update", "mobileRoutes:destroy"]
     });
     this.app.acl.registerSnippet({
-      name: `pm.${this.name}`,
-      actions: ["mobileRoutes:list"]
+      name: `pm.mobile`,
+      actions: ["mobileRoutes:list", "roles.mobileRoutes:*"]
+    });
+    this.app.acl.allow("mobileRoutes", "listAccessible", "loggedIn");
+  }
+  /**
+   * used to implement: roles with permission (allowNewMobileMenu is true) can directly access the newly created menu
+   */
+  bindNewMenuToRoles() {
+    this.app.db.on("roles.beforeCreate", async (instance) => {
+      instance.set("allowNewMobileMenu", ["admin", "member"].includes(instance.name));
+    });
+    this.app.db.on("mobileRoutes.afterCreate", async (instance, { transaction }) => {
+      const addNewMenuRoles = await this.app.db.getRepository("roles").find({
+        filter: {
+          allowNewMobileMenu: true
+        },
+        transaction
+      });
+      await this.app.db.getRepository("mobileRoutes.roles", instance.id).add({
+        tk: addNewMenuRoles.map((role) => role.name),
+        transaction
+      });
+    });
+  }
+  registerActionHandlers() {
+    this.app.resourceManager.registerActionHandler("mobileRoutes:listAccessible", async (ctx, next) => {
+      const mobileRoutesRepository = ctx.db.getRepository("mobileRoutes");
+      const rolesRepository = ctx.db.getRepository("roles");
+      if (ctx.state.currentRole === "root") {
+        ctx.body = await mobileRoutesRepository.find({
+          tree: true,
+          ...ctx.query
+        });
+        return await next();
+      }
+      const role = await rolesRepository.findOne({
+        filterByTk: ctx.state.currentRole,
+        appends: ["mobileRoutes"]
+      });
+      const mobileRoutesId = role.get("mobileRoutes").map((item) => item.id);
+      ctx.body = await mobileRoutesRepository.find({
+        tree: true,
+        ...ctx.query,
+        filter: {
+          id: mobileRoutesId
+        }
+      });
+      await next();
     });
-    this.app.acl.allow("mobileRoutes", "list", "loggedIn");
   }
 }
 var plugin_default = PluginMobileServer;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-mobile",
-  "version": "1.3.38-beta",
+  "version": "1.4.0-alpha",
   "main": "dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/mobile",
   "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/mobile",
@@ -11,19 +11,26 @@
   "description.zh-CN": "提供移动端页面配置的能力。",
   "peerDependencies": {
     "@nocobase/client": "1.x",
+    "@nocobase/plugin-acl": "1.x",
     "@nocobase/server": "1.x",
     "@nocobase/test": "1.x"
   },
   "devDependencies": {
     "@ant-design/icons": "5.x",
+    "@emotion/css": "11.x",
     "@formily/antd-v5": "1.x",
+    "@formily/core": "2.x",
     "@formily/react": "2.x",
     "@formily/shared": "2.x",
     "@types/react": "17.x",
     "@types/react-dom": "17.x",
+    "ahooks": "3.x",
+    "antd": "5.x",
     "antd-mobile": "^5.36.1",
+    "lodash": "4.x",
     "re-resizable": "6.6.0",
-    "react-device-detect": "2.2.3"
+    "react-device-detect": "2.2.3",
+    "react-i18next": "11.x"
   },
-  "gitHead": "1b9490667c9224cd0b179cbf75e10a581c49b230"
+  "gitHead": "f097a2bddec152522b5645bd5d451f4c866d2060"
 }