@rxdrag/website-studio 0.0.5 → 0.0.7

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

@@ -1,6 +1,7 @@
 export declare const FRAME_CONTENT = "#frameContent#";
 export declare const FRAME_IMPORTS = "#frameImports#";
 export declare const FRAME_404 = "#frame404#";
+export declare const CSS_CONTENT = "#cssContent#";
 export declare const PAGE_CONTENT = "#content#";
 export declare const PAGE_IMPORTS = "#imports#";
 export declare const APP_NAME = "#appName#";

package/dist/index.mjs

@@ -4,14 +4,14 @@ var __publicField = (obj, key, value) => {
   __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
   return value;
 };
-var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C, _D, _E, _F, _G, _H, _I, _J, _K;
+var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C, _D, _E, _F;
 import * as React from "react";
 import React__default, { createContext, useContext, useMemo, memo, Fragment, useCallback, useState, useEffect, forwardRef as forwardRef$1, useRef, useImperativeHandle, isValidElement, cloneElement } from "react";
 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 { 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, formEmailResource, formNameResource, formCompanyResource, formTelResource, formMessageResource, 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";
@@ -12415,27 +12415,27 @@ const resourceTreeNodes = [
       },
       {
         title: "邮箱",
-        resource: (_C = XFormEmailMaterial.resource) == null ? void 0 : _C.name
+        resource: formEmailResource
       },
       {
         title: "姓名",
-        resource: (_D = XFormNameMaterial.resource) == null ? void 0 : _D.name
+        resource: formNameResource
       },
       {
         title: "公司",
-        resource: (_E = XFormCompanyMaterial.resource) == null ? void 0 : _E.name
+        resource: formCompanyResource
       },
       {
         title: "电话",
-        resource: (_F = XFormTelMaterial.resource) == null ? void 0 : _F.name
+        resource: formTelResource
       },
       {
         title: "内容",
-        resource: (_G = XFormMessageMaterial.resource) == null ? void 0 : _G.name
+        resource: formMessageResource
       },
       {
         title: "提交",
-        resource: (_H = XSubmitMaterial.resource) == null ? void 0 : _H.name
+        resource: (_C = XSubmitMaterial.resource) == null ? void 0 : _C.name
       }
     ]
   },
