2025-07-19 03:30:44 +08:00
|
|
|
/*
|
|
|
|
|
Copyright (C) 2025 QuantumNous
|
|
|
|
|
|
|
|
|
|
This program is free software: you can redistribute it and/or modify
|
|
|
|
|
it under the terms of the GNU Affero General Public License as
|
|
|
|
|
published by the Free Software Foundation, either version 3 of the
|
|
|
|
|
License, or (at your option) any later version.
|
|
|
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
GNU Affero General Public License for more details.
|
|
|
|
|
|
|
|
|
|
You should have received a copy of the GNU Affero General Public License
|
|
|
|
|
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
|
|
|
|
|
|
|
|
For commercial licensing, please contact support@quantumnous.com
|
|
|
|
|
*/
|
|
|
|
|
|
2025-06-06 20:55:52 +08:00
|
|
|
import React, { useEffect, useMemo, useState } from 'react';
|
2025-06-04 00:42:06 +08:00
|
|
|
import { Link, useLocation } from 'react-router-dom';
|
2024-12-13 19:03:14 +08:00
|
|
|
import { useTranslation } from 'react-i18next';
|
2025-08-18 04:14:35 +08:00
|
|
|
import { getLucideIcon } from '../../helpers/render';
|
2025-06-06 20:55:52 +08:00
|
|
|
import { ChevronLeft } from 'lucide-react';
|
2025-08-18 04:14:35 +08:00
|
|
|
import { useSidebarCollapsed } from '../../hooks/common/useSidebarCollapsed';
|
2025-08-31 07:07:40 +08:00
|
|
|
import { useSidebar } from '../../hooks/common/useSidebar';
|
✨ feat: Add skeleton loading states for sidebar navigation
Add comprehensive skeleton screen implementation for sidebar to improve loading UX, matching the existing headerbar skeleton pattern.
## Features Added
- **Sidebar skeleton screens**: Complete 1:1 recreation of sidebar structure during loading
- **Responsive skeleton layouts**: Different layouts for expanded (164×30px) and collapsed (44×44px) states
- **Skeleton component enhancements**: Extended SkeletonWrapper with new skeleton types (sidebar, button, sidebarNavItem, sidebarGroupTitle)
- **Minimum loading time**: Integrated useMinimumLoadingTime hook with 500ms duration for smooth UX
## Layout Specifications
- **Expanded nav items**: 164×30px with 8px horizontal margins and 3px vertical margins
- **Collapsed nav items**: 44×44px with 4px bottom margin and 8px horizontal margins
- **Collapse button**: 156×24px (expanded) / 36×24px (collapsed) with rounded corners
- **Container padding**: 12px top padding, 8px horizontal margins
- **Group labels**: 4px 15px 8px padding matching real sidebar-group-label styles
## Code Improvements
- **Refactored skeleton rendering**: Eliminated code duplication using reusable components (NavRow, CollapsedRow)
- **Configuration-driven sections**: Sections defined as config objects with title widths and item widths
- **Fixed width calculations**: Removed random width generation, using precise fixed widths per menu item
- **Proper CSS class alignment**: Uses real sidebar CSS classes (sidebar-section, sidebar-group-label, sidebar-divider)
## UI/UX Enhancements
- **Bottom-aligned collapse button**: Fixed positioning using margin-top: auto to stay at viewport bottom
- **Accurate spacing**: Matches real sidebar margins, padding, and spacing exactly
- **Skeleton stability**: Fixed width values prevent layout shifts during loading
- **Clean file structure**: Removed redundant HeaderBar.js export file
## Technical Details
- Extended SkeletonWrapper component with sidebar-specific skeleton types
- Integrated skeleton loading state management in SiderBar component
- Added support for collapsed state awareness in skeleton rendering
- Implemented precise dimension matching for pixel-perfect loading states
Closes: Sidebar skeleton loading implementation
2025-09-02 03:38:01 +08:00
|
|
|
import { useMinimumLoadingTime } from '../../hooks/common/useMinimumLoadingTime';
|
2025-08-30 21:15:10 +08:00
|
|
|
import { isAdmin, isRoot, showError } from '../../helpers';
|
✨ feat: Add skeleton loading states for sidebar navigation
Add comprehensive skeleton screen implementation for sidebar to improve loading UX, matching the existing headerbar skeleton pattern.
## Features Added
- **Sidebar skeleton screens**: Complete 1:1 recreation of sidebar structure during loading
- **Responsive skeleton layouts**: Different layouts for expanded (164×30px) and collapsed (44×44px) states
- **Skeleton component enhancements**: Extended SkeletonWrapper with new skeleton types (sidebar, button, sidebarNavItem, sidebarGroupTitle)
- **Minimum loading time**: Integrated useMinimumLoadingTime hook with 500ms duration for smooth UX
## Layout Specifications
- **Expanded nav items**: 164×30px with 8px horizontal margins and 3px vertical margins
- **Collapsed nav items**: 44×44px with 4px bottom margin and 8px horizontal margins
- **Collapse button**: 156×24px (expanded) / 36×24px (collapsed) with rounded corners
- **Container padding**: 12px top padding, 8px horizontal margins
- **Group labels**: 4px 15px 8px padding matching real sidebar-group-label styles
## Code Improvements
- **Refactored skeleton rendering**: Eliminated code duplication using reusable components (NavRow, CollapsedRow)
- **Configuration-driven sections**: Sections defined as config objects with title widths and item widths
- **Fixed width calculations**: Removed random width generation, using precise fixed widths per menu item
- **Proper CSS class alignment**: Uses real sidebar CSS classes (sidebar-section, sidebar-group-label, sidebar-divider)
## UI/UX Enhancements
- **Bottom-aligned collapse button**: Fixed positioning using margin-top: auto to stay at viewport bottom
- **Accurate spacing**: Matches real sidebar margins, padding, and spacing exactly
- **Skeleton stability**: Fixed width values prevent layout shifts during loading
- **Clean file structure**: Removed redundant HeaderBar.js export file
## Technical Details
- Extended SkeletonWrapper component with sidebar-specific skeleton types
- Integrated skeleton loading state management in SiderBar component
- Added support for collapsed state awareness in skeleton rendering
- Implemented precise dimension matching for pixel-perfect loading states
Closes: Sidebar skeleton loading implementation
2025-09-02 03:38:01 +08:00
|
|
|
import SkeletonWrapper from './components/SkeletonWrapper';
|
2025-08-30 21:15:10 +08:00
|
|
|
|
|
|
|
|
import { Nav, Divider, Button } from '@douyinfe/semi-ui';
|
2023-10-31 00:03:22 +08:00
|
|
|
|
2025-03-11 14:55:48 +08:00
|
|
|
const routerMap = {
|
|
|
|
|
home: '/',
|
2025-05-20 01:11:37 +08:00
|
|
|
channel: '/console/channel',
|
|
|
|
|
token: '/console/token',
|
|
|
|
|
redemption: '/console/redemption',
|
|
|
|
|
topup: '/console/topup',
|
|
|
|
|
user: '/console/user',
|
✨ feat: add subscription billing system (#2808)
* ci: create docker automation
* ✨ feat: add subscription billing system with admin management and user purchase flow
Implement a new subscription-based billing model alongside existing metered/per-request billing:
Backend:
- Add subscription plan models (SubscriptionPlan, SubscriptionPlanItem, UserSubscription, etc.)
- Implement CRUD APIs for subscription plan management (admin only)
- Add user subscription queries with support for multiple active/expired subscriptions
- Integrate payment gateways (Stripe, Creem, Epay) for subscription purchases
- Implement pre-consume and post-consume billing logic for subscription quota tracking
- Add billing preference settings (subscription_first, wallet_first, etc.)
- Enhance usage logs with subscription deduction details
Frontend - Admin:
- Add subscription management page with table view and drawer-based edit form
- Match UI/UX style with existing admin pages (redemption codes, users)
- Support enabling/disabling plans, configuring payment IDs, and model quotas
- Add user subscription binding modal in user management
Frontend - Wallet:
- Add subscription plans card with current subscription status display
- Show all subscriptions (active and expired) with remaining days/usage percentage
- Display purchasable plans with pricing cards following SaaS best practices
- Extract purchase modal to separate component matching payment confirm modal style
- Add skeleton loading states with active animation
- Implement billing preference selector in card header
- Handle payment gateway availability based on admin configuration
Frontend - Usage Logs:
- Display subscription deduction details in log entries
- Show step-by-step breakdown of subscription usage (pre-consumed, delta, final, remaining)
- Add subscription deduction tag for subscription-covered requests
* ✨ feat(admin): add user subscription management and refine UI/pagination
Add admin APIs to list/create/invalidate/delete user subscriptions
Add model helpers to fetch all user subscriptions (incl. expired) and support cancel/hard-delete
Wire new admin routes for user subscription operations
Replace “Bind subscription plan” entry with a dedicated User Subscriptions SideSheet in Users table
Use CardTable with responsive layout and working client-side pagination inside the SideSheet
Improve subscription purchase modal empty-gateway state with a Banner notice
* ✨ feat(admin): streamline subscription plan benefits editor with bulk actions
Restore the avatar/icon header for the “Model Benefits” section
Replace scattered controls with a compact toolbar-style workflow
Support multi-select add with a default quota for new items
Add row selection with bulk apply-to-selected / apply-to-all quota updates
Enable delete-selected to manage benefits faster and reduce mistakes
* ✨ fix(subscription): finalize payments, log billing, and clean up dead code
Complete subscription orders by creating a matching top-up record and writing billing logs
Add Epay return handler to verify and finalize browser callbacks
Require Stripe/Creem webhook configuration before starting subscription payments
Show subscription purchases in topup history with clearer labels/methods
Remove unused subscription helper, legacy Creem webhook struct, and unused topup fields
Simplify subscription self API payload to active/all lists only
* 🎨 style: format all code with gofmt and lint:fix
Apply consistent code formatting across the entire codebase using
gofmt and lint:fix tools. This ensures adherence to Go community
standards and improves code readability and maintainability.
Changes include:
- Run gofmt on all .go files to standardize formatting
- Apply lint:fix to automatically resolve linting issues
- Fix code style inconsistencies and formatting violations
No functional changes were made in this commit.
* ✨ feat(subscription): add quota reset periods and admin configuration
- Add reset period fields on subscription plans and user items
- Apply automatic quota resets during pre-consume based on plan schedule
- Expose reset-period configuration in the admin plan editor
- Display reset cadence in subscription cards and purchase modal
- Validate custom reset seconds on plan create/update
* ✨ feat(subscription): harden subscription billing with resets, idempotency, and production-grade stability
Add plan-level quota reset periods and display/reset cadence in admin/UI
Enforce natural reset alignment with background reset task and cleanup job
Make subscription pre-consume/refund idempotent with request-scoped records and retries
Use database time for consistent resets across multi-instance deployments
Harden payment callbacks with locking and idempotent order completion
Record subscription purchases in topup history and billing logs
Optimize subscription queries and add critical composite indexes
* ✨ feat(subscription): cache plan lookups and stabilize pre-consume
Introduce hybrid caches for subscription plans, items, and plan info with explicit
invalidation on admin updates. Streamline pre-consume transactions to reduce
redundant queries while preserving idempotency and reset logic.
* 🐛 fix(subscription): avoid pre-consume lookup noise
Use a RowsAffected check for the idempotency lookup so missing records
no longer surface as "record not found" errors while preserving behavior.
* 🔧 ci: Change workflow trigger to sub branch
Update the Docker image workflow to run on pushes to the sub branch instead of main.
* 💸 chore: Align subscription pricing display with global currency settings
Unify subscription price rendering to use the site-wide currency symbol/rate on the wallet and admin views.
Make subscription plan currency read-only in the editor and force USD on create/update to avoid drift.
Use global currency display type when creating Creem checkout payloads.
* 🔧 chore: Unify subscription plan status toggle with PATCH endpoint
Replace separate enable/disable flows with a single PATCH API that updates the enabled flag.
Update frontend hooks and table actions to call the unified endpoint and keep UI behavior consistent.
Introduce a minimal admin controller handler and route for the status update.
* ✨ feat: Add subscription limits and UI tags consistency
Add per-plan purchase limits with backend enforcement and UI disable states.
Expose limit configuration in admin plan editor and show limits in plan tables/cards.
Refine subscription UI tags with unified badge style and streamlined “My Subscriptions” layout.
* 🎨 style: tag color to white
* 🚀 refactor: Simplify subscription quota to total amount model
Remove per-model subscription items and switch to a single total quota per plan and user subscription. Update billing, reset, and logging flows to operate on total quota, and refactor admin/user UI to configure and display total quota consistently.
* 🚀 chore: Remove duplicate subscription usage percentage display
Keep the usage percentage shown only in the total quota line to avoid redundant “已用 0%” text while preserving remaining days in the summary.
* ✨ feat: Add subscription upgrade group with auto downgrade
* ✨ feat: Update subscription purchase modal display
Show total quota as currency with tooltip for raw quota, hide reset cycle when never, and display upgrade group when configured to match card display rules.
* ✨ feat: Extract quota conversion helpers to shared utils
Move quota display/conversion helpers into web/src/helpers/quota.js and update the subscription plan editor to import and use the shared utilities instead of inline functions.
* ✨ chore: Add upgrade group guidance in subscription editor
Add explanatory helper text under the upgrade group field to clarify automatic group upgrades, rollback conditions, and the expected delay before downgrading takes effect.
* 🔧 chore: remove unused Creem settings state
Drop the unused originInputs state and redundant updates to keep the Creem
settings form state minimal and easier to maintain.
* 🚀 chore: Remove useless action
* ✨ Add full i18n coverage for subscription-related UI across locales
* ✨ feat: harden subscription billing and improve UI consistency
Improve subscription payment safety and data integrity by handling user/URL lookup failures, fixing Stripe subscription mode, persisting quota reset fields, and correcting subscription delta accounting and DB timestamp casting. Refine the UI with stricter custom duration validation, accurate currency rounding, conditional Epay labeling, rollback on preference update failure, and shared subscription formatting helpers plus clearer component naming.
* 🔧 fix: make epay webhook and return flow subscription-aware
Ensure Epay webhook acknowledges success only after order completion, returning fail on processing errors to allow retries. Redirect subscription payment returns to the subscription page instead of top-up for correct user flow.
* 🚦 fix: guard epay return success on order completion
Redirect subscription return flow to failure when order completion fails, preventing false success states after payment verification.
* 🔧 fix: normalize epay error handling and webhook retries
Standardize SubscriptionRequestEpay error responses via ApiErrorMsg for a consistent schema.
Return "fail" on non-success trade statuses in the epay webhook to preserve retry behavior.
* 🧾 fix: persist epay orders before purchase
Create the subscription order before initiating epay payment and expire it if the provider call fails, preventing orphaned transactions and improving reconciliation.
* 🔧 fix: harden epay callbacks and billing fallbacks
Use POST and form parsing for epay notify/return routes, persist epay orders before provider calls with expiry on failure, and ensure notify handlers retry correctly.
Restrict subscription-first fallback to insufficient-subscription errors and log refund failures after retries to avoid silent quota drift.
* 🔧 fix: harden billing flow and sidebar settings
Add missing strings import for subscription fallback checks, log failed subscription refunds after retries, and extend sidebar module settings with a subscription management toggle plus translations.
* 🛡️ fix: fail fast on epay form parse errors
Handle ParseForm errors in epay notify/return handlers by returning fail or redirecting to failure, avoiding unsafe fallback to query parameters.
* ✨ fix: refine Japanese subscription status labels
Adjust Japanese UI wording for active-count labels to read more naturally and consistently.
* ✅ fix: standardize epay success response schema
Return subscription epay pay success responses via ApiSuccess to include the consistent success field and align with error schema.
2026-02-03 17:40:43 +08:00
|
|
|
subscription: '/console/subscription',
|
2025-05-20 01:11:37 +08:00
|
|
|
log: '/console/log',
|
|
|
|
|
midjourney: '/console/midjourney',
|
|
|
|
|
setting: '/console/setting',
|
2025-03-11 14:55:48 +08:00
|
|
|
about: '/about',
|
2025-05-20 01:11:37 +08:00
|
|
|
detail: '/console',
|
2025-03-11 14:55:48 +08:00
|
|
|
pricing: '/pricing',
|
2025-05-20 01:11:37 +08:00
|
|
|
task: '/console/task',
|
🚀 feat: Introduce full Model & Vendor Management suite (backend + frontend) and UI refinements
Backend
• Add `model/model_meta.go` and `model/vendor_meta.go` defining Model & Vendor entities with CRUD helpers, soft-delete and time stamps
• Create corresponding controllers `controller/model_meta.go`, `controller/vendor_meta.go` and register routes in `router/api-router.go`
• Auto-migrate new tables in DB startup logic
Frontend
• Build complete “Model Management” module under `/console/models`
- New pages, tables, filters, actions, hooks (`useModelsData`) and dynamic vendor tabs
- Modals `EditModelModal.jsx` & unified `EditVendorModal.jsx`; latter now uses default confirm/cancel footer and mobile-friendly modal sizing (`full-width` / `small`) via `useIsMobile`
• Update sidebar (`SiderBar.js`) and routing (`App.js`) to surface the feature
• Add helper updates (`render.js`) incl. `stringToColor`, dynamic LobeHub icon retrieval, and tag color palettes
Table UX improvements
• Replace separate status column with inline Enable / Disable buttons in operation column (matching channel table style)
• Limit visible tags to max 3; overflow represented as “+x” tag with padded `Popover` showing remaining tags
• Color all tags deterministically using `stringToColor` for consistent theming
• Change vendor column tag color to white for better contrast
Misc
• Minor layout tweaks, compact-mode toggle relocation, lint fixes and TypeScript/ESLint clean-up
These changes collectively deliver end-to-end model & vendor administration while unifying visual language across management tables.
2025-07-31 22:28:09 +08:00
|
|
|
models: '/console/models',
|
2025-12-28 15:55:35 +08:00
|
|
|
deployment: '/console/deployment',
|
2025-05-20 01:11:37 +08:00
|
|
|
playground: '/console/playground',
|
|
|
|
|
personal: '/console/personal',
|
2025-03-11 14:55:48 +08:00
|
|
|
};
|
|
|
|
|
|
2025-08-30 21:15:10 +08:00
|
|
|
const SiderBar = ({ onNavigate = () => {} }) => {
|
2024-12-13 19:03:14 +08:00
|
|
|
const { t } = useTranslation();
|
📱 refactor(web): remove legacy isMobile util and migrate to useIsMobile hook
BREAKING CHANGE:
helpers/utils.js no longer exports `isMobile()`.
Any external code that relied on this function must switch to the `useIsMobile` React hook.
Summary
-------
1. Deleted the obsolete `isMobile()` function from helpers/utils.js.
2. Introduced `MOBILE_BREAKPOINT` constant and `matchMedia`-based detection for non-React contexts.
3. Reworked toast positioning logic in utils.js to rely on `matchMedia`.
4. Updated render.js:
• Removed isMobile import.
• Added MOBILE_BREAKPOINT detection in `truncateText`.
5. Migrated every page/component to the `useIsMobile` hook:
• Layout: HeaderBar, PageLayout, SiderBar
• Pages: Home, Detail, Playground, User (Add/Edit), Token, Channel, Redemption, Ratio Sync
• Components: ChannelsTable, ChannelSelectorModal, ConflictConfirmModal
6. Purged all remaining `isMobile()` calls and legacy imports.
7. Added missing `const isMobile = useIsMobile()` declarations where required.
Benefits
--------
• Unifies mobile detection with a React-friendly hook.
• Eliminates duplicated logic and improves maintainability.
• Keeps non-React helpers lightweight by using `matchMedia` directly.
2025-07-16 02:54:58 +08:00
|
|
|
const [collapsed, toggleCollapsed] = useSidebarCollapsed();
|
2025-09-01 23:43:39 +08:00
|
|
|
const {
|
|
|
|
|
isModuleVisible,
|
|
|
|
|
hasSectionVisibleModules,
|
|
|
|
|
loading: sidebarLoading,
|
|
|
|
|
} = useSidebar();
|
2024-03-02 02:12:02 +08:00
|
|
|
|
2025-09-29 22:16:25 +08:00
|
|
|
const showSkeleton = useMinimumLoadingTime(sidebarLoading, 200);
|
✨ feat: Add skeleton loading states for sidebar navigation
Add comprehensive skeleton screen implementation for sidebar to improve loading UX, matching the existing headerbar skeleton pattern.
## Features Added
- **Sidebar skeleton screens**: Complete 1:1 recreation of sidebar structure during loading
- **Responsive skeleton layouts**: Different layouts for expanded (164×30px) and collapsed (44×44px) states
- **Skeleton component enhancements**: Extended SkeletonWrapper with new skeleton types (sidebar, button, sidebarNavItem, sidebarGroupTitle)
- **Minimum loading time**: Integrated useMinimumLoadingTime hook with 500ms duration for smooth UX
## Layout Specifications
- **Expanded nav items**: 164×30px with 8px horizontal margins and 3px vertical margins
- **Collapsed nav items**: 44×44px with 4px bottom margin and 8px horizontal margins
- **Collapse button**: 156×24px (expanded) / 36×24px (collapsed) with rounded corners
- **Container padding**: 12px top padding, 8px horizontal margins
- **Group labels**: 4px 15px 8px padding matching real sidebar-group-label styles
## Code Improvements
- **Refactored skeleton rendering**: Eliminated code duplication using reusable components (NavRow, CollapsedRow)
- **Configuration-driven sections**: Sections defined as config objects with title widths and item widths
- **Fixed width calculations**: Removed random width generation, using precise fixed widths per menu item
- **Proper CSS class alignment**: Uses real sidebar CSS classes (sidebar-section, sidebar-group-label, sidebar-divider)
## UI/UX Enhancements
- **Bottom-aligned collapse button**: Fixed positioning using margin-top: auto to stay at viewport bottom
- **Accurate spacing**: Matches real sidebar margins, padding, and spacing exactly
- **Skeleton stability**: Fixed width values prevent layout shifts during loading
- **Clean file structure**: Removed redundant HeaderBar.js export file
## Technical Details
- Extended SkeletonWrapper component with sidebar-specific skeleton types
- Integrated skeleton loading state management in SiderBar component
- Added support for collapsed state awareness in skeleton rendering
- Implemented precise dimension matching for pixel-perfect loading states
Closes: Sidebar skeleton loading implementation
2025-09-02 03:38:01 +08:00
|
|
|
|
2024-03-15 16:05:33 +08:00
|
|
|
const [selectedKeys, setSelectedKeys] = useState(['home']);
|
2024-10-12 21:06:49 +08:00
|
|
|
const [chatItems, setChatItems] = useState([]);
|
2025-03-10 03:25:02 +08:00
|
|
|
const [openedKeys, setOpenedKeys] = useState([]);
|
|
|
|
|
const location = useLocation();
|
2025-03-11 14:55:48 +08:00
|
|
|
const [routerMapState, setRouterMapState] = useState(routerMap);
|
2025-03-10 03:25:02 +08:00
|
|
|
|
2025-09-01 23:43:39 +08:00
|
|
|
const workspaceItems = useMemo(() => {
|
|
|
|
|
const items = [
|
|
|
|
|
{
|
|
|
|
|
text: t('数据看板'),
|
|
|
|
|
itemKey: 'detail',
|
|
|
|
|
to: '/detail',
|
|
|
|
|
className:
|
|
|
|
|
localStorage.getItem('enable_data_export') === 'true'
|
|
|
|
|
? ''
|
|
|
|
|
: 'tableHiddle',
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
text: t('令牌管理'),
|
|
|
|
|
itemKey: 'token',
|
|
|
|
|
to: '/token',
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
text: t('使用日志'),
|
|
|
|
|
itemKey: 'log',
|
|
|
|
|
to: '/log',
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
text: t('绘图日志'),
|
|
|
|
|
itemKey: 'midjourney',
|
|
|
|
|
to: '/midjourney',
|
|
|
|
|
className:
|
|
|
|
|
localStorage.getItem('enable_drawing') === 'true'
|
|
|
|
|
? ''
|
|
|
|
|
: 'tableHiddle',
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
text: t('任务日志'),
|
|
|
|
|
itemKey: 'task',
|
|
|
|
|
to: '/task',
|
|
|
|
|
className:
|
|
|
|
|
localStorage.getItem('enable_task') === 'true' ? '' : 'tableHiddle',
|
|
|
|
|
},
|
|
|
|
|
];
|
|
|
|
|
|
|
|
|
|
// 根据配置过滤项目
|
|
|
|
|
const filteredItems = items.filter((item) => {
|
|
|
|
|
const configVisible = isModuleVisible('console', item.itemKey);
|
|
|
|
|
return configVisible;
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
return filteredItems;
|
|
|
|
|
}, [
|
|
|
|
|
localStorage.getItem('enable_data_export'),
|
|
|
|
|
localStorage.getItem('enable_drawing'),
|
|
|
|
|
localStorage.getItem('enable_task'),
|
|
|
|
|
t,
|
|
|
|
|
isModuleVisible,
|
|
|
|
|
]);
|
|
|
|
|
|
|
|
|
|
const financeItems = useMemo(() => {
|
|
|
|
|
const items = [
|
|
|
|
|
{
|
|
|
|
|
text: t('钱包管理'),
|
|
|
|
|
itemKey: 'topup',
|
|
|
|
|
to: '/topup',
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
text: t('个人设置'),
|
|
|
|
|
itemKey: 'personal',
|
|
|
|
|
to: '/personal',
|
|
|
|
|
},
|
|
|
|
|
];
|
|
|
|
|
|
|
|
|
|
// 根据配置过滤项目
|
|
|
|
|
const filteredItems = items.filter((item) => {
|
|
|
|
|
const configVisible = isModuleVisible('personal', item.itemKey);
|
|
|
|
|
return configVisible;
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
return filteredItems;
|
|
|
|
|
}, [t, isModuleVisible]);
|
|
|
|
|
|
|
|
|
|
const adminItems = useMemo(() => {
|
|
|
|
|
const items = [
|
|
|
|
|
{
|
|
|
|
|
text: t('渠道管理'),
|
|
|
|
|
itemKey: 'channel',
|
|
|
|
|
to: '/channel',
|
|
|
|
|
className: isAdmin() ? '' : 'tableHiddle',
|
|
|
|
|
},
|
✨ feat: add subscription billing system (#2808)
* ci: create docker automation
* ✨ feat: add subscription billing system with admin management and user purchase flow
Implement a new subscription-based billing model alongside existing metered/per-request billing:
Backend:
- Add subscription plan models (SubscriptionPlan, SubscriptionPlanItem, UserSubscription, etc.)
- Implement CRUD APIs for subscription plan management (admin only)
- Add user subscription queries with support for multiple active/expired subscriptions
- Integrate payment gateways (Stripe, Creem, Epay) for subscription purchases
- Implement pre-consume and post-consume billing logic for subscription quota tracking
- Add billing preference settings (subscription_first, wallet_first, etc.)
- Enhance usage logs with subscription deduction details
Frontend - Admin:
- Add subscription management page with table view and drawer-based edit form
- Match UI/UX style with existing admin pages (redemption codes, users)
- Support enabling/disabling plans, configuring payment IDs, and model quotas
- Add user subscription binding modal in user management
Frontend - Wallet:
- Add subscription plans card with current subscription status display
- Show all subscriptions (active and expired) with remaining days/usage percentage
- Display purchasable plans with pricing cards following SaaS best practices
- Extract purchase modal to separate component matching payment confirm modal style
- Add skeleton loading states with active animation
- Implement billing preference selector in card header
- Handle payment gateway availability based on admin configuration
Frontend - Usage Logs:
- Display subscription deduction details in log entries
- Show step-by-step breakdown of subscription usage (pre-consumed, delta, final, remaining)
- Add subscription deduction tag for subscription-covered requests
* ✨ feat(admin): add user subscription management and refine UI/pagination
Add admin APIs to list/create/invalidate/delete user subscriptions
Add model helpers to fetch all user subscriptions (incl. expired) and support cancel/hard-delete
Wire new admin routes for user subscription operations
Replace “Bind subscription plan” entry with a dedicated User Subscriptions SideSheet in Users table
Use CardTable with responsive layout and working client-side pagination inside the SideSheet
Improve subscription purchase modal empty-gateway state with a Banner notice
* ✨ feat(admin): streamline subscription plan benefits editor with bulk actions
Restore the avatar/icon header for the “Model Benefits” section
Replace scattered controls with a compact toolbar-style workflow
Support multi-select add with a default quota for new items
Add row selection with bulk apply-to-selected / apply-to-all quota updates
Enable delete-selected to manage benefits faster and reduce mistakes
* ✨ fix(subscription): finalize payments, log billing, and clean up dead code
Complete subscription orders by creating a matching top-up record and writing billing logs
Add Epay return handler to verify and finalize browser callbacks
Require Stripe/Creem webhook configuration before starting subscription payments
Show subscription purchases in topup history with clearer labels/methods
Remove unused subscription helper, legacy Creem webhook struct, and unused topup fields
Simplify subscription self API payload to active/all lists only
* 🎨 style: format all code with gofmt and lint:fix
Apply consistent code formatting across the entire codebase using
gofmt and lint:fix tools. This ensures adherence to Go community
standards and improves code readability and maintainability.
Changes include:
- Run gofmt on all .go files to standardize formatting
- Apply lint:fix to automatically resolve linting issues
- Fix code style inconsistencies and formatting violations
No functional changes were made in this commit.
* ✨ feat(subscription): add quota reset periods and admin configuration
- Add reset period fields on subscription plans and user items
- Apply automatic quota resets during pre-consume based on plan schedule
- Expose reset-period configuration in the admin plan editor
- Display reset cadence in subscription cards and purchase modal
- Validate custom reset seconds on plan create/update
* ✨ feat(subscription): harden subscription billing with resets, idempotency, and production-grade stability
Add plan-level quota reset periods and display/reset cadence in admin/UI
Enforce natural reset alignment with background reset task and cleanup job
Make subscription pre-consume/refund idempotent with request-scoped records and retries
Use database time for consistent resets across multi-instance deployments
Harden payment callbacks with locking and idempotent order completion
Record subscription purchases in topup history and billing logs
Optimize subscription queries and add critical composite indexes
* ✨ feat(subscription): cache plan lookups and stabilize pre-consume
Introduce hybrid caches for subscription plans, items, and plan info with explicit
invalidation on admin updates. Streamline pre-consume transactions to reduce
redundant queries while preserving idempotency and reset logic.
* 🐛 fix(subscription): avoid pre-consume lookup noise
Use a RowsAffected check for the idempotency lookup so missing records
no longer surface as "record not found" errors while preserving behavior.
* 🔧 ci: Change workflow trigger to sub branch
Update the Docker image workflow to run on pushes to the sub branch instead of main.
* 💸 chore: Align subscription pricing display with global currency settings
Unify subscription price rendering to use the site-wide currency symbol/rate on the wallet and admin views.
Make subscription plan currency read-only in the editor and force USD on create/update to avoid drift.
Use global currency display type when creating Creem checkout payloads.
* 🔧 chore: Unify subscription plan status toggle with PATCH endpoint
Replace separate enable/disable flows with a single PATCH API that updates the enabled flag.
Update frontend hooks and table actions to call the unified endpoint and keep UI behavior consistent.
Introduce a minimal admin controller handler and route for the status update.
* ✨ feat: Add subscription limits and UI tags consistency
Add per-plan purchase limits with backend enforcement and UI disable states.
Expose limit configuration in admin plan editor and show limits in plan tables/cards.
Refine subscription UI tags with unified badge style and streamlined “My Subscriptions” layout.
* 🎨 style: tag color to white
* 🚀 refactor: Simplify subscription quota to total amount model
Remove per-model subscription items and switch to a single total quota per plan and user subscription. Update billing, reset, and logging flows to operate on total quota, and refactor admin/user UI to configure and display total quota consistently.
* 🚀 chore: Remove duplicate subscription usage percentage display
Keep the usage percentage shown only in the total quota line to avoid redundant “已用 0%” text while preserving remaining days in the summary.
* ✨ feat: Add subscription upgrade group with auto downgrade
* ✨ feat: Update subscription purchase modal display
Show total quota as currency with tooltip for raw quota, hide reset cycle when never, and display upgrade group when configured to match card display rules.
* ✨ feat: Extract quota conversion helpers to shared utils
Move quota display/conversion helpers into web/src/helpers/quota.js and update the subscription plan editor to import and use the shared utilities instead of inline functions.
* ✨ chore: Add upgrade group guidance in subscription editor
Add explanatory helper text under the upgrade group field to clarify automatic group upgrades, rollback conditions, and the expected delay before downgrading takes effect.
* 🔧 chore: remove unused Creem settings state
Drop the unused originInputs state and redundant updates to keep the Creem
settings form state minimal and easier to maintain.
* 🚀 chore: Remove useless action
* ✨ Add full i18n coverage for subscription-related UI across locales
* ✨ feat: harden subscription billing and improve UI consistency
Improve subscription payment safety and data integrity by handling user/URL lookup failures, fixing Stripe subscription mode, persisting quota reset fields, and correcting subscription delta accounting and DB timestamp casting. Refine the UI with stricter custom duration validation, accurate currency rounding, conditional Epay labeling, rollback on preference update failure, and shared subscription formatting helpers plus clearer component naming.
* 🔧 fix: make epay webhook and return flow subscription-aware
Ensure Epay webhook acknowledges success only after order completion, returning fail on processing errors to allow retries. Redirect subscription payment returns to the subscription page instead of top-up for correct user flow.
* 🚦 fix: guard epay return success on order completion
Redirect subscription return flow to failure when order completion fails, preventing false success states after payment verification.
* 🔧 fix: normalize epay error handling and webhook retries
Standardize SubscriptionRequestEpay error responses via ApiErrorMsg for a consistent schema.
Return "fail" on non-success trade statuses in the epay webhook to preserve retry behavior.
* 🧾 fix: persist epay orders before purchase
Create the subscription order before initiating epay payment and expire it if the provider call fails, preventing orphaned transactions and improving reconciliation.
* 🔧 fix: harden epay callbacks and billing fallbacks
Use POST and form parsing for epay notify/return routes, persist epay orders before provider calls with expiry on failure, and ensure notify handlers retry correctly.
Restrict subscription-first fallback to insufficient-subscription errors and log refund failures after retries to avoid silent quota drift.
* 🔧 fix: harden billing flow and sidebar settings
Add missing strings import for subscription fallback checks, log failed subscription refunds after retries, and extend sidebar module settings with a subscription management toggle plus translations.
* 🛡️ fix: fail fast on epay form parse errors
Handle ParseForm errors in epay notify/return handlers by returning fail or redirecting to failure, avoiding unsafe fallback to query parameters.
* ✨ fix: refine Japanese subscription status labels
Adjust Japanese UI wording for active-count labels to read more naturally and consistently.
* ✅ fix: standardize epay success response schema
Return subscription epay pay success responses via ApiSuccess to include the consistent success field and align with error schema.
2026-02-03 17:40:43 +08:00
|
|
|
{
|
|
|
|
|
text: t('订阅管理'),
|
|
|
|
|
itemKey: 'subscription',
|
|
|
|
|
to: '/subscription',
|
|
|
|
|
className: isAdmin() ? '' : 'tableHiddle',
|
|
|
|
|
},
|
2025-09-01 23:43:39 +08:00
|
|
|
{
|
|
|
|
|
text: t('模型管理'),
|
|
|
|
|
itemKey: 'models',
|
|
|
|
|
to: '/console/models',
|
|
|
|
|
className: isAdmin() ? '' : 'tableHiddle',
|
|
|
|
|
},
|
2025-12-28 15:55:35 +08:00
|
|
|
{
|
|
|
|
|
text: t('模型部署'),
|
|
|
|
|
itemKey: 'deployment',
|
|
|
|
|
to: '/deployment',
|
|
|
|
|
className: isAdmin() ? '' : 'tableHiddle',
|
|
|
|
|
},
|
2025-09-01 23:43:39 +08:00
|
|
|
{
|
|
|
|
|
text: t('兑换码管理'),
|
|
|
|
|
itemKey: 'redemption',
|
|
|
|
|
to: '/redemption',
|
|
|
|
|
className: isAdmin() ? '' : 'tableHiddle',
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
text: t('用户管理'),
|
|
|
|
|
itemKey: 'user',
|
|
|
|
|
to: '/user',
|
|
|
|
|
className: isAdmin() ? '' : 'tableHiddle',
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
text: t('系统设置'),
|
|
|
|
|
itemKey: 'setting',
|
|
|
|
|
to: '/setting',
|
|
|
|
|
className: isRoot() ? '' : 'tableHiddle',
|
|
|
|
|
},
|
|
|
|
|
];
|
|
|
|
|
|
|
|
|
|
// 根据配置过滤项目
|
|
|
|
|
const filteredItems = items.filter((item) => {
|
|
|
|
|
const configVisible = isModuleVisible('admin', item.itemKey);
|
|
|
|
|
return configVisible;
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
return filteredItems;
|
|
|
|
|
}, [isAdmin(), isRoot(), t, isModuleVisible]);
|
|
|
|
|
|
|
|
|
|
const chatMenuItems = useMemo(() => {
|
|
|
|
|
const items = [
|
|
|
|
|
{
|
|
|
|
|
text: t('操练场'),
|
|
|
|
|
itemKey: 'playground',
|
|
|
|
|
to: '/playground',
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
text: t('聊天'),
|
|
|
|
|
itemKey: 'chat',
|
|
|
|
|
items: chatItems,
|
|
|
|
|
},
|
|
|
|
|
];
|
|
|
|
|
|
|
|
|
|
// 根据配置过滤项目
|
|
|
|
|
const filteredItems = items.filter((item) => {
|
|
|
|
|
const configVisible = isModuleVisible('chat', item.itemKey);
|
|
|
|
|
return configVisible;
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
return filteredItems;
|
|
|
|
|
}, [chatItems, t, isModuleVisible]);
|
2024-01-07 23:54:51 +08:00
|
|
|
|
2025-06-06 20:55:52 +08:00
|
|
|
// 更新路由映射,添加聊天路由
|
2025-03-11 14:55:48 +08:00
|
|
|
const updateRouterMapWithChats = (chats) => {
|
|
|
|
|
const newRouterMap = { ...routerMap };
|
2025-04-04 12:00:38 +08:00
|
|
|
|
2025-03-11 14:55:48 +08:00
|
|
|
if (Array.isArray(chats) && chats.length > 0) {
|
|
|
|
|
for (let i = 0; i < chats.length; i++) {
|
2025-06-02 04:16:48 +08:00
|
|
|
newRouterMap['chat' + i] = '/console/chat/' + i;
|
2025-03-11 14:55:48 +08:00
|
|
|
}
|
2024-03-17 16:37:19 +08:00
|
|
|
}
|
2025-04-04 12:00:38 +08:00
|
|
|
|
2025-03-11 14:55:48 +08:00
|
|
|
setRouterMapState(newRouterMap);
|
|
|
|
|
return newRouterMap;
|
|
|
|
|
};
|
2025-03-07 17:22:37 +08:00
|
|
|
|
2025-06-06 20:55:52 +08:00
|
|
|
// 加载聊天项
|
2025-03-10 20:14:23 +08:00
|
|
|
useEffect(() => {
|
2025-03-09 18:31:16 +08:00
|
|
|
let chats = localStorage.getItem('chats');
|
|
|
|
|
if (chats) {
|
|
|
|
|
try {
|
|
|
|
|
chats = JSON.parse(chats);
|
|
|
|
|
if (Array.isArray(chats)) {
|
|
|
|
|
let chatItems = [];
|
|
|
|
|
for (let i = 0; i < chats.length; i++) {
|
2025-08-09 20:58:28 +08:00
|
|
|
let shouldSkip = false;
|
2025-03-09 18:31:16 +08:00
|
|
|
let chat = {};
|
|
|
|
|
for (let key in chats[i]) {
|
2025-08-09 20:58:28 +08:00
|
|
|
let link = chats[i][key];
|
|
|
|
|
if (typeof link !== 'string') continue; // 确保链接是字符串
|
|
|
|
|
if (link.startsWith('fluent')) {
|
|
|
|
|
shouldSkip = true;
|
2025-08-09 21:06:25 +08:00
|
|
|
break; // 跳过 Fluent Read
|
2025-08-09 20:58:28 +08:00
|
|
|
}
|
2025-03-09 18:31:16 +08:00
|
|
|
chat.text = key;
|
|
|
|
|
chat.itemKey = 'chat' + i;
|
2025-06-02 04:16:48 +08:00
|
|
|
chat.to = '/console/chat/' + i;
|
2024-10-12 21:06:49 +08:00
|
|
|
}
|
2025-08-09 21:06:25 +08:00
|
|
|
if (shouldSkip || !chat.text) continue; // 避免推入空项
|
2025-03-09 18:31:16 +08:00
|
|
|
chatItems.push(chat);
|
2025-03-07 17:22:37 +08:00
|
|
|
}
|
2025-03-09 18:31:16 +08:00
|
|
|
setChatItems(chatItems);
|
2025-03-11 14:55:48 +08:00
|
|
|
updateRouterMapWithChats(chats);
|
2024-10-12 21:06:49 +08:00
|
|
|
}
|
2025-03-09 18:31:16 +08:00
|
|
|
} catch (e) {
|
2025-04-04 12:00:38 +08:00
|
|
|
showError('聊天数据解析失败');
|
2025-03-07 17:22:37 +08:00
|
|
|
}
|
2024-10-12 21:06:49 +08:00
|
|
|
}
|
2025-03-11 14:55:48 +08:00
|
|
|
}, []);
|
|
|
|
|
|
2025-06-06 20:55:52 +08:00
|
|
|
// 根据当前路径设置选中的菜单项
|
2025-03-11 14:55:48 +08:00
|
|
|
useEffect(() => {
|
|
|
|
|
const currentPath = location.pathname;
|
2025-04-04 12:00:38 +08:00
|
|
|
let matchingKey = Object.keys(routerMapState).find(
|
|
|
|
|
(key) => routerMapState[key] === currentPath,
|
|
|
|
|
);
|
2025-03-11 14:55:48 +08:00
|
|
|
|
2025-06-06 20:55:52 +08:00
|
|
|
// 处理聊天路由
|
2025-06-02 04:16:48 +08:00
|
|
|
if (!matchingKey && currentPath.startsWith('/console/chat/')) {
|
2025-03-11 14:55:48 +08:00
|
|
|
const chatIndex = currentPath.split('/').pop();
|
|
|
|
|
if (!isNaN(chatIndex)) {
|
|
|
|
|
matchingKey = 'chat' + chatIndex;
|
|
|
|
|
} else {
|
|
|
|
|
matchingKey = 'chat';
|
|
|
|
|
}
|
|
|
|
|
}
|
2025-03-07 17:22:37 +08:00
|
|
|
|
2025-06-06 20:55:52 +08:00
|
|
|
// 如果找到匹配的键,更新选中的键
|
2025-03-11 14:55:48 +08:00
|
|
|
if (matchingKey) {
|
|
|
|
|
setSelectedKeys([matchingKey]);
|
|
|
|
|
}
|
|
|
|
|
}, [location.pathname, routerMapState]);
|
|
|
|
|
|
📱 refactor(web): remove legacy isMobile util and migrate to useIsMobile hook
BREAKING CHANGE:
helpers/utils.js no longer exports `isMobile()`.
Any external code that relied on this function must switch to the `useIsMobile` React hook.
Summary
-------
1. Deleted the obsolete `isMobile()` function from helpers/utils.js.
2. Introduced `MOBILE_BREAKPOINT` constant and `matchMedia`-based detection for non-React contexts.
3. Reworked toast positioning logic in utils.js to rely on `matchMedia`.
4. Updated render.js:
• Removed isMobile import.
• Added MOBILE_BREAKPOINT detection in `truncateText`.
5. Migrated every page/component to the `useIsMobile` hook:
• Layout: HeaderBar, PageLayout, SiderBar
• Pages: Home, Detail, Playground, User (Add/Edit), Token, Channel, Redemption, Ratio Sync
• Components: ChannelsTable, ChannelSelectorModal, ConflictConfirmModal
6. Purged all remaining `isMobile()` calls and legacy imports.
7. Added missing `const isMobile = useIsMobile()` declarations where required.
Benefits
--------
• Unifies mobile detection with a React-friendly hook.
• Eliminates duplicated logic and improves maintainability.
• Keeps non-React helpers lightweight by using `matchMedia` directly.
2025-07-16 02:54:58 +08:00
|
|
|
// 监控折叠状态变化以更新 body class
|
2025-03-11 14:55:48 +08:00
|
|
|
useEffect(() => {
|
📱 refactor(web): remove legacy isMobile util and migrate to useIsMobile hook
BREAKING CHANGE:
helpers/utils.js no longer exports `isMobile()`.
Any external code that relied on this function must switch to the `useIsMobile` React hook.
Summary
-------
1. Deleted the obsolete `isMobile()` function from helpers/utils.js.
2. Introduced `MOBILE_BREAKPOINT` constant and `matchMedia`-based detection for non-React contexts.
3. Reworked toast positioning logic in utils.js to rely on `matchMedia`.
4. Updated render.js:
• Removed isMobile import.
• Added MOBILE_BREAKPOINT detection in `truncateText`.
5. Migrated every page/component to the `useIsMobile` hook:
• Layout: HeaderBar, PageLayout, SiderBar
• Pages: Home, Detail, Playground, User (Add/Edit), Token, Channel, Redemption, Ratio Sync
• Components: ChannelsTable, ChannelSelectorModal, ConflictConfirmModal
6. Purged all remaining `isMobile()` calls and legacy imports.
7. Added missing `const isMobile = useIsMobile()` declarations where required.
Benefits
--------
• Unifies mobile detection with a React-friendly hook.
• Eliminates duplicated logic and improves maintainability.
• Keeps non-React helpers lightweight by using `matchMedia` directly.
2025-07-16 02:54:58 +08:00
|
|
|
if (collapsed) {
|
|
|
|
|
document.body.classList.add('sidebar-collapsed');
|
|
|
|
|
} else {
|
|
|
|
|
document.body.classList.remove('sidebar-collapsed');
|
|
|
|
|
}
|
|
|
|
|
}, [collapsed]);
|
2023-10-31 00:03:22 +08:00
|
|
|
|
2025-08-01 02:50:06 +08:00
|
|
|
// 选中高亮颜色(统一)
|
|
|
|
|
const SELECTED_COLOR = 'var(--semi-color-primary)';
|
2025-03-07 17:22:37 +08:00
|
|
|
|
2025-06-06 20:55:52 +08:00
|
|
|
// 渲染自定义菜单项
|
|
|
|
|
const renderNavItem = (item) => {
|
|
|
|
|
// 跳过隐藏的项目
|
|
|
|
|
if (item.className === 'tableHiddle') return null;
|
|
|
|
|
|
|
|
|
|
const isSelected = selectedKeys.includes(item.itemKey);
|
2025-08-01 02:50:06 +08:00
|
|
|
const textColor = isSelected ? SELECTED_COLOR : 'inherit';
|
2025-06-06 20:55:52 +08:00
|
|
|
|
|
|
|
|
return (
|
|
|
|
|
<Nav.Item
|
|
|
|
|
key={item.itemKey}
|
|
|
|
|
itemKey={item.itemKey}
|
|
|
|
|
text={
|
2025-09-02 17:07:01 +08:00
|
|
|
<span
|
|
|
|
|
className='truncate font-medium text-sm'
|
|
|
|
|
style={{ color: textColor }}
|
|
|
|
|
>
|
|
|
|
|
{item.text}
|
|
|
|
|
</span>
|
2025-06-06 20:55:52 +08:00
|
|
|
}
|
|
|
|
|
icon={
|
2025-08-30 21:15:10 +08:00
|
|
|
<div className='sidebar-icon-container flex-shrink-0'>
|
2025-06-06 20:55:52 +08:00
|
|
|
{getLucideIcon(item.itemKey, isSelected)}
|
|
|
|
|
</div>
|
|
|
|
|
}
|
|
|
|
|
className={item.className}
|
|
|
|
|
/>
|
|
|
|
|
);
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
// 渲染子菜单项
|
|
|
|
|
const renderSubItem = (item) => {
|
|
|
|
|
if (item.items && item.items.length > 0) {
|
|
|
|
|
const isSelected = selectedKeys.includes(item.itemKey);
|
2025-08-01 02:50:06 +08:00
|
|
|
const textColor = isSelected ? SELECTED_COLOR : 'inherit';
|
2025-06-06 20:55:52 +08:00
|
|
|
|
|
|
|
|
return (
|
|
|
|
|
<Nav.Sub
|
|
|
|
|
key={item.itemKey}
|
|
|
|
|
itemKey={item.itemKey}
|
|
|
|
|
text={
|
2025-09-02 17:07:01 +08:00
|
|
|
<span
|
|
|
|
|
className='truncate font-medium text-sm'
|
|
|
|
|
style={{ color: textColor }}
|
|
|
|
|
>
|
|
|
|
|
{item.text}
|
|
|
|
|
</span>
|
2025-06-06 20:55:52 +08:00
|
|
|
}
|
|
|
|
|
icon={
|
2025-08-30 21:15:10 +08:00
|
|
|
<div className='sidebar-icon-container flex-shrink-0'>
|
2025-06-06 20:55:52 +08:00
|
|
|
{getLucideIcon(item.itemKey, isSelected)}
|
|
|
|
|
</div>
|
|
|
|
|
}
|
|
|
|
|
>
|
|
|
|
|
{item.items.map((subItem) => {
|
|
|
|
|
const isSubSelected = selectedKeys.includes(subItem.itemKey);
|
2025-08-01 02:50:06 +08:00
|
|
|
const subTextColor = isSubSelected ? SELECTED_COLOR : 'inherit';
|
2025-06-06 20:55:52 +08:00
|
|
|
|
|
|
|
|
return (
|
|
|
|
|
<Nav.Item
|
|
|
|
|
key={subItem.itemKey}
|
|
|
|
|
itemKey={subItem.itemKey}
|
|
|
|
|
text={
|
2025-08-30 21:15:10 +08:00
|
|
|
<span
|
|
|
|
|
className='truncate font-medium text-sm'
|
|
|
|
|
style={{ color: subTextColor }}
|
|
|
|
|
>
|
2025-06-06 20:55:52 +08:00
|
|
|
{subItem.text}
|
|
|
|
|
</span>
|
|
|
|
|
}
|
|
|
|
|
/>
|
|
|
|
|
);
|
|
|
|
|
})}
|
|
|
|
|
</Nav.Sub>
|
|
|
|
|
);
|
|
|
|
|
} else {
|
|
|
|
|
return renderNavItem(item);
|
|
|
|
|
}
|
2025-03-07 17:22:37 +08:00
|
|
|
};
|
|
|
|
|
|
2024-03-15 16:05:33 +08:00
|
|
|
return (
|
2025-06-06 20:55:52 +08:00
|
|
|
<div
|
2025-08-30 21:15:10 +08:00
|
|
|
className='sidebar-container'
|
2025-09-02 17:07:01 +08:00
|
|
|
style={{
|
|
|
|
|
width: 'var(--sidebar-current-width)',
|
|
|
|
|
}}
|
2025-06-06 20:55:52 +08:00
|
|
|
>
|
✨ feat: Add skeleton loading states for sidebar navigation
Add comprehensive skeleton screen implementation for sidebar to improve loading UX, matching the existing headerbar skeleton pattern.
## Features Added
- **Sidebar skeleton screens**: Complete 1:1 recreation of sidebar structure during loading
- **Responsive skeleton layouts**: Different layouts for expanded (164×30px) and collapsed (44×44px) states
- **Skeleton component enhancements**: Extended SkeletonWrapper with new skeleton types (sidebar, button, sidebarNavItem, sidebarGroupTitle)
- **Minimum loading time**: Integrated useMinimumLoadingTime hook with 500ms duration for smooth UX
## Layout Specifications
- **Expanded nav items**: 164×30px with 8px horizontal margins and 3px vertical margins
- **Collapsed nav items**: 44×44px with 4px bottom margin and 8px horizontal margins
- **Collapse button**: 156×24px (expanded) / 36×24px (collapsed) with rounded corners
- **Container padding**: 12px top padding, 8px horizontal margins
- **Group labels**: 4px 15px 8px padding matching real sidebar-group-label styles
## Code Improvements
- **Refactored skeleton rendering**: Eliminated code duplication using reusable components (NavRow, CollapsedRow)
- **Configuration-driven sections**: Sections defined as config objects with title widths and item widths
- **Fixed width calculations**: Removed random width generation, using precise fixed widths per menu item
- **Proper CSS class alignment**: Uses real sidebar CSS classes (sidebar-section, sidebar-group-label, sidebar-divider)
## UI/UX Enhancements
- **Bottom-aligned collapse button**: Fixed positioning using margin-top: auto to stay at viewport bottom
- **Accurate spacing**: Matches real sidebar margins, padding, and spacing exactly
- **Skeleton stability**: Fixed width values prevent layout shifts during loading
- **Clean file structure**: Removed redundant HeaderBar.js export file
## Technical Details
- Extended SkeletonWrapper component with sidebar-specific skeleton types
- Integrated skeleton loading state management in SiderBar component
- Added support for collapsed state awareness in skeleton rendering
- Implemented precise dimension matching for pixel-perfect loading states
Closes: Sidebar skeleton loading implementation
2025-09-02 03:38:01 +08:00
|
|
|
<SkeletonWrapper
|
|
|
|
|
loading={showSkeleton}
|
|
|
|
|
type='sidebar'
|
|
|
|
|
className=''
|
|
|
|
|
collapsed={collapsed}
|
|
|
|
|
showAdmin={isAdmin()}
|
2025-03-07 17:22:37 +08:00
|
|
|
>
|
✨ feat: Add skeleton loading states for sidebar navigation
Add comprehensive skeleton screen implementation for sidebar to improve loading UX, matching the existing headerbar skeleton pattern.
## Features Added
- **Sidebar skeleton screens**: Complete 1:1 recreation of sidebar structure during loading
- **Responsive skeleton layouts**: Different layouts for expanded (164×30px) and collapsed (44×44px) states
- **Skeleton component enhancements**: Extended SkeletonWrapper with new skeleton types (sidebar, button, sidebarNavItem, sidebarGroupTitle)
- **Minimum loading time**: Integrated useMinimumLoadingTime hook with 500ms duration for smooth UX
## Layout Specifications
- **Expanded nav items**: 164×30px with 8px horizontal margins and 3px vertical margins
- **Collapsed nav items**: 44×44px with 4px bottom margin and 8px horizontal margins
- **Collapse button**: 156×24px (expanded) / 36×24px (collapsed) with rounded corners
- **Container padding**: 12px top padding, 8px horizontal margins
- **Group labels**: 4px 15px 8px padding matching real sidebar-group-label styles
## Code Improvements
- **Refactored skeleton rendering**: Eliminated code duplication using reusable components (NavRow, CollapsedRow)
- **Configuration-driven sections**: Sections defined as config objects with title widths and item widths
- **Fixed width calculations**: Removed random width generation, using precise fixed widths per menu item
- **Proper CSS class alignment**: Uses real sidebar CSS classes (sidebar-section, sidebar-group-label, sidebar-divider)
## UI/UX Enhancements
- **Bottom-aligned collapse button**: Fixed positioning using margin-top: auto to stay at viewport bottom
- **Accurate spacing**: Matches real sidebar margins, padding, and spacing exactly
- **Skeleton stability**: Fixed width values prevent layout shifts during loading
- **Clean file structure**: Removed redundant HeaderBar.js export file
## Technical Details
- Extended SkeletonWrapper component with sidebar-specific skeleton types
- Integrated skeleton loading state management in SiderBar component
- Added support for collapsed state awareness in skeleton rendering
- Implemented precise dimension matching for pixel-perfect loading states
Closes: Sidebar skeleton loading implementation
2025-09-02 03:38:01 +08:00
|
|
|
<Nav
|
|
|
|
|
className='sidebar-nav'
|
|
|
|
|
defaultIsCollapsed={collapsed}
|
|
|
|
|
isCollapsed={collapsed}
|
|
|
|
|
onCollapseChange={toggleCollapsed}
|
|
|
|
|
selectedKeys={selectedKeys}
|
|
|
|
|
itemStyle='sidebar-nav-item'
|
|
|
|
|
hoverStyle='sidebar-nav-item:hover'
|
|
|
|
|
selectedStyle='sidebar-nav-item-selected'
|
|
|
|
|
renderWrapper={({ itemElement, props }) => {
|
|
|
|
|
const to =
|
|
|
|
|
routerMapState[props.itemKey] || routerMap[props.itemKey];
|
|
|
|
|
|
|
|
|
|
// 如果没有路由,直接返回元素
|
|
|
|
|
if (!to) return itemElement;
|
2025-06-06 20:55:52 +08:00
|
|
|
|
✨ feat: Add skeleton loading states for sidebar navigation
Add comprehensive skeleton screen implementation for sidebar to improve loading UX, matching the existing headerbar skeleton pattern.
## Features Added
- **Sidebar skeleton screens**: Complete 1:1 recreation of sidebar structure during loading
- **Responsive skeleton layouts**: Different layouts for expanded (164×30px) and collapsed (44×44px) states
- **Skeleton component enhancements**: Extended SkeletonWrapper with new skeleton types (sidebar, button, sidebarNavItem, sidebarGroupTitle)
- **Minimum loading time**: Integrated useMinimumLoadingTime hook with 500ms duration for smooth UX
## Layout Specifications
- **Expanded nav items**: 164×30px with 8px horizontal margins and 3px vertical margins
- **Collapsed nav items**: 44×44px with 4px bottom margin and 8px horizontal margins
- **Collapse button**: 156×24px (expanded) / 36×24px (collapsed) with rounded corners
- **Container padding**: 12px top padding, 8px horizontal margins
- **Group labels**: 4px 15px 8px padding matching real sidebar-group-label styles
## Code Improvements
- **Refactored skeleton rendering**: Eliminated code duplication using reusable components (NavRow, CollapsedRow)
- **Configuration-driven sections**: Sections defined as config objects with title widths and item widths
- **Fixed width calculations**: Removed random width generation, using precise fixed widths per menu item
- **Proper CSS class alignment**: Uses real sidebar CSS classes (sidebar-section, sidebar-group-label, sidebar-divider)
## UI/UX Enhancements
- **Bottom-aligned collapse button**: Fixed positioning using margin-top: auto to stay at viewport bottom
- **Accurate spacing**: Matches real sidebar margins, padding, and spacing exactly
- **Skeleton stability**: Fixed width values prevent layout shifts during loading
- **Clean file structure**: Removed redundant HeaderBar.js export file
## Technical Details
- Extended SkeletonWrapper component with sidebar-specific skeleton types
- Integrated skeleton loading state management in SiderBar component
- Added support for collapsed state awareness in skeleton rendering
- Implemented precise dimension matching for pixel-perfect loading states
Closes: Sidebar skeleton loading implementation
2025-09-02 03:38:01 +08:00
|
|
|
return (
|
|
|
|
|
<Link
|
|
|
|
|
style={{ textDecoration: 'none' }}
|
|
|
|
|
to={to}
|
|
|
|
|
onClick={onNavigate}
|
|
|
|
|
>
|
|
|
|
|
{itemElement}
|
|
|
|
|
</Link>
|
|
|
|
|
);
|
|
|
|
|
}}
|
|
|
|
|
onSelect={(key) => {
|
|
|
|
|
// 如果点击的是已经展开的子菜单的父项,则收起子菜单
|
|
|
|
|
if (openedKeys.includes(key.itemKey)) {
|
|
|
|
|
setOpenedKeys(openedKeys.filter((k) => k !== key.itemKey));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
setSelectedKeys([key.itemKey]);
|
|
|
|
|
}}
|
|
|
|
|
openKeys={openedKeys}
|
|
|
|
|
onOpenChange={(data) => {
|
|
|
|
|
setOpenedKeys(data.openKeys);
|
|
|
|
|
}}
|
|
|
|
|
>
|
|
|
|
|
{/* 聊天区域 */}
|
|
|
|
|
{hasSectionVisibleModules('chat') && (
|
|
|
|
|
<div className='sidebar-section'>
|
📱 refactor(web): remove legacy isMobile util and migrate to useIsMobile hook
BREAKING CHANGE:
helpers/utils.js no longer exports `isMobile()`.
Any external code that relied on this function must switch to the `useIsMobile` React hook.
Summary
-------
1. Deleted the obsolete `isMobile()` function from helpers/utils.js.
2. Introduced `MOBILE_BREAKPOINT` constant and `matchMedia`-based detection for non-React contexts.
3. Reworked toast positioning logic in utils.js to rely on `matchMedia`.
4. Updated render.js:
• Removed isMobile import.
• Added MOBILE_BREAKPOINT detection in `truncateText`.
5. Migrated every page/component to the `useIsMobile` hook:
• Layout: HeaderBar, PageLayout, SiderBar
• Pages: Home, Detail, Playground, User (Add/Edit), Token, Channel, Redemption, Ratio Sync
• Components: ChannelsTable, ChannelSelectorModal, ConflictConfirmModal
6. Purged all remaining `isMobile()` calls and legacy imports.
7. Added missing `const isMobile = useIsMobile()` declarations where required.
Benefits
--------
• Unifies mobile detection with a React-friendly hook.
• Eliminates duplicated logic and improves maintainability.
• Keeps non-React helpers lightweight by using `matchMedia` directly.
2025-07-16 02:54:58 +08:00
|
|
|
{!collapsed && (
|
✨ feat: Add skeleton loading states for sidebar navigation
Add comprehensive skeleton screen implementation for sidebar to improve loading UX, matching the existing headerbar skeleton pattern.
## Features Added
- **Sidebar skeleton screens**: Complete 1:1 recreation of sidebar structure during loading
- **Responsive skeleton layouts**: Different layouts for expanded (164×30px) and collapsed (44×44px) states
- **Skeleton component enhancements**: Extended SkeletonWrapper with new skeleton types (sidebar, button, sidebarNavItem, sidebarGroupTitle)
- **Minimum loading time**: Integrated useMinimumLoadingTime hook with 500ms duration for smooth UX
## Layout Specifications
- **Expanded nav items**: 164×30px with 8px horizontal margins and 3px vertical margins
- **Collapsed nav items**: 44×44px with 4px bottom margin and 8px horizontal margins
- **Collapse button**: 156×24px (expanded) / 36×24px (collapsed) with rounded corners
- **Container padding**: 12px top padding, 8px horizontal margins
- **Group labels**: 4px 15px 8px padding matching real sidebar-group-label styles
## Code Improvements
- **Refactored skeleton rendering**: Eliminated code duplication using reusable components (NavRow, CollapsedRow)
- **Configuration-driven sections**: Sections defined as config objects with title widths and item widths
- **Fixed width calculations**: Removed random width generation, using precise fixed widths per menu item
- **Proper CSS class alignment**: Uses real sidebar CSS classes (sidebar-section, sidebar-group-label, sidebar-divider)
## UI/UX Enhancements
- **Bottom-aligned collapse button**: Fixed positioning using margin-top: auto to stay at viewport bottom
- **Accurate spacing**: Matches real sidebar margins, padding, and spacing exactly
- **Skeleton stability**: Fixed width values prevent layout shifts during loading
- **Clean file structure**: Removed redundant HeaderBar.js export file
## Technical Details
- Extended SkeletonWrapper component with sidebar-specific skeleton types
- Integrated skeleton loading state management in SiderBar component
- Added support for collapsed state awareness in skeleton rendering
- Implemented precise dimension matching for pixel-perfect loading states
Closes: Sidebar skeleton loading implementation
2025-09-02 03:38:01 +08:00
|
|
|
<div className='sidebar-group-label'>{t('聊天')}</div>
|
2025-06-06 20:55:52 +08:00
|
|
|
)}
|
✨ feat: Add skeleton loading states for sidebar navigation
Add comprehensive skeleton screen implementation for sidebar to improve loading UX, matching the existing headerbar skeleton pattern.
## Features Added
- **Sidebar skeleton screens**: Complete 1:1 recreation of sidebar structure during loading
- **Responsive skeleton layouts**: Different layouts for expanded (164×30px) and collapsed (44×44px) states
- **Skeleton component enhancements**: Extended SkeletonWrapper with new skeleton types (sidebar, button, sidebarNavItem, sidebarGroupTitle)
- **Minimum loading time**: Integrated useMinimumLoadingTime hook with 500ms duration for smooth UX
## Layout Specifications
- **Expanded nav items**: 164×30px with 8px horizontal margins and 3px vertical margins
- **Collapsed nav items**: 44×44px with 4px bottom margin and 8px horizontal margins
- **Collapse button**: 156×24px (expanded) / 36×24px (collapsed) with rounded corners
- **Container padding**: 12px top padding, 8px horizontal margins
- **Group labels**: 4px 15px 8px padding matching real sidebar-group-label styles
## Code Improvements
- **Refactored skeleton rendering**: Eliminated code duplication using reusable components (NavRow, CollapsedRow)
- **Configuration-driven sections**: Sections defined as config objects with title widths and item widths
- **Fixed width calculations**: Removed random width generation, using precise fixed widths per menu item
- **Proper CSS class alignment**: Uses real sidebar CSS classes (sidebar-section, sidebar-group-label, sidebar-divider)
## UI/UX Enhancements
- **Bottom-aligned collapse button**: Fixed positioning using margin-top: auto to stay at viewport bottom
- **Accurate spacing**: Matches real sidebar margins, padding, and spacing exactly
- **Skeleton stability**: Fixed width values prevent layout shifts during loading
- **Clean file structure**: Removed redundant HeaderBar.js export file
## Technical Details
- Extended SkeletonWrapper component with sidebar-specific skeleton types
- Integrated skeleton loading state management in SiderBar component
- Added support for collapsed state awareness in skeleton rendering
- Implemented precise dimension matching for pixel-perfect loading states
Closes: Sidebar skeleton loading implementation
2025-09-02 03:38:01 +08:00
|
|
|
{chatMenuItems.map((item) => renderSubItem(item))}
|
2025-06-06 20:55:52 +08:00
|
|
|
</div>
|
✨ feat: Add skeleton loading states for sidebar navigation
Add comprehensive skeleton screen implementation for sidebar to improve loading UX, matching the existing headerbar skeleton pattern.
## Features Added
- **Sidebar skeleton screens**: Complete 1:1 recreation of sidebar structure during loading
- **Responsive skeleton layouts**: Different layouts for expanded (164×30px) and collapsed (44×44px) states
- **Skeleton component enhancements**: Extended SkeletonWrapper with new skeleton types (sidebar, button, sidebarNavItem, sidebarGroupTitle)
- **Minimum loading time**: Integrated useMinimumLoadingTime hook with 500ms duration for smooth UX
## Layout Specifications
- **Expanded nav items**: 164×30px with 8px horizontal margins and 3px vertical margins
- **Collapsed nav items**: 44×44px with 4px bottom margin and 8px horizontal margins
- **Collapse button**: 156×24px (expanded) / 36×24px (collapsed) with rounded corners
- **Container padding**: 12px top padding, 8px horizontal margins
- **Group labels**: 4px 15px 8px padding matching real sidebar-group-label styles
## Code Improvements
- **Refactored skeleton rendering**: Eliminated code duplication using reusable components (NavRow, CollapsedRow)
- **Configuration-driven sections**: Sections defined as config objects with title widths and item widths
- **Fixed width calculations**: Removed random width generation, using precise fixed widths per menu item
- **Proper CSS class alignment**: Uses real sidebar CSS classes (sidebar-section, sidebar-group-label, sidebar-divider)
## UI/UX Enhancements
- **Bottom-aligned collapse button**: Fixed positioning using margin-top: auto to stay at viewport bottom
- **Accurate spacing**: Matches real sidebar margins, padding, and spacing exactly
- **Skeleton stability**: Fixed width values prevent layout shifts during loading
- **Clean file structure**: Removed redundant HeaderBar.js export file
## Technical Details
- Extended SkeletonWrapper component with sidebar-specific skeleton types
- Integrated skeleton loading state management in SiderBar component
- Added support for collapsed state awareness in skeleton rendering
- Implemented precise dimension matching for pixel-perfect loading states
Closes: Sidebar skeleton loading implementation
2025-09-02 03:38:01 +08:00
|
|
|
)}
|
|
|
|
|
|
|
|
|
|
{/* 控制台区域 */}
|
|
|
|
|
{hasSectionVisibleModules('console') && (
|
|
|
|
|
<>
|
|
|
|
|
<Divider className='sidebar-divider' />
|
|
|
|
|
<div>
|
|
|
|
|
{!collapsed && (
|
|
|
|
|
<div className='sidebar-group-label'>{t('控制台')}</div>
|
|
|
|
|
)}
|
|
|
|
|
{workspaceItems.map((item) => renderNavItem(item))}
|
|
|
|
|
</div>
|
|
|
|
|
</>
|
|
|
|
|
)}
|
|
|
|
|
|
|
|
|
|
{/* 个人中心区域 */}
|
|
|
|
|
{hasSectionVisibleModules('personal') && (
|
|
|
|
|
<>
|
|
|
|
|
<Divider className='sidebar-divider' />
|
|
|
|
|
<div>
|
|
|
|
|
{!collapsed && (
|
|
|
|
|
<div className='sidebar-group-label'>{t('个人中心')}</div>
|
|
|
|
|
)}
|
|
|
|
|
{financeItems.map((item) => renderNavItem(item))}
|
|
|
|
|
</div>
|
|
|
|
|
</>
|
|
|
|
|
)}
|
|
|
|
|
|
|
|
|
|
{/* 管理员区域 - 只在管理员时显示且配置允许时显示 */}
|
|
|
|
|
{isAdmin() && hasSectionVisibleModules('admin') && (
|
|
|
|
|
<>
|
|
|
|
|
<Divider className='sidebar-divider' />
|
|
|
|
|
<div>
|
|
|
|
|
{!collapsed && (
|
|
|
|
|
<div className='sidebar-group-label'>{t('管理员')}</div>
|
|
|
|
|
)}
|
|
|
|
|
{adminItems.map((item) => renderNavItem(item))}
|
|
|
|
|
</div>
|
|
|
|
|
</>
|
|
|
|
|
)}
|
|
|
|
|
</Nav>
|
|
|
|
|
</SkeletonWrapper>
|
2025-06-06 20:55:52 +08:00
|
|
|
|
|
|
|
|
{/* 底部折叠按钮 */}
|
2025-08-30 21:15:10 +08:00
|
|
|
<div className='sidebar-collapse-button'>
|
✨ feat: Add skeleton loading states for sidebar navigation
Add comprehensive skeleton screen implementation for sidebar to improve loading UX, matching the existing headerbar skeleton pattern.
## Features Added
- **Sidebar skeleton screens**: Complete 1:1 recreation of sidebar structure during loading
- **Responsive skeleton layouts**: Different layouts for expanded (164×30px) and collapsed (44×44px) states
- **Skeleton component enhancements**: Extended SkeletonWrapper with new skeleton types (sidebar, button, sidebarNavItem, sidebarGroupTitle)
- **Minimum loading time**: Integrated useMinimumLoadingTime hook with 500ms duration for smooth UX
## Layout Specifications
- **Expanded nav items**: 164×30px with 8px horizontal margins and 3px vertical margins
- **Collapsed nav items**: 44×44px with 4px bottom margin and 8px horizontal margins
- **Collapse button**: 156×24px (expanded) / 36×24px (collapsed) with rounded corners
- **Container padding**: 12px top padding, 8px horizontal margins
- **Group labels**: 4px 15px 8px padding matching real sidebar-group-label styles
## Code Improvements
- **Refactored skeleton rendering**: Eliminated code duplication using reusable components (NavRow, CollapsedRow)
- **Configuration-driven sections**: Sections defined as config objects with title widths and item widths
- **Fixed width calculations**: Removed random width generation, using precise fixed widths per menu item
- **Proper CSS class alignment**: Uses real sidebar CSS classes (sidebar-section, sidebar-group-label, sidebar-divider)
## UI/UX Enhancements
- **Bottom-aligned collapse button**: Fixed positioning using margin-top: auto to stay at viewport bottom
- **Accurate spacing**: Matches real sidebar margins, padding, and spacing exactly
- **Skeleton stability**: Fixed width values prevent layout shifts during loading
- **Clean file structure**: Removed redundant HeaderBar.js export file
## Technical Details
- Extended SkeletonWrapper component with sidebar-specific skeleton types
- Integrated skeleton loading state management in SiderBar component
- Added support for collapsed state awareness in skeleton rendering
- Implemented precise dimension matching for pixel-perfect loading states
Closes: Sidebar skeleton loading implementation
2025-09-02 03:38:01 +08:00
|
|
|
<SkeletonWrapper
|
|
|
|
|
loading={showSkeleton}
|
|
|
|
|
type='button'
|
|
|
|
|
width={collapsed ? 36 : 156}
|
|
|
|
|
height={24}
|
|
|
|
|
className='w-full'
|
2025-07-16 04:35:19 +08:00
|
|
|
>
|
✨ feat: Add skeleton loading states for sidebar navigation
Add comprehensive skeleton screen implementation for sidebar to improve loading UX, matching the existing headerbar skeleton pattern.
## Features Added
- **Sidebar skeleton screens**: Complete 1:1 recreation of sidebar structure during loading
- **Responsive skeleton layouts**: Different layouts for expanded (164×30px) and collapsed (44×44px) states
- **Skeleton component enhancements**: Extended SkeletonWrapper with new skeleton types (sidebar, button, sidebarNavItem, sidebarGroupTitle)
- **Minimum loading time**: Integrated useMinimumLoadingTime hook with 500ms duration for smooth UX
## Layout Specifications
- **Expanded nav items**: 164×30px with 8px horizontal margins and 3px vertical margins
- **Collapsed nav items**: 44×44px with 4px bottom margin and 8px horizontal margins
- **Collapse button**: 156×24px (expanded) / 36×24px (collapsed) with rounded corners
- **Container padding**: 12px top padding, 8px horizontal margins
- **Group labels**: 4px 15px 8px padding matching real sidebar-group-label styles
## Code Improvements
- **Refactored skeleton rendering**: Eliminated code duplication using reusable components (NavRow, CollapsedRow)
- **Configuration-driven sections**: Sections defined as config objects with title widths and item widths
- **Fixed width calculations**: Removed random width generation, using precise fixed widths per menu item
- **Proper CSS class alignment**: Uses real sidebar CSS classes (sidebar-section, sidebar-group-label, sidebar-divider)
## UI/UX Enhancements
- **Bottom-aligned collapse button**: Fixed positioning using margin-top: auto to stay at viewport bottom
- **Accurate spacing**: Matches real sidebar margins, padding, and spacing exactly
- **Skeleton stability**: Fixed width values prevent layout shifts during loading
- **Clean file structure**: Removed redundant HeaderBar.js export file
## Technical Details
- Extended SkeletonWrapper component with sidebar-specific skeleton types
- Integrated skeleton loading state management in SiderBar component
- Added support for collapsed state awareness in skeleton rendering
- Implemented precise dimension matching for pixel-perfect loading states
Closes: Sidebar skeleton loading implementation
2025-09-02 03:38:01 +08:00
|
|
|
<Button
|
|
|
|
|
theme='outline'
|
|
|
|
|
type='tertiary'
|
|
|
|
|
size='small'
|
|
|
|
|
icon={
|
|
|
|
|
<ChevronLeft
|
|
|
|
|
size={16}
|
|
|
|
|
strokeWidth={2.5}
|
|
|
|
|
color='var(--semi-color-text-2)'
|
|
|
|
|
style={{
|
|
|
|
|
transform: collapsed ? 'rotate(180deg)' : 'rotate(0deg)',
|
|
|
|
|
}}
|
|
|
|
|
/>
|
|
|
|
|
}
|
|
|
|
|
onClick={toggleCollapsed}
|
|
|
|
|
icononly={collapsed}
|
|
|
|
|
style={
|
|
|
|
|
collapsed
|
|
|
|
|
? { width: 36, height: 24, padding: 0 }
|
|
|
|
|
: { padding: '4px 12px', width: '100%' }
|
|
|
|
|
}
|
|
|
|
|
>
|
|
|
|
|
{!collapsed ? t('收起侧边栏') : null}
|
|
|
|
|
</Button>
|
|
|
|
|
</SkeletonWrapper>
|
2025-06-06 20:55:52 +08:00
|
|
|
</div>
|
|
|
|
|
</div>
|
2024-03-15 16:05:33 +08:00
|
|
|
);
|
2023-10-31 00:03:22 +08:00
|
|
|
};
|
|
|
|
|
|
2023-11-25 17:30:46 +08:00
|
|
|
export default SiderBar;
|