v1.2.9 修复儒略日转阳历秒数为60的错误。
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
var {Solar} = require('../lunar');
|
var {Solar, Lunar} = require('../lunar');
|
||||||
|
|
||||||
test('test1', () => {
|
test('test1', () => {
|
||||||
const solar = Solar.fromYmd(1986, 1, 5);
|
const solar = Solar.fromYmd(1986, 1, 5);
|
||||||
@@ -86,3 +86,12 @@ test('test6', () => {
|
|||||||
expect(lunar.getPrevJieQi().getName()).toBe('冬至');
|
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');
|
||||||
|
});
|
||||||
|
|||||||
8
lunar.js
8
lunar.js
@@ -65,6 +65,14 @@
|
|||||||
f -= minute;
|
f -= minute;
|
||||||
f *= 60;
|
f *= 60;
|
||||||
var second = Math.round(f);
|
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);
|
return _fromYmdHms(year,month,day,hour,minute,second);
|
||||||
};
|
};
|
||||||
var _fromYmdHms = function(y,m,d,hour,minute,second){
|
var _fromYmdHms = function(y,m,d,hour,minute,second){
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "lunar-javascript",
|
"name": "lunar-javascript",
|
||||||
"version": "1.2.8",
|
"version": "1.2.9",
|
||||||
"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": {
|
||||||
|
|||||||
Reference in New Issue
Block a user