@rxdrag/website-lib-core 0.0.86 → 0.0.88

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rxdrag/website-lib-core",
-  "version": "0.0.86",
+  "version": "0.0.88",
   "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.61"
   },
   "dependencies": {
     "@iconify/utils": "^3.0.2",

package/src/entify/Entify.ts

@@ -42,6 +42,7 @@ 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";
+import { queryOneIcon } from "./lib/queryOneIcon";
 
 export class Entify implements IEntify {
   private static instance: Entify | null = null;
@@ -132,6 +133,10 @@ export class Entify implements IEntify {
     return await queryOneMedia(ref, fields, this.envVariables);
   }
 
+  public async getIcon(name: string | undefined | null) {
+    return await queryOneIcon(name, this.envVariables);
+  }
+
   public async getFeaturedProducts(
     count?: number,
     imageSize?: ImageSize,

package/src/entify/IEntify.ts

@@ -16,6 +16,7 @@ import {
   PageType,
   Product,
   SearchIndex,
+  SvgIcon,
   ThemeBranch,
   Website,
   WebsitePart,
@@ -61,6 +62,8 @@ export interface IEntify {
 
   getMedia(ref: string | undefined | null, fileField?: FileFieldType, resize?: ImageResize): Promise<Media | undefined>;
 
+  getIcon(name: string | undefined | null): Promise<SvgIcon | undefined>;
+
   getFeaturedProducts(
     count?: number,
     imageSize?: ImageSize,

package/src/entify/lib/queryOneIcon.ts

@@ -0,0 +1,27 @@
+import { SvgIcon, SvgIconBoolExp, SvgIconDistinctExp, SvgIconOrderBy, SvgIconQueryOptions, SvgIconFields } from "@rxdrag/rxcms-models";
+import { EnvVariables } from "../types";
+import { queryOneEntity } from "./queryOneEntity";
+
+export const queryOneIcon = async (
+  name: string | undefined | null,
+  envVariables: EnvVariables) => {
+
+  const icon = await queryOneEntity<SvgIcon, SvgIconBoolExp, SvgIconOrderBy, SvgIconDistinctExp>(
+    new SvgIconQueryOptions([
+      SvgIconFields.id,
+      SvgIconFields.name,
+      SvgIconFields.title,
+      SvgIconFields.code,
+    ], {
+      where: {
+        name: {
+          "_eq": name || ""
+        }
+      }
+    })
+      .setNoQuery(!name)
+    ,
+    envVariables
+  );
+  return icon;
+};

package/src/entify/lib/queryPosts.ts

@@ -66,7 +66,7 @@ export async function queryPosts(
           new PostCategoryQueryOptions([
             PostCategoryFields.id,
             PostCategoryFields.slug,
-          ]).children([])
+          ]).children([PostCategoryFields.id])
         ),
       envVariables
     );

package/src/entify/lib/queryProducts.ts

@@ -63,15 +63,8 @@ export async function queryProducts(
         [
           ProductCategoryFields.id,
           ProductCategoryFields.slug,
-        ],
-        {
-          where: {
-            slug: {
-              _eq: categorySlug,
-            },
-          },
-        }
-      ).children([])),
+        ]
+      ).children([ProductCategoryFields.id])),
       envVariables
     );
     if (category) {

package/src/react/components/Icon/svgToIconify.ts

@@ -16,7 +16,6 @@ export function svgToIconify(svgString: string): IconifyIcon | null {
     const viewBox = svg.getAttribute("viewBox");
     let width = svg.getAttribute("width");
     let height = svg.getAttribute("height");
-    const body = svg.innerHTML;
 
     // 如果没有显式宽高，尝试从 viewBox 解析
     if (viewBox && (!width || !height)) {
@@ -27,6 +26,27 @@ export function svgToIconify(svgString: string): IconifyIcon | null {
       }
     }
 
+    // 提取关键属性并包裹在 <g> 中，以保留 SVG 根节点的样式
+    const attributesToPreserve = [
+      "fill", 
+      "stroke", 
+      "stroke-width", 
+      "stroke-linecap", 
+      "stroke-linejoin"
+    ];
+    
+    const gAttributes = attributesToPreserve
+      .map(attr => {
+        const value = svg.getAttribute(attr);
+        return value ? `${attr}="${value}"` : "";
+      })
+      .filter(Boolean)
+      .join(" ");
+
+    const body = gAttributes 
+      ? `<g ${gAttributes}>${svg.innerHTML}</g>`
+      : svg.innerHTML;
+
     return {
       body,
       width: width ? parseFloat(width) : undefined,