@lark-apaas/client-toolkit 1.1.21-alpha.auth.dev.0 → 1.1.21-alpha.auth.dev.2

package/lib/antd-table.d.ts

@@ -0,0 +1,4 @@
+import { Table } from 'antd';
+import type { TableProps } from 'antd';
+export { Table };
+export type { TableProps };

package/lib/antd-table.js

@@ -0,0 +1,2 @@
+import { Table } from "antd";
+export { Table };

package/lib/auth/index.d.ts

@@ -0,0 +1 @@
+export { useAuth, useAuthAbility, Can, ROLE_SUBJECT, } from '@lark-apaas/auth-sdk';

package/lib/auth/index.js

@@ -0,0 +1,2 @@
+import { Can, ROLE_SUBJECT, useAuth, useAuthAbility } from "@lark-apaas/auth-sdk";
+export { Can, ROLE_SUBJECT, useAuth, useAuthAbility };

package/lib/components/AppContainer/index.js

@@ -1,5 +1,6 @@
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
-import { useEffect } from "react";
+import { useEffect, useState } from "react";
+import { ConfigProvider } from "antd";
 import { MiaodaInspector } from "@lark-apaas/miaoda-inspector";
 import IframeBridge from "./IframeBridge.js";
 import { defaultUIConfig } from "../theme/ui-config.js";
@@ -15,6 +16,15 @@ import { AuthProvider } from "@lark-apaas/auth-sdk";
 registerDayjsPlugins();
 initAxiosConfig();
 const isMiaodaPreview = window.IS_MIAODA_PREVIEW;
+const readCssVarColor = (varName, fallback)=>{
+    try {
+        if ('undefined' == typeof document) return fallback;
+        const value = getComputedStyle(document.documentElement).getPropertyValue(varName).trim();
+        return value || fallback;
+    } catch  {
+        return fallback;
+    }
+};
 const App = (props)=>{
     const { themeMeta = {}, enableAuth } = props;
     useAppInfo();
@@ -58,18 +68,140 @@ const App = (props)=>{
         ]
     });
 };
