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

package/lib/cjs/utils/generate-wrapper-code.js

@@ -205,7 +205,7 @@ router.get('/api/pages', async (req, res) => {
     return res.status(400).json({ message: 'Either did or projectId is required' });
   } catch (error) {
     console.error('Error fetching pages:', error);
-    return res.status(500).json({ message: 'Internal server error' });
+    return res.status(400).json({ message: 'Internal server error' });
   }
 });
 

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

@@ -115,7 +115,7 @@ 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' });
     }
 });
 initBlockStudioRouter.post('/', async (req, res) => {
@@ -163,7 +163,7 @@ 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' });
     }
 });
 initBlockStudioRouter.post('/create', async (req, res) => {
@@ -225,7 +225,7 @@ 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' });
     }
 });
 initBlockStudioRouter.get('/resources', async (req, res) => {
@@ -319,7 +319,7 @@ 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}`,
             });
@@ -327,7 +327,7 @@ 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}`,
         });
@@ -385,7 +385,7 @@ 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}`,
             });
@@ -393,7 +393,7 @@ 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}`,
         });
@@ -455,7 +455,7 @@ 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}`,
             });
@@ -463,7 +463,7 @@ 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/esm/middlewares/init-resource-router.js

@@ -250,7 +250,7 @@ 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' });
     }
 });
 export default initResourceRouter;

package/lib/esm/plugins/_theme.js

@@ -8,12 +8,9 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { createAuthServiceSessionContext } from '@arcblock/did-connect/lib/Session';
 import { useConfig } from '@arcblock/ux/lib/Config';
 import { LocaleProvider, useLocaleContext } from '@arcblock/ux/lib/Locale/context';
-import { ThemeProvider } from '@arcblock/ux/lib/Theme';
 import Toast, { ToastProvider } from '@arcblock/ux/lib/Toast';
 import { createAxios } from '@blocklet/js-sdk';
-import { 
-// PageProvider,
-DashboardProvider, } from '@blocklet/pages-kit-inner-components/theme';
+import { PagesKitThemeProvider } from '@blocklet/pages-kit-inner-components/theme';
 // @ts-ignore
 import { BasicInfo, ParametersConfig, PropertiesConfig } from '@blocklet/pages-kit-runtime/components';
 // @ts-ignore
@@ -55,6 +52,14 @@ const api = createAxios({
     componentDid: PAGES_KIT_BLOCK_STUDIO_BLOCKLET_DID,
 });
 const { SessionProvider, SessionContext } = createAuthServiceSessionContext();
+function useIsInsideIframe() {
+    const location = useLocation();
+    const isInsideIframe = useMemo(() => {
+        const url = new URL(window.location.href);
+        return url.searchParams.get('simulator') === '1';
+    }, [location.href]);
+    return isInsideIframe;
+}
 function useSessionContext() {
     const info = useContext(SessionContext);
     return info;
@@ -274,10 +279,7 @@ function Layout({ loadState, loadedData }) {
     const navigate = useNavigate();
     const staticData = useStaticData();
     // 获取当前URL参数判断是否是在iframe内
-    const isInsideIframe = useMemo(() => {
-        const url = new URL(window.location.href);
-        return url.searchParams.get('simulator') === '1';
-    }, [window.location.href]);
+    const isInsideIframe = useIsInsideIframe();
     useUpdateEffect(() => {
         const iframe = document.querySelector('#preview-iframe');
         if (iframe && iframe.contentWindow) {
@@ -639,11 +641,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 (_jsx(Box, { className: "custom-component-root", sx: { height: '100vh', width: '100vw', overflow: 'auto' }, children: _jsx(ThemeProvider, { theme: theme, children: _jsx(CustomComponentRenderer, { locale: initialLocale, componentId: initialComponentId || state.metadata.id, dev: {
-                            mode: 'draft',
-                            components: mergedAllBlocks,
-                            defaultLocale,
-                        }, properties: mergedPropertiesValues }, `custom-${renderComponentTrigger}`) }) }));
+            return (_jsx(Box, { className: "custom-component-root", sx: { height: '100vh', width: '100vw', overflow: 'auto' }, children: _jsx(CustomComponentRenderer, { locale: initialLocale, componentId: initialComponentId || state.metadata.id, dev: {
+                        mode: 'draft',
+                        components: mergedAllBlocks,
+                        defaultLocale,
+                    }, properties: mergedPropertiesValues }, `custom-${renderComponentTrigger}`) }));
         }
         // 没有匹配到路由，使用欢迎页面
         if (notSelectedBlock) {
@@ -1128,7 +1130,8 @@ const StyledDashboard = styled(Dashboard) `
   }
 `;
 function LayoutWrapper({ loadState, loadedData, ...rest }) {
-    return (_jsx(StyledEngineProvider, { injectFirst: true, children: _jsx(DashboardProvider, { children: _jsx(ToastProvider, { children: _jsx(LocaleProvider, { translations: translations, fallbackLocale: "en", children: _jsx(SessionProvider, { serviceHost: basename, protectedRoutes: [`${basename}/*`], children: _jsx(Layout, { loadState: loadState, loadedData: loadedData }) }) }) }) }) }));
+    const isInsideIframe = useIsInsideIframe();
+    return (_jsx(StyledEngineProvider, { injectFirst: true, children: _jsx(PagesKitThemeProvider, { isDashboard: isInsideIframe, children: _jsx(ToastProvider, { children: _jsx(LocaleProvider, { translations: translations, fallbackLocale: "en", children: _jsx(SessionProvider, { serviceHost: basename, protectedRoutes: [`${basename}/*`], children: _jsx(Layout, { loadState: loadState, loadedData: loadedData }) }) }) }) }) }));
 }
 export default LayoutWrapper;
 function CreateResource({ open, onClose }) {