@liujitcn/kratos-uni-app-core 0.0.82 → 0.0.83

package/README.md

@@ -43,6 +43,8 @@ packages/core
 
 ## 公开入口
 
+登录页返回会清理本次回跳并替换到首页；直接打开登录页清理旧 `lastRoute`，登录成功默认进入首页。主动登录、路由守卫和会话过期重登通过 `redirect=1` 标记保留本次业务目标及查询参数，成功跳转后才清理目标。登录页每次显示都会检查有效登录态，已登录则替换回首页，避免浏览器回退重新停留在登录页。H5 与微信小程序统一使用 `reLaunch` 替换登录入口并重置应用页面栈。
+
 - `@liujitcn/kratos-uni-app-core`：运行时、导航、store 和组件。
 - `@liujitcn/kratos-uni-app-core/module`：模块协议和 core 模块。
 - `@liujitcn/kratos-uni-app-core/vite`：Vite 配置、页面装配插件和构建错误文案格式化器。

package/dist/module.mjs

@@ -26,6 +26,7 @@ var corePages = {
 
 // src/locales/zh-CN.json
 var zh_CN_default = {
+  "common.action.back": "\u8FD4\u56DE",
   "common.action.cancel": "\u53D6\u6D88",
   "common.action.confirm": "\u786E\u5B9A",
   "common.action.delete": "\u5220\u9664",
@@ -36,16 +37,11 @@ var zh_CN_default = {
   "common.action.save": "\u4FDD\u5B58",
   "common.action.view": "\u67E5\u770B",
   "common.field.language": "\u8BED\u8A00",
-  "common.language.en-US": "English",
-  "common.language.zh-CN": "\u7B80\u4F53\u4E2D\u6587",
-  "common.language.zh-TW": "\u7E41\u4F53\u4E2D\u6587",
-  "common.language.ja-JP": "\u65E5\u8BED",
   "common.message.loading": "\u6B63\u5728\u52A0\u8F7D",
   "common.message.network_error": "\u7F51\u7EDC\u9519\u8BEF\uFF0C\u6362\u4E2A\u7F51\u7EDC\u8BD5\u8BD5",
   "common.message.request_error": "\u8BF7\u6C42\u9519\u8BEF",
   "common.message.unknown": "\u6682\u65F6\u65E0\u6CD5\u5904\u7406\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5",
   "common.title.notice": "\u63D0\u793A",
-  "core.auth.login_again": "\u91CD\u65B0\u767B\u5F55",
   "core.auth.session_expired": "\u5F53\u524D\u9875\u9762\u5DF2\u5931\u6548\uFF0C\u8BF7\u91CD\u65B0\u767B\u5F55",
   "core.config.missing": "\u79FB\u52A8\u7AEF\u914D\u7F6E\u7F3A\u5931\uFF1A{names}",
   "core.crypto.base64_decode_unsupported": "\u5F53\u524D\u73AF\u5883\u4E0D\u652F\u6301 Base64 \u89E3\u7801",
@@ -96,7 +92,6 @@ var zh_CN_default = {
   "core.login.mfa_recovery_code": "\u6062\u590D\u7801\uFF08\u53EF\u9009\uFF09",
   "core.login.mfa_setup_title": "\u7ED1\u5B9A\u591A\u56E0\u7D20\u8BA4\u8BC1",
   "core.login.mfa_copy_uri": "\u590D\u5236\u7ED1\u5B9A\u5730\u5740",
-  "core.login.mfa_copy_success": "\u7ED1\u5B9A\u5730\u5740\u5DF2\u590D\u5236",
   "core.login.mfa_recovery_codes_copied": "\u6062\u590D\u7801\u5DF2\u590D\u5236",
   "core.login.mfa_recovery_codes_title": "\u4FDD\u5B58 MFA \u6062\u590D\u7801",
   "core.login.mfa_recovery_codes_warning": "\u6BCF\u4E2A\u6062\u590D\u7801\u53EA\u80FD\u4F7F\u7528\u4E00\u6B21\uFF0C\u6B64\u5F39\u7A97\u5173\u95ED\u540E\u4E0D\u4F1A\u518D\u6B21\u663E\u793A\u3002",
@@ -169,14 +164,7 @@ var zh_CN_default = {
   "core.webview.embed_blocked": "\u5F53\u524D H5 \u9875\u9762\u53EF\u80FD\u88AB\u76EE\u6807\u7AD9\u70B9\u9650\u5236\u5D4C\u5165",
   "core.webview.invalid_url": "\u7F3A\u5C11\u6709\u6548\u94FE\u63A5\u5730\u5740",
   "core.webview.open_failed": "\u94FE\u63A5\u65E0\u6CD5\u6253\u5F00",
-  "common.value.top_level": "\u9876\u7EA7\u8282\u70B9",
-  "common.resource.default": "{resource}",
-  "common.action.delete_resource": "\u5220\u9664{resource}",
-  "common.action.set_field_status": "\u8BBE\u7F6E{field}",
   "common.action.load_more": "\u52A0\u8F7D\u66F4\u591A",
-  "common.status.loading": "\u52A0\u8F7D\u4E2D\u2026",
-  "core.navigation.analytics": "\u5206\u6790",
-  "core.navigation.report": "\u62A5\u8868",
   "core.settings.theme": "\u4E3B\u9898\u5916\u89C2",
   "core.theme.auto": "\u8DDF\u968F\u7CFB\u7EDF",
   "core.theme.dark": "\u6697\u9ED1",
@@ -185,6 +173,7 @@ var zh_CN_default = {
 
 // src/locales/en-US.json
 var en_US_default = {
+  "common.action.back": "Back",
   "common.action.cancel": "Cancel",
   "common.action.confirm": "Confirm",
   "common.action.delete": "Delete",
@@ -195,16 +184,11 @@ var en_US_default = {
   "common.action.save": "Save",
   "common.action.view": "View",
   "common.field.language": "Language",
-  "common.language.en-US": "English",
-  "common.language.zh-CN": "\u7B80\u4F53\u4E2D\u6587",
-  "common.language.zh-TW": "Traditional Chinese",
-  "common.language.ja-JP": "Japanese",
   "common.message.loading": "Loading",
   "common.message.network_error": "Network error. Check your connection and try again.",
   "common.message.request_error": "Request failed",
   "common.message.unknown": "Unable to process this request. Try again later.",
   "common.title.notice": "Notice",
-  "core.auth.login_again": "Log in again",
   "core.auth.session_expired": "Your session has expired. Please log in again.",
   "core.config.missing": "Missing app configuration: {names}",
   "core.crypto.base64_decode_unsupported": "Base64 decoding is not supported in this environment",
@@ -255,7 +239,6 @@ var en_US_default = {
   "core.login.mfa_recovery_code": "Recovery code (optional)",
   "core.login.mfa_setup_title": "Bind multi-factor authentication",
   "core.login.mfa_copy_uri": "Copy binding address",
-  "core.login.mfa_copy_success": "Binding address copied",
   "core.login.mfa_recovery_codes_copied": "Recovery codes copied",
   "core.login.mfa_recovery_codes_title": "Save MFA recovery codes",
   "core.login.mfa_recovery_codes_warning": "Each code works once and will not be shown again after this dialog closes.",
@@ -328,14 +311,7 @@ var en_US_default = {
   "core.webview.embed_blocked": "The destination may block embedding on H5",
   "core.webview.invalid_url": "No valid link was provided",
   "core.webview.open_failed": "Unable to open link",
-  "common.value.top_level": "Top level",
-  "common.resource.default": "{resource}",
-  "common.action.delete_resource": "Delete {resource}",
-  "common.action.set_field_status": "Set {field}",
   "common.action.load_more": "Load more",
-  "common.status.loading": "Loading\u2026",
-  "core.navigation.analytics": "Analytics",
-  "core.navigation.report": "Reports",
   "core.settings.theme": "Theme Appearance",
   "core.theme.auto": "Follow System",
   "core.theme.dark": "Dark",
@@ -344,6 +320,7 @@ var en_US_default = {
 
 // src/locales/ja-JP.json
 var ja_JP_default = {
+  "common.action.back": "\u623B\u308B",
   "common.action.cancel": "\u30AD\u30E3\u30F3\u30BB\u30EB",
   "common.action.confirm": "OK",
   "common.action.delete": "\u524A\u9664",
@@ -354,16 +331,11 @@ var ja_JP_default = {
   "common.action.save": "\u4FDD\u5B58",
   "common.action.view": "\u8868\u793A",
   "common.field.language": "\u8A00\u8A9E",
-  "common.language.en-US": "\u82F1\u8A9E",
-  "common.language.zh-CN": "\u7C21\u4F53\u5B57\u4E2D\u56FD\u8A9E",
-  "common.language.zh-TW": "\u7E41\u4F53\u5B57\u4E2D\u56FD\u8A9E",
-  "common.language.ja-JP": "\u65E5\u672C\u8A9E",
   "common.message.loading": "\u3092\u30ED\u30FC\u30C9\u4E2D\u3067\u3059",
   "common.message.network_error": "\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF \u30A8\u30E9\u30FC\u3002\u5225\u306E\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u3092\u8A66\u3057\u3066\u304F\u3060\u3055\u3044",
   "common.message.request_error": "\u30EA\u30AF\u30A8\u30B9\u30C8\u30A8\u30E9\u30FC",
   "common.message.unknown": "\u73FE\u5728\u51E6\u7406\u3067\u304D\u307E\u305B\u3093\u3002\u5F8C\u3067\u3082\u3046\u4E00\u5EA6\u304A\u8A66\u3057\u304F\u3060\u3055\u3044\u3002",
   "common.title.notice": "\u30D2\u30F3\u30C8",
-  "core.auth.login_again": "\u518D\u5EA6\u30ED\u30B0\u30A4\u30F3\u3057\u3066\u304F\u3060\u3055\u3044",
   "core.auth.session_expired": "\u73FE\u5728\u306E\u30DA\u30FC\u30B8\u306F\u7121\u52B9\u3067\u3059\u3002\u518D\u5EA6\u30ED\u30B0\u30A4\u30F3\u3057\u3066\u304F\u3060\u3055\u3044\u3002",
   "core.config.missing": "\u30E2\u30D0\u30A4\u30EB\u7AEF\u672B\u306E\u8A2D\u5B9A\u304C\u3042\u308A\u307E\u305B\u3093: {names}",
   "core.crypto.base64_decode_unsupported": "\u73FE\u5728\u306E\u74B0\u5883\u306F Base64 \u30C7\u30B3\u30FC\u30C9\u3092\u30B5\u30DD\u30FC\u30C8\u3057\u3066\u3044\u307E\u305B\u3093",
@@ -414,7 +386,6 @@ var ja_JP_default = {
   "core.login.mfa_recovery_code": "\u30EA\u30AB\u30D0\u30EA\u30FC\u30B3\u30FC\u30C9\uFF08\u4EFB\u610F\uFF09",
   "core.login.mfa_setup_title": "\u591A\u8981\u7D20\u8A8D\u8A3C\u3092\u8A2D\u5B9A",
   "core.login.mfa_copy_uri": "\u767B\u9332\u30A2\u30C9\u30EC\u30B9\u3092\u30B3\u30D4\u30FC",
-  "core.login.mfa_copy_success": "\u767B\u9332\u30A2\u30C9\u30EC\u30B9\u3092\u30B3\u30D4\u30FC\u3057\u307E\u3057\u305F",
   "core.login.mfa_recovery_codes_copied": "\u30EA\u30AB\u30D0\u30EA\u30FC\u30B3\u30FC\u30C9\u3092\u30B3\u30D4\u30FC\u3057\u307E\u3057\u305F",
   "core.login.mfa_recovery_codes_title": "MFA \u30EA\u30AB\u30D0\u30EA\u30FC\u30B3\u30FC\u30C9\u3092\u4FDD\u5B58",
   "core.login.mfa_recovery_codes_warning": "\u5404\u30B3\u30FC\u30C9\u306F\u4E00\u5EA6\u3060\u3051\u4F7F\u7528\u3067\u304D\u3001\u30C0\u30A4\u30A2\u30ED\u30B0\u3092\u9589\u3058\u308B\u3068\u518D\u8868\u793A\u3055\u308C\u307E\u305B\u3093\u3002",
@@ -487,14 +458,7 @@ var ja_JP_default = {
   "core.webview.embed_blocked": "\u73FE\u5728\u306E H5 \u30DA\u30FC\u30B8\u306F\u3001\u30BF\u30FC\u30B2\u30C3\u30C8 \u30B5\u30A4\u30C8\u306B\u3088\u3063\u3066\u57CB\u3081\u8FBC\u307F\u304C\u5236\u9650\u3055\u308C\u3066\u3044\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059",
   "core.webview.invalid_url": "\u6709\u52B9\u306A\u30EA\u30F3\u30AF \u30A2\u30C9\u30EC\u30B9\u304C\u3042\u308A\u307E\u305B\u3093",
   "core.webview.open_failed": "\u30EA\u30F3\u30AF\u3092\u958B\u3051\u307E\u305B\u3093",
-  "common.value.top_level": "\u30C8\u30C3\u30D7\u30EC\u30D9\u30EB",
-  "common.resource.default": "{resource}",
-  "common.action.delete_resource": "{resource}\u3092\u524A\u9664",
-  "common.action.set_field_status": "{field}\u3092\u8A2D\u5B9A",
   "common.action.load_more": "\u3055\u3089\u306B\u8AAD\u307F\u8FBC\u3080",
-  "common.status.loading": "\u8AAD\u307F\u8FBC\u307F\u4E2D\u2026",
-  "core.navigation.analytics": "\u5206\u6790",
-  "core.navigation.report": "\u30EC\u30DD\u30FC\u30C8",
   "core.settings.theme": "\u30C6\u30FC\u30DE\u5916\u89B3",
   "core.theme.auto": "\u30B7\u30B9\u30C6\u30E0\u306B\u5F93\u3046",
   "core.theme.dark": "\u30C0\u30FC\u30AF",
@@ -503,6 +467,7 @@ var ja_JP_default = {
 
 // src/locales/zh-TW.json
 var zh_TW_default = {
+  "common.action.back": "\u8FD4\u56DE",
   "common.action.cancel": "\u53D6\u6D88",
   "common.action.confirm": "\u78BA\u5B9A",
   "common.action.delete": "\u522A\u9664",
@@ -513,16 +478,11 @@ var zh_TW_default = {
   "common.action.save": "\u5132\u5B58",
   "common.action.view": "\u6AA2\u8996",
   "common.field.language": "\u8A9E\u8A00",
-  "common.language.en-US": "English",
-  "common.language.zh-CN": "\u7C21\u9AD4\u4E2D\u6587",
-  "common.language.zh-TW": "\u7E41\u9AD4\u4E2D\u6587",
-  "common.language.ja-JP": "\u65E5\u8A9E",
   "common.message.loading": "\u6B63\u5728\u8F09\u5165",
   "common.message.network_error": "\u7DB2\u8DEF\u932F\u8AA4\uFF0C\u63DB\u500B\u7DB2\u8DEF\u8A66\u8A66",
   "common.message.request_error": "\u8ACB\u6C42\u932F\u8AA4",
   "common.message.unknown": "\u66AB\u6642\u7121\u6CD5\u8655\u7406\uFF0C\u8ACB\u7A0D\u5F8C\u91CD\u8A66",
   "common.title.notice": "\u63D0\u793A",
-  "core.auth.login_again": "\u91CD\u65B0\u767B\u5165",
   "core.auth.session_expired": "\u7576\u524D\u9801\u9762\u5DF2\u5931\u6548\uFF0C\u8ACB\u91CD\u65B0\u767B\u5165",
   "core.config.missing": "\u79FB\u52D5\u7AEF\u914D\u7F6E\u7F3A\u5931\uFF1A{names}",
   "core.crypto.base64_decode_unsupported": "\u7576\u524D\u74B0\u5883\u4E0D\u652F\u63F4 Base64 \u89E3\u78BC",
@@ -573,7 +533,6 @@ var zh_TW_default = {
   "core.login.mfa_recovery_code": "\u6062\u5FA9\u78BC\uFF08\u53EF\u9078\uFF09",
   "core.login.mfa_setup_title": "\u7D81\u5B9A\u591A\u56E0\u7D20\u8A8D\u8B49",
   "core.login.mfa_copy_uri": "\u8907\u88FD\u7D81\u5B9A\u5730\u5740",
-  "core.login.mfa_copy_success": "\u7D81\u5B9A\u5730\u5740\u5DF2\u8907\u88FD",
   "core.login.mfa_recovery_codes_copied": "\u6062\u5FA9\u78BC\u5DF2\u8907\u88FD",
   "core.login.mfa_recovery_codes_title": "\u5132\u5B58 MFA \u6062\u5FA9\u78BC",
   "core.login.mfa_recovery_codes_warning": "\u6BCF\u500B\u6062\u5FA9\u78BC\u53EA\u80FD\u4F7F\u7528\u4E00\u6B21\uFF0C\u95DC\u9589\u6B64\u8996\u7A97\u5F8C\u4E0D\u6703\u518D\u6B21\u986F\u793A\u3002",
@@ -646,14 +605,7 @@ var zh_TW_default = {
   "core.webview.embed_blocked": "\u7576\u524D H5 \u9801\u9762\u53EF\u80FD\u88AB\u76EE\u6A19\u7AD9\u9EDE\u9650\u5236\u5D4C\u5165",
   "core.webview.invalid_url": "\u7F3A\u5C11\u6709\u6548\u9023\u7D50\u5730\u5740",
   "core.webview.open_failed": "\u9023\u7D50\u7121\u6CD5\u958B\u555F",
-  "common.value.top_level": "\u9802\u7D1A\u7BC0\u9EDE",
-  "common.resource.default": "{resource}",
-  "common.action.delete_resource": "\u522A\u9664{resource}",
-  "common.action.set_field_status": "\u8A2D\u5B9A{field}",
   "common.action.load_more": "\u8F09\u5165\u66F4\u591A",
-  "common.status.loading": "\u8F09\u5165\u4E2D\u2026",
-  "core.navigation.analytics": "\u5206\u6790",
-  "core.navigation.report": "\u5831\u8868",
   "core.settings.theme": "\u4E3B\u984C\u5916\u89C0",
   "core.theme.auto": "\u8DDF\u96A8\u7CFB\u7D71",
   "core.theme.dark": "\u6697\u9ED1",

package/package.json

@@ -7,7 +7,7 @@
     "type": "git",
     "url": "git@github.com:liujitcn/kratos-admin.git"
   },
-  "version": "0.0.82",
+  "version": "0.0.83",
   "type": "module",
   "files": [
     "dist",

package/src/locales/README.md

@@ -9,4 +9,4 @@
 | `en-US.json` | 英文 Core 语言包。 | uni-app 切换为英文时使用。 |
 | `ja-JP.json` | 日文 Core 语言包。 | uni-app 切换为日文时使用。 |
 
-语言包是标准 JSON，不能在文件内直接写注释；公共键使用 `common.` 或 `core.` 命名空间。新增语言后执行仓库根目录的 `make i18n`。语言切换选项固定显示后端 `base_language.native_name`，接口不可用时使用代码内置的原生名称；`common.language.*` 仅用于普通文案和语言迁移初始数据。新增语言的完整文件清单见[国际化设计与语言扩展](../../../../../../docs/国际化设计与语言扩展.md)。
+语言包是标准 JSON，不能在文件内直接写注释；公共键使用 `common.` 或 `core.` 命名空间。新增语言后执行仓库根目录的 `make i18n`。语言切换选项固定显示后端 `base_language.native_name`，接口不可用时使用代码内置的原生名称；语言迁移初始名称来自管理端 Core 的 `common.language.*`。新增语言的完整文件清单见[国际化设计与语言扩展](../../../../../../docs/国际化设计与语言扩展.md)。

package/src/locales/en-US.json

@@ -1,4 +1,5 @@
 {
+  "common.action.back": "Back",
   "common.action.cancel": "Cancel",
   "common.action.confirm": "Confirm",
   "common.action.delete": "Delete",
@@ -9,16 +10,11 @@
   "common.action.save": "Save",
   "common.action.view": "View",
   "common.field.language": "Language",
-  "common.language.en-US": "English",
-  "common.language.zh-CN": "简体中文",
-  "common.language.zh-TW": "Traditional Chinese",
-  "common.language.ja-JP": "Japanese",
   "common.message.loading": "Loading",
   "common.message.network_error": "Network error. Check your connection and try again.",
   "common.message.request_error": "Request failed",
   "common.message.unknown": "Unable to process this request. Try again later.",
   "common.title.notice": "Notice",
-  "core.auth.login_again": "Log in again",
   "core.auth.session_expired": "Your session has expired. Please log in again.",
   "core.config.missing": "Missing app configuration: {names}",
   "core.crypto.base64_decode_unsupported": "Base64 decoding is not supported in this environment",
@@ -69,7 +65,6 @@
   "core.login.mfa_recovery_code": "Recovery code (optional)",
   "core.login.mfa_setup_title": "Bind multi-factor authentication",
   "core.login.mfa_copy_uri": "Copy binding address",
-  "core.login.mfa_copy_success": "Binding address copied",
   "core.login.mfa_recovery_codes_copied": "Recovery codes copied",
   "core.login.mfa_recovery_codes_title": "Save MFA recovery codes",
   "core.login.mfa_recovery_codes_warning": "Each code works once and will not be shown again after this dialog closes.",
@@ -142,14 +137,7 @@
   "core.webview.embed_blocked": "The destination may block embedding on H5",
   "core.webview.invalid_url": "No valid link was provided",
   "core.webview.open_failed": "Unable to open link",
-  "common.value.top_level": "Top level",
-  "common.resource.default": "{resource}",
-  "common.action.delete_resource": "Delete {resource}",
-  "common.action.set_field_status": "Set {field}",
   "common.action.load_more": "Load more",
-  "common.status.loading": "Loading…",
-  "core.navigation.analytics": "Analytics",
-  "core.navigation.report": "Reports",
   "core.settings.theme": "Theme Appearance",
   "core.theme.auto": "Follow System",
   "core.theme.dark": "Dark",

package/src/locales/ja-JP.json

@@ -1,4 +1,5 @@
 {
+  "common.action.back": "戻る",
   "common.action.cancel": "キャンセル",
   "common.action.confirm": "OK",
   "common.action.delete": "削除",
@@ -9,16 +10,11 @@
   "common.action.save": "保存",
   "common.action.view": "表示",
   "common.field.language": "言語",
-  "common.language.en-US": "英語",
-  "common.language.zh-CN": "簡体字中国語",
-  "common.language.zh-TW": "繁体字中国語",
-  "common.language.ja-JP": "日本語",
   "common.message.loading": "をロード中です",
   "common.message.network_error": "ネットワーク エラー。別のネットワークを試してください",
   "common.message.request_error": "リクエストエラー",
   "common.message.unknown": "現在処理できません。後でもう一度お試しください。",
   "common.title.notice": "ヒント",
-  "core.auth.login_again": "再度ログインしてください",
   "core.auth.session_expired": "現在のページは無効です。再度ログインしてください。",
   "core.config.missing": "モバイル端末の設定がありません: {names}",
   "core.crypto.base64_decode_unsupported": "現在の環境は Base64 デコードをサポートしていません",
@@ -69,7 +65,6 @@
   "core.login.mfa_recovery_code": "リカバリーコード（任意）",
   "core.login.mfa_setup_title": "多要素認証を設定",
   "core.login.mfa_copy_uri": "登録アドレスをコピー",
-  "core.login.mfa_copy_success": "登録アドレスをコピーしました",
   "core.login.mfa_recovery_codes_copied": "リカバリーコードをコピーしました",
   "core.login.mfa_recovery_codes_title": "MFA リカバリーコードを保存",
   "core.login.mfa_recovery_codes_warning": "各コードは一度だけ使用でき、ダイアログを閉じると再表示されません。",
@@ -142,14 +137,7 @@
   "core.webview.embed_blocked": "現在の H5 ページは、ターゲット サイトによって埋め込みが制限されている可能性があります",
   "core.webview.invalid_url": "有効なリンク アドレスがありません",
   "core.webview.open_failed": "リンクを開けません",
-  "common.value.top_level": "トップレベル",
-  "common.resource.default": "{resource}",
-  "common.action.delete_resource": "{resource}を削除",
-  "common.action.set_field_status": "{field}を設定",
   "common.action.load_more": "さらに読み込む",
-  "common.status.loading": "読み込み中…",
-  "core.navigation.analytics": "分析",
-  "core.navigation.report": "レポート",
   "core.settings.theme": "テーマ外観",
   "core.theme.auto": "システムに従う",
   "core.theme.dark": "ダーク",

package/src/locales/zh-CN.json

@@ -1,4 +1,5 @@
 {
+  "common.action.back": "返回",
   "common.action.cancel": "取消",
   "common.action.confirm": "确定",
   "common.action.delete": "删除",
@@ -9,16 +10,11 @@
   "common.action.save": "保存",
   "common.action.view": "查看",
   "common.field.language": "语言",
-  "common.language.en-US": "English",
-  "common.language.zh-CN": "简体中文",
-  "common.language.zh-TW": "繁体中文",
-  "common.language.ja-JP": "日语",
   "common.message.loading": "正在加载",
   "common.message.network_error": "网络错误，换个网络试试",
   "common.message.request_error": "请求错误",
   "common.message.unknown": "暂时无法处理，请稍后重试",
   "common.title.notice": "提示",
-  "core.auth.login_again": "重新登录",
   "core.auth.session_expired": "当前页面已失效，请重新登录",
   "core.config.missing": "移动端配置缺失：{names}",
   "core.crypto.base64_decode_unsupported": "当前环境不支持 Base64 解码",
@@ -69,7 +65,6 @@
   "core.login.mfa_recovery_code": "恢复码（可选）",
   "core.login.mfa_setup_title": "绑定多因素认证",
   "core.login.mfa_copy_uri": "复制绑定地址",
-  "core.login.mfa_copy_success": "绑定地址已复制",
   "core.login.mfa_recovery_codes_copied": "恢复码已复制",
   "core.login.mfa_recovery_codes_title": "保存 MFA 恢复码",
   "core.login.mfa_recovery_codes_warning": "每个恢复码只能使用一次，此弹窗关闭后不会再次显示。",
@@ -142,14 +137,7 @@
   "core.webview.embed_blocked": "当前 H5 页面可能被目标站点限制嵌入",
   "core.webview.invalid_url": "缺少有效链接地址",
   "core.webview.open_failed": "链接无法打开",
-  "common.value.top_level": "顶级节点",
-  "common.resource.default": "{resource}",
-  "common.action.delete_resource": "删除{resource}",
-  "common.action.set_field_status": "设置{field}",
   "common.action.load_more": "加载更多",
-  "common.status.loading": "加载中…",
-  "core.navigation.analytics": "分析",
-  "core.navigation.report": "报表",
   "core.settings.theme": "主题外观",
   "core.theme.auto": "跟随系统",
   "core.theme.dark": "暗黑",

package/src/locales/zh-TW.json

@@ -1,4 +1,5 @@
 {
+  "common.action.back": "返回",
   "common.action.cancel": "取消",
   "common.action.confirm": "確定",
   "common.action.delete": "刪除",
@@ -9,16 +10,11 @@
   "common.action.save": "儲存",
   "common.action.view": "檢視",
   "common.field.language": "語言",
-  "common.language.en-US": "English",
-  "common.language.zh-CN": "簡體中文",
-  "common.language.zh-TW": "繁體中文",
-  "common.language.ja-JP": "日語",
   "common.message.loading": "正在載入",
   "common.message.network_error": "網路錯誤，換個網路試試",
   "common.message.request_error": "請求錯誤",
   "common.message.unknown": "暫時無法處理，請稍後重試",
   "common.title.notice": "提示",
-  "core.auth.login_again": "重新登入",
   "core.auth.session_expired": "當前頁面已失效，請重新登入",
   "core.config.missing": "移動端配置缺失：{names}",
   "core.crypto.base64_decode_unsupported": "當前環境不支援 Base64 解碼",
@@ -69,7 +65,6 @@
   "core.login.mfa_recovery_code": "恢復碼（可選）",
   "core.login.mfa_setup_title": "綁定多因素認證",
   "core.login.mfa_copy_uri": "複製綁定地址",
-  "core.login.mfa_copy_success": "綁定地址已複製",
   "core.login.mfa_recovery_codes_copied": "恢復碼已複製",
   "core.login.mfa_recovery_codes_title": "儲存 MFA 恢復碼",
   "core.login.mfa_recovery_codes_warning": "每個恢復碼只能使用一次，關閉此視窗後不會再次顯示。",
@@ -142,14 +137,7 @@
   "core.webview.embed_blocked": "當前 H5 頁面可能被目標站點限制嵌入",
   "core.webview.invalid_url": "缺少有效連結地址",
   "core.webview.open_failed": "連結無法開啟",
-  "common.value.top_level": "頂級節點",
-  "common.resource.default": "{resource}",
-  "common.action.delete_resource": "刪除{resource}",
-  "common.action.set_field_status": "設定{field}",
   "common.action.load_more": "載入更多",
-  "common.status.loading": "載入中…",
-  "core.navigation.analytics": "分析",
-  "core.navigation.report": "報表",
   "core.settings.theme": "主題外觀",
   "core.theme.auto": "跟隨系統",
   "core.theme.dark": "暗黑",

package/src/utils/http.ts

@@ -467,15 +467,16 @@ function silentClearAuthData() {
   uni.$emit(AUTH_SILENT_LOGOUT_EVENT)
 }
 
+/** 清理失效认证并进入携带本次业务回跳标记的登录页。 */
 async function clearUserData() {
   clearToken()
   uni.removeStorageSync('user')
   saveCurrentRoute()
   // token 失效时直接重启页面栈，避免小程序历史页残留。
   uni.reLaunch({
-    url: '/pages/login/login',
+    url: '/pages/login/login?redirect=1',
     fail: () => {
-      uni.redirectTo({ url: '/pages/login/login' })
+      uni.redirectTo({ url: '/pages/login/login?redirect=1' })
     },
   })
 }

package/src/utils/navigation.ts

@@ -1,7 +1,11 @@
+import { hasValidToken } from './auth'
+
 /** 登录前暂存的目标路由。 */
 const LAST_ROUTE_KEY = 'lastRoute'
 /** 登录页路径。 */
 const LOGIN_PAGE = '/pages/login/login'
+/** 携带本次回跳标记的登录入口。 */
+const LOGIN_REDIRECT_PAGE = `${LOGIN_PAGE}?redirect=1`
 /** 首页 tab 页面路径。 */
 export const homeTabPage = '/pages/index/index'
 
@@ -47,7 +51,6 @@ const getCurrentRouteUrl = () => {
 export const saveCurrentRoute = () => {
   const currentRoute = getCurrentRouteUrl()
   if (!currentRoute || currentRoute.startsWith(LOGIN_PAGE)) {
-    uni.removeStorageSync(LAST_ROUTE_KEY)
     return
   }
   uni.setStorageSync(LAST_ROUTE_KEY, currentRoute)
@@ -61,6 +64,34 @@ export const saveLoginRedirectUrl = (url: string) => {
   }
 }
 
+/** prepareLoginPage 清理直接访问的旧目标，已登录时替换回首页。 */
+export const prepareLoginPage = (redirect?: string): boolean => {
+  if (redirect !== '1') uni.removeStorageSync(LAST_ROUTE_KEY)
+  if (!hasValidToken()) return true
+  void returnFromLogin()
+  return false
+}
+
+/** returnFromLogin 结束本次登录入口并替换到首页，避免返回受保护页面。 */
+export const returnFromLogin = async (): Promise<void> => {
+  uni.removeStorageSync(LAST_ROUTE_KEY)
+  uni.setStorageSync('SwitchTabIndex', true)
+  await uni.reLaunch({ url: homeTabPage })
+}
+
+/** restoreLoginRedirect 替换到本次访问目标，跳转成功后才清理保存的地址。 */
+export const restoreLoginRedirect = async (): Promise<void> => {
+  const savedRoute = uni.getStorageSync(LAST_ROUTE_KEY) || ''
+  const normalizedRoute = `/${savedRoute.replace(/^\/+/, '')}`
+  const targetRoute =
+    savedRoute && !normalizedRoute.startsWith(LOGIN_PAGE) ? normalizedRoute : homeTabPage
+  if (targetRoute.startsWith(homeTabPage)) uni.setStorageSync('SwitchTabIndex', true)
+  await uni.reLaunch({ url: targetRoute })
+  if (savedRoute && uni.getStorageSync(LAST_ROUTE_KEY) === savedRoute) {
+    uni.removeStorageSync(LAST_ROUTE_KEY)
+  }
+}
+
 /** 跳转到登录页，并在跳转前记录当前页面。 */
 export const navigateToLogin = (redirectUrl?: string) => {
   // 模板直接绑定时会传入点击事件对象，只有字符串才是明确的回跳地址。
@@ -70,9 +101,9 @@ export const navigateToLogin = (redirectUrl?: string) => {
     saveCurrentRoute()
   }
   uni.navigateTo({
-    url: LOGIN_PAGE,
+    url: LOGIN_REDIRECT_PAGE,
     fail: () => {
-      uni.reLaunch({ url: LOGIN_PAGE })
+      uni.reLaunch({ url: LOGIN_REDIRECT_PAGE })
     },
   })
 }
@@ -86,9 +117,9 @@ export const redirectToLogin = (redirectUrl?: string) => {
     saveCurrentRoute()
   }
   uni.redirectTo({
-    url: LOGIN_PAGE,
+    url: LOGIN_REDIRECT_PAGE,
     fail: () => {
-      uni.reLaunch({ url: LOGIN_PAGE })
+      uni.reLaunch({ url: LOGIN_REDIRECT_PAGE })
     },
   })
 }

package/src/views/pages/login/login.vue

@@ -2,13 +2,13 @@
 import { useSettingStore, useThemeStore, useUserStore } from '../../../stores'
 import type { LoginRequest } from '../../../rpc/base/v1/login'
 import { LoginStatus, type LoginResponse } from '../../../rpc/base/v1/login'
-import { onLoad, onUnload } from '@dcloudio/uni-app'
+import { onLoad, onShow, onUnload } from '@dcloudio/uni-app'
 import { computed, defineAsyncComponent, nextTick, reactive, ref, watch } from 'vue'
 import { defLoginService } from '../../../api/base/v1/login'
 import { defMfaService } from '../../../api/base/v1/mfa'
 import defaultLogo from '../../../static/images/logo_icon.png'
 import { formatSrc } from '../../../utils'
-import { homeTabPage } from '../../../utils/navigation'
+import { prepareLoginPage, restoreLoginRedirect, returnFromLogin } from '../../../utils/navigation'
 import { encryptPassword } from '../../../utils/secretCrypto'
 import { createWebAuthnCredential, getWebAuthnAssertion } from '../../../utils/webauthn'
 import { navigateAppRoute } from '../../../navigation'
@@ -600,11 +600,9 @@ const refreshCaptcha = async () => {
   }
 }
 
-/** 返回上一页；登录页可能是冷启动首页，无上级页面时回主页。 */
+/** 返回首页并结束本次登录回跳，避免上一页再次要求登录。 */
 const goBack = () => {
-  uni.navigateBack({
-    fail: () => uni.reLaunch({ url: homeTabPage }),
-  })
+  void returnFromLogin()
 }
 
 // 页面加载或普通表单刷新验证码，行为验证码延迟到登录弹窗打开时再请求。
@@ -786,6 +784,7 @@ const onSubmit = async () => {
   }
 }
 // #endif
+/** 完成用户资料加载并替换到本次登录目标，直接登录默认进入首页。 */
 const loginSuccess = async () => {
   await userStore.getUserProfile()
   // 成功提示
@@ -793,13 +792,7 @@ const loginSuccess = async () => {
   if (loginSuccessTimer) clearTimeout(loginSuccessTimer)
   loginSuccessTimer = setTimeout(() => {
     loginSuccessTimer = undefined
-    const lastRoute = uni.getStorageSync('lastRoute') || homeTabPage
-    if (lastRoute.startsWith(homeTabPage)) {
-      uni.setStorageSync('SwitchTabIndex', true)
-    }
-    uni.removeStorageSync('lastRoute')
-
-    uni.reLaunch({ url: lastRoute })
+    void restoreLoginRedirect()
   }, 500)
 }
 
@@ -882,8 +875,13 @@ const loadLoginSettings = () => {
 /** 确保登录前已完成移动端配置加载。 */
 const ensureLoginSettings = () => loadLoginSettings()
 
-// 获取 code 登录凭证
-onLoad(() => {
+let loginRedirect: string | undefined
+onLoad((options) => {
+  loginRedirect = options?.redirect
+})
+
+onShow(() => {
+  if (!prepareLoginPage(loginRedirect)) return
   void loadLoginSettings()
 })