From 30da87688c595c0b6e57006f08b06ed97c7b82be Mon Sep 17 00:00:00 2001 From: 6tail <6tail@6tail.cn> Date: Wed, 20 Oct 2021 20:08:12 +0800 Subject: [PATCH] =?UTF-8?q?v1.2.9=20=E4=BF=AE=E5=A4=8D=E5=84=92=E7=95=A5?= =?UTF-8?q?=E6=97=A5=E8=BD=AC=E9=98=B3=E5=8E=86=E7=A7=92=E6=95=B0=E4=B8=BA?= =?UTF-8?q?60=E7=9A=84=E9=94=99=E8=AF=AF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- __tests__/JieQi.test.js | 11 ++++++++++- lunar.js | 8 ++++++++ package.json | 2 +- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/__tests__/JieQi.test.js b/__tests__/JieQi.test.js index 3537ac4..c4d703f 100644 --- a/__tests__/JieQi.test.js +++ b/__tests__/JieQi.test.js @@ -1,4 +1,4 @@ -var {Solar} = require('../lunar'); +var {Solar, Lunar} = require('../lunar'); test('test1', () => { const solar = Solar.fromYmd(1986, 1, 5); @@ -86,3 +86,12 @@ test('test6', () => { expect(lunar.getPrevJieQi().getName()).toBe('冬至'); }); +test('test7', () => { + const lunar = Lunar.fromYmd(2012, 9, 1); + expect(lunar.getJieQiTable()['白露'].toYmdHms()).toBe('2012-09-07 13:29:00'); +}); + +test('test8', () => { + const lunar = Lunar.fromYmd(2050, 12, 1); + expect(lunar.getJieQiTable()['大雪'].toYmdHms()).toBe('2050-12-07 06:41:00'); +}); diff --git a/lunar.js b/lunar.js index 0407a99..5e7019d 100644 --- a/lunar.js +++ b/lunar.js @@ -65,6 +65,14 @@ f -= minute; f *= 60; var second = Math.round(f); + if(second>59){ + second-=60; + minute++; + } + if(minute>59){ + minute-=60; + hour++; + } return _fromYmdHms(year,month,day,hour,minute,second); }; var _fromYmdHms = function(y,m,d,hour,minute,second){ diff --git a/package.json b/package.json index dcd23cd..c0d9ac7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lunar-javascript", - "version": "1.2.8", + "version": "1.2.9", "description": "lunar is a calendar library for Solar and Chinese Lunar.", "main": "index.js", "scripts": {