-
+ {/* 趋势 Tab 与数据需求分组一一映射，按钮始终跟随当前指标进入对应明细。 */}
+
+
{TREND_METRICS.map((item) => (
))}
-
diff --git a/external-admin/__repro__.html b/external-admin/__repro__.html
deleted file mode 100644
index 54d509c..0000000
--- a/external-admin/__repro__.html
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
filter-bar repro
-
-
-
-
-
-
-
diff --git a/external-admin/__repro__.jsx b/external-admin/__repro__.jsx
deleted file mode 100644
index 36c9fbf..0000000
--- a/external-admin/__repro__.jsx
+++ /dev/null
@@ -1,42 +0,0 @@
-// Untracked verification harness: renders the real UsersPage (filter bar included)
-// with the production theme, emotion cache and stylesheets, but without routing/auth
-// guards, so layout can be measured at arbitrary viewport widths. Delete after use.
-import { CacheProvider } from "@emotion/react";
-import CssBaseline from "@mui/material/CssBaseline";
-import { ThemeProvider } from "@mui/material/styles";
-import React, { useMemo } from "react";
-import { createRoot } from "react-dom/client";
-import { ToastProvider } from "@/shared/ui/ToastProvider.jsx";
-import { createExternalTheme } from "./src/theme.js";
-import { ExternalAuthProvider } from "./src/auth/ExternalAuthProvider.jsx";
-import { ExternalI18nProvider, useExternalI18n } from "./src/i18n/ExternalI18nProvider.jsx";
-import { externalEmotionCache } from "./src/i18n/emotionCache.js";
-import UsersPage from "./src/pages/UsersPage.jsx";
-import "@/styles/tokens.css";
-import "@/styles/shared-ui.css";
-import "./src/styles/index.css";
-
-createRoot(document.getElementById("external-admin-root")).render(
-
-
-
-
-
-);
-
-function Root() {
- const { direction } = useExternalI18n();
- const theme = useMemo(() => createExternalTheme(direction), [direction]);
- return (
-
-
-
-
-
-
-
-
-
-
- );
-}
diff --git a/external-admin/index.html b/external-admin/index.html
index d5b05c8..329eb1a 100644
--- a/external-admin/index.html
+++ b/external-admin/index.html
@@ -1,10 +1,10 @@
-
+
-
Admin System
+
External Admin
diff --git a/external-admin/src/ExternalAdminApp.jsx b/external-admin/src/ExternalAdminApp.jsx
index aaad881..c559ebf 100644
--- a/external-admin/src/ExternalAdminApp.jsx
+++ b/external-admin/src/ExternalAdminApp.jsx
@@ -1,6 +1,6 @@
import { lazy, Suspense } from "react";
import { Navigate, Route, Routes } from "react-router-dom";
-import { RequireExternalAuth, RequireExternalCapability, RequirePasswordChanged } from "./auth/RouteGuards.jsx";
+import { RequireExternalAuth, RequireExternalCapability } from "./auth/RouteGuards.jsx";
import { ExternalAdminLayout } from "./layout/ExternalAdminLayout.jsx";
import { ExternalPageState } from "./shared/PageComponents.jsx";
@@ -21,30 +21,28 @@ export function ExternalAdminApp() {
} path="/login" />
}>
} path="/change-password" />
-
}>
-
}>
-
} index />
-
} path="/overview" />
-
}>
-
} path="/users" />
-
-
}>
-
} path="/bans" />
-
-
}>
-
} path="/organization/:kind" />
-
-
}>
-
} path="/rooms" />
-
-
}>
-
} path="/grants" />
-
-
}>
-
} path="/banners" />
-
-
} path="*" />
+
}>
+
} index />
+
} path="/overview" />
+
}>
+
} path="/users" />
+
}>
+
} path="/bans" />
+
+
}>
+
} path="/organization/:kind" />
+
+
}>
+
} path="/rooms" />
+
+
}>
+
} path="/grants" />
+
+
}>
+
} path="/banners" />
+
+
} path="*" />
diff --git a/external-admin/src/api/auth.js b/external-admin/src/api/auth.js
index 9371100..f6dcae6 100644
--- a/external-admin/src/api/auth.js
+++ b/external-admin/src/api/auth.js
@@ -66,6 +66,7 @@ export function normalizeSession(data) {
account: textValue(accountRecord.username, accountRecord.account, legacyAccount.username, legacyAccount.account, root.accountName, typeof root.account === "string" ? root.account : "", root.username),
appCode: textValue(root.appCode, root.app_code, app.appCode, app.app_code, accountRecord.appCode, accountRecord.app_code, linkedUser.appCode, linkedUser.app_code),
appName: textValue(app.name, app.appName, app.app_name, root.appName, root.app_name),
+ logoUrl: textValue(app.logoUrl, app.logo_url, root.logoUrl, root.logo_url),
capabilities: [...new Set(capabilities)],
displayName: textValue(linkedUser.displayName, linkedUser.display_name, linkedUser.name, linkedUser.username, accountRecord.username, legacyAccount.username, root.displayName),
id: textValue(accountRecord.id, accountRecord.externalAdminUserId, accountRecord.external_admin_user_id, legacyAccount.id, root.accountId, root.account_id),
diff --git a/external-admin/src/api/auth.test.js b/external-admin/src/api/auth.test.js
index 1c3584e..f732676 100644
--- a/external-admin/src/api/auth.test.js
+++ b/external-admin/src/api/auth.test.js
@@ -9,13 +9,14 @@ describe("normalizeSession", () => {
test("normalizes account objects, fixed app and capabilities without stringifying objects", () => {
expect(normalizeSession({
account: { id: "ext-1", username: "fami-manager" },
- app: { appCode: "fami", appName: "Fami" },
+ app: { appCode: "fami", appName: "Fami", logoUrl: "https://media.example.com/fami.png" },
capabilities: ["user:list"],
passwordChangeRequired: true
})).toEqual(expect.objectContaining({
account: "fami-manager",
appCode: "fami",
appName: "Fami",
+ logoUrl: "https://media.example.com/fami.png",
capabilities: ["user:list"],
passwordChangeRequired: true
}));
diff --git a/external-admin/src/auth/RouteGuards.jsx b/external-admin/src/auth/RouteGuards.jsx
index d2ae5d0..599400b 100644
--- a/external-admin/src/auth/RouteGuards.jsx
+++ b/external-admin/src/auth/RouteGuards.jsx
@@ -38,11 +38,6 @@ export function RequireExternalAuth() {
return
;
}
-export function RequirePasswordChanged() {
- const { session } = useExternalAuth();
- return session?.passwordChangeRequired ?
:
;
-}
-
export function RequireExternalCapability({ anyOf }) {
const { session } = useExternalAuth();
const { t } = useExternalI18n();
diff --git a/external-admin/src/components/BannerCreateDialog.jsx b/external-admin/src/components/BannerCreateDialog.jsx
index 486fec1..077fcb6 100644
--- a/external-admin/src/components/BannerCreateDialog.jsx
+++ b/external-admin/src/components/BannerCreateDialog.jsx
@@ -22,7 +22,7 @@ const displayScopeOptions = [
];
export function BannerCreateDialog({ loading, onClose, onSubmit, open }) {
- const { locale, t } = useExternalI18n();
+ const { direction, locale, t } = useExternalI18n();
const [form, setForm] = useState(initialForm);
useEffect(() => setForm(initialForm), [open]);
@@ -57,6 +57,7 @@ export function BannerCreateDialog({ loading, onClose, onSubmit, open }) {
messages={appJumpMessages(t)}
paramValue={form.param}
required
+ showHint={false}
typeLabel={t("banners.jumpType")}
typeValue={form.bannerType}
onChange={({ param, type }) => setForm({ ...form, bannerType: type, param })}
@@ -78,6 +79,7 @@ export function BannerCreateDialog({ loading, onClose, onSubmit, open }) {
setForm({ ...form, sortOrder: event.target.value })} />
[value, t(`jump.target.${value}`)])),
diff --git a/external-admin/src/components/BannerCreateDialog.test.jsx b/external-admin/src/components/BannerCreateDialog.test.jsx
index bafad3e..f07ecc1 100644
--- a/external-admin/src/components/BannerCreateDialog.test.jsx
+++ b/external-admin/src/components/BannerCreateDialog.test.jsx
@@ -16,5 +16,6 @@ describe("BannerCreateDialog", () => {
expect(screen.getByRole("combobox", { name: "App destination" })).toBeInTheDocument();
expect(screen.getByRole("textbox", { name: "Parameter (App navigation JSON)" })).toHaveValue(JSON.stringify({ type: "wallet" }));
+ expect(screen.queryByText("App navigation parameters are generated as JSON. You can edit the JSON directly for custom parameters.")).not.toBeInTheDocument();
});
});
diff --git a/external-admin/src/components/GrantDialogs.jsx b/external-admin/src/components/GrantDialogs.jsx
index 6fce0f1..7f986ee 100644
--- a/external-admin/src/components/GrantDialogs.jsx
+++ b/external-admin/src/components/GrantDialogs.jsx
@@ -1,4 +1,3 @@
-import Alert from "@mui/material/Alert";
import Button from "@mui/material/Button";
import Dialog from "@mui/material/Dialog";
import DialogActions from "@mui/material/DialogActions";
@@ -16,7 +15,6 @@ export function ResourceGrantDialog({ loading, onClose, onSubmit, open, resource
useEffect(() => setForm(resourceGrantInitial), [open]);
return (
onSubmit(form)}>
-
setForm({ ...form, target: event.target.value.trim() })} />
setForm({ ...form, resourceId: event.target.value })}>
{resources.map((item) => )}
@@ -34,7 +32,6 @@ export function PrettyIdGrantDialog({ loading, onClose, onSubmit, open }) {
useEffect(() => setForm(prettyGrantInitial), [open]);
return (
onSubmit(form)}>
-
setForm({ ...form, target: event.target.value.trim() })} />
setForm({ ...form, prettyId: event.target.value.trim() })} />
setForm({ ...form, durationDays: event.target.value })} />
@@ -43,11 +40,6 @@ export function PrettyIdGrantDialog({ loading, onClose, onSubmit, open }) {
);
}
-function TargetNotice() {
- const { t } = useExternalI18n();
- return {t("grants.notice")};
-}
-
function GrantDialog({ children, loading, onClose, onSubmit, open, title }) {
const { t } = useExternalI18n();
return (
diff --git a/external-admin/src/components/GrantDialogs.test.jsx b/external-admin/src/components/GrantDialogs.test.jsx
new file mode 100644
index 0000000..3c72d63
--- /dev/null
+++ b/external-admin/src/components/GrantDialogs.test.jsx
@@ -0,0 +1,17 @@
+import { render, screen } from "@testing-library/react";
+import { expect, test, vi } from "vitest";
+import { ExternalI18nProvider } from "../i18n/ExternalI18nProvider.jsx";
+import { ResourceGrantDialog } from "./GrantDialogs.jsx";
+
+test("shows only actionable grant fields without a descriptive notice", () => {
+ render(
+
+
+
+ );
+
+ expect(screen.getByRole("dialog", { name: "Grant privilege item" })).toBeInTheDocument();
+ expect(screen.queryByRole("alert")).not.toBeInTheDocument();
+ expect(screen.queryByText("Before submission, the user is verified in the current App and the server-returned user ID is used for the grant.")).not.toBeInTheDocument();
+ expect(screen.getByText("Enter 0 for permanent validity")).toBeInTheDocument();
+});
diff --git a/external-admin/src/i18n/ExternalI18nProvider.jsx b/external-admin/src/i18n/ExternalI18nProvider.jsx
index b5fe1ee..3c244c4 100644
--- a/external-admin/src/i18n/ExternalI18nProvider.jsx
+++ b/external-admin/src/i18n/ExternalI18nProvider.jsx
@@ -41,7 +41,6 @@ export function ExternalI18nProvider({ children }) {
root.lang = locale;
root.dir = direction;
globalThis.document.body?.setAttribute("dir", direction);
- globalThis.document.title = t("app.title");
}, [direction, locale, t]);
const value = useMemo(
diff --git a/external-admin/src/i18n/ExternalI18nProvider.test.jsx b/external-admin/src/i18n/ExternalI18nProvider.test.jsx
index 562e9df..7a30b33 100644
--- a/external-admin/src/i18n/ExternalI18nProvider.test.jsx
+++ b/external-admin/src/i18n/ExternalI18nProvider.test.jsx
@@ -16,7 +16,7 @@ describe("ExternalI18nProvider", () => {
render();
expect(screen.getByTestId("locale")).toHaveTextContent("en");
- expect(screen.getByTestId("title")).toHaveTextContent("Admin System");
+ expect(screen.getByTestId("title")).toHaveTextContent("External Admin");
expect(document.documentElement).toHaveAttribute("lang", "en");
expect(document.documentElement).toHaveAttribute("dir", "ltr");
});
@@ -26,25 +26,25 @@ describe("ExternalI18nProvider", () => {
const firstRender = render();
await user.click(screen.getByRole("button", { name: "ar" }));
- expect(screen.getByTestId("title")).toHaveTextContent("نظام الإدارة");
+ expect(screen.getByTestId("title")).toHaveTextContent("الإدارة الخارجية");
expect(document.documentElement).toHaveAttribute("lang", "ar");
expect(document.documentElement).toHaveAttribute("dir", "rtl");
expect(document.body).toHaveAttribute("dir", "rtl");
expect(localStorage.getItem(EXTERNAL_LOCALE_STORAGE_KEY)).toBe("ar");
await user.click(screen.getByRole("button", { name: "tr" }));
- expect(screen.getByTestId("title")).toHaveTextContent("Yönetim Sistemi");
+ expect(screen.getByTestId("title")).toHaveTextContent("Harici Yönetim");
expect(document.documentElement).toHaveAttribute("lang", "tr");
expect(document.documentElement).toHaveAttribute("dir", "ltr");
await user.click(screen.getByRole("button", { name: "zh-CN" }));
- expect(screen.getByTestId("title")).toHaveTextContent("管理系统");
+ expect(screen.getByTestId("title")).toHaveTextContent("外管后台");
expect(localStorage.getItem(EXTERNAL_LOCALE_STORAGE_KEY)).toBe("zh-CN");
firstRender.unmount();
render();
expect(screen.getByTestId("locale")).toHaveTextContent("zh-CN");
- expect(screen.getByTestId("title")).toHaveTextContent("管理系统");
+ expect(screen.getByTestId("title")).toHaveTextContent("外管后台");
});
});
diff --git a/external-admin/src/i18n/emotionCache.integration.test.jsx b/external-admin/src/i18n/emotionCache.integration.test.jsx
new file mode 100644
index 0000000..18acb18
--- /dev/null
+++ b/external-admin/src/i18n/emotionCache.integration.test.jsx
@@ -0,0 +1,25 @@
+import { CacheProvider } from "@emotion/react";
+import Button from "@mui/material/Button";
+import { createTheme, ThemeProvider } from "@mui/material/styles";
+import { render, screen } from "@testing-library/react";
+import { expect, test } from "vitest";
+import { externalEmotionCache } from "./emotionCache.js";
+
+test("keeps MUI mounted when the live page switches from LTR to RTL", () => {
+ const view = render();
+ expect(screen.getByRole("button", { name: "ltr" })).toBeInTheDocument();
+
+ // Exercise Emotion's real insert pipeline: a standalone Stylis serializer test cannot detect a plugin resolved from a second, incompatible Stylis version.
+ expect(() => view.rerender()).not.toThrow();
+ expect(screen.getByRole("button", { name: "rtl" })).toBeInTheDocument();
+});
+
+function DirectionProbe({ direction }) {
+ return (
+
+
+
+
+
+ );
+}
diff --git a/external-admin/src/i18n/messages.js b/external-admin/src/i18n/messages.js
index e2865b1..97400cd 100644
--- a/external-admin/src/i18n/messages.js
+++ b/external-admin/src/i18n/messages.js
@@ -10,8 +10,8 @@ export const EXTERNAL_LANGUAGE_OPTIONS = Object.freeze([
]);
const en = {
- "app.title": "Admin System",
- "app.shortTitle": "Admin System",
+ "app.title": "External Admin",
+ "app.shortTitle": "External Admin",
"language.label": "Language",
"common.actions": "Actions",
"common.active": "Active",
@@ -41,7 +41,6 @@ const en = {
"auth.confirmNewPassword": "Confirm new password",
"auth.currentPassword": "Current password",
"auth.fillAccountPassword": "Enter your account and password",
- "auth.firstLoginChange": "You must change your password on first sign-in",
"auth.hidePassword": "Hide password",
"auth.invalidCredentials": "Incorrect account or password",
"auth.login": "Sign in",
@@ -52,8 +51,6 @@ const en = {
"auth.password": "Password",
"auth.passwordChangedFailed": "Failed to change password",
"auth.passwordMismatch": "The new passwords do not match",
- "auth.passwordMin": "At least 8 characters",
- "auth.passwordMinError": "The new password must be at least 8 characters",
"auth.passwordWhitespace": "The new password cannot be empty or contain only whitespace",
"auth.recheck": "Check again",
"auth.returnOverview": "Back to Home",
@@ -194,7 +191,6 @@ const en = {
"grants.validDays": "Validity (days)",
"grants.permanentHint": "Enter 0 for permanent validity",
"grants.reason": "Grant reason",
- "grants.notice": "Before submission, the user is verified in the current App and the server-returned user ID is used for the grant.",
"grants.confirm": "Confirm grant",
"banners.title": "Banner management",
"banners.banner": "Banner",
@@ -260,7 +256,6 @@ const en = {
"jump.gameId": "Game ID",
"jump.giftId": "Gift ID",
"jump.redPacketNo": "Red packet number",
- "jump.hint": "App navigation parameters are generated as JSON. You can edit the JSON directly for custom parameters.",
"time.unlimited": "Any time",
"time.quickHour": "Last hour",
"time.quickDay": "Last 24 hours",
@@ -326,11 +321,11 @@ const en = {
};
const zhCN = {
- "app.title": "管理系统",
- "app.shortTitle": "管理系统",
+ "app.title": "外管后台",
+ "app.shortTitle": "外管后台",
"language.label": "语言",
"common.actions": "操作", "common.active": "正常", "common.all": "全部", "common.allStatuses": "全部状态", "common.banned": "已封禁", "common.cancel": "取消", "common.confirm": "确认", "common.create": "创建", "common.disabled": "禁用", "common.edit": "编辑", "common.enabled": "启用", "common.expired": "过期", "common.loading": "正在加载", "common.noData": "当前无数据", "common.normal": "正常", "common.query": "查询", "common.reason": "原因", "common.reload": "重新加载", "common.retry": "重试", "common.save": "保存", "common.status": "状态", "common.user": "用户",
- "auth.account": "账号", "auth.changePassword": "修改密码", "auth.checkingSession": "正在校验会话", "auth.confirmNewPassword": "确认新密码", "auth.currentPassword": "当前密码", "auth.fillAccountPassword": "请填写账号和密码", "auth.firstLoginChange": "首次登录必须修改密码", "auth.hidePassword": "隐藏密码", "auth.invalidCredentials": "账号或密码错误", "auth.login": "登录", "auth.loginFailed": "登录失败", "auth.logout": "退出登录", "auth.newPassword": "新密码", "auth.noPermission": "当前账号没有访问此功能的权限。", "auth.password": "密码", "auth.passwordChangedFailed": "密码修改失败", "auth.passwordMismatch": "两次输入的新密码不一致", "auth.passwordMin": "至少 8 个字符", "auth.passwordMinError": "新密码至少 8 个字符", "auth.passwordWhitespace": "新密码不能为空或全为空白字符", "auth.recheck": "重新校验", "auth.returnOverview": "返回首页", "auth.savePassword": "保存密码", "auth.sessionFailed": "会话校验失败", "auth.showPassword": "显示密码",
+ "auth.account": "账号", "auth.changePassword": "修改密码", "auth.checkingSession": "正在校验会话", "auth.confirmNewPassword": "确认新密码", "auth.currentPassword": "当前密码", "auth.fillAccountPassword": "请填写账号和密码", "auth.hidePassword": "隐藏密码", "auth.invalidCredentials": "账号或密码错误", "auth.login": "登录", "auth.loginFailed": "登录失败", "auth.logout": "退出登录", "auth.newPassword": "新密码", "auth.noPermission": "当前账号没有访问此功能的权限。", "auth.password": "密码", "auth.passwordChangedFailed": "密码修改失败", "auth.passwordMismatch": "两次输入的新密码不一致", "auth.passwordWhitespace": "新密码不能为空或全为空白字符", "auth.recheck": "重新校验", "auth.returnOverview": "返回首页", "auth.savePassword": "保存密码", "auth.sessionFailed": "会话校验失败", "auth.showPassword": "显示密码",
"nav.expand": "展开菜单", "nav.more": "更多", "nav.overview": "首页", "nav.users": "用户管理", "nav.bans": "封禁管理", "nav.hosts": "主播列表", "nav.agencies": "公会列表", "nav.bds": "BD 列表", "nav.bdManagers": "BD Manager 列表", "nav.superAdmins": "Super Admin 列表", "nav.rooms": "房间管理", "nav.grants": "资源与靓号", "nav.banners": "Banner 管理", "nav.team": "我的团队",
"capability.userList": "用户列表", "capability.userUpdate": "用户信息编辑", "capability.banList": "账号封禁列表", "capability.ban": "执行封禁", "capability.unban": "解除封禁", "capability.hostList": "主播列表", "capability.agencyList": "公会列表", "capability.bdList": "BD 列表", "capability.bdManagerList": "BD Manager 列表", "capability.superAdminList": "Super Admin 列表", "capability.roomList": "房间管理", "capability.roomUpdate": "房间编辑", "capability.privilegeList": "用户特权道具列表", "capability.privilegeGrant": "特权道具发放", "capability.bannerCreate": "Banner 创建", "capability.prettyIdGrant": "靓号下发", "capability.userTitleGrant": "用户称号下发", "capability.roomBackgroundGrant": "房间背景图下发", "capability.userLevelGrant": "财富/VIP 等级下发", "capability.teamView": "我的团队",
"overview.currentApp": "当前 App", "overview.account": "登录账号", "overview.permissions": "已开通权限", "overview.welcome": "欢迎回来", "overview.features": "功能入口", "overview.enabled": "已开通", "overview.notEnabled": "未开通",
@@ -338,21 +333,21 @@ const zhCN = {
"bans.title": "账号封禁列表", "bans.reason": "封禁原因", "bans.unban": "解除封禁", "bans.unbanned": "用户已解除封禁", "bans.unbanFailed": "解除封禁失败", "bans.confirmTitle": "解除封禁", "bans.confirmContent": "确认解除用户 {user} 的封禁？",
"organization.title": "组织管理", "organization.agencies": "公会列表", "organization.bds": "BD 列表", "organization.bdManagers": "BD Manager 列表", "organization.hosts": "主播列表", "organization.managers": "管理员列表", "organization.superAdmins": "Super Admin 列表", "organization.team": "我的团队", "organization.agency": "公会", "organization.owner": "负责人", "organization.parentBd": "上级 BD", "organization.member": "成员", "organization.country": "国家/地区", "organization.userReference": "用户 {id}", "organization.agencyReference": "公会 {id}", "organization.teamSearch": "公会 ID / 负责人用户 ID / 上级 BD ID", "organization.noPermission": "当前账号没有访问该组织列表的权限。", "organization.bdLeaderCount": "BD Leader：{count}", "organization.bdCount": "BD：{count}", "organization.agencyCount": "公会：{count}", "organization.truncated": "团队规模超过接口上限，当前结果不完整",
"rooms.title": "房间管理", "rooms.room": "房间", "rooms.owner": "房主", "rooms.visibleRegion": "可见区域", "rooms.search": "房间 ID / 名称 / 房主", "rooms.updated": "房间信息已更新", "rooms.updateFailed": "房间更新失败", "rooms.editTitle": "编辑房间", "rooms.background": "房间背景图", "rooms.name": "房间名称", "rooms.description": "房间介绍", "rooms.visibleRegionId": "可见区域 ID", "rooms.allRegions": "全部",
- "grants.title": "资源与靓号", "grants.grantResource": "发放道具", "grants.grantPrettyId": "下发靓号", "grants.availableResources": "可发放资源", "grants.targetUser": "目标用户", "grants.resource": "资源", "grants.quantity": "数量", "grants.resourceGranted": "特权道具已发放", "grants.prettyIdGranted": "靓号已下发", "grants.failed": "发放失败", "grants.resourceTitle": "特权道具发放", "grants.prettyIdTitle": "靓号下发", "grants.target": "用户 ID / 短 ID（靓号）", "grants.currentTarget": "用户 ID / 当前短 ID", "grants.prettyId": "下发靓号", "grants.validDays": "有效天数", "grants.permanentHint": "填 0 表示永久有效", "grants.reason": "发放原因", "grants.notice": "提交前会校验当前 App 内的用户，并使用服务端返回的用户 ID 执行发放。", "grants.confirm": "确认发放",
+ "grants.title": "资源与靓号", "grants.grantResource": "发放道具", "grants.grantPrettyId": "下发靓号", "grants.availableResources": "可发放资源", "grants.targetUser": "目标用户", "grants.resource": "资源", "grants.quantity": "数量", "grants.resourceGranted": "特权道具已发放", "grants.prettyIdGranted": "靓号已下发", "grants.failed": "发放失败", "grants.resourceTitle": "特权道具发放", "grants.prettyIdTitle": "靓号下发", "grants.target": "用户 ID / 短 ID（靓号）", "grants.currentTarget": "用户 ID / 当前短 ID", "grants.prettyId": "下发靓号", "grants.validDays": "有效天数", "grants.permanentHint": "填 0 表示永久有效", "grants.reason": "发放原因", "grants.confirm": "确认发放",
"banners.title": "Banner 管理", "banners.banner": "Banner", "banners.type": "类型", "banners.platform": "平台", "banners.sort": "排序", "banners.create": "创建 Banner", "banners.created": "Banner 已创建", "banners.createFailed": "Banner 创建失败", "banners.image": "Banner 图片", "banners.roomImage": "房间内小屏图", "banners.description": "描述", "banners.jumpType": "跳转类型", "banners.h5Param": "参数（H5 链接）", "banners.appParam": "参数（APP 公共跳转 JSON）", "banners.displayScope": "展示范围", "banners.scopeHome": "首页", "banners.scopeRoom": "房间", "banners.scopeRecharge": "充值", "banners.scopeMe": "我的", "banners.regionId": "区域 ID", "banners.countryCode": "国家码", "banners.countryCodeHint": "2-3 位字母，留空为全部", "banners.schedule": "投放时间",
"upload.preview": "{label}预览", "upload.empty": "暂无图片", "upload.uploading": "上传中", "upload.replace": "更换图片", "upload.select": "上传图片", "upload.imageOnly": "请选择图片文件", "upload.sizeLimit": "图片不能超过 10MB", "upload.missingUrl": "上传结果缺少图片地址", "upload.failed": "图片上传失败",
"pagination.total": "共 {count} 条", "pagination.previous": "上一页", "pagination.next": "下一页",
"status.active": "正常", "status.enabled": "启用", "status.running": "运行中", "status.normal": "正常", "status.unbanned": "未封禁", "status.banned": "已封禁", "status.disabled": "禁用", "status.failed": "失败", "status.blocked": "已拦截", "status.expired": "过期",
- "jump.appTarget": "APP 目标", "jump.target.wallet": "钱包", "jump.target.room": "指定房间", "jump.target.room_random": "随机房间", "jump.target.room_window": "指定房内拉起窗口", "jump.target.room_random_window": "随机房内拉起窗口", "jump.target.room_game": "指定房内拉起游戏", "jump.target.room_random_game": "随机房内拉起游戏", "jump.target.explore_game": "Explore 游戏 H5", "jump.target.custom": "自定义 JSON", "jump.roomId": "房间 ID", "jump.window": "房内窗口", "jump.window.game_window": "游戏窗口", "jump.window.gift_panel": "礼物面板", "jump.window.red_packet_claim": "领红包弹窗", "jump.window.wheel": "转盘窗口", "jump.gameId": "游戏 ID", "jump.giftId": "礼物 ID", "jump.redPacketNo": "红包编号", "jump.hint": "APP 参数会按公共跳转方案生成 JSON；需要特殊参数时可直接编辑 JSON。",
+ "jump.appTarget": "APP 目标", "jump.target.wallet": "钱包", "jump.target.room": "指定房间", "jump.target.room_random": "随机房间", "jump.target.room_window": "指定房内拉起窗口", "jump.target.room_random_window": "随机房内拉起窗口", "jump.target.room_game": "指定房内拉起游戏", "jump.target.room_random_game": "随机房内拉起游戏", "jump.target.explore_game": "Explore 游戏 H5", "jump.target.custom": "自定义 JSON", "jump.roomId": "房间 ID", "jump.window": "房内窗口", "jump.window.game_window": "游戏窗口", "jump.window.gift_panel": "礼物面板", "jump.window.red_packet_claim": "领红包弹窗", "jump.window.wheel": "转盘窗口", "jump.gameId": "游戏 ID", "jump.giftId": "礼物 ID", "jump.redPacketNo": "红包编号",
"time.unlimited": "不限", "time.quickHour": "近 1 小时", "time.quickDay": "近 24 小时", "time.quickWeek": "近 7 天", "time.start": "开始时间", "time.end": "结束时间", "time.startDate": "开始日期", "time.endDate": "结束日期", "time.pending": "待选择", "time.startMark": "始", "time.endMark": "末", "time.previousMonth": "上个月", "time.nextMonth": "下个月", "time.hour": "时", "time.minute": "分", "time.clear": "清空", "time.apply": "确定", "time.endAfterStart": "结束时间必须晚于开始时间", "time.endDateAfterStart": "结束日期不能早于开始日期", "time.completeRange": "选择完整区间", "time.endLaterShort": "结束需晚于开始", "time.endDateLaterShort": "结束不能早于开始", "time.durationDays": "{count} 天", "time.durationHours": "{count} 小时", "time.durationMinutes": "{count} 分钟", "time.duration": "间隔 {value}", "time.sameDay": "同一天", "time.lessMinute": "间隔少于 1 分钟",
"errors.loadFailed": "数据加载失败", "errors.requestFailed": "请求失败", "errors.unauthorized": "会话已失效，请重新登录。", "errors.forbidden": "你没有执行此操作的权限。", "errors.notFound": "未找到请求的资源。", "errors.conflict": "当前数据状态存在冲突，请刷新后重试。", "errors.tooLarge": "请求内容过大。", "errors.rateLimited": "请求过于频繁，请稍后重试。", "errors.server": "服务暂时不可用，请稍后重试。", "errors.accountLocked": "账号已临时锁定，请稍后重试。", "errors.appInactive": "该账号关联的 App 已停用。", "errors.vipDisabled": "当前 App 的 VIP 体系已停用", "errors.vipLevelInvalid": "请选择当前 App 已配置的 VIP 等级", "errors.organizationRoute": "该组织列表尚无安全的数据接口", "errors.regionId": "可见区域 ID 必须是安全的非负整数", "errors.grantTarget": "未找到当前 App 内的目标用户", "errors.bannerType": "Banner 类型不正确", "errors.bannerPlatform": "Banner 平台不正确", "errors.bannerStatus": "Banner 状态不正确", "errors.bannerScope": "请至少选择一个展示范围", "errors.bannerImage": "请上传 Banner 图片", "errors.h5Url": "请填写合法的 H5 链接", "errors.h5Protocol": "H5 链接仅支持 http 或 https", "errors.appParamRequired": "请填写 APP 跳转参数", "errors.appParamObject": "APP 跳转参数必须是 JSON 对象", "errors.appParamType": "APP 跳转 type 不在公共跳转方案内", "errors.appParamRoom": "该 APP 跳转需要填写 room_id", "errors.appParamGame": "该 APP 跳转需要填写 game_id", "errors.appParamWindow": "该 APP 跳转需要填写有效 window", "errors.appParamGameCode": "Explore 游戏 H5 需要选择有效 game_code", "errors.roomBannerImage": "房间范围必须上传房间内小屏图", "errors.countryCode": "国家码必须是 2-3 位字母", "errors.bannerRegion": "区域 ID 不正确", "errors.bannerSchedule": "投放结束时间必须晚于开始时间"
};
const ar = {
...en,
- "app.title": "نظام الإدارة", "app.shortTitle": "نظام الإدارة", "language.label": "اللغة",
+ "app.title": "الإدارة الخارجية", "app.shortTitle": "الإدارة الخارجية", "language.label": "اللغة",
"common.actions": "الإجراءات", "common.active": "نشط", "common.all": "الكل", "common.allStatuses": "كل الحالات", "common.banned": "محظور", "common.cancel": "إلغاء", "common.confirm": "تأكيد", "common.create": "إنشاء", "common.disabled": "معطّل", "common.edit": "تعديل", "common.enabled": "مفعّل", "common.expired": "منتهي", "common.loading": "جارٍ التحميل", "common.noData": "لا توجد بيانات", "common.normal": "طبيعي", "common.query": "بحث", "common.reason": "السبب", "common.reload": "إعادة التحميل", "common.retry": "إعادة المحاولة", "common.save": "حفظ", "common.status": "الحالة", "common.user": "المستخدم",
- "auth.account": "الحساب", "auth.changePassword": "تغيير كلمة المرور", "auth.checkingSession": "جارٍ التحقق من الجلسة", "auth.confirmNewPassword": "تأكيد كلمة المرور الجديدة", "auth.currentPassword": "كلمة المرور الحالية", "auth.fillAccountPassword": "أدخل الحساب وكلمة المرور", "auth.firstLoginChange": "يجب تغيير كلمة المرور عند تسجيل الدخول لأول مرة", "auth.hidePassword": "إخفاء كلمة المرور", "auth.invalidCredentials": "الحساب أو كلمة المرور غير صحيحة", "auth.login": "تسجيل الدخول", "auth.loginFailed": "فشل تسجيل الدخول", "auth.logout": "تسجيل الخروج", "auth.newPassword": "كلمة المرور الجديدة", "auth.noPermission": "لا يملك هذا الحساب صلاحية الوصول إلى هذه الميزة.", "auth.password": "كلمة المرور", "auth.passwordChangedFailed": "فشل تغيير كلمة المرور", "auth.passwordMismatch": "كلمتا المرور الجديدتان غير متطابقتين", "auth.passwordMin": "8 أحرف على الأقل", "auth.passwordMinError": "يجب أن تتكون كلمة المرور الجديدة من 8 أحرف على الأقل", "auth.passwordWhitespace": "لا يمكن أن تكون كلمة المرور الجديدة فارغة أو مسافات فقط", "auth.recheck": "إعادة التحقق", "auth.returnOverview": "العودة إلى الرئيسية", "auth.savePassword": "حفظ كلمة المرور", "auth.sessionFailed": "فشل التحقق من الجلسة", "auth.showPassword": "إظهار كلمة المرور",
+ "auth.account": "الحساب", "auth.changePassword": "تغيير كلمة المرور", "auth.checkingSession": "جارٍ التحقق من الجلسة", "auth.confirmNewPassword": "تأكيد كلمة المرور الجديدة", "auth.currentPassword": "كلمة المرور الحالية", "auth.fillAccountPassword": "أدخل الحساب وكلمة المرور", "auth.hidePassword": "إخفاء كلمة المرور", "auth.invalidCredentials": "الحساب أو كلمة المرور غير صحيحة", "auth.login": "تسجيل الدخول", "auth.loginFailed": "فشل تسجيل الدخول", "auth.logout": "تسجيل الخروج", "auth.newPassword": "كلمة المرور الجديدة", "auth.noPermission": "لا يملك هذا الحساب صلاحية الوصول إلى هذه الميزة.", "auth.password": "كلمة المرور", "auth.passwordChangedFailed": "فشل تغيير كلمة المرور", "auth.passwordMismatch": "كلمتا المرور الجديدتان غير متطابقتين", "auth.passwordWhitespace": "لا يمكن أن تكون كلمة المرور الجديدة فارغة أو مسافات فقط", "auth.recheck": "إعادة التحقق", "auth.returnOverview": "العودة إلى الرئيسية", "auth.savePassword": "حفظ كلمة المرور", "auth.sessionFailed": "فشل التحقق من الجلسة", "auth.showPassword": "إظهار كلمة المرور",
"nav.expand": "فتح القائمة", "nav.more": "المزيد", "nav.overview": "الرئيسية", "nav.users": "إدارة المستخدمين", "nav.bans": "إدارة الحظر", "nav.hosts": "المضيفون", "nav.agencies": "الوكالات", "nav.bds": "قائمة BD", "nav.bdManagers": "مديرو BD", "nav.superAdmins": "المشرفون العامون", "nav.rooms": "إدارة الغرف", "nav.grants": "الموارد والمعرّفات المميزة", "nav.banners": "إدارة اللافتات", "nav.team": "فريقي",
"capability.userList": "قائمة المستخدمين", "capability.userUpdate": "تعديل بيانات المستخدم", "capability.banList": "قائمة الحسابات المحظورة", "capability.ban": "حظر المستخدمين", "capability.unban": "إلغاء حظر المستخدمين", "capability.hostList": "قائمة المضيفين", "capability.agencyList": "قائمة الوكالات", "capability.bdList": "قائمة BD", "capability.bdManagerList": "قائمة مديري BD", "capability.superAdminList": "قائمة المشرفين العامين", "capability.roomList": "إدارة الغرف", "capability.roomUpdate": "تعديل الغرف", "capability.privilegeList": "قائمة عناصر الامتياز", "capability.privilegeGrant": "منح عناصر الامتياز", "capability.bannerCreate": "إنشاء اللافتات", "capability.prettyIdGrant": "منح المعرّفات المميزة", "capability.userTitleGrant": "منح ألقاب المستخدمين", "capability.roomBackgroundGrant": "منح خلفيات الغرف", "capability.userLevelGrant": "منح مستويات الثروة/VIP", "capability.teamView": "فريقي",
"overview.currentApp": "التطبيق الحالي", "overview.account": "الحساب", "overview.permissions": "الصلاحيات المفعّلة", "overview.welcome": "مرحبًا بعودتك", "overview.features": "الخدمات", "overview.enabled": "مفعّلة", "overview.notEnabled": "غير مفعّلة",
@@ -360,21 +355,21 @@ const ar = {
"bans.title": "قائمة الحسابات المحظورة", "bans.reason": "سبب الحظر", "bans.unban": "إلغاء الحظر", "bans.unbanned": "تم إلغاء حظر المستخدم", "bans.unbanFailed": "فشل إلغاء حظر المستخدم", "bans.confirmTitle": "إلغاء حظر المستخدم", "bans.confirmContent": "هل تريد إلغاء حظر {user}؟",
"organization.title": "المؤسسة", "organization.agencies": "قائمة الوكالات", "organization.bds": "قائمة BD", "organization.bdManagers": "قائمة مديري BD", "organization.hosts": "قائمة المضيفين", "organization.managers": "قائمة المديرين", "organization.superAdmins": "قائمة المشرفين العامين", "organization.team": "فريقي", "organization.agency": "الوكالة", "organization.owner": "المالك", "organization.parentBd": "BD الأعلى", "organization.member": "العضو", "organization.country": "الدولة / المنطقة", "organization.userReference": "المستخدم {id}", "organization.agencyReference": "الوكالة {id}", "organization.teamSearch": "معرّف الوكالة / معرّف المالك / معرّف BD الأعلى", "organization.noPermission": "لا يملك هذا الحساب صلاحية الوصول إلى قائمة المؤسسة هذه.", "organization.bdLeaderCount": "قادة BD: {count}", "organization.bdCount": "BD: {count}", "organization.agencyCount": "الوكالات: {count}", "organization.truncated": "يتجاوز حجم الفريق حد الواجهة. النتائج الحالية غير مكتملة.",
"rooms.title": "إدارة الغرف", "rooms.room": "الغرفة", "rooms.owner": "المالك", "rooms.visibleRegion": "المنطقة المرئية", "rooms.search": "معرّف الغرفة / الاسم / المالك", "rooms.updated": "تم تحديث بيانات الغرفة", "rooms.updateFailed": "فشل تحديث الغرفة", "rooms.editTitle": "تعديل الغرفة", "rooms.background": "خلفية الغرفة", "rooms.name": "اسم الغرفة", "rooms.description": "وصف الغرفة", "rooms.visibleRegionId": "معرّف المنطقة المرئية", "rooms.allRegions": "الكل",
- "grants.title": "الموارد والمعرّفات المميزة", "grants.grantResource": "منح عنصر", "grants.grantPrettyId": "منح معرّف مميز", "grants.availableResources": "الموارد المتاحة", "grants.targetUser": "المستخدم المستهدف", "grants.resource": "المورد", "grants.quantity": "الكمية", "grants.resourceGranted": "تم منح عنصر الامتياز", "grants.prettyIdGranted": "تم منح المعرّف المميز", "grants.failed": "فشل المنح", "grants.resourceTitle": "منح عنصر امتياز", "grants.prettyIdTitle": "منح معرّف مميز", "grants.target": "معرّف المستخدم / المعرّف المميز", "grants.currentTarget": "معرّف المستخدم / المعرّف المميز الحالي", "grants.prettyId": "المعرّف المميز المراد منحه", "grants.validDays": "الصلاحية (بالأيام)", "grants.permanentHint": "أدخل 0 للصلاحية الدائمة", "grants.reason": "سبب المنح", "grants.notice": "قبل الإرسال، يتم التحقق من المستخدم داخل التطبيق الحالي ويُستخدم معرّف المستخدم الذي يعيده الخادم.", "grants.confirm": "تأكيد المنح",
+ "grants.title": "الموارد والمعرّفات المميزة", "grants.grantResource": "منح عنصر", "grants.grantPrettyId": "منح معرّف مميز", "grants.availableResources": "الموارد المتاحة", "grants.targetUser": "المستخدم المستهدف", "grants.resource": "المورد", "grants.quantity": "الكمية", "grants.resourceGranted": "تم منح عنصر الامتياز", "grants.prettyIdGranted": "تم منح المعرّف المميز", "grants.failed": "فشل المنح", "grants.resourceTitle": "منح عنصر امتياز", "grants.prettyIdTitle": "منح معرّف مميز", "grants.target": "معرّف المستخدم / المعرّف المميز", "grants.currentTarget": "معرّف المستخدم / المعرّف المميز الحالي", "grants.prettyId": "المعرّف المميز المراد منحه", "grants.validDays": "الصلاحية (بالأيام)", "grants.permanentHint": "أدخل 0 للصلاحية الدائمة", "grants.reason": "سبب المنح", "grants.confirm": "تأكيد المنح",
"banners.title": "إدارة اللافتات", "banners.banner": "اللافتة", "banners.type": "النوع", "banners.platform": "المنصة", "banners.sort": "الترتيب", "banners.create": "إنشاء لافتة", "banners.created": "تم إنشاء اللافتة", "banners.createFailed": "فشل إنشاء اللافتة", "banners.image": "صورة اللافتة", "banners.roomImage": "الصورة المصغرة داخل الغرفة", "banners.description": "الوصف", "banners.jumpType": "نوع الوجهة", "banners.h5Param": "المعامل (رابط H5)", "banners.appParam": "المعامل (JSON للتنقل داخل التطبيق)", "banners.displayScope": "نطاق العرض", "banners.scopeHome": "الرئيسية", "banners.scopeRoom": "الغرفة", "banners.scopeRecharge": "الشحن", "banners.scopeMe": "حسابي", "banners.regionId": "معرّف المنطقة", "banners.countryCode": "رمز الدولة", "banners.countryCodeHint": "حرفان أو 3؛ اتركه فارغًا للكل", "banners.schedule": "جدول العرض",
"upload.preview": "معاينة {label}", "upload.empty": "لا توجد صورة", "upload.uploading": "جارٍ الرفع", "upload.replace": "استبدال الصورة", "upload.select": "رفع صورة", "upload.imageOnly": "اختر ملف صورة", "upload.sizeLimit": "يجب ألا يتجاوز حجم الصورة 10 ميغابايت", "upload.missingUrl": "لا تحتوي استجابة الرفع على رابط للصورة", "upload.failed": "فشل رفع الصورة",
"pagination.total": "{count} عنصر", "pagination.previous": "السابق", "pagination.next": "التالي",
"status.active": "نشط", "status.enabled": "مفعّل", "status.running": "قيد التشغيل", "status.normal": "طبيعي", "status.unbanned": "غير محظور", "status.banned": "محظور", "status.disabled": "معطّل", "status.failed": "فشل", "status.blocked": "محجوب", "status.expired": "منتهي",
- "jump.appTarget": "وجهة التطبيق", "jump.target.wallet": "المحفظة", "jump.target.room": "غرفة محددة", "jump.target.room_random": "غرفة عشوائية", "jump.target.room_window": "نافذة في غرفة محددة", "jump.target.room_random_window": "نافذة في غرفة عشوائية", "jump.target.room_game": "لعبة في غرفة محددة", "jump.target.room_random_game": "لعبة في غرفة عشوائية", "jump.target.explore_game": "لعبة Explore H5", "jump.target.custom": "JSON مخصص", "jump.roomId": "معرّف الغرفة", "jump.window": "نافذة داخل الغرفة", "jump.window.game_window": "نافذة اللعبة", "jump.window.gift_panel": "لوحة الهدايا", "jump.window.red_packet_claim": "نافذة الظرف الأحمر", "jump.window.wheel": "نافذة العجلة", "jump.gameId": "معرّف اللعبة", "jump.giftId": "معرّف الهدية", "jump.redPacketNo": "رقم الظرف الأحمر", "jump.hint": "يتم إنشاء معاملات التنقل داخل التطبيق بصيغة JSON، ويمكنك تعديلها مباشرة للمعاملات المخصصة.",
+ "jump.appTarget": "وجهة التطبيق", "jump.target.wallet": "المحفظة", "jump.target.room": "غرفة محددة", "jump.target.room_random": "غرفة عشوائية", "jump.target.room_window": "نافذة في غرفة محددة", "jump.target.room_random_window": "نافذة في غرفة عشوائية", "jump.target.room_game": "لعبة في غرفة محددة", "jump.target.room_random_game": "لعبة في غرفة عشوائية", "jump.target.explore_game": "لعبة Explore H5", "jump.target.custom": "JSON مخصص", "jump.roomId": "معرّف الغرفة", "jump.window": "نافذة داخل الغرفة", "jump.window.game_window": "نافذة اللعبة", "jump.window.gift_panel": "لوحة الهدايا", "jump.window.red_packet_claim": "نافذة الظرف الأحمر", "jump.window.wheel": "نافذة العجلة", "jump.gameId": "معرّف اللعبة", "jump.giftId": "معرّف الهدية", "jump.redPacketNo": "رقم الظرف الأحمر",
"time.unlimited": "أي وقت", "time.quickHour": "آخر ساعة", "time.quickDay": "آخر 24 ساعة", "time.quickWeek": "آخر 7 أيام", "time.start": "وقت البدء", "time.end": "وقت الانتهاء", "time.startDate": "تاريخ البدء", "time.endDate": "تاريخ الانتهاء", "time.pending": "غير محدد", "time.startMark": "ب", "time.endMark": "ن", "time.previousMonth": "الشهر السابق", "time.nextMonth": "الشهر التالي", "time.hour": "الساعة", "time.minute": "الدقيقة", "time.clear": "مسح", "time.apply": "تطبيق", "time.endAfterStart": "يجب أن يكون وقت الانتهاء بعد وقت البدء", "time.endDateAfterStart": "لا يمكن أن يسبق تاريخ الانتهاء تاريخ البدء", "time.completeRange": "حدد النطاق الكامل", "time.endLaterShort": "يجب أن تكون النهاية بعد البداية", "time.endDateLaterShort": "لا يمكن أن تسبق النهاية البداية", "time.durationDays": "{count} يوم", "time.durationHours": "{count} ساعة", "time.durationMinutes": "{count} دقيقة", "time.duration": "{value}", "time.sameDay": "اليوم نفسه", "time.lessMinute": "أقل من دقيقة واحدة",
"errors.loadFailed": "فشل تحميل البيانات", "errors.requestFailed": "فشل الطلب", "errors.unauthorized": "انتهت الجلسة. سجّل الدخول مرة أخرى.", "errors.forbidden": "ليس لديك إذن لتنفيذ هذه العملية.", "errors.notFound": "لم يتم العثور على المورد المطلوب.", "errors.conflict": "تتعارض العملية مع البيانات الحالية. حدّث الصفحة وحاول مجددًا.", "errors.tooLarge": "حجم الطلب كبير جدًا.", "errors.rateLimited": "طلبات كثيرة جدًا. حاول لاحقًا.", "errors.server": "الخدمة غير متاحة مؤقتًا. حاول لاحقًا.", "errors.accountLocked": "الحساب مقفل مؤقتًا. حاول لاحقًا.", "errors.appInactive": "التطبيق المرتبط بهذا الحساب غير نشط.", "errors.vipDisabled": "نظام VIP معطّل في التطبيق الحالي", "errors.vipLevelInvalid": "اختر مستوى VIP معدًا للتطبيق الحالي", "errors.organizationRoute": "لا توجد نقطة بيانات آمنة لقائمة المؤسسة هذه", "errors.regionId": "يجب أن يكون معرّف المنطقة عددًا صحيحًا آمنًا وغير سالب", "errors.grantTarget": "لم يتم العثور على المستخدم المستهدف في التطبيق الحالي", "errors.bannerType": "نوع اللافتة غير صالح", "errors.bannerPlatform": "منصة اللافتة غير صالحة", "errors.bannerStatus": "حالة اللافتة غير صالحة", "errors.bannerScope": "اختر نطاق عرض واحدًا على الأقل", "errors.bannerImage": "ارفع صورة للافتة", "errors.h5Url": "أدخل رابط H5 صالحًا", "errors.h5Protocol": "يجب أن يستخدم رابط H5 بروتوكول http أو https", "errors.appParamRequired": "أدخل معاملات التنقل داخل التطبيق", "errors.appParamObject": "يجب أن تكون معاملات التطبيق كائن JSON", "errors.appParamType": "نوع التنقل داخل التطبيق غير مدعوم", "errors.appParamRoom": "تتطلب هذه الوجهة room_id", "errors.appParamGame": "تتطلب هذه الوجهة game_id", "errors.appParamWindow": "تتطلب هذه الوجهة نافذة صالحة", "errors.appParamGameCode": "تتطلب لعبة Explore H5 قيمة game_code صالحة", "errors.roomBannerImage": "ارفع صورة مصغرة لنطاق الغرفة", "errors.countryCode": "يجب أن يتكون رمز الدولة من حرفين أو 3", "errors.bannerRegion": "معرّف المنطقة غير صالح", "errors.bannerSchedule": "يجب أن يكون وقت انتهاء العرض بعد وقت البدء"
};
const tr = {
...en,
- "app.title": "Yönetim Sistemi", "app.shortTitle": "Yönetim Sistemi", "language.label": "Dil",
+ "app.title": "Harici Yönetim", "app.shortTitle": "Harici Yönetim", "language.label": "Dil",
"common.actions": "İşlemler", "common.active": "Aktif", "common.all": "Tümü", "common.allStatuses": "Tüm durumlar", "common.banned": "Yasaklı", "common.cancel": "İptal", "common.confirm": "Onayla", "common.create": "Oluştur", "common.disabled": "Devre dışı", "common.edit": "Düzenle", "common.enabled": "Etkin", "common.expired": "Süresi dolmuş", "common.loading": "Yükleniyor", "common.noData": "Veri yok", "common.normal": "Normal", "common.query": "Ara", "common.reason": "Neden", "common.reload": "Yeniden yükle", "common.retry": "Tekrar dene", "common.save": "Kaydet", "common.status": "Durum", "common.user": "Kullanıcı",
- "auth.account": "Hesap", "auth.changePassword": "Parolayı değiştir", "auth.checkingSession": "Oturum kontrol ediliyor", "auth.confirmNewPassword": "Yeni parolayı doğrula", "auth.currentPassword": "Mevcut parola", "auth.fillAccountPassword": "Hesabınızı ve parolanızı girin", "auth.firstLoginChange": "İlk girişte parolanızı değiştirmeniz gerekir", "auth.hidePassword": "Parolayı gizle", "auth.invalidCredentials": "Hesap veya parola hatalı", "auth.login": "Giriş yap", "auth.loginFailed": "Giriş başarısız", "auth.logout": "Çıkış yap", "auth.newPassword": "Yeni parola", "auth.noPermission": "Bu hesabın bu özelliğe erişimi yok.", "auth.password": "Parola", "auth.passwordChangedFailed": "Parola değiştirilemedi", "auth.passwordMismatch": "Yeni parolalar eşleşmiyor", "auth.passwordMin": "En az 8 karakter", "auth.passwordMinError": "Yeni parola en az 8 karakter olmalıdır", "auth.passwordWhitespace": "Yeni parola boş veya yalnızca boşluk olamaz", "auth.recheck": "Tekrar kontrol et", "auth.returnOverview": "Ana sayfaya dön", "auth.savePassword": "Parolayı kaydet", "auth.sessionFailed": "Oturum doğrulanamadı", "auth.showPassword": "Parolayı göster",
+ "auth.account": "Hesap", "auth.changePassword": "Parolayı değiştir", "auth.checkingSession": "Oturum kontrol ediliyor", "auth.confirmNewPassword": "Yeni parolayı doğrula", "auth.currentPassword": "Mevcut parola", "auth.fillAccountPassword": "Hesabınızı ve parolanızı girin", "auth.hidePassword": "Parolayı gizle", "auth.invalidCredentials": "Hesap veya parola hatalı", "auth.login": "Giriş yap", "auth.loginFailed": "Giriş başarısız", "auth.logout": "Çıkış yap", "auth.newPassword": "Yeni parola", "auth.noPermission": "Bu hesabın bu özelliğe erişimi yok.", "auth.password": "Parola", "auth.passwordChangedFailed": "Parola değiştirilemedi", "auth.passwordMismatch": "Yeni parolalar eşleşmiyor", "auth.passwordWhitespace": "Yeni parola boş veya yalnızca boşluk olamaz", "auth.recheck": "Tekrar kontrol et", "auth.returnOverview": "Ana sayfaya dön", "auth.savePassword": "Parolayı kaydet", "auth.sessionFailed": "Oturum doğrulanamadı", "auth.showPassword": "Parolayı göster",
"nav.expand": "Menüyü aç", "nav.more": "Daha fazla", "nav.overview": "Ana sayfa", "nav.users": "Kullanıcı yönetimi", "nav.bans": "Yasak yönetimi", "nav.hosts": "Yayıncılar", "nav.agencies": "Ajanslar", "nav.bds": "BD listesi", "nav.bdManagers": "BD Yöneticileri", "nav.superAdmins": "Süper Yöneticiler", "nav.rooms": "Oda yönetimi", "nav.grants": "Kaynaklar ve özel ID'ler", "nav.banners": "Banner yönetimi", "nav.team": "Ekibim",
"capability.userList": "Kullanıcı listesi", "capability.userUpdate": "Kullanıcı bilgilerini düzenleme", "capability.banList": "Yasaklı hesap listesi", "capability.ban": "Kullanıcı yasaklama", "capability.unban": "Kullanıcı yasağını kaldırma", "capability.hostList": "Yayıncı listesi", "capability.agencyList": "Ajans listesi", "capability.bdList": "BD listesi", "capability.bdManagerList": "BD Yöneticisi listesi", "capability.superAdminList": "Süper Yönetici listesi", "capability.roomList": "Oda yönetimi", "capability.roomUpdate": "Oda düzenleme", "capability.privilegeList": "Ayrıcalık öğesi listesi", "capability.privilegeGrant": "Ayrıcalık öğesi verme", "capability.bannerCreate": "Banner oluşturma", "capability.prettyIdGrant": "Özel ID verme", "capability.userTitleGrant": "Kullanıcı unvanı verme", "capability.roomBackgroundGrant": "Oda arka planı verme", "capability.userLevelGrant": "Servet/VIP seviyesi verme", "capability.teamView": "Ekibim",
"overview.currentApp": "Geçerli uygulama", "overview.account": "Hesap", "overview.permissions": "Etkin yetkiler", "overview.welcome": "Tekrar hoş geldiniz", "overview.features": "Özellikler", "overview.enabled": "Etkin", "overview.notEnabled": "Etkin değil",
@@ -382,12 +377,12 @@ const tr = {
"bans.title": "Yasaklı hesap listesi", "bans.reason": "Yasak nedeni", "bans.unban": "Yasağı kaldır", "bans.unbanned": "Kullanıcı yasağı kaldırıldı", "bans.unbanFailed": "Kullanıcı yasağı kaldırılamadı", "bans.confirmTitle": "Kullanıcı yasağını kaldır", "bans.confirmContent": "{user} kullanıcısının yasağı kaldırılsın mı?",
"organization.title": "Organizasyon", "organization.agencies": "Ajans listesi", "organization.bds": "BD listesi", "organization.bdManagers": "BD Yöneticisi listesi", "organization.hosts": "Yayıncı listesi", "organization.managers": "Yönetici listesi", "organization.superAdmins": "Süper Yönetici listesi", "organization.team": "Ekibim", "organization.agency": "Ajans", "organization.owner": "Sahip", "organization.parentBd": "Üst BD", "organization.member": "Üye", "organization.country": "Ülke / bölge", "organization.userReference": "Kullanıcı {id}", "organization.agencyReference": "Ajans {id}", "organization.teamSearch": "Ajans ID / sahip kullanıcı ID / üst BD ID", "organization.noPermission": "Bu hesabın bu organizasyon listesine erişimi yok.", "organization.bdLeaderCount": "BD Liderleri: {count}", "organization.bdCount": "BD: {count}", "organization.agencyCount": "Ajanslar: {count}", "organization.truncated": "Ekip API sınırını aşıyor. Mevcut sonuçlar eksik.",
"rooms.title": "Oda yönetimi", "rooms.room": "Oda", "rooms.owner": "Sahip", "rooms.visibleRegion": "Görünür bölge", "rooms.search": "Oda ID / ad / sahip", "rooms.updated": "Oda bilgileri güncellendi", "rooms.updateFailed": "Oda güncellenemedi", "rooms.editTitle": "Odayı düzenle", "rooms.background": "Oda arka planı", "rooms.name": "Oda adı", "rooms.description": "Oda açıklaması", "rooms.visibleRegionId": "Görünür bölge ID", "rooms.allRegions": "Tümü",
- "grants.title": "Kaynaklar ve özel ID'ler", "grants.grantResource": "Öğe ver", "grants.grantPrettyId": "Özel ID ver", "grants.availableResources": "Kullanılabilir kaynaklar", "grants.targetUser": "Hedef kullanıcı", "grants.resource": "Kaynak", "grants.quantity": "Miktar", "grants.resourceGranted": "Ayrıcalık öğesi verildi", "grants.prettyIdGranted": "Özel ID verildi", "grants.failed": "Verme işlemi başarısız", "grants.resourceTitle": "Ayrıcalık öğesi ver", "grants.prettyIdTitle": "Özel ID ver", "grants.target": "Kullanıcı ID / özel ID", "grants.currentTarget": "Kullanıcı ID / mevcut özel ID", "grants.prettyId": "Verilecek özel ID", "grants.validDays": "Geçerlilik (gün)", "grants.permanentHint": "Kalıcı geçerlilik için 0 girin", "grants.reason": "Verme nedeni", "grants.notice": "Göndermeden önce kullanıcı geçerli uygulamada doğrulanır ve sunucunun döndürdüğü kullanıcı ID kullanılır.", "grants.confirm": "Vermeyi onayla",
+ "grants.title": "Kaynaklar ve özel ID'ler", "grants.grantResource": "Öğe ver", "grants.grantPrettyId": "Özel ID ver", "grants.availableResources": "Kullanılabilir kaynaklar", "grants.targetUser": "Hedef kullanıcı", "grants.resource": "Kaynak", "grants.quantity": "Miktar", "grants.resourceGranted": "Ayrıcalık öğesi verildi", "grants.prettyIdGranted": "Özel ID verildi", "grants.failed": "Verme işlemi başarısız", "grants.resourceTitle": "Ayrıcalık öğesi ver", "grants.prettyIdTitle": "Özel ID ver", "grants.target": "Kullanıcı ID / özel ID", "grants.currentTarget": "Kullanıcı ID / mevcut özel ID", "grants.prettyId": "Verilecek özel ID", "grants.validDays": "Geçerlilik (gün)", "grants.permanentHint": "Kalıcı geçerlilik için 0 girin", "grants.reason": "Verme nedeni", "grants.confirm": "Vermeyi onayla",
"banners.title": "Banner yönetimi", "banners.banner": "Banner", "banners.type": "Tür", "banners.platform": "Platform", "banners.sort": "Sıralama", "banners.create": "Banner oluştur", "banners.created": "Banner oluşturuldu", "banners.createFailed": "Banner oluşturulamadı", "banners.image": "Banner görseli", "banners.roomImage": "Oda içi küçük görsel", "banners.description": "Açıklama", "banners.jumpType": "Hedef türü", "banners.h5Param": "Parametre (H5 bağlantısı)", "banners.appParam": "Parametre (uygulama yönlendirme JSON'u)", "banners.displayScope": "Gösterim kapsamı", "banners.scopeHome": "Ana sayfa", "banners.scopeRoom": "Oda", "banners.scopeRecharge": "Yükleme", "banners.scopeMe": "Ben", "banners.regionId": "Bölge ID", "banners.countryCode": "Ülke kodu", "banners.countryCodeHint": "2–3 harf; tümü için boş bırakın", "banners.schedule": "Gösterim zamanı",
"upload.preview": "{label} önizlemesi", "upload.empty": "Görsel yok", "upload.uploading": "Yükleniyor", "upload.replace": "Görseli değiştir", "upload.select": "Görsel yükle", "upload.imageOnly": "Bir görsel dosyası seçin", "upload.sizeLimit": "Görseller 10 MB'ı aşamaz", "upload.missingUrl": "Yükleme yanıtında görsel URL'si yok", "upload.failed": "Görsel yüklenemedi",
"pagination.total": "{count} öğe", "pagination.previous": "Önceki", "pagination.next": "Sonraki",
"status.active": "Aktif", "status.enabled": "Etkin", "status.running": "Çalışıyor", "status.normal": "Normal", "status.unbanned": "Yasaksız", "status.banned": "Yasaklı", "status.disabled": "Devre dışı", "status.failed": "Başarısız", "status.blocked": "Engelli", "status.expired": "Süresi dolmuş",
- "jump.appTarget": "Uygulama hedefi", "jump.target.wallet": "Cüzdan", "jump.target.room": "Belirli oda", "jump.target.room_random": "Rastgele oda", "jump.target.room_window": "Belirli odada pencere", "jump.target.room_random_window": "Rastgele odada pencere", "jump.target.room_game": "Belirli odada oyun", "jump.target.room_random_game": "Rastgele odada oyun", "jump.target.explore_game": "Explore oyunu H5", "jump.target.custom": "Özel JSON", "jump.roomId": "Oda ID", "jump.window": "Oda içi pencere", "jump.window.game_window": "Oyun penceresi", "jump.window.gift_panel": "Hediye paneli", "jump.window.red_packet_claim": "Kırmızı paket penceresi", "jump.window.wheel": "Çark penceresi", "jump.gameId": "Oyun ID", "jump.giftId": "Hediye ID", "jump.redPacketNo": "Kırmızı paket numarası", "jump.hint": "Uygulama yönlendirme parametreleri JSON olarak oluşturulur; özel parametreler için JSON'u doğrudan düzenleyebilirsiniz.",
+ "jump.appTarget": "Uygulama hedefi", "jump.target.wallet": "Cüzdan", "jump.target.room": "Belirli oda", "jump.target.room_random": "Rastgele oda", "jump.target.room_window": "Belirli odada pencere", "jump.target.room_random_window": "Rastgele odada pencere", "jump.target.room_game": "Belirli odada oyun", "jump.target.room_random_game": "Rastgele odada oyun", "jump.target.explore_game": "Explore oyunu H5", "jump.target.custom": "Özel JSON", "jump.roomId": "Oda ID", "jump.window": "Oda içi pencere", "jump.window.game_window": "Oyun penceresi", "jump.window.gift_panel": "Hediye paneli", "jump.window.red_packet_claim": "Kırmızı paket penceresi", "jump.window.wheel": "Çark penceresi", "jump.gameId": "Oyun ID", "jump.giftId": "Hediye ID", "jump.redPacketNo": "Kırmızı paket numarası",
"time.unlimited": "Sınırsız", "time.quickHour": "Son 1 saat", "time.quickDay": "Son 24 saat", "time.quickWeek": "Son 7 gün", "time.start": "Başlangıç zamanı", "time.end": "Bitiş zamanı", "time.startDate": "Başlangıç tarihi", "time.endDate": "Bitiş tarihi", "time.pending": "Seçilmedi", "time.startMark": "B", "time.endMark": "S", "time.previousMonth": "Önceki ay", "time.nextMonth": "Sonraki ay", "time.hour": "Saat", "time.minute": "Dakika", "time.clear": "Temizle", "time.apply": "Uygula", "time.endAfterStart": "Bitiş zamanı başlangıçtan sonra olmalıdır", "time.endDateAfterStart": "Bitiş tarihi başlangıçtan önce olamaz", "time.completeRange": "Tam aralığı seçin", "time.endLaterShort": "Bitiş başlangıçtan sonra olmalı", "time.endDateLaterShort": "Bitiş başlangıçtan önce olamaz", "time.durationDays": "{count} gün", "time.durationHours": "{count} saat", "time.durationMinutes": "{count} dakika", "time.duration": "{value}", "time.sameDay": "Aynı gün", "time.lessMinute": "1 dakikadan az",
"errors.loadFailed": "Veriler yüklenemedi", "errors.requestFailed": "İstek başarısız", "errors.unauthorized": "Oturumunuz sona erdi. Tekrar giriş yapın.", "errors.forbidden": "Bu işlemi yapma yetkiniz yok.", "errors.notFound": "İstenen kaynak bulunamadı.", "errors.conflict": "İşlem mevcut verilerle çakışıyor. Yenileyip tekrar deneyin.", "errors.tooLarge": "İstek çok büyük.", "errors.rateLimited": "Çok fazla istek gönderildi. Daha sonra tekrar deneyin.", "errors.server": "Hizmet geçici olarak kullanılamıyor. Daha sonra tekrar deneyin.", "errors.accountLocked": "Hesap geçici olarak kilitlendi. Daha sonra tekrar deneyin.", "errors.appInactive": "Bu hesaba bağlı uygulama etkin değil.", "errors.vipDisabled": "Geçerli uygulamanın VIP programı devre dışı", "errors.vipLevelInvalid": "Geçerli uygulama için yapılandırılmış bir VIP seviyesi seçin", "errors.organizationRoute": "Bu organizasyon listesi için güvenli veri uç noktası yok", "errors.regionId": "Görünür bölge ID güvenli ve negatif olmayan bir tam sayı olmalıdır", "errors.grantTarget": "Geçerli uygulamada hedef kullanıcı bulunamadı", "errors.bannerType": "Geçersiz banner türü", "errors.bannerPlatform": "Geçersiz banner platformu", "errors.bannerStatus": "Geçersiz banner durumu", "errors.bannerScope": "En az bir gösterim kapsamı seçin", "errors.bannerImage": "Bir banner görseli yükleyin", "errors.h5Url": "Geçerli bir H5 bağlantısı girin", "errors.h5Protocol": "H5 bağlantıları http veya https kullanmalıdır", "errors.appParamRequired": "Uygulama yönlendirme parametrelerini girin", "errors.appParamObject": "Uygulama parametreleri bir JSON nesnesi olmalıdır", "errors.appParamType": "Uygulama yönlendirme türü desteklenmiyor", "errors.appParamRoom": "Bu hedef room_id gerektirir", "errors.appParamGame": "Bu hedef game_id gerektirir", "errors.appParamWindow": "Bu hedef geçerli bir window gerektirir", "errors.appParamGameCode": "Explore oyunu H5 geçerli bir game_code gerektirir", "errors.roomBannerImage": "Oda kapsamı için oda içi küçük görsel yükleyin", "errors.countryCode": "Ülke kodu 2–3 harften oluşmalıdır", "errors.bannerRegion": "Geçersiz bölge ID", "errors.bannerSchedule": "Gösterim bitiş zamanı başlangıçtan sonra olmalıdır"
};
diff --git a/external-admin/src/i18n/messages.test.js b/external-admin/src/i18n/messages.test.js
index 7fa4dbb..19c7cf1 100644
--- a/external-admin/src/i18n/messages.test.js
+++ b/external-admin/src/i18n/messages.test.js
@@ -13,6 +13,12 @@ describe("external admin translations", () => {
test("uses native language names and Arabic RTL only", () => {
expect(EXTERNAL_LANGUAGE_OPTIONS.map((item) => item.label)).toEqual(["English", "简体中文", "العربية", "Türkçe"]);
+ expect(["en", "zh-CN", "ar", "tr"].map((locale) => externalMessage(locale, "app.title"))).toEqual([
+ "External Admin", "外管后台", "الإدارة الخارجية", "Harici Yönetim"
+ ]);
+ expect(["en", "zh-CN", "ar", "tr"].map((locale) => externalMessage(locale, "app.shortTitle"))).toEqual([
+ "External Admin", "外管后台", "الإدارة الخارجية", "Harici Yönetim"
+ ]);
expect(externalDirection("ar")).toBe("rtl");
expect(externalDirection("en")).toBe("ltr");
expect(externalDirection("zh-CN")).toBe("ltr");
diff --git a/external-admin/src/layout/ExternalAdminLayout.jsx b/external-admin/src/layout/ExternalAdminLayout.jsx
index a7fadfe..1ce8839 100644
--- a/external-admin/src/layout/ExternalAdminLayout.jsx
+++ b/external-admin/src/layout/ExternalAdminLayout.jsx
@@ -28,10 +28,12 @@ import useMediaQuery from "@mui/material/useMediaQuery";
import { useTheme } from "@mui/material/styles";
import { useMemo, useState } from "react";
import { NavLink, Outlet, useLocation, useNavigate } from "react-router-dom";
+import { AppIdentity } from "@/shared/ui/AppIdentity.jsx";
import { useExternalAuth } from "../auth/ExternalAuthProvider.jsx";
import { hasAnyExternalCapability } from "../config/capabilities.js";
import { useExternalI18n } from "../i18n/ExternalI18nProvider.jsx";
import { LanguageSwitcher } from "../i18n/LanguageSwitcher.jsx";
+import { useExternalSessionBrand } from "../shared/useExternalSessionBrand.js";
const drawerWidth = 248;
const navigation = [
@@ -67,6 +69,7 @@ export function ExternalAdminLayout() {
// The H5 tab bar keeps three primary destinations reachable with a thumb; everything else lives in the "More" sheet.
const tabs = visibleNavigation.slice(0, 3);
const moreActive = !tabs.some((item) => isItemActive(item, location.pathname));
+ useExternalSessionBrand(session, t("app.title"));
const handleLogout = async () => {
setSheetOpen(false);
@@ -87,10 +90,14 @@ export function ExternalAdminLayout() {
const sidebar = (
-
- {t("app.shortTitle")}
- {session?.appName || session?.appCode}
-
+
@@ -131,7 +138,18 @@ export function ExternalAdminLayout() {
}}
>
- {mobile && !current ? t("app.shortTitle") : t(current?.labelKey || "app.shortTitle")}
+ {mobile ? (
+
+ ) : (
+ {t(current?.labelKey || "app.shortTitle")}
+ )}
@@ -186,7 +204,7 @@ export function ExternalAdminLayout() {
})}
-
+
} onClick={() => { setSheetOpen(false); navigate("/change-password"); }}>{t("auth.changePassword")}
} variant="outlined" onClick={handleLogout}>{t("auth.logout")}
diff --git a/external-admin/src/layout/ExternalAdminLayout.test.jsx b/external-admin/src/layout/ExternalAdminLayout.test.jsx
index 09f7da1..c767ab0 100644
--- a/external-admin/src/layout/ExternalAdminLayout.test.jsx
+++ b/external-admin/src/layout/ExternalAdminLayout.test.jsx
@@ -14,6 +14,7 @@ const auth = vi.hoisted(() => ({
account: "fami-manager",
appCode: "fami",
appName: "Fami",
+ logoUrl: "https://media.example.com/apps/fami.png",
capabilities: ["user:list", "room:list"]
}
}));
@@ -26,6 +27,13 @@ describe("ExternalAdminLayout RTL", () => {
beforeEach(() => {
localStorage.setItem(EXTERNAL_LOCALE_STORAGE_KEY, "ar");
viewport.mobile = false;
+ auth.session = {
+ account: "fami-manager",
+ appCode: "fami",
+ appName: "Fami",
+ logoUrl: "https://media.example.com/apps/fami.png",
+ capabilities: ["user:list", "room:list"]
+ };
});
test("shows the H5 tab bar and opens the more sheet in Arabic", async () => {
@@ -47,7 +55,7 @@ describe("ExternalAdminLayout RTL", () => {
});
test("places the desktop navigation drawer on the right for Arabic", () => {
- renderLayout();
+ const view = renderLayout();
expect(document.documentElement).toHaveAttribute("dir", "rtl");
expect(document.documentElement).toHaveAttribute("lang", "ar");
@@ -60,8 +68,37 @@ describe("ExternalAdminLayout RTL", () => {
.find((cssText) => cssText.includes(`.${generatedClass}`));
expect(drawerRule).toContain("right: 0px");
expect(drawerRule).toContain("border-left:");
+ expect(document.querySelector(".external-sidebar-brand img")).toHaveAttribute("src", "https://media.example.com/apps/fami.png");
+ expect(screen.getAllByText("Fami").length).toBeGreaterThan(0);
+ expect(screen.queryByText("إدارة HYApp الخارجية")).not.toBeInTheDocument();
+ expect(document.title).toBe("Fami");
+ expect(document.head.querySelector('link[data-external-app-favicon="true"]')).toHaveAttribute("href", "https://media.example.com/apps/fami.png");
expect(screen.getAllByText("الرئيسية").length).toBeGreaterThan(0);
expect(screen.getByRole("combobox", { name: "اللغة" })).toHaveTextContent("العربية");
+
+ view.unmount();
+ expect(document.title).toBe("الإدارة الخارجية");
+ expect(document.head.querySelector('link[data-external-app-favicon="true"]')).not.toBeInTheDocument();
+ });
+
+ test("uses the App name, logo and title resolved by the authenticated session", () => {
+ auth.session = {
+ ...auth.session,
+ account: "lalu-manager",
+ appCode: "lalu",
+ appName: "Lalu",
+ logoUrl: "https://media.example.com/apps/lalu.png"
+ };
+ const view = renderLayout();
+
+ expect(screen.getAllByText("Lalu").length).toBeGreaterThan(0);
+ expect(document.querySelector(".external-sidebar-brand img")).toHaveAttribute("src", "https://media.example.com/apps/lalu.png");
+ expect(document.title).toBe("Lalu");
+ expect(document.head.querySelector('link[data-external-app-favicon="true"]')).toHaveAttribute("href", "https://media.example.com/apps/lalu.png");
+
+ view.unmount();
+ expect(document.title).toBe("الإدارة الخارجية");
+ expect(document.head.querySelector('link[data-external-app-favicon="true"]')).not.toBeInTheDocument();
});
});
diff --git a/external-admin/src/pages/ChangePasswordPage.jsx b/external-admin/src/pages/ChangePasswordPage.jsx
index 436d82d..a14a139 100644
--- a/external-admin/src/pages/ChangePasswordPage.jsx
+++ b/external-admin/src/pages/ChangePasswordPage.jsx
@@ -8,10 +8,12 @@ import TextField from "@mui/material/TextField";
import Typography from "@mui/material/Typography";
import { useState } from "react";
import { useNavigate } from "react-router-dom";
+import { AppIdentity } from "@/shared/ui/AppIdentity.jsx";
import { useExternalAuth } from "../auth/ExternalAuthProvider.jsx";
import { useExternalI18n } from "../i18n/ExternalI18nProvider.jsx";
import { LanguageSwitcher } from "../i18n/LanguageSwitcher.jsx";
import { translateExternalError } from "../i18n/errors.js";
+import { useExternalSessionBrand } from "../shared/useExternalSessionBrand.js";
export default function ChangePasswordPage() {
const { changePassword, logout, session } = useExternalAuth();
@@ -20,6 +22,7 @@ export default function ChangePasswordPage() {
const [error, setError] = useState("");
const [submitting, setSubmitting] = useState(false);
const navigate = useNavigate();
+ useExternalSessionBrand(session, t("app.title"));
const submit = async (event) => {
event.preventDefault();
@@ -27,10 +30,6 @@ export default function ChangePasswordPage() {
setError(t("auth.passwordWhitespace"));
return;
}
- if (form.newPassword.length < 8) {
- setError(t("auth.passwordMinError"));
- return;
- }
if (form.newPassword !== form.confirmPassword) {
setError(t("auth.passwordMismatch"));
return;
@@ -57,11 +56,22 @@ export default function ChangePasswordPage() {
- {t("auth.changePassword")}{session?.passwordChangeRequired ? t("auth.firstLoginChange") : session?.account}
+
+
+ {t("auth.changePassword")}
+ {session?.account}
+
{error ? {error} : null}
setForm({ ...form, oldPassword: event.target.value })} />
- setForm({ ...form, newPassword: event.target.value })} />
+ setForm({ ...form, newPassword: event.target.value })} />
setForm({ ...form, confirmPassword: event.target.value })} />
diff --git a/external-admin/src/pages/ChangePasswordPage.test.jsx b/external-admin/src/pages/ChangePasswordPage.test.jsx
index 51351d7..c1f6e4f 100644
--- a/external-admin/src/pages/ChangePasswordPage.test.jsx
+++ b/external-admin/src/pages/ChangePasswordPage.test.jsx
@@ -7,7 +7,13 @@ import ChangePasswordPage from "./ChangePasswordPage.jsx";
const auth = vi.hoisted(() => ({
changePassword: vi.fn(),
logout: vi.fn(),
- session: { account: "fami-manager", passwordChangeRequired: true }
+ session: {
+ account: "fami-manager",
+ appCode: "fami",
+ appName: "Fami",
+ logoUrl: "https://media.example.com/apps/fami.png",
+ passwordChangeRequired: true
+ }
}));
vi.mock("../auth/ExternalAuthProvider.jsx", () => ({ useExternalAuth: () => auth }));
@@ -16,6 +22,29 @@ describe("ChangePasswordPage", () => {
beforeEach(() => {
auth.changePassword.mockReset().mockResolvedValue({});
auth.logout.mockReset().mockResolvedValue(undefined);
+ auth.session = {
+ account: "fami-manager",
+ appCode: "fami",
+ appName: "Fami",
+ logoUrl: "https://media.example.com/apps/fami.png",
+ passwordChangeRequired: true
+ };
+ });
+
+ test("shows the App brand resolved by the authenticated session", () => {
+ auth.session = {
+ ...auth.session,
+ account: "lalu-manager",
+ appCode: "lalu",
+ appName: "Lalu",
+ logoUrl: "https://media.example.com/apps/lalu.png"
+ };
+ const view = render();
+
+ expect(screen.getByText("Lalu")).toBeInTheDocument();
+ expect(view.container.querySelector("img")).toHaveAttribute("src", "https://media.example.com/apps/lalu.png");
+ expect(document.title).toBe("Lalu");
+ expect(document.head.querySelector('link[data-external-app-favicon="true"]')).toHaveAttribute("href", "https://media.example.com/apps/lalu.png");
});
test("blocks a whitespace-only new password", async () => {
diff --git a/external-admin/src/pages/LoginPage.jsx b/external-admin/src/pages/LoginPage.jsx
index 683e340..280697a 100644
--- a/external-admin/src/pages/LoginPage.jsx
+++ b/external-admin/src/pages/LoginPage.jsx
@@ -28,9 +28,17 @@ export default function LoginPage() {
const navigate = useNavigate();
const location = useLocation();
+ useEffect(() => {
+ // 登录前没有可信 App 上下文；使用通用标题并清掉上次认证遗留的图标，避免误导用户所属 App。
+ globalThis.document.title = t("app.title");
+ globalThis.document.head.querySelector('link[data-external-app-favicon="true"]')?.remove();
+ }, [t]);
+
useEffect(() => {
if (!initializing && session) {
- const destination = session.passwordChangeRequired ? "/change-password" : location.state?.from?.pathname || "/overview";
+ // Password rotation is optional. An authenticated session always returns to the
+ // requested business page, including sessions created by older server versions.
+ const destination = location.state?.from?.pathname || "/overview";
navigate(destination, { replace: true });
}
}, [initializing, location.state, navigate, session]);
@@ -44,8 +52,8 @@ export default function LoginPage() {
setSubmitting(true);
setError("");
try {
- const nextSession = await login(form);
- navigate(nextSession.passwordChangeRequired ? "/change-password" : "/overview", { replace: true });
+ await login(form);
+ navigate("/overview", { replace: true });
} catch (requestError) {
// Every login 401 uses one generic credential message so unknown, disabled and locked accounts cannot be distinguished.
setError(requestError?.status === 401 ? t("auth.invalidCredentials") : translateExternalError(requestError, t, "auth.loginFailed"));
diff --git a/external-admin/src/pages/LoginPage.test.jsx b/external-admin/src/pages/LoginPage.test.jsx
index d62f9d4..0511095 100644
--- a/external-admin/src/pages/LoginPage.test.jsx
+++ b/external-admin/src/pages/LoginPage.test.jsx
@@ -18,11 +18,22 @@ describe("LoginPage", () => {
test("defaults to English, has no App field and submits only account and password", async () => {
const user = userEvent.setup();
+ const staleFavicon = document.createElement("link");
+ staleFavicon.dataset.externalAppFavicon = "true";
+ staleFavicon.rel = "icon";
+ staleFavicon.href = "https://media.example.com/apps/lalu.png";
+ document.head.append(staleFavicon);
+ document.title = "Lalu";
const { container } = renderLogin();
- expect(screen.getByRole("heading", { name: "Admin System" })).toBeInTheDocument();
+ expect(screen.getByRole("heading", { name: "External Admin" })).toBeInTheDocument();
+ expect(container.querySelector("img")).toBeNull();
+ expect(document.title).toBe("External Admin");
+ expect(document.head.querySelector('link[data-external-app-favicon="true"]')).not.toBeInTheDocument();
expect(screen.queryByRole("combobox", { name: "App" })).not.toBeInTheDocument();
await user.type(screen.getByRole("textbox", { name: "Account" }), "fami-manager");
+ expect(screen.getByRole("heading", { name: "External Admin" })).toBeInTheDocument();
+ expect(container.querySelector("img")).toBeNull();
await user.type(container.querySelector('input[autocomplete="current-password"]'), "secret-password");
await user.click(screen.getByRole("button", { name: "Sign in" }));
diff --git a/external-admin/src/pages/OverviewPage.jsx b/external-admin/src/pages/OverviewPage.jsx
index 9945f85..ee249f3 100644
--- a/external-admin/src/pages/OverviewPage.jsx
+++ b/external-admin/src/pages/OverviewPage.jsx
@@ -55,20 +55,9 @@ const CAPABILITY_ICONS = {
export default function OverviewPage() {
const { session } = useExternalAuth();
const { t } = useExternalI18n();
- const enabledCount = EXTERNAL_CAPABILITIES.filter((item) => hasExternalCapability(session, item.code)).length;
return (
-
- {t("overview.welcome")}
- {session.appName || session.appCode}
-
- {t("overview.currentApp")}{session.appName || session.appCode} ({session.appCode})
- {t("overview.account")}{session.account}
- {t("overview.permissions")}{enabledCount} / {EXTERNAL_CAPABILITIES.length}
-
-
- {t("overview.features")}
{EXTERNAL_CAPABILITIES.map((item) => {
const enabled = hasExternalCapability(session, item.code);
diff --git a/external-admin/src/shared/useExternalSessionBrand.js b/external-admin/src/shared/useExternalSessionBrand.js
new file mode 100644
index 0000000..f7cbbef
--- /dev/null
+++ b/external-admin/src/shared/useExternalSessionBrand.js
@@ -0,0 +1,32 @@
+import { useEffect } from "react";
+
+export function useExternalSessionBrand(session, fallbackTitle) {
+ const appName = String(session?.appName || session?.appCode || fallbackTitle || "External Admin").trim();
+ const logoUrl = String(session?.logoUrl || "").trim();
+
+ useEffect(() => {
+ // 认证后的 App 品牌只采用服务端 session；session 又来自 apps 行，前端不解析账号名称猜租户。
+ globalThis.document.title = appName;
+ syncBrandFavicon(logoUrl);
+ return () => {
+ globalThis.document.title = fallbackTitle || "External Admin";
+ syncBrandFavicon("");
+ };
+ }, [appName, fallbackTitle, logoUrl]);
+}
+
+function syncBrandFavicon(logoUrl) {
+ const selector = 'link[data-external-app-favicon="true"]';
+ const current = globalThis.document?.head?.querySelector(selector);
+ if (!logoUrl) {
+ current?.remove();
+ return;
+ }
+ const link = current || globalThis.document.createElement("link");
+ link.dataset.externalAppFavicon = "true";
+ link.rel = "icon";
+ link.href = logoUrl;
+ if (!current) {
+ globalThis.document.head.append(link);
+ }
+}
diff --git a/external-admin/src/styles/index.css b/external-admin/src/styles/index.css
index c61ea93..b4ab771 100644
--- a/external-admin/src/styles/index.css
+++ b/external-admin/src/styles/index.css
@@ -5,7 +5,7 @@
* All directional rules use CSS logical properties because the app also runs RTL (Arabic).
*/
-:root {
+:root[data-external-admin-theme="black-gold"] {
--bg-page: #0d0d11;
--bg-sidebar: #101015;
--bg-header: rgba(14, 14, 19, 0.88);
@@ -88,7 +88,7 @@
/* Bigger touch targets on handsets; 16px inputs also stop iOS Safari focus-zoom. */
@media (max-width: 899px) {
- :root {
+ :root[data-external-admin-theme="black-gold"] {
--control-height: 44px;
--control-font-size: 16px;
--control-line-height: 22px;
@@ -170,6 +170,14 @@ body {
min-width: 140px !important;
}
+.external-change-password-brand {
+ color: var(--primary-strong);
+ font-family: var(--font-display);
+ font-size: 18px;
+ font-weight: 750;
+ letter-spacing: 0.03em;
+}
+
.external-full-state {
min-height: 100dvh;
display: grid;
@@ -216,6 +224,22 @@ body {
letter-spacing: 0.03em;
}
+.external-mobile-brand {
+ max-width: min(48vw, 180px);
+ color: var(--primary-strong);
+ font-family: var(--font-display);
+ font-size: 15px;
+ font-weight: 750;
+ letter-spacing: 0.04em;
+}
+
+.external-mobile-brand img,
+.external-sidebar-brand img,
+.external-change-password-brand img {
+ border-color: var(--primary-border);
+ box-shadow: 0 0 0 1px rgba(214, 181, 110, 0.08), 0 8px 24px rgba(0, 0, 0, 0.38);
+}
+
.external-user-avatar {
width: 34px !important;
height: 34px !important;
@@ -245,8 +269,11 @@ body {
padding: 14px 20px;
}
-.external-logo-name {
- font-family: var(--font-display) !important;
+.external-sidebar-brand {
+ color: var(--primary-strong);
+ font-family: var(--font-display);
+ font-size: 16px;
+ font-weight: 750;
letter-spacing: 0.05em;
}
diff --git a/finance/src/components/FinanceCoinSellerRechargeOrderList.test.jsx b/finance/src/components/FinanceCoinSellerRechargeOrderList.test.jsx
index 5a147a8..2178749 100644
--- a/finance/src/components/FinanceCoinSellerRechargeOrderList.test.jsx
+++ b/finance/src/components/FinanceCoinSellerRechargeOrderList.test.jsx
@@ -1,5 +1,6 @@
import { fireEvent, render, screen, waitFor } from "@testing-library/react";
import { afterEach, expect, test, vi } from "vitest";
+import { COIN_SELLER_RECHARGE_PROVIDER_CURRENCIES } from "../constants.js";
import { FinanceCoinSellerRechargeOrderList } from "./FinanceCoinSellerRechargeOrderList.jsx";
afterEach(() => {
@@ -86,6 +87,15 @@ test("coin seller recharge order create dialog verifies receipt before create",
);
}, 10000);
+test("MiFaPay and V5Pay expose the complete runtime currency list", () => {
+ const runtimeCurrencies = Intl.supportedValuesOf("currency");
+
+ expect(COIN_SELLER_RECHARGE_PROVIDER_CURRENCIES.mifapay).toEqual(expect.arrayContaining(runtimeCurrencies));
+ expect(COIN_SELLER_RECHARGE_PROVIDER_CURRENCIES.v5pay).toEqual(expect.arrayContaining(runtimeCurrencies));
+ expect(COIN_SELLER_RECHARGE_PROVIDER_CURRENCIES.mifapay).toContain("BRL");
+ expect(COIN_SELLER_RECHARGE_PROVIDER_CURRENCIES.v5pay).toContain("BRL");
+});
+
test("makeup order keeps zero coins while creating a normal recharge record", async () => {
const nowMS = new Date(2026, 6, 13, 9, 0, 0, 0).getTime();
vi.spyOn(Date, "now").mockReturnValue(nowMS);
diff --git a/finance/src/constants.js b/finance/src/constants.js
index 440d65b..8632bd1 100644
--- a/finance/src/constants.js
+++ b/finance/src/constants.js
@@ -29,9 +29,37 @@ export const COIN_SELLER_RECHARGE_CHAINS = [
["BSC", "BSC"],
];
+// 三方回单使用 ISO 4217 字母代码，前端不再维护渠道币种白名单；白名单会随渠道扩区而过期，
+// 造成后端能够校验的订单在录单入口不可选。Intl 数据来自浏览器运行时，并保留旧浏览器所需的现有币种兜底。
+const FALLBACK_PROVIDER_CURRENCIES = [
+ "AED",
+ "BDT",
+ "BHD",
+ "BRL",
+ "EGP",
+ "IDR",
+ "INR",
+ "KWD",
+ "MXN",
+ "OMR",
+ "PHP",
+ "PKR",
+ "QAR",
+ "SAR",
+ "TRY",
+ "VND",
+];
+export const COIN_SELLER_RECHARGE_CURRENCIES = [
+ ...new Set(
+ typeof Intl.supportedValuesOf === "function"
+ ? [...Intl.supportedValuesOf("currency"), ...FALLBACK_PROVIDER_CURRENCIES]
+ : FALLBACK_PROVIDER_CURRENCIES,
+ ),
+].sort();
+
export const COIN_SELLER_RECHARGE_PROVIDER_CURRENCIES = {
- mifapay: ["PHP", "INR", "IDR", "VND", "SAR", "AED", "BHD", "QAR", "OMR", "KWD", "BDT", "PKR", "EGP"],
- v5pay: ["PHP", "SAR", "EGP", "AED", "IDR", "INR", "PKR", "TRY", "MXN"],
+ mifapay: COIN_SELLER_RECHARGE_CURRENCIES,
+ v5pay: COIN_SELLER_RECHARGE_CURRENCIES,
};
export const COIN_SELLER_RECHARGE_STATUS = [
diff --git a/package.json b/package.json
index 0236793..97dad83 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,7 @@
"react": "19.2.5",
"react-dom": "19.2.5",
"react-router-dom": "^7.14.2",
- "stylis": "4.4.0",
+ "stylis": "4.2.0",
"svgaplayerweb": "2.3.2",
"zod": "^4.4.1"
},
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3385623..58abe24 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -25,7 +25,7 @@ importers:
version: 9.0.0(@emotion/react@11.14.0(@types/react@19.2.14)(react@19.2.5))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.14)(react@19.2.5))(@types/react@19.2.14)(react@19.2.5))(@types/react@19.2.14)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
'@mui/stylis-plugin-rtl':
specifier: 9.1.1
- version: 9.1.1(stylis@4.4.0)
+ version: 9.1.1(stylis@4.2.0)
'@tanstack/react-query':
specifier: ^5.100.6
version: 5.100.6(react@19.2.5)
@@ -45,8 +45,8 @@ importers:
specifier: ^7.14.2
version: 7.14.2(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
stylis:
- specifier: 4.4.0
- version: 4.4.0
+ specifier: 4.2.0
+ version: 4.2.0
svgaplayerweb:
specifier: 2.3.2
version: 2.3.2
@@ -1876,9 +1876,6 @@ packages:
stylis@4.2.0:
resolution: {integrity: sha512-Orov6g6BB1sDfYgzWfTHDOxamtX1bE/zo104Dh9e6fqJ3PooipYyfJ0pUmrZO2wAvO8YbEyeFrkV91XTsGMSrw==}
- stylis@4.4.0:
- resolution: {integrity: sha512-5Z9ZpRzfuH6l/UAvCPAPUo3665Nk2wLaZU3x+TLHKVzIz33+sbJqbtrYoC3KD4/uVOr2Zp+L0LySezP9OHV9yA==}
-
supports-color@10.2.2:
resolution: {integrity: sha512-SS+jx45GF1QjgEXQx4NJZV9ImqmO2NPz5FNsIHrsDjh2YsHnawpan7SNQ1o8NuhrbHZy9AZhIoCUiCeaW/C80g==}
engines: {node: '>=18'}
@@ -2591,11 +2588,11 @@ snapshots:
'@emotion/react': 11.14.0(@types/react@19.2.14)(react@19.2.5)
'@emotion/styled': 11.14.1(@emotion/react@11.14.0(@types/react@19.2.14)(react@19.2.5))(@types/react@19.2.14)(react@19.2.5)
- '@mui/stylis-plugin-rtl@9.1.1(stylis@4.4.0)':
+ '@mui/stylis-plugin-rtl@9.1.1(stylis@4.2.0)':
dependencies:
'@babel/runtime': 7.29.2
cssjanus: 2.3.1
- stylis: 4.4.0
+ stylis: 4.2.0
'@mui/system@9.0.0(@emotion/react@11.14.0(@types/react@19.2.14)(react@19.2.5))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.14)(react@19.2.5))(@types/react@19.2.14)(react@19.2.5))(@types/react@19.2.14)(react@19.2.5)':
dependencies:
@@ -3844,8 +3841,6 @@ snapshots:
stylis@4.2.0: {}
- stylis@4.4.0: {}
-
supports-color@10.2.2: {}
supports-preserve-symlinks-flag@1.0.0: {}
diff --git a/src/app/permissions.ts b/src/app/permissions.ts
index b7b6ea9..cbe86f8 100644
--- a/src/app/permissions.ts
+++ b/src/app/permissions.ts
@@ -63,6 +63,7 @@ export const PERMISSIONS = {
coinAdjustmentCreate: "coin-adjustment:create",
externalAdminUserView: "external-admin-user:view",
externalAdminUserCreate: "external-admin-user:create",
+ externalAdminUserPermissions: "external-admin-user:permissions",
externalAdminUserStatus: "external-admin-user:status",
externalAdminUserResetPassword: "external-admin-user:reset-password",
reportView: "report:view",
diff --git a/src/features/external-admin-users/api.test.ts b/src/features/external-admin-users/api.test.ts
index bc3e742..da4bad5 100644
--- a/src/features/external-admin-users/api.test.ts
+++ b/src/features/external-admin-users/api.test.ts
@@ -2,10 +2,13 @@ import { afterEach, expect, test, vi } from "vitest";
import { setAccessToken, setSelectedAppCode } from "@/shared/api/request";
import {
createExternalAdminUser,
+ getExternalAdminUserPermissions,
listExternalAdminUsers,
+ listExternalAdminPermissionCatalog,
lookupExternalAdminUserTarget,
resetExternalAdminUserPassword,
updateExternalAdminUserStatus,
+ updateExternalAdminUserPermissions,
} from "./api";
afterEach(() => {
@@ -14,6 +17,56 @@ afterEach(() => {
vi.unstubAllGlobals();
});
+test("loads the backend-driven permission catalog and sends an explicit permission snapshot", async () => {
+ vi.stubGlobal(
+ "fetch",
+ vi.fn()
+ .mockResolvedValueOnce(
+ envelope({
+ items: [
+ {
+ capabilities: ["user:list"],
+ code: "user:list",
+ defaultGranted: true,
+ dependencies: [],
+ group: "用户管理",
+ label: "用户列表",
+ },
+ ],
+ total: 1,
+ }),
+ )
+ .mockResolvedValueOnce(envelope({ accountId: "71", permissions: ["user:list"], revision: 4 }))
+ .mockResolvedValueOnce(envelope({ ...externalUserFixture(), permissions: [] })),
+ );
+
+ const catalog = await listExternalAdminPermissionCatalog("fami");
+ const current = await getExternalAdminUserPermissions("fami", 71);
+ const updated = await updateExternalAdminUserPermissions("fami", 71, [], 4);
+
+ const calls = vi.mocked(fetch).mock.calls;
+ expect(calls.map(([, init]) => init?.method)).toEqual(["GET", "GET", "PUT"]);
+ expect(String(calls[0][0])).toContain("/api/v1/admin/external-admin-users/permission-catalog");
+ expect(String(calls[1][0])).toContain("/api/v1/admin/external-admin-users/71/permissions");
+ expect(String(calls[2][0])).toContain("/api/v1/admin/external-admin-users/71/permissions");
+ expect(requestBody(calls[2][1])).toEqual({ expectedRevision: 4, permissions: [] });
+ expect(catalog).toEqual({
+ items: [
+ {
+ capabilities: ["user:list"],
+ code: "user:list",
+ defaultGranted: true,
+ dependencies: [],
+ group: "用户管理",
+ label: "用户列表",
+ },
+ ],
+ total: 1,
+ });
+ expect(current).toEqual({ accountId: "71", permissions: ["user:list"], revision: 4 });
+ expect(updated.permissions).toEqual([]);
+});
+
test("external admin APIs pin every read and write to the explicit App scope", async () => {
setSelectedAppCode("lalu");
const externalUser = externalUserFixture();
@@ -76,6 +129,7 @@ test("external admin APIs pin every read and write to the explicit App scope", a
userId: "user-1001",
},
permissions: ["user:list", "room:edit"],
+ permissionRevision: 3,
status: "active",
username: "ops.fami",
},
@@ -114,6 +168,7 @@ function externalUserFixture() {
username: "Fami user",
},
permissions: ["user:list", "room:edit"],
+ permission_revision: 3,
status: "active",
updated_at_ms: "1784077200000",
username: "ops.fami",
diff --git a/src/features/external-admin-users/api.ts b/src/features/external-admin-users/api.ts
index e815302..0951492 100644
--- a/src/features/external-admin-users/api.ts
+++ b/src/features/external-admin-users/api.ts
@@ -17,6 +17,7 @@ export interface ExternalAdminUserDto {
lastLoginAtMs?: number;
linkedUser: ExternalAdminLinkedUserDto;
permissions: string[];
+ permissionRevision: number;
status: ExternalAdminUserStatus;
updatedAtMs?: number;
username: string;
@@ -26,8 +27,29 @@ export interface ExternalAdminUserTargetDto extends ExternalAdminLinkedUserDto {
existingExternalAdminUser?: ExternalAdminUserDto;
}
+export interface ExternalAdminPermissionCatalogItemDto {
+ capabilities: string[];
+ code: string;
+ defaultGranted: boolean;
+ dependencies: string[];
+ group: string;
+ label: string;
+}
+
+export interface ExternalAdminPermissionCatalogDto {
+ items: ExternalAdminPermissionCatalogItemDto[];
+ total: number;
+}
+
+export interface ExternalAdminUserPermissionsDto {
+ accountId: string;
+ permissions: string[];
+ revision: number;
+}
+
export interface CreateExternalAdminUserPayload {
password: string;
+ permissions?: string[];
targetUserId: string;
username: string;
}
@@ -58,6 +80,32 @@ export async function lookupExternalAdminUserTarget(
return normalizeTarget(data);
}
+export async function listExternalAdminPermissionCatalog(
+ appCode: string,
+): Promise {
+ const endpoint = API_ENDPOINTS.listExternalAdminPermissionCatalog;
+ const data = await apiRequest(apiEndpointPath(API_OPERATIONS.listExternalAdminPermissionCatalog), {
+ headers: appScopeHeaders(appCode),
+ method: endpoint.method,
+ });
+ return normalizePermissionCatalog(data);
+}
+
+export async function getExternalAdminUserPermissions(
+ appCode: string,
+ id: EntityId,
+): Promise {
+ const endpoint = API_ENDPOINTS.getExternalAdminUserPermissions;
+ const data = await apiRequest(
+ apiEndpointPath(API_OPERATIONS.getExternalAdminUserPermissions, { id }),
+ {
+ headers: appScopeHeaders(appCode),
+ method: endpoint.method,
+ },
+ );
+ return normalizeUserPermissions(data);
+}
+
export async function createExternalAdminUser(
appCode: string,
payload: CreateExternalAdminUserPayload,
@@ -108,6 +156,24 @@ export async function resetExternalAdminUserPassword(
return normalizeExternalAdminUser(data);
}
+export async function updateExternalAdminUserPermissions(
+ appCode: string,
+ id: EntityId,
+ permissions: string[],
+ expectedRevision: number,
+): Promise {
+ const endpoint = API_ENDPOINTS.updateExternalAdminUserPermissions;
+ const data = await apiRequest(
+ apiEndpointPath(API_OPERATIONS.updateExternalAdminUserPermissions, { id }),
+ {
+ body: { expectedRevision, permissions },
+ headers: appScopeHeaders(appCode),
+ method: endpoint.method,
+ },
+ );
+ return normalizeExternalAdminUser(data);
+}
+
function appScopeHeaders(appCode: string) {
// 外管账号是强 App 隔离数据；显式固定请求头，避免切换 App 后全局请求上下文把写操作送到另一租户。
return { "X-App-Code": String(appCode || "").trim().toLowerCase() };
@@ -151,6 +217,7 @@ function normalizeExternalAdminUser(raw: RawRecord): ExternalAdminUserDto {
lastLoginAtMs: optionalNumber(item.lastLoginAtMs ?? item.last_login_at_ms),
linkedUser,
permissions: stringArray(item.permissions),
+ permissionRevision: numberValue(item.permissionRevision ?? item.permission_revision),
status: status === "disabled" ? "disabled" : "active",
updatedAtMs: optionalNumber(item.updatedAtMs ?? item.updated_at_ms),
username: stringValue(item.username ?? item.account ?? item.accountName ?? item.account_name),
@@ -178,6 +245,34 @@ function normalizeTarget(raw: RawRecord): ExternalAdminUserTargetDto {
};
}
+function normalizePermissionCatalog(raw: RawRecord): ExternalAdminPermissionCatalogDto {
+ const item = asRecord(raw) || {};
+ const items = (Array.isArray(item.items) ? item.items : [])
+ .map((entry) => {
+ const permission = asRecord(entry) || {};
+ return {
+ capabilities: stringArray(permission.capabilities),
+ code: stringValue(permission.code),
+ defaultGranted: Boolean(permission.defaultGranted ?? permission.default_granted),
+ dependencies: stringArray(permission.dependencies),
+ group: stringValue(permission.group),
+ label: stringValue(permission.label),
+ };
+ })
+ // 空编码无法用于提交，直接从可选目录剔除，避免 UI 生成不可保存的勾选项。
+ .filter((permission) => permission.code);
+ return { items, total: numberValue(item.total, items.length) };
+}
+
+function normalizeUserPermissions(raw: RawRecord): ExternalAdminUserPermissionsDto {
+ const item = asRecord(raw) || {};
+ return {
+ accountId: stringValue(item.accountId ?? item.account_id),
+ permissions: stringArray(item.permissions),
+ revision: numberValue(item.revision),
+ };
+}
+
function normalizeUser(raw: RawRecord): ExternalAdminLinkedUserDto {
const user = asRecord(raw) || {};
return {
diff --git a/src/features/external-admin-users/components/ExternalAdminPermissionDialogs.test.jsx b/src/features/external-admin-users/components/ExternalAdminPermissionDialogs.test.jsx
new file mode 100644
index 0000000..30c43e1
--- /dev/null
+++ b/src/features/external-admin-users/components/ExternalAdminPermissionDialogs.test.jsx
@@ -0,0 +1,61 @@
+import { cleanup, render, screen } from "@testing-library/react";
+import { afterEach, expect, test, vi } from "vitest";
+import { ExternalAdminPermissionDrawer } from "./ExternalAdminPermissionDrawer.jsx";
+import { ExternalAdminUserFormDialog } from "./ExternalAdminUserFormDialog.jsx";
+
+afterEach(cleanup);
+
+const abilities = { canCreate: true, canManagePermissions: true };
+
+test("disables account creation when a successful permission catalog is empty", () => {
+ render(
+ ,
+ );
+
+ expect(screen.getByRole("button", { name: "创建" })).toBeDisabled();
+});
+
+test("disables permission updates when a successful catalog is empty", () => {
+ render(
+ ,
+ );
+
+ expect(screen.getByRole("button", { name: "保存权限" })).toBeDisabled();
+});
diff --git a/src/features/external-admin-users/components/ExternalAdminPermissionDrawer.jsx b/src/features/external-admin-users/components/ExternalAdminPermissionDrawer.jsx
new file mode 100644
index 0000000..66c354b
--- /dev/null
+++ b/src/features/external-admin-users/components/ExternalAdminPermissionDrawer.jsx
@@ -0,0 +1,60 @@
+import { ExternalAdminPermissionSelector } from "@/features/external-admin-users/components/ExternalAdminPermissionSelector.jsx";
+import styles from "@/features/external-admin-users/external-admin-users.module.css";
+import { Button } from "@/shared/ui/Button.jsx";
+import { SideDrawer } from "@/shared/ui/SideDrawer.jsx";
+
+export function ExternalAdminPermissionDrawer({
+ abilities,
+ catalog,
+ catalogError,
+ catalogLoading,
+ error,
+ loading,
+ onChange,
+ onClose,
+ onReloadCatalog,
+ onRetry,
+ onSubmit,
+ permissions,
+ permissionsLoading,
+ user,
+}) {
+ const open = Boolean(user);
+ const unavailable = Boolean(
+ !catalog.length || catalogError || error || catalogLoading || permissionsLoading || loading,
+ );
+
+ return (
+
+
+
+
+ }
+ contentClassName={styles.permissionDrawerBody}
+ open={open}
+ title={`配置权限${user?.username ? ` · ${user.username}` : ""}`}
+ width="detail"
+ onClose={onClose}
+ >
+
+
+ );
+}
diff --git a/src/features/external-admin-users/components/ExternalAdminPermissionSelector.jsx b/src/features/external-admin-users/components/ExternalAdminPermissionSelector.jsx
new file mode 100644
index 0000000..ff822d1
--- /dev/null
+++ b/src/features/external-admin-users/components/ExternalAdminPermissionSelector.jsx
@@ -0,0 +1,144 @@
+import Checkbox from "@mui/material/Checkbox";
+import CircularProgress from "@mui/material/CircularProgress";
+import { useMemo } from "react";
+import { Button } from "@/shared/ui/Button.jsx";
+import styles from "@/features/external-admin-users/external-admin-users.module.css";
+import {
+ updatePermissionGroup,
+ updatePermissionSelection,
+} from "@/features/external-admin-users/permissionSelection.js";
+
+export { updatePermissionSelection } from "@/features/external-admin-users/permissionSelection.js";
+
+export function ExternalAdminPermissionSelector({
+ catalog = [],
+ disabled = false,
+ error = "",
+ loading = false,
+ onChange,
+ onRetry,
+ value = [],
+}) {
+ const groups = useMemo(() => groupCatalog(catalog), [catalog]);
+ const knownCodes = useMemo(() => catalog.map((permission) => permission.code), [catalog]);
+ const selected = useMemo(() => new Set(value), [value]);
+ const selectedCount = knownCodes.filter((code) => selected.has(code)).length;
+
+ if (loading) {
+ return (
+
+
+ 加载权限目录
+
+ );
+ }
+
+ if (error) {
+ return (
+
+ {error}
+ {onRetry ? : null}
+
+ );
+ }
+
+ return (
+
+
+
+ 已选 {selectedCount} / {knownCodes.length} 项
+
+
+
+
+
+
+
+ {groups.length ? (
+
+ {groups.map((group) => {
+ const groupCodes = group.items.map((permission) => permission.code);
+ const groupSelectedCount = groupCodes.filter((code) => selected.has(code)).length;
+ return (
+
+
+ {group.name}
+
+
+
+ {group.items.map((permission) => {
+ return (
+
+ );
+ })}
+
+
+ );
+ })}
+
+ ) : (
+
当前无可配置权限
+ )}
+
+ {!configValid ?
请先在高级配置中修正 JSON 格式
: null}
+
+ {(definition.fields || []).length > 0 ? (
+
+ ) : null}
+ {definition.catalog ? (
+
+ ) : null}
+ {(definition.advancedFields || []).length > 0 ? (
+
+ 可选厂商参数
+
+
+ ) : null}
+
+ 高级配置 · 完整 JSON
+
+
+
+
+
+ {fields.map((field) => (
+
onChange(updateAdapterConfigField(value, field, inputValue))}
+ />
+ ))}
+
+
游戏目录 · {rows.length}
+
+
+ {rows.map((row, index) => {
+ const duplicate =
+ row.providerGameId.trim() !== "" &&
+ rows.some(
+ (candidate, candidateIndex) =>
+ candidateIndex !== index &&
+ candidate.providerGameId.trim() === row.providerGameId.trim(),
+ );
+ return (
+
+
+
+ changeRow(row.rowKey, { providerGameId: event.target.value })
+ }
+ />
+ changeRow(row.rowKey, { gameName: event.target.value })}
+ />
+ changeRow(row.rowKey, { gameUrl: event.target.value })}
+ />
+
+
+
+ 素材与游戏参数
+
+ changeRow(row.rowKey, { iconUrl: event.target.value })}
+ />
+
+ changeRow(row.rowKey, { coverUrl: event.target.value })
+ }
+ />
+ {adapterType === "yomi_v4" ? (
+
+ changeRow(row.rowKey, { gameLevelUid: event.target.value })
+ }
+ />
+ ) : null}
+
+
+
+ );
+ })}
+
当前无游戏目录
+ )}
+
+ );
+}
+
+function withRowKeys(rows, prefix) {
+ return rows.map((row, index) => ({ ...row, rowKey: `${prefix}-${index}` }));
+}
+
+function catalogSignature(rows) {
+ return JSON.stringify(
+ (rows || []).map(({ providerGameId, gameName, gameUrl, iconUrl, coverUrl, gameLevelUid }) => ({
+ providerGameId,
+ gameName,
+ gameUrl,
+ iconUrl,
+ coverUrl,
+ gameLevelUid,
+ })),
+ );
+}
diff --git a/src/features/games/components/AdapterConfigFields.module.css b/src/features/games/components/AdapterConfigFields.module.css
new file mode 100644
index 0000000..5723611
--- /dev/null
+++ b/src/features/games/components/AdapterConfigFields.module.css
@@ -0,0 +1,162 @@
+.root {
+ display: grid;
+ min-width: 0;
+ gap: var(--space-4);
+}
+
+.group,
+.catalog {
+ display: grid;
+ min-width: 0;
+ gap: var(--space-3);
+}
+
+.groupTitle {
+ color: var(--text-secondary);
+ font-size: 12px;
+ font-weight: 760;
+ line-height: 18px;
+}
+
+.fieldGrid {
+ display: grid;
+ min-width: 0;
+ grid-template-columns: repeat(3, minmax(0, 1fr));
+ gap: var(--space-3);
+}
+
+.fieldGrid > :global(.MuiTextField-root),
+.fieldGrid > :global(.MuiFormControl-root) {
+ width: 100%;
+}
+
+.wideField {
+ grid-column: span 2;
+}
+
+.invalid {
+ padding: 9px 12px;
+ border: 1px solid color-mix(in srgb, var(--danger) 30%, transparent);
+ border-radius: var(--radius-sm);
+ background: color-mix(in srgb, var(--danger) 7%, transparent);
+ color: var(--danger);
+ font-size: 12px;
+ font-weight: 650;
+}
+
+.catalogHeader {
+ display: flex;
+ min-height: 32px;
+ align-items: center;
+ justify-content: space-between;
+ gap: var(--space-3);
+}
+
+.catalogRows {
+ display: grid;
+ gap: var(--space-2);
+}
+
+.catalogRow {
+ display: grid;
+ min-width: 0;
+ gap: var(--space-2);
+ padding: var(--space-3);
+ border: 1px solid var(--border-soft);
+ border-radius: var(--radius-sm);
+ background: var(--bg-card-strong);
+}
+
+.catalogMain {
+ display: grid;
+ min-width: 0;
+ grid-template-columns: minmax(130px, 0.55fr) minmax(150px, 0.7fr) minmax(260px, 1.5fr) auto;
+ align-items: start;
+ gap: var(--space-2);
+}
+
+.catalogMain > :global(.MuiTextField-root) {
+ width: 100%;
+}
+
+.rowDetails,
+.details {
+ min-width: 0;
+ overflow: hidden;
+ border: 1px solid var(--border-soft);
+ border-radius: var(--radius-sm);
+ background: var(--bg-card-strong);
+}
+
+.rowDetails {
+ border: 0;
+ background: transparent;
+}
+
+.rowDetails > summary,
+.details > summary {
+ padding: 9px 11px;
+ color: var(--text-tertiary);
+ cursor: pointer;
+ font-size: 12px;
+ font-weight: 700;
+ user-select: none;
+}
+
+.rowDetails > summary {
+ padding: 2px 0;
+}
+
+.details[open] > summary {
+ border-bottom: 1px solid var(--border-soft);
+}
+
+.rowExtra {
+ display: grid;
+ min-width: 0;
+ grid-template-columns: repeat(3, minmax(0, 1fr));
+ gap: var(--space-2);
+ padding-top: var(--space-2);
+}
+
+.advancedEditor,
+.details > .fieldGrid {
+ padding: var(--space-3);
+}
+
+.empty {
+ display: grid;
+ min-height: 48px;
+ place-items: center;
+ border: 1px dashed var(--border);
+ border-radius: var(--radius-sm);
+ color: var(--text-tertiary);
+ font-size: 12px;
+}
+
+@media (max-width: 900px) {
+ .fieldGrid,
+ .rowExtra {
+ grid-template-columns: repeat(2, minmax(0, 1fr));
+ }
+
+ .catalogMain {
+ grid-template-columns: minmax(120px, 0.6fr) minmax(150px, 0.8fr) minmax(220px, 1.4fr) auto;
+ }
+}
+
+@media (max-width: 720px) {
+ .fieldGrid,
+ .rowExtra,
+ .catalogMain {
+ grid-template-columns: 1fr;
+ }
+
+ .wideField {
+ grid-column: auto;
+ }
+
+ .catalogMain > :global(button) {
+ justify-self: end;
+ }
+}
diff --git a/src/features/games/components/PlatformFormDialog.jsx b/src/features/games/components/PlatformFormDialog.jsx
new file mode 100644
index 0000000..f7f42a9
--- /dev/null
+++ b/src/features/games/components/PlatformFormDialog.jsx
@@ -0,0 +1,210 @@
+import MenuItem from "@mui/material/MenuItem";
+import TextField from "@mui/material/TextField";
+import { AdapterConfigFields } from "@/features/games/components/AdapterConfigFields.jsx";
+import {
+ adapterDefinition,
+ adapterSecretState,
+ adapterTypeOptions,
+ migrateAdapterConfigJson,
+ readAdapterConfig,
+} from "@/features/games/adapterConfigModel.js";
+import {
+ AdminFormDialog,
+ AdminFormFieldGrid,
+ AdminFormSection,
+ AdminFormSwitchField,
+} from "@/shared/ui/AdminFormDialog.jsx";
+import styles from "@/features/games/components/PlatformFormDialog.module.css";
+
+export function PlatformFormDialog({ form, loading, mode, open, page, onClose, onSubmit }) {
+ const definition = adapterDefinition(form.adapterType);
+ const configValid = Boolean(readAdapterConfig(form.adapterConfigJson));
+ const disabled = !page.abilities.canUpdate;
+ const fixedAdapterType = adapterTypeOptions.find(
+ ([value]) => adapterDefinition(value).fixedPlatformCode === form.platformCode.trim(),
+ )?.[0];
+ const { configuredSecretUsable, required: secretRequired } = adapterSecretState(form, mode === "edit");
+
+ const changeAdapter = (adapterType) => {
+ const previousDefinition = adapterDefinition(form.adapterType);
+ const nextDefinition = adapterDefinition(adapterType);
+ const adapterDrafts = {
+ ...(form.adapterDrafts || {}),
+ [form.adapterType]: {
+ adapterConfigJson: form.adapterConfigJson,
+ apiBaseUrl: form.apiBaseUrl,
+ callbackIpWhitelistText: form.callbackIpWhitelistText,
+ },
+ };
+ const savedDraft = adapterDrafts[adapterType];
+ const next = {
+ ...form,
+ adapterType,
+ adapterDrafts,
+ // 不允许把上一厂商刚输入的签名密钥带进新协议；编辑迁移时下方会强制重新录入。
+ callbackSecret: "",
+ // 每个厂商保留独立草稿，切回时恢复；首次切入才从公共字段和游戏目录生成兼容配置。
+ adapterConfigJson:
+ savedDraft?.adapterConfigJson ??
+ migrateAdapterConfigJson(form.adapterConfigJson, form.adapterType, adapterType),
+ apiBaseUrl: savedDraft?.apiBaseUrl ?? "",
+ callbackIpWhitelistText: savedDraft?.callbackIpWhitelistText ?? "",
+ };
+ if (mode === "create" && nextDefinition.fixedPlatformCode) {
+ const canReplaceName =
+ !form.platformName.trim() || form.platformName.trim() === previousDefinition.fixedPlatformName;
+ // ZGame/AMG 的回调按固定 platformCode 查启动会话；这里必须锁定，不能让可保存但无法结算的配置进入库。
+ next.platformCode = nextDefinition.fixedPlatformCode;
+ if (canReplaceName) {
+ next.platformName = nextDefinition.fixedPlatformName;
+ }
+ } else if (
+ mode === "create" &&
+ previousDefinition.fixedPlatformCode &&
+ form.platformCode.trim() === previousDefinition.fixedPlatformCode
+ ) {
+ next.platformCode = "";
+ if (form.platformName.trim() === previousDefinition.fixedPlatformName) {
+ next.platformName = "";
+ }
+ }
+ page.setPlatformForm(next);
+ };
+
+ return (
+
+
+
+ page.setPlatformForm({ ...form, platformCode: event.target.value })}
+ />
+ page.setPlatformForm({ ...form, platformName: event.target.value })}
+ />
+
+ page.setPlatformForm({
+ ...form,
+ status: checked ? "active" : form.status === "disabled" ? "disabled" : "maintenance",
+ })
+ }
+ />
+ page.setPlatformForm({ ...form, sortOrder: event.target.value })}
+ />
+
+
+
+
+ changeAdapter(event.target.value)}
+ >
+ {adapterTypeOptions.map(([value, label]) => {
+ const optionDefinition = adapterDefinition(value);
+ const fixedCodeMismatch =
+ mode === "edit" &&
+ optionDefinition.fixedPlatformCode &&
+ optionDefinition.fixedPlatformCode !== form.platformCode.trim();
+ return (
+
+ );
+ })}
+
+ {definition.apiUrl !== false ? (
+ page.setPlatformForm({ ...form, apiBaseUrl: event.target.value })}
+ />
+ ) : null}
+ page.setPlatformForm({ ...form, callbackSecret })}
+ />
+ {definition.ipWhitelist ? (
+
+ page.setPlatformForm({ ...form, callbackIpWhitelistText: event.target.value })
+ }
+ />
+ ) : null}
+
+
+
+ page.setPlatformForm({ ...form, adapterConfigJson })}
+ />
+
+
+ );
+}
+
+function SecretField({ configured, disabled, label, placeholder, required, value, onChange }) {
+ const whitespaceOnly = required && Boolean(value) && !value.trim();
+ return (
+ onChange(event.target.value)}
+ />
+ );
+}
diff --git a/src/features/games/components/PlatformFormDialog.module.css b/src/features/games/components/PlatformFormDialog.module.css
new file mode 100644
index 0000000..a04bfab
--- /dev/null
+++ b/src/features/games/components/PlatformFormDialog.module.css
@@ -0,0 +1,3 @@
+.ipWhitelist {
+ grid-column: 1 / -1;
+}
diff --git a/src/features/games/games.module.css b/src/features/games/games.module.css
index ebeb116..ff2b739 100644
--- a/src/features/games/games.module.css
+++ b/src/features/games/games.module.css
@@ -50,12 +50,6 @@
white-space: nowrap;
}
-.secretMeta {
- font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", monospace;
- overflow-wrap: anywhere;
- white-space: normal;
-}
-
.switchOnlyField {
display: inline-flex;
min-height: 56px;
diff --git a/src/features/games/hooks/useGamesPage.js b/src/features/games/hooks/useGamesPage.js
index a4419aa..728216f 100644
--- a/src/features/games/hooks/useGamesPage.js
+++ b/src/features/games/hooks/useGamesPage.js
@@ -15,8 +15,13 @@ import {
import { useGameAbilities } from "@/features/games/permissions.js";
import { useAdminQuery } from "@/shared/hooks/useAdminQuery.js";
import { useConfirm } from "@/shared/ui/ConfirmProvider.jsx";
-import { normalizeJsonObjectString } from "@/shared/ui/JsonEditorField.jsx";
import { useToast } from "@/shared/ui/ToastProvider.jsx";
+import {
+ adapterDefinition,
+ normalizeAdapterCallbackSecret,
+ normalizeAdapterConfigJson,
+ writableBridgeAdapterTypes,
+} from "@/features/games/adapterConfigModel.js";
const defaultGameForm = {
gameId: "",
@@ -43,12 +48,14 @@ const defaultPlatformForm = {
apiBaseUrl: "",
// 新建平台必须选择真实厂商协议，避免把线上配置误落成 demo。
adapterType: "yomi_v4",
- // 后台现在会回显厂商 key，编辑弹窗直接显示当前值；提交空值仍代表“不覆盖旧值”。
+ initialAdapterType: "yomi_v4",
+ // 已保存密钥只回显“已配置”，不会重新进入表单状态；提交空值仍代表“不覆盖旧值”。
callbackSecret: "",
callbackSecretSet: false,
callbackIpWhitelistText: "",
// 厂商扩展配置以 JSON 透传，服务端按 adapter_type 自己解析需要的字段。
adapterConfigJson: "{}",
+ adapterDrafts: {},
sortOrder: 0,
};
@@ -57,17 +64,6 @@ const defaultBridgeScriptForm = {
bridgeScriptVersion: "",
};
-const writableBridgeAdapterTypes = new Set([
- "yomi_v4",
- "leadercc_v1",
- "zeeone_v1",
- "baishun_v1",
- "vivagames_v1",
- "reyou_v1",
- "zgame_v1",
- "amg_v1",
-]);
-
const emptyCatalog = { items: [], pageSize: 50 };
const emptyPlatforms = { items: [] };
const defaultPageSize = 50;
@@ -302,7 +298,7 @@ export function useGamesPage() {
event.preventDefault();
let payload;
try {
- payload = platformPayload(platformForm);
+ payload = platformPayload(platformForm, Boolean(editingPlatformCode));
} catch (err) {
showToast(err.message || "适配器配置 JSON 不正确", "error");
return;
@@ -784,11 +780,13 @@ function platformToForm(platform) {
status: platform.status || "active",
apiBaseUrl: platform.apiBaseUrl || "",
adapterType: platform.adapterType || "yomi_v4",
- // 使用后端返回的当前密钥，方便运营直接核对；用户清空提交时后端会保留旧值。
+ initialAdapterType: platform.adapterType || "yomi_v4",
+ // 运营要求密钥明文可核对；后端有返回时直接进入编辑框，没有返回时仍保留“已配置”状态语义。
callbackSecret: platform.callbackSecret || "",
callbackSecretSet: Boolean(platform.callbackSecretSet),
callbackIpWhitelistText: (platform.callbackIpWhitelist || []).join("\n"),
adapterConfigJson: platform.adapterConfigJson || "{}",
+ adapterDrafts: {},
sortOrder: Number(platform.sortOrder || 0),
};
}
@@ -823,24 +821,29 @@ function normalizeLaunchMode(value) {
return "full_screen";
}
-function platformPayload(form) {
- const isLeaderCC = form.adapterType.trim() === "leadercc_v1";
+function platformPayload(form, editing) {
+ const adapterType = form.adapterType.trim() || "yomi_v4";
+ const definition = adapterDefinition(adapterType);
+ const status = form.status.trim() || "active";
+ const callbackSecret = normalizeAdapterCallbackSecret(form, editing);
+ // required 属性只能拦截空字符串，纯空格提交后会被 trim 成空并触发后端“保留旧密钥”；提交层必须再次校验。
return {
platformCode: form.platformCode.trim(),
platformName: form.platformName.trim(),
- status: form.status.trim() || "active",
- apiBaseUrl: isLeaderCC ? "" : form.apiBaseUrl.trim(),
- adapterType: form.adapterType.trim() || "yomi_v4",
+ status,
+ apiBaseUrl: definition.apiUrl === false ? "" : form.apiBaseUrl.trim(),
+ adapterType,
// 空密钥提交给后端后会保留旧值；非空才覆盖，用于安全轮换 key/AppSecret。
- callbackSecret: form.callbackSecret.trim(),
+ callbackSecret,
// 支持换行或逗号分隔，方便直接粘贴厂商给的多 IP 白名单。
- callbackIpWhitelist: isLeaderCC
- ? []
- : form.callbackIpWhitelistText
+ callbackIpWhitelist: definition.ipWhitelist
+ ? form.callbackIpWhitelistText
.split(/[\n,]/)
.map((item) => item.trim())
- .filter(Boolean),
- adapterConfigJson: normalizeJsonObjectString(form.adapterConfigJson),
+ .filter(Boolean)
+ : [],
+ // 可视字段只 patch 当前 key；提交时再统一类型与历史别名，未知字段、游戏目录和桥接配置原样保留。
+ adapterConfigJson: normalizeAdapterConfigJson(form.adapterConfigJson, adapterType),
sortOrder: Number(form.sortOrder || 0),
};
}
diff --git a/src/features/games/pages/GameListPage.jsx b/src/features/games/pages/GameListPage.jsx
index 68699e1..a6328a6 100644
--- a/src/features/games/pages/GameListPage.jsx
+++ b/src/features/games/pages/GameListPage.jsx
@@ -14,7 +14,6 @@ import { AdminFormDialog, AdminFormFieldGrid, AdminFormSection } from "@/shared/
import { Button } from "@/shared/ui/Button.jsx";
import { DataState } from "@/shared/ui/DataState.jsx";
import { DataTable } from "@/shared/ui/DataTable.jsx";
-import { JsonEditorField } from "@/shared/ui/JsonEditorField.jsx";
import {
AdminActionIconButton,
AdminListBody,
@@ -27,6 +26,7 @@ import { UploadField } from "@/shared/ui/UploadField.jsx";
import { formatMillis } from "@/shared/utils/time.js";
import { useGamesPage } from "@/features/games/hooks/useGamesPage.js";
import { GameWhitelistDialog } from "@/features/games/components/GameWhitelistDialog.jsx";
+import { PlatformFormDialog } from "@/features/games/components/PlatformFormDialog.jsx";
import styles from "@/features/games/games.module.css";
const statusOptions = [
@@ -45,18 +45,6 @@ const launchModeOptions = [
["half_screen", "半屏"],
["three_quarter_screen", "3/4屏"],
];
-// 这里的值必须和 game-service 的 adapter_type 白名单一致；新增厂商先后端登记，再放到后台可选项。
-const adapterTypeOptions = [
- ["yomi_v4", "小游 Yomi V4"],
- ["leadercc_v1", "灵仙 LeaderCC V1"],
- ["zeeone_v1", "ZeeOne V1"],
- ["baishun_v1", "百顺 BAISHUN V1"],
- ["vivagames_v1", "VIVAGAMES V1"],
- ["reyou_v1", "热游 Reyou V1"],
- ["zgame_v1", "ZGame V1"],
- ["amg_v1", "AMG V1"],
-];
-
const baseColumns = [
{
key: "game",
@@ -487,108 +475,6 @@ function BridgeScriptDialog({ form, loading, open, page, onClose, onSubmit }) {
);
}
-function PlatformFormDialog({ form, loading, mode, open, page, onClose, onSubmit }) {
- const isLeaderCC = form.adapterType === "leadercc_v1";
- return (
-
-
-
- page.setPlatformForm({ ...form, platformCode: event.target.value })}
- />
- page.setPlatformForm({ ...form, platformName: event.target.value })}
- />
-
- page.setPlatformForm({
- ...form,
- status: checked ? "active" : form.status === "disabled" ? "disabled" : "maintenance",
- })
- }
- />
- page.setPlatformForm({ ...form, sortOrder: event.target.value })}
- />
-
-
-
-
- {/* 适配器决定服务端启动参数、签名/解密和错误码映射。 */}
- page.setPlatformForm({ ...form, adapterType: event.target.value })}
- >
- {adapterTypeOptions.map(([value, label]) => (
-
- ))}
-
- {!isLeaderCC ? (
- page.setPlatformForm({ ...form, apiBaseUrl: event.target.value })}
- />
- ) : null}
- {/* 后台直接回显当前厂商 key；清空保存时后端保持旧密钥，输入新值才轮换。 */}
- page.setPlatformForm({ ...form, callbackSecret: event.target.value })}
- />
- {!isLeaderCC ? (
-
- page.setPlatformForm({ ...form, callbackIpWhitelistText: event.target.value })
- }
- />
- ) : null}
- {/* 厂商差异字段放 JSON：如 uid_mode、default_lang、token_ttl_seconds、game_level_uid。 */}
- page.setPlatformForm({ ...form, adapterConfigJson })}
- />
-
-
-
- );
-}
-
function PlatformManageDialog({ open, page, onClose }) {
const platforms = page.platformData.items || [];
return (
@@ -613,9 +499,6 @@ function PlatformManageDialog({ open, page, onClose }) {
{platform.platformCode} / {platform.adapterType || "未配置"}
{platform.apiBaseUrl ? {platform.apiBaseUrl} : null}
-
- 密钥：{platform.callbackSecret || "未配置"}
-