@lark-apaas/client-toolkit 1.2.24-alpha.4 → 1.2.24-alpha.6

package/lib/components/AppContainer/api-proxy/core.js

@@ -139,7 +139,8 @@ class ApiProxy {
             ...config,
             headers: {
                 ...this.defaultConfig.headers,
-                ...config.headers
+                ...config.headers,
+                'X-Page-Route': 'undefined' != typeof window ? window.location?.pathname || '/' : '/'
             }
         };
         const requestKey = this.generateRequestKey(mergedConfig);

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/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,82 @@
+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(--color-neutral-00,#fff)] text-[var(--color-neutral-950,#1f2329)]', 'border 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(--color-neutral-950,#1f2329)]'),
+                            children: title
+                        }),
+                        /*#__PURE__*/ jsx(Description, {
+                            className: clsxWithTw('mt-2 text-sm leading-5', 'text-[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",
+                                    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/utils/axiosConfig.js

@@ -4,21 +4,6 @@ import { logger } from "../apis/logger.js";
 import { getStacktrace } from "../logger/selected-logs.js";
 import { safeStringify } from "./safeStringify.js";
 import { slardar } from "@lark-apaas/internal-slardar";
-import { normalizeBasePath } from "./utils.js";
-const APP_CLIENT_API_LOG_TYPE = 'app_client_api_log';
-function getRefererPath() {
-    try {
-        if ('undefined' != typeof window && window.location?.pathname) return stripBasePath(window.location.pathname);
-        return '/';
-    } catch  {
-        return '/';
-    }
-}
-function stripBasePath(urlPath) {
-    const base = normalizeBasePath(process.env.CLIENT_BASE_PATH);
-    if (base && urlPath.startsWith(base)) return urlPath.slice(base.length) || '/';
-    return urlPath;
-}
 const isValidResponse = (resp)=>null != resp && 'object' == typeof resp && 'config' in resp && null !== resp.config && void 0 !== resp.config && 'object' == typeof resp.config && 'status' in resp && 'number' == typeof resp.status && 'data' in resp;
 async function logResponse(ok, responseOrError) {
     if (isValidResponse(responseOrError)) {
@@ -154,20 +139,13 @@ function handleSpanEnd(cfg, response, error) {
         const errorMessage = error?.message || '未知错误';
         const url = response?.request?.responseURL || errorResponse?.request?.responseURL || cfg.url || "";
         const method = (cfg.method || 'GET').toUpperCase();
-        const rawPath = url.split('?')[0].replace(/^https?:\/\/[^/]+/, '') || '/';
-        const path = stripBasePath(rawPath);
-        const durationMs = startTime ? Date.now() - startTime : void 0;
-        const referer_path = getRefererPath();
-        const api = `${method} ${path}`;
-        const type = APP_CLIENT_API_LOG_TYPE;
+        const path = url.split('?')[0].replace(/^https?:\/\/[^/]+/, '') || '/';
         const logData = {
             method,
             path,
             url,
-            duration_ms: durationMs,
-            status: response ? response.status : errorResponse.status || 0,
-            referer_path,
-            type
+            duration_ms: startTime ? Date.now() - startTime : void 0,
+            status: response ? response.status : errorResponse.status || 0
         };
         if (error) logData.error_message = errorMessage;
         if ('undefined' != typeof navigator) logData.user_agent = navigator.userAgent;
@@ -180,12 +158,7 @@ function handleSpanEnd(cfg, response, error) {
         const responseData = response?.data || errorResponse?.data;
         if (responseData) logData.response = responseData;
         const level = error ? 'ERROR' : 'INFO';
-        observable.log(level, safeStringify(logData), {
-            referer_path,
-            api,
-            type,
-            duration_ms: durationMs
-        }, currentSpan);
+        observable.log(level, safeStringify(logData), {}, currentSpan);
         'function' == typeof currentSpan.end && currentSpan.end();
     } catch (e) {
         console.error('[AxiosTrace] Log span failed:', e);
@@ -266,11 +239,7 @@ function initAxiosConfig(axiosInstance) {
         config._startTime = config._startTime || Date.now();
         const csrfToken = window.csrfToken;
         if (csrfToken) config.headers['X-Suda-Csrf-Token'] = csrfToken;
-        const refererPath = getRefererPath();
-        config.headers['Rpc-Persist-Apaas-Observability-Referer-Path'] = refererPath;
-        const reqMethod = (config.method || 'GET').toUpperCase();
-        const requestPath = stripBasePath((config.url || '').split('?')[0]);
-        config.headers['Rpc-Persist-Apaas-Observability-Api'] = `${reqMethod} ${requestPath}`;
+        if ('undefined' != typeof window && window.location?.pathname) config.headers['X-Page-Route'] = window.location.pathname;
         return config;
     }, (error)=>Promise.reject(error));
     instance.interceptors.response.use((response)=>response, (error)=>{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/client-toolkit",
-  "version": "1.2.24-alpha.4",
+  "version": "1.2.24-alpha.6",
   "types": "./lib/index.d.ts",
   "main": "./lib/index.js",
   "files": [
@@ -99,10 +99,10 @@
     "@ant-design/colors": "^7.2.1",
     "@ant-design/cssinjs": "^1.24.0",
     "@data-loom/js": "0.4.9",
-    "@lark-apaas/aily-web-sdk": "^0.0.6",
-    "@lark-apaas/auth-sdk": "^0.1.1",
-    "@lark-apaas/client-capability": "^0.1.5",
-    "@lark-apaas/internal-slardar": ">=0.0.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.20",
     "@lark-apaas/observable-web": "^1.0.4",
     "@radix-ui/react-avatar": "^1.1.10",