v1.3.1 修复八字转阳历极端情况下仍然有遗漏的问题。
This commit is contained in:
@@ -177,3 +177,7 @@ test('test11', () => {
|
|||||||
expect(eightChar.getDay()).toBe('庚子');
|
expect(eightChar.getDay()).toBe('庚子');
|
||||||
expect(eightChar.getTime()).toBe('戊子');
|
expect(eightChar.getTime()).toBe('戊子');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test('test12', () => {
|
||||||
|
expect(Solar.fromYmdHms('1999', '06', '07', '09', '11', '00').getLunar().getEightChar().toString()).toBe('己卯 庚午 庚寅 辛巳');
|
||||||
|
});
|
||||||
|
|||||||
6
lunar.js
6
lunar.js
@@ -514,9 +514,13 @@
|
|||||||
offsetYear += 60;
|
offsetYear += 60;
|
||||||
}
|
}
|
||||||
var startYear = today.getYear() - offsetYear - 1;
|
var startYear = today.getYear() - offsetYear - 1;
|
||||||
while (startYear >= baseYear) {
|
while (true) {
|
||||||
years.push(startYear);
|
years.push(startYear);
|
||||||
startYear -= 60;
|
startYear -= 60;
|
||||||
|
if (startYear < baseYear) {
|
||||||
|
years.push(baseYear);
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
var hour = 0;
|
var hour = 0;
|
||||||
var timeZhi = timeGanZhi.substr(1);
|
var timeZhi = timeGanZhi.substr(1);
|
||||||
|
|||||||
Reference in New Issue
Block a user