提交 25fbb6ba 编写于 作者: KK's avatar KK

日历部件调整

上级 ad0cddc9
...@@ -167,13 +167,6 @@ import moment from 'moment'; ...@@ -167,13 +167,6 @@ import moment from 'moment';
*/ */
public count :number = 20; public count :number = 20;
/**
* 是否有选中某天
*
* @type {number}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
public isSelect: boolean = false;
/** /**
* 获取单项树 * 获取单项树
...@@ -268,7 +261,6 @@ import moment from 'moment'; ...@@ -268,7 +261,6 @@ import moment from 'moment';
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}
*/ */
protected prev(year: any, month: any, weekIndex: any) { protected prev(year: any, month: any, weekIndex: any) {
this.isSelect = true;
if(this.calendarStyle == "month_timeline" || this.calendarStyle == "month"){ if(this.calendarStyle == "month_timeline" || this.calendarStyle == "month"){
this.selectday(year, month, this.day); this.selectday(year, month, this.day);
this.formatData(new Date(year+'/'+month+'/'+'1')); this.formatData(new Date(year+'/'+month+'/'+'1'));
...@@ -284,7 +276,6 @@ import moment from 'moment'; ...@@ -284,7 +276,6 @@ import moment from 'moment';
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}
*/ */
protected next(year: any, month: any, weekIndex: any) { protected next(year: any, month: any, weekIndex: any) {
this.isSelect = true;
if(this.calendarStyle == "month_timeline" || this.calendarStyle == "month" ){ if(this.calendarStyle == "month_timeline" || this.calendarStyle == "month" ){
this.selectday(year, month, this.day); this.selectday(year, month, this.day);
this.formatData(new Date(year+'/'+month+'/'+'1')); this.formatData(new Date(year+'/'+month+'/'+'1'));
...@@ -353,7 +344,6 @@ import moment from 'moment'; ...@@ -353,7 +344,6 @@ import moment from 'moment';
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}
*/ */
protected selectYear(year: any) { protected selectYear(year: any) {
this.isSelect = true;
this.value = [year, this.month, this.day]; this.value = [year, this.month, this.day];
this.formatData(new Date(year+'/'+this.month+'/'+this.day)); this.formatData(new Date(year+'/'+this.month+'/'+this.day));
} }
...@@ -364,7 +354,6 @@ import moment from 'moment'; ...@@ -364,7 +354,6 @@ import moment from 'moment';
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}
*/ */
protected selectMonth(month: any, year: any) { protected selectMonth(month: any, year: any) {
this.isSelect = true;
this.selectday(year, month, this.day); this.selectday(year, month, this.day);
this.formatData(new Date(year+'/'+month+'/'+this.day)); this.formatData(new Date(year+'/'+month+'/'+this.day));
} }
...@@ -395,19 +384,14 @@ import moment from 'moment'; ...@@ -395,19 +384,14 @@ import moment from 'moment';
this.start = (moment as any)(curtime).startOf('day').format('YYYY-MM-DD HH:mm:ss'); this.start = (moment as any)(curtime).startOf('day').format('YYYY-MM-DD HH:mm:ss');
this.end = (moment as any)(curtime).endOf('day').format('YYYY-MM-DD HH:mm:ss'); this.end = (moment as any)(curtime).endOf('day').format('YYYY-MM-DD HH:mm:ss');
</#if> </#if>
if(this.isSelect){ <#if ctrl.getCalendarStyle() == 'MONTH' || ctrl.getCalendarStyle() == 'MONTH_TIMELINE' || ctrl.getCalendarStyle() == 'TIMELINE'>
this.start = (moment as any)(curtime).startOf('day').format('YYYY-MM-DD HH:mm:ss'); this.start = (moment as any)(curtime).startOf('month').format('YYYY-MM-DD HH:mm:ss');
this.end = (moment as any)(curtime).endOf('day').format('YYYY-MM-DD HH:mm:ss'); this.end = (moment as any)(curtime).endOf('month').format('YYYY-MM-DD HH:mm:ss');
}else{ </#if>
<#if ctrl.getCalendarStyle() == 'MONTH' || ctrl.getCalendarStyle() == 'MONTH_TIMELINE' || ctrl.getCalendarStyle() == 'TIMELINE'> <#if ctrl.getCalendarStyle() == 'WEEK' || ctrl.getCalendarStyle() == 'WEEK_TIMELINE'>
this.start = (moment as any)(curtime).startOf('month').format('YYYY-MM-DD HH:mm:ss'); this.start = (moment as any)(curtime).startOf('week').format('YYYY-MM-DD HH:mm:ss');
this.end = (moment as any)(curtime).endOf('month').format('YYYY-MM-DD HH:mm:ss'); this.end = (moment as any)(curtime).endOf('week').format('YYYY-MM-DD HH:mm:ss');
</#if> </#if>
<#if ctrl.getCalendarStyle() == 'WEEK' || ctrl.getCalendarStyle() == 'WEEK_TIMELINE'>
this.start = (moment as any)(curtime).startOf('week').format('YYYY-MM-DD HH:mm:ss');
this.end = (moment as any)(curtime).endOf('week').format('YYYY-MM-DD HH:mm:ss');
</#if>
}
this.load(Object.assign(data, { this.load(Object.assign(data, {
"start": this.start, "start": this.start,
"end": this.end "end": this.end
...@@ -557,7 +541,6 @@ import moment from 'moment'; ...@@ -557,7 +541,6 @@ import moment from 'moment';
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}
*/ */
protected clickDay(data: any) { protected clickDay(data: any) {
this.isSelect = true;
if (data) { if (data) {
let temptime = new Date(data); let temptime = new Date(data);
this.year = temptime.getFullYear(); this.year = temptime.getFullYear();
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册