@rxdrag/website-lib-core 0.0.19 → 0.0.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rxdrag/website-lib-core",
-  "version": "0.0.19",
+  "version": "0.0.21",
   "type": "module",
   "exports": {
     ".": "./index.ts"
@@ -24,10 +24,10 @@
     "@types/react-dom": "^18.2.7",
     "eslint": "^7.32.0",
     "typescript": "^5",
-    "@rxdrag/slate-preview": "1.2.57",
     "@rxdrag/entify-hooks": "0.2.43",
-    "@rxdrag/eslint-config-custom": "0.2.12",
-    "@rxdrag/tsconfig": "0.2.0"
+    "@rxdrag/tsconfig": "0.2.0",
+    "@rxdrag/slate-preview": "1.2.57",
+    "@rxdrag/eslint-config-custom": "0.2.12"
   },
   "dependencies": {
     "clsx": "^2.1.0",
@@ -35,7 +35,7 @@
     "lodash-es": "^4.17.21",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "@rxdrag/rxcms-models": "0.3.49"
+    "@rxdrag/rxcms-models": "0.3.50"
   },
   "peerDependencies": {
     "astro": "^4.0.0 || ^5.0.0"

package/src/component-logic/link-client.ts

@@ -15,7 +15,7 @@ export const initLinks = () => {
         anchorLink.dataset.activedPath === "true"
           ? linkUrl.pathname
           : anchorLink.dataset.activedPath;
-
+      console.log("====>", linkPath, currentPath);
       // 检查当前路径是否与链接路径匹配或是其子路径
       if (
         currentPath === linkPath ||
@@ -30,4 +30,4 @@ export const initLinks = () => {
       console.warn("Invalid URL:", e, anchorLink);
     }
   });
-};
+};

package/src/entify/lib/queryLangs.ts

@@ -5,6 +5,10 @@ import {
   LangOrderBy,
   LangQueryOptions,
   LangAssciations,
+  ThemeQueryOptions,
+  ThemeFields,
+  ThemeConfigFields,
+  ThemeAssciations,
 } from "@rxdrag/rxcms-models";
 import { ListResult } from "@rxdrag/entify-hooks";
 import { EnvVariables } from "../types";
@@ -28,7 +32,29 @@ export async function queryLangs(envVariables: EnvVariables) {
           },
         },
       },
-    }).setNoQuery(!envVariables.websiteId)
+    })
+      .themes(
+        new ThemeQueryOptions([ThemeFields.id, ThemeFields.name], {
+          where: {
+            [ThemeAssciations.website]: {
+              id: {
+                _eq: envVariables.websiteId,
+              },
+            },
+          },
+        }).config([
+          ThemeConfigFields.id,
+          ThemeConfigFields.address,
+          ThemeConfigFields.contact,
+          ThemeConfigFields.email,
+          ThemeConfigFields.fax,
+          ThemeConfigFields.mobile,
+          ThemeConfigFields.tel,
+          ThemeConfigFields.wechat,
+          ThemeConfigFields.domain,
+        ])
+      )
+      .setNoQuery(!envVariables.websiteId)
   );
   return result as ListResult<Lang> | undefined;
 }

package/src/entify/lib/queryProducts.ts

@@ -1,4 +1,13 @@
-import { Product, ProductBoolExp, ProductOrderBy, ProductDistinctExp, ProductFields, ProductQueryOptions, PublishableStatus, ProductAssciations } from "@rxdrag/rxcms-models";
+import {
+  Product,
+  ProductBoolExp,
+  ProductOrderBy,
+  ProductDistinctExp,
+  ProductFields,
+  ProductQueryOptions,
+  PublishableStatus,
+  ProductAssciations,
+} from "@rxdrag/rxcms-models";
 import { ListConditions } from "./queryPosts";
 import { queryEntityList } from "./queryEntityList";
 import { newQueryProductsMediaOptions } from "./newQueryProductsMediaOptions";
@@ -7,22 +16,22 @@ import { EnvVariables, TSize } from "../types";
 import { TProduct } from "../view-model";
 
 export async function queryProducts(
-  conditions: ListConditions, 
-  imageSize: TSize | undefined, 
+  conditions: ListConditions,
+  imageSize: TSize | undefined,
   envVariables: EnvVariables,
   selectFields?: (keyof Product)[]
 ) {
   const { category: categorySlug, page = 1, pageSize = 10 } = conditions;
 
-  let where = {}
+  let where = {};
   if (categorySlug) {
     where = {
       [ProductAssciations.category]: {
         slug: {
-          "_eq": categorySlug
-        }
+          _eq: categorySlug,
+        },
       },
-    }
+    };
   }
 
   // 默认查询字段
