jeawin-astro 1.0.78 → 1.0.80

package/package.json

@@ -1,73 +1,73 @@
-{
-    "name": "jeawin-astro",
-    "version": "1.0.78",
-    "author": "chaegumi <chaegumi@qq.com>",
-    "description": "",
-    "license": "MIT",
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/chaegumi/jeawin-astro.git"
-    },
-    "homepage": "https://www.jeawin.com/",
-    "type": "module",
-    "types": "index.d.ts",
-    "main": "index.ts",
-    "scripts": {
-        "test": "mocha test"
-    },
-    "devDependencies": {
-        "@babel/core": "^7.26.0",
-        "@babel/preset-env": "^7.26.0",
-        "@rollup/plugin-babel": "^6.0.4",
-        "@rollup/plugin-commonjs": "^28.0.1",
-        "@rollup/plugin-json": "^6.1.0",
-        "@rollup/plugin-multi-entry": "^6.0.1",
-        "@rollup/plugin-node-resolve": "^15.3.0",
-        "@rollup/plugin-strip": "^3.0.4",
-        "@rollup/plugin-terser": "^0.4.4",
-        "@rollup/plugin-typescript": "^12.1.1",
-        "@types/lodash": "^4.17.13",
-        "@types/sprintf-js": "^1.1.4",
-        "autoprefixer": "^10.4.20",
-        "chai": "^5.1.2",
-        "mocha": "^10.8.2",
-        "postcss": "^8.4.49",
-        "rollup": "^4.27.4",
-        "rollup-plugin-node-externals": "^7.1.3",
-        "rollup-plugin-postcss": "^4.0.2",
-        "typescript": "^5.7.2"
-    },
-    "dependencies": {
-        "@astrojs/alpinejs": "^0.4.0",
-        "@astrojs/check": "^0.9.4",
-        "@astrojs/cloudflare": "^11.2.0",
-        "@astrojs/rss": "4.0.9",
-        "@astrojs/sitemap": "3.2.1",
-        "@astrojs/tailwind": "5.1.2",
-        "@astrojs/ts-plugin": "^1.10.4",
-        "@astrojs/vue": "4.5.2",
-        "@iconify-json/fa6-brands": "^1.2.3",
-        "@iconify-json/fa6-solid": "^1.2.2",
-        "@iconify/tools": "^4.0.7",
-        "@keyv/compress-brotli": "^2.0.2",
-        "@types/alpinejs": "^3.13.11",
-        "alpinejs": "^3.14.5",
-        "aos": "3.0.0-beta.6",
-        "astro": "^4.16.14",
-        "astro-icon": "^1.1.4",
-        "astro-integration-kit": "^0.16.1",
-        "cheerio": "^1.0.0",
-        "dayjs": "^1.11.13",
-        "fetch-jsonp": "^1.3.0",
-        "glob": "^11.0.0",
-        "keyv": "^5.2.1",
-        "keyv-lru": "^3.0.4",
-        "lodash": "^4.17.21",
-        "photoswipe": "^5.4.4",
-        "smartmenus": "2.0.0-alpha.1",
-        "sprintf-js": "^1.1.3",
-        "string-strip-html": "^13.4.8",
-        "swiper": "^11.1.15",
-        "tslib": "^2.8.1"
-    }
-}
+{
+    "name": "jeawin-astro",
+    "version": "1.0.80",
+    "author": "chaegumi <chaegumi@qq.com>",
+    "description": "",
+    "license": "MIT",
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/chaegumi/jeawin-astro.git"
+    },
+    "homepage": "https://www.jeawin.com/",
+    "type": "module",
+    "types": "index.d.ts",
+    "main": "index.ts",
+    "scripts": {
+        "test": "mocha test"
+    },
+    "devDependencies": {
+        "@babel/core": "^7.26.0",
+        "@babel/preset-env": "^7.26.0",
+        "@rollup/plugin-babel": "^6.0.4",
+        "@rollup/plugin-commonjs": "^28.0.1",
+        "@rollup/plugin-json": "^6.1.0",
+        "@rollup/plugin-multi-entry": "^6.0.1",
+        "@rollup/plugin-node-resolve": "^15.3.0",
+        "@rollup/plugin-strip": "^3.0.4",
+        "@rollup/plugin-terser": "^0.4.4",
+        "@rollup/plugin-typescript": "^12.1.1",
+        "@types/lodash": "^4.17.13",
+        "@types/sprintf-js": "^1.1.4",
+        "autoprefixer": "^10.4.20",
+        "chai": "^5.1.2",
+        "mocha": "^10.8.2",
+        "postcss": "^8.4.49",
+        "rollup": "^4.28.0",
+        "rollup-plugin-node-externals": "^7.1.3",
+        "rollup-plugin-postcss": "^4.0.2",
+        "typescript": "^5.7.2"
+    },
+    "dependencies": {
+        "@astrojs/alpinejs": "^0.4.0",
+        "@astrojs/check": "^0.9.4",
+        "@astrojs/cloudflare": "^11.2.0",
+        "@astrojs/rss": "4.0.9",
+        "@astrojs/sitemap": "3.2.1",
+        "@astrojs/tailwind": "5.1.2",
+        "@astrojs/ts-plugin": "^1.10.4",
+        "@astrojs/vue": "4.5.2",
+        "@iconify-json/fa6-brands": "^1.2.3",
+        "@iconify-json/fa6-solid": "^1.2.2",
+        "@iconify/tools": "^4.0.7",
+        "@keyv/compress-brotli": "^2.0.2",
+        "@types/alpinejs": "^3.13.11",
+        "alpinejs": "^3.14.6",
+        "aos": "3.0.0-beta.6",
+        "astro": "^4.16.16",
+        "astro-icon": "^1.1.4",
+        "astro-integration-kit": "^0.16.1",
+        "cheerio": "^1.0.0",
+        "dayjs": "^1.11.13",
+        "fetch-jsonp": "^1.3.0",
+        "glob": "^11.0.0",
+        "keyv": "^5.2.1",
+        "keyv-lru": "^3.0.4",
+        "lodash": "^4.17.21",
+        "photoswipe": "^5.4.4",
+        "smartmenus": "2.0.0-alpha.1",
+        "sprintf-js": "^1.1.3",
+        "string-strip-html": "^13.4.8",
+        "swiper": "^11.1.15",
+        "tslib": "^2.8.1"
+    }
+}

