Roy.Liu 4 years ago
parent
commit
a0432ca461
  1. 6
      typescript/index.ts

6
typescript/index.ts

@ -141,12 +141,9 @@ import { EditorIconCheckCombo } from "./case/combo/editoriconcheckcombo/combo.ed
import { IconTextValueCombo } from './case/combo/icontextvaluecombo/combo.icontextvalue'; import { IconTextValueCombo } from './case/combo/icontextvaluecombo/combo.icontextvalue';
import { ListView } from './base/list/listview'; import { ListView } from './base/list/listview';
import { FloatCenterLayout } from './core/wrapper/layout/middle/middle.float.center'; import { FloatCenterLayout } from './core/wrapper/layout/middle/middle.float.center';
<<<<<<< HEAD
import { _msg } from './base/foundation/message'; import { _msg } from './base/foundation/message';
import { _web } from './core/platform/web'; import { _web } from './core/platform/web';
=======
import { DynamicYearMonthPopup } from './widget/yearmonth/popup.yearmonth'; import { DynamicYearMonthPopup } from './widget/yearmonth/popup.yearmonth';
>>>>>>> 6719cf4a69338c554f8e06c51d91a74c6b66e71e
type ClassConstructor<T extends {}> = T & { type ClassConstructor<T extends {}> = T & {
@ -303,11 +300,8 @@ export interface BI extends _func, _i18n, _base, _inject, _var, _web {
IconTextValueCombo: typeof IconTextValueCombo; IconTextValueCombo: typeof IconTextValueCombo;
ListView: typeof ListView; ListView: typeof ListView;
FloatCenterLayout: typeof FloatCenterLayout; FloatCenterLayout: typeof FloatCenterLayout;
<<<<<<< HEAD
Msg: _msg; Msg: _msg;
=======
DynamicYearMonthPopup: typeof DynamicYearMonthPopup; DynamicYearMonthPopup: typeof DynamicYearMonthPopup;
>>>>>>> 6719cf4a69338c554f8e06c51d91a74c6b66e71e
} }
export default { export default {

Loading…
Cancel
Save