jeawin-astro 3.0.24 → 3.0.26

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "jeawin-astro",
-    "version": "3.0.24",
+    "version": "3.0.26",
     "author": "chaegumi <chaegumi@qq.com>",
     "description": "",
     "license": "MIT",

package/src/components/heading/heading1.astro

@@ -12,17 +12,20 @@
 interface Props {
   block_title?: any;
   block_subtitle?: any;
+  h_tag_name?: any;
 }
-const { block_title, block_subtitle } = Astro.props;
+const { block_title, block_subtitle, h_tag_name = 'h2' } = Astro.props;
+
+const HTagName = h_tag_name;
 ---
 
 <div class="mb-8 lg:mb-16 relative z-[2]">
   <div
     class="text-4xl tracking-tight font-extrabold text-gray-900 text-center mb-4 flex flex-col gap-4 after:mx-auto after:w-1/12 after:border after:border-[var(--themeColor)]"
   >
-    <h2>
+    <HTagName>
       <Fragment set:html={block_title} />
-    </h2>
+    </HTagName>
   </div>
 
   <div

package/src/components/heading/heading2.astro

@@ -11,13 +11,16 @@
  */
 interface Props {
   block_title: any;
+  h_tag_name?: any;
 }
 
-const { block_title } = Astro.props;
+const { block_title, h_tag_name } = Astro.props;
+
+const HTagName = h_tag_name;
 ---
 
-<div
+<HTagName 
   class="text-2xl mb-7 flex flex-col gap-5 after:w-1/12 after:border after:border-[var(--themeColor)]"
 >
   {block_title}
-</div>
+</HTagName>

package/src/components/heading/heading3.astro

@@ -2,14 +2,16 @@
 interface Props {
   block_title: any;
   block_subtitle?: any;
+  h_tag_name?: any;
 }
-const { block_title, block_subtitle } = Astro.props;
+const { block_title, block_subtitle, h_tag_name = 'h2' } = Astro.props;
+const HTagName = h_tag_name;
 ---
 
 <div class="mx-auto max-w-screen-sm text-center mb-8 lg:mb-16">
-  <h2 class="mb-4 text-4xl tracking-tight font-extrabold text-gray-900">
+  <HTagName class="mb-4 text-4xl tracking-tight font-extrabold text-gray-900">
     {block_title}
-  </h2>
+  </HTagName>
   <p class="font-light text-gray-500 lg:mb-16 sm:text-xl">
     {block_subtitle}
   </p>

package/src/components/newsletter.astro

@@ -11,6 +11,8 @@
 import { render_value } from "../scripts/util.js";
 import Input from "./formitem/input.astro";
 const { btn_class, siteinfo, jeawin_form_api_domain, all_langs } = Astro.locals;
+
+const {other_btn_class} = Astro.props;
 ---
 
 <form
@@ -38,7 +40,7 @@ const { btn_class, siteinfo, jeawin_form_api_domain, all_langs } = Astro.locals;
         <button
           type="submit"
           id="submitbtnsubscribe"
-          class:list={["break-keep", ...btn_class]}
+          class:list={["break-keep", ...btn_class, other_btn_class ? other_btn_class : null]}
           >{render_value(all_langs, "Subscribe")}</button
         >
       </div>

package/src/components/search_input.astro

@@ -1,13 +1,17 @@
 ---
 import { Icon } from "astro-icon/components";
 import { render_value } from "../scripts/util.js";
+interface Props {
+  show_search_box?: boolean;
+}
 const { all_langs } = Astro.locals;
+const {show_search_box = false} = Astro.props;
 const searchInputLang = render_value(all_langs, "Search by site");
 const searchLang = render_value(all_langs, "Search");
 ---
 
 <div>
-  <div x-data="{showSearchForm:false}" class="w-full" :class={`{'w-full':showSearchForm}`}>
+  <div x-data={`{showSearchForm:${show_search_box}}`} class="w-full" :class={`{'w-full':showSearchForm}`}>
     <Icon
       name="fa6-solid:magnifying-glass"
       class="md:hidden size-5"

package/src/integrations/jeawin-common-route/routes/rss.xml.ts

@@ -21,7 +21,7 @@ export const GET:APIRoute = async ({site, locals}) => {
             title: node.node_title,
             pubDate: dayjs.unix(node.node_created).format('YYYY-MM-DD HH:mm:ss'),
             description: node.content,
-            link: render_url(node.node_uri, locals.base, null, locals.url_suffix)
+            link: render_url(node.node_url, locals.base, null, locals.url_suffix)
         })        
     })
 

package/src/scripts/util.d.ts

@@ -1,40 +1,44 @@
-/**
- * 判断是不是默认图片
- */
-export function is_default_image(img_url: any): boolean;
-/**
- * 输出发布时间
- */
-export function render_date(locale: string, t: any, f?: string): any;
-/**
- * 安全输出数据
- */
-export function render_value(obj: any, prop: any, def?: string): any;
-/**
- * 输出url
- */
-export function render_url(url: any, base?: string, queryObj?: any, suffix?: any): any;
-/**
- * 输出url
- */
-export function get_url(apikey: any, page_type: any, id: any): Promise<string>;
-/**
- * 图片添加链接
- */
-export function img_add_link(img_html: any): any;
-/**
- * 图片修改属性
- */
-export function img_change_attrs(img_html: any, add_attrs: any, remove_attrs: any): any;
-/**
- * 返回子类别
- */
-export function get_children_categories(all_categories: any, channel_id: any, category_id: any, is_check?: boolean): any;
-/**
- * 截取html
- */
-export function truncate(content: any, options: any): any;
-/**
- * 判断是否使用pagefind搜索
- */
-export function is_pagefind(language_id: any): boolean;
+/**
+ * 判断是不是默认图片
+ */
+export function is_default_image(img_url: any): boolean;
+/**
+ * 输出发布时间
+ */
+export function render_date(locale: string, t: any, f?: string): any;
+/**
+ * 安全输出数据
+ */
+export function render_value(obj: any, prop: any, def?: string): any;
+/**
+ * 输出url
+ */
+export function render_url(url: any, base?: string, queryObj?: any, suffix?: string): any;
+/**
+ * 输出url
+ */
+export function get_url(apikey: any, page_type: any, id: any): Promise<string>;
+/**
+ * 图片添加链接
+ */
+export function img_add_link(img_html: any): any;
+/**
+ * 图片修改属性
+ */
+export function img_change_attrs(img_html: any, add_attrs: any, remove_attrs: any): any;
+/**
+ * 返回子类别
+ */
+export function get_children_categories(all_categories: any, channel_id: any, category_id: any, is_check?: boolean): any;
+/**
+ * 截取html
+ */
+export function truncate(content: any, options: any): any;
+/**
+ * 判断是否使用pagefind搜索
+ */
+export function is_pagefind(language_id: any): boolean;
+/**
+ * 输出多语言项
+ */
+export function render_lang(all_langs: any, key: any): any;

package/src/scripts/util.js

@@ -343,4 +343,11 @@ export function is_pagefind(language_id) {
         return false;
     }
     return true;
+}
+
+/**
+ * 输出多语言项
+ */
+export function render_lang(all_langs, key){
+    return render_value(all_langs, key, key);
 }