@nocobase/plugin-mobile 1.6.0-alpha.3 → 1.6.0-alpha.31

package/dist/client/locale.d.ts

@@ -8,3 +8,5 @@
  */
 export declare function usePluginTranslation(): import("react-i18next").UseTranslationResponse<string[], undefined>;
 export declare function generatePluginTranslationTemplate(key: string): string;
+export declare const ROUTE_NAMESPACE = "lm-mobile-routes";
+export declare function useRouteTranslation(): import("react-i18next").UseTranslationResponse<"lm-mobile-routes", undefined>;

package/dist/client/mobile/MobileAppContext.d.ts

@@ -10,6 +10,8 @@ import React, { FC } from 'react';
 interface MobileAppContextProps {
     showTabBar?: boolean;
     setShowTabBar?: (showTabBar: boolean) => void;
+    showBackButton?: boolean;
+    setShowBackButton?: (showBackButton: boolean) => void;
 }
 export declare const MobileAppContext: React.Context<MobileAppContextProps>;
 export interface MobileAppProviderProps {

package/dist/client/mobile-blocks/settings-block/MobileSettings.d.ts

@@ -7,5 +7,6 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import React from 'react';
+export declare function UserCenter(): React.JSX.Element;
 export declare const InternalSettings: () => React.JSX.Element;
 export declare const MobileSettings: () => React.JSX.Element;

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

@@ -18,6 +18,9 @@ export interface MobileRouteItem {
     icon?: string;
     parentId?: number;
     children?: MobileRouteItem[];
+    hideInMenu?: boolean;
+    enableTabs?: boolean;
+    hidden?: boolean;
 }
 export declare const MobileRoutesContext: React.Context<MobileRoutesContextValue>;
 export interface MobileRoutesContextValue {

package/dist/client/pages/dynamic-page/components/MobileDatePicker.d.ts

@@ -8,4 +8,11 @@
  */
 import React from 'react';
 declare const MobileDateTimePicker: React.ForwardRefExoticComponent<Omit<Partial<any>, "ref"> & React.RefAttributes<unknown>>;
-export { MobileDateTimePicker };
+declare const MobileRangePicker: (props: any) => React.JSX.Element;
+declare const MobileDateFilterWithPicker: (props: any) => React.JSX.Element;
+type ComposedMobileTimePicker = React.FC<any> & {
+    RangePicker?: React.FC<any>;
+    ReadPretty?: React.FC<any>;
+};
+declare const MobileTimePicker: ComposedMobileTimePicker;
+export { MobileDateTimePicker, MobileRangePicker, MobileDateFilterWithPicker, MobileTimePicker };

package/dist/client/pages/dynamic-page/header/navigation-bar/actions/MobileNavigationActionBar.d.ts

@@ -25,4 +25,6 @@ export declare const ActionBarProvider: React.FC<ActionBarContextValue>;
 export declare const useActionBarContext: () => ActionBarContextValue;
 export declare const MobileNavigationActionBar: React.FunctionComponent<Omit<{
     children?: React.ReactNode;
-}, string | number | symbol> & Omit<any, "ref">>;
+}, string | number | symbol> & Omit<any, "ref"> & {
+    children?: any;
+}>;

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,22 +11,24 @@ module.exports = {
   "@emotion/css": "11.13.4",
   "@formily/core": "2.3.0",
   "@formily/shared": "2.3.2",
-  "@nocobase/client": "1.6.0-alpha.3",
-  "@nocobase/plugin-acl": "1.6.0-alpha.3",
+  "@nocobase/client": "1.6.0-alpha.31",
+  "@nocobase/plugin-acl": "1.6.0-alpha.31",
   "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.21.0",
-  "@nocobase/database": "1.6.0-alpha.3",
-  "@nocobase/server": "1.6.0-alpha.3",
-  "@nocobase/test": "1.6.0-alpha.3",
-  "@nocobase/utils": "1.6.0-alpha.3",
+  "react-router-dom": "6.28.1",
+  "@nocobase/database": "1.6.0-alpha.31",
+  "@nocobase/plugin-localization": "1.6.0-alpha.31",
+  "@nocobase/server": "1.6.0-alpha.31",
+  "@nocobase/utils": "1.6.0-alpha.31",
+  "@nocobase/test": "1.6.0-alpha.31",
   "@formily/react": "2.3.0",
-  "@nocobase/plugin-mobile": "1.6.0-alpha.3",
-  "@ant-design/icons": "5.2.6",
+  "@nocobase/plugin-mobile": "1.6.0-alpha.31",
+  "@ant-design/icons": "5.6.1",
   "react-dom": "18.2.0",
-  "@nocobase/sdk": "1.6.0-alpha.3",
+  "@nocobase/sdk": "1.6.0-alpha.31",
+  "dayjs": "1.11.10",
   "@formily/antd-v5": "1.1.9"
 };

package/dist/locale/en-US.json

@@ -23,6 +23,7 @@
   "Other desktop blocks": "Other desktop blocks",
   "Settings": "Settings",
   "Mobile menu": "Mobile menu",
+  "Mobile routes": "Mobile routes",
   "No accessible pages found": "No accessible pages found",
   "This might be due to permission configuration issues": "This might be due to permission configuration issues",
   "Select time":"Select time"

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/locale/ja-JP.json

@@ -23,5 +23,6 @@
   "Other desktop blocks": "他のデスクトップブロック",
   "Settings": "設定",
   "Fill": "塗りつぶし",
-  "Select time":"時間の選択"
-}
+  "Select time":"時間の選択",
+  "Mobile routes": "モバイルルート"
+}

