@rxdrag/website-lib-core 0.0.68 → 0.0.70

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rxdrag/website-lib-core",
-  "version": "0.0.68",
+  "version": "0.0.70",
   "type": "module",
   "exports": {
     ".": "./index.ts"
@@ -25,8 +25,8 @@
     "eslint": "^7.32.0",
     "typescript": "^5",
     "@rxdrag/eslint-config-custom": "0.2.12",
-    "@rxdrag/slate-preview": "1.2.58",
-    "@rxdrag/tsconfig": "0.2.0"
+    "@rxdrag/tsconfig": "0.2.0",
+    "@rxdrag/slate-preview": "1.2.58"
   },
   "dependencies": {
     "clsx": "^2.1.0",
@@ -35,8 +35,8 @@
     "lodash-es": "^4.17.21",
     "react": "^19.1.0",
     "react-dom": "^19.1.0",
-    "@rxdrag/entify-lib": "0.0.19",
-    "@rxdrag/rxcms-models": "0.3.90"
+    "@rxdrag/entify-lib": "0.0.21",
+    "@rxdrag/rxcms-models": "0.3.92"
   },
   "peerDependencies": {
     "astro": "^4.0.0 || ^5.0.0"

package/src/astro/media.ts

@@ -1,5 +1,4 @@
 import { ImageSizes, Media } from "@rxdrag/rxcms-models";
-import { ImgHTMLAttributes } from "react";
 
 export type FileFieldType =
   | "thumbnail"
@@ -32,16 +31,34 @@ export const DEFAULT_LARGE: ImageResize = {
   height: 1200,
 };
 
+export const DEFAULT_PRODUCT_IMAGE_SIZE: ImageResize = {
+  width: 800,
+  height: 800,
+};
+
+export const DEFAULT_PRODUCT_THUMBNAIL_IMAGE_SIZE: ImageResize = {
+  width: 600,
+  height: 400,
+};
+
+export const DEFAULT_POST_IMAGE_SIZE: ImageResize = {
+  width: 800,
+  height: 600,
+};
+
+export const DEFAULT_POST_THUMBNAIL_IMAGE_SIZE: ImageResize = {
+  width: 600,
+  height: 400,
+};
+
 //TODO：以后还要加transform参数
-export type ImageProps = ImgHTMLAttributes<HTMLImageElement> & {
+export type ImageProps = {
   className?: string;
-  mediaId?: string;
+  mediaRef?: string;
   //默认original
   fileField?: FileFieldType;
   resize?: ImageResize;
   children?: React.ReactNode;
-  //为导出代码方便，如果设置了src，显示的时候可以忽略mediaId等
-  src?: string;
 };
 
 export const transformMeidaFields = (
@@ -52,29 +69,25 @@ export const transformMeidaFields = (
   const fields = ["original", "thumbnail"];
   if (resize) {
     fields.push(
-      `resize(width: ${resize.width || DEFUALT_WIDTH}, height: ${
-        resize.height || DEFUALT_HEIGHT
+      `resize(width: ${resize.width || DEFUALT_WIDTH}, height: ${resize.height || DEFUALT_HEIGHT
       })`
     );
   }
   if (field === "small") {
     fields.push(
-      `small(width: ${images?.small?.width || DEFAULT_SAMLL.width}, height: ${
-        images?.small?.height || DEFAULT_SAMLL.height
+      `small(width: ${images?.small?.width || DEFAULT_SAMLL.width}, height: ${images?.small?.height || DEFAULT_SAMLL.height
       })`
     );
   }
   if (field === "medium") {
     fields.push(
-      `medium(width: ${
-        images?.medium?.width || DEFAULT_MEDIUM.width
+      `medium(width: ${images?.medium?.width || DEFAULT_MEDIUM.width
       }, height: ${images?.medium?.height || DEFAULT_MEDIUM.height})`
     );
   }
   if (field === "large") {
     fields.push(
-      `large(width: ${images?.large?.width || DEFAULT_LARGE.width}, height: ${
-        images?.large?.height || DEFAULT_LARGE.height
+      `large(width: ${images?.large?.width || DEFAULT_LARGE.width}, height: ${images?.large?.height || DEFAULT_LARGE.height
       })`
     );
   }

package/src/entify/Entify.ts

@@ -1,4 +1,4 @@
-import { EnvVariables, TSize } from "./types";
+import { EnvVariables } from "./types";
 import { queryOneTheme } from "./lib/queryOneTheme";
 import {
   ListConditions,
@@ -29,6 +29,7 @@ import { queryUserIds } from "./lib/queryUserIds";
 import { IEntify, PostPatinateOptions, PostsOptions } from "./IEntify";
 import { queryWebsite } from "./lib/queryWebsite";
 import {
+  ImageSize,
   ImageSizes,
   Media,
   Page,
@@ -40,26 +41,25 @@ import {
 import { queryPageBySlug } from "./lib/queryPageBySlug";
 import { queryPageByType } from "./lib/queryPageByType";
 import { queryOneMedia } from "./lib/queryOneMedia";
+import { DEFAULT_LARGE, DEFAULT_MEDIUM, DEFAULT_SAMLL, DEFUALT_HEIGHT, DEFUALT_WIDTH, FileFieldType, ImageResize } from "../astro/media";
 
 export class Entify implements IEntify {
   private static instance: Entify | null = null;
 
-  private constructor(protected envVariables: EnvVariables) { }
+  private constructor(protected envVariables: EnvVariables, protected imageSizes: ImageSizes) { }
 
-  public static getInstance(envVariables: EnvVariables): Entify {
+  public static getInstance(envVariables: EnvVariables, imageSizes: ImageSizes): Entify {
     if (!Entify.instance) {
-      Entify.instance = new Entify(envVariables);
+      Entify.instance = new Entify(envVariables, imageSizes);
     }
     return Entify.instance;
   }
 
-  private imageSizes: ImageSizes | undefined;
-
-  public setImageSizes(imageSizes: ImageSizes | undefined): void {
+  public setImageSizes(imageSizes: ImageSizes): void {
     this.imageSizes = imageSizes;
   }
 
-  public getImageSizes(): ImageSizes | undefined {
+  public getImageSizes(): ImageSizes {
     return this.imageSizes;
   }
 
@@ -100,15 +100,33 @@ export class Entify implements IEntify {
     return (await queryLangs(this.envVariables))?.items;
   }
 
-  public async getMedia(ref: string | undefined | null): Promise<Media | undefined> {
-    return await queryOneMedia(ref, this.envVariables);
+  public async getMedia(ref: string | undefined | null, fileField?: FileFieldType, resize?: ImageResize): Promise<Media | undefined> {
+    const fields: string[] = []
+    switch (fileField) {
+      case "resize":
+        fields.push(`resize(width: ${resize?.width || DEFUALT_WIDTH}, height: ${resize?.height || DEFUALT_HEIGHT})`)
+        break;
+      case "small":
+        fields.push(`small(width: ${this.imageSizes.small?.width || DEFAULT_SAMLL.width}, height: ${this.imageSizes.small?.height || DEFAULT_SAMLL.height})`)
+        break;
+      case "medium":
+        fields.push(`medium(width: ${this.imageSizes.medium?.width || DEFAULT_MEDIUM.width}, height: ${this.imageSizes.medium?.height || DEFAULT_MEDIUM.height})`)
+        break;
+      case "large":
+        fields.push(`large(width: ${this.imageSizes.large?.width || DEFAULT_LARGE.width}, height: ${this.imageSizes.large?.height || DEFAULT_LARGE.height})`)
+        break;
+    }
+    return await queryOneMedia(ref, fields, this.envVariables);
   }
 
   public async getFeaturedProducts(
     count?: number,
-    imageSize?: TSize,
+    imageSize?: ImageSize,
     addonFields?: (keyof Product)[]
   ) {
+    if (!imageSize) {
+      imageSize = this.imageSizes.productThumbnial;
+    }
     return await queryFeaturedProducts(
       count,
       imageSize,
@@ -117,7 +135,10 @@ export class Entify implements IEntify {
     );
   }
 
-  public async getLatestPosts(count?: number, coverSize?: TSize) {
+  public async getLatestPosts(count?: number, coverSize?: ImageSize) {
+    if (!coverSize) {
+      coverSize = this.imageSizes.postThumbnial;
+    }
     return await queryLatestPosts(count, coverSize, this.envVariables);
   }
 
@@ -198,7 +219,10 @@ export class Entify implements IEntify {
     }));
   }
 
-  public async getPostBySlug(slug: string, coverSize: TSize | undefined) {
+  public async getPostBySlug(slug: string, coverSize: ImageSize | undefined) {
+    if (!coverSize) {
+      coverSize = this.imageSizes.post;
+    }
     return await queryOnePostBySlug(slug, coverSize, this.envVariables);
   }
 
@@ -223,9 +247,12 @@ export class Entify implements IEntify {
 
   public async getProducts(
     conditions: ListConditions,
-    imageSize: TSize | undefined,
+    imageSize: ImageSize | undefined,
     addonFields?: (keyof Product)[]
   ) {
+    if (!imageSize) {
+      imageSize = this.imageSizes.productThumbnial;
+    }
     return (
       await queryProducts(conditions, imageSize, this.envVariables, addonFields)
     )?.items;
@@ -372,7 +399,10 @@ export class Entify implements IEntify {
     return paths;
   }
 
-  public async getProductBySlug(slug: string, imageSize: TSize | undefined) {
+  public async getProductBySlug(slug: string, imageSize: ImageSize | undefined) {
+    if (!imageSize) {
+      imageSize = this.imageSizes.product;
+    }
     return await queryOneProductBySlug(slug, imageSize, this.envVariables);
   }
 
@@ -418,7 +448,10 @@ export class Entify implements IEntify {
     return (await queryUserPosts({ userId }, this.envVariables))?.items;
   }
 
-  public async fulltextSearch(keyword: string, imageSize: TSize | undefined) {
+  public async fulltextSearch(keyword: string, imageSize: ImageSize | undefined) {
+    if (!imageSize) {
+      imageSize = this.imageSizes.postThumbnial;
+    }
     return await fulltextSearch(keyword, imageSize, this.envVariables);
   }
 

package/src/entify/IEntify.ts

@@ -1,5 +1,4 @@
 import { IQueryOptions, ListResult } from "@rxdrag/entify-lib";
-import { TSize } from "./types";
 import { ListConditions, UploadOptions, UploadSession } from "./lib";
 import {
   TPost,
@@ -9,6 +8,7 @@ import {
   TUser,
 } from "./view-model";
 import {
+  ImageSize,
   ImageSizes,
   Lang,
   Media,
@@ -21,10 +21,11 @@ import {
   WebsitePart,
 } from "@rxdrag/rxcms-models";
 import { WebsitePartBoolExp } from "@rxdrag/rxcms-models/";
+import { FileFieldType, ImageResize } from "../astro";
 
 export type PostsOptions = {
   category?: string;
-  coverSize?: TSize | undefined;
+  coverSize?: ImageSize | undefined;
   page: number;
   pageSize: number;
 };
@@ -36,8 +37,8 @@ export type PostPatinateOptions = {
 
 export interface IEntify {
   //从配置文件注入到这里面，供组件使用
-  setImageSizes(imageSizes: ImageSizes | undefined): void;
-  getImageSizes(): ImageSizes | undefined;
+  setImageSizes(imageSizes: ImageSizes): void;
+  getImageSizes(): ImageSizes;
   getLang(): string;
   queryEntityList<
     T,
@@ -58,17 +59,17 @@ export interface IEntify {
 
   getLangs(): Promise<Lang[] | undefined>;
 
-  getMedia(ref: string | undefined | null): Promise<Media | undefined>;
+  getMedia(ref: string | undefined | null, fileField?: FileFieldType, resize?: ImageResize): Promise<Media | undefined>;
 
   getFeaturedProducts(
     count?: number,
-    imageSize?: TSize,
+    imageSize?: ImageSize,
     addonFields?: (keyof Product)[]
   ): Promise<TProduct[] | undefined>;
 
   getLatestPosts(
     count?: number,
-    coverSize?: TSize
+    coverSize?: ImageSize
   ): Promise<TPost[] | undefined>;
 
   getPosts(options: PostsOptions): Promise<TPost[] | undefined>;
@@ -107,7 +108,7 @@ export interface IEntify {
 
   getPostBySlug(
     slug: string,
-    coverSize: TSize | undefined
+    coverSize: ImageSize | undefined
   ): Promise<TPost | undefined>;
 
   getPostSlugs(): Promise<Array<string | undefined>>;
@@ -118,7 +119,7 @@ export interface IEntify {
 
   getProducts(
     conditions: ListConditions,
-    imageSize: TSize | undefined,
+    imageSize: ImageSize | undefined,
     addonFields?: (keyof Product)[]
   ): Promise<TProduct[] | undefined>;
 
@@ -133,7 +134,7 @@ export interface IEntify {
 
   getProductBySlug(
     slug: string,
-    imageSize: TSize | undefined
+    imageSize: ImageSize | undefined
   ): Promise<TProduct | undefined>;
 
   getProductPaths(): Promise<unknown>;
@@ -152,7 +153,7 @@ export interface IEntify {
 
   fulltextSearch(
     keyword: string,
-    imageSize: TSize | undefined
+    imageSize: ImageSize | undefined
   ): Promise<ListResult<SearchIndex> | undefined>;
 
   getUserPaths(): Promise<unknown>;

package/src/entify/lib/fulltextSearch.ts

@@ -7,14 +7,15 @@ import {
   SearchIndexQueryOptions,
   SearchIndexFields,
   MediaQueryOptions,
+  ImageSize,
 } from "@rxdrag/rxcms-models";
 import { queryEntityList } from "./queryEntityList";
 import { ListResult } from "@rxdrag/entify-lib";
-import { EnvVariables, TSize } from "../types";
+import { EnvVariables } from "../types";
 
 export async function fulltextSearch(
   keyword: string,
-  imageSize: TSize | undefined,
+  imageSize: ImageSize | undefined,
   envVariables: EnvVariables
 ) {
 

package/src/entify/lib/newQueryPostOptions.ts

@@ -5,12 +5,13 @@ import {
   UserFields,
   MediaQueryOptions,
   PostCategoryFields,
+  ImageSize,
 } from "@rxdrag/rxcms-models";
-import { TSize } from "../types";
+
 import { newPageMetaOptions } from "./newPageMetaOptions";
 
 //查询一个产品的参数，不带条件
-export function newQueryOnePostOptions(coverSize?: TSize) {
+export function newQueryOnePostOptions(coverSize?: ImageSize) {
   const coverFields = ["thumbnail", "url"];
   if (coverSize?.width && coverSize?.height) {
     coverFields.push(

package/src/entify/lib/newQueryProductOptions.ts

@@ -9,11 +9,11 @@ import {
   AttachmentOnProductFields,
   ProductCategoryFields,
   ProductRelatedPivotQueryOptions,
+  ImageSize,
 } from "@rxdrag/rxcms-models";
-import { TSize } from "../types";
 import { newPageMetaOptions } from "./newPageMetaOptions";
 
-function creatProductMediaOptions(imagSize?: TSize) {
+function creatProductMediaOptions(imagSize?: ImageSize) {
   const imageFields = ["thumbnail(width:400, height:320)", "url"];
   if (imagSize?.width && imagSize?.height) {
     imageFields.push(
@@ -39,7 +39,7 @@ function creatProductMediaOptions(imagSize?: TSize) {
   ).media(new MediaQueryOptions().description().file(imageFields));
 }
 
-export function newQueryProductOptions(imagSize?: TSize) {
+export function newQueryProductOptions(imagSize?: ImageSize) {
   return new ProductQueryOptions([
     ProductFields.id,
     ProductFields.title,

package/src/entify/lib/newQueryProductsMediaOptions.ts

@@ -2,10 +2,10 @@ import {
   MediaOnProductQueryOptions,
   MediaOnProductFields,
   MediaQueryOptions,
+  ImageSize,
 } from "@rxdrag/rxcms-models";
-import { TSize } from "../types";
 
-export function newQueryProductsMediaOptions(imageSize?: TSize | undefined) {
+export function newQueryProductsMediaOptions(imageSize?: ImageSize | undefined) {
   return new MediaOnProductQueryOptions(
     [MediaOnProductFields.seqValue, MediaOnProductFields.altText],
     {

package/src/entify/lib/queryEntityList.ts

@@ -1,8 +1,8 @@
 import { IQueryOptions, ListResult } from "@rxdrag/entify-lib";
 import { createEntifyClient } from "./createEntifyClient";
 import { EnvVariables } from "../types";
-import { MediaEntityName, Post, PostCategoryEntityName, PostEntityName, Product, ProductCategoryEntityName, ProductEntityName, UserEntityName } from "@rxdrag/rxcms-models";
-import { mediaListToViewModel, postCategoriesToViewModel, postListToViewModel, productCategoriesToViewModel, productListToViewModel, userListToViewModel } from "../view-model";
+import { Post, PostCategoryEntityName, PostEntityName, Product, ProductCategoryEntityName, ProductEntityName, UserEntityName } from "@rxdrag/rxcms-models";
+import { postCategoriesToViewModel, postListToViewModel, productCategoriesToViewModel, productListToViewModel, userListToViewModel } from "../view-model";
 
 export async function queryEntityList<T, WhereExp = unknown, OrderBy = unknown, DistinctExp = unknown>(
   options: IQueryOptions<T, WhereExp, OrderBy, DistinctExp>,
@@ -37,8 +37,6 @@ export async function queryEntityList<T, WhereExp = unknown, OrderBy = unknown,
       return postCategoriesToViewModel(result as ListResult<Post> | undefined);
     case UserEntityName:
       return userListToViewModel(result as ListResult<Post> | undefined);
-    case MediaEntityName:
-      return mediaListToViewModel(result as ListResult<Post> | undefined);
   }
   return result;
 }

package/src/entify/lib/queryFeaturedProducts.ts

@@ -5,16 +5,17 @@ import {
   ProductDistinctExp,
   ProductFields,
   ProductQueryOptions,
+  ImageSize,
 } from "@rxdrag/rxcms-models";
 import { queryEntityList } from "./queryEntityList";
 import { newQueryProductsMediaOptions } from "./newQueryProductsMediaOptions";
-import { EnvVariables, TSize } from "../types";
+import { EnvVariables } from "../types";
 import { ListResult } from "@rxdrag/entify-lib";
 import { TProduct } from "../view-model";
 
 export async function queryFeaturedProducts(
   count: number = 8,
-  imageSize: TSize | undefined,
+  imageSize: ImageSize | undefined,
   envVariables: EnvVariables,
   addonFields?: (keyof Product)[]
 ) {

package/src/entify/lib/queryLatestPosts.ts

@@ -13,12 +13,13 @@ import {
   PostCategoryFields,
 } from "@rxdrag/rxcms-models";
 import { queryEntityList } from "./queryEntityList";
-import { EnvVariables, TSize } from "../types";
+import { EnvVariables } from "../types";
 import { TPost } from "../view-model";
+import { ImageSize } from "@rxdrag/rxcms-models";
 
 export async function queryLatestPosts(
   count: number = 2,
-  coverSize: TSize | undefined,
+  coverSize: ImageSize | undefined,
   envVariables: EnvVariables
 ) {
   const result = await queryEntityList<

package/src/entify/lib/queryOneEntity.ts

@@ -1,7 +1,6 @@
 import { IQueryOptions } from "@rxdrag/entify-lib";
 import { createEntifyClient } from "./createEntifyClient";
 import {
-  MediaEntityName,
   PostCategoryEntityName,
   PostEntityName,
   ProductCategoryEntityName,
@@ -13,7 +12,6 @@ import {
 import { WebsitePartBoolExp } from "@rxdrag/rxcms-models/";
 import { EnvVariables } from "../types";
 import {
-  mediaToViewModel,
   postCategoryToViewModel,
   postToViewModel,
   productCategoryToViewModel,
@@ -57,8 +55,6 @@ export async function queryOneEntity<
       return postCategoryToViewModel(result) as T | undefined;
     case UserEntityName:
       return userToViewModel(result) as T | undefined;
-    case MediaEntityName:
-      return mediaToViewModel(result) as T | undefined;
     case WebsiteSettingsEntityName:
       return websiteSettingsToViewModel(result) as T | undefined;
   }

package/src/entify/lib/queryOneMedia.ts

@@ -1,8 +1,11 @@
 import { Media, MediaBoolExp, MediaDistinctExp, MediaFields, MediaOrderBy, MediaQueryOptions } from "@rxdrag/rxcms-models";
 import { EnvVariables } from "../types";
 import { queryOneEntity } from "./queryOneEntity";
+export const queryOneMedia = async (
+  ref: string | undefined | null,
+  fields: string[] | undefined,
+  envVariables: EnvVariables) => {
 
-export const queryOneMedia = async (ref: string | undefined | null, envVariables: EnvVariables) => {
   const media = await queryOneEntity<Media, MediaBoolExp, MediaOrderBy, MediaDistinctExp>(
     new MediaQueryOptions([
       MediaFields.id,
@@ -16,7 +19,7 @@ export const queryOneMedia = async (ref: string | undefined | null, envVariables
         }
       }
     })
-      .file(["original", "thumbnail"])
+      .file(["original", "thumbnail", ...(fields || [])])
       .setNoQuery(!ref)
     ,
     envVariables

package/src/entify/lib/queryOnePostBySlug.ts

@@ -6,12 +6,13 @@ import {
 } from "@rxdrag/rxcms-models";
 import { newQueryOnePostOptions } from "./newQueryPostOptions";
 import { queryOneEntity } from "./queryOneEntity";
-import { EnvVariables, TSize } from "../types";
+import { EnvVariables } from "../types";
 import { TPost } from "../view-model";
+import { ImageSize } from "@rxdrag/rxcms-models";
 
 export async function queryOnePostBySlug(
   slug: string,
-  coverSize: TSize | undefined,
+  coverSize: ImageSize | undefined,
   envVariables: EnvVariables
 ) {
   const post = await queryOneEntity<

package/src/entify/lib/queryOneProductBySlug.ts

@@ -6,12 +6,13 @@ import {
 } from "@rxdrag/rxcms-models";
 import { newQueryProductOptions } from "./newQueryProductOptions";
 import { queryOneEntity } from "./queryOneEntity";
-import { EnvVariables, TSize } from "../types";
+import { EnvVariables } from "../types";
 import { productToViewModel, TProduct } from "../view-model";
+import { ImageSize } from "@rxdrag/rxcms-models";
 
 export async function queryOneProductBySlug(
   slug: string,
-  imageSize: TSize | undefined,
+  imageSize: ImageSize | undefined,
   envVariables: EnvVariables
 ) {
   const product = await queryOneEntity<

package/src/entify/lib/queryPosts.ts

@@ -11,10 +11,11 @@ import {
   UserQueryOptions,
   UserFields,
   ProductOrderBy,
+  ImageSize,
 } from "@rxdrag/rxcms-models";
 import { queryEntityList } from "./queryEntityList";
 import { ListResult } from "@rxdrag/entify-lib";
-import { EnvVariables, TSize } from "../types";
+import { EnvVariables } from "../types";
 import { TPost } from "../view-model";
 
 export interface ListConditions {
@@ -26,7 +27,7 @@ export interface ListConditions {
 
 export async function queryPosts(
   conditions: ListConditions,
-  coverSize: TSize | undefined,
+  coverSize: ImageSize | undefined,
   envVariables: EnvVariables,
   selectFields?: (keyof Post)[]
 ) {

package/src/entify/lib/queryProducts.ts

@@ -12,12 +12,13 @@ import { ListConditions } from "./queryPosts";
 import { queryEntityList } from "./queryEntityList";
 import { newQueryProductsMediaOptions } from "./newQueryProductsMediaOptions";
 import { ListResult } from "@rxdrag/entify-lib";
-import { EnvVariables, TSize } from "../types";
+import { EnvVariables } from "../types";
 import { TProduct } from "../view-model";
+import { ImageSize } from "@rxdrag/rxcms-models";
 
 export async function queryProducts(
   conditions: ListConditions,
-  imageSize: TSize | undefined,
+  imageSize: ImageSize | undefined,
   envVariables: EnvVariables,
   addonFields?: (keyof Product)[]
 ) {

package/src/entify/types/utils.ts

@@ -1,11 +1,7 @@
+import { ImageSizes } from "@rxdrag/rxcms-models";
 import { EnvVariables } from "./variables";
-
-export type TSize = {
-  width: number
-  height: number
-} 
-
 //astro传递上下文用
 export type Locals = {
   env: EnvVariables;
+  imageSizes: ImageSizes;
 };

package/src/entify/view-model/funcs.ts

@@ -9,7 +9,6 @@ import {
   WebsiteSettings,
 } from "@rxdrag/rxcms-models";
 import {
-  TMedia,
   TMedias,
   TPost,
   TPostCategory,
@@ -20,15 +19,6 @@ import {
 } from "./models";
 import { ListResult } from "@rxdrag/entify-lib";
 
-export function mediaToViewModel(media?: Media): TMedia | undefined {
-  if (!media) {
-    return undefined;
-  }
-  return {
-    ...media,
-    ...media?.file,
-  };
-}
 
 export function mediasToViewModel(product?: Product): TMedias | undefined {
   if (!product) {
@@ -40,7 +30,7 @@ export function mediasToViewModel(product?: Product): TMedias | undefined {
       return {
         alt: mediaOnProduct.altText,
         seqValue: mediaOnProduct.seqValue,
-        ...mediaToViewModel(mediaOnProduct.media)!,
+        ...mediaOnProduct.media!,
       };
     }),
   };
@@ -48,14 +38,14 @@ export function mediasToViewModel(product?: Product): TMedias | undefined {
 
 export function attachmentsToViewModel(
   attachments?: AttachmentOnProduct[]
-): TMedia[] | undefined {
+): Media[] | undefined {
   if (!attachments) {
     return undefined;
   }
   return attachments?.map((attachPovit) => {
     return {
       seqValue: attachPovit.seqValue,
-      ...mediaToViewModel(attachPovit.attachment)!,
+      ...attachPovit.attachment!,
     };
   });
 }
@@ -79,19 +69,19 @@ export function productCategoryToViewModel(
   }
   return {
     ...productCategory,
-    media: productCategory?.media && mediaToViewModel(productCategory?.media),
+    media: productCategory?.media,
     children: productCategory?.children?.length
       ? (productCategory?.children?.map(productCategoryToViewModel) as
-          | TProductCategory[]
-          | undefined)
+        | TProductCategory[]
+        | undefined)
       : undefined,
     parent:
       productCategory?.parent &&
       productCategoryToViewModel(productCategory?.parent),
     products: productCategory?.products?.length
       ? (productCategory?.products?.map(productToViewModel) as
-          | TProduct[]
-          | undefined)
+        | TProduct[]
+        | undefined)
       : undefined,
   };
 }
@@ -152,11 +142,11 @@ export function postCategoryToViewModel(
   }
   return {
     ...postCategory,
-    media: postCategory?.media && mediaToViewModel(postCategory?.media),
+    media: postCategory?.media,
     children: postCategory?.children?.length
       ? (postCategory?.children?.map(postCategoryToViewModel) as
-          | TPostCategory[]
-          | undefined)
+        | TPostCategory[]
+        | undefined)
       : undefined,
     parent:
       postCategory?.parent && postCategoryToViewModel(postCategory?.parent),
@@ -190,7 +180,7 @@ export function postToViewModel(post?: Post): TPost | undefined {
     content: post?.content,
     meta: post?.meta,
     category: post?.category && postCategoryToViewModel(post?.category),
-    cover: post?.cover && mediaToViewModel(post?.cover),
+    cover: post?.cover,
   };
 }
 
@@ -226,7 +216,7 @@ export function userToViewModel(user?: User): TUser | undefined {
   }
   return {
     ...user,
-    avatar: user?.avatar && mediaToViewModel(user?.avatar),
+    avatar: user?.avatar,
   };
 }
 
@@ -241,15 +231,3 @@ export function userListToViewModel(
     items: users?.items?.map(userToViewModel) as TUser[] | undefined,
   };
 }
-
-export function mediaListToViewModel(
-  medias?: ListResult<Media>
-): ListResult<TMedia> | undefined {
-  if (!medias) {
-    return undefined;
-  }
-  return {
-    ...medias,
-    items: medias?.items?.map(mediaToViewModel) as TMedia[] | undefined,
-  };
-}

package/src/entify/view-model/models.ts

@@ -1,22 +1,8 @@
-import { MediaType, PageMeta } from "@rxdrag/rxcms-models";
+import { Media, PageMeta } from "@rxdrag/rxcms-models";
 
-/**
- * 定义数据绑定用的类型，需要从@rxdrag/rxcms-models的类型进行转换
- */
-
-export type TMedia = {
-  id?: string | null;
-  name?: string;
-  mimeType?: string;
-  extName?: string;
-  thumbnail?: string;
-  resize?: string;
-  url?: string;
+export type TMedia = Media & {
   alt?: string;
-  createdAt?: Date;
-  updatedAt?: Date;
-  mediaType?: MediaType;
-};
+}
 
 export type TMedias = {
   externalVideoUrl?: string;
@@ -43,7 +29,7 @@ export type TProduct = {
   features?: string;
   medias?: TMedias;
   //从头medias中获取第一个不是视频的图片
-  cover?: TMedia;
+  cover?: Media;
   content?: string;
   content2?: string;
   content3?: string;
@@ -53,7 +39,7 @@ export type TProduct = {
   updatedAt?: Date;
   category?: TProductCategory;
   related?: TProduct[];
-  attachments?: TMedia[];
+  attachments?: Media[];
   meta?: PageMeta;
 };
 
@@ -62,7 +48,7 @@ export type TPostCategory = {
   slug?: string;
   name?: string;
   children?: TProductCategory[];
-  media?: TMedia;
+  media?: Media;
   parent?: TProductCategory;
   posts?: TPost[];
 };
@@ -70,7 +56,7 @@ export type TPostCategory = {
 export type TUser = {
   id?: string | null;
   name?: string;
-  avatar?: TMedia;
+  avatar?: Media;
   position?: string;
   profile?: string;
   email?: string;
@@ -87,7 +73,7 @@ export type TPost = {
   slug?: string;
   title?: string;
   description?: string;
-  cover?: TMedia;
+  cover?: Media;
   content?: string;
   extends?: object;
   publishedAt?: Date;
@@ -101,7 +87,7 @@ export type TPost = {
 export type TWebsiteSettings = {
   id?: string | null;
   contact?: string;
-  contactAvatar?: TMedia;
+  contactAvatar?: Media;
   address?: string;
   email?: string;
   tel?: string;
@@ -131,6 +117,5 @@ export const entityMaps: Record<string, string> = {
   Post: "TPost",
   PostCategory: "TPostCategory",
   User: "TUser",
-  Media: "TMedia",
   WebsiteSettings: "TWebsiteSettings",
 };

package/src/react/components/Medias/index.tsx

@@ -61,9 +61,7 @@ export const Medias = forwardRef<HTMLDivElement, MediasProps>((props, ref) => {
         : value.externalVideoUrl.split("v=")[1]?.split("&")[0];
 
       if (videoId) {
-        setThumbnailUrl(
-          `https://img.youtube.com/vi/${videoId}/default.jpg`
-        );
+        setThumbnailUrl(`https://img.youtube.com/vi/${videoId}/default.jpg`);
       }
     }
   }, [value?.externalVideoUrl]);
@@ -211,7 +209,7 @@ export const Medias = forwardRef<HTMLDivElement, MediasProps>((props, ref) => {
             )}
           >
             <img
-              src={media?.resize || media?.url}
+              src={media?.file?.resize || media?.file?.url}
               alt={media?.alt}
               className="w-full h-full object-cover object-center"
             />
@@ -310,7 +308,7 @@ export const Medias = forwardRef<HTMLDivElement, MediasProps>((props, ref) => {
                       onClick={() => setSelectedId(media.id)}
                     >
                       <img
-                        src={media?.resize || media?.url}
+                        src={media?.file?.resize || media?.file?.url}
                         alt={media?.alt}
                         className="w-full h-full object-cover"
                       />