@rxdrag/website-lib-core 0.0.47 → 0.0.49

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rxdrag/website-lib-core",
-  "version": "0.0.47",
+  "version": "0.0.49",
   "type": "module",
   "exports": {
     ".": "./index.ts"
@@ -24,9 +24,9 @@
     "@types/react-dom": "^18.2.7",
     "eslint": "^7.32.0",
     "typescript": "^5",
-    "@rxdrag/slate-preview": "1.2.57",
     "@rxdrag/eslint-config-custom": "0.2.12",
-    "@rxdrag/tsconfig": "0.2.0"
+    "@rxdrag/tsconfig": "0.2.0",
+    "@rxdrag/slate-preview": "1.2.57"
   },
   "dependencies": {
     "clsx": "^2.1.0",
@@ -34,8 +34,8 @@
     "lodash-es": "^4.17.21",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "@rxdrag/rxcms-models": "0.3.74",
-    "@rxdrag/entify-lib": "0.0.8"
+    "@rxdrag/entify-lib": "0.0.8",
+    "@rxdrag/rxcms-models": "0.3.76"
   },
   "peerDependencies": {
     "astro": "^4.0.0 || ^5.0.0"

package/src/entify/lib/newQueryProductOptions.ts

@@ -8,6 +8,7 @@ import {
   AttachmentOnProductQueryOptions,
   AttachmentOnProductFields,
   ProductCategoryFields,
+  ProductRelatedPivotQueryOptions,
 } from "@rxdrag/rxcms-models";
 import { TSize } from "../types";
 import { newPageMetaOptions } from "./newPageMetaOptions";
@@ -52,7 +53,6 @@ export function newQueryProductOptions(imagSize?: TSize) {
     ProductFields.description,
     ProductFields.features,
     ProductFields.relatedSlugs,
-    ProductFields.relatedSlugs,
   ])
     .meta(newPageMetaOptions())
     .mediaPivots(creatProductMediaOptions(imagSize))
@@ -72,6 +72,20 @@ export function newQueryProductOptions(imagSize?: TSize) {
         ]).file(["url"])
       )
     )
+    .relatedPivots(
+      new ProductRelatedPivotQueryOptions([ProductFields.id]).product(
+        new ProductQueryOptions(
+          [ProductFields.id, ProductFields.slug, ProductFields.title],
+          {
+            orderBy: [
+              {
+                [ProductFields.id]: "asc",
+              },
+            ],
+          }
+        ).mediaPivots(creatProductMediaOptions(imagSize))
+      )
+    )
     .category([
       ProductCategoryFields.id,
       ProductCategoryFields.slug,

package/src/entify/lib/queryOneProductBySlug.ts

@@ -8,7 +8,6 @@ import { newQueryProductOptions } from "./newQueryProductOptions";
 import { queryOneEntity } from "./queryOneEntity";
 import { EnvVariables, TSize } from "../types";
 import { productToViewModel, TProduct } from "../view-model";
-import { queryEntityList } from "./queryEntityList";
 
 export async function queryOneProductBySlug(
   slug: string,
@@ -42,37 +41,11 @@ export async function queryOneProductBySlug(
 
   const tProduct = productToViewModel(product)!;
 
-  if (product?.relatedSlugs?.length) {
-    const result = await queryEntityList<
-      Product,
-      ProductBoolExp,
-      ProductOrderBy,
-      ProductDistinctExp
-    >(
-      newQueryProductOptions(imageSize).setQueryArgs({
-        where: {
-          slug: {
-            _in: product?.relatedSlugs,
-          },
-          lang: {
-            abbr: {
-              _eq: envVariables.language,
-            },
-          },
-        },
-      }),
-      envVariables
-    );
-
-    const relatedProducts = result?.items?.map((pro) =>
-      productToViewModel(pro)
-    ) as TProduct[] | undefined;
-
+  if (product?.relatedPivots?.length) {
     //重新排序后赋值
-    tProduct.related = product?.relatedSlugs.map((slug) =>
-      relatedProducts?.find((p) => p.slug === slug)
+    tProduct.related = product?.relatedPivots.map((pv) =>
+      productToViewModel(pv.product)
     ) as TProduct[] | undefined;
   }
-
   return tProduct;
 }