diff --git a/src/case/pager/pager.all.count.js b/src/case/pager/pager.all.count.js
index dcfa40002..52fb3be70 100644
--- a/src/case/pager/pager.all.count.js
+++ b/src/case/pager/pager.all.count.js
@@ -12,7 +12,7 @@ import {
     HorizontalAlign,
     isNotEmptyObject
 } from "@/core";
-import { SmallTextEditor } from "@/widget/editor/editor.text.small";
+import { SmallTextEditor, TextEditor } from "@/widget";
 
 /**
  * 有总页数和总行数的分页控件
@@ -100,8 +100,7 @@ export class AllCountPager extends Widget {
             invisible: pages <= 1,
         });
 
-        //  TODO:需等到TextEditor 完成es6化后才可替换BI.TextEditor
-        this.editor.on(BI.TextEditor.EVENT_CONFIRM, () => {
+        this.editor.on(TextEditor.EVENT_CONFIRM, () => {
             this.pager.setValue(parseInt(this.editor.getValue()));
             this.fireEvent(AllCountPager.EVENT_CHANGE);
         });
diff --git a/src/widget/yearquarter/combo.yearquarter.js b/src/widget/yearquarter/combo.yearquarter.js
index 7ce72d6fb..38f956360 100644
--- a/src/widget/yearquarter/combo.yearquarter.js
+++ b/src/widget/yearquarter/combo.yearquarter.js
@@ -14,8 +14,7 @@ import {
     getQuarter
 } from "@/core";
 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 { DynamicDateCombo } from "../dynamicdate";
 import { Combo, IconButton } from "@/base";
@@ -75,7 +74,7 @@ export class DynamicYearQuarterCombo extends Widget {
         });
         this.trigger.on(DynamicYearQuarterTrigger.EVENT_VALID, () => {
             this.comboWrapper.element.removeClass("error");
-            this.fireEvent(BI.DynamicYearMonthCombo.EVENT_VALID);
+            this.fireEvent(DynamicYearMonthCombo.EVENT_VALID);
         });
         this.trigger.on(DynamicYearQuarterTrigger.EVENT_CONFIRM, () => {
             const dateStore = this.storeTriggerValue;
@@ -142,7 +141,7 @@ export class DynamicYearQuarterCombo extends Widget {
                             action: () => {
                                 const date = getDate();
                                 this.setValue({
-                                    type: BI.DynamicYearMonthCombo.Static,
+                                    type: DynamicYearMonthCombo.Static,
                                     value: {
                                         year: date.getFullYear(),
                                         quarter: getQuarter(date),
diff --git a/src/widget/yearquarter/popup.yearquarter.js b/src/widget/yearquarter/popup.yearquarter.js
index f134f384e..4a1d13d1f 100644
--- a/src/widget/yearquarter/popup.yearquarter.js
+++ b/src/widget/yearquarter/popup.yearquarter.js
@@ -14,8 +14,7 @@ import {
 import { DynamicYearQuarterCombo } from "./combo.yearquarter";
 import { TextButton, Tab } from "@/base";
 import { DynamicDateCombo, DynamicDatePopup, DynamicDateHelper } from "../dynamicdate";
-//  TODO:需要等待year完成才能将BI.DynamicYearCard替换
-// import { DynamicYearCard } from "../year/card.dynamic.year";
+import { DynamicYearCard } from "../year/card.dynamic.year";
 import { LinearSegment } from "@/case";
 import { DynamicYearQuarterCard } from "./card.dynamic.yearquarter";
 import { StaticYearQuarterCard } from "./card.static.yearquarter";
@@ -228,7 +227,7 @@ export class DynamicYearQuarterPopup extends Widget {
                         max: this.options.max,
                         listeners: [
                             {
-                                eventName: BI.DynamicYearCard.EVENT_CHANGE,
+                                eventName: DynamicYearCard.EVENT_CHANGE,
                                 action: () => {
                                     this.fireEvent(
                                         DynamicYearQuarterPopup.EVENT_CHANGE
diff --git a/src/widget/yearquarter/trigger.yearquarter.js b/src/widget/yearquarter/trigger.yearquarter.js
index cd31a3908..4020036c5 100644
--- a/src/widget/yearquarter/trigger.yearquarter.js
+++ b/src/widget/yearquarter/trigger.yearquarter.js
@@ -21,8 +21,7 @@ import {
 import { Trigger, TextButton } from "@/base";
 import { TriggerIconButton, SignEditor } from "@/case";
 import { DynamicDateHelper } from "../dynamicdate";
-//  TODO:需要等待yearmonth完成才能将BI.DynamicYearMonthTrigger替换
-// import { DynamicYearMonthTrigger } from "../yearmonth/trigger.yearmonth";
+import { DynamicYearMonthTrigger } from "../yearmonth/trigger.yearmonth";
 import { DynamicYearQuarterCombo } from "./combo.yearquarter";
 
 @shortcut()
@@ -221,7 +220,7 @@ export class DynamicYearQuarterTrigger extends Trigger {
                         o.max
                     )[0]
                 ) {
-                    this.fireEvent(BI.DynamicYearMonthTrigger.EVENT_VALID);
+                    this.fireEvent(DynamicYearMonthTrigger.EVENT_VALID);
                 }
             }
         });