@rxdrag/website-studio 0.0.3 → 0.0.4

package/dist/components/EditorScope/useAllMaterials.d.ts

@@ -0,0 +1 @@
+export declare function useAllMaterials(): import("@rxdrag/react-core-pro").IMaterial[];

package/dist/generator/classes/ComponentsStore.d.ts

@@ -3,9 +3,9 @@ import { ComponentCoder } from "./ComponentCoder";
 import { IMaterial } from "@rxdrag/react-core-pro";
 export declare class TemplatesStore {
     protected components: FrontComponent[];
-    maretials: Record<string, IMaterial | undefined> | undefined;
+    materials: IMaterial[];
     coders: ComponentCoder[];
-    constructor(components: FrontComponent[], maretials: Record<string, IMaterial | undefined> | undefined);
+    constructor(components: FrontComponent[], materials: IMaterial[]);
     getComponentCoders(): ComponentCoder[];
     getComponentCoder(name: string): ComponentCoder | undefined;
 }

package/dist/generator/classes/WebsiteGenerator.d.ts

@@ -4,8 +4,8 @@ import { IMaterial } from "@rxdrag/react-core-pro";
 import { StudioContextProps } from "../../components/StudioRoot";
 export declare class WebsiteGenerator {
     protected studioProps: StudioContextProps;
-    protected materials: Record<string, IMaterial | undefined> | undefined;
-    constructor(studioProps: StudioContextProps, materials: Record<string, IMaterial | undefined> | undefined);
+    protected materials: IMaterial[];
+    constructor(studioProps: StudioContextProps, materials: IMaterial[]);
     getComponents(): import("@rxdrag/rxcms-models").FrontComponent[];
     getPages(): Page[] | undefined;
     get404Page(): Page | undefined;

package/dist/generator/templates/vars.d.ts

@@ -9,6 +9,6 @@ export declare const APP_PPACKAGES = "#appPackages#";
 export declare const WEBSITE_ID = "#websiteId#";
 export declare const LOADER_FUNCTION = "#loader#";
 export declare const USE_LOADER_DATA = "#useLoaderData#";
-export declare const rxcmsModelsVersion = "0.3.35";
-export declare const entifyHooksVersion = "0.2.29";
-export declare const modelRemixLibVersion = "0.1.46";
+export declare const rxcmsModelsVersion = "0.3.36";
+export declare const entifyHooksVersion = "0.2.30";
+export declare const modelRemixLibVersion = "0.1.47";

package/dist/index.mjs

@@ -10,6 +10,8 @@ import React__default, { createContext, useContext, useMemo, memo, Fragment, use
 import { useFilterMeta, useDesignerEngine, ComponentDesignersRoot, useComponentDesigners, useNode, Designer, useDocument, useDocumentChangedState, useCurrentNode, useGetNode, useChangeNodeMeta, useNodeMeta, useUndo, useRedo, useLanguage, useSetters, useResourceNode, useActiveIdState, useActions, useCurrentTree, useSelectedNodeIds, ComponentTreeWidget, useSelect, DocumentRoot } from "@rxdrag/react-core-pro";
 import { RXID_ATTR_NAME, TOOLBAR_HEIGHT, CanvasScrollEvent, CanvasResizeEvent, numbToPx, getMaxZIndex, HistoryableActionType, MARGIN_DECORATOR_NAME, LINE_DECORTOR_NAME, LineDecorator, MarginDecorator, IFrameCanvasImpl, KeyboardDriver, DragDropDriver, DragOverDriver, MouseClickDriver, MouseMoveDriver, MouseOverOutDriver, CanvasResizeDriver, CanvasScrollDriver, MouseUpDriver, ContainerImpl } from "@rxdrag/core-pro";
 import { TextNodeName } from "@rxdrag/schema-pro";
+import { propSetters, Input, Textarea, ImageSelect, TargetSetter, DeviceBreakpoints, DeviceContext } from "@rxdrag/schema-setters";
+import { createSchema as createSchema$1, staticMaterials, attachmentNameResource, XAttachmentIconMaterial, attachmentLinkResource, websiteSettingsContactResource, websiteSettingsAvatarResource, websiteSettingsAddressResource, webisteSettingsEmailResource, webisteSettingsTelResource, webisteSettingsFaxResource, webisteSettingMobileResource, userNameResource, userAvatarResource, userPositionResource, userProfileResource, userEmailResource, userTelResource, userMobileResource, userLinkedInResource, userTwitterResource, userFacebookResource, userInstagramResource, userLinkResource, productCategoryNameResource, productCategoryMediaResource, productCategoryDescriptionResource, productCategoryCreatedAtResource, productCategoryUpdatedAtResource, productCategoryProductsResource, proudctCategoryLinkResource, postCategoryNameResource, postCategoryDescriptionResource, postCategoryCreatedAtResource, postCategoryUpdatedAtResource, postCategoryPostsResource, postCategoryLinkResource, productTitleResource, productShortTitleResource, productCoverResource, productMediasResource, productDescriptionResource, productFeaturesResource, productContentResource, productContent2Resource, productContent3Resource, productPublishedAtResource, productCreatedAtResource, productUpdatedAtResource, productAssociationCategoryResource, productAttachmentsResource, productRelatedResource, productLinkResource, postCoverResource, postAuthorResource, postTitleResource, postDescriptionResource, postContentResource, postPublishedAtResource, postCreatedAtResource, postUpdatedAtResource, postAssociationCategoryResource, postOutlineResource, postLinkResource, productResource, productListResource, postResource, postListResource, productCategoryResource, productCategoryListResource, postCategoryResource, postCategoryListResource, searchListResource, featuredProductsResource, latestPostsResource, XPaginationMaterial, XPaginationPrevButtonMaterial, XPaginationNextButtonMaterial, XPaginationPagesMaterial, XPaginationPageIndexMaterial, XPaginationTotalMaterial, pageTitleResource, XBreadcrumbsMaterial, xHeading1Resource, xHeading2Resource, xHeading3Resource, xHeading4Resource, XParagraphMaterial, XDateMaterial, ImgMaterial, XIconMaterial, XMenuMaterial, XModalMaterial, XModalCloseMaterial, RouteLinkMaterial, XSearchMaterial, XShareMaterial, XToTopMaterial, XAnimationNumberMaterial, XSectionMaterial, XBoxMaterial, xRowName, xColName, XPageOutletMaterial, XTabsMaterial, XTabsNavTitleMaterial, XTabPanelMaterial, XFormMaterial, XFormEmailMaterial, XFormNameMaterial, XFormCompanyMaterial, XFormTelMaterial, XFormMessageMaterial, XSubmitMaterial, AMaterial, creatHtmlMaterial } from "@rxdrag/website-materials";
 import { ThemeQueryOptions, ThemeFields, WebsiteFrameQueryOptions, WebsiteFrameFields, TemplateQueryOptions, TemplateFields, TemplateCategoryFields, PageQueryOptions, PageFields, PageAssciations, MediaQueryOptions, FrontComponentQueryOptions, FrontComponentFields, ComponentCategoryFields, MediaFields, WebsiteSettingsFields, ProductCategoryAssciations, ProductCategoryFields, ProductFields, PostFields, PostAssciations, UserFields, UserAssciations, ComponentType, FrontComponentEntityName, TemplateEntityName, mediaToInput, templateToInput, TemplateCategoryQueryOptions, frontComponentToInput, ComponentCategoryQueryOptions, ExtendFieldType, PageEntityName, PageType, pageToInput, ComponentCategoryEntityName, componentCategoryToInput, TemplateCategoryEntityName, templateCategoryToInput, MediaType, ProductAssciations, PostCategoryAssciations } from "@rxdrag/rxcms-models";
 import { GlobalLoading, EntityEditModal, EntitySelectField, EditingPopoverScope, useRemoveRow, useEditRow, EntityListScope, EntityRowScope, useListData, QueryListScope, useNewRow, useIsLoading, NewButton } from "@rxdrag/rxcms-models-ui";
 import { useOneTheme, useOneWebsiteFrame, useTemplateList, usePageList, useFrontComponentList, useUpsertOnePage, useUpsertOneWebsiteFrame, useUpsertOneTheme, useDeletePageById, useDeleteWebsiteFrameById } from "@rxdrag/rxcms-model-hooks";
@@ -21,9 +23,7 @@ import { isHTMLElement, makeRxId, isStr } from "@rxdrag/shared";
 import { faker } from "@faker-js/faker";
 import { XDataType, XDataScope, PRODUCT_COVER, PAGE_BREADCRUMBS, PAGE_TITLE, TriggerType } from "@rxdrag/website-components";
 import { merge, keys, uniqueId, isObject, isArray, isString, uniqBy } from "lodash-es";
-import { Input, Textarea, ImageSelect, TargetSetter, propSetters, DeviceBreakpoints, DeviceContext } from "@rxdrag/schema-setters";
 import { ColorPicker, StyledTooltip, Modal, ModalContent, ModalHeader, ModalBody, WarningIcon, ModalFooter, SettingsIcon, AddIcon, Drawer, ModalClose, PinIcon, CloseIcon, LeafNode, GroupNode, SearchIcon, TreeView, PredefinedColorPicker, FrameIcon, HomeIcon, RemoveIcon, MenuIcon } from "@rxdrag/rxcms-common";
-import { createSchema as createSchema$1, staticMaterials, attachmentNameResource, XAttachmentIconMaterial, attachmentLinkResource, websiteSettingsContactResource, websiteSettingsAvatarResource, websiteSettingsAddressResource, webisteSettingsEmailResource, webisteSettingsTelResource, webisteSettingsFaxResource, webisteSettingMobileResource, userNameResource, userAvatarResource, userPositionResource, userProfileResource, userEmailResource, userTelResource, userMobileResource, userLinkedInResource, userTwitterResource, userFacebookResource, userInstagramResource, userLinkResource, productCategoryNameResource, productCategoryMediaResource, productCategoryDescriptionResource, productCategoryCreatedAtResource, productCategoryUpdatedAtResource, productCategoryProductsResource, proudctCategoryLinkResource, postCategoryNameResource, postCategoryDescriptionResource, postCategoryCreatedAtResource, postCategoryUpdatedAtResource, postCategoryPostsResource, postCategoryLinkResource, productTitleResource, productShortTitleResource, productCoverResource, productMediasResource, productDescriptionResource, productFeaturesResource, productContentResource, productContent2Resource, productContent3Resource, productPublishedAtResource, productCreatedAtResource, productUpdatedAtResource, productAssociationCategoryResource, productAttachmentsResource, productRelatedResource, productLinkResource, postCoverResource, postAuthorResource, postTitleResource, postDescriptionResource, postContentResource, postPublishedAtResource, postCreatedAtResource, postUpdatedAtResource, postAssociationCategoryResource, postOutlineResource, postLinkResource, productResource, productListResource, postResource, postListResource, productCategoryResource, productCategoryListResource, postCategoryResource, postCategoryListResource, searchListResource, featuredProductsResource, latestPostsResource, XPaginationMaterial, XPaginationPrevButtonMaterial, XPaginationNextButtonMaterial, XPaginationPagesMaterial, XPaginationPageIndexMaterial, XPaginationTotalMaterial, pageTitleResource, XBreadcrumbsMaterial, xHeading1Resource, xHeading2Resource, xHeading3Resource, xHeading4Resource, XParagraphMaterial, XDateMaterial, ImgMaterial, XIconMaterial, XMenuMaterial, XModalMaterial, XModalCloseMaterial, RouteLinkMaterial, XSearchMaterial, XShareMaterial, XToTopMaterial, XAnimationNumberMaterial, XSectionMaterial, XBoxMaterial, xRowName, xColName, XPageOutletMaterial, XTabsMaterial, XTabsNavTitleMaterial, XTabPanelMaterial, XFormMaterial, XFormEmailMaterial, XFormNameMaterial, XFormCompanyMaterial, XFormTelMaterial, XFormMessageMaterial, XSubmitMaterial, AMaterial, creatHtmlMaterial } from "@rxdrag/website-materials";
 import { Icon } from "@iconify/react";
 import { useUpsertEntityWithIndicator, globalErrorState } from "@rxdrag/rxcms-entify-wrapper";
 import { InputField, Form, TextareaField } from "@rxdrag/fieldy-nextui";
@@ -1352,6 +1352,27 @@ class ContentEditorImpl {
 const ContentEditor = (engine) => {
   return new ContentEditorImpl(engine);
 };
+const studioSetters = {
+  ...propSetters,
+  Fragment: React__default.Fragment
+  // TabList,
+  // Tab,
+  // TabPanel,
+  // Stack,
+  // FormControl,
+  // FormLabel: FormLabel,
+  // Autocomplete: Autocomplete,
+  // Input: toControlled(Input, 'value', ''),
+  // Textarea: toControlled(Textarea, 'value', ''),
+  //Select,
+  //Option: Option,
+  //Switch: Switch,
+  //IconPicker,
+  //ToggleButtonGroup,
+  // Button,
+  // IconButton,
+  // SlotSwitch,
+};
 const StudioContext = createContext({});
 function useStudioContext() {
   return useContext(StudioContext);
@@ -3284,33 +3305,16 @@ function useCustomizedMaterials() {
   }, [components]);
   return materials;
 }
-const studioSetters = {
-  ...propSetters,
-  Fragment: React__default.Fragment
-  // TabList,
-  // Tab,
-  // TabPanel,
-  // Stack,
-  // FormControl,
-  // FormLabel: FormLabel,
-  // Autocomplete: Autocomplete,
-  // Input: toControlled(Input, 'value', ''),
-  // Textarea: toControlled(Textarea, 'value', ''),
-  //Select,
-  //Option: Option,
-  //Switch: Switch,
-  //IconPicker,
-  //ToggleButtonGroup,
-  // Button,
-  // IconButton,
-  // SlotSwitch,
-};
-function EditorScope(props) {
-  const { children, resources, ...rest } = props;
+function useAllMaterials() {
   const customMaterials = useCustomizedMaterials();
   const materials = useMemo(() => {
     return staticMaterials.concat(customMaterials || []);
   }, [customMaterials]);
+  return materials;
+}
+function EditorScope(props) {
+  const { children, resources, ...rest } = props;
+  const materials = useAllMaterials();
   const plugins = useMemo(() => {
     return [ContentEditor];
   }, []);
@@ -15417,9 +15421,9 @@ const APP_PPACKAGES = "#appPackages#";
 const WEBSITE_ID = "#websiteId#";
 const LOADER_FUNCTION = "#loader#";
 const USE_LOADER_DATA = "#useLoaderData#";
-const rxcmsModelsVersion = "0.3.35";
-const entifyHooksVersion = "0.2.29";
-const modelRemixLibVersion = "0.1.46";
+const rxcmsModelsVersion = "0.3.36";
+const entifyHooksVersion = "0.2.30";
+const modelRemixLibVersion = "0.1.47";
 const envTemplate = {
   name: ".env",
   content: `VITE_SERVER_URL = http://139.129.23.194:4000/graphql
@@ -15990,13 +15994,16 @@ class Coder {
   getMaterialsFromElements(elements, usedMaterials) {
     var _a2;
     for (const element of elements) {
-      const maretial = (_a2 = this.comsStore.maretials) == null ? void 0 : _a2[element.componentName];
-      if (maretial) {
+      const maretial = (_a2 = this.comsStore.materials) == null ? void 0 : _a2.find((material) => material.componentName === element.componentName);
+      if (maretial && !usedMaterials.find((material) => material.componentName === maretial.componentName)) {
         usedMaterials.push(maretial);
       }
       if (element.children) {
         this.getMaterialsFromElements(element.children, usedMaterials);
       }
+      if (element.slots) {
+        this.getMaterialsFromElements(Object.values(element.slots).filter(Boolean), usedMaterials);
+      }
     }
   }
   getXDataSchemas() {
@@ -16015,6 +16022,9 @@ class Coder {
         if (element.children) {
           this.getXSchemas(element.children, xSchemas);
         }
+        if (element.slots) {
+          this.getXSchemas(Object.values(element.slots).filter(Boolean), xSchemas);
+        }
       }
       if (element.componentName.startsWith(CUSTOMIZED_COMPONENT_NAME_PREFIX)) {
         const componentCoder = this.comsStore.getComponentCoder((_a2 = element.props) == null ? void 0 : _a2.name);
@@ -16035,6 +16045,9 @@ class Coder {
         components.push((_a2 = element.props) == null ? void 0 : _a2.name);
       }
       this.getCustomzedComponentsFromElements(element.children, components);
+      if (element.slots) {
+        this.getCustomzedComponentsFromElements(Object.values(element.slots).filter(Boolean), components);
+      }
     }
   }
   getImportsCode() {
@@ -16249,9 +16262,7 @@ const rootTemplate = {
   name: "root.tsx",
   content: `import type { LoaderFunctionArgs } from "~/deploy/remix-run-node";
 import { entify } from "@rxdrag/model-remix-lib";
-import type { TDatas } from "@rxdrag/website-components";
-import { useAppInit, toViewModel, XDataScope, HtmlDocument } from "@rxdrag/website-components";
-import { Page404 } from "./components/Page404";
+import { useAppInit, XDataScope, HtmlDocument } from "@rxdrag/website-components";
 import "./tailwind.css";
 import './frontend.css'
 ${FRAME_IMPORTS}
@@ -16324,7 +16335,7 @@ class FrameCoder extends Coder {
     return `export const loader = async (args: LoaderFunctionArgs) => {
   //为了兼容cloudflare，把环境变量抽离到一个函数
   const envVariables = getEnvVariables(args)
-  const productCategories = await entify.queryProductCategories(undefined, envVariables);
+  const productCategories = await entify.queryProductCategories(envVariables);
   const webSiteSettings = await entify.queryWebSiteSettings(envVariables);
   const datas: TDatas = {
     [XDataScope.WebsiteSettings]: webSiteSettings,
@@ -16426,10 +16437,10 @@ class ComponentCoder extends Coder {
   }
 }
 class TemplatesStore {
-  constructor(components, maretials) {
+  constructor(components, materials) {
     __publicField(this, "coders", []);
     this.components = components;
-    this.maretials = maretials;
+    this.materials = materials;
     this.coders = this.components.map((component) => new ComponentCoder(this, component));
   }
   getComponentCoders() {
@@ -16844,14 +16855,14 @@ function useExportWebsite() {
   const website = useWebsite();
   const save = useSave();
   const contextValue = useStudioContext();
-  const engine = useDesignerEngine();
+  const materials = useAllMaterials();
   const exportWebsite = useCallback(async () => {
     try {
       if (nopClient && website) {
         setExporting(true);
         const generator = new WebsiteGenerator(
           contextValue,
-          engine == null ? void 0 : engine.getComponentManager().getAllComponentConfigs()
+          materials
         );
         const zip = await generator.generate();
         const content = await zip.generateAsync({ type: "blob" });
@@ -16863,7 +16874,7 @@ function useExportWebsite() {
     } finally {
       setExporting(false);
     }
-  }, [contextValue, engine, nopClient, save, setError, website]);
+  }, [contextValue, materials, nopClient, save, setError, website]);
   return { exportWebsite, exporting };
 }
 const Toolbar = memo(() => {