package/src/components/author_info.astro

@@ -22,8 +22,8 @@ const jeawinapi = new JeawinApi({
   api_path: jeawin_api_path,
 });
 const author_info_html = await jeawinapi.get_author_info({ node_id });
-
-const html = await Astro.slots.render("default", [author_info_html]);
+// console.log(author_info_html);
+// const html = await Astro.slots.render("default", [author_info_html]);
 ---
 
-<Fragment set:html={html} />
+<Fragment set:html={author_info_html} />

package/src/components/baidumap.astro

@@ -24,15 +24,14 @@ const {
 } = Astro.props;
 ---
 
-<input type="hidden" id="map_longitude" value={longitude} />
-<input type="hidden" id="map_latitude" value={latitude} />
-<input type="hidden" id="map_address" value={address} />
-<input
-  type="hidden"
-  id="map_search_info_window_title"
-  value={search_info_window_title}
-/>
-<div id="map" class="map"></div>
+<custom-baidumap
+  data-longitude={longitude}
+  data-latitude={latitude}
+  data-address={address}
+  data-search_info_window_title={search_info_window_title}
+>
+  <div class="map w-full h-[350px]"></div>
+</custom-baidumap>
 <script
   is:inline
   src="https://api.map.baidu.com/api?v=2.0&ak=525d1fe8987ae7254b080b2c62d1c098"
