@rxdrag/website-lib-core 0.0.96 → 0.0.98

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rxdrag/website-lib-core",
-  "version": "0.0.96",
+  "version": "0.0.98",
   "type": "module",
   "exports": {
     ".": "./index.ts"
@@ -24,9 +24,9 @@
     "@types/react-dom": "^19.1.0",
     "eslint": "^7.32.0",
     "typescript": "^5",
-    "@rxdrag/slate-preview": "1.2.61",
+    "@rxdrag/eslint-config-custom": "0.2.12",
     "@rxdrag/tsconfig": "0.2.0",
-    "@rxdrag/eslint-config-custom": "0.2.12"
+    "@rxdrag/slate-preview": "1.2.63"
   },
   "dependencies": {
     "@iconify/utils": "^3.0.2",
@@ -37,7 +37,7 @@
     "react": "^19.1.0",
     "react-dom": "^19.1.0",
     "@rxdrag/entify-lib": "0.0.23",
-    "@rxdrag/rxcms-models": "0.3.94"
+    "@rxdrag/rxcms-models": "0.3.95"
   },
   "peerDependencies": {
     "astro": "^4.0.0 || ^5.0.0"

package/src/entify/Entify.ts

@@ -43,12 +43,12 @@ 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";
 import { queryOneIcon } from "./lib/queryOneIcon";
+import { queryBulletin } from "./lib/queryBulletin";
 
 export class Entify implements IEntify {
   private static instance: Entify | null = null;
 
   private constructor(protected envVariables: EnvVariables, protected imageSizes: ImageSizes) { }
-
   private flattenTree<T>(nodes: T[] | undefined): T[] {
     if (!nodes) return [];
     let result: T[] = [];
@@ -137,6 +137,11 @@ export class Entify implements IEntify {
     return await queryOneIcon(name, this.envVariables);
   }
 
+  public async getBulletin() {
+    return await queryBulletin(this.envVariables);
+  }
+
+
   public async getFeaturedProducts(
     count?: number,
     imageSize?: ImageSize,

package/src/entify/IEntify.ts

@@ -8,6 +8,7 @@ import {
   TUser,
 } from "./view-model";
 import {
+  Bulletin,
   ImageSize,
   ImageSizes,
   Lang,
@@ -64,6 +65,8 @@ export interface IEntify {
 
   getIcon(name: string | undefined | null): Promise<SvgIcon | undefined>;
 
+  getBulletin(): Promise<Bulletin | undefined | null>
+
   getFeaturedProducts(
     count?: number,
     imageSize?: ImageSize,

package/src/entify/lib/newQueryPostOptions.ts

@@ -6,6 +6,7 @@ import {
   MediaQueryOptions,
   PostCategoryFields,
   ImageSize,
+  TagFields,
 } from "@rxdrag/rxcms-models";
 
 import { newPageMetaOptions } from "./newPageMetaOptions";
@@ -39,5 +40,6 @@ export function newQueryOnePostOptions(coverSize?: ImageSize) {
       PostCategoryFields.id,
       PostCategoryFields.slug,
       PostCategoryFields.name,
-    ]);
+    ])
+    .tags([TagFields.id, TagFields.name, TagFields.color]);
 }

package/src/entify/lib/newQueryProductOptions.ts

@@ -10,6 +10,7 @@ import {
   ProductCategoryFields,
   ProductRelatedPivotQueryOptions,
   ImageSize,
+  TagFields,
 } from "@rxdrag/rxcms-models";
 import { newPageMetaOptions } from "./newPageMetaOptions";
 
@@ -92,5 +93,6 @@ export function newQueryProductOptions(imagSize?: ImageSize) {
       ProductCategoryFields.id,
       ProductCategoryFields.slug,
       ProductCategoryFields.name,
-    ]);
+    ])
+    .tags([TagFields.id, TagFields.name, TagFields.color]);
 }

package/src/entify/lib/queryBulletin.ts

@@ -0,0 +1,17 @@
+import { BulletinBoolExp, BulletinDistinctExp, BulletinOrderBy, BulletinQueryOptions, BulletinFields, Bulletin } from "@rxdrag/rxcms-models";
+import { EnvVariables } from "../types";
+import { queryOneEntity } from "./queryOneEntity";
+
+export const queryBulletin = async (
+  envVariables: EnvVariables) => {
+
+  const bulletin = await queryOneEntity<Bulletin, BulletinBoolExp, BulletinOrderBy, BulletinDistinctExp>(
+    new BulletinQueryOptions([
+      BulletinFields.id,
+      BulletinFields.title,
+      BulletinFields.content,
+    ]),
+    envVariables
+  );
+  return bulletin;
+};

package/src/entify/lib/queryFeaturedProducts.ts

@@ -46,6 +46,18 @@ export async function queryFeaturedProducts(
               _eq: envVariables.language,
             },
           },
+          _or: [
+            {
+              [ProductFields.isDeleted]: {
+                _eq: false,
+              },
+            },
+            {
+              [ProductFields.isDeleted]: {
+                _isNull: true,
+              },
+            },
+          ],
         },
         orderBy: [{ [ProductFields.seqValue]: "asc" }],
       }

