jekyll-zeta 0.9.17 → 0.9.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8bd46a233c132a633e0ba426d464460273fbcfffa520d4803324ea495b996a37
-  data.tar.gz: d793bbed01415f67e92101dad5348905bfba818499c09e031bf133b3dcfce787
+  metadata.gz: 48218f35cd6ea372bbe59540aedee23be204e78316ed890aaf388e87d8ac21c2
+  data.tar.gz: ab582042969267aa38eff75c514458785adee59c44536ec19e8627a129070b7c
 SHA512:
-  metadata.gz: 0b85a2f1a239ecdf6ff5ffecdbb394349678551f2833c8442635991058c9ebd0f08f82565901ac943482a5b925d483fd2d44b933b560b511ae70ef049e316dd0
-  data.tar.gz: f9b455eb201241f93cd4b457d3a3e02e6f273b32ea59c86686ab78e2a4d61d50639691629d5037ae3f8f82ba17590e612d7992ae2a4f2af28a9cc12de7c8b797
+  metadata.gz: 42182868f066083c74e2937a5d0ed44b10a3a8653f9573a06c0d526f00ab480dcf2d179cb7e5b80f0094f0d73067e11f91417a36cb81e5c318576e6370b6dcbc
+  data.tar.gz: 3837ac31d91770f3c6cd01d810516a8035a4832b11323f8eac610d9d0bf6ebf108dcc557fa8717662ead1a03890a840f3e734b8cb45783198b72c44dd3444a4f

data/_includes/getmapdata.js

@@ -2,6 +2,15 @@
 (function () {
   var g_id = 100;
 
+  function normalizeYmd(ymd){
+    if (ymd) {
+      const arr = ymd.split('-')
+      return `${arr[0]}-${arr[1].padStart(2,'0')}-${arr[2].padStart(2,'0')}`
+    }
+
+    return ymd
+  }
+
 
   function getConfigFromStr(str,obj){
     if (str && str.startsWith('#')) {
@@ -19,16 +28,63 @@
     return 0
   }
 
+
+
+  function date2ymd(t) {
+    let m = t.getMonth() + 1;
+    let d = t.getDate();
+    return `${t.getFullYear()}-${m < 10 ? "0" + m : m}-${d < 10 ? "0" + d : d}`;
+  }
   /// 2025-01-01 描述，日期格式yyyy-mm-dd，空格后跟上 描述
   function getDataFromSignleLine(str0,gData) {
+    if(!str0) return null
     let str = str0.trim()
     if (!str) return null
 
-    if(getConfigFromStr(str,gData)) return null
+    if(gData && getConfigFromStr(str,gData)) return null
 
 
     var arr = str.split(" ")
     var date0 = arr[0]
+    date0 = date0.replace('～','~')
+    if (gData && date0.indexOf("~") > 0) {
+      let arrRg = date0.split('~')
+      let beginYmd = arrRg[0]
+      let endYmd = arrRg[1]
+      let dateBegin = new Date(normalizeYmd(beginYmd))
+      if (!dateBegin || isNaN(dateBegin)) {
+        
+        return
+      }
+      let rangCount = 7
+      if(endYmd){
+         let dend = new Date(normalizeYmd(endYmd))
+         if (dend && !isNaN(dend)) {
+          rangCount = Math.floor((dend.getTime() - dateBegin.getTime())/ 86400000) + 1
+         }
+         
+      }else{
+        rangCount =  Math.floor((Date.now() - dateBegin.getTime())/ 86400000) + 1;
+        if(rangCount > 7) rangCount =7
+      }
+ 
+      const desc = arr.slice(1).join(' ')
+      
+      let resultArr = []
+      for (let i  = 0; i  < rangCount; i ++) {
+        const ymd = date2ymd(new Date(dateBegin.getTime() + i * 86400000))
+        const newStr = ymd + ' ' + desc
+        const newEle = getDataFromSignleLine(newStr)
+        if(newEle){
+          resultArr.push(newEle)
+        }
+      }
+      return resultArr.length ? resultArr : null
+
+    }
+
+
+
     let date = ''
     if (date0) {
       let ymd = date0.split("-")
@@ -114,12 +170,24 @@
     strData.split("\n").forEach(function (str,idx) {
       if(idx == 0) return 
       let item = getDataFromSignleLine(str,dataObj)
-      fillDataObj(dataObj, item)
-      if (item) {
-        if (item.date >= Recent365YMD) {
-          Recent365Count++
+      if (item && Array.isArray(item)) {
+        item.forEach(e=>{
+          fillDataObj(dataObj, e)
+          if (e) {
+            if (e.date >= Recent365YMD) {
+              Recent365Count++
+            }
+          }
+        })
+      }else{
+        fillDataObj(dataObj, item)
+        if (item) {
+          if (item.date >= Recent365YMD) {
+            Recent365Count++
+          }
         }
       }
+      
     })
 
 

data/_includes/heatmap_svg.js

@@ -45,7 +45,6 @@
   const TodayIdx =
     DayCount - Math.floor((endStamp - new Date(date2ymd(new Date))) / (24 * 3600000));
 
-  console.log('xxxxx',Math.floor((endStamp - Date.now()) / (24 * 3600000)));
 
   const beginIdx = !dateBegin ? -1 : DayCount - Math.floor((endStamp - dateBegin.getTime()) / (24 * 3600000));
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-zeta
 version: !ruby/object:Gem::Version
-  version: 0.9.17
+  version: 0.9.21
 platform: ruby
 authors:
 - vitock
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-19 00:00:00.000000000 Z
+date: 2025-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll