@blocklet/pages-kit 0.4.11 → 0.4.13-beta.20250227

package/lib/esm/utils/inject-global-components.js

@@ -33,20 +33,21 @@ function injectGlobalComponents() {
             '@blocklet/pages-kit/builtin/pages-kit': { CustomComponentRenderer },
             '@blocklet/pages-kit/builtin/dayjs': dayjs,
             '@blocklet/pages-kit/builtin/utils': utils,
+            '@blocklet/pages-kit/builtin/stream': stream,
             '@blocklet/pages-kit/builtin/react': react,
             '@blocklet/pages-kit/builtin/emotion/css': emotionCss,
             '@blocklet/pages-kit/builtin/mui/material': muiMaterial,
             '@blocklet/pages-kit/builtin/mui/lab': muiLab,
             '@blocklet/pages-kit/builtin/react-hook-form': reactHookForm,
             '@blocklet/pages-kit/builtin/iconify/react': iconifyReact,
+            //
             '@blocklet/pages-kit/builtin/zustand': zustand,
             '@blocklet/pages-kit/builtin/zustand/middleware/immer': zustandMiddlewareImmer,
             '@blocklet/pages-kit/builtin/immer': immer,
             '@blocklet/pages-kit/builtin/react-wrap-balancer': reactWrapBalancer,
-            '@blocklet/pages-kit/builtin/stream': stream,
+            '@blocklet/pages-kit/builtin/react-router-dom': reactRouterDOM,
             '@blocklet/pages-kit/builtin/session': session,
             '@blocklet/pages-kit/builtin/locale': locale,
-            '@blocklet/pages-kit/builtin/react-router-dom': reactRouterDOM,
             '@blocklet/pages-kit/builtin/arcblock/ux': arcblockUx,
             '@blocklet/pages-kit/builtin/page/header': pageHeader,
             '@blocklet/pages-kit/builtin/components': components,
@@ -58,7 +59,21 @@ function injectGlobalComponents() {
             '@blocklet/pages-kit/builtin/async/ai-runtime': aiRuntime,
         },
         require(module) {
-            return win[BuiltinModulesGlobalVariableName].modules[module];
+            var _a;
+            if ((_a = win[BuiltinModulesGlobalVariableName]) === null || _a === void 0 ? void 0 : _a.modules[module]) {
+                return win[BuiltinModulesGlobalVariableName].modules[module];
+            }
+            // Try loading from CDN or dynamic import
+            try {
+                // TODO: 需要支持动态加载
+                // const module = await import(/* webpackIgnore: true */ `https://cdn.jsdelivr.net/npm/${moduleName}`);
+                // return module;
+                return null;
+            }
+            catch (err) {
+                console.warn(`Failed to load module ${module}`, err);
+                return null;
+            }
         },
     };
     win.React = React;

package/lib/esm/utils/property.js

@@ -13,13 +13,15 @@ export function mergeComponent({ componentId, getComponent, locale, defaultLocal
         const property = (_b = (_a = component === null || component === void 0 ? void 0 : component.properties) === null || _a === void 0 ? void 0 : _a[id]) === null || _b === void 0 ? void 0 : _b.data;
         if (!property)
             return [];
-        return [property.key, parsePropertyValue(property, value, { locale, defaultLocale })];
+        // // if key is undefined, use id
+        return [property.key || property.id, parsePropertyValue(property, value, { locale, defaultLocale })];
     }));
     while (component) {
         assignNullableFields(properties, Object.fromEntries(Object.values((_a = component.properties) !== null && _a !== void 0 ? _a : {}).map(({ data }) => {
             var _a, _b, _c, _d, _e;
             return [
-                data.key,
+                // if key is undefined, use id
+                data.key || data.id,
                 parsePropertyValue(data, (_c = (_b = (_a = data.locales) === null || _a === void 0 ? void 0 : _a[locale]) === null || _b === void 0 ? void 0 : _b.defaultValue) !== null && _c !== void 0 ? _c : (_e = (_d = data.locales) === null || _d === void 0 ? void 0 : _d[defaultLocale]) === null || _e === void 0 ? void 0 : _e.defaultValue, { locale, defaultLocale }),
             ];
         })));

package/lib/types/components/CustomComponentRenderer/index.d.ts

@@ -32,5 +32,6 @@ export interface CustomComponentRendererProps {
     dev?: CustomComponentRendererDevProps;
     fallbackRender?: any;
     ErrorBoundaryProps?: ComponentProps<typeof ErrorBoundary>;
+    renderType?: 'view' | 'setting';
 }
 export default function CustomComponentRenderer({ dev, ...props }: CustomComponentRendererProps): import("react/jsx-runtime").JSX.Element;

package/lib/types/components/CustomComponentRenderer/state.d.ts

@@ -27,6 +27,7 @@ export declare const customComponentStates: () => UseBoundStore<StoreApi<CustomC
 export declare function useComponent({ instanceId, componentId, properties, locale, dev }: CustomComponentRendererProps): {
     error?: Error;
     Component?: CustomComponentType;
+    EditComponent?: CustomComponentType;
     props?: {
         [key: string]: any;
     };