package/src/entify/lib/queryLatestPosts.ts

@@ -53,6 +53,18 @@ export async function queryLatestPosts(
               _eq: envVariables.language,
             },
           },
+          _or: [
+            {
+              [PostFields.isDeleted]: {
+                _eq: false,
+              },
+            },
+            {
+              [PostFields.isDeleted]: {
+                _isNull: true,
+              },
+            },
+          ],
         },
       }
     )
@@ -64,8 +76,7 @@ export async function queryLatestPosts(
       .cover(
         new MediaQueryOptions().file([
           "thumbnail",
-          `resize(width:${coverSize?.width || 480}, height:${
-            coverSize?.height || 180
+          `resize(width:${coverSize?.width || 480}, height:${coverSize?.height || 180
           })`,
         ])
       )

package/src/entify/lib/queryPosts.ts

@@ -19,6 +19,7 @@ import {
   PostCategoryOrderBy,
   PostCategoryDistinctExp,
   PostCategoryQueryOptions,
+  TagFields,
 } from "@rxdrag/rxcms-models";
 import { queryEntityList } from "./queryEntityList";
 import { ListResult } from "@rxdrag/entify-lib";
@@ -112,6 +113,18 @@ export async function queryPosts(
           _eq: envVariables.language,
         },
       },
+      _or: [
+        {
+          [PostFields.isDeleted]: {
+            _eq: false,
+          },
+        },
+        {
+          [PostFields.isDeleted]: {
+            _isNull: true,
+          },
+        },
+      ],
       ...where,
     },
     orderBy: [
@@ -125,7 +138,8 @@ export async function queryPosts(
         [PostFields.updatedAt]: "desc",
       },
     ],
-  }).category([PostCategoryFields.id, PostCategoryFields.name, PostCategoryFields.slug]);
+  }).category([PostCategoryFields.id, PostCategoryFields.name, PostCategoryFields.slug])
+    .tags([TagFields.id, TagFields.name, TagFields.color]);
 
   // 只有在需要查询封面图时才添加封面图查询
   if (!selectFields || selectFields.includes("cover" as keyof Post)) {

package/src/entify/lib/queryProducts.ts

@@ -13,6 +13,7 @@ import {
   ProductCategoryDistinctExp,
   ProductCategoryFields,
   ProductCategoryQueryOptions,
+  TagFields,
 } from "@rxdrag/rxcms-models";
 import { ListConditions } from "./queryPosts";
 import { queryEntityList } from "./queryEntityList";
@@ -108,13 +109,25 @@ export async function queryProducts(
           _eq: envVariables.language,
         },
       },
+      _or: [
+        {
+          [ProductFields.isDeleted]: {
+            _eq: false,
+          },
+        },
+        {
+          [ProductFields.isDeleted]: {
+            _isNull: true,
+          },
+        },
+      ],
       ...where,
     },
     orderBy: orderBy || [
       { [ProductFields.seqValue]: "asc" },
       { [ProductFields.updatedAt]: "desc" },
     ],
-  });
+  }).tags([TagFields.id, TagFields.name, TagFields.color]);
 
   // 只有在不指定字段或需要查询媒体时才添加媒体查询
   if (!addonFields || !addonFields.includes("slug" as keyof Product)) {

package/src/entify/lib/queryProductsInMenu.ts

@@ -18,6 +18,18 @@ export async function queryProductsInMenu(envVariables: EnvVariables) {
               _eq: envVariables.language,
             },
           },
+          _or: [
+            {
+              [ProductFields.isDeleted]: {
+                _eq: false,
+              },
+            },
+            {
+              [ProductFields.isDeleted]: {
+                _isNull: true,
+              },
+            },
+          ],
           showInNavMenu: {
             _eq: true,
           },

package/src/react/components/Bulletin.tsx

@@ -0,0 +1,30 @@
+import { Bulletin as BulletinModel } from "@rxdrag/rxcms-models";
+import { useEffect, useState } from "react";
+
+export function Bulletin(props: { className?: string }) {
+  const { className, ...rest } = props;
+  const [bulletin, setBulletin] = useState<BulletinModel | null>(null);
+
+  useEffect(() => {
+    fetch("/api/get-bulletin")
+      .then((res) => res.json())
+      .then((res) => {
+        if (res.success) {
+          setBulletin(res.data);
+        }
+      })
+      .catch((err) => {
+        console.error("Failed to fetch bulletin", err);
+      });
+  }, []);
+
+  console.log("====>bulletin", bulletin)
+
+  if (!bulletin) return null;
+
+  return (
+    <div className={className} {...rest}>
+      {bulletin.content}
+    </div>
+  );
+}

package/src/react/components/index.ts

@@ -11,6 +11,7 @@ export * from "./SearchInput";
 export * from "./ToTop";
 export * from "./BackgroundVideoPlayer";
 export * from "./BackgroundHlsVideoPlayer";
+export * from "./Bulletin";
 export * from "./ReactModalTrigger";
 export * from "./ReactVideoPlayer";