@@ -37,38 +46,35 @@ export async function queryProducts(
   // 使用指定的字段或默认字段
   const fields = selectFields || defaultFields;
 
-  const queryOptions = new ProductQueryOptions(
-    fields,
-    {
-      offset: (page - 1) * pageSize,
-      limit: pageSize,
-      where: {
-        [ProductFields.status]: {
-          "_eq": PublishableStatus.published
-        },
-        lang: {
-          abbr: {
-            _eq: envVariables.language,
-          },
+  const queryOptions = new ProductQueryOptions(fields, {
+    offset: (page - 1) * pageSize,
+    limit: pageSize,
+    where: {
+      [ProductFields.status]: {
+        _eq: PublishableStatus.published,
+      },
+      lang: {
+        abbr: {
+          _eq: envVariables.language,
         },
-        ...where,
       },
-      orderBy: [
-        { [ProductFields.seqValue]: "asc" }
-      ]
-    }
-  );
+      ...where,
+    },
+    orderBy: [
+      { [ProductFields.seqValue]: "asc", [ProductFields.updatedAt]: "desc" },
+    ],
+  });
 
   // 只有在不指定字段或需要查询媒体时才添加媒体查询
-  if (!selectFields || !selectFields.includes('slug' as keyof Product)) {
-    queryOptions.mediaPivots(
-      newQueryProductsMediaOptions(imageSize)
-    );
+  if (!selectFields || !selectFields.includes("slug" as keyof Product)) {
+    queryOptions.mediaPivots(newQueryProductsMediaOptions(imageSize));
   }
 
-  const result = await queryEntityList<Product, ProductBoolExp, ProductOrderBy, ProductDistinctExp>(
-    queryOptions,
-    envVariables
-  );
+  const result = await queryEntityList<
+    Product,
+    ProductBoolExp,
+    ProductOrderBy,
+    ProductDistinctExp
+  >(queryOptions, envVariables);
   return result as ListResult<TProduct> | undefined;
 }

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

@@ -254,7 +254,7 @@ export const ContactForm = forwardRef<HTMLDivElement, ContactFormProps>(
         <Input
           className="sm:col-span-1"
           inputClassName="mt-2 block w-full rounded-md outline-none border-0 py-1.5 text-gray-900 shadow-sm ring-1 ring-gray-300 placeholder:text-gray-400 focus:ring-2 focus:ring-sky-600 sm:text-sm sm:leading-6"
-          label={(labels?.name || "Your Name") + " *"}
+          label={labels?.name || "Your Name"}
           labelClassName="block text-sm font-medium leading-6 text-gray-900"
           name="name"
           value={formData.name}
@@ -264,7 +264,7 @@ export const ContactForm = forwardRef<HTMLDivElement, ContactFormProps>(
         <Input
           className="col-span-full"
           inputClassName="mt-2 block w-full rounded-md outline-none border-0 py-1.5 text-gray-900 shadow-sm ring-1 ring-gray-300 placeholder:text-gray-400 focus:ring-2 focus:ring-sky-600 sm:text-sm sm:leading-6"
-          label={(labels?.company || "Company") + " *"}
+          label={labels?.company || "Company"}
           labelClassName="block text-sm font-medium leading-6 text-gray-900"
           name="company"
           value={formData.company}

package/src/react/components/SearchInput.tsx

@@ -8,25 +8,10 @@ export const SearchInput = forwardRef<HTMLInputElement, SearchProps>(
     const { children, ...rest } = props;
     const [keyword, setKeyword] = useState<string>();
 
-    // const navigate = useNavigate();
-    // const [, setOpen] = useXModalState();
-
-    const handleKeyEnter = (event: React.KeyboardEvent<HTMLElement>) => {
-      if (event.key !== "Enter" || !keyword) {
-        return;
-      }
-      // setOpen?.(false);
-      const encodedKeyword = encodeURIComponent(keyword || "");
-      if (encodedKeyword) {
-        //navigate(`/search?keyword=${encodedKeyword}`);
-      }
-    };
-
     return (
       <input
         ref={ref}
         name="q"
-        onKeyDown={handleKeyEnter}
         value={keyword}
         onChange={(e) => setKeyword(e.target.value)}
         {...rest}