@tsingroc/tsingroc-components 3.14.1 → 4.1.0

package/src/components/UserButton.tsx

@@ -14,8 +14,13 @@ import {
 } from "@ant-design/icons";
 import type { Account } from "casdoor-js-sdk/lib/esm/sdk";
 
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-import { AuthCheck, AuthProvider, useAuth } from "./Auth";
+import {
+  AuthCheck, // eslint-disable-line @typescript-eslint/no-unused-vars
+  AuthProvider, // eslint-disable-line @typescript-eslint/no-unused-vars
+  type CasdoorAuth,
+  type LocalAuth,
+  useAuth,
+} from "./Auth";
 
 export interface UserButtonProps extends ButtonProps {
   /**
@@ -60,20 +65,22 @@ export interface UserButtonProps extends ButtonProps {
 function UserButton(props: UserButtonProps) {
   const { token } = theme.useToken();
   const auth = useAuth("UserButton");
-  const userInfo = auth.userInfo;
+  const userInfo = (auth as CasdoorAuth).userInfo;
   const {
     compact,
     layout = "sidebar",
-    onOpenProfile = () => {
-      const account =
-        auth.accessToken === undefined
-          ? undefined
-          : { accessToken: auth.accessToken };
-      location.href = auth.sdk.getMyProfileUrl(
-        account as Account,
-        location.href,
-      );
-    },
+    onOpenProfile = auth.mode === "casdoor"
+      ? () => {
+          const account =
+            auth.accessToken === undefined
+              ? undefined
+              : { accessToken: auth.accessToken };
+          location.href = auth.sdk.getMyProfileUrl(
+            account as Account,
+            location.href,
+          );
+        }
+      : undefined,
     onLogout = () => {
       auth.logout();
       location.href = "/";
@@ -88,13 +95,15 @@ function UserButton(props: UserButtonProps) {
       {...dropdownProps}
       menu={{
         items: [
-          {
-            key: "profile",
-            label: <>账户</>, // 如果使用字符串，在缩小时会被裁剪，即使宽度足够
-            icon: <UserOutlined />,
-            title: "", // 若不设置，在缩小时总是会显示工具提示，即使宽度足够
-            onClick: onOpenProfile,
-          },
+          onOpenProfile
+            ? {
+                key: "profile",
+                label: <>账户</>, // 如果使用字符串，在缩小时会被裁剪，即使宽度足够
+                icon: <UserOutlined />,
+                title: "", // 若不设置，在缩小时总是会显示工具提示，即使宽度足够
+                onClick: onOpenProfile,
+              }
+            : null,
           {
             key: "logout",
             icon: <LogoutOutlined />,
@@ -113,7 +122,11 @@ function UserButton(props: UserButtonProps) {
       <Button
         type="text"
         icon={
-          <Avatar alt="头像" src={userInfo?.picture} icon={<UserOutlined />} />
+          <Avatar
+            alt="头像"
+            src={userInfo?.picture ?? undefined}
+            icon={<UserOutlined />}
+          />
         }
         {...rest}
         styles={{
@@ -139,7 +152,10 @@ function UserButton(props: UserButtonProps) {
         {!compact && (
           <>
             <span style={{ marginRight: token.marginXXS }}>
-              {userInfo?.name ?? userInfo?.prefered_username ?? "平台用户"}
+              {userInfo?.name ??
+                userInfo?.prefered_username ??
+                (auth as LocalAuth).userInfo?.username ??
+                "平台用户"}
             </span>
             {layout === "sidebar" ? <UpOutlined /> : <DownOutlined />}
           </>

package/src/index.ts

@@ -6,6 +6,9 @@ export {
   AuthCallback,
   type AuthCallbackProps,
   useAuth,
+  type Auth,
+  type CasdoorAuth,
+  type LocalAuth,
 } from "./components/Auth";
 
 export { default as Calendar, type CalendarProps } from "./components/Calendar";