@nocobase/plugin-mobile 1.6.0-beta.16 → 1.6.0-beta.18

package/dist/client/pages/dynamic-page/header/tabs/settings.d.ts

@@ -6,8 +6,8 @@
  * 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 { FC } from 'react';
 import { SchemaSettings } from '@nocobase/client';
+import { FC } from 'react';
 import { MobileRouteItem } from '../../../../mobile-providers';
 export declare const mobilePageTabsSettings: SchemaSettings<{}>;
 interface MobilePageTabsSettingsProps {

package/dist/externalVersion.js

@@ -11,24 +11,24 @@ module.exports = {
   "@emotion/css": "11.13.4",
   "@formily/core": "2.3.0",
   "@formily/shared": "2.3.2",
-  "@nocobase/client": "1.6.0-beta.16",
-  "@nocobase/plugin-acl": "1.6.0-beta.16",
+  "@nocobase/client": "1.6.0-beta.18",
+  "@nocobase/plugin-acl": "1.6.0-beta.18",
   "ahooks": "3.7.8",
   "antd": "5.12.8",
   "lodash": "4.17.21",
   "react": "18.2.0",
   "react-i18next": "11.18.6",
   "react-router-dom": "6.28.1",
-  "@nocobase/database": "1.6.0-beta.16",
-  "@nocobase/server": "1.6.0-beta.16",
-  "@nocobase/plugin-localization": "1.6.0-beta.16",
-  "@nocobase/utils": "1.6.0-beta.16",
-  "@nocobase/test": "1.6.0-beta.16",
+  "@nocobase/database": "1.6.0-beta.18",
+  "@nocobase/server": "1.6.0-beta.18",
+  "@nocobase/plugin-localization": "1.6.0-beta.18",
+  "@nocobase/utils": "1.6.0-beta.18",
+  "@nocobase/test": "1.6.0-beta.18",
   "@formily/react": "2.3.0",
-  "@nocobase/plugin-mobile": "1.6.0-beta.16",
+  "@nocobase/plugin-mobile": "1.6.0-beta.18",
   "@ant-design/icons": "5.6.1",
   "react-dom": "18.2.0",
-  "@nocobase/sdk": "1.6.0-beta.16",
+  "@nocobase/sdk": "1.6.0-beta.18",
   "dayjs": "1.11.10",
   "@formily/antd-v5": "1.1.9"
 };

package/dist/locale/it-IT.json

@@ -0,0 +1,29 @@
+{
+  "App settings": "Impostazioni app",
+  "Page settings": "Impostazioni pagina",
+  "Info": "Info",
+  "Back": "Indietro",
+  "Link": "Collegamento",
+  "Remove": "Rimuovi",
+  "Add page": "Aggiungi pagina",
+  "Title": "Titolo",
+  "Icon": "Icona",
+  "Selected icon": "Icona selezionata",
+  "Add link": "Aggiungi collegamento",
+  "Display tab bar": "Mostra barra tab",
+  "Display page header": "Mostra intestazione pagina",
+  "Display navigation bar": "Mostra barra di navigazione",
+  "Display page title": "Mostra titolo pagina",
+  "Display tabs": "Mostra tab",
+  "Add tab": "Aggiungi tab",
+  "Mobile": "Mobile",
+  "Title field is required": "Il campo titolo è obbligatorio",
+  "Icon field is required": "Il campo icona è obbligatorio",
+  "Desktop data blocks": "Blocchi dati desktop",
+  "Other desktop blocks": "Altri blocchi desktop",
+  "Settings": "Impostazioni",
+  "Mobile menu": "Menu mobile",
+  "No accessible pages found": "Nessuna pagina accessibile trovata",
+  "This might be due to permission configuration issues": "Questo potrebbe essere dovuto a problemi di configurazione dei permessi",
+  "Select time":"Seleziona orario"
+}

package/dist/server/migrations/202503091240-fix-roles-mobile-routes.d.ts

@@ -0,0 +1,13 @@
+/**
+ * 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>;
+}

package/dist/server/migrations/202503091240-fix-roles-mobile-routes.js

@@ -0,0 +1,87 @@
+/**
+ * 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 __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+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 __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var fix_roles_mobile_routes_exports = {};
+__export(fix_roles_mobile_routes_exports, {
+  default: () => fix_roles_mobile_routes_default
+});
+module.exports = __toCommonJS(fix_roles_mobile_routes_exports);
+var import_server = require("@nocobase/server");
+var import_lodash = __toESM(require("lodash"));
+class fix_roles_mobile_routes_default extends import_server.Migration {
+  appVersion = "<1.6.0";
+  async up() {
+    const rolesMobileRoutesRepo = this.db.getRepository("rolesMobileRoutes");
+    const count = await rolesMobileRoutesRepo.count();
+    if (!count) {
+      return;
+    }
+    const mobileRoutesRepo = this.db.getRepository("mobileRoutes");
+    try {
+      await this.db.sequelize.transaction(async (transaction) => {
+        const rolesMobileRoutes = await rolesMobileRoutesRepo.find({ transaction });
+        const rolesMobileRouteIds = rolesMobileRoutes.map((x) => x.get("mobileRouteId"));
+        const mobileRoutes = await mobileRoutesRepo.find({
+          filter: { $or: [{ id: rolesMobileRouteIds }, { parentId: rolesMobileRouteIds }] },
+          transaction
+        });
+        const records = findMissingRoutes(rolesMobileRoutes, mobileRoutes);
+        await rolesMobileRoutesRepo.createMany({ records, transaction });
+      });
+    } catch (error) {
+      console.error("Migration failed:", error);
+      throw error;
+    }
+  }
+}
+function findMissingRoutes(rolesMobileRoutes, mobileRoutes) {
+  const routeMap = import_lodash.default.keyBy(mobileRoutes, "id");
+  const group = (id, roleName) => `${id}_${roleName}`;
+  const existingMap = new Set(rolesMobileRoutes.map((x) => group(x.mobileRouteId, x.roleName)));
+  const missingRoutes = [];
+  rolesMobileRoutes.forEach((route) => {
+    const parentRoute = routeMap[route.mobileRouteId];
+    mobileRoutes.forEach((child) => {
+      if (child.hidden && child.parentId === parentRoute.id) {
+        const key = group(child.id, route.roleName);
+        if (!existingMap.has(key)) {
+          missingRoutes.push({ mobileRouteId: child.id, roleName: route.roleName });
+        }
+      }
+    });
+  });
+  return missingRoutes;
+}

package/dist/server/plugin.js

@@ -7,9 +7,11 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -23,6 +25,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var plugin_exports = {};
 __export(plugin_exports, {
@@ -32,6 +42,7 @@ __export(plugin_exports, {
 module.exports = __toCommonJS(plugin_exports);
 var import_server = require("@nocobase/server");
 var import_utils = require("@nocobase/utils");
+var import_lodash = __toESM(require("lodash"));
 class PluginMobileServer extends import_server.Plugin {
   async load() {
     this.registerActionHandlers();
@@ -83,6 +94,38 @@ class PluginMobileServer extends import_server.Plugin {
         transaction
       });
     });
+    const processRoleMobileRoutes = async (params) => {
+      const { models, action, transaction } = params;
+      if (!models.length) return;
+      const parentIds = models.map((x) => x.mobileRouteId);
+      const tabs = await this.app.db.getRepository("mobileRoutes").find({
+        where: { parentId: parentIds, hidden: true },
+        transaction
+      });
+      if (!tabs.length) return;
+      const repository = this.app.db.getRepository("rolesMobileRoutes");
+      const roleName = models[0].get("roleName");
+      const tabIds = tabs.map((x) => x.get("id"));
+      const where = { mobileRouteId: tabIds, roleName };
+      if (action === "create") {
+        const exists = await repository.find({ where });
+        const modelsByRouteId = import_lodash.default.keyBy(exists, (x) => x.get("mobileRouteId"));
+        const createModels = tabs.map((x) => !modelsByRouteId[x.get("id")] && { mobileRouteId: x.get("id"), roleName }).filter(Boolean);
+        return await repository.create({ values: createModels, transaction });
+      }
+      if (action === "remove") {
+        return await repository.destroy({ filter: where, transaction });
+      }
+    };
+    this.app.db.on("rolesMobileRoutes.afterBulkCreate", async (instances, options) => {
+      await processRoleMobileRoutes({ models: instances, action: "create", transaction: options.transaction });
+    });
+    this.app.db.on("rolesMobileRoutes.afterBulkDestroy", async (options) => {
+      const models = await this.app.db.getRepository("rolesMobileRoutes").find({
+        where: options.where
+      });
+      await processRoleMobileRoutes({ models, action: "remove", transaction: options.transaction });
+    });
   }
   registerActionHandlers() {
     this.app.resourceManager.registerActionHandler("mobileRoutes:listAccessible", async (ctx, next) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-mobile",
-  "version": "1.6.0-beta.16",
+  "version": "1.6.0-beta.18",
   "main": "dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/mobile",
   "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/mobile",
@@ -33,5 +33,5 @@
     "react-device-detect": "2.2.3",
     "react-i18next": "11.x"
   },
-  "gitHead": "3171e60836b0ad0ad9ef02ecfbf16250a4afed89"
+  "gitHead": "b6981f549765a1f94fe43a18faa0eae9246fdd98"
 }