@blocklet/pages-kit-block-studio 0.5.54 → 0.5.56

package/lib/cjs/middlewares/init-block-studio-router.js

@@ -154,7 +154,7 @@ exports.initBlockStudioRouter.get('/', async (req, res) => {
         return res.json(metadata);
     }
     catch (error) {
-        return res.status(500).json({ error: 'Failed to read file' });
+        return res.status(400).json({ error: 'Failed to read file' });
     }
 });
 exports.initBlockStudioRouter.post('/', async (req, res) => {
@@ -202,7 +202,7 @@ exports.initBlockStudioRouter.post('/', async (req, res) => {
         return res.json({ success: true, content: mergedContent, message: 'Updated' });
     }
     catch (error) {
-        return res.status(500).json({ error: 'Failed to write file' });
+        return res.status(400).json({ error: 'Failed to write file' });
     }
 });
 exports.initBlockStudioRouter.post('/create', async (req, res) => {
@@ -264,7 +264,7 @@ exports.initBlockStudioRouter.post('/create', async (req, res) => {
     }
     catch (error) {
         console.error('Failed to create block:', error);
-        return res.status(500).json({ error: 'Failed to create block' });
+        return res.status(400).json({ error: 'Failed to create block' });
     }
 });
 exports.initBlockStudioRouter.get('/resources', async (req, res) => {
@@ -358,7 +358,7 @@ exports.initBlockStudioRouter.post('/properties-to-interface', async (req, res)
         }
         catch (conversionError) {
             console.error('Failed to convert properties to interface:', conversionError);
-            return res.status(500).json({
+            return res.status(400).json({
                 success: false,
                 error: `Failed to convert properties to interface: ${conversionError.message}`,
             });
@@ -366,7 +366,7 @@ exports.initBlockStudioRouter.post('/properties-to-interface', async (req, res)
     }
     catch (error) {
         console.error('Failed to generate interface:', error);
-        return res.status(500).json({
+        return res.status(400).json({
             success: false,
             error: `Failed to generate interface: ${error.message}`,
         });
@@ -424,7 +424,7 @@ exports.initBlockStudioRouter.post('/interface-to-properties', async (req, res)
         }
         catch (conversionError) {
             console.error('Failed to convert interface to properties:', conversionError);
-            return res.status(500).json({
+            return res.status(400).json({
                 success: false,
                 error: `Failed to convert interface to properties: ${conversionError.message}`,
             });
@@ -432,7 +432,7 @@ exports.initBlockStudioRouter.post('/interface-to-properties', async (req, res)
     }
     catch (error) {
         console.error('Failed to generate metadata:', error);
-        return res.status(500).json({
+        return res.status(400).json({
             success: false,
             error: `Failed to generate metadata: ${error.message}`,
         });
@@ -494,7 +494,7 @@ exports.initBlockStudioRouter.delete('/delete', async (req, res) => {
         }
         catch (deleteError) {
             console.error('Failed to delete component directory:', deleteError);
-            return res.status(500).json({
+            return res.status(400).json({
                 success: false,
                 error: `Failed to delete component directory: ${deleteError.message}`,
             });
@@ -502,7 +502,7 @@ exports.initBlockStudioRouter.delete('/delete', async (req, res) => {
     }
     catch (error) {
         console.error('Failed to delete component:', error);
-        return res.status(500).json({
+        return res.status(400).json({
             success: false,
             error: `Failed to delete component: ${error.message}`,
         });

package/lib/cjs/middlewares/init-resource-router.js

@@ -292,7 +292,7 @@ exports.initResourceRouter.post('/', async (req, res) => {
     }
     catch (error) {
         console.error('Build failed:', error);
-        res.status(500).json({ error: 'Build failed' });
+        res.status(400).json({ error: 'Build failed' });
     }
 });
 exports.default = exports.initResourceRouter;

package/lib/cjs/plugins/_theme.js

@@ -46,7 +46,6 @@ const jsx_runtime_1 = require("react/jsx-runtime");
 const Session_1 = require("@arcblock/did-connect/lib/Session");
 const Config_1 = require("@arcblock/ux/lib/Config");
 const context_1 = require("@arcblock/ux/lib/Locale/context");
-const Theme_1 = require("@arcblock/ux/lib/Theme");
 const Toast_1 = __importStar(require("@arcblock/ux/lib/Toast"));
 const js_sdk_1 = require("@blocklet/js-sdk");
 const theme_1 = require("@blocklet/pages-kit-inner-components/theme");
@@ -91,6 +90,14 @@ const api = (0, js_sdk_1.createAxios)({
     componentDid: PAGES_KIT_BLOCK_STUDIO_BLOCKLET_DID,
 });
 const { SessionProvider, SessionContext } = (0, Session_1.createAuthServiceSessionContext)();
+function useIsInsideIframe() {
+    const location = (0, react_router_dom_1.useLocation)();
+    const isInsideIframe = (0, react_1.useMemo)(() => {
+        const url = new URL(window.location.href);
+        return url.searchParams.get('simulator') === '1';
+    }, [location.href]);
+    return isInsideIframe;
+}
 function useSessionContext() {
     const info = (0, react_1.useContext)(SessionContext);
     return info;
@@ -310,10 +317,7 @@ function Layout({ loadState, loadedData }) {
     const navigate = (0, react_router_dom_1.useNavigate)();
     const staticData = (0, client_1.useStaticData)();
     // 获取当前URL参数判断是否是在iframe内
-    const isInsideIframe = (0, react_1.useMemo)(() => {
-        const url = new URL(window.location.href);
-        return url.searchParams.get('simulator') === '1';
-    }, [window.location.href]);
+    const isInsideIframe = useIsInsideIframe();
     (0, ahooks_2.useUpdateEffect)(() => {
         const iframe = document.querySelector('#preview-iframe');
         if (iframe && iframe.contentWindow) {
@@ -675,11 +679,11 @@ function Layout({ loadState, loadedData }) {
             const url = new URL(window.location.href);
             const initialComponentId = url.searchParams.get('componentId') || state.metadata.id;
             const initialLocale = url.searchParams.get('locale') || locale || 'en';
-            return ((0, jsx_runtime_1.jsx)(material_1.Box, { className: "custom-component-root", sx: { height: '100vh', width: '100vw', overflow: 'auto' }, children: (0, jsx_runtime_1.jsx)(Theme_1.ThemeProvider, { theme: theme, children: (0, jsx_runtime_1.jsx)(components_2.CustomComponentRenderer, { locale: initialLocale, componentId: initialComponentId || state.metadata.id, dev: {
-                            mode: 'draft',
-                            components: mergedAllBlocks,
-                            defaultLocale,
-                        }, properties: mergedPropertiesValues }, `custom-${renderComponentTrigger}`) }) }));
+            return ((0, jsx_runtime_1.jsx)(material_1.Box, { className: "custom-component-root", sx: { height: '100vh', width: '100vw', overflow: 'auto' }, children: (0, jsx_runtime_1.jsx)(components_2.CustomComponentRenderer, { locale: initialLocale, componentId: initialComponentId || state.metadata.id, dev: {
+                        mode: 'draft',
+                        components: mergedAllBlocks,
+                        defaultLocale,
+                    }, properties: mergedPropertiesValues }, `custom-${renderComponentTrigger}`) }));
         }
         // 没有匹配到路由，使用欢迎页面
         if (notSelectedBlock) {
@@ -1164,7 +1168,8 @@ const StyledDashboard = (0, material_1.styled)(studio_ui_1.Dashboard) `
   }
 `;
 function LayoutWrapper({ loadState, loadedData, ...rest }) {
-    return ((0, jsx_runtime_1.jsx)(material_1.StyledEngineProvider, { injectFirst: true, children: (0, jsx_runtime_1.jsx)(theme_1.DashboardProvider, { children: (0, jsx_runtime_1.jsx)(Toast_1.ToastProvider, { children: (0, jsx_runtime_1.jsx)(context_1.LocaleProvider, { translations: locales_1.translations, fallbackLocale: "en", children: (0, jsx_runtime_1.jsx)(SessionProvider, { serviceHost: basename, protectedRoutes: [`${basename}/*`], children: (0, jsx_runtime_1.jsx)(Layout, { loadState: loadState, loadedData: loadedData }) }) }) }) }) }));
+    const isInsideIframe = useIsInsideIframe();
+    return ((0, jsx_runtime_1.jsx)(material_1.StyledEngineProvider, { injectFirst: true, children: (0, jsx_runtime_1.jsx)(theme_1.PagesKitThemeProvider, { isDashboard: isInsideIframe, children: (0, jsx_runtime_1.jsx)(Toast_1.ToastProvider, { children: (0, jsx_runtime_1.jsx)(context_1.LocaleProvider, { translations: locales_1.translations, fallbackLocale: "en", children: (0, jsx_runtime_1.jsx)(SessionProvider, { serviceHost: basename, protectedRoutes: [`${basename}/*`], children: (0, jsx_runtime_1.jsx)(Layout, { loadState: loadState, loadedData: loadedData }) }) }) }) }) }));
 }
 exports.default = LayoutWrapper;
 function CreateResource({ open, onClose }) {