v1.2.12 恢复Lunar中的getOtherFestivals方法并更改为传统节日。
This commit is contained in:
18
lunar.js
18
lunar.js
@@ -930,6 +930,19 @@
|
|||||||
}
|
}
|
||||||
return l;
|
return l;
|
||||||
},
|
},
|
||||||
|
getOtherFestivals:function(){
|
||||||
|
var l = [];
|
||||||
|
var fs = LunarUtil.OTHER_FESTIVAL[this._p.month+'-'+this._p.day];
|
||||||
|
if(fs){
|
||||||
|
for(var i=0,j=fs.length;i<j;i++){
|
||||||
|
l.push(fs[i]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if(this._p.solar.toYmd()===this._p.jieQi['清明'].next(-1).toYmd()){
|
||||||
|
l.push('寒食节');
|
||||||
|
}
|
||||||
|
return l;
|
||||||
|
},
|
||||||
getBaZi:function(){
|
getBaZi:function(){
|
||||||
var bz = this.getEightChar();
|
var bz = this.getEightChar();
|
||||||
var l = [];
|
var l = [];
|
||||||
@@ -1334,6 +1347,10 @@
|
|||||||
for(i=0,j=festivals.length;i<j;i++){
|
for(i=0,j=festivals.length;i<j;i++){
|
||||||
s += ' ('+festivals[i]+')';
|
s += ' ('+festivals[i]+')';
|
||||||
}
|
}
|
||||||
|
festivals = this.getOtherFestivals();
|
||||||
|
for(i=0,j=festivals.length;i<j;i++){
|
||||||
|
s += ' ('+festivals[i]+')';
|
||||||
|
}
|
||||||
var jq = this.getJieQi();
|
var jq = this.getJieQi();
|
||||||
if(jq.length>0){
|
if(jq.length>0){
|
||||||
s += ' ['+jq+']';
|
s += ' ['+jq+']';
|
||||||
@@ -2368,6 +2385,7 @@
|
|||||||
GONG:{'角':'东','井':'南','奎':'西','斗':'北','亢':'东','鬼':'南','娄':'西','牛':'北','氐':'南','柳':'南','胃':'西','女':'北','房':'东','星':'南','昴':'西','虚':'北','心':'东','张':'南','毕':'西','危':'北','尾':'东','翼':'南','觜':'西','室':'北','箕':'东','轸':'南','参':'西','壁':'北' },
|
GONG:{'角':'东','井':'南','奎':'西','斗':'北','亢':'东','鬼':'南','娄':'西','牛':'北','氐':'南','柳':'南','胃':'西','女':'北','房':'东','星':'南','昴':'西','虚':'北','心':'东','张':'南','毕':'西','危':'北','尾':'东','翼':'南','觜':'西','室':'北','箕':'东','轸':'南','参':'西','壁':'北' },
|
||||||
SHOU:{'东':'青龙','南':'朱雀','西':'白虎','北':'玄武'},
|
SHOU:{'东':'青龙','南':'朱雀','西':'白虎','北':'玄武'},
|
||||||
FESTIVAL:{'1-1':'春节','1-15':'元宵节','2-2':'龙头节','5-5':'端午节','7-7':'七夕节','8-15':'中秋节','9-9':'重阳节','12-8':'腊八节'},
|
FESTIVAL:{'1-1':'春节','1-15':'元宵节','2-2':'龙头节','5-5':'端午节','7-7':'七夕节','8-15':'中秋节','9-9':'重阳节','12-8':'腊八节'},
|
||||||
|
OTHER_FESTIVAL:{'1-4':['接神日'],'1-5':['隔开日'],'1-7':['人日'],'1-8':['谷日','顺星节'],'1-9':['天日'],'1-10':['地日'],'1-20':['天穿节'],'1-25':['填仓节'],'1-30':['正月晦'],'2-1':['中和节'],'2-2':['春社'],'3-3':['上巳节'],'5-20':['分龙节'],'5-25':['会龙节'],'6-6':['天贶节'],'6-24':['观莲节'],'6-25':['五谷母节'],'7-14':['中元节'],'7-22':['财神节'],'7-29':['地藏节'],'8-1':['天灸日'],'10-1':['寒衣节'],'10-10':['十成节'],'10-15':['下元节'],'12-7':['驱傩日'],'12-16':['尾牙'],'12-24':['祭灶日']},
|
||||||
CHONG:{'子':'午','丑':'未','寅':'申','卯':'酉','辰':'戌','巳':'亥','午':'子','未':'丑','申':'寅','酉':'卯','戌':'辰','亥':'巳'},
|
CHONG:{'子':'午','丑':'未','寅':'申','卯':'酉','辰':'戌','巳':'亥','午':'子','未':'丑','申':'寅','酉':'卯','戌':'辰','亥':'巳'},
|
||||||
CHONG_GAN:{'甲':'戊','乙':'己','丙':'庚','丁':'辛','戊':'壬','己':'癸','庚':'甲','辛':'乙','壬':'丙','癸':'丁'},
|
CHONG_GAN:{'甲':'戊','乙':'己','丙':'庚','丁':'辛','戊':'壬','己':'癸','庚':'甲','辛':'乙','壬':'丙','癸':'丁'},
|
||||||
CHONG_GAN_BAD:{'庚':'甲','辛':'乙','壬':'丙','癸':'丁'},
|
CHONG_GAN_BAD:{'庚':'甲','辛':'乙','壬':'丙','癸':'丁'},
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "lunar-javascript",
|
"name": "lunar-javascript",
|
||||||
"version": "1.2.11",
|
"version": "1.2.12",
|
||||||
"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