From 90f59ec8f9becce1fd365d9aa8bc981874976427 Mon Sep 17 00:00:00 2001 From: 6tail <6tail@6tail.cn> Date: Wed, 8 Dec 2021 21:18:53 +0800 Subject: [PATCH] =?UTF-8?q?v1.2.17=20=E4=BD=9B=E5=8E=86=E6=96=B0=E5=A2=9E2?= =?UTF-8?q?7=E5=AE=BF=EF=BC=9B=E4=BF=AE=E5=A4=8D=E5=AE=9C=E5=BF=8C?= =?UTF-8?q?=E9=87=8D=E5=A4=8D=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=9B=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E8=8E=B7=E5=8F=96=E6=B0=94=E6=97=B6=E7=BC=BA=E5=86=AC?= =?UTF-8?q?=E8=87=B3=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- __tests__/Foto.test.js | 15 +++++++++++++++ __tests__/JieQi.test.js | 8 ++++++++ lunar.js | 39 +++++++++++++++++++++++++++++++++------ package.json | 2 +- 5 files changed, 58 insertions(+), 8 deletions(-) create mode 100644 __tests__/Foto.test.js diff --git a/README.md b/README.md index f0ff5a3..3a899f1 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # lunar [![License](https://img.shields.io/badge/license-MIT-4EB1BA.svg?style=flat-square)](https://github.com/6tail/lunar-javascript/blob/master/LICENSE) -lunar是一款无第三方依赖的公历(阳历)和农历(阴历、老黄历)工具，支持星座、儒略日、干支、生肖、节气、节日、彭祖百忌、每日宜忌、吉神宜趋、凶煞宜忌、吉神(喜神/福神/财神/阳贵神/阴贵神)方位、胎神方位、冲煞、纳音、星宿、八字、五行、十神、建除十二值星、青龙名堂等十二神、黄道日及吉凶等。 +lunar是一款无第三方依赖的公历(阳历)、农历(阴历、老黄历)、佛历和道历工具，支持星座、儒略日、干支、生肖、节气、节日、彭祖百忌、每日宜忌、吉神宜趋、凶煞宜忌、吉神(喜神/福神/财神/阳贵神/阴贵神)方位、胎神方位、冲煞、纳音、星宿、八字、五行、十神、建除十二值星、青龙名堂等十二神、黄道日及吉凶等。 [English](https://github.com/6tail/lunar-javascript/blob/master/README_EN.md) diff --git a/__tests__/Foto.test.js b/__tests__/Foto.test.js new file mode 100644 index 0000000..0f9f3a9 --- /dev/null +++ b/__tests__/Foto.test.js @@ -0,0 +1,15 @@ +var {Foto, Lunar} = require('../lunar'); + +test('test1()', () => { + const foto = Foto.fromLunar(Lunar.fromYmd(2021, 10, 14)); + expect(foto.toFullString()).toBe('二五六五年十月十四 (三元降) (四天王巡行)'); +}); + +test('test2()', () => { + const foto = Foto.fromLunar(Lunar.fromYmd(2020, 4, 13)); + expect(foto.getXiu()).toBe('氐'); + expect(foto.getZheng()).toBe('土'); + expect(foto.getAnimal()).toBe('貉'); + expect(foto.getGong()).toBe('东'); + expect(foto.getShou()).toBe('青龙'); +}); diff --git a/__tests__/JieQi.test.js b/__tests__/JieQi.test.js index c4d703f..0420660 100644 --- a/__tests__/JieQi.test.js +++ b/__tests__/JieQi.test.js @@ -95,3 +95,11 @@ test('test8', () => { const lunar = Lunar.fromYmd(2050, 12, 1); expect(lunar.getJieQiTable()['大雪'].toYmdHms()).toBe('2050-12-07 06:41:00'); }); + +test('test9', () => { + const solar = Solar.fromYmd(2021, 12, 21); + const lunar = solar.getLunar(); + expect(lunar.getJieQi()).toBe('冬至'); + expect(lunar.getJie()).toBe(''); + expect(lunar.getQi()).toBe('冬至'); +}); diff --git a/lunar.js b/lunar.js index ae58116..cce4512 100644 --- a/lunar.js +++ b/lunar.js @@ -859,8 +859,8 @@ }, getJie:function(){ var d,jie=''; - for(var i=1,j=Lunar.JIE_QI.length;i