@lark-apaas/client-toolkit 1.2.28-alpha.2 → 1.2.28-alpha.21

package/lib/components/AppContainer/safety.js

@@ -14,17 +14,31 @@ const Component = ()=>{
     const isMobile = useIsMobile();
     const [userinfo, setUserinfo] = useState(null);
     const [isInternetVisible, setIsInternetVisible] = useState(false);
+    const [showBadge, setShowBadge] = useState(true);
+    const [badgeLoaded, setBadgeLoaded] = useState(false);
     const timeoutRef = useRef(null);
     useEffect(()=>{
         const appId = getAppId();
+        const csrfHeaders = {
+            'X-Suda-Csrf-Token': getCsrfToken()
+        };
         const tenantInfoUrl = isNewPathEnabled() ? `/app/${appId}/__runtime__/api/v1/studio/tenant_info` : `/spark/b/${appId}/tenant_info`;
         fetch(tenantInfoUrl, {
-            headers: {
-                'X-Suda-Csrf-Token': getCsrfToken()
-            }
+            headers: csrfHeaders
         }).then((res)=>res.json()).then((data)=>{
             setUserinfo(data?.data?.tenant_info);
             setIsInternetVisible(data?.data?.is_internet_visible);
+        }).catch(()=>{});
+        const getPublishedUrl = isNewPathEnabled() ? `/app/${appId}/__runtime__/api/v1/studio/get_published` : `/spark/b/${appId}/get_published`;
+        fetch(getPublishedUrl, {
+            headers: csrfHeaders
+        }).then((res)=>res.json()).then((data)=>{
+            const badge = data?.data?.app_info?.show_badge;
+            setShowBadge(false !== badge);
+        }).catch(()=>{
+            setShowBadge(true);
+        }).finally(()=>{
+            setBadgeLoaded(true);
         });
     }, []);
     useEffect(()=>{
@@ -39,6 +53,8 @@ const Component = ()=>{
         isMobile
     ]);
     if ('production' !== process.env.NODE_ENV) return null;
+    if (!badgeLoaded) return null;
+    if (!showBadge) return null;
     if (!visible) return null;
     if (isMobile) return /*#__PURE__*/ jsxs(Sheet, {
         open: open,
@@ -47,7 +63,7 @@ const Component = ()=>{
             /*#__PURE__*/ jsx(SheetTrigger, {
                 asChild: true,
                 children: /*#__PURE__*/ jsxs("div", {
-                    className: "fixed right-[12px] bottom-[80px] inline-flex items-center gap-x-1 border-solid border-[#ffffff1a] border px-[10px] py-[6px] bg-[#1f2329e5] backdrop-blur-[5px] shadow-[0px_6px_12px_0px_#41444a0a,0px_8px_24px_8px_#41444a0a] rounded-md text-[#ebebeb)] font-['PingFang_SC'] text-xs leading-[20px] tracking-[0px] z-[10000000]",
+                    className: "fixed right-[12px] bottom-[80px] inline-flex items-center gap-x-1 border-solid border-[#ffffff1a] border px-[10px] py-[6px] bg-[#1f2329e5] backdrop-blur-[5px] shadow-[0px_6px_12px_0px_#41444a0a,0px_8px_24px_8px_#41444a0a] rounded-[6px] text-[#ebebeb)] font-['PingFang_SC'] text-xs leading-[20px] tracking-[0px] z-[10000000]",
                     onClick: ()=>{
                         setOpen(true);
                     },
@@ -242,7 +258,7 @@ const Component = ()=>{
                                     className: "w-full self-stretch shrink-0 flex items-start gap-x-[8px]",
                                     children: [
                                         /*#__PURE__*/ jsx("div", {
-                                            className: "flex-1 flex rounded-lg items-center justify-center h-[34px] border-[0.5px] border-solid border-[#ffffff1c] hover:border-[#ffffff33] bg-[#ffffff08] hover:bg-[#ffffff14] cursor-pointer text-[#ebebeb]",
+                                            className: "flex-1 flex rounded-[8px] items-center justify-center h-[34px] border-[0.5px] border-solid border-[#ffffff1c] hover:border-[#ffffff33] bg-[#ffffff08] hover:bg-[#ffffff14] cursor-pointer text-[#ebebeb]",
                                             "data-custom-element": "safety-close",
                                             onClick: (e)=>{
                                                 e.stopPropagation();
@@ -253,7 +269,7 @@ const Component = ()=>{
                                             children: "不再展示"
                                         }),
                                         /*#__PURE__*/ jsx("div", {
-                                            className: "flex-1 flex rounded-lg items-center justify-center h-[34px] border-[0.5px] border-solid border-[#ffffff1c] hover:border-[#ffffff33] bg-[#ffffff08] hover:bg-[#ffffff14] cursor-pointer text-[#ebebeb]",
+                                            className: "flex-1 flex rounded-[8px] items-center justify-center h-[34px] border-[0.5px] border-solid border-[#ffffff1c] hover:border-[#ffffff33] bg-[#ffffff08] hover:bg-[#ffffff14] cursor-pointer text-[#ebebeb]",
                                             "data-custom-element": "safety-more",
                                             onClick: ()=>{
                                                 window.open('https://miaoda.feishu.cn/landing', '_blank');

package/lib/components/ui/badge.d.ts

@@ -1,7 +1,7 @@
 import * as React from "react";
 import { type VariantProps } from "class-variance-authority";
 declare const badgeVariants: (props?: {
-    variant?: "default" | "destructive" | "secondary" | "outline";
+    variant?: "default" | "destructive" | "outline" | "secondary";
 } & import("class-variance-authority/dist/types").ClassProp) => string;
 declare function Badge({ className, variant, asChild, ...props }: React.ComponentProps<"span"> & VariantProps<typeof badgeVariants> & {
     asChild?: boolean;

package/lib/components/ui/button.d.ts

@@ -1,8 +1,8 @@
 import * as React from "react";
 import { type VariantProps } from "class-variance-authority";
 declare const buttonVariants: (props?: {
-    variant?: "default" | "link" | "destructive" | "secondary" | "outline" | "ghost";
-    size?: "default" | "icon" | "sm" | "lg" | "icon-sm" | "icon-lg";
+    variant?: "default" | "link" | "destructive" | "outline" | "secondary" | "ghost";
+    size?: "default" | "sm" | "lg" | "icon" | "icon-sm" | "icon-lg";
 } & import("class-variance-authority/dist/types").ClassProp) => string;
 declare function Button({ className, variant, size, asChild, ...props }: React.ComponentProps<"button"> & VariantProps<typeof buttonVariants> & {
     asChild?: boolean;

package/lib/components/ui/button.js

@@ -8,7 +8,7 @@ const buttonVariants = cva("inline-flex items-center justify-center gap-2 whites
         variant: {
             default: "bg-primary text-primary-foreground not-disabled:hover:bg-primary/90",
             destructive: "bg-destructive text-white not-disabled:hover:bg-destructive/90 focus-visible:ring-destructive/20 dark:focus-visible:ring-destructive/40 dark:bg-destructive/60",
-            outline: "border bg-background not-disabled:hover:bg-accent not-disabled:hover:text-accent-foreground dark:bg-input/30 dark:border-input dark:not-disabled:hover:bg-input/50",
+            outline: "border border-input bg-transparent text-foreground not-disabled:hover:bg-accent not-disabled:hover:text-accent-foreground",
             secondary: "bg-secondary text-secondary-foreground not-disabled:hover:bg-secondary/80",
             ghost: "not-disabled:hover:bg-accent not-disabled:hover:text-accent-foreground dark:not-disabled:hover:bg-accent/50",
             link: "text-primary underline-offset-4 not-disabled:hover:underline"

package/lib/components/ui/confirm.d.ts

@@ -0,0 +1,28 @@
+export interface ConfirmOptions {
+    /** 标题，默认 "提示" */
+    title?: string;
+    /** 内容描述 */
+    message: string;
+    /** 确认按钮文案，默认 "确认" */
+    confirmText?: string;
+    /** 取消按钮文案，默认 "取消" */
+    cancelText?: string;
+    /** 确认按钮样式变体 */
+    variant?: 'default' | 'destructive';
+}
+/**
+ * 函数式确认弹窗，作为 window.confirm 的直接平替。
+ *
+ * @example
+ * // 简单用法（兼容 window.confirm 传参）
+ * const ok = await showConfirm('确定删除吗？');
+ *
+ * // 完整用法
+ * const ok = await showConfirm({
+ *   title: '确认删除',
+ *   message: '删除后不可恢复',
+ *   confirmText: '删除',
+ *   variant: 'destructive',
+ * });
+ */
+export declare function showConfirm(options: string | ConfirmOptions): Promise<boolean>;

package/lib/components/ui/confirm.js

@@ -0,0 +1,83 @@
+import { jsx, jsxs } from "react/jsx-runtime";
+import "react";
+import { createRoot } from "react-dom/client";
+import { Content, Description, Overlay, Portal, Root, Title } from "@radix-ui/react-dialog";
+import { Button } from "./button.js";
+import { clsxWithTw } from "../../utils/utils.js";
+function showConfirm(options) {
+    const opts = 'string' == typeof options ? {
+        message: options
+    } : options;
+    const { title = '提示', message, confirmText = '确认', cancelText = '取消', variant = 'default' } = opts;
+    return new Promise((resolve)=>{
+        const container = document.createElement('div');
+        document.body.appendChild(container);
+        const root = createRoot(container);
+        function cleanup() {
+            root.unmount();
+            container.remove();
+        }
+        function handleConfirm() {
+            cleanup();
+            resolve(true);
+        }
+        function handleCancel() {
+            cleanup();
+            resolve(false);
+        }
+        root.render(/*#__PURE__*/ jsx(ConfirmDialog, {
+            title: title,
+            message: message,
+            confirmText: confirmText,
+            cancelText: cancelText,
+            variant: variant,
+            onConfirm: handleConfirm,
+            onCancel: handleCancel
+        }));
+    });
+}
+function ConfirmDialog({ title, message, confirmText, cancelText, variant, onConfirm, onCancel }) {
+    return /*#__PURE__*/ jsx(Root, {
+        defaultOpen: true,
+        onOpenChange: (open)=>{
+            if (!open) onCancel();
+        },
+        children: /*#__PURE__*/ jsxs(Portal, {
+            children: [
+                /*#__PURE__*/ jsx(Overlay, {
+                    className: clsxWithTw('fixed inset-0 z-[99999] bg-black/40', 'data-[state=open]:animate-in data-[state=open]:fade-in-0', 'data-[state=closed]:animate-out data-[state=closed]:fade-out-0')
+                }),
+                /*#__PURE__*/ jsxs(Content, {
+                    className: clsxWithTw('fixed left-1/2 top-1/2 z-[99999] -translate-x-1/2 -translate-y-1/2', 'w-[90vw] max-w-[400px] rounded-lg', 'bg-[var(--popover,var(--color-neutral-00,#fff))] text-[var(--popover-foreground,var(--color-neutral-950,#1f2329))]', 'border border-[var(--border,var(--color-neutral-300,#dee0e3))]', 'shadow-lg p-6', 'data-[state=open]:animate-in data-[state=open]:fade-in-0 data-[state=open]:zoom-in-95', 'data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95'),
+                    children: [
+                        /*#__PURE__*/ jsx(Title, {
+                            className: clsxWithTw('text-base font-medium leading-6', 'text-[var(--foreground,var(--color-neutral-950,#1f2329))]'),
+                            children: title
+                        }),
+                        /*#__PURE__*/ jsx(Description, {
+                            className: clsxWithTw('mt-2 text-sm leading-5', 'text-[var(--muted-foreground,var(--color-neutral-700,#646a73))]'),
+                            children: message
+                        }),
+                        /*#__PURE__*/ jsxs("div", {
+                            className: clsxWithTw('mt-6 flex justify-end gap-2'),
+                            children: [
+                                /*#__PURE__*/ jsx(Button, {
+                                    variant: "outline",
+                                    className: "!bg-transparent !text-inherit",
+                                    onClick: onCancel,
+                                    children: cancelText
+                                }),
+                                /*#__PURE__*/ jsx(Button, {
+                                    variant: variant,
+                                    onClick: onConfirm,
+                                    children: confirmText
+                                })
+                            ]
+                        })
+                    ]
+                })
+            ]
+        })
+    });
+}
+export { showConfirm };

package/lib/index.d.ts

@@ -1,4 +1,6 @@
 export declare const capabilityClient: import("@lark-apaas/client-capability").CapabilityClient;
+export { showConfirm } from './components/ui/confirm';
+export type { ConfirmOptions } from './components/ui/confirm';
 declare const _default: {
     version: string;
 };

package/lib/index.js

@@ -5,6 +5,7 @@ import { isNewPathEnabled } from "./utils/apiPath.js";
 import { logger } from "./logger/index.js";
 import { showToast } from "./components/ui/toast.js";
 import { version } from "../package.json";
+import { showConfirm } from "./components/ui/confirm.js";
 const _appId = getAppId();
 const _acquireUploadUrl = isNewPathEnabled() ? `/app/${_appId}/__runtime__/api/v1/studio/plugins/tmp_files/acquire_upload_url` : "/af/api/v1/studio/plugins/tmp_files/acquire_upload_url";
 const _acquireDownloadUrl = isNewPathEnabled() ? `/app/${_appId}/__runtime__/api/v1/studio/plugins/tmp_files/acquire_download_url` : "/af/api/v1/studio/plugins/tmp_files/acquire_download_url";
@@ -25,4 +26,4 @@ const capabilityClient = createClient({
 const src = {
     version: version
 };
-export { capabilityClient, src as default };
+export { capabilityClient, src as default, showConfirm };

package/lib/integrations/services/ChatService.d.ts

@@ -0,0 +1,12 @@
+import type { BatchGetChatsResponse, SearchChatsParams, SearchChatsResponse } from './types';
+export type ChatServiceConfig = {
+    getAppId?: () => string | null | undefined;
+    searchChatsUrl?: (appId: string) => string;
+    listChatsUrl?: (appId: string) => string;
+};
+export declare class ChatService {
+    private config;
+    constructor(config?: ChatServiceConfig);
+    searchChats(params: SearchChatsParams): Promise<SearchChatsResponse>;
+    listChatsByIds(chatIds: string[]): Promise<BatchGetChatsResponse>;
+}

package/lib/integrations/services/ChatService.js

@@ -0,0 +1,67 @@
+import { getAppId } from "../../utils/getAppId.js";
+const DEFAULT_CONFIG = {
+    getAppId: ()=>getAppId(),
+    searchChatsUrl: (appId)=>`/app/${appId}/__runtime__/api/v1/account/search`,
+    listChatsUrl: (appId)=>`/app/${appId}/__runtime__/api/v1/account/chat/list_chats`
+};
+class ChatService {
+    config;
+    constructor(config = {}){
+        this.config = {
+            ...DEFAULT_CONFIG,
+            ...config
+        };
+    }
+    async searchChats(params) {
+        const appId = this.config.getAppId();
+        if (!appId) throw new Error('Failed to get appId');
+        const response = await fetch(this.config.searchChatsUrl(appId), {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            body: JSON.stringify({
+                query: params.query,
+                filters: {
+                    userParam: {
+                        commonParam: {
+                            searchable: false
+                        }
+                    },
+                    departmentParam: {
+                        commonParam: {
+                            searchable: false
+                        }
+                    },
+                    chatParam: {
+                        commonParam: {
+                            searchable: true,
+                            pageSize: params.pageSize ?? 100,
+                            offset: params.offset ?? 0
+                        }
+                    }
+                }
+            }),
+            credentials: 'include'
+        });
+        if (!response.ok) throw new Error('Failed to search chats');
+        return response.json();
+    }
+    async listChatsByIds(chatIds) {
+        const appId = this.config.getAppId();
+        if (!appId) throw new Error('Failed to get appId');
+        const response = await fetch(this.config.listChatsUrl(appId), {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            body: JSON.stringify({
+                chatIDList: chatIds
+            }),
+            credentials: 'include'
+        });
+        if (!response.ok) throw new Error('Failed to fetch chats by ids');
+        return response.json();
+    }
+}
+export { ChatService };

package/lib/integrations/services/UserService.d.ts

@@ -1,12 +1,14 @@
-import type { BatchGetUsersResponse, SearchUsersParams, SearchUsersResponse } from './types';
+import type { BatchGetUsersResponse, ConvertExternalContactResponse, SearchUsersParams, SearchUsersResponse } from './types';
 export type UserServiceConfig = {
     getAppId?: () => string | null | undefined;
     searchUserUrl?: (appId: string) => string;
     listUsersUrl?: (appId: string) => string;
+    convertExternalContactUrl?: (appId: string) => string;
 };
 export declare class UserService {
     private config;
     constructor(config?: UserServiceConfig);
     searchUsers(params: SearchUsersParams): Promise<SearchUsersResponse>;
     listUsersByIds(userIds: string[]): Promise<BatchGetUsersResponse>;
+    convertExternalContact(larkUserID: string): Promise<ConvertExternalContactResponse>;
 }

package/lib/integrations/services/UserService.js

@@ -3,7 +3,8 @@ import { isNewPathEnabled } from "../../utils/apiPath.js";
 const DEFAULT_CONFIG = {
     getAppId: ()=>getAppId(),
     searchUserUrl: (appId)=>isNewPathEnabled() ? `/app/${appId}/__runtime__/api/v1/account/search_user` : `/af/app/${appId}/runtime/api/v1/account/search_user`,
-    listUsersUrl: (appId)=>isNewPathEnabled() ? `/app/${appId}/__runtime__/api/v1/account/list_users` : `/af/app/${appId}/runtime/api/v1/account/list_users`
+    listUsersUrl: (appId)=>isNewPathEnabled() ? `/app/${appId}/__runtime__/api/v1/account/list_users` : `/af/app/${appId}/runtime/api/v1/account/list_users`,
+    convertExternalContactUrl: (appId)=>isNewPathEnabled() ? `/app/${appId}/__runtime__/api/v1/account/convert_lark_user` : `/af/app/${appId}/runtime/api/v1/account/convert_lark_user`
 };
 class UserService {
     config;
@@ -43,5 +44,23 @@ class UserService {
         if (!response.ok) throw new Error('Failed to fetch users by ids');
         return response.json();
     }
+    async convertExternalContact(larkUserID) {
+        const appId = this.config.getAppId();
+        if (!appId) throw new Error('Failed to get appId');
+        const response = await fetch(this.config.convertExternalContactUrl(appId), {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            body: JSON.stringify({
+                larkUserID
+            }),
+            credentials: 'include'
+        });
+        if (!response.ok) throw new Error('Failed to convert external contact');
+        const data = await response.json();
+        if (!data?.data?.userInfo?.userID) throw new Error('Invalid response from convert external contact');
+        return data;
+    }
 }
 export { UserService };

package/lib/integrations/services/index.d.ts

@@ -1,4 +1,5 @@
 export * from './types';
 export * from './UserService';
 export * from './DepartmentService';
+export * from './ChatService';
 export * from './UserProfileService';

package/lib/integrations/services/index.js

@@ -1,4 +1,5 @@
 export * from "./types.js";
 export * from "./UserService.js";
 export * from "./DepartmentService.js";
+export * from "./ChatService.js";
 export * from "./UserProfileService.js";

package/lib/integrations/services/types.d.ts

@@ -15,6 +15,7 @@ export type UserInfo = {
     userType: '_employee' | '_externalUser' | '_anonymousUser';
     department: DepartmentBasic;
     email?: string;
+    tenantName?: string;
 };
 export type DepartmentInfo = {
     departmentID: string;
@@ -33,6 +34,7 @@ export type SearchUsersParams = {
     query?: string;
     offset?: number;
     pageSize?: number;
+    searchExternalContact?: boolean;
 };
 export type SearchUsersResponse = {
     data: {
@@ -41,6 +43,14 @@ export type SearchUsersResponse = {
     };
     status_code: string;
 };
+export type ConvertExternalContactResponse = {
+    data: {
+        userInfo: {
+            tenantID: number;
+            userID: number;
+        };
+    };
+};
 export type BatchGetUsersResponse = {
     data: {
         userInfoMap: Record<string, UserInfo & SearchAvatar>;
@@ -62,6 +72,40 @@ export type SearchDepartmentsResponse = {
     };
     status_code: string;
 };
+export type ChatInfo = {
+    /** 群组 ID */
+    chatID: string;
+    /** 群组名称（国际化文本） */
+    name: I18nText;
+    /** 头像：URL 或 16 进制 RGB 颜色 */
+    avatar: string;
+    /** 是否是外部群 */
+    isExternal?: boolean;
+    /** 群成员数量（不包括机器人），搜索接口返回，批量查询接口不返回 */
+    userCount?: number;
+};
+export type SearchChatsParams = {
+    query?: string;
+    offset?: number;
+    pageSize?: number;
+};
+export type SearchChatsResponse = {
+    data: {
+        result: {
+            chatResult?: {
+                total: number;
+                items: ChatInfo[];
+            };
+        };
+    };
+    status_code: string;
+};
+export type BatchGetChatsResponse = {
+    data: {
+        chatInfoMap: Record<string, ChatInfo>;
+    };
+    status_code: string;
+};
 export type UserProfileAccountStatus = 0 | 1 | 2 | 3 | 4;
 export type SimpleUserProfileInfo = {
     name?: string;

package/lib/utils/hmr-api.d.ts

@@ -9,12 +9,6 @@
  * @see docs/RFC_HMR_API.md
  */
 export interface HmrApi {
-    /**
-     * 注册 HMR 更新前回调（模块替换之前触发）
-     * @param callback 回调函数
-     * @returns cleanup 函数，用于取消注册
-     */
-    onBeforeApply?(callback: () => void): () => void;
     /**
      * 注册 HMR 成功回调
      * @param callback 成功回调函数
@@ -30,7 +24,7 @@ export interface HmrApi {
 }
 declare global {
     interface Window {
-        __VITE_HMR__?: Required<HmrApi>;
+        __VITE_HMR__?: HmrApi;
     }
 }
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/client-toolkit",
-  "version": "1.2.28-alpha.2",
+  "version": "1.2.28-alpha.21",
   "types": "./lib/index.d.ts",
   "main": "./lib/index.js",
   "files": [
@@ -98,13 +98,13 @@
   "dependencies": {
     "@ant-design/colors": "^7.2.1",
     "@ant-design/cssinjs": "^1.24.0",
-    "@data-loom/js": "0.4.9",
+    "@data-loom/js": "0.4.13-alpha.1",
     "@lark-apaas/aily-web-sdk": "^0.0.7",
     "@lark-apaas/auth-sdk": "^0.1.2",
     "@lark-apaas/client-capability": "^0.1.6",
     "@lark-apaas/internal-slardar": "^0.0.3",
-    "@lark-apaas/miaoda-inspector": "1.0.14-alpha.30",
-    "@lark-apaas/observable-web": "^1.0.4",
+    "@lark-apaas/miaoda-inspector": "^1.0.20",
+    "@lark-apaas/observable-web": "^1.0.5",
     "@radix-ui/react-avatar": "^1.1.10",
     "@radix-ui/react-popover": "^1.1.15",
     "@radix-ui/react-slot": "^1.2.3",