Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion desktop/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@itemmanager/desktop",
"version": "26.7.0",
"version": "26.7.1",
"private": true,
"description": "物品管理桌面客户端",
"author": "MCJ",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "itemmanager-workspace",
"version": "26.7.0",
"version": "26.7.1",
"private": true,
"license": "MIT",
"packageManager": "pnpm@11.7.0",
Expand Down
2 changes: 1 addition & 1 deletion web/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@itemmanager/web",
"version": "26.7.0",
"version": "26.7.1",
"private": true,
"license": "MIT",
"packageManager": "pnpm@11.7.0",
Expand Down
2 changes: 1 addition & 1 deletion web/src/renderer/features/catalog/NodeEditorPane.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ export default function NodeEditorPane({
<h3>{isCreate ? title || '新增节点' : node.name || '未命名节点'}</h3>
</div>
<div className="catalog-node-stats">
{!isCreate ? <span className="catalog-item-count" aria-label={`当前${mode === 'category' ? '分类' : '位置'}物品数量`} title="包含下级,按物品卡片统计">{itemCount} 个物品</span> : null}
{!isCreate ? <span className="catalog-item-count" aria-label={`当前${mode === 'category' ? '分类' : '位置'}物品数量`}>{itemCount}</span> : null}
<span className="level-pill">{label}</span>
</div>
</div>
Expand Down
10 changes: 1 addition & 9 deletions web/src/renderer/features/catalog/TreePanel.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@ import { useEffect, useMemo, useState } from 'react';
import { buildTree } from '../../lib/project-data';
import useCatalogDrag from './useCatalogDrag';

function countDescendants(node) {
return node.children.reduce((count, child) => count + 1 + countDescendants(child), 0);
}

function getAncestorIds(entries, nodeId) {
const byId = new Map(entries.map((entry) => [entry.id, entry]));
const ancestorIds = [];
Expand All @@ -25,7 +21,6 @@ function TreeNode({ node, itemCounts, selectedId, expandedIds, onSelect, onToggl
const nodeLabel = node.name || '未命名节点';
const hasChildren = node.children.length > 0;
const isExpanded = expandedIds.has(node.id);
const childCount = countDescendants(node);

function handleSelect() {
onSelect(node.id);
Expand Down Expand Up @@ -66,10 +61,7 @@ function TreeNode({ node, itemCounts, selectedId, expandedIds, onSelect, onToggl
onClick={handleSelect}
>
<span className="tree-item__title">{nodeLabel}</span>
<span className="tree-item__counts">
<span className="catalog-item-count" title="包含下级,按物品卡片统计">{itemCounts?.get(node.id) || 0} 个物品</span>
{hasChildren ? <span className="tree-item__meta">{childCount} 个下级</span> : null}
</span>
<span className="catalog-item-count" aria-label={`${nodeLabel}物品数量`}>{itemCounts?.get(node.id) || 0}</span>
</button>
</div>
{hasChildren && isExpanded ? (
Expand Down
15 changes: 1 addition & 14 deletions web/src/renderer/styles/app.css
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,6 @@ button:not(:disabled):hover {
.status-bar,
.dialog-eyebrow,
.tree-item__path,
.tree-item__meta,
.section-kicker,
.workspace-card__header p,
.editor-empty p,
Expand Down Expand Up @@ -1499,20 +1498,8 @@ button:not(:disabled):hover {
white-space: nowrap;
}

.tree-item__meta {
flex: 0 0 auto;
padding: 3px 7px;
color: var(--text-soft);
background: rgba(47, 111, 159, 0.07);
border-radius: 999px;
font-size: 0.66rem;
font-weight: 900;
white-space: nowrap;
}

.tree-item__counts { display: flex; flex: 0 0 auto; flex-direction: column; align-items: flex-end; gap: 3px; }
.catalog-item-count { display: inline-block; padding: 4px 8px; border-radius: 999px; background: var(--accent-soft); color: var(--accent-strong); font-size: 0.7rem; font-weight: 800; white-space: nowrap; font-variant-numeric: tabular-nums; }
.tree-item__counts .catalog-item-count { font-size: 0.66rem; }
.tree-item .catalog-item-count { font-size: 0.66rem; }
.catalog-node-stats { display: flex; flex-wrap: wrap; align-items: center; justify-content: flex-end; gap: 8px; }

.tree-node--level-2 .tree-item,
Expand Down
11 changes: 6 additions & 5 deletions web/tests/renderer/catalog-counts-ui.test.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,31 +27,32 @@ const props = (mode = 'category', currentItems = items, selectedId = 'clothes')
visibleItems: [], search: '不匹配的搜索',
onDeleteCatalogNode: vi.fn()
});
const count = (name, value) => expect(within(screen.getByRole('treeitem', { name, exact: true })).getByText(`${value} 个物品`)).toBeInTheDocument();
const count = (name, value) => expect(within(screen.getByRole('treeitem', { name, exact: true })).getByText(String(value), { exact: true })).toBeInTheDocument();
afterEach(cleanup);

describe('catalog item totals', () => {
it('counts all project cards rather than gallery search results and displays zeros and selected totals', async () => {
const user = userEvent.setup();
render(<AppShell {...props()} />);
count('服装', 3); count('空分类', 0);
expect(screen.getByLabelText('当前分类物品数量')).toHaveTextContent('3 个物品');
expect(screen.getByLabelText('当前分类物品数量')).toHaveTextContent(/^3$/);
await user.click(screen.getByRole('treeitem', { name: '服装', exact: true }));
count('上衣', 1); count('鞋子', 1);
expect(screen.getByText('2 个下级')).toBeInTheDocument();
expect(screen.queryByText(/个下级/)).not.toBeInTheDocument();
expect(document.body).not.toHaveTextContent('个物品');
});
it('shows three-level location counts while deduplicating the shared ancestors of multiple locations', () => {
render(<AppShell {...props('location', items, 'top')} />);
count('家', 3); count('衣柜', 3); count('上层', 2); count('下层', 1); count('办公室', 1);
expect(screen.getByLabelText('当前位置物品数量')).toHaveTextContent('2 个物品');
expect(screen.getByLabelText('当前位置物品数量')).toHaveTextContent(/^2$/);
});
it('refreshes totals when cards are added, removed or moved and hides totals for an unsaved node', async () => {
const user = userEvent.setup();
const view = render(<AppShell {...props()} />);
const changed = [{ ...items[0], categoryId: 'empty' }, items[2], { id: 'new', name: '新增', categoryId: 'empty' }];
view.rerender(<AppShell {...props('category', changed)} />);
count('服装', 1); count('空分类', 2);
expect(screen.getByLabelText('当前分类物品数量')).toHaveTextContent('1 个物品');
expect(screen.getByLabelText('当前分类物品数量')).toHaveTextContent(/^1$/);
await user.click(screen.getByRole('button', { name: '新增顶级', exact: true }));
expect(screen.queryByLabelText('当前分类物品数量')).not.toBeInTheDocument();
});
Expand Down
8 changes: 4 additions & 4 deletions web/tests/renderer/web-app.test.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -129,19 +129,19 @@ describe('password gated browser inventory', () => {
render(<WebApp fetchImpl={fetchImpl} />);
await screen.findByRole('button', { name: '普通物品', exact: true });
await user.click(screen.getByRole('button', { name: '分类', exact: true }));
expect(screen.getByLabelText('当前分类物品数量')).toHaveTextContent('1 个物品');
expect(screen.getByLabelText('当前分类物品数量')).toHaveTextContent(/^1$/);
await submitLogoPassword(user);
await screen.findByRole('button', { name: '秘密条目', exact: true });
await user.click(screen.getByRole('button', { name: '分类', exact: true }));
expect(screen.getByLabelText('当前分类物品数量')).toHaveTextContent('2 个物品');
expect(screen.getByLabelText('当前分类物品数量')).toHaveTextContent(/^2$/);
await user.click(screen.getByRole('button', { name: '物品管理', exact: true }));
expect(screen.queryByRole('tree')).not.toBeInTheDocument();
expect(document.body).not.toHaveTextContent('2 个物品');
expect(screen.queryByLabelText('当前分类物品数量')).not.toBeInTheDocument();
await act(async () => finishClose());
await user.click(within(screen.getByRole('dialog', { name: '输入密码' })).getByRole('button', { name: '取消', exact: true }));
await screen.findByRole('button', { name: '普通物品', exact: true });
await user.click(screen.getByRole('button', { name: '分类', exact: true }));
expect(screen.getByLabelText('当前分类物品数量')).toHaveTextContent('1 个物品');
expect(screen.getByLabelText('当前分类物品数量')).toHaveTextContent(/^1$/);
expect(document.body).not.toHaveTextContent('秘密条目');
});

Expand Down
Loading