fix(globalConfig): 导出位置由ng-devui/utils/globalConfig 变更为 ng-devui/utils (

#204)
DevCloudFE · May 9, 2022 · 2ec2986 · 2ec2986
1 parent a830145
commit 2ec2986
Show file tree

Hide file tree

Showing 25 changed files with 48 additions and 37 deletions.
diff --git a/devui/accordion/accordion.component.ts b/devui/accordion/accordion.component.ts
@@ -11,7 +11,7 @@ import {
   TemplateRef
 } from '@angular/core';
 import { I18nInterface, I18nService } from 'ng-devui/i18n';
-import { DevConfigService, WithConfig } from 'ng-devui/utils/globalConfig';
+import { DevConfigService, WithConfig } from 'ng-devui/utils';
 import { Subscription } from 'rxjs';
 import { ACCORDION } from './accordion-token';
 import { AccordionItemClickEvent, AccordionMenuToggleEvent, AccordionMenuType, AccordionOptions } from './accordion.type';

diff --git a/devui/auto-complete/auto-complete.directive.ts b/devui/auto-complete/auto-complete.directive.ts
@@ -23,8 +23,14 @@ import {
 import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
 import { I18nInterface, I18nService } from 'ng-devui/i18n';
 import { PositionService } from 'ng-devui/position';
-import { addClassToOrigin, AppendToBodyDirection, AppendToBodyDirectionsConfig, removeClassFromOrigin } from 'ng-devui/utils';
-import { DevConfigService, WithConfig } from 'ng-devui/utils/globalConfig';
+import {
+  addClassToOrigin,
+  AppendToBodyDirection,
+  AppendToBodyDirectionsConfig,
+  DevConfigService,
+  removeClassFromOrigin,
+  WithConfig
+} from 'ng-devui/utils';
 import { fromEvent, Observable, of, Subject, Subscription } from 'rxjs';
 import { debounceTime, filter, map, switchMap, takeUntil, tap } from 'rxjs/operators';
 import { AutoCompleteConfig } from './auto-complete-config';

diff --git a/devui/cascader/cascader.component.ts b/devui/cascader/cascader.component.ts
@@ -6,7 +6,7 @@ import {
 import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
 import { DropDownAppendToBodyComponent, DropDownDirective } from 'ng-devui/dropdown';
 import { I18nInterface, I18nService } from 'ng-devui/i18n';
-import { DevConfigService, WithConfig } from 'ng-devui/utils/globalConfig';
+import { DevConfigService, WithConfig } from 'ng-devui/utils';
 import { Observable, Subject, Subscription } from 'rxjs';
 import { debounceTime, distinctUntilChanged, filter, takeUntil } from 'rxjs/operators';
 import { CascaderService } from './cascader.service';

diff --git a/devui/checkbox/checkbox-group.component.ts b/devui/checkbox/checkbox-group.component.ts
@@ -12,7 +12,7 @@ import {
   ControlValueAccessor,
   NG_VALUE_ACCESSOR
 } from '@angular/forms';
-import { DevConfigService, WithConfig } from 'ng-devui/utils/globalConfig';
+import { DevConfigService, WithConfig } from 'ng-devui/utils';
 import { isArray } from 'lodash-es';
 import { Observable } from 'rxjs';
 

diff --git a/devui/checkbox/checkbox.component.ts b/devui/checkbox/checkbox.component.ts
@@ -11,7 +11,7 @@ import {
   TemplateRef
 } from '@angular/core';
 import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
-import { DevConfigService, WithConfig } from 'ng-devui/utils/globalConfig';
+import { DevConfigService, WithConfig } from 'ng-devui/utils';
 import { Observable } from 'rxjs';
 
 @Component({

diff --git a/devui/datepicker/date-range-picker.directive.ts b/devui/datepicker/date-range-picker.directive.ts
@@ -23,11 +23,12 @@ import {
   addClassToOrigin,
   DateConverter,
   DefaultDateConverter,
+  DevConfigService,
   fadeInOut,
   formWithDropDown,
-  removeClassFromOrigin
+  removeClassFromOrigin,
+  WithConfig
 } from 'ng-devui/utils';
-import { DevConfigService, WithConfig } from 'ng-devui/utils/globalConfig';
 import { fromEvent, Subscription } from 'rxjs';
 import { debounceTime, filter, map } from 'rxjs/operators';
 import { DatePickerConfigService as DatePickerConfig } from './date-picker.config.service';

diff --git a/devui/datepicker/datepicker.directive.ts b/devui/datepicker/datepicker.directive.ts
@@ -27,9 +27,10 @@ import {
   AnimationDuration,
   DateConverter,
   DefaultDateConverter,
-  removeClassFromOrigin
+  DevConfigService,
+  removeClassFromOrigin,
+  WithConfig
 } from 'ng-devui/utils';
-import { DevConfigService, WithConfig } from 'ng-devui/utils/globalConfig';
 import { fromEvent, Observable, Subscription } from 'rxjs';
 import { debounceTime, filter, map } from 'rxjs/operators';
 import { SelectDateChangeEventArgs, SelectDateChangeReason } from './date-change-event-args.model';

diff --git a/devui/datepicker/two-datepicker/two-datepicker.component.ts b/devui/datepicker/two-datepicker/two-datepicker.component.ts
@@ -14,8 +14,7 @@ import {
   ViewChild
 } from '@angular/core';
 import { I18nInterface, I18nService } from 'ng-devui/i18n';
-import { DateConverter, DefaultDateConverter, fadeInOut } from 'ng-devui/utils';
-import { DevConfigService, WithConfig } from 'ng-devui/utils/globalConfig';
+import { DateConverter, DefaultDateConverter, DevConfigService, fadeInOut, WithConfig } from 'ng-devui/utils';
 import { Subject, Subscription } from 'rxjs';
 import { distinctUntilChanged } from 'rxjs/operators';
 import { DatePickerConfigService as DatePickerConfig } from '../date-picker.config.service';

diff --git a/devui/dropdown/dropdown.directive.ts b/devui/dropdown/dropdown.directive.ts
@@ -5,8 +5,7 @@ import {
   OnChanges, OnDestroy, Optional, Output, QueryList, SimpleChanges,
   SkipSelf
 } from '@angular/core';
-import { addClassToOrigin, formWithDropDown, removeClassFromOrigin } from 'ng-devui/utils';
-import { DevConfigService, WithConfig } from 'ng-devui/utils/globalConfig';
+import { addClassToOrigin, DevConfigService, formWithDropDown, removeClassFromOrigin, WithConfig } from 'ng-devui/utils';
 import { fromEvent, merge, Observable, ReplaySubject, Subscription } from 'rxjs';
 import { debounceTime, filter, mapTo, tap } from 'rxjs/operators';
 import { DropDownService } from './dropdown.service';

diff --git a/devui/editable-select/editable-select.component.ts b/devui/editable-select/editable-select.component.ts
@@ -18,8 +18,7 @@ import {
 import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
 import { AutoCompleteDirective } from 'ng-devui/auto-complete';
 import { I18nInterface, I18nService } from 'ng-devui/i18n';
-import { AppendToBodyDirection } from 'ng-devui/utils';
-import { DevConfigService, WithConfig } from 'ng-devui/utils/globalConfig';
+import { AppendToBodyDirection, DevConfigService, WithConfig } from 'ng-devui/utils';
 import { Observable, Subscription } from 'rxjs';
 
 @Component({

diff --git a/devui/modal/dialog.service.ts b/devui/modal/dialog.service.ts
@@ -7,7 +7,7 @@ import {
   Renderer2, RendererFactory2
 } from '@angular/core';
 import { OverlayContainerRef } from 'ng-devui/overlay-container';
-import { DevConfigService } from 'ng-devui/utils/globalConfig';
+import { DevConfigService } from 'ng-devui/utils';
 import { assign, isUndefined } from 'lodash-es';
 import { ModalContainerComponent } from './modal-container.component';
 import { ModalComponent } from './modal.component';

diff --git a/devui/modal/modal.service.ts b/devui/modal/modal.service.ts
@@ -6,7 +6,7 @@ import {
   Renderer2, RendererFactory2
 } from '@angular/core';
 import { OverlayContainerRef } from 'ng-devui/overlay-container';
-import { DevConfigService } from 'ng-devui/utils/globalConfig';
+import { DevConfigService } from 'ng-devui/utils';
 import { assign, isUndefined } from 'lodash-es';
 import { ModalComponent } from './modal.component';
 import { IModalOptions } from './modal.types';

diff --git a/devui/multi-auto-complete/multi-auto-complete.component.ts b/devui/multi-auto-complete/multi-auto-complete.component.ts
@@ -16,8 +16,13 @@ import {
 } from '@angular/core';
 import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
 import { AutoCompleteDirective, AutoCompletePopupComponent } from 'ng-devui/auto-complete';
-import { addClassToOrigin, AppendToBodyDirection, removeClassFromOrigin } from 'ng-devui/utils';
-import { DevConfigService, WithConfig } from 'ng-devui/utils/globalConfig';
+import {
+  addClassToOrigin,
+  AppendToBodyDirection,
+  DevConfigService,
+  removeClassFromOrigin,
+  WithConfig
+} from 'ng-devui/utils';
 import { Observable, of } from 'rxjs';
 
 @Component({

diff --git a/devui/panel/panel.component.ts b/devui/panel/panel.component.ts
@@ -9,8 +9,7 @@ import {
   Input,
   Output
 } from '@angular/core';
-import { expandCollapseForDomDestroy } from 'ng-devui/utils';
-import { DevConfigService, WithConfig } from 'ng-devui/utils/globalConfig';
+import { DevConfigService, expandCollapseForDomDestroy, WithConfig } from 'ng-devui/utils';
 import { Observable } from 'rxjs';
 import { PanelBodyComponent } from './panel-body.component';
 import { PanelFooterComponent } from './panel-footer.component';

diff --git a/devui/popover/popover.directive.ts b/devui/popover/popover.directive.ts
@@ -13,7 +13,7 @@ import {
   ViewContainerRef
 } from '@angular/core';
 import { OverlayContainerRef } from 'ng-devui/overlay-container';
-import { DevConfigService, WithConfig } from 'ng-devui/utils/globalConfig';
+import { DevConfigService, WithConfig } from 'ng-devui/utils';
 import { fromEvent, Subject, Subscription } from 'rxjs';
 import { debounceTime, filter, map, takeUntil } from 'rxjs/operators';
 import { PopoverComponent } from './popover.component';

diff --git a/devui/select/select.component.ts b/devui/select/select.component.ts
@@ -35,11 +35,12 @@ import {
   addClassToOrigin,
   AppendToBodyDirection,
   AppendToBodyDirectionsConfig,
+  DevConfigService,
   fadeInOut,
   formWithDropDown,
-  removeClassFromOrigin
+  removeClassFromOrigin,
+  WithConfig
 } from 'ng-devui/utils';
-import { DevConfigService, WithConfig } from 'ng-devui/utils/globalConfig';
 import { WindowRef } from 'ng-devui/window-ref';
 import { BehaviorSubject, fromEvent, Observable, of, Subscription } from 'rxjs';
 import { debounceTime, filter, map, switchMap } from 'rxjs/operators';

diff --git a/devui/tags-input/tags.input.component.ts b/devui/tags-input/tags.input.component.ts
@@ -16,7 +16,7 @@ import {
 import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
 import { I18nInterface, I18nService } from 'ng-devui/i18n';
 import { ToggleMenuContainerComponent, ToggleMenuListComponent, ToggleMenuSearchComponent } from 'ng-devui/toggle-menu';
-import { DevConfigService, WithConfig } from 'ng-devui/utils/globalConfig';
+import { DevConfigService, WithConfig } from 'ng-devui/utils';
 import { isEmpty } from 'lodash-es';
 import { BehaviorSubject, fromEvent, Observable, of, Subscription } from 'rxjs';
 import { debounceTime, map, switchMap } from 'rxjs/operators';

diff --git a/devui/time-picker/time-picker.component.ts b/devui/time-picker/time-picker.component.ts
@@ -25,12 +25,13 @@ import {
   addClassToOrigin,
   AppendToBodyDirection,
   AppendToBodyDirectionsConfig,
+  DevConfigService,
   fadeInOut,
   formWithDropDown,
   removeClassFromOrigin,
-  unshiftString
+  unshiftString,
+  WithConfig
 } from 'ng-devui/utils';
-import { DevConfigService, WithConfig } from 'ng-devui/utils/globalConfig';
 import { fromEvent, Observable, Subscription } from 'rxjs';
 import { debounceTime, filter, map } from 'rxjs/operators';
 

diff --git a/devui/toggle-menu/toggle-menu-container.component.ts b/devui/toggle-menu/toggle-menu-container.component.ts
@@ -28,11 +28,12 @@ import {
   addClassToOrigin,
   AppendToBodyDirection,
   AppendToBodyDirectionsConfig,
+  DevConfigService,
   fadeInOut,
   formWithDropDown,
-  removeClassFromOrigin
+  removeClassFromOrigin,
+  WithConfig
 } from 'ng-devui/utils';
-import { DevConfigService, WithConfig } from 'ng-devui/utils/globalConfig';
 import { WindowRef } from 'ng-devui/window-ref';
 import { ToggleMenuListComponent } from './toggle-menu-list.component';
 

diff --git a/devui/toggle-menu/toggle-menu-operation.component.ts b/devui/toggle-menu/toggle-menu-operation.component.ts
@@ -1,5 +1,5 @@
 import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from '@angular/core';
-import { DevConfigService, WithConfig } from 'ng-devui/utils/globalConfig';
+import { DevConfigService, WithConfig } from 'ng-devui/utils';
 
 @Component({
   selector: 'd-toggle-menu-operation',

diff --git a/devui/tooltip/tooltip.directive.ts b/devui/tooltip/tooltip.directive.ts
@@ -11,7 +11,7 @@ import {
   SimpleChanges
 } from '@angular/core';
 import { OverlayContainerRef } from 'ng-devui/overlay-container';
-import { DevConfigService, WithConfig } from 'ng-devui/utils/globalConfig';
+import { DevConfigService, WithConfig } from 'ng-devui/utils';
 import { fromEvent, Subject } from 'rxjs';
 import { debounceTime, filter, map, takeUntil } from 'rxjs/operators';
 import { TooltipComponent } from './tooltip.component';

diff --git a/devui/tree-select/tree-select.component.ts b/devui/tree-select/tree-select.component.ts
@@ -19,8 +19,7 @@ import {
 import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
 import { I18nInterface, I18nService } from 'ng-devui/i18n';
 import { ICheckboxInput, ITreeItem, OperableTreeComponent, TreeNode } from 'ng-devui/tree';
-import { addClassToOrigin, removeClassFromOrigin } from 'ng-devui/utils';
-import { DevConfigService, WithConfig } from 'ng-devui/utils/globalConfig';
+import { addClassToOrigin, DevConfigService, removeClassFromOrigin, WithConfig } from 'ng-devui/utils';
 import { Subject, Subscription } from 'rxjs';
 import { debounceTime, distinctUntilChanged, takeUntil } from 'rxjs/operators';
 import DefaultIcons from './tree-default-icons';

diff --git a/devui/tree/operable-tree.component.ts b/devui/tree/operable-tree.component.ts
@@ -14,8 +14,7 @@ import {
   ViewChildren
 } from '@angular/core';
 import { I18nInterface, I18nService } from 'ng-devui/i18n';
-import { expandCollapseForDomDestroy } from 'ng-devui/utils';
-import { DevConfigService, WithConfig } from 'ng-devui/utils/globalConfig';
+import { DevConfigService, expandCollapseForDomDestroy, WithConfig } from 'ng-devui/utils';
 import { Subscription } from 'rxjs';
 import { Dictionary, ITreeItem, ITreeNodeData, TreeNode } from './tree-factory.class';
 import { TreeComponent } from './tree.component';

diff --git a/devui/tree/tree.component.ts b/devui/tree/tree.component.ts
@@ -17,7 +17,7 @@ import {
 } from '@angular/core';
 import { I18nInterface, I18nService } from 'ng-devui/i18n';
 import { expandCollapseForDomDestroy } from 'ng-devui/utils';
-import { DevConfigService, WithConfig } from 'ng-devui/utils/globalConfig';
+import { DevConfigService, WithConfig } from 'ng-devui/utils';
 import { Subject, Subscription } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
 import {

diff --git a/devui/utils/public-api.ts b/devui/utils/public-api.ts
@@ -15,3 +15,4 @@ export * from './popper/popper.module';
 export * from './safe-pipe.module';
 export * from './safe.pipe';
 export * from './tree-utils';
+export * from './globalConfig';