Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
10e8041f21 | ||
|
|
5ab29be0bf | ||
|
|
9e159c109f | ||
|
|
4e66c329b6 |
11
CHANGELOG.md
Normal file
11
CHANGELOG.md
Normal file
@@ -0,0 +1,11 @@
|
||||
# Changelog
|
||||
|
||||
|
||||
## [1.6.10] - 2024-02-06
|
||||
1. 八字转阳历结果按时间先后排序,转换速度大幅提升。
|
||||
|
||||
## [1.6.11] - 2024-02-29
|
||||
1. 修复节气当天获取下一节气仍为当前节气的问题。
|
||||
2. 完善package.json中author信息。
|
||||
3. 修复每日宜忌存在重复项的问题。
|
||||
4. 修复八字转阳历存在遗漏的问题。
|
||||
@@ -196,7 +196,7 @@ test('test19', () => {
|
||||
solarList.forEach(solar => {
|
||||
timeList.push(solar.toYmdHms());
|
||||
})
|
||||
expect(timeList).toStrictEqual(['1997-03-12 18:00:00', '1937-03-27 18:00:00']);
|
||||
expect(timeList).toStrictEqual(['1937-03-27 18:00:00', '1997-03-12 18:00:00']);
|
||||
});
|
||||
|
||||
|
||||
|
||||
@@ -108,3 +108,9 @@ test('test10', () => {
|
||||
const lunar = Lunar.fromYmd(2023, 6, 1);
|
||||
expect(lunar.getJieQiTable()['冬至'].toYmdHms()).toBe('2022-12-22 05:48:11');
|
||||
});
|
||||
|
||||
test('test11', () => {
|
||||
const lunar = Solar.fromYmd(2024, 2, 4).getLunar();
|
||||
expect(lunar.getPrevJie(true).getName()).toBe('立春');
|
||||
expect(lunar.getNextJie(true).getName()).toBe('惊蛰');
|
||||
});
|
||||
|
||||
@@ -63,7 +63,7 @@ test('16', () => {
|
||||
solarList.forEach(solar => {
|
||||
timeList.push(solar.toYmdHms());
|
||||
})
|
||||
expect(timeList).toStrictEqual(['1976-09-21 12:00:00', '1916-10-06 12:00:00']);
|
||||
expect(timeList).toStrictEqual(['1916-10-06 12:00:00', '1976-09-21 12:00:00']);
|
||||
});
|
||||
|
||||
test('17', () => {
|
||||
@@ -72,7 +72,7 @@ test('17', () => {
|
||||
solarList.forEach(solar => {
|
||||
timeList.push(solar.toYmdHms());
|
||||
})
|
||||
expect(timeList).toStrictEqual(['1999-07-21 16:00:00', '1939-08-05 16:00:00']);
|
||||
expect(timeList).toStrictEqual(['1939-08-05 16:00:00', '1999-07-21 16:00:00']);
|
||||
});
|
||||
|
||||
test('18', () => {
|
||||
@@ -81,7 +81,7 @@ test('18', () => {
|
||||
solarList.forEach(solar => {
|
||||
timeList.push(solar.toYmdHms());
|
||||
})
|
||||
expect(timeList).toStrictEqual(['1960-12-17 12:00:00', '1901-01-01 12:00:00']);
|
||||
expect(timeList).toStrictEqual(['1901-01-01 12:00:00', '1960-12-17 12:00:00']);
|
||||
});
|
||||
|
||||
test('19', () => {
|
||||
@@ -90,7 +90,7 @@ test('19', () => {
|
||||
solarList.forEach(solar => {
|
||||
timeList.push(solar.toYmdHms());
|
||||
})
|
||||
expect(timeList).toStrictEqual(['2020-07-21 22:00:00', '1960-08-05 22:00:00']);
|
||||
expect(timeList).toStrictEqual(['1960-08-05 22:00:00', '2020-07-21 22:00:00']);
|
||||
});
|
||||
|
||||
test('20', () => {
|
||||
@@ -109,12 +109,12 @@ test('22', () => {
|
||||
});
|
||||
|
||||
test('23', () => {
|
||||
const solarList = Solar.fromBaZi('癸卯', '甲寅', '癸丑', '甲子', 2, 1843);
|
||||
const solarList = Solar.fromBaZi('癸卯', '甲寅', '甲寅', '甲子', 2, 1843);
|
||||
const timeList = [];
|
||||
solarList.forEach(solar => {
|
||||
timeList.push(solar.toYmdHms());
|
||||
})
|
||||
expect(timeList).toStrictEqual(['2023-02-24 23:00:00', '1843-02-08 23:00:00']);
|
||||
expect(timeList).toStrictEqual(['1843-02-09 00:00:00', '2023-02-25 00:00:00']);
|
||||
});
|
||||
|
||||
test('24', () => {
|
||||
@@ -123,7 +123,7 @@ test('24', () => {
|
||||
solarList.forEach(solar => {
|
||||
timeList.push(solar.toYmdHms());
|
||||
})
|
||||
expect(timeList).toStrictEqual(['1960-01-15 16:00:00', '1900-01-29 16:00:00']);
|
||||
expect(timeList).toStrictEqual(['1900-01-29 16:00:00', '1960-01-15 16:00:00']);
|
||||
});
|
||||
|
||||
test('25', () => {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "lunar-javascript",
|
||||
"version": "1.6.9",
|
||||
"description": "lunar is a calendar library for Solar and Chinese Lunar.",
|
||||
"version": "1.6.11",
|
||||
"description": "lunar是一款无第三方依赖的公历(阳历)、农历(阴历、老黄历)、佛历和道历工具,支持星座、儒略日、干支、生肖、节气、节日、彭祖百忌、每日宜忌、吉神宜趋、凶煞宜忌、吉神(喜神/福神/财神/阳贵神/阴贵神)方位、胎神方位、冲煞、纳音、星宿、八字、五行、十神、建除十二值星、青龙名堂等十二神、黄道日及吉凶等。lunar is a calendar library for Solar and Chinese Lunar.",
|
||||
"main": "index.js",
|
||||
"scripts": {
|
||||
"test": "jest"
|
||||
@@ -42,7 +42,7 @@
|
||||
"青龙名堂等十二神",
|
||||
"黄道黑道日"
|
||||
],
|
||||
"author": "6tail",
|
||||
"author": "6tail <6tail@6tail.cn> (https://6tail.cn)",
|
||||
"license": "MIT",
|
||||
"bugs": {
|
||||
"url": "https://github.com/6tail/lunar-javascript/issues"
|
||||
|
||||
Reference in New Issue
Block a user