From ac08a66f3c1742f57854bffd2a01831c62ada08d Mon Sep 17 00:00:00 2001 From: wugaoliang Date: Wed, 18 Mar 2020 22:03:07 +0800 Subject: [PATCH] fix: #992 --- components/date-picker/DatePicker.js | 2 +- components/date-picker/IndiaHoliday.js | 45 +++++++++++++++++++++++ components/date-picker/IndiaHoliday.json | 46 ------------------------ 3 files changed, 46 insertions(+), 47 deletions(-) create mode 100644 components/date-picker/IndiaHoliday.js delete mode 100644 components/date-picker/IndiaHoliday.json diff --git a/components/date-picker/DatePicker.js b/components/date-picker/DatePicker.js index cc18e8248..2a49e6a64 100644 --- a/components/date-picker/DatePicker.js +++ b/components/date-picker/DatePicker.js @@ -7,7 +7,7 @@ import DateRangePanel from './DateRangePanel' import WeekRangePanel from './WeekRangePanel' import Provider from '../context' import { getPRCDate, deconstructDate } from './util' -import IndiaHoliday from './IndiaHoliday' +import IndiaHoliday from './IndiaHoliday.js' class DatePicker extends BasePicker { static propTypes = { altCalendar: PropTypes.array, diff --git a/components/date-picker/IndiaHoliday.js b/components/date-picker/IndiaHoliday.js new file mode 100644 index 000000000..dd80315b1 --- /dev/null +++ b/components/date-picker/IndiaHoliday.js @@ -0,0 +1,45 @@ + +export default { + '2020': { + 'IndiaHoliday': [ + {'date': '2020-1-1', 'text': 'New Years', 'FullText': 'New Years Day'}, + {'date': '2020-1-15', 'text': 'MS,Pongal', 'FullText': 'Makar Sankranti,Pongal'}, + {'date': '2020-1-26', 'text': 'Republic', 'FullText': 'Republic Day'}, + {'date': '2020-1-29', 'text': 'VP', 'FullText': 'Vasant Panchami'}, + {'date': '2020-2-9', 'text': 'GRJ', 'FullText': 'Guru Ravidas Jayanti'}, + {'date': '2020-2-18', 'text': 'MDSJ', 'FullText': 'Maharishi Dayanand Saraswati Jayanti'}, + {'date': '2020-2-21', 'text': 'MS-S', 'FullText': 'Maha Shivaratri - Shivaratri'}, + {'date': '2020-3-8', 'text': "H Ali's", 'FullText': "Hazarat Ali's Birthday"}, + {'date': '2020-3-9', 'text': 'HD', 'FullText': 'Holika Dahana'}, + {'date': '2020-3-10', 'text': 'Dolyatra', 'FullText': 'Dolyatra'}, + {'date': '2020-3-12', 'text': 'SJ', 'FullText': 'Shivaji Jayanti'}, + {'date': '2020-3-20', 'text': 'Parsi', 'FullText': 'Parsi New Year'}, + {'date': '2020-3-25', 'text': 'CS', 'FullText': 'Chaitra Sukhladi'}, + {'date': '2020-4-6', 'text': 'MJ', 'FullText': 'Mahavir Jayanti'}, + {'date': '2020-4-10', 'text': 'GF', 'FullText': 'Good Friday'}, + {'date': '2020-4-12', 'text': 'Easter', 'FullText': 'Easter'}, + {'date': '2020-4-13', 'text': 'V,M-V', 'FullText': 'Vaisakhi,Mesadi - Vaisakhadi'}, + {'date': '2020-5-7', 'text': 'BP,Ra', 'FullText': 'Buddha Purnima - Vesak,Birthday of Rabindranath'}, + {'date': '2020-5-22', 'text': 'JUlV', 'FullText': 'Jamat Ul-Vida'}, + {'date': '2020-6-23', 'text': 'RY', 'FullText': 'Rath Yatra'}, + {'date': '2020-8-3 ', 'text': 'RB', 'FullText': 'Raksha Bandhan'}, + {'date': '2020-8-11', 'text': 'Janma', 'FullText': 'Janmashtami'}, + {'date': '2020-8-15', 'text': 'Indep', 'FullText': 'Independence Day'}, + {'date': '2020-8-21', 'text': 'Onam', 'FullText': 'Onam'}, + {'date': '2020-8-22', 'text': 'GCVC', 'FullText': 'Ganesh Chaturthi - Vinayaka Chaturthi'}, + {'date': '2020-8-29', 'text': 'M-A', 'FullText': 'Muharram - Ashura'}, + {'date': '2020-10-2', 'text': 'MGJ', 'FullText': 'Mahatma Gandhi Jayanti'}, + {'date': '2020-10-25', 'text': 'Dusse', 'FullText': 'Dussehra'}, + {'date': '2020-10-29', 'text': 'MuNIeM', 'FullText': 'Milad un-Nabi - Id-e-Milad'}, + {'date': '2020-10-31', 'text': 'aVJ', 'FullText': 'aharishi Valmiki Jayanti'}, + {'date': '2020-11-4', 'text': 'KC', 'FullText': 'Karaka Chaturthi'}, + {'date': '2020-11-14', 'text': 'NC,DD', 'FullText': 'Naraka Chaturdasi,Diwali - Deepavali'}, + {'date': '2020-11-15', 'text': 'GP', 'FullText': 'Govardhan Puja'}, + {'date': '2020-11-16', 'text': 'B-Duj', 'FullText': 'Bhai Duj'}, + {'date': '2020-11-20', 'text': 'C-Puja', 'FullText': 'Chhat Puja'}, + {'date': '2020-11-24', 'text': 'Guru', 'FullText': "Guru Tegh Bahadur's Martyrdom Day"}, + {'date': '2020-12-24', 'text': 'C-Eve', 'FullText': 'Christmas Eve'}, + {'date': '2020-12-25', 'text': 'C-Day', 'FullText': 'Christmas Day'} + ] + } +} diff --git a/components/date-picker/IndiaHoliday.json b/components/date-picker/IndiaHoliday.json deleted file mode 100644 index c1a5c04cd..000000000 --- a/components/date-picker/IndiaHoliday.json +++ /dev/null @@ -1,46 +0,0 @@ - -{ - "2020":{ - "IndiaHoliday":[ - {"date":"2020-1-1","text":"New Years","FullText":"New Years Day"}, - {"date":"2020-1-15","text":"MS,Pongal","FullText":"Makar Sankranti,Pongal"}, - {"date":"2020-1-26","text":"Republic","FullText":"Republic Day"}, - {"date":"2020-1-29","text":"VP","FullText":"Vasant Panchami"}, - {"date":"2020-2-9","text":"GRJ","FullText":"Guru Ravidas Jayanti"}, - {"date":"2020-2-18","text":"MDSJ","FullText":"Maharishi Dayanand Saraswati Jayanti"}, - {"date":"2020-2-21","text":"MS-S","FullText":"Maha Shivaratri - Shivaratri"}, - {"date":"2020-3-8","text":"H Ali's","FullText":"Hazarat Ali's Birthday"}, - {"date":"2020-3-9","text":"HD","FullText":"Holika Dahana"}, - {"date":"2020-3-10","text":"Dolyatra","FullText":"Dolyatra"}, - {"date":"2020-3-12","text":"SJ","FullText":"Shivaji Jayanti"}, - {"date":"2020-3-20","text":"Parsi","FullText":"Parsi New Year"}, - {"date":"2020-3-25","text":"CS","FullText":"Chaitra Sukhladi"}, - {"date":"2020-4-6","text":"MJ","FullText":"Mahavir Jayanti"}, - {"date":"2020-4-10","text":"GF","FullText":"Good Friday"}, - {"date":"2020-4-12","text":"Easter","FullText":"Easter"}, - {"date":"2020-4-13","text":"V,M-V","FullText":"Vaisakhi,Mesadi - Vaisakhadi"}, - {"date":"2020-5-7","text":"BP,Ra","FullText":"Buddha Purnima - Vesak,Birthday of Rabindranath"}, - {"date":"2020-5-22","text":"JUlV","FullText":"Jamat Ul-Vida"}, - {"date":"2020-6-23","text":"RY","FullText":"Rath Yatra"}, - {"date":"2020-8-3 ","text":"RB","FullText":"Raksha Bandhan"}, - {"date":"2020-8-11","text":"Janma","FullText":"Janmashtami"}, - {"date":"2020-8-15","text":"Indep","FullText":"Independence Day"}, - {"date":"2020-8-21","text":"Onam","FullText":"Onam"}, - {"date":"2020-8-22","text":"GCVC","FullText":"Ganesh Chaturthi - Vinayaka Chaturthi"}, - {"date":"2020-8-29","text":"M-A","FullText":"Muharram - Ashura"}, - {"date":"2020-10-2","text":"MGJ","FullText":"Mahatma Gandhi Jayanti"}, - {"date":"2020-10-25","text":"Dusse","FullText":"Dussehra"}, - {"date":"2020-10-29","text":"MuNIeM","FullText":"Milad un-Nabi - Id-e-Milad"}, - {"date":"2020-10-31","text":"aVJ","FullText":"aharishi Valmiki Jayanti"}, - {"date":"2020-11-4","text":"KC","FullText":"Karaka Chaturthi"}, - {"date":"2020-11-14","text":"NC,DD","FullText":"Naraka Chaturdasi,Diwali - Deepavali"}, - {"date":"2020-11-15","text":"GP","FullText":"Govardhan Puja"}, - {"date":"2020-11-16","text":"B-Duj","FullText":"Bhai Duj"}, - {"date":"2020-11-20","text":"C-Puja","FullText":"Chhat Puja"}, - {"date":"2020-11-24","text":"Guru","FullText":"Guru Tegh Bahadur's Martyrdom Day"}, - {"date":"2020-12-24","text":"C-Eve","FullText":"Christmas Eve"}, - {"date":"2020-12-25","text":"C-Day","FullText":"Christmas Day"} - ] - } -} -