package/dist/locale/zh-CN.json

@@ -24,10 +24,12 @@
   "Other desktop blocks": "其他桌面端区块",
   "Settings": "设置",
   "Mobile menu": "移动端菜单",
+  "Mobile routes": "移动端路由",
   "No accessible pages found": "没有找到你可以访问的页面",
   "This might be due to permission configuration issues": "这可能是权限配置的问题",
   "Select time": "选择时间",
   "Clear": "清空",
   "Confirm": "确认",
-  "Cancel": "取消"
+  "Cancel": "取消",
+  "Display < back button": "显示 < 返回按钮"
 }

package/dist/server/collections/mobileRoutes.js

@@ -33,6 +33,7 @@ var import_database = require("@nocobase/database");
 var mobileRoutes_default = (0, import_database.defineCollection)({
   name: "mobileRoutes",
   dumpRules: "required",
+  migrationRules: ["overwrite", "schema-only"],
   title: "mobileRoutes",
   inherit: false,
   hidden: false,
@@ -225,7 +226,7 @@ var mobileRoutes_default = (0, import_database.defineCollection)({
       uiSchema: {
         type: "string",
         "x-component": "Input",
-        title: "title"
+        title: '{{t("Title")}}'
       }
     },
     {
@@ -240,7 +241,7 @@ var mobileRoutes_default = (0, import_database.defineCollection)({
       uiSchema: {
         type: "string",
         "x-component": "Input",
-        title: "icon"
+        title: '{{t("Icon")}}'
       }
     },
     {
@@ -255,7 +256,7 @@ var mobileRoutes_default = (0, import_database.defineCollection)({
       uiSchema: {
         type: "string",
         "x-component": "Input",
-        title: "schemaUid"
+        title: '{{t("Schema UID")}}'
       }
     },
     {
@@ -270,7 +271,7 @@ var mobileRoutes_default = (0, import_database.defineCollection)({
       uiSchema: {
         type: "string",
         "x-component": "Input",
-        title: "type"
+        title: '{{t("Type")}}'
       }
     },
     {
@@ -292,7 +293,7 @@ var mobileRoutes_default = (0, import_database.defineCollection)({
           }
         },
         default: null,
-        title: "options"
+        title: '{{t("Options")}}'
       }
     },
     {
@@ -304,6 +305,7 @@ var mobileRoutes_default = (0, import_database.defineCollection)({
       collectionName: "mobileRoutes",
       parentKey: null,
       reverseKey: null,
+      scopeKey: "parentId",
       uiSchema: {
         type: "number",
         "x-component": "InputNumber",
@@ -312,7 +314,7 @@ var mobileRoutes_default = (0, import_database.defineCollection)({
           step: "1"
         },
         "x-validator": "integer",
-        title: "sort"
+        title: '{{t("Sort")}}'
       }
     },
     {
@@ -321,6 +323,36 @@ var mobileRoutes_default = (0, import_database.defineCollection)({
       through: "rolesMobileRoutes",
       target: "roles",
       onDelete: "CASCADE"
+    },
+    {
+      type: "boolean",
+      name: "hideInMenu",
+      interface: "checkbox",
+      uiSchema: {
+        type: "boolean",
+        "x-component": "Checkbox",
+        title: '{{t("Hide in menu")}}'
+      }
+    },
+    {
+      type: "boolean",
+      name: "enableTabs",
+      interface: "checkbox",
+      uiSchema: {
+        type: "boolean",
+        "x-component": "Checkbox",
+        title: '{{t("Enable tabs")}}'
+      }
+    },
+    {
+      type: "boolean",
+      name: "hidden",
+      interface: "checkbox",
+      uiSchema: {
+        type: "boolean",
+        "x-component": "Checkbox",
+        title: '{{t("Hidden")}}'
+      }
     }
   ],
   category: [],

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.d.ts

@@ -15,5 +15,6 @@ export declare class PluginMobileServer extends Plugin {
      */
     bindNewMenuToRoles(): void;
     registerActionHandlers(): void;
+    registerLocalizationSource(): void;
 }
 export default PluginMobileServer;

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, {
@@ -31,11 +41,28 @@ __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();
     this.bindNewMenuToRoles();
     this.setACL();
+    this.registerLocalizationSource();
+    this.app.db.on("mobileRoutes.afterUpdate", async (instance, { transaction }) => {
+      if (instance.changed("enableTabs")) {
+        const repository = this.app.db.getRepository("mobileRoutes");
+        await repository.update({
+          filter: {
+            parentId: instance.id
+          },
+          values: {
+            hidden: !instance.enableTabs
+          },
+          transaction
+        });
+      }
+    });
   }
   setACL() {
     this.app.acl.registerSnippet({
@@ -67,6 +94,45 @@ 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);
+        for (const values of createModels) {
+          await repository.firstOrCreate({
+            values,
+            filterKeys: ["mobileRouteId", "roleName"],
+            transaction
+          });
+        }
+        return;
+      }
+      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) => {
@@ -94,6 +160,36 @@ class PluginMobileServer extends import_server.Plugin {
       await next();
     });
   }
+  registerLocalizationSource() {
+    const localizationPlugin = this.app.pm.get("localization");
+    if (!localizationPlugin) {
+      return;
+    }
+    localizationPlugin.sourceManager.registerSource("mobile-routes", {
+      title: (0, import_utils.tval)("Mobile routes"),
+      sync: async (ctx) => {
+        const mobileRoutes = await ctx.db.getRepository("mobileRoutes").find({
+          raw: true
+        });
+        const resources = {};
+        mobileRoutes.forEach((route) => {
+          if (route.title) {
+            resources[route.title] = "";
+          }
+        });
+        return {
+          "lm-mobile-routes": resources
+        };
+      },
+      namespace: "lm-mobile-routes",
+      collections: [
+        {
+          collection: "mobileRoutes",
+          fields: ["title"]
+        }
+      ]
+    });
+  }
 }
 var plugin_default = PluginMobileServer;
 // Annotate the CommonJS export names for ESM import in node:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-mobile",
-  "version": "1.6.0-alpha.3",
+  "version": "1.6.0-alpha.31",
   "main": "dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/mobile",
   "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/mobile",
@@ -12,6 +12,7 @@
   "peerDependencies": {
     "@nocobase/client": "1.x",
     "@nocobase/plugin-acl": "1.x",
+    "@nocobase/plugin-localization": "1.x",
     "@nocobase/server": "1.x",
     "@nocobase/test": "1.x"
   },
@@ -22,8 +23,8 @@
     "@formily/core": "2.x",
     "@formily/react": "2.x",
     "@formily/shared": "2.x",
-    "@types/react": "17.x",
-    "@types/react-dom": "17.x",
+    "@types/react": "18.x",
+    "@types/react-dom": "18.x",
     "ahooks": "3.x",
     "antd": "5.x",
     "antd-mobile": "^5.38",
@@ -32,5 +33,5 @@
     "react-device-detect": "2.2.3",
     "react-i18next": "11.x"
   },
-  "gitHead": "205b4aca5556d5af70679fa401394943a9e51670"
+  "gitHead": "2f118f0a0691dd51c437f208b1166258a615b6a8"
 }