@steedos/webapp 3.0.14-beta.2 → 3.0.14-beta.3

package/dist/assets/{browser-ponyfill-CoPk88In.js → browser-ponyfill-D1ntEuu8.js}

@@ -1,4 +1,4 @@
-import { c as commonjsGlobal, g as getDefaultExportFromCjs } from "./index-BwvMWDgU.js";
+import { c as commonjsGlobal, g as getDefaultExportFromCjs } from "./index-CIm_G2BR.js";
 function _mergeNamespaces(n, m) {
   for (var i = 0; i < m.length; i++) {
     const e = m[i];

package/dist/assets/{index-BwvMWDgU.js → index-CIm_G2BR.js}

@@ -40473,9 +40473,10 @@ class Card extends reactExports.Component {
   }
   render() {
     const { platform: platform2 = {} } = this.props.settings;
+    const isOem = platform2.is_oem === true || platform2.is_oem === "true";
     return /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex sm:items-center justify-center mx-auto overflow-auto md:p-10 h-full", children: [
       /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "relative rounded p-10 sm:shadow-md bg-white w-screen max-w-md steedos-auth-card", children: this.props.children }),
-      platform2.is_oem != true && /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "absolute bottom-0 left-0 right-0 text-center pb-6 text-gray-400 text-xs tracking-wide", children: [
+      !isOem && /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "absolute bottom-0 left-0 right-0 text-center pb-6 text-gray-400 text-xs tracking-wide", children: [
         /* @__PURE__ */ jsxRuntimeExports.jsx(
           FormattedMessage,
           {
@@ -40488,6 +40489,7 @@ class Card extends reactExports.Component {
           "a",
           {
             className: "text-xs text-gray-400 hover:text-gray-600 hover:underline transition-colors duration-200",
+            title: "privacy",
             href: "javascript:void(0)",
             onClick: this.openPrivacyPage,
             children: /* @__PURE__ */ jsxRuntimeExports.jsx(
@@ -40514,16 +40516,22 @@ function mapStateToProps$d(state) {
   };
 }
 const Card$1 = connect(mapStateToProps$d)(Card);
-const Logo = ({ tenant, location: location2 }) => {
+const Logo = ({ tenant, settings: settings2 }) => {
+  const platform2 = settings2?.platform || {};
+  const isOem = platform2?.is_oem === true || platform2?.is_oem === "true";
+  const tenantConfig = settings2?.tenant || {};
   let logoUrl = `${localizeMessage("accounts.logoURL")}`;
-  if (tenant.logo_url) {
+  if (isOem && (tenant?.logo_url || tenantConfig?.logo_url)) {
+    logoUrl = tenant?.logo_url || tenantConfig?.logo_url;
+  } else if (tenant?.logo_url) {
     logoUrl = tenant.logo_url;
   }
-  return /* @__PURE__ */ jsxRuntimeExports.jsx("div", { children: /* @__PURE__ */ jsxRuntimeExports.jsx("img", { src: logoUrl, className: "h-10" }) });
+  return /* @__PURE__ */ jsxRuntimeExports.jsx("div", { children: /* @__PURE__ */ jsxRuntimeExports.jsx("img", { src: logoUrl, className: "h-10", alt: "logo" }) });
 };
 function mapStateToProps$c(state) {
   return {
-    tenant: getTenant(state)
+    tenant: getTenant(state),
+    settings: getSettings(state)
   };
 }
 const Logo$1 = connect(mapStateToProps$c)(Logo);
@@ -49831,6 +49839,23 @@ class Login extends React$1.Component {
   };
   componentDidMount() {
     this.initGeetest();
+    const platform2 = this.props.settings?.platform || {};
+    const tenant = this.props.tenant || {};
+    const isOem = platform2.is_oem === true || platform2.is_oem === "true";
+    const faviconUrl = tenant.favicon_url || this.props.settings?.tenant?.favicon_url;
+    if (isOem && faviconUrl) {
+      const faviconLink = document.querySelector('link[rel*="icon"], link[rel*="shortcut"]');
+      if (faviconLink) {
+        if (faviconLink.href !== faviconUrl) {
+          faviconLink.href = faviconUrl;
+        }
+      } else {
+        const newFaviconLink = document.createElement("link");
+        newFaviconLink.rel = "icon";
+        newFaviconLink.href = faviconUrl;
+        document.head.appendChild(newFaviconLink);
+      }
+    }
   }
   render() {
     return /* @__PURE__ */ jsxRuntimeExports.jsxs(jsxRuntimeExports.Fragment, { children: [
@@ -54622,6 +54647,23 @@ const AppView = () => {
   }, [appId, navigate]);
   return /* @__PURE__ */ jsxRuntimeExports.jsx("div", {});
 };
+const isTrueValue = (value2) => value2 === true || value2 === "true";
+const setBrowserFavicon = (faviconUrl) => {
+  if (!faviconUrl) {
+    return;
+  }
+  const faviconLink = document.querySelector('link[rel*="icon"], link[rel*="shortcut"]');
+  if (faviconLink) {
+    if (faviconLink.href !== faviconUrl) {
+      faviconLink.href = faviconUrl;
+    }
+    return;
+  }
+  const newFaviconLink = document.createElement("link");
+  newFaviconLink.rel = "icon";
+  newFaviconLink.href = faviconUrl;
+  document.head.appendChild(newFaviconLink);
+};
 const getHeaderSchema = (props) => {
   const { logoSrc, customButtons, className } = props;
   const isMobile = window.innerWidth <= 768;
@@ -54787,9 +54829,24 @@ const AppHeader = () => {
   const location2 = useLocation();
   const searchParams = new URLSearchParams(location2.search);
   const params = useParams();
-  let { appId = null, objectName } = params;
+  let { appId = null } = params;
   const isMobile = window.innerWidth < 1024;
   let [app, setApp] = reactExports.useState(null);
+  const isOem = isTrueValue(Builder$1.settings?.platform?.is_oem);
+  const oemSpaceAvatar = Builder$1.settings?.context?.user?.space?.avatar;
+  const oemSpaceFavicon = Builder$1.settings?.context?.user?.space?.favicon;
+  reactExports.useEffect(() => {
+    if (isOem) {
+      document.body.classList.add("is-oem");
+    } else {
+      document.body.classList.remove("is-oem");
+    }
+  }, [isOem]);
+  reactExports.useEffect(() => {
+    if (isOem && oemSpaceFavicon) {
+      setBrowserFavicon(`/api/v6/files/cfs.avatars.filerecord/${oemSpaceFavicon}`);
+    }
+  }, [isOem, oemSpaceFavicon]);
   reactExports.useEffect(() => {
     const fetchApp = async () => {
       if (appId === "-" || appId == null) {
@@ -54862,21 +54919,8 @@ const AppHeader = () => {
     return /* @__PURE__ */ jsxRuntimeExports.jsx(jsxRuntimeExports.Fragment, {});
   }
   let logoSrc = "/images/logo.svg";
-  if (Builder$1.settings?.platform?.is_oem && Builder$1.settings?.context?.user?.space?.avatar) {
-    logoSrc = "/api/v6/files/cfs.avatars.filerecord/" + Builder$1.settings.context.user.space.avatar;
-  }
-  const faviconLink = document.querySelector('link[rel*="icon"], link[rel*="shortcut"]');
-  let favicon = "/images/logo.svg";
-  if (Builder$1.settings?.platform?.is_oem && Builder$1.settings?.context?.user?.space?.favicon) {
-    favicon = "/api/v6/files/cfs.avatars.filerecord/" + Builder$1.settings.context.user.space.favicon;
-  }
-  if (faviconLink) {
-    faviconLink.href = favicon;
-  } else {
-    const newFaviconLink = document.createElement("link");
-    newFaviconLink.rel = "icon";
-    newFaviconLink.href = favicon;
-    document.head.appendChild(newFaviconLink);
+  if (isOem && oemSpaceAvatar) {
+    logoSrc = "/api/v6/files/cfs.avatars.filerecord/" + oemSpaceAvatar;
   }
   const headerSchema = getHeaderSchema({ logoSrc });
   const schema = {
@@ -80670,6 +80714,22 @@ if (_window["Steedos"]) {
 }
 const Root = (props) => {
   const [configLoaded, setConfigLoaded] = reactExports.useState(false);
+  const setBrowserFavicon2 = (faviconUrl) => {
+    if (!faviconUrl) {
+      return;
+    }
+    const faviconLink = document.querySelector('link[rel*="icon"], link[rel*="shortcut"]');
+    if (faviconLink) {
+      if (faviconLink.href !== faviconUrl) {
+        faviconLink.href = faviconUrl;
+      }
+      return;
+    }
+    const newFaviconLink = document.createElement("link");
+    newFaviconLink.rel = "icon";
+    newFaviconLink.href = faviconUrl;
+    document.head.appendChild(newFaviconLink);
+  };
   reactExports.useEffect(() => {
     const uid2 = new URLSearchParams(window.location.search).get("uid");
     if (uid2) {
@@ -80688,12 +80748,19 @@ const Root = (props) => {
   }, []);
   reactExports.useEffect(() => {
     if (props.tenant && props.tenant.favicon_url) {
-      const faviconLink = document.querySelector('link[rel="shortcut icon"]');
-      if (faviconLink) {
-        faviconLink.href = props.tenant.favicon_url;
+      setBrowserFavicon2(props.tenant.favicon_url);
+      try {
+        localStorage.setItem("steedos_favicon_url", props.tenant.favicon_url);
+      } catch (e) {
       }
     }
-  }, [props.tenant]);
+    const isOem = props.settings?.platform?.is_oem === true || props.settings?.platform?.is_oem === "true";
+    if (isOem) {
+      document.body.classList.add("is-oem");
+    } else {
+      document.body.classList.remove("is-oem");
+    }
+  }, [props.tenant, props.settings]);
   if (!configLoaded) {
     return /* @__PURE__ */ jsxRuntimeExports.jsx("div", {});
   }
@@ -81383,7 +81450,7 @@ if (typeof ActiveXObject === "function") {
 if (typeof fetchApi !== "function") fetchApi = void 0;
 if (!fetchApi && !XmlHttpRequestApi && !ActiveXObjectApi) {
   try {
-    __vitePreload(() => import("./browser-ponyfill-CoPk88In.js").then((n) => n.b), true ? [] : void 0).then(function(mod) {
+    __vitePreload(() => import("./browser-ponyfill-D1ntEuu8.js").then((n) => n.b), true ? [] : void 0).then(function(mod) {
       fetchApi = mod.default;
     }).catch(function() {
     });

package/dist/customize.css

@@ -29,6 +29,18 @@ html {
   display: none;
 }
 
+/* OEM 模式下隐藏右上角“关于/帮助”入口 */
+body.is-oem [data-item-id="about"],
+body.is-oem [data-item-id="help"],
+body.is-oem [data-key="about"],
+body.is-oem [data-key="help"],
+body.is-oem [title="关于"],
+body.is-oem [title="帮助"],
+body.is-oem [title="About"],
+body.is-oem [title="Help"] {
+  display: none !important;
+}
+
 /* :root {
   --body-bg: rgb(225, 239, 254);
 } */

package/dist/index.html

@@ -3,6 +3,7 @@
   <head>
     <meta charset="UTF-8" />
     <link rel="shortcut icon" href="/images/logo.svg" />
+    <script>try{var f=localStorage.getItem('steedos_favicon_url');if(f){document.querySelector('link[rel*="icon"]').href=f;}}catch(e){}</script>
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Steedos</title>
 
@@ -65,7 +66,7 @@
     <link rel="stylesheet" href="https://unpkg.com/@steedos-widgets/amis@6.3.0-patch.8/lib/themes/antd.css">
     <link rel="stylesheet" href="https://unpkg.com/@steedos-widgets/amis@6.3.0-patch.8/lib/helper.css">
     <link rel="stylesheet" href="https://unpkg.com/@steedos-widgets/amis@6.3.0-patch.8/sdk/iconfont.css">
-    <script type="module" crossorigin src="/assets/index-BwvMWDgU.js"></script>
+    <script type="module" crossorigin src="/assets/index-CIm_G2BR.js"></script>
     <link rel="stylesheet" crossorigin href="/assets/index-Np5NzHbA.css">
   </head>
   <body class="skin-blue-light fixed steedos sidebar-mini three-columns" >

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/webapp",
-  "version": "3.0.14-beta.2",
+  "version": "3.0.14-beta.3",
   "files": [
     "dist"
   ],
@@ -75,9 +75,9 @@
     "access": "public"
   },
   "repository": "https://github.com/steedos/app-builder/tree/master/apps/accounts",
-  "gitHead": "840ce631d505348bbfdbd5c0b728b3661c4dd36d",
+  "gitHead": "67cf8eaa2ab8b8ea7a4cbc360b4c5a3f009274d3",
   "dependencies": {
-    "@steedos-widgets/amis-object": "^6.10.53-beta.2",
+    "@steedos-widgets/amis-object": "^6.10.53-beta.3",
     "autoprefixer": "^10.4.23"
   }
 }