@steedos/webapp 3.0.13-beta.27 → 3.0.13-beta.29

package/dist/assets/{browser-ponyfill-D7PrWfUr.js → browser-ponyfill-9YmtxePq.js}

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

package/dist/assets/{index-CvIcQick.js → index-Bgqu_5NR.js}

@@ -51573,6 +51573,7 @@ const normalizeLink = (to, location2 = window.location) => {
 };
 const AmisRender = function({ schema = {}, data: data2 = {}, env: env2 = {} }) {
   const navigate = useNavigate();
+  const location2 = useLocation();
   if (!window.goBack) {
     window.goBack = () => {
       navigate(-1);
@@ -51594,10 +51595,70 @@ const AmisRender = function({ schema = {}, data: data2 = {}, env: env2 = {} }) {
       user: Builder$1.settings.context.user,
       now: /* @__PURE__ */ new Date()
     },
+    _pathname: location2.pathname,
     ...data2
   };
   const mergedEnv = {
     ...env2,
+    isCurrentUrl: (to, ctx) => {
+      if (!to) {
+        return false;
+      }
+      const link2 = normalizeLink(to);
+      const pathname = window.location.pathname;
+      const idx = link2.indexOf("?");
+      let linkPathname = link2;
+      let linkSearch = "";
+      if (~idx) {
+        linkPathname = link2.substring(0, idx);
+        linkSearch = link2.substring(idx);
+      }
+      if (linkSearch) {
+        if (linkPathname !== pathname) {
+          return false;
+        }
+        const currentSearch = window.location.search;
+        if (!currentSearch) {
+          return false;
+        }
+        const linkParams = new URLSearchParams(linkSearch);
+        const currentParams = new URLSearchParams(currentSearch);
+        let allMatch = true;
+        linkParams.forEach((value2, key2) => {
+          if (currentParams.get(key2) !== value2) {
+            allMatch = false;
+          }
+        });
+        return allMatch;
+      }
+      const decodedPathname = decodeURI(pathname);
+      const decodedLink = decodeURI(linkPathname);
+      if (decodedPathname === decodedLink) {
+        return true;
+      }
+      const linkSegments = decodedLink.replace(/^\//, "").split("/");
+      if (linkSegments.length <= 3 && decodedPathname.startsWith(decodedLink + "/")) {
+        const navPaths = window._steedosNavPaths;
+        if (navPaths && navPaths.some((p) => {
+          let pp = p;
+          const qi = pp.indexOf("?");
+          if (qi > -1) pp = pp.substring(0, qi);
+          const hi = pp.indexOf("#");
+          if (hi > -1) pp = pp.substring(0, hi);
+          if (decodeURI(pp) === decodedLink) return false;
+          const tmplIdx = pp.indexOf("${");
+          if (tmplIdx > -1) {
+            pp = pp.substring(0, tmplIdx);
+          }
+          const decodedNavPath = decodeURI(pp);
+          return decodedNavPath.startsWith(decodedLink + "/") && decodedPathname.startsWith(decodedNavPath);
+        })) {
+          return false;
+        }
+        return true;
+      }
+      return false;
+    },
     jumpTo: (to, action, ctx) => {
       if (to === "goBack") {
         return window.history.back();
@@ -51674,12 +51735,30 @@ const on_click_script = `
     }
   `;
 const pcInitJumtoFirstAppFirstTabScript = (payload, response, api2, context) => {
+  const resolvePathTemplate = (path2, data2) => {
+    if (!path2 || path2.indexOf("${") < 0) {
+      return path2;
+    }
+    try {
+      var currentAmis = window.amisRequire && window.amisRequire("amis");
+      var createObject = window.BuilderAmisObject && window.BuilderAmisObject.AmisLib && window.BuilderAmisObject.AmisLib.createObject;
+      if (currentAmis && createObject) {
+        const resolved = currentAmis.evaluate(path2, createObject(context, data2 || {}));
+        if (typeof resolved === "string" && resolved) {
+          return resolved;
+        }
+      }
+    } catch (ex) {
+      console.warn("resolvePathTemplate failed:", ex);
+    }
+    return path2;
+  };
   let app_items = payload;
   if (app_items && app_items.length > 0) {
     let firstApp = app_items[0];
     if (firstApp && firstApp.default_tab) {
       if (typeof firstApp.default_tab === "object" && firstApp.default_tab.path) {
-        window.location.href = firstApp.default_tab.path;
+        window.location.href = resolvePathTemplate(firstApp.default_tab.path, firstApp.default_tab);
       } else {
         window.location.href = `/app/${firstApp.id}/${firstApp.default_tab}`;
       }
@@ -51688,7 +51767,7 @@ const pcInitJumtoFirstAppFirstTabScript = (payload, response, api2, context) =>
     if (firstApp && firstApp.children && firstApp.children.length > 0) {
       let firstTab = firstApp.children[0];
       if (firstTab) {
-        window.location.href = firstTab.path;
+        window.location.href = resolvePathTemplate(firstTab.path, firstTab);
       }
     }
   }
@@ -54455,6 +54534,33 @@ const {
 const AppView = () => {
   const { appId } = useParams();
   const navigate = useNavigate();
+  const resolvePathTemplate = (path2, data2) => {
+    if (!path2 || path2.indexOf("${") < 0) {
+      return path2 || "";
+    }
+    try {
+      const currentAmis = window.amisRequire?.("amis");
+      const createObject = window.BuilderAmisObject?.AmisLib?.createObject;
+      if (currentAmis && createObject) {
+        const settings2 = window.Builder?.settings || {};
+        const scope = {
+          context: settings2.context,
+          global: {
+            userId: settings2.context?.userId,
+            spaceId: settings2.context?.tenantId,
+            user: settings2.context?.user
+          }
+        };
+        const resolved = currentAmis.evaluate(path2, createObject(scope, data2 || {}));
+        if (typeof resolved === "string" && resolved) {
+          return resolved;
+        }
+      }
+    } catch (error) {
+      console.warn("resolvePathTemplate failed:", error);
+    }
+    return path2;
+  };
   reactExports.useEffect(() => {
     const fetchData = async () => {
       try {
@@ -54466,7 +54572,7 @@ const AppView = () => {
         const data2 = response.data;
         if (data2?.default_tab) {
           if (typeof data2.default_tab === "object" && data2.default_tab !== null && data2.default_tab.path) {
-            navigate(data2.default_tab.path);
+            navigate(resolvePathTemplate(data2.default_tab.path, data2.default_tab));
             return;
           }
           if (typeof data2.default_tab === "string") {
@@ -54476,7 +54582,7 @@ const AppView = () => {
         }
         if (data2?.children.length > 0 && data2.children[0].path) {
           const children = _$1.sortBy(data2.children, ["index"]);
-          navigate(children[0].path);
+          navigate(resolvePathTemplate(children[0].path, children[0]));
         }
       } catch (error) {
         console.error("Error fetching data:", error);
@@ -81243,7 +81349,7 @@ if (typeof ActiveXObject === "function") {
 if (typeof fetchApi !== "function") fetchApi = void 0;
 if (!fetchApi && !XmlHttpRequestApi && !ActiveXObjectApi) {
   try {
-    __vitePreload(() => import("./browser-ponyfill-D7PrWfUr.js").then((n) => n.b), true ? [] : void 0).then(function(mod) {
+    __vitePreload(() => import("./browser-ponyfill-9YmtxePq.js").then((n) => n.b), true ? [] : void 0).then(function(mod) {
       fetchApi = mod.default;
     }).catch(function() {
     });

package/dist/index.html

@@ -65,7 +65,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-CvIcQick.js"></script>
+    <script type="module" crossorigin src="/assets/index-Bgqu_5NR.js"></script>
     <link rel="stylesheet" crossorigin href="/assets/index-Cd9-p_c2.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.13-beta.27",
+  "version": "3.0.13-beta.29",
   "files": [
     "dist"
   ],
@@ -75,7 +75,7 @@
     "access": "public"
   },
   "repository": "https://github.com/steedos/app-builder/tree/master/apps/accounts",
-  "gitHead": "878f48f739c6acaa049ba1bd0b1f85c827259489",
+  "gitHead": "55a23a8cd119c35902d8846a1270f375f0532a91",
   "dependencies": {
     "@steedos-widgets/amis-object": "^6.10.51",
     "autoprefixer": "^10.4.23"