From f57c4887a6c979aa9238656919110e7350885df7 Mon Sep 17 00:00:00 2001 From: 6tail <6tail@6tail.cn> Date: Wed, 5 Mar 2025 21:13:21 +0800 Subject: [PATCH] =?UTF-8?q?v1.7.1=20=E8=B0=83=E6=95=B4=E6=AF=8F=E6=97=A5?= =?UTF-8?q?=E5=AE=9C=E5=BF=8C=E7=9A=84=E9=BB=98=E8=AE=A4=E6=B5=81=E6=B4=BE?= =?UTF-8?q?=EF=BC=9B=E6=9B=B4=E6=96=B02018=E4=B9=8B=E5=90=8E=E7=9A=84?= =?UTF-8?q?=E2=96=B3T=E5=8F=82=E6=95=B0=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 4 ++++ __tests__/JieQi.test.js | 4 ++-- lunar.js | 10 ++++++---- package.json | 2 +- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3c28cff..7d358dc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,3 +19,7 @@ ## [1.7.0] - 2025-02-12 1. 修复每日宜忌错别字。 2. 去除每日宜忌的重复项。 + +## [1.7.1] - 2025-03-05 +1. 调整每日宜忌的默认流派。 +2. 更新2018之后的△T参数。 diff --git a/__tests__/JieQi.test.js b/__tests__/JieQi.test.js index 7d6fd0c..80acfd2 100644 --- a/__tests__/JieQi.test.js +++ b/__tests__/JieQi.test.js @@ -93,7 +93,7 @@ test('test7', () => { test('test8', () => { const lunar = Lunar.fromYmd(2050, 12, 1); - expect(lunar.getJieQiTable()['DA_XUE'].toYmdHms()).toBe('2050-12-07 06:41:13'); + expect(lunar.getJieQiTable()['DA_XUE'].toYmdHms()).toBe('2050-12-07 06:40:53'); }); test('test9', () => { @@ -106,7 +106,7 @@ test('test9', () => { test('test10', () => { const lunar = Lunar.fromYmd(2023, 6, 1); - expect(lunar.getJieQiTable()['冬至'].toYmdHms()).toBe('2022-12-22 05:48:11'); + expect(lunar.getJieQiTable()['冬至'].toYmdHms()).toBe('2022-12-22 05:48:01'); }); test('test11', () => { diff --git a/lunar.js b/lunar.js index 43284e9..b36a587 100644 --- a/lunar.js +++ b/lunar.js @@ -1455,14 +1455,14 @@ getDayYi:function(sect){ sect *= 1; if(isNaN(sect)){ - sect = 2; + sect = 1; } return LunarUtil.getDayYi(2 === sect ? this.getMonthInGanZhiExact() : this.getMonthInGanZhi(), this.getDayInGanZhi()); }, getDayJi:function(sect){ sect *= 1; if(isNaN(sect)){ - sect = 2; + sect = 1; } return LunarUtil.getDayJi(2 === sect ? this.getMonthInGanZhiExact() : this.getMonthInGanZhi(), this.getDayInGanZhi()); }, @@ -3039,8 +3039,10 @@ 2000, 63.87, 0.1, 0, 0, 2005, 64.7, 0.21, 0, 0, 2012, 66.8, 0.22, 0, 0, - 2018, 69.0, 0.36, 0, 0, - 2028, 72.6 + 2018, 73.6, 0.40, 0, 0, + 2021, 78.1, 0.44, 0, 0, + 2024, 83.1, 0.55, 0, 0, + 2028, 98.6 ], XL0:[ 10000000000, diff --git a/package.json b/package.json index f177a7f..b3fd60e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lunar-javascript", - "version": "1.7.0", + "version": "1.7.1", "description": "lunar是一款无第三方依赖的公历(阳历)、农历(阴历、老黄历)、佛历和道历工具,支持星座、儒略日、干支、生肖、节气、节日、彭祖百忌、每日宜忌、吉神宜趋、凶煞宜忌、吉神(喜神/福神/财神/阳贵神/阴贵神)方位、胎神方位、冲煞、纳音、星宿、八字、五行、十神、建除十二值星、青龙名堂等十二神、黄道日及吉凶等。lunar is a calendar library for Solar and Chinese Lunar.", "main": "index.js", "scripts": {