|
|
@ -14,8 +14,7 @@ import { |
|
|
|
getQuarter |
|
|
|
getQuarter |
|
|
|
} from "@/core"; |
|
|
|
} from "@/core"; |
|
|
|
import { DynamicYearQuarterTrigger } from "./trigger.yearquarter"; |
|
|
|
import { DynamicYearQuarterTrigger } from "./trigger.yearquarter"; |
|
|
|
// TODO:需要等待yearmonth完成才能将BI.DynamicYearMonthTrigger替换
|
|
|
|
import { DynamicYearMonthCombo } from "../yearmonth/combo.yearmonth"; |
|
|
|
// import { DynamicYearMonthCombo } from "../yearmonth/combo.yearmonth";
|
|
|
|
|
|
|
|
import { DynamicYearQuarterPopup } from "./popup.yearquarter"; |
|
|
|
import { DynamicYearQuarterPopup } from "./popup.yearquarter"; |
|
|
|
import { DynamicDateCombo } from "../dynamicdate"; |
|
|
|
import { DynamicDateCombo } from "../dynamicdate"; |
|
|
|
import { Combo, IconButton } from "@/base"; |
|
|
|
import { Combo, IconButton } from "@/base"; |
|
|
@ -75,7 +74,7 @@ export class DynamicYearQuarterCombo extends Widget { |
|
|
|
}); |
|
|
|
}); |
|
|
|
this.trigger.on(DynamicYearQuarterTrigger.EVENT_VALID, () => { |
|
|
|
this.trigger.on(DynamicYearQuarterTrigger.EVENT_VALID, () => { |
|
|
|
this.comboWrapper.element.removeClass("error"); |
|
|
|
this.comboWrapper.element.removeClass("error"); |
|
|
|
this.fireEvent(BI.DynamicYearMonthCombo.EVENT_VALID); |
|
|
|
this.fireEvent(DynamicYearMonthCombo.EVENT_VALID); |
|
|
|
}); |
|
|
|
}); |
|
|
|
this.trigger.on(DynamicYearQuarterTrigger.EVENT_CONFIRM, () => { |
|
|
|
this.trigger.on(DynamicYearQuarterTrigger.EVENT_CONFIRM, () => { |
|
|
|
const dateStore = this.storeTriggerValue; |
|
|
|
const dateStore = this.storeTriggerValue; |
|
|
@ -142,7 +141,7 @@ export class DynamicYearQuarterCombo extends Widget { |
|
|
|
action: () => { |
|
|
|
action: () => { |
|
|
|
const date = getDate(); |
|
|
|
const date = getDate(); |
|
|
|
this.setValue({ |
|
|
|
this.setValue({ |
|
|
|
type: BI.DynamicYearMonthCombo.Static, |
|
|
|
type: DynamicYearMonthCombo.Static, |
|
|
|
value: { |
|
|
|
value: { |
|
|
|
year: date.getFullYear(), |
|
|
|
year: date.getFullYear(), |
|
|
|
quarter: getQuarter(date), |
|
|
|
quarter: getQuarter(date), |
|
|
|