v1.7.4 修复极端情况下八字转公历时刻出现遗漏的问题。
This commit is contained in:
@@ -29,3 +29,6 @@
|
|||||||
|
|
||||||
## [1.7.3] - 2025-04-29
|
## [1.7.3] - 2025-04-29
|
||||||
1. 修复身宫报错的问题。
|
1. 修复身宫报错的问题。
|
||||||
|
|
||||||
|
## [1.7.4] - 2025-09-07
|
||||||
|
1. 修复极端情况下八字转公历时刻出现遗漏的问题。
|
||||||
|
|||||||
@@ -249,3 +249,12 @@ test('test28', () => {
|
|||||||
})
|
})
|
||||||
expect(timeList).toStrictEqual(['1987-08-03 02:00:00']);
|
expect(timeList).toStrictEqual(['1987-08-03 02:00:00']);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test('test29', () => {
|
||||||
|
const solarList = Solar.fromBaZi('壬申','壬寅','庚辰','甲申', 1, 1801);
|
||||||
|
const timeList = [];
|
||||||
|
solarList.forEach(solar => {
|
||||||
|
timeList.push(solar.toYmdHms());
|
||||||
|
})
|
||||||
|
expect(timeList).toStrictEqual(['1812-02-18 16:00:00', '1992-03-05 15:00:00']);
|
||||||
|
});
|
||||||
|
|||||||
3
lunar.js
3
lunar.js
@@ -603,6 +603,9 @@
|
|||||||
}
|
}
|
||||||
// 验证一下
|
// 验证一下
|
||||||
var solar = Solar.fromYmdHms(solarTime.getYear(), solarTime.getMonth(), solarTime.getDay(), hour, mi, s);
|
var solar = Solar.fromYmdHms(solarTime.getYear(), solarTime.getMonth(), solarTime.getDay(), hour, mi, s);
|
||||||
|
if (d === 30) {
|
||||||
|
solar = solar.nextHour(-1);
|
||||||
|
}
|
||||||
var lunar = solar.getLunar();
|
var lunar = solar.getLunar();
|
||||||
var dgz = (2 === sect) ? lunar.getDayInGanZhiExact2() : lunar.getDayInGanZhiExact();
|
var dgz = (2 === sect) ? lunar.getDayInGanZhiExact2() : lunar.getDayInGanZhiExact();
|
||||||
if (lunar.getYearInGanZhiExact() === yearGanZhi && lunar.getMonthInGanZhiExact() === monthGanZhi && dgz === dayGanZhi && lunar.getTimeInGanZhi() === timeGanZhi) {
|
if (lunar.getYearInGanZhiExact() === yearGanZhi && lunar.getMonthInGanZhiExact() === monthGanZhi && dgz === dayGanZhi && lunar.getTimeInGanZhi() === timeGanZhi) {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "lunar-javascript",
|
"name": "lunar-javascript",
|
||||||
"version": "1.7.3",
|
"version": "1.7.4",
|
||||||
"description": "lunar是一款无第三方依赖的公历(阳历)、农历(阴历、老黄历)、佛历和道历工具,支持星座、儒略日、干支、生肖、节气、节日、彭祖百忌、每日宜忌、吉神宜趋、凶煞宜忌、吉神(喜神/福神/财神/阳贵神/阴贵神)方位、胎神方位、冲煞、纳音、星宿、八字、五行、十神、建除十二值星、青龙名堂等十二神、黄道日及吉凶等。lunar is a calendar library for Solar and Chinese Lunar.",
|
"description": "lunar是一款无第三方依赖的公历(阳历)、农历(阴历、老黄历)、佛历和道历工具,支持星座、儒略日、干支、生肖、节气、节日、彭祖百忌、每日宜忌、吉神宜趋、凶煞宜忌、吉神(喜神/福神/财神/阳贵神/阴贵神)方位、胎神方位、冲煞、纳音、星宿、八字、五行、十神、建除十二值星、青龙名堂等十二神、黄道日及吉凶等。lunar is a calendar library for Solar and Chinese Lunar.",
|
||||||
"main": "index.js",
|
"main": "index.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|||||||
Reference in New Issue
Block a user