@blocklet/pages-kit-runtime 0.1.23 → 0.1.25

package/lib/cjs/client.js

@@ -57,7 +57,6 @@ const Box_1 = __importDefault(require("@mui/material/Box"));
 const ahooks_1 = require("ahooks");
 const react_1 = __importStar(require("react"));
 const ufo_1 = require("ufo");
-const PAGES_KIT_BLOCKLET_DID = 'z8iZiDFg3vkkrPwsiba1TLXy3H9XHzFERsP8o';
 const CenteredContainer = ({ children }) => ((0, jsx_runtime_1.jsx)(Box_1.default, { display: "flex", justifyContent: "center", alignItems: "center", minHeight: "100vh", children: children }));
 const api = (0, js_sdk_1.createAxios)({
     baseURL: (0, ufo_1.joinURL)(((_a = window === null || window === void 0 ? void 0 : window.blocklet) === null || _a === void 0 ? void 0 : _a.prefix) || ''),
@@ -215,41 +214,22 @@ const RuntimeComponent = (props) => {
         }
     }, [proxyState.rawState]);
     const { loading } = (0, ahooks_1.useRequest)(() => __awaiter(void 0, void 0, void 0, function* () {
-        var _a;
         if (props.state) {
             return null;
         }
         if (!props.did && !props.projectId) {
             return null;
         }
-        let stateData;
-        if (props.did) {
-            // get state from resource blocklet by did
-            const { data } = yield api.get('/api/pages', {
-                params: {
-                    did: props.did,
-                },
-            });
-            proxyState.rawState = data.state;
-            stateData = data;
-        }
-        else if (props.projectId) {
-            let pagesKitBaseUrl = props.siteFrom;
-            if (!pagesKitBaseUrl) {
-                pagesKitBaseUrl = window.location.origin;
-                // find pages kit prefix from window.blocklet
-                const pagesKitMountPoint = (_a = window.blocklet) === null || _a === void 0 ? void 0 : _a.componentMountPoints.find((i) => i.did === PAGES_KIT_BLOCKLET_DID);
-                if (pagesKitMountPoint) {
-                    pagesKitBaseUrl = (0, ufo_1.joinURL)(pagesKitBaseUrl, pagesKitMountPoint.mountPoint);
-                }
-            }
-            const apiUrl = (0, ufo_1.joinURL)(pagesKitBaseUrl, 'api/projects', props.projectId, 'pages');
-            // get state from project by projectId
-            const { data } = yield api.get(apiUrl);
-            proxyState.rawState = data;
-            stateData = data;
-        }
-        return stateData;
+        // 统一使用 /api/pages 接口
+        const { data } = yield api.get('/api/pages', {
+            params: {
+                did: props.did,
+                projectId: props.projectId,
+                siteFrom: props.siteFrom,
+            },
+        });
+        proxyState.rawState = data.state || data;
+        return data;
     }), {
         refreshDeps: [props.did, props.state, props.projectId],
     });

package/lib/cjs/components/custom-component/index.js

@@ -14,4 +14,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+// eslint-disable-next-line import/export
 __exportStar(require("./settings"), exports);

package/lib/cjs/components/index.js

@@ -15,4 +15,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./create-resource"), exports);
+// eslint-disable-next-line import/export
 __exportStar(require("./custom-component"), exports);