1
0
mirror of synced 2026-04-18 06:18:40 +08:00

Compare commits

...

2 Commits

3 changed files with 10 additions and 2 deletions

View File

@@ -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('己卯 庚午 庚寅 辛巳');
});

View File

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

View File

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