lxm_front/lunar-javascript
1
0
Fork 0
mirror of synced 2025-12-24 14:08:02 +08:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
6tail
2022-01-10 20:40:20 +08:00
parent 1e7f33e048
commit 26557902f6
3 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
__tests__/SolarWeek.test.js
View File

@@ -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);
});

15
lunar.js
View File

@@ -1659,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(){
@@ -1726,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);
},
/**
* 周推移
@@ -3469,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--;

2
package.json
View File

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