v1.2.26 修复SolarWeek获取当月第几周的错误。

__tests__/SolarWeek.test.js

@@ -19,3 +19,15 @@ test('testFromSunday', () => {
   expect(week.getFirstDay().toString()).toBe('2019-04-28');
   expect(week.getFirstDayInMonth().toString()).toBe('2019-05-01');
 });
+
+test('test1', () => {
+  const start = 0;
+  const week = SolarWeek.fromYmd(2022, 5, 1, start);
+  expect(week.getIndex()).toBe(1);
+});
+
+test('test2', () => {
+  const start = 2;
+  const week = SolarWeek.fromYmd(2021, 5, 4, start);
+  expect(week.getIndex()).toBe(2);
+});

lunar.js

@@ -983,59 +983,51 @@
         },
         _convertJieQi:function(name){
           var jq = name;
-          if('DONG_ZHI'===jq){
+          if('DONG_ZHI' === jq){
             jq = '冬至';
-          }else if('DA_HAN'===jq){
+          }else if('DA_HAN' === jq){
             jq = '大寒';
-          }else if('XIAO_HAN'===jq){
+          }else if('XIAO_HAN' === jq){
             jq = '小寒';
-          }else if('LI_CHUN'===jq){
+          }else if('LI_CHUN' === jq){
             jq = '立春';
-          }else if('DA_XUE'===jq){
+          }else if('DA_XUE' === jq){
             jq = '大雪';
-          }else if('YU_SHUI'===jq){
+          }else if('YU_SHUI' === jq){
             jq = '雨水';
-          }else if('JING_ZHE'===jq){
+          }else if('JING_ZHE' === jq){
             jq = '惊蛰';
           }
           return jq;
         },
         getJie:function(){
-          var d;
-          var jie='';
-          for(var i=0,j=Lunar.JIE_QI_IN_USE.length;i<j;i+=2){
+          for(var i=0, j=Lunar.JIE_QI_IN_USE.length; i<j; i+=2){
             var key = Lunar.JIE_QI_IN_USE[i];
-            d = this._p.jieQi[key];
-            if(d.getYear()===this._p.solar.getYear()&&d.getMonth()===this._p.solar.getMonth()&&d.getDay()===this._p.solar.getDay()){
-              jie=key;
-              break;
+            var d = this._p.jieQi[key];
+            if(d.getYear() === this._p.solar.getYear() && d.getMonth() === this._p.solar.getMonth() && d.getDay() === this._p.solar.getDay()){
+              return this._convertJieQi(key);
             }
           }
-          return this._convertJieQi(jie);
+          return '';
         },
         getQi:function(){
-          var d;
-          var qi='';
-          for(var i=1,j=Lunar.JIE_QI_IN_USE.length;i<j;i+=2){
+          for(var i=1, j=Lunar.JIE_QI_IN_USE.length; i<j; i+=2){
             var key = Lunar.JIE_QI_IN_USE[i];
-            d = this._p.jieQi[key];
-            if(d.getYear()===this._p.solar.getYear()&&d.getMonth()===this._p.solar.getMonth()&&d.getDay()===this._p.solar.getDay()){
-              qi=key;
-              break;
+            var d = this._p.jieQi[key];
+            if(d.getYear() === this._p.solar.getYear() && d.getMonth() === this._p.solar.getMonth() && d.getDay() === this._p.solar.getDay()){
+              return this._convertJieQi(key);
             }
           }
-          return this._convertJieQi(qi);
+          return '';
         },
         getJieQi:function(){
-          var name = '';
           for(var key in this._p.jieQi){
             var d = this._p.jieQi[key];
-            if(d.getYear()==this._p.solar.getYear()&&d.getMonth()==this._p.solar.getMonth()&&d.getDay()==this._p.solar.getDay()){
-              name = key;
-              break;
+            if(d.getYear() === this._p.solar.getYear() && d.getMonth() === this._p.solar.getMonth() && d.getDay() === this._p.solar.getDay()){
+              return this._convertJieQi(key);
             }
           }
-          return this._convertJieQi(name);
+          return '';
         },
         getWeek:function(){
           return this._p.weekIndex;
@@ -1429,16 +1421,33 @@
           return this._buildJieQi(name, near);
         },
         getCurrentJieQi:function(){
-          var name = this.getJieQi();
-          return name.length>0 ? this._buildJieQi(name,this._p.solar) : null;
+          for(var key in this._p.jieQi){
+            var d = this._p.jieQi[key];
+            if(d.getYear() === this._p.solar.getYear() && d.getMonth() === this._p.solar.getMonth() && d.getDay() === this._p.solar.getDay()){
+              return this._buildJieQi(this._convertJieQi(key), d);
+            }
+          }
+          return null;
         },
         getCurrentJie:function(){
-          var name = this.getJie();
-          return name.length>0 ? this._buildJieQi(name,this._p.solar) : null;
+          for(var i=0, j=Lunar.JIE_QI_IN_USE.length; i<j; i+=2){
+            var key = Lunar.JIE_QI_IN_USE[i];
+            var d = this._p.jieQi[key];
+            if(d.getYear() === this._p.solar.getYear() && d.getMonth() === this._p.solar.getMonth() && d.getDay() === this._p.solar.getDay()){
+              return this._buildJieQi(this._convertJieQi(key), d);
+            }
+          }
+          return null;
         },
         getCurrentQi:function(){
-          var name = this.getQi();
-          return name.length>0 ? this._buildJieQi(name,this._p.solar) : null;
+          for(var i=1, j=Lunar.JIE_QI_IN_USE.length; i<j; i+=2){
+            var key = Lunar.JIE_QI_IN_USE[i];
+            var d = this._p.jieQi[key];
+            if(d.getYear() === this._p.solar.getYear() && d.getMonth() === this._p.solar.getMonth() && d.getDay() === this._p.solar.getDay()){
+              return this._buildJieQi(this._convertJieQi(key), d);
+            }
+          }
+          return null;
         },
         getEightChar:function(){
           if(!this._p.eightChar){
@@ -1650,10 +1659,8 @@
         getHou:function(){
           var jieQi = this.getPrevJieQi(true);
           var name = jieQi.getName();
-          var currentCalendar = ExactDate.fromYmd(this._p.solar.getYear(),this._p.solar.getMonth(),this._p.solar.getDay());
           var startSolar = jieQi.getSolar();
-          var startCalendar = ExactDate.fromYmd(startSolar.getYear(),startSolar.getMonth(),startSolar.getDay());
-          var days = days = ExactDate.getDaysBetween(startCalendar, currentCalendar);
+          var days = days = ExactDate.getDaysBetweenYmd(startSolar.getYear(),startSolar.getMonth(),startSolar.getDay(), this._p.solar.getYear(),this._p.solar.getMonth(),this._p.solar.getDay());
           return name + ' ' + LunarUtil.HOU[(Math.floor(days/5)) % LunarUtil.HOU.length];
         },
         getDayLu:function(){
@@ -1717,10 +1724,11 @@
         getIndex:function(){
           var firstDate = ExactDate.fromYmd(this._p.year,this._p.month,1);
           var firstDayWeek = firstDate.getDay();
-          if(firstDayWeek===0){
-            firstDayWeek = 7;
+          var offset = firstDayWeek - this._p.start;
+          if(offset < 0) {
+            offset += 7;
           }
-          return Math.ceil((this._p.day+firstDayWeek-this._p.start)/7);
+          return Math.ceil((this._p.day + offset)/7);
         },
         /**
          * 周推移
@@ -3460,10 +3468,8 @@
             const startTimeZhiIndex = (start.getHour() === 23) ? 11 : LunarUtil.getTimeZhiIndex(start.toYmdHms().substr(11, 5));
             // 时辰差
             var hourDiff = endTimeZhiIndex - startTimeZhiIndex;
-            var endCalendar = ExactDate.fromYmd(end.getYear(), end.getMonth(), end.getDay());
-            var startCalendar = ExactDate.fromYmd(start.getYear(), start.getMonth(), start.getDay());
             // 天数差
-            var dayDiff = Math.floor((endCalendar - startCalendar) / (1000 * 3600 * 24));
+            var dayDiff = ExactDate.getDaysBetweenYmd(start.getYear(), start.getMonth(), start.getDay(), end.getYear(), end.getMonth(), end.getDay());
             if (hourDiff < 0) {
               hourDiff += 12;
               dayDiff--;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "lunar-javascript",
-  "version": "1.2.24",
+  "version": "1.2.26",
   "description": "lunar is a calendar library for Solar and Chinese Lunar.",
   "main": "index.js",
   "scripts": {