Merge origin/master: resolve CSS conflicts, keep both sides

src/features/script-tokens/TokenUsagePage.tsx

@@ -142,6 +142,8 @@ function TokenUsagePage({
   onSelectView,
 }: TokenUsagePageProps) {
   const [enterpriseUsage, setEnterpriseUsage] = useState<WebEnterpriseUsageSummary | null>(null);
+  const [enterpriseUsageLoading, setEnterpriseUsageLoading] = useState(false);
+  const [enterpriseUsageError, setEnterpriseUsageError] = useState<string | null>(null);
   const isEnterpriseAdmin = session?.user.enterpriseRole === "admin";
   const isEnterpriseAccount = Boolean(session?.user.enterpriseId || session?.user.accountType === "enterprise");
 
@@ -152,10 +154,15 @@ function TokenUsagePage({
       setEnterpriseUsage(null);
       return;
     }
+    setEnterpriseUsageLoading(true);
+    setEnterpriseUsageError(null);
     try {
       setEnterpriseUsage(await loader());
     } catch (error) {
       setEnterpriseUsage(null);
+      setEnterpriseUsageError(error instanceof Error ? error.message : "加载失败");
+    } finally {
+      setEnterpriseUsageLoading(false);
     }
   }, [session, isEnterpriseAdmin, loadEnterpriseUsage, loadPersonalUsage]);