-const AppContainer = (props)=>{
+const AppContainer_AppContainer = (props)=>{
     const { children, ...rest } = props;
+    const [cssColors, setCssColors] = useState(()=>({
+            background: readCssVarColor('--background'),
+            destructive: readCssVarColor('--destructive'),
+            primary: readCssVarColor('--primary'),
+            foreground: readCssVarColor('--foreground'),
+            warning: readCssVarColor('--warning'),
+            success: readCssVarColor('--success'),
+            muted: readCssVarColor('--muted'),
+            mutedForeground: readCssVarColor('--muted-foreground'),
+            border: readCssVarColor('--border'),
+            popover: readCssVarColor('--popover'),
+            accent: readCssVarColor('--accent')
+        }));
+    useEffect(()=>{
+        if ('production' === process.env.NODE_ENV) return ()=>{};
+        const observer = new MutationObserver((mutations)=>{
+            for (const mutation of mutations){
+                let linkTag = null;
+                if ('attributes' === mutation.type) {
+                    if ('fullstack-nestjs-template:chunk-main' === mutation.target.dataset.webpack) linkTag = mutation.target;
+                } else if ('childList' === mutation.type) {
+                    for (const node of Array.from(mutation.addedNodes))if ('LINK' === node.nodeName && 'fullstack-nestjs-template:chunk-main' === node.dataset.webpack) {
+                        linkTag = node;
+                        break;
+                    }
+                }
+                if (linkTag) {
+                    let retryCount = 0;
+                    const maxRetries = 10;
+                    const retryDelay = 400;
+                    const updateColors = ()=>{
+                        const newColors = {
+                            background: readCssVarColor('--background'),
+                            destructive: readCssVarColor('--destructive'),
+                            primary: readCssVarColor('--primary'),
+                            foreground: readCssVarColor('--foreground'),
+                            warning: readCssVarColor('--warning'),
+                            success: readCssVarColor('--success'),
+                            muted: readCssVarColor('--muted'),
+                            mutedForeground: readCssVarColor('--muted-foreground'),
+                            border: readCssVarColor('--border'),
+                            popover: readCssVarColor('--popover'),
+                            accent: readCssVarColor('--accent')
+                        };
+                        setCssColors((currentColors)=>{
+                            if (JSON.stringify(currentColors) !== JSON.stringify(newColors)) {
+                                retryCount = 0;
+                                return newColors;
+                            }
+                            if (retryCount < maxRetries) {
+                                retryCount++;
+                                setTimeout(updateColors, retryDelay);
+                            }
+                            return currentColors;
+                        });
+                    };
+                    setTimeout(updateColors, 100);
+                }
+            }
+        });
+        observer.observe(document.head, {
+            childList: true,
+            subtree: true,
+            attributes: true,
+            attributeFilter: [
+                'href'
+            ]
+        });
+        return ()=>{
+            observer.disconnect();
+        };
+    }, []);
+    const antdThemeToken = {
+        colorBgBase: cssColors.background,
+        colorError: cssColors.destructive,
+        colorInfo: cssColors.primary,
+        colorLink: cssColors.primary,
+        colorPrimary: cssColors.primary,
+        colorSuccess: cssColors.primary,
+        colorTextBase: cssColors.foreground,
+        colorWarning: cssColors.destructive
+    };
+    const antdTableToken = {
+        bodySortBg: cssColors.muted,
+        borderColor: cssColors.border,
+        expandIconBg: cssColors.background,
+        filterDropdownBg: cssColors.popover,
+        filterDropdownMenuBg: cssColors.popover,
+        fixedHeaderSortActiveBg: cssColors.muted,
+        footerBg: cssColors.muted,
+        footerColor: cssColors.mutedForeground,
+        headerBg: cssColors.muted,
+        headerColor: cssColors.mutedForeground,
+        headerFilterHoverBg: cssColors.muted,
+        headerSortActiveBg: cssColors.muted,
+        headerSortHoverBg: cssColors.muted,
+        headerSplitColor: cssColors.border,
+        rowExpandedBg: cssColors.background,
+        rowHoverBg: cssColors.muted,
+        rowSelectedBg: cssColors.accent,
+        rowSelectedHoverBg: cssColors.accent,
+        stickyScrollBarBg: cssColors.muted
+    };
+    const antdPaginationToken = {
+        itemActiveBg: cssColors.background,
+        itemActiveBgDisabled: cssColors.muted,
+        itemActiveColor: cssColors.primary,
+        itemActiveColorDisabled: cssColors.muted,
+        itemActiveColorHover: cssColors.muted,
+        itemBg: cssColors.background,
+        itemInputBg: cssColors.background,
+        itemLinkBg: cssColors.background
+    };
     return /*#__PURE__*/ jsxs(Fragment, {
         children: [
             /*#__PURE__*/ jsx(safety, {}),
-            /*#__PURE__*/ jsx(App, {
-                themeMeta: props.themeMeta,
-                enableAuth: props.enableAuth,
-                children: children
+            /*#__PURE__*/ jsx(ConfigProvider, {
+                theme: {
+                    token: antdThemeToken,
+                    components: {
+                        Table: antdTableToken,
+                        Pagination: antdPaginationToken
+                    }
+                },
+                children: /*#__PURE__*/ jsx(App, {
+                    themeMeta: props.themeMeta,
+                    enableAuth: props.enableAuth,
+                    children: children
+                })
             })
         ]
     });
 };
-const components_AppContainer = AppContainer;
-export { components_AppContainer as default };
+const AppContainer = AppContainer_AppContainer;
+export { AppContainer as default };

package/lib/components/AppContainer/safety.js

@@ -152,7 +152,7 @@ const Component = ()=>{
             /*#__PURE__*/ jsx(PopoverTrigger, {
                 asChild: true,
                 children: /*#__PURE__*/ jsxs("div", {
-                    className: "fixed right-3 bottom-3 inline-flex items-center gap-x-1 border-solid border-[#ffffff1a] border px-2.5 py-1.5 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] cursor-pointer",
+                    className: "fixed right-3 bottom-3 inline-flex items-center gap-x-1 border-solid border-[#ffffff1a] border px-2.5 py-1.5 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] cursor-pointer",
                     onMouseEnter: ()=>{
                         clearTimeout(timeoutRef.current);
                         setOpen(true);
@@ -173,7 +173,7 @@ const Component = ()=>{
                 })
             }),
             /*#__PURE__*/ jsx(PopoverContent, {
-                className: "overflow-hidden p-0 m-0 border-0 rounded-xl!",
+                className: "overflow-hidden p-0 m-0 border-0 rounded-[12px]!",
                 style: {
                     boxShadow: '0 6px 12px 0 #41444a0a, 0 8px 24px 0 #41444a0a'
                 },

package/lib/components/User/UserDisplay.js

@@ -12,12 +12,12 @@ const UserDisplay = ({ users, size, className, style, showLabel = true })=>{
             if (0 === users.length) return [];
             const first = users[0];
             const isStringArray = 'string' == typeof first;
-            return isStringArray ? users.filter(Boolean).map((id)=>String(id)) : users.map((u)=>String(u.user_id)).filter(Boolean);
+            return isStringArray ? users.filter(Boolean).map((id)=>String(id)) : users.map((u)=>String(u?.user_id)).filter(Boolean);
         }
         return 'string' == typeof users ? [
             String(users)
         ] : [
-            String(users.user_id)
+            String(users?.user_id)
         ].filter(Boolean);
     }, [
         users

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" | "secondary" | "destructive" | "outline";
+    variant?: "default" | "destructive" | "secondary" | "outline";
 } & 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,7 +1,7 @@
 import * as React from "react";
 import { type VariantProps } from "class-variance-authority";
 declare const buttonVariants: (props?: {
-    variant?: "default" | "link" | "secondary" | "destructive" | "outline" | "ghost";
+    variant?: "default" | "link" | "destructive" | "secondary" | "outline" | "ghost";
     size?: "default" | "icon" | "sm" | "lg" | "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> & {

package/lib/logger/selected-logs.js

@@ -71,18 +71,26 @@ async function sendSelectedLog(logWithoutID) {
             } catch (postError) {}
         }
         if (void 0 === log.meta.skipFrame) log.meta.skipFrame = 2;
-        const logJSON = JSON.stringify(log);
+        const errorReplacer = (key, value)=>{
+            if (value instanceof Error) return {
+                message: value.message,
+                stack: value.stack,
+                name: value.name
+            };
+            return value;
+        };
+        const logJSON = JSON.stringify(log, errorReplacer);
         const logForDedup = {
             ...log
         };
         delete logForDedup.id;
-        const logContentForDedup = JSON.stringify(logForDedup);
+        const logContentForDedup = JSON.stringify(logForDedup, errorReplacer);
         if (lastLogInfo && lastLogInfo.content === logContentForDedup) {
             lastLogInfo.count++;
             log.meta.isDuplicate = true;
             log.meta.duplicateCount = lastLogInfo.count;
             log.meta.duplicateOfId = lastLogInfo.id;
-            const updatedLogJSON = JSON.stringify(log);
+            const updatedLogJSON = JSON.stringify(log, errorReplacer);
             try {
                 batchLogInfo('info', updatedLogJSON);
             } catch (e) {}

package/lib/utils/axiosConfig.js

@@ -1,59 +1,129 @@
 import axios from "axios";
 import { logger } from "../apis/logger.js";
 import { getStacktrace } from "../logger/selected-logs.js";
-async function logResponse(ok, response) {
-    const okToTextMap = {
-        success: '请求成功：',
-        error: '请求失败：'
-    };
-    const realOK = 'success' === ok && response.status >= 200 && response.status < 300;
-    const parts = [
-        okToTextMap[realOK ? 'success' : 'error'],
-        (response.config.url || '').split('?')[0].replace(/^\/spark\/p\/app_\w+/, ''),
-        ' - ',
-        Date.now() - response.config._startTime,
-        'ms'
-    ];
-    const logTraceID = response.headers['x-log-trace-id'];
-    const queryParams = {};
-    const url = response.config.url || '';
-    const queryString = url.split('?')[1];
-    if (queryString) {
-        const urlParams = new URLSearchParams(queryString);
-        urlParams.forEach((value, key)=>{
-            queryParams[key] = value;
+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)) {
+        const response = responseOrError;
+        const okToTextMap = {
+            success: '请求成功：',
+            error: '请求失败：'
+        };
+        const realOK = 'success' === ok && response.status >= 200 && response.status < 300;
+        const method = (response.config.method || 'GET').toUpperCase();
+        const parts = [
+            okToTextMap[realOK ? 'success' : 'error'],
+            method,
+            ' ',
+            (response.config.url || '').split('?')[0].replace(/^\/spark\/p\/app_\w+/, ''),
+            ' - ',
+            Date.now() - response.config._startTime,
+            'ms'
+        ];
+        const logTraceID = response.headers?.['x-log-trace-id'];
+        const queryParams = {};
+        const url = response.config.url || '';
+        const queryString = url.split('?')[1];
+        if (queryString) {
+            const urlParams = new URLSearchParams(queryString);
+            urlParams.forEach((value, key)=>{
+                queryParams[key] = value;
+            });
+        }
+        if (response.config.params) Object.assign(queryParams, response.config.params);
+        const args = [
+            {
+                请求参数: response.config.data,
+                ...Object.keys(queryParams).length > 0 && {
+                    查询参数: queryParams
+                },
+                返回数据: response.data,
+                请求摘要: {
+                    方法: method,
+                    TraceID: logTraceID,
+                    状态: `${response.statusText}[状态码${response.status}]`,
+                    时间: `${new Date().toLocaleString()}`
+                }
+            }
+        ];
+        const requestUUID = response.config._requestUUID;
+        const stacktrace = await requestStacktraceMap.get(requestUUID);
+        const logMeta = {
+            logTraceID
+        };
+        if (stacktrace) logMeta.stacktrace = stacktrace;
+        logger.log({
+            level: ok,
+            args: [
+                parts.join(''),
+                ...args
+            ],
+            meta: logMeta
         });
+        return;
     }
-    if (response.config.params) Object.assign(queryParams, response.config.params);
-    const args = [
-        {
-            '请求参数：': response.config.data,
-            ...Object.keys(queryParams).length > 0 && {
-                '查询参数：': queryParams
-            },
-            '返回数据：': response.data,
-            '请求摘要：': {
-                TraceID: logTraceID,
-                状态: `${response.statusText}[状态码${response.status}]`,
-                时间: `${new Date().toLocaleString()}`
-            }
+    const error = responseOrError;
+    if (error && error.config && 'object' == typeof error.config) {
+        const errorType = error.code || 'UNKNOWN_ERROR';
+        const errorMessage = error.message || '未知错误';
+        const method = (error.config.method || 'GET').toUpperCase();
+        const url = error.config.url || '';
+        const startTime = error.config._startTime;
+        const duration = startTime ? Date.now() - startTime : 0;
+        const parts = [
+            '网络请求失败：',
+            method,
+            ' ',
+            url.split('?')[0].replace(/^\/spark\/p\/app_\w+/, ''),
+            ' - ',
+            errorType,
+            duration > 0 ? ` (${duration}ms)` : ''
+        ];
+        const queryParams = {};
+        const queryString = url.split('?')[1];
+        if (queryString) {
+            const urlParams = new URLSearchParams(queryString);
+            urlParams.forEach((value, key)=>{
+                queryParams[key] = value;
+            });
         }
-    ];
-    const requestUUID = response.config._requestUUID;
-    const stacktrace = await requestStacktraceMap.get(requestUUID);
-    const logMeta = {
-        logTraceID
-    };
-    if (stacktrace) logMeta.stacktrace = stacktrace;
+        if (error.config.params) Object.assign(queryParams, error.config.params);
+        const args = [
+            {
+                请求参数: error.config.data,
+                ...Object.keys(queryParams).length > 0 && {
+                    查询参数: queryParams
+                },
+                错误信息: errorMessage,
+                请求摘要: {
+                    方法: method,
+                    错误类型: errorType,
+                    错误代码: error.code,
+                    超时设置: error.config.timeout,
+                    时间: `${new Date().toLocaleString()}`
+                }
+            }
+        ];
+        const requestUUID = error.config._requestUUID;
+        const stacktrace = await requestStacktraceMap.get(requestUUID);
+        const logMeta = {};
+        if (stacktrace) logMeta.stacktrace = stacktrace;
+        logger.log({
+            level: 'error',
+            args: [
+                parts.join(''),
+                ...args
+            ],
+            meta: logMeta
+        });
+        return;
+    }
     logger.log({
-        level: ok,
+        level: 'error',
         args: [
-            parts.join(''),
-            ...args
+            '请求失败：无响应对象或配置信息'
         ],
-        meta: {
-            logTraceID
-        }
+        meta: {}
     });
 }
 const requestStacktraceMap = new Map();
@@ -73,7 +143,7 @@ function initAxiosConfig(axiosInstance) {
         logResponse('success', response);
         return response;
     }, (error)=>{
-        logResponse('error', error.response);
+        logResponse('error', error.response || error);
         return Promise.reject(error);
     });
 }

package/lib/utils/getParentOrigin.d.ts

@@ -2,4 +2,4 @@
  * @internal
  * 获取预览环境父级域名
  */
-export declare function getPreviewParentOrigin(): "https://miaoda.feishu.cn" | "https://miaoda.feishu-pre.cn" | "https://miaoda.feishu-boe.cn";
+export declare function getPreviewParentOrigin(): "https://force.feishu-boe.cn" | "https://miaoda.feishu.cn" | "https://miaoda.feishu-pre.cn" | "https://miaoda.feishu-boe.cn";

package/lib/utils/getParentOrigin.js

@@ -1,5 +1,6 @@
 function getPreviewParentOrigin() {
     const { origin } = window.location;
+    if (origin.includes('force.byted.org')) return 'https://force.feishu-boe.cn';
     if (origin.includes('feishuapp.cn') || origin.includes('miaoda.feishuapp.net')) return 'https://miaoda.feishu.cn';
     if (origin.includes('fsapp.kundou.cn') || origin.includes('miaoda-pre.feishuapp.net')) return 'https://miaoda.feishu-pre.cn';
     return 'https://miaoda.feishu-boe.cn';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/client-toolkit",
-  "version": "1.1.21-alpha.auth.dev.0",
+  "version": "1.1.21-alpha.auth.dev.2",
   "types": "./lib/index.d.ts",
   "main": "./lib/index.js",
   "files": [
@@ -15,6 +15,11 @@
       "require": "./lib/index.js",
       "types": "./lib/index.d.ts"
     },
+    "./antd-table": {
+      "import": "./lib/antd-table.js",
+      "require": "./lib/antd-table.js",
+      "types": "./lib/antd-table.d.ts"
+    },
     "./lib/index.css": "./lib/index.css",
     "./dataloom": {
       "import": "./lib/apis/dataloom.js",
@@ -55,6 +60,11 @@
       "import": "./lib/apis/utils/*.js",
       "require": "./lib/apis/utils/*.js",
       "types": "./lib/apis/utils/*.d.ts"
+    },
+    "./auth/*": {
+      "import": "./lib/auth.js",
+      "require": "./lib/auth.js",
+      "types": "./lib/auth.d.ts"
     }
   },
   "scripts": {
@@ -76,7 +86,7 @@
     "@ant-design/colors": "^7.2.1",
     "@ant-design/cssinjs": "^1.24.0",
     "@data-loom/js": "^0.4.0",
-    "@lark-apaas/auth-sdk": "^0.1.0-alpha.3",
+    "@lark-apaas/auth-sdk": "0.1.0-alpha.6",
     "@lark-apaas/miaoda-inspector": "^1.0.4",
     "@radix-ui/react-avatar": "^1.1.10",
     "@radix-ui/react-popover": "^1.1.15",