- 留存按注册日 cohort 计算；观察期未到的日期显示 "--"。hyapp App 的按日留存暂不提供（仅整段区间口径）。
+ 留存按观察日回看计算：某日的 N 日留存 = 该日往前推 N 天注册的用户中当日仍活跃的比例；区间合计 =
+ 各观察日留存人数之和 / 各观察日 cohort 基数之和。cohort 日无注册或数据未接入时显示 "--"。
);
diff --git a/databi/src/social/views/data-table-view.css b/databi/src/social/views/data-table-view.css
index f09f808..110427d 100644
--- a/databi/src/social/views/data-table-view.css
+++ b/databi/src/social/views/data-table-view.css
@@ -117,6 +117,11 @@
z-index: 4;
}
+/* 日维度按 App（或 App+区域）分块展示时的块间分隔线，比常规行线更醒目一档。 */
+.sbi-dt-table tr.sbi-dt-group-start td {
+ border-top: 2px solid var(--sbi-border);
+}
+
/* 截断提示（表尾整行）。 */
.sbi-dt-note td {
padding: 10px 12px;
diff --git a/src/App.test.jsx b/src/App.test.jsx
index 75c51cb..fb2d4fa 100644
--- a/src/App.test.jsx
+++ b/src/App.test.jsx
@@ -30,6 +30,33 @@ test("redirects protected route to login when unauthenticated", async () => {
expect(await screen.findByText("HYApp 管理平台")).toBeInTheDocument();
});
+test("redirects a zero-App user to the common workspace", async () => {
+ setAccessToken("test-token");
+ vi.mocked(fetch).mockImplementation(async (input) => {
+ const url = String(input);
+ if (url.includes("/v1/auth/refresh") || url.includes("/v1/auth/me")) {
+ return jsonResponse({
+ accessToken: "test-token",
+ permissions: ["overview:view", "finance:view", "resource:view"],
+ user: { id: 7, username: "finance" },
+ });
+ }
+ if (url.includes("/v1/admin/apps/visible")) {
+ return jsonResponse({ items: [], mode: "none", total: 0 });
+ }
+ if (url.includes("/v1/admin/navigation/menus")) {
+ return jsonResponse([]);
+ }
+ return jsonResponse(null);
+ });
+
+ renderWithRoute("/resources");
+
+ expect(await screen.findByRole("link", { name: /财务工作台/ })).toBeInTheDocument();
+ expect(screen.getByText("通用")).toBeInTheDocument();
+ expect(screen.queryByText("资源列表")).not.toBeInTheDocument();
+});
+
test("renders resource list route with an authenticated session", async () => {
setAccessToken("test-token");
vi.mocked(fetch).mockImplementation(async (input) => {
diff --git a/src/app/App.jsx b/src/app/App.jsx
index fd8ddc4..d53fd13 100644
--- a/src/app/App.jsx
+++ b/src/app/App.jsx
@@ -1,7 +1,7 @@
import { Navigate, Route, Routes } from "react-router-dom";
import { AdminLayout } from "@/app/layout/AdminLayout.jsx";
import { DeferredPage } from "@/app/router/DeferredPage.jsx";
-import { RequireAuth, RequirePermission } from "@/app/router/guards.jsx";
+import { RequireAppScope, RequireAuth, RequirePermission } from "@/app/router/guards.jsx";
import { adminRoutes, defaultAdminPath, publicRoutes } from "@/app/router/routeConfig";
import { AppUserDetailProvider } from "@/features/app-users/components/AppUserDetailProvider.jsx";
@@ -21,7 +21,13 @@ function App() {
path={route.path}
element={
-
+
}
+ onClick={() => page.openRuleBatchEdit(track)}
+ >
+ 批量编辑
+
+ }
+ countLabel={`${rules.length} 条`}
+ title="每级升级数值"
+ />
-
+
}
+ onClick={() => page.openTierBatchEdit(track)}
+ >
+ 批量编辑
+
+ }
+ countLabel={`${tiers.length} 个`}
+ title="等级层展示与礼物"
+ />
{title}
{countLabel}
+ {actions ? {actions}
: null}
);
}
@@ -753,40 +786,6 @@ function changeField(setter, key) {
};
}
-function withSelectedResource(resources, value) {
- const selectedId = Number(value || 0);
- if (!selectedId || resources.some((resource) => Number(resource.resourceId) === selectedId)) {
- return resources;
- }
- return [{ resourceId: selectedId, name: `资源 #${selectedId}` }, ...resources];
-}
-
-function levelBadgeResourcesForTrack(resources, track) {
- return (resources || []).filter((resource) => {
- const badgeForm = resource.badgeForm || badgeFormFromMetadata(resource.metadataJson);
- const badgeKind = resource.badgeKind || badgeKindFromMetadata(resource.metadataJson);
- const levelTrack = resource.levelTrack || levelTrackFromMetadata(resource.metadataJson);
- return badgeForm === "strip" && badgeKind === "level" && levelTrack === track;
- });
-}
-
-function levelShortBadgeResourcesForTrack(resources, track) {
- return (resources || []).filter((resource) => {
- const badgeForm = resource.badgeForm || badgeFormFromMetadata(resource.metadataJson);
- const badgeKind = resource.badgeKind || badgeKindFromMetadata(resource.metadataJson);
- const levelTrack = resource.levelTrack || levelTrackFromMetadata(resource.metadataJson);
- return badgeForm === "tile" && badgeKind === "level" && levelTrack === track;
- });
-}
-
-function levelAvatarFrameResourcesForTrack(resources, track) {
- return (resources || []).filter((resource) => {
- const avatarFrameKind = resource.avatarFrameKind || avatarFrameKindFromMetadata(resource.metadataJson);
- const levelTrack = resource.levelTrack || levelTrackFromMetadata(resource.metadataJson);
- return resource.resourceType === "avatar_frame" && avatarFrameKind === "level" && levelTrack === track;
- });
-}
-
function resourceMetaLabel(resource, id) {
if (resource.resourceType === "avatar_frame") {
const avatarFrameKind = resource.avatarFrameKind || avatarFrameKindFromMetadata(resource.metadataJson);
@@ -838,7 +837,11 @@ function badgeKindFromMetadata(metadataJson) {
}
try {
const metadata = JSON.parse(metadataJson);
- return String(metadata?.badge_kind || "").trim().toLowerCase() === "level" ? "level" : "normal";
+ return String(metadata?.badge_kind || "")
+ .trim()
+ .toLowerCase() === "level"
+ ? "level"
+ : "normal";
} catch {
return "";
}
diff --git a/src/features/level-config/resourceFilters.js b/src/features/level-config/resourceFilters.js
new file mode 100644
index 0000000..887173e
--- /dev/null
+++ b/src/features/level-config/resourceFilters.js
@@ -0,0 +1,62 @@
+export function withSelectedResource(resources, value) {
+ const selectedId = Number(value || 0);
+ if (!selectedId || resources.some((resource) => Number(resource.resourceId) === selectedId)) {
+ return resources;
+ }
+ return [{ resourceId: selectedId, name: `资源 #${selectedId}` }, ...resources];
+}
+
+export function levelBadgeResourcesForTrack(resources, track) {
+ return (resources || []).filter((resource) => {
+ const metadata = resourceMetadata(resource);
+ return (
+ (resource.badgeForm || metadata.badgeForm) === "strip" &&
+ (resource.badgeKind || metadata.badgeKind) === "level" &&
+ (resource.levelTrack || metadata.levelTrack) === track
+ );
+ });
+}
+
+export function levelShortBadgeResourcesForTrack(resources, track) {
+ return (resources || []).filter((resource) => {
+ const metadata = resourceMetadata(resource);
+ return (
+ (resource.badgeForm || metadata.badgeForm) === "tile" &&
+ (resource.badgeKind || metadata.badgeKind) === "level" &&
+ (resource.levelTrack || metadata.levelTrack) === track
+ );
+ });
+}
+
+export function levelAvatarFrameResourcesForTrack(resources, track) {
+ return (resources || []).filter((resource) => {
+ const metadata = resourceMetadata(resource);
+ return (
+ resource.resourceType === "avatar_frame" &&
+ (resource.avatarFrameKind || metadata.avatarFrameKind) === "level" &&
+ (resource.levelTrack || metadata.levelTrack) === track
+ );
+ });
+}
+
+function resourceMetadata(resource) {
+ try {
+ const metadata = JSON.parse(resource?.metadataJson || "{}");
+ return {
+ avatarFrameKind: String(metadata.avatar_frame_kind || "")
+ .trim()
+ .toLowerCase(),
+ badgeForm: String(metadata.badge_form || "")
+ .trim()
+ .toLowerCase(),
+ badgeKind: String(metadata.badge_kind || "")
+ .trim()
+ .toLowerCase(),
+ levelTrack: String(metadata.level_track || "")
+ .trim()
+ .toLowerCase(),
+ };
+ } catch {
+ return {};
+ }
+}
diff --git a/src/features/resources/pages/ResourceListPage.jsx b/src/features/resources/pages/ResourceListPage.jsx
index f535bfe..16d3e0f 100644
--- a/src/features/resources/pages/ResourceListPage.jsx
+++ b/src/features/resources/pages/ResourceListPage.jsx
@@ -1232,6 +1232,7 @@ function ResourceFormDialog({ disabled, form, loading, mode, onClose, onSubmit,
disabled={disabled || uploadDisabled}
kind="file"
label="资源封面"
+ showSourceActions
value={form.previewUrl}
onChange={(previewUrl) => setForm((previous) => ({ ...previous, previewUrl }))}
/>
@@ -1239,6 +1240,7 @@ function ResourceFormDialog({ disabled, form, loading, mode, onClose, onSubmit,
disabled={disabled || uploadDisabled}
kind="file"
label="动效素材"
+ showSourceActions
value={form.animationUrl}
onChange={(animationUrl) => setForm((previous) => ({ ...previous, animationUrl }))}
onFileSelected={handleAnimationSelected}
diff --git a/src/features/users/api.test.ts b/src/features/users/api.test.ts
index 13c98fc..4594b13 100644
--- a/src/features/users/api.test.ts
+++ b/src/features/users/api.test.ts
@@ -1,6 +1,6 @@
import { afterEach, expect, test, vi } from "vitest";
import { setAccessToken } from "@/shared/api/request";
-import { getFinanceScopeCatalog, listUserFinanceScopes, listUsers, replaceUserFinanceScopes, updateUserStatus } from "./api";
+import { getFinanceScopeCatalog, getUserAppScopes, listFinanceScopeAssignments, listUserFinanceScopes, listUsers, replaceUserAppScopes, replaceUserFinanceScopes, updateUserStatus } from "./api";
afterEach(() => {
setAccessToken("");
@@ -48,6 +48,7 @@ test("finance scope APIs use generated endpoint paths", async () => {
await listUserFinanceScopes(9);
await replaceUserFinanceScopes(9, [{ appCode: "lalu", regionId: 2 }]);
await getFinanceScopeCatalog();
+ await listFinanceScopeAssignments();
const calls = vi.mocked(fetch).mock.calls;
expect(String(calls[0][0])).toContain("/api/v1/users/9/finance-scopes");
@@ -57,4 +58,23 @@ test("finance scope APIs use generated endpoint paths", async () => {
expect(JSON.parse(String(calls[1][1]?.body))).toEqual({ scopes: [{ appCode: "lalu", regionId: 2 }] });
expect(String(calls[2][0])).toContain("/api/v1/admin/finance/scope");
expect(calls[2][1]?.method).toBe("GET");
+ expect(String(calls[3][0])).toContain("/api/v1/users/finance-scope-assignments");
+ expect(calls[3][1]?.method).toBe("GET");
+});
+
+test("app scope APIs use generated endpoint paths and explicit mode", async () => {
+ vi.stubGlobal(
+ "fetch",
+ vi.fn(async () => new Response(JSON.stringify({ code: 0, data: { appCodes: ["lalu"], mode: "selected" } })))
+ );
+
+ await getUserAppScopes(9);
+ await replaceUserAppScopes(9, { appCodes: ["lalu"], mode: "selected" });
+
+ const calls = vi.mocked(fetch).mock.calls;
+ expect(String(calls[0][0])).toContain("/api/v1/users/9/app-scopes");
+ expect(calls[0][1]?.method).toBe("GET");
+ expect(String(calls[1][0])).toContain("/api/v1/users/9/app-scopes");
+ expect(calls[1][1]?.method).toBe("PUT");
+ expect(JSON.parse(String(calls[1][1]?.body))).toEqual({ appCodes: ["lalu"], mode: "selected" });
});
diff --git a/src/features/users/api.ts b/src/features/users/api.ts
index 5adb20a..71cb826 100644
--- a/src/features/users/api.ts
+++ b/src/features/users/api.ts
@@ -5,10 +5,12 @@ import type {
ApiPage,
CreateUserResultDto,
EntityId,
+ FinanceScopeAssignmentDto,
PageQuery,
ResetPasswordResultDto,
UserFormPayload,
UserFinanceScopeDto,
+ UserAppScopeDto,
UserStatus,
UserUpdatePayload
} from "@/shared/api/types";
@@ -87,3 +89,18 @@ export function replaceUserFinanceScopes(id: EntityId, scopes: UserFinanceScopeD
export function getFinanceScopeCatalog(): Promise
{
return apiRequest(apiEndpointPath(API_OPERATIONS.getFinanceScope));
}
+
+export function listFinanceScopeAssignments(): Promise<{ items: FinanceScopeAssignmentDto[]; total: number }> {
+ return apiRequest<{ items: FinanceScopeAssignmentDto[]; total: number }>(apiEndpointPath(API_OPERATIONS.listFinanceScopeAssignments));
+}
+
+export function getUserAppScopes(id: EntityId): Promise {
+ return apiRequest(apiEndpointPath(API_OPERATIONS.getUserAppScopes, { id }));
+}
+
+export function replaceUserAppScopes(id: EntityId, scope: UserAppScopeDto): Promise {
+ return apiRequest(apiEndpointPath(API_OPERATIONS.replaceUserAppScopes, { id }), {
+ body: scope,
+ method: "PUT"
+ });
+}
diff --git a/src/features/users/components/UserAppScopeEditor.jsx b/src/features/users/components/UserAppScopeEditor.jsx
new file mode 100644
index 0000000..b3914b3
--- /dev/null
+++ b/src/features/users/components/UserAppScopeEditor.jsx
@@ -0,0 +1,40 @@
+import Checkbox from "@mui/material/Checkbox";
+import { AppIdentity } from "@/shared/ui/AppIdentity.jsx";
+
+export function UserAppScopeEditor({ apps = [], appCodes = [], mode = "none", onAppChecked, onModeChange }) {
+ const selected = new Set((appCodes || []).map(normalizeAppCode));
+ const all = mode === "all";
+ const count = all ? apps.length : selected.size;
+
+ if (!apps.length) {
+ return 当前无数据
;
+ }
+
+ return (
+
+
+
App 可见范围
+
已选 {count} 项
+
+
+ {apps.map((app) => {
+ const appCode = normalizeAppCode(app.appCode);
+ return (
+
+ );
+ })}
+
加载中
;
@@ -44,7 +71,8 @@ export function UserFinanceScopeEditor({ catalog, checkedScopes, onChecked }) {
return 当前无数据
;
}
- const allRegionsChecked = hasScope(checkedScopes, activeApp.appCode, 0);
+ const allHolders = holdersFor(holderIndex, activeApp.appCode, 0);
+ const appTakenByOthers = appStats.taken > 0 || allHolders.length > 0;
return (
@@ -74,7 +102,9 @@ export function UserFinanceScopeEditor({ catalog, checkedScopes, onChecked }) {
{activeApp.appName || activeApp.appCode}
- 已选 {countAppScopes(checkedScopes, activeApp.appCode)} 项
+
+ 已选 {countAppScopes(checkedScopes, activeApp.appCode)} 项 · 他人已分 {appStats.taken} · 未分配 {appStats.unassigned}
+
+
- {(!selectedOnly || allRegionsChecked) && !query ? (
+ {(!selectedOnly || allRegionsChecked) && !unassignedOnly && !query ? (
0
+ ? `他人已分 ${appStats.taken} 区`
+ : ""
+ }
label="全部区域"
onChange={(checked) => onChecked(activeApp.appCode, 0, checked)}
/>
) : null}
- {activeRegions.map((region) => (
- onChecked(activeApp.appCode, region.regionId, checked)}
- />
- ))}
+ {activeRegions.map((region) => {
+ const holders = holdersFor(holderIndex, activeApp.appCode, region.regionId);
+ const checked = hasScope(checkedScopes, activeApp.appCode, region.regionId);
+ return (
+ 0}
+ holderText={holders.length ? `已分配：${holderNames(holders)}` : ""}
+ key={region.regionId}
+ label={region.name}
+ onChange={(nextChecked) => onChecked(activeApp.appCode, region.regionId, nextChecked)}
+ />
+ );
+ })}
- {!activeRegions.length && (query || selectedOnly) && !(selectedOnly && allRegionsChecked) ? (
+ {!activeRegions.length && (query || selectedOnly || unassignedOnly) && !(selectedOnly && allRegionsChecked) ? (
当前无匹配区域
) : null}
@@ -124,18 +191,66 @@ export function UserFinanceScopeEditor({ catalog, checkedScopes, onChecked }) {
);
}
-function FinanceScopeOption({ checked, code, label, onChange }) {
+function FinanceScopeOption({ checked, code, disabled = false, holderText = "", label, onChange }) {
return (
-
{assetKindLabel(assetKind, isImage)}}
-