@lark-apaas/client-toolkit 1.2.19 → 1.2.21

package/lib/apis/utils/resolveAppUrl.d.ts

@@ -0,0 +1 @@
+export { resolveAppUrl } from '../../utils/resolveAppUrl';

package/lib/apis/utils/resolveAppUrl.js

@@ -0,0 +1,2 @@
+import { resolveAppUrl } from "../../utils/resolveAppUrl.js";
+export { resolveAppUrl };

package/lib/utils/postMessage.js

@@ -1,3 +1,19 @@
+const PARENT_ORIGIN_KEY = '__parentOrigin';
+function getParentOriginFromParams() {
+    try {
+        const params = new URLSearchParams(window.location.search);
+        const origin = params.get(PARENT_ORIGIN_KEY);
+        if (origin) {
+            sessionStorage.setItem(PARENT_ORIGIN_KEY, origin);
+            return origin;
+        }
+    } catch  {}
+    try {
+        return sessionStorage.getItem(PARENT_ORIGIN_KEY) || void 0;
+    } catch  {
+        return;
+    }
+}
 function getLegacyParentOrigin() {
     const { origin } = window.location;
     if (origin.includes('force.feishuapp.net')) return 'https://force.feishu.cn';
@@ -8,6 +24,8 @@ function getLegacyParentOrigin() {
     return 'https://miaoda.feishu-boe.cn';
 }
 function resolveParentOrigin() {
+    const paramOrigin = getParentOriginFromParams();
+    if (paramOrigin) return paramOrigin;
     return process.env?.FORCE_FRAMEWORK_DOMAIN_MAIN ?? getLegacyParentOrigin();
 }
 function submitPostMessage(message, targetOrigin) {

package/lib/utils/resolveAppUrl.d.ts

@@ -0,0 +1,27 @@
+/**
+ * 解析应用内路径，自动补全 CLIENT_BASE_PATH 前缀，返回完整 URL
+ * 适用于生成分享链接、二维码等需要完整 URL 的场景
+ *
+ * - 相对路径：补全前缀 + 当前域名
+ * - 当前域名的完整 URL：修正路径部分，补全前缀
+ * - 其他域名的 URL：原样返回，不做处理
+ *
+ * @param path - 应用内相对路径或完整 URL
+ * @returns 完整的 URL 字符串
+ *
+ * @example
+ * // 假设 CLIENT_BASE_PATH = '/app/abc'，当前域名为 https://example.com
+ *
+ * resolveAppUrl('/detail/123')
+ * // => 'https://example.com/app/abc/detail/123'
+ *
+ * resolveAppUrl('https://example.com/detail/123')
+ * // => 'https://example.com/app/abc/detail/123'
+ *
+ * resolveAppUrl('https://example.com/app/abc/detail/123')
+ * // => 'https://example.com/app/abc/detail/123' (已有前缀，不重复添加)
+ *
+ * resolveAppUrl('https://other-site.com/page')
+ * // => 'https://other-site.com/page' (非当前域名，原样返回)
+ */
+export declare function resolveAppUrl(path: string): string;

package/lib/utils/resolveAppUrl.js

@@ -0,0 +1,19 @@
+import { normalizeBasePath } from "./utils.js";
+function ensureBasePath(pathname, basePath) {
+    if (!basePath) return pathname;
+    if (pathname.startsWith(basePath)) return pathname;
+    return `${basePath}${pathname.startsWith('/') ? '' : '/'}${pathname}`;
+}
+function resolveAppUrl(path) {
+    const basePath = normalizeBasePath(process.env.CLIENT_BASE_PATH);
+    try {
+        const url = new URL(path);
+        if (url.origin !== window.location.origin) return path;
+        url.pathname = ensureBasePath(url.pathname, basePath);
+        return url.toString();
+    } catch  {}
+    const normalizedPath = path.startsWith('/') ? path : `/${path}`;
+    const resolvedPath = ensureBasePath(normalizedPath, basePath);
+    return `${window.location.origin}${resolvedPath}`;
+}
+export { resolveAppUrl };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/client-toolkit",
-  "version": "1.2.19",
+  "version": "1.2.21",
   "types": "./lib/index.d.ts",
   "main": "./lib/index.js",
   "files": [
@@ -99,11 +99,11 @@
     "@ant-design/colors": "^7.2.1",
     "@ant-design/cssinjs": "^1.24.0",
     "@data-loom/js": "0.4.7",
-    "@lark-apaas/aily-web-sdk": "^0.0.3",
+    "@lark-apaas/aily-web-sdk": "^0.0.5",
     "@lark-apaas/auth-sdk": "^0.1.0",
     "@lark-apaas/client-capability": "^0.1.4",
-    "@lark-apaas/miaoda-inspector": "^1.0.18",
-    "@lark-apaas/observable-web": "^1.0.1",
+    "@lark-apaas/miaoda-inspector": "^1.0.20",
+    "@lark-apaas/observable-web": "^1.0.3",
     "@radix-ui/react-avatar": "^1.1.10",
     "@radix-ui/react-popover": "^1.1.15",
     "@radix-ui/react-slot": "^1.2.3",