@lark-apaas/client-toolkit 1.2.35-alpha.6 → 1.2.35-alpha.7

package/lib/integrations/dataloom.d.ts

@@ -1,4 +1,4 @@
-declare const createDataLoomClient: (url?: string, pat?: string) => import("@data-loom/js").DataloomClient<any, "public", any>;
+declare const createDataLoomClient: (url?: string, pat?: string) => import("@lark-apaas/dataloom").DataloomClient;
 /** 获取dataloom实例 */
 export declare function getDataloom(): Promise<ReturnType<typeof createDataLoomClient>>;
 export {};

package/lib/integrations/dataloom.js

@@ -1,24 +1,14 @@
-import { splitWorkspaceUrl } from "../utils/url.js";
-import { createClient } from "@data-loom/js";
+import { createClient } from "@lark-apaas/dataloom";
 import { getAppId } from "../utils/getAppId.js";
 import { getAppPublished } from "../utils/getInitialInfo.js";
 const createDataLoomClient = (url, pat)=>{
-    const { baseUrl, workspace } = url ? splitWorkspaceUrl(url) : {
-        baseUrl: '',
-        workspace: ''
-    };
     const appId = getAppId();
-    return createClient(baseUrl, pat, workspace, {
+    return createClient(url ?? '', pat ?? '', {
         global: {
             enableDataloomLog: 'production' !== process.env.NODE_ENV,
             requestRateLimit: 'production' !== process.env.NODE_ENV ? 100 : void 0,
             brandName: 'miaoda',
-            appId,
-            onError: (error, dataloomInstance)=>{
-                if (error?.status === 401) {
-                    if (error?.code === 'k_ident_013001') dataloomInstance.service.session.redirectToLogin();
-                }
-            }
+            appId
         }
     });
 };

package/lib/locales/messages.js

@@ -102,30 +102,6 @@ const messages_messages = {
     'userProfile.label.email': {
         zh: '邮箱',
         en: 'Email'
-    },
-    'axios.log.requestSuccess': {
-        zh: '请求成功：',
-        en: 'Request succeeded: '
-    },
-    'axios.log.requestFailed': {
-        zh: '请求失败：',
-        en: 'Request failed: '
-    },
-    'axios.log.networkFailed': {
-        zh: '网络请求失败：',
-        en: 'Network request failed: '
-    },
-    'axios.log.noResponseOrConfig': {
-        zh: '请求失败：无响应对象或配置信息',
-        en: 'Request failed: no response object or config'
-    },
-    'axios.log.forbidden': {
-        zh: '请求被拒绝(403)：{method} {url}',
-        en: 'Request rejected (403): {method} {url}'
-    },
-    'axios.log.unknownError': {
-        zh: '未知错误',
-        en: 'Unknown error'
     }
 };
 const messages = messages_messages;

package/lib/utils/axiosConfig.js

@@ -5,7 +5,6 @@ import { getStacktrace } from "../logger/selected-logs.js";
 import { safeStringify } from "./safeStringify.js";
 import { slardar } from "@lark-apaas/internal-slardar";
 import { normalizeBasePath } from "./utils.js";
-import { t } from "../locales/index.js";
 const APP_CLIENT_API_LOG_TYPE = 'app_client_api_log';
 function stripBasePath(urlPath) {
     const base = normalizeBasePath(process.env.CLIENT_BASE_PATH);
@@ -96,8 +95,8 @@ async function logResponse(ok, responseOrError) {
     if (isValidResponse(responseOrError)) {
         const response = responseOrError;
         const okToTextMap = {
-            success: t('axios.log.requestSuccess'),
-            error: t('axios.log.requestFailed')
+            success: '请求成功：',
+            error: '请求失败：'
         };
         const realOK = 'success' === ok && response.status >= 200 && response.status < 300;
         const method = (response.config.method || 'GET').toUpperCase();
@@ -155,13 +154,13 @@ async function logResponse(ok, responseOrError) {
     const error = responseOrError;
     if (error && error.config && 'object' == typeof error.config) {
         const errorType = error.code || 'UNKNOWN_ERROR';
-        const errorMessage = error.message || t('axios.log.unknownError');
+        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 = [
-            t('axios.log.networkFailed'),
+            '网络请求失败：',
             method,
             ' ',
             url.split('?')[0].replace(/^\/spark\/p\/app_\w+/, ''),
@@ -211,7 +210,7 @@ async function logResponse(ok, responseOrError) {
     logger.log({
         level: 'error',
         args: [
-            t('axios.log.noResponseOrConfig')
+            '请求失败：无响应对象或配置信息'
         ],
         meta: {}
     });
@@ -361,10 +360,7 @@ function initAxiosConfig(axiosInstance) {
                 logger.log({
                     level: 'warn',
                     args: [
-                        t('axios.log.forbidden', {
-                            method,
-                            url
-                        }),
+                        `请求被拒绝(403)：${method} ${url}`,
                         {
                             状态码: 403,
                             返回数据: error.response.data

package/lib/utils/locale.d.ts

@@ -1,17 +1,9 @@
 /**
  * 统一的语言判断方法。
  *
- * 生产环境（`process.env.NODE_ENV === 'production'`）：
- *   只看浏览器容器语言（navigator.language）。
- *
- * 非生产环境（沙箱预览场景）：
- *   优先级 query > localStorage > navigator。
- *   URL query `locale`（值为 `zh_CN` / `en_US`）由宿主平台（miaoda）
- *   通过 iframe src 透传，确保产物内的语言与宿主一致；
- *   读到 query 时会同步写入 localStorage，便于后续无 query 的跳转/刷新场景使用。
- *
- * 返回标准化 locale code：'zh' | 'en'。
- * 目前只区分中英文，未来扩展时在此调整。
+ * 基于浏览器 Accept-Language（navigator.language）判断。
+ * 返回标准化的 locale code：'zh' | 'en'。
+ * 目前只区分中英文，未来需要更多语言时在此扩展。
  */
 export type Locale = 'zh' | 'en';
 export declare function getLocale(): Locale;

package/lib/utils/locale.js

@@ -1,41 +1,5 @@
-const STORAGE_KEY = 'miaoda:preview-locale';
-function toLocale(value) {
-    const lang = value ?? 'zh';
-    return lang.toLowerCase().startsWith('zh') ? 'zh' : 'en';
-}
-function readLocaleFromQuery() {
-    if ('undefined' == typeof window) return null;
-    try {
-        const value = new URLSearchParams(window.location.search).get('locale');
-        return value && value.length > 0 ? value : null;
-    } catch  {
-        return null;
-    }
-}
-function readLocaleFromStorage() {
-    if ('undefined' == typeof window) return null;
-    try {
-        const value = window.localStorage?.getItem(STORAGE_KEY);
-        return value && value.length > 0 ? value : null;
-    } catch  {
-        return null;
-    }
-}
-function writeLocaleToStorage(value) {
-    if ('undefined' == typeof window) return;
-    try {
-        window.localStorage?.setItem(STORAGE_KEY, value);
-    } catch  {}
-}
 function getLocale() {
-    if ('production' === process.env.NODE_ENV) return toLocale(navigator.language);
-    const fromQuery = readLocaleFromQuery();
-    if (fromQuery) {
-        writeLocaleToStorage(fromQuery);
-        return toLocale(fromQuery);
-    }
-    const fromStorage = readLocaleFromStorage();
-    if (fromStorage) return toLocale(fromStorage);
-    return toLocale(navigator.language);
+    const lang = navigator.language || 'zh';
+    return lang.startsWith('zh') ? 'zh' : 'en';
 }
 export { getLocale };

package/lib/utils/url.d.ts

@@ -2,7 +2,3 @@ export interface UrlParts {
     baseUrl: string;
     workspace: string;
 }
-/**
- * @internal
- */
-export declare function splitWorkspaceUrl(fullUrl: string): UrlParts;

package/lib/utils/url.js

@@ -1,22 +0,0 @@
-import { logger } from "../logger/index.js";
-function splitWorkspaceUrl(fullUrl) {
-    try {
-        const url = new URL(fullUrl);
-        const pathParts = url.pathname.split('/');
-        const workspacesIndex = pathParts.findIndex((part)=>'workspaces' === part);
-        if (-1 === workspacesIndex) throw new Error('Invalid workspace URL format');
-        const basePathParts = pathParts.slice(0, workspacesIndex);
-        const workspace = pathParts[workspacesIndex + 1];
-        return {
-            baseUrl: `${url.origin}${basePathParts.join('/')}`,
-            workspace
-        };
-    } catch (error) {
-        logger.error('Error splitting workspace URL:', error);
-    }
-    return {
-        baseUrl: fullUrl,
-        workspace: 'workspace'
-    };
-}
-export { splitWorkspaceUrl };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/client-toolkit",
-  "version": "1.2.35-alpha.6",
+  "version": "1.2.35-alpha.7",
   "types": "./lib/index.d.ts",
   "main": "./lib/index.js",
   "files": [
@@ -98,10 +98,10 @@
   "dependencies": {
     "@ant-design/colors": "^7.2.1",
     "@ant-design/cssinjs": "^1.24.0",
-    "@data-loom/js": "0.4.13",
     "@lark-apaas/aily-web-sdk": "^0.0.9",
     "@lark-apaas/auth-sdk": "^0.1.4",
     "@lark-apaas/client-capability": "^0.1.6",
+    "@lark-apaas/dataloom": "0.1.1-alpha.2",
     "@lark-apaas/internal-slardar": "^0.0.3",
     "@lark-apaas/miaoda-inspector": "^1.0.23",
     "@lark-apaas/observable-web": "^1.0.6",