@@ -45,62 +44,67 @@ const {
   rel="stylesheet"
   href="https://api.map.baidu.com/library/SearchInfoWindow/1.5/src/SearchInfoWindow_min.css"
 />
-<script is:inline>
-  window.addEventListener("load", function () {
-    if (typeof BMap != "undefined") {
-      // 百度地图API功能
-      const map = new BMap.Map("map");
-      const longitude = document.querySelector("#map_longitude").value;
-      const latitude = document.querySelector("#map_latitude").value;
-      const address = document.querySelector("#map_address").value;
-      const search_info_window_title = document.querySelector(
-        "#map_search_info_window_title"
-      ).value;
-      const point = new BMap.Point(longitude, latitude);
-      map.centerAndZoom(point, 16);
+<script>
+  import _ from "lodash";
+  class CustomBaidumap extends HTMLElement {
+    constructor() {
+      super();
+
+      // @ts-ignore
+      if (!_.isUndefined(window.BMap)) {
+        // 百度地图API功能
+        // @ts-ignore
+        const map = new window.BMap.Map(this.querySelector(".map"));
+        const longitude = this.dataset.longitude;
+        const latitude = this.dataset.latitude;
+        const address = this.dataset.address;
+        const search_info_window_title = this.dataset.search_info_window_title;
+        // @ts-ignore
+        const point = new window.BMap.Point(longitude, latitude);
+        map.centerAndZoom(point, 16);
 
-      map.enableScrollWheelZoom();
+        map.enableScrollWheelZoom();
 
-      const content =
-        '<div style="margin:0;line-height:20px;padding:2px;">' +
-        "" +
-        address +
-        "</div>";
+        const content =
+          '<div style="margin:0;line-height:20px;padding:2px;">' +
+          "" +
+          address +
+          "</div>";
 
-      //创建检索信息窗口对象
-      var searchInfoWindow = null;
-      searchInfoWindow = new BMapLib.SearchInfoWindow(map, content, {
-        title: search_info_window_title, //标题
-        width: 290, //宽度
-        height: 65, //高度
-        panel: "panel", //检索结果面板
-        enableAutoPan: true, //自动平移
-        searchTypes: [
-          BMAPLIB_TAB_SEARCH, //周边检索
-          BMAPLIB_TAB_TO_HERE, //到这里去
-          BMAPLIB_TAB_FROM_HERE, //从这里出发
-        ],
-      });
-      var marker = new BMap.Marker(point); //创建marker对象
-      marker.enableDragging(); //marker可拖拽
-      marker.addEventListener("click", function (e) {
+        //创建检索信息窗口对象
+        let searchInfoWindow = null;
+        // @ts-ignore
+        searchInfoWindow = new window.BMapLib.SearchInfoWindow(map, content, {
+          title: search_info_window_title, //标题
+          width: 290, //宽度
+          height: 65, //高度
+          panel: "panel", //检索结果面板
+          enableAutoPan: true, //自动平移
+          searchTypes: [
+            // @ts-ignore
+            window.BMAPLIB_TAB_SEARCH, //周边检索
+            // @ts-ignore
+            window.BMAPLIB_TAB_TO_HERE, //到这里去
+            // @ts-ignore
+            window.BMAPLIB_TAB_FROM_HERE, //从这里出发
+          ],
+        });
+        // @ts-ignore
+        const marker = new window.BMap.Marker(point); //创建marker对象
+        marker.enableDragging(); //marker可拖拽
+        marker.addEventListener("click", function () {
+          searchInfoWindow.open(marker);
+        });
         searchInfoWindow.open(marker);
-      });
-      searchInfoWindow.open(marker);
-      map.addOverlay(marker); //在地图中添加marker
+        map.addOverlay(marker); //在地图中添加marker
 
-      // var marker = new BMap.Marker(point);
-      // map.addOverlay(marker);
-      // var infoWindow = new BMap.InfoWindow("地址：厦禾路879号美新广场17楼		<br>电话：(0592)2203787,4009188880		<br>坐标：118.115775,24.473813");  // 创建信息窗口对象
-      // map.openInfoWindow(infoWindow,point); //开启信息窗口
+        // var marker = new BMap.Marker(point);
+        // map.addOverlay(marker);
+        // var infoWindow = new BMap.InfoWindow("地址：厦禾路879号美新广场17楼		<br>电话：(0592)2203787,4009188880		<br>坐标：118.115775,24.473813");  // 创建信息窗口对象
+        // map.openInfoWindow(infoWindow,point); //开启信息窗口
+      }
     }
-  });
-</script>
-<style is:inline>
-  .map {
-    width: 100%;
-    height: 350px;
-    border-top: solid 1px #eee;
-    border-bottom: solid 1px #eee;
   }
-</style>
+
+  customElements.define("custom-baidumap", CustomBaidumap);
+</script>

package/src/components/banner_swiper.astro

@@ -1,119 +1,119 @@
----
-/**
- * banner切换组件
- *
- * jeawin-astro/src/components/banner_swiper.astro
- *
- * @package jeawin-astro
- * @author		Chaegumi
- * @copyright	Copyright (c) 2024-2099 jeawin.com
- * @email		chaegumi@jeawin.com
- * @filesource
- */
-import _ from "lodash";
-import { img_change_attrs, render_value } from "../scripts/util.js";
-import JeawinApi from "../scripts/cms.js";
-
-interface Props {
-  tag_name?: string;
-  style_class?: any;
-}
-
-const { tag_name, style_class } = Astro.props;
-
-const TagName = tag_name || "section";
-let StyleClass: any = [];
-if (style_class) {
-  if (_.isArray(style_class)) {
-    StyleClass = style_class;
-  } else if (_.isString(style_class)) {
-    StyleClass = _.split(style_class, " ");
-  }
-}
-
-const { jeawin_apikey, jeawin_api_domain, jeawin_api_path } = Astro.locals;
-const jeawinapi = new JeawinApi({
-  apikey: jeawin_apikey,
-  api_domain: jeawin_api_domain,
-  api_path: jeawin_api_path,
-});
-const banners = await jeawinapi.get_nodes({ channel_id: 5 });
-// console.log(banners);
----
-
-<custom-banner-swiper>
-  {
-    banners && banners.nodes && banners.nodes.length > 0 ? (
-      <TagName class:list={StyleClass}>
-        <swiper-container
-          class="banner_swiper"
-          init="false"
-          autoplay="true"
-          slides-per-view="1"
-          mousewheel-force-to-axis="true"
-          navigation="true"
-          pagination="true"
-        >
-          {banners.nodes &&
-            banners.nodes.map((banner: any, idx: number) => (
-              <swiper-slide class:list={["swiper-slide", { hidden: idx > 0 }]}>
-                <a
-                  href={render_value(banner, "linkurl")}
-                  title={banner.node_title}
-                >
-                  {idx > 0 ? (
-                    <Fragment
-                      set:html={img_change_attrs(
-                        banner.node_picurl_html,
-                        {
-                          width: "100%",
-                          fetchpriority: "high",
-                        },
-                        ["class", "loading"]
-                      )}
-                    />
-                  ) : (
-                    <Fragment
-                      set:html={img_change_attrs(
-                        banner.node_picurl_html,
-                        {
-                          width: "100%",
-                          class: "",
-                          loading: "",
-                          fetchpriority: "high",
-                        },
-                        ["class", "loading"]
-                      )}
-                    />
-                  )}
-                </a>
-              </swiper-slide>
-            ))}
-        </swiper-container>
-      </TagName>
-    ) : null
-  }
-</custom-banner-swiper>
-<style>
-  .swiper-slide img {
-    object-fit: contain;
-    width: 100%;
-  }
-</style>
-<script>
-  import { initSwiper } from "../scripts/swiper.js";
-
-  class CustomBannerSwiper extends HTMLElement {
-    constructor() {
-      super();
-
-      initSwiper(".banner_swiper");
-
-      document.addEventListener("astro:after-swap", function () {
-        initSwiper(".banner_swiper");
-      });
-    }
-  }
-
-  customElements.define("custom-banner-swiper", CustomBannerSwiper);
-</script>
+---
+/**
+ * banner切换组件
+ *
+ * jeawin-astro/src/components/banner_swiper.astro
+ *
+ * @package jeawin-astro
+ * @author		Chaegumi
+ * @copyright	Copyright (c) 2024-2099 jeawin.com
+ * @email		chaegumi@jeawin.com
+ * @filesource
+ */
+import _ from "lodash";
+import { img_change_attrs, render_value } from "../scripts/util.js";
+import JeawinApi from "../scripts/cms.js";
+
+interface Props {
+  tag_name?: string;
+  style_class?: any;
+}
+
+const { tag_name, style_class } = Astro.props;
+
+const TagName = tag_name || "section";
+let StyleClass: any = [];
+if (style_class) {
+  if (_.isArray(style_class)) {
+    StyleClass = style_class;
+  } else if (_.isString(style_class)) {
+    StyleClass = _.split(style_class, " ");
+  }
+}
+
+const { jeawin_apikey, jeawin_api_domain, jeawin_api_path } = Astro.locals;
+const jeawinapi = new JeawinApi({
+  apikey: jeawin_apikey,
+  api_domain: jeawin_api_domain,
+  api_path: jeawin_api_path,
+});
+const banners = await jeawinapi.get_nodes({ channel_id: 5 });
+// console.log(banners);
+---
+
+<custom-banner-swiper>
+  {
+    banners && banners.nodes && banners.nodes.length > 0 ? (
+      <TagName class:list={StyleClass}>
+        <swiper-container
+          class="banner_swiper"
+          init="false"
+          autoplay="true"
+          slides-per-view="1"
+          mousewheel-force-to-axis="true"
+          navigation="true"
+          pagination="true"
+        >
+          {banners.nodes &&
+            banners.nodes.map((banner: any, idx: number) => (
+              <swiper-slide class:list={["swiper-slide", { hidden: idx > 0 }]}>
+                <a
+                  href={render_value(banner, "linkurl")}
+                  title={banner.node_title}
+                >
+                  {idx > 0 ? (
+                    <Fragment
+                      set:html={img_change_attrs(
+                        banner.node_picurl_html,
+                        {
+                          width: "100%",
+                          fetchpriority: "high",
+                        },
+                        ["class", "loading"]
+                      )}
+                    />
+                  ) : (
+                    <Fragment
+                      set:html={img_change_attrs(
+                        banner.node_picurl_html,
+                        {
+                          width: "100%",
+                          class: "",
+                          loading: "",
+                          fetchpriority: "high",
+                        },
+                        ["class", "loading"]
+                      )}
+                    />
+                  )}
+                </a>
+              </swiper-slide>
+            ))}
+        </swiper-container>
+      </TagName>
+    ) : null
+  }
+</custom-banner-swiper>
+<style>
+  .swiper-slide img {
+    object-fit: contain;
+    width: 100%;
+  }
+</style>
+<script>
+  import { initSwiper } from "../scripts/swiper.js";
+
+  class CustomBannerSwiper extends HTMLElement {
+    constructor() {
+      super();
+
+      initSwiper(".banner_swiper");
+
+      document.addEventListener("astro:after-swap", function () {
+        initSwiper(".banner_swiper");
+      });
+    }
+  }
+
+  customElements.define("custom-banner-swiper", CustomBannerSwiper);
+</script>