diff --git a/desktop/package.json b/desktop/package.json index 8fe18e8..f7246cb 100644 --- a/desktop/package.json +++ b/desktop/package.json @@ -1,6 +1,6 @@ { "name": "@itemmanager/desktop", - "version": "26.7.0", + "version": "26.7.1", "private": true, "description": "物品管理桌面客户端", "author": "MCJ", diff --git a/package.json b/package.json index 5a40f38..98c3a6f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "itemmanager-workspace", - "version": "26.7.0", + "version": "26.7.1", "private": true, "license": "MIT", "packageManager": "pnpm@11.7.0", diff --git a/web/package.json b/web/package.json index e5b1026..28c984e 100644 --- a/web/package.json +++ b/web/package.json @@ -1,6 +1,6 @@ { "name": "@itemmanager/web", - "version": "26.7.0", + "version": "26.7.1", "private": true, "license": "MIT", "packageManager": "pnpm@11.7.0", diff --git a/web/src/renderer/features/catalog/NodeEditorPane.jsx b/web/src/renderer/features/catalog/NodeEditorPane.jsx index 63f6d40..7ea927c 100644 --- a/web/src/renderer/features/catalog/NodeEditorPane.jsx +++ b/web/src/renderer/features/catalog/NodeEditorPane.jsx @@ -119,7 +119,7 @@ export default function NodeEditorPane({

{isCreate ? title || '新增节点' : node.name || '未命名节点'}

- {!isCreate ? {itemCount} 个物品 : null} + {!isCreate ? {itemCount} : null} {label}
diff --git a/web/src/renderer/features/catalog/TreePanel.jsx b/web/src/renderer/features/catalog/TreePanel.jsx index a04dfce..80036a3 100644 --- a/web/src/renderer/features/catalog/TreePanel.jsx +++ b/web/src/renderer/features/catalog/TreePanel.jsx @@ -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 = []; @@ -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); @@ -66,10 +61,7 @@ function TreeNode({ node, itemCounts, selectedId, expandedIds, onSelect, onToggl onClick={handleSelect} > {nodeLabel} - - {itemCounts?.get(node.id) || 0} 个物品 - {hasChildren ? {childCount} 个下级 : null} - + {itemCounts?.get(node.id) || 0} {hasChildren && isExpanded ? ( diff --git a/web/src/renderer/styles/app.css b/web/src/renderer/styles/app.css index 3ef40c0..2cc458e 100644 --- a/web/src/renderer/styles/app.css +++ b/web/src/renderer/styles/app.css @@ -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, @@ -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, diff --git a/web/tests/renderer/catalog-counts-ui.test.jsx b/web/tests/renderer/catalog-counts-ui.test.jsx index ae5046b..4be5fc2 100644 --- a/web/tests/renderer/catalog-counts-ui.test.jsx +++ b/web/tests/renderer/catalog-counts-ui.test.jsx @@ -27,7 +27,7 @@ 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', () => { @@ -35,15 +35,16 @@ describe('catalog item totals', () => { const user = userEvent.setup(); render(); 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(); 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(); @@ -51,7 +52,7 @@ describe('catalog item totals', () => { const changed = [{ ...items[0], categoryId: 'empty' }, items[2], { id: 'new', name: '新增', categoryId: 'empty' }]; view.rerender(); 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(); }); diff --git a/web/tests/renderer/web-app.test.jsx b/web/tests/renderer/web-app.test.jsx index 42d8f59..22a3e31 100644 --- a/web/tests/renderer/web-app.test.jsx +++ b/web/tests/renderer/web-app.test.jsx @@ -129,19 +129,19 @@ describe('password gated browser inventory', () => { render(); 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('秘密条目'); });