@@ -12452,15 +12452,15 @@ const resourceTreeNodes = [
     children: [
       {
         title: "a",
-        resource: (_I = AMaterial.resource) == null ? void 0 : _I.name
+        resource: (_D = AMaterial.resource) == null ? void 0 : _D.name
       },
       {
         title: "div",
-        resource: (_J = creatHtmlMaterial("div").resource) == null ? void 0 : _J.name
+        resource: (_E = creatHtmlMaterial("div").resource) == null ? void 0 : _E.name
       },
       {
         title: "span",
-        resource: (_K = creatHtmlMaterial("span").resource) == null ? void 0 : _K.name
+        resource: (_F = creatHtmlMaterial("span").resource) == null ? void 0 : _F.name
       },
       {
         title: "button"
@@ -15415,6 +15415,7 @@ const MenuContent = memo((props) => {
 const FRAME_CONTENT = "#frameContent#";
 const FRAME_IMPORTS = "#frameImports#";
 const FRAME_404 = "#frame404#";
+const CSS_CONTENT = "#cssContent#";
 const APP_NAME = "#appName#";
 const APP_VERSION = "#appVersion#";
 const APP_PPACKAGES = "#appPackages#";
@@ -15853,6 +15854,7 @@ const tailwindCssTemplate = {
 @tailwind components;
 @tailwind utilities;
 
+${CSS_CONTENT}
 `
 };
 const slugTemplate = {
@@ -15883,8 +15885,7 @@ export const loader: LoaderFunction = async (args: LoaderFunctionArgs) => {
     envVariables
   )
   if (webisteSettings?.map301) {
-    for (const line of webisteSettings.map301?.split('
-')) {
+    for (const line of webisteSettings.map301?.split('\\n')) {
       const [from, to] = line.split(',');
       if (slug === from) {
         return redirect(to, 301);
@@ -16043,7 +16044,7 @@ class Coder {
     }
   }
   jsonToTsx(node, spaces = 0, hasRootClassName) {
-    var _a2, _b2;
+    var _a2, _b2, _c2, _d2, _e2, _f2;
     const spacesStr = " ".repeat(spaces);
     if (node.componentName === TextNodeName) {
       return spacesStr + (node.text || "");
@@ -16090,9 +16091,18 @@ class Coder {
       spaceAddon = 2;
       str += `  ${spacesStr}{(datas) => (
 `;
+      if (((_b2 = node.children) == null ? void 0 : _b2.length) && ((_c2 = node.children) == null ? void 0 : _c2.length) > 1) {
+        str += `    ${spacesStr}<>
+`;
+        spaceAddon = 4;
+      }
     }
-    str += ((_b2 = node.children) == null ? void 0 : _b2.map((child) => this.jsonToTsx(child, spaces + 2 + spaceAddon)).join("\n")) + "\n";
+    str += ((_d2 = node.children) == null ? void 0 : _d2.map((child) => this.jsonToTsx(child, spaces + 2 + spaceAddon)).join("\n")) + "\n";
     if (this.needAddDatas(xdata)) {
+      if (((_e2 = node.children) == null ? void 0 : _e2.length) && ((_f2 = node.children) == null ? void 0 : _f2.length) > 1) {
+        str += `    ${spacesStr}</>
+`;
+      }
       str += `  ${spacesStr})}`;
     }
     str += `
@@ -16242,7 +16252,6 @@ const rootTemplate = {
 import { entify } from "@rxdrag/model-remix-lib";
 import { useAppInit, XDataScope, HtmlDocument } from "@rxdrag/website-components";
 import "./tailwind.css";
-import './frontend.css'
 ${FRAME_IMPORTS}
 
 ${LOADER_FUNCTION}
@@ -16360,7 +16369,7 @@ class ComponentCoder extends Coder {
     let code = "\n";
     code += this.getPropsTypeCode();
     const xdatas = this.getXDataSchemas();
-    code += `export default function ${this.component.name}(props: ${this.component.name}Props) {
+    code += `export function ${this.component.name}(props: ${this.component.name}Props) {
 `;
     const childrenCode = this.component.droppable ? `, children` : "";
     const propsStr = (_b2 = (_a2 = this.component.props) == null ? void 0 : _a2.items) == null ? void 0 : _b2.map((field) => field.name).join(", ");
@@ -16390,18 +16399,23 @@ class ComponentCoder extends Coder {
     return code;
   }
   getPropsTypeCode() {
-    var _a2;
+    var _a2, _b2;
     let code = `export type ${this.component.name}Props = {
 `;
     code += `  className?: string
 `;
     if (this.getXDataSchemas().length) {
-      code += `  datas: TDatas
+      code += `  datas?: TDatas
 `;
     }
     for (const field of ((_a2 = this.component.props) == null ? void 0 : _a2.items) || []) {
-      code += `  ${field.name}: ${field.type}
+      if (field.type === ExtendFieldType.Json) {
+        code += `  ${field.name}?: any
+`;
+      } else {
+        code += `  ${field.name}: ${(_b2 = field.type) == null ? void 0 : _b2.toLowerCase()}
 `;
+      }
     }
     if (this.component.droppable) {
       code += `  children: React.ReactNode
@@ -16716,6 +16730,7 @@ class WebsiteGenerator {
     return this.studioProps.frame;
   }
   async generate() {
+    var _a2, _b2, _c2;
     const zip = new JSZip();
     const pages = this.getPages();
     const frame = this.getFrame();
@@ -16742,7 +16757,7 @@ class WebsiteGenerator {
       );
       usedMaterials.push(...frameCoder.getUsedMaterials());
       appFolder.file(frameCoder.getFileName(), frameCoder.getFileCode());
-      appFolder.file(tailwindCssTemplate.name, tailwindCssTemplate.content);
+      appFolder.file(tailwindCssTemplate.name, tailwindCssTemplate.content.replace(CSS_CONTENT, ((_a2 = this.studioProps.theme) == null ? void 0 : _a2.css) || ""));
       const deplyFolder = appFolder.folder("deploy");
       if (deplyFolder) {
         deplyFolder.file(deployEnvTemplate.name, deployEnvTemplate.content);
@@ -16753,9 +16768,11 @@ class WebsiteGenerator {
       if (routesFolder) {
         routesFolder.file(slugTemplate.name, slugTemplate.content);
         for (const page of pages || []) {
-          const pageCoder = new PageCoder(comsStore, page);
-          routesFolder.file(pageCoder.getFileName(), pageCoder.getFileCode());
-          usedMaterials.push(...pageCoder.getUsedMaterials());
+          if ((_c2 = (_b2 = page.content) == null ? void 0 : _b2.elements) == null ? void 0 : _c2.length) {
+            const pageCoder = new PageCoder(comsStore, page);
+            routesFolder.file(pageCoder.getFileName(), pageCoder.getFileCode());
+            usedMaterials.push(...pageCoder.getUsedMaterials());
+          }
         }
       }
       const componentsFolder = appFolder == null ? void 0 : appFolder.folder("components");
@@ -16765,7 +16782,7 @@ class WebsiteGenerator {
           componentsFolder.file(comCoder.getFileName(), comCoder.getFileCode());
           usedMaterials.push(...comCoder.getUsedMaterials());
         }
-        componentsFolder.file("index.ts", coders.map((coder) => `export { ${coder.getComponent().name} } from "./components/${coder.getComponent().name}"`).join("\n"));
+        componentsFolder.file("index.ts", coders.map((coder) => `export { ${coder.getComponent().name} } from "./${coder.getComponent().name}"`).join("\n"));
       }
     }
     const packages = {};