@steedos/webapp 3.0.6 → 3.0.7-beta.3

package/dist/assets/{browser-ponyfill-C0nRaRXP.js → browser-ponyfill-C-i5StIu.js}

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

package/dist/assets/{index-BIqMuyTa.css → index-DucDe4Dz.css}

@@ -1027,9 +1027,6 @@ video {
 .m-4 {
   margin: 1rem;
 }
-.m-auto {
-  margin: auto;
-}
 .\!mx-0 {
   margin-left: 0px !important;
   margin-right: 0px !important;
@@ -1130,9 +1127,6 @@ video {
 .mr-4 {
   margin-right: 1rem;
 }
-.mr-7 {
-  margin-right: 1.75rem;
-}
 .mt-0\.5 {
   margin-top: 0.125rem;
 }
@@ -1250,9 +1244,6 @@ video {
 .w-4 {
   width: 1rem;
 }
-.w-4\/5 {
-  width: 80%;
-}
 .w-48 {
   width: 12rem;
 }
@@ -1310,9 +1301,6 @@ video {
 .min-w-\[460px\] {
   min-width: 460px;
 }
-.max-w-4xl {
-  max-width: 56rem;
-}
 .max-w-7xl {
   max-width: 80rem;
 }
@@ -1750,9 +1738,6 @@ video {
 .pl-1\.5 {
   padding-left: 0.375rem;
 }
-.pl-10 {
-  padding-left: 2.5rem;
-}
 .pl-4 {
   padding-left: 1rem;
 }
@@ -1912,6 +1897,10 @@ video {
   --tw-text-opacity: 1;
   color: rgb(22 163 74 / var(--tw-text-opacity, 1));
 }
+.text-red-500 {
+  --tw-text-opacity: 1;
+  color: rgb(239 68 68 / var(--tw-text-opacity, 1));
+}
 .text-sky-500 {
   --tw-text-opacity: 1;
   color: rgb(14 165 233 / var(--tw-text-opacity, 1));

package/dist/assets/{index-D1Qod7S1.js → index-K_xwMI-B.js}

@@ -48431,7 +48431,7 @@ function filterWithCustomTargeting(e, t, n, r2) {
     return objectMatchesQuery(e, t2);
   }))));
 }
-function isString$1(e) {
+function isString$2(e) {
   return "string" == typeof e;
 }
 function isNumber$1(e) {
@@ -48454,11 +48454,11 @@ function objectMatchesQuery(e, t) {
       case "isNot":
         return o !== i;
       case "contains":
-        return (isString$1(o) || Array.isArray(o)) && o.includes(String(i));
+        return (isString$2(o) || Array.isArray(o)) && o.includes(String(i));
       case "startsWith":
-        return isString$1(o) && o.startsWith(String(i));
+        return isString$2(o) && o.startsWith(String(i));
       case "endsWith":
-        return isString$1(o) && o.endsWith(String(i));
+        return isString$2(o) && o.endsWith(String(i));
       case "greaterThan":
         return isNumber$1(o) && isNumber$1(i) && o > i;
       case "lessThan":
@@ -51937,7 +51937,7 @@ function isArrayBufferView(val) {
   }
   return result;
 }
-const isString = typeOfTest("string");
+const isString$1 = typeOfTest("string");
 const isFunction$1 = typeOfTest("function");
 const isNumber = typeOfTest("number");
 const isObject$2 = (thing) => thing !== null && typeof thing === "object";
@@ -52239,7 +52239,7 @@ const utils$1 = {
   isBuffer,
   isFormData,
   isArrayBufferView,
-  isString,
+  isString: isString$1,
   isNumber,
   isBoolean,
   isObject: isObject$2,
@@ -54892,35 +54892,90 @@ const ObjectDetail = () => {
     app_id: appId
   }, env: {} });
 };
+const isString = (val) => typeof val === "string";
+function injectServerCss(cssString) {
+  const styleTag = document.createElement("style");
+  styleTag.id = "app-page-styles";
+  styleTag.innerHTML = cssString;
+  const oldStyle = document.getElementById("app-page-styles");
+  if (oldStyle) {
+    oldStyle.remove();
+  }
+  document.head.appendChild(styleTag);
+}
 const PageView = () => {
   const { appId, pageId } = useParams();
-  return /* @__PURE__ */ jsxRuntimeExports.jsx(AmisRender, { schema: {
-    type: "page",
-    bodyClassName: "p-0",
-    body: {
-      type: "service",
-      schemaApi: {
-        "method": "get",
-        "url": "/api/pageSchema/app?app=${appId}&pageId=${pageId}&formFactor=${formFactor}",
-        "adaptor": `
-                return {
-                    "data": _.isString(payload.schema) ? JSON.parse(payload.schema):payload.schema
-                }
-            `
+  const [schema, setSchema] = reactExports.useState(null);
+  const [loading, setLoading] = reactExports.useState(true);
+  const [error, setError] = reactExports.useState(null);
+  const formFactor = "";
+  reactExports.useEffect(() => {
+    const fetchSchema = async () => {
+      try {
+        setLoading(true);
+        const url2 = `/api/v6/pages/schema/app?app=${appId}&pageId=${pageId}&formFactor=${formFactor}`;
+        const response = await fetch(url2, {
+          method: "GET",
+          headers: {
+            "Content-Type": "application/json"
+            // 如果需要鉴权 token，请在这里添加
+            // 'Authorization': `Bearer ${token}` 
+          }
+        });
+        if (!response.ok) {
+          throw new Error(`HTTP error! status: ${response.status}`);
+        }
+        const payload = await response.json();
+        if (payload && payload.css) {
+          injectServerCss(payload.css);
+        }
+        let finalSchema = payload.schema;
+        if (isString(finalSchema)) {
+          try {
+            finalSchema = JSON.parse(finalSchema);
+          } catch (e) {
+            console.error("Schema parse failed", e);
+          }
+        }
+        setSchema(finalSchema);
+      } catch (err) {
+        console.error("Fetch schema failed", err);
+        setError(err);
+      } finally {
+        setLoading(false);
       }
+    };
+    if (appId && pageId) {
+      fetchSchema();
     }
-  }, data: {
-    context: {
-      app: appId,
-      appId,
-      app_id: appId,
-      ...Builder$1.settings.context
-    },
-    app: appId,
-    appId,
-    app_id: appId,
-    pageId
-  }, env: {} });
+  }, [appId, pageId]);
+  if (loading) return /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "p-4 text-center", children: "Loading..." });
+  if (error) return /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "p-4 text-center text-red-500", children: "Error loading page configuration." });
+  return /* @__PURE__ */ jsxRuntimeExports.jsx(
+    AmisRender,
+    {
+      schema: {
+        type: "page",
+        // 保持原有的样式类名逻辑
+        bodyClassName: `p-0 page-${pageId}`,
+        // 将获取到的 schema 直接作为 body 渲染
+        body: schema
+      },
+      data: {
+        context: {
+          app: appId,
+          appId,
+          app_id: appId,
+          ...Builder$1.settings.context
+        },
+        app: appId,
+        appId,
+        app_id: appId,
+        pageId
+      },
+      env: {}
+    }
+  );
 };
 const IframeView = () => {
   const { appId, tabId } = useParams();
@@ -81120,7 +81175,7 @@ if (typeof ActiveXObject === "function") {
 if (typeof fetchApi !== "function") fetchApi = void 0;
 if (!fetchApi && !XmlHttpRequestApi && !ActiveXObjectApi) {
   try {
-    __vitePreload(() => import("./browser-ponyfill-C0nRaRXP.js").then((n) => n.b), true ? [] : void 0).then(function(mod) {
+    __vitePreload(() => import("./browser-ponyfill-C-i5StIu.js").then((n) => n.b), true ? [] : void 0).then(function(mod) {
       fetchApi = mod.default;
     }).catch(function() {
     });

package/dist/index.html

@@ -66,8 +66,8 @@
     <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-D1Qod7S1.js"></script>
-    <link rel="stylesheet" crossorigin href="/assets/index-BIqMuyTa.css">
+    <script type="module" crossorigin src="/assets/index-K_xwMI-B.js"></script>
+    <link rel="stylesheet" crossorigin href="/assets/index-DucDe4Dz.css">
   </head>
   <body class="skin-blue-light fixed steedos sidebar-mini three-columns" >
     <div id="root" class="steedos skin-blue-light creator h-full flex flex-col relative overflow-hidden bg-slate-50"></div>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/webapp",
-  "version": "3.0.6",
+  "version": "3.0.7-beta.3",
   "files": [
     "dist"
   ],
@@ -74,9 +74,9 @@
     "access": "public"
   },
   "repository": "https://github.com/steedos/app-builder/tree/master/apps/accounts",
-  "gitHead": "4a71a744c351bcfbd70cf8af8108092e34cf3705",
+  "gitHead": "ef6ed92d244835fae9ca3436e7be6f9eb362ffdd",
   "dependencies": {
-    "@steedos-widgets/amis-object": "^6.10.39",
+    "@steedos-widgets/amis-object": "^6.10.40",
     "autoprefixer": "^10.4.23"
   }
 }