@lark-apaas/client-toolkit 1.2.51-alpha.9 → 1.2.51-beta.0

package/lib/apis/components/UniversalLink.js

@@ -2,28 +2,28 @@ import { jsx } from "react/jsx-runtime";
 import react from "react";
 import { Link } from "react-router-dom";
 import { isPreview } from "../../utils/utils.js";
-import { submitPostMessage } from "../../utils/postMessage.js";
+import { getParentOriginFromParams, submitPostMessage } from "../../utils/postMessage.js";
 function isInternalRoute(to) {
     return !to.startsWith('#') && !to.startsWith('http://') && !to.startsWith('https://') && !to.startsWith('//');
 }
 function isExternalLink(to) {
     return to.startsWith('http://') || to.startsWith('https://') || to.startsWith('//');
 }
-const MIAODA_PARENT_ORIGIN_RE = /^https:\/\/(miaoda|force)\.feishu(-pre|-boe|-staging)?\.cn$/;
-function isIframeUnderMiaoda() {
+function isIframeUnderMainHost() {
     if ('undefined' == typeof window) return false;
     if (window.parent === window) return false;
+    if (getParentOriginFromParams()) return true;
+    const envOrigin = process.env.FORCE_FRAMEWORK_DOMAIN_MAIN;
+    if (!envOrigin || !document.referrer) return false;
     try {
-        if (!document.referrer) return false;
-        const refOrigin = new URL(document.referrer).origin;
-        return MIAODA_PARENT_ORIGIN_RE.test(refOrigin);
+        return new URL(document.referrer).origin === envOrigin;
     } catch  {
         return false;
     }
 }
 const UniversalLink_UniversalLink = /*#__PURE__*/ react.forwardRef(function({ to, onClick, ...props }, ref) {
     const isExternal = isExternalLink(to);
-    const preview = (isPreview() || isIframeUnderMiaoda()) && isExternal;
+    const preview = (isPreview() || isIframeUnderMainHost()) && isExternal;
     if (preview) {
         const handlePreviewClick = (e)=>{
             e.preventDefault();

package/lib/components/AppContainer/safety.js

@@ -2,12 +2,32 @@ import { jsx, jsxs } from "react/jsx-runtime";
 import { useEffect, useRef, useState } from "react";
 import { Popover, PopoverContent, PopoverTrigger } from "../ui/popover.js";
 import { getAppId } from "../../utils/getAppId.js";
+import { getEnv } from "../../utils/getParentOrigin.js";
 import { getCsrfToken } from "../../utils/getCsrfToken.js";
 import { isNewPathEnabled } from "../../utils/apiPath.js";
 import { useIsMobile } from "../../hooks/index.js";
 import { X } from "lucide-react";
 import { Sheet, SheetContent, SheetTrigger } from "../ui/drawer.js";
 import { t } from "../../locales/index.js";
+const ICON_FEEDBACK_URL = 'https://lf3-static.bytednsdoc.com/obj/eden-cn/LMfspH/ljhwZthlaukjlkulzlp/miaoda-ui/icon_feedback_outlined.png';
+const REPORT_DOMAIN = {
+    BOE: 'tns.feishu-boe.cn',
+    PRE: 'tns.feishu-pre.cn',
+    ONLINE: 'tns.feishu.cn'
+};
+const openReport = ()=>{
+    const appId = getAppId();
+    if (!appId) return;
+    const params = JSON.stringify({
+        scene: 'miaoda_app_report',
+        entity_id: appId,
+        entity_type: 'miaoda_app',
+        extra: ''
+    });
+    const domain = REPORT_DOMAIN[getEnv()] ?? REPORT_DOMAIN.ONLINE;
+    const url = `https://${domain}/cust/lark_report/?type=common&params=${encodeURIComponent(params)}&lang=zh-CN`;
+    window.open(url, '_blank', 'noopener,noreferrer');
+};
 const Component = ()=>{
     const HasClosedKey = `miaoda-creatByMiaoda-has-closed-${getAppId()}`;
     const [visible, setVisible] = useState(!window.localStorage?.getItem(HasClosedKey));
@@ -129,6 +149,21 @@ const Component = ()=>{
                                                     children: t('safety.ai.disclaimer')
                                                 })
                                             ]
+                                        }),
+                                        /*#__PURE__*/ jsxs("div", {
+                                            className: "self-stretch shrink-0 flex items-center gap-x-[6px] cursor-pointer",
+                                            "data-custom-element": "safety-report",
+                                            onClick: openReport,
+                                            children: [
+                                                /*#__PURE__*/ jsx("img", {
+                                                    src: ICON_FEEDBACK_URL,
+                                                    className: "shrink-0 w-[14px] h-[14px]"
+                                                }),
+                                                /*#__PURE__*/ jsx("p", {
+                                                    className: "shrink-0 m-0! text-[#646A73] text-sm underline underline-offset-2",
+                                                    children: t('safety.report')
+                                                })
+                                            ]
                                         })
                                     ]
                                 }),
@@ -248,6 +283,21 @@ const Component = ()=>{
                                                     children: t('safety.ai.disclaimer')
                                                 })
                                             ]
+                                        }),
+                                        /*#__PURE__*/ jsxs("div", {
+                                            className: "self-stretch shrink-0 flex items-center gap-x-[6px] cursor-pointer",
+                                            "data-custom-element": "safety-report",
+                                            onClick: openReport,
+                                            children: [
+                                                /*#__PURE__*/ jsx("img", {
+                                                    src: ICON_FEEDBACK_URL,
+                                                    className: "shrink-0 w-[12px] h-[12px]"
+                                                }),
+                                                /*#__PURE__*/ jsx("p", {
+                                                    className: "shrink-0 m-0! text-[#a6a6a6] underline underline-offset-2",
+                                                    children: t('safety.report')
+                                                })
+                                            ]
                                         })
                                     ]
                                 }),

package/lib/locales/messages.js

@@ -23,6 +23,10 @@ const messages_messages = {
         zh: '了解更多',
         en: 'Learn more'
     },
+    'safety.report': {
+        zh: '投诉与举报',
+        en: 'Report'
+    },
     'safety.cover.pc': {
         zh: 'https://lf3-static.bytednsdoc.com/obj/eden-cn/LMfspH/ljhwZthlaukjlkulzlp/logo/miaodacover.png',
         en: 'https://lf3-static.bytednsdoc.com/obj/eden-cn/LMfspH/ljhwZthlaukjlkulzlp/logo/miaodacover-weben.png'

package/lib/utils/postMessage.d.ts

@@ -1,4 +1,5 @@
 import type { IncomingMessage, OutgoingMessage } from '../types/iframe-events';
+export declare function getParentOriginFromParams(): string | undefined;
 export declare function resolveParentOrigin(): string;
 export declare function submitPostMessage<T extends OutgoingMessage>(message: T, targetOrigin?: string): void;
 export declare function isOutgoingMessage<T extends OutgoingMessage['type']>(msg: OutgoingMessage, type: T): msg is Extract<OutgoingMessage, {

package/lib/utils/postMessage.js

@@ -23,23 +23,22 @@ function getLegacyParentOrigin() {
     if (origin.includes('fsapp.kundou.cn') || origin.includes('miaoda-pre.feishuapp.net')) return 'https://miaoda.feishu-pre.cn';
     return 'https://miaoda.feishu-boe.cn';
 }
-const MIAODA_PARENT_ORIGIN_RE = /^https:\/\/(miaoda|force)\.feishu(-pre|-boe|-staging)?\.cn$/;
 function resolveParentOrigin() {
-    const paramOrigin = getParentOriginFromParams();
-    if (paramOrigin) return paramOrigin;
     try {
         if (document.referrer) {
             const referrerOrigin = new URL(document.referrer).origin;
-            if (MIAODA_PARENT_ORIGIN_RE.test(referrerOrigin) || referrerOrigin.startsWith('http://localhost') || referrerOrigin.startsWith('http://127.0.0.1')) return referrerOrigin;
+            if (referrerOrigin.startsWith('http://localhost') || referrerOrigin.startsWith('http://127.0.0.1')) return referrerOrigin;
         }
     } catch  {}
+    const paramOrigin = getParentOriginFromParams();
+    if (paramOrigin) return paramOrigin;
     return process.env?.FORCE_FRAMEWORK_DOMAIN_MAIN ?? getLegacyParentOrigin();
 }
 function submitPostMessage(message, targetOrigin) {
     try {
         const parentOrigin = resolveParentOrigin();
         const origin = targetOrigin ?? parentOrigin;
-        if (!origin) return void console.error('postMessage skipped: cannot resolve parent origin');
+        if (!origin) return;
         window.parent.postMessage(message, origin);
     } catch (e) {
         console.error('postMessage error', e);
@@ -51,4 +50,4 @@ function isOutgoingMessage(msg, type) {
 function isIncomingMessage(msg, type) {
     return msg.type === type;
 }
-export { isIncomingMessage, isOutgoingMessage, resolveParentOrigin, submitPostMessage };
+export { getParentOriginFromParams, isIncomingMessage, isOutgoingMessage, resolveParentOrigin, submitPostMessage };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/client-toolkit",
-  "version": "1.2.51-alpha.9",
+  "version": "1.2.51-beta.0",
   "types": "./lib/index.d.ts",
   "main": "./lib/index.js",
   "files": [