Skip to content

Commit 2ec2986

Browse files
yangtuantuanyangtuantuan
authored
fix(globalConfig): 导出位置由ng-devui/utils/globalConfig 变更为 ng-devui/utils (#204)
1 parent a830145 commit 2ec2986

25 files changed

+48
-37
lines changed

‎devui/accordion/accordion.component.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {
1111
TemplateRef
1212
} from '@angular/core';
1313
import { I18nInterface, I18nService } from 'ng-devui/i18n';
14-
import { DevConfigService, WithConfig } from 'ng-devui/utils/globalConfig';
14+
import { DevConfigService, WithConfig } from 'ng-devui/utils';
1515
import { Subscription } from 'rxjs';
1616
import { ACCORDION } from './accordion-token';
1717
import { AccordionItemClickEvent, AccordionMenuToggleEvent, AccordionMenuType, AccordionOptions } from './accordion.type';

‎devui/auto-complete/auto-complete.directive.ts

+8-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,14 @@ import {
2323
import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
2424
import { I18nInterface, I18nService } from 'ng-devui/i18n';
2525
import { PositionService } from 'ng-devui/position';
26-
import { addClassToOrigin, AppendToBodyDirection, AppendToBodyDirectionsConfig, removeClassFromOrigin } from 'ng-devui/utils';
27-
import { DevConfigService, WithConfig } from 'ng-devui/utils/globalConfig';
26+
import {
27+
addClassToOrigin,
28+
AppendToBodyDirection,
29+
AppendToBodyDirectionsConfig,
30+
DevConfigService,
31+
removeClassFromOrigin,
32+
WithConfig
33+
} from 'ng-devui/utils';
2834
import { fromEvent, Observable, of, Subject, Subscription } from 'rxjs';
2935
import { debounceTime, filter, map, switchMap, takeUntil, tap } from 'rxjs/operators';
3036
import { AutoCompleteConfig } from './auto-complete-config';

‎devui/cascader/cascader.component.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {
66
import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
77
import { DropDownAppendToBodyComponent, DropDownDirective } from 'ng-devui/dropdown';
88
import { I18nInterface, I18nService } from 'ng-devui/i18n';
9-
import { DevConfigService, WithConfig } from 'ng-devui/utils/globalConfig';
9+
import { DevConfigService, WithConfig } from 'ng-devui/utils';
1010
import { Observable, Subject, Subscription } from 'rxjs';
1111
import { debounceTime, distinctUntilChanged, filter, takeUntil } from 'rxjs/operators';
1212
import { CascaderService } from './cascader.service';

‎devui/checkbox/checkbox-group.component.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {
1212
ControlValueAccessor,
1313
NG_VALUE_ACCESSOR
1414
} from '@angular/forms';
15-
import { DevConfigService, WithConfig } from 'ng-devui/utils/globalConfig';
15+
import { DevConfigService, WithConfig } from 'ng-devui/utils';
1616
import { isArray } from 'lodash-es';
1717
import { Observable } from 'rxjs';
1818

‎devui/checkbox/checkbox.component.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {
1111
TemplateRef
1212
} from '@angular/core';
1313
import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
14-
import { DevConfigService, WithConfig } from 'ng-devui/utils/globalConfig';
14+
import { DevConfigService, WithConfig } from 'ng-devui/utils';
1515
import { Observable } from 'rxjs';
1616

1717
@Component({

‎devui/datepicker/date-range-picker.directive.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,12 @@ import {
2323
addClassToOrigin,
2424
DateConverter,
2525
DefaultDateConverter,
26+
DevConfigService,
2627
fadeInOut,
2728
formWithDropDown,
28-
removeClassFromOrigin
29+
removeClassFromOrigin,
30+
WithConfig
2931
} from 'ng-devui/utils';
30-
import { DevConfigService, WithConfig } from 'ng-devui/utils/globalConfig';
3132
import { fromEvent, Subscription } from 'rxjs';
3233
import { debounceTime, filter, map } from 'rxjs/operators';
3334
import { DatePickerConfigService as DatePickerConfig } from './date-picker.config.service';

‎devui/datepicker/datepicker.directive.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,10 @@ import {
2727
AnimationDuration,
2828
DateConverter,
2929
DefaultDateConverter,
30-
removeClassFromOrigin
30+
DevConfigService,
31+
removeClassFromOrigin,
32+
WithConfig
3133
} from 'ng-devui/utils';
32-
import { DevConfigService, WithConfig } from 'ng-devui/utils/globalConfig';
3334
import { fromEvent, Observable, Subscription } from 'rxjs';
3435
import { debounceTime, filter, map } from 'rxjs/operators';
3536
import { SelectDateChangeEventArgs, SelectDateChangeReason } from './date-change-event-args.model';

‎devui/datepicker/two-datepicker/two-datepicker.component.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ import {
1414
ViewChild
1515
} from '@angular/core';
1616
import { I18nInterface, I18nService } from 'ng-devui/i18n';
17-
import { DateConverter, DefaultDateConverter, fadeInOut } from 'ng-devui/utils';
18-
import { DevConfigService, WithConfig } from 'ng-devui/utils/globalConfig';
17+
import { DateConverter, DefaultDateConverter, DevConfigService, fadeInOut, WithConfig } from 'ng-devui/utils';
1918
import { Subject, Subscription } from 'rxjs';
2019
import { distinctUntilChanged } from 'rxjs/operators';
2120
import { DatePickerConfigService as DatePickerConfig } from '../date-picker.config.service';

‎devui/dropdown/dropdown.directive.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ import {
55
OnChanges, OnDestroy, Optional, Output, QueryList, SimpleChanges,
66
SkipSelf
77
} from '@angular/core';
8-
import { addClassToOrigin, formWithDropDown, removeClassFromOrigin } from 'ng-devui/utils';
9-
import { DevConfigService, WithConfig } from 'ng-devui/utils/globalConfig';
8+
import { addClassToOrigin, DevConfigService, formWithDropDown, removeClassFromOrigin, WithConfig } from 'ng-devui/utils';
109
import { fromEvent, merge, Observable, ReplaySubject, Subscription } from 'rxjs';
1110
import { debounceTime, filter, mapTo, tap } from 'rxjs/operators';
1211
import { DropDownService } from './dropdown.service';

‎devui/editable-select/editable-select.component.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ import {
1818
import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
1919
import { AutoCompleteDirective } from 'ng-devui/auto-complete';
2020
import { I18nInterface, I18nService } from 'ng-devui/i18n';
21-
import { AppendToBodyDirection } from 'ng-devui/utils';
22-
import { DevConfigService, WithConfig } from 'ng-devui/utils/globalConfig';
21+
import { AppendToBodyDirection, DevConfigService, WithConfig } from 'ng-devui/utils';
2322
import { Observable, Subscription } from 'rxjs';
2423

2524
@Component({

‎devui/modal/dialog.service.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {
77
Renderer2, RendererFactory2
88
} from '@angular/core';
99
import { OverlayContainerRef } from 'ng-devui/overlay-container';
10-
import { DevConfigService } from 'ng-devui/utils/globalConfig';
10+
import { DevConfigService } from 'ng-devui/utils';
1111
import { assign, isUndefined } from 'lodash-es';
1212
import { ModalContainerComponent } from './modal-container.component';
1313
import { ModalComponent } from './modal.component';

‎devui/modal/modal.service.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {
66
Renderer2, RendererFactory2
77
} from '@angular/core';
88
import { OverlayContainerRef } from 'ng-devui/overlay-container';
9-
import { DevConfigService } from 'ng-devui/utils/globalConfig';
9+
import { DevConfigService } from 'ng-devui/utils';
1010
import { assign, isUndefined } from 'lodash-es';
1111
import { ModalComponent } from './modal.component';
1212
import { IModalOptions } from './modal.types';

‎devui/multi-auto-complete/multi-auto-complete.component.ts

+7-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,13 @@ import {
1616
} from '@angular/core';
1717
import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
1818
import { AutoCompleteDirective, AutoCompletePopupComponent } from 'ng-devui/auto-complete';
19-
import { addClassToOrigin, AppendToBodyDirection, removeClassFromOrigin } from 'ng-devui/utils';
20-
import { DevConfigService, WithConfig } from 'ng-devui/utils/globalConfig';
19+
import {
20+
addClassToOrigin,
21+
AppendToBodyDirection,
22+
DevConfigService,
23+
removeClassFromOrigin,
24+
WithConfig
25+
} from 'ng-devui/utils';
2126
import { Observable, of } from 'rxjs';
2227

2328
@Component({

‎devui/panel/panel.component.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ import {
99
Input,
1010
Output
1111
} from '@angular/core';
12-
import { expandCollapseForDomDestroy } from 'ng-devui/utils';
13-
import { DevConfigService, WithConfig } from 'ng-devui/utils/globalConfig';
12+
import { DevConfigService, expandCollapseForDomDestroy, WithConfig } from 'ng-devui/utils';
1413
import { Observable } from 'rxjs';
1514
import { PanelBodyComponent } from './panel-body.component';
1615
import { PanelFooterComponent } from './panel-footer.component';

‎devui/popover/popover.directive.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {
1313
ViewContainerRef
1414
} from '@angular/core';
1515
import { OverlayContainerRef } from 'ng-devui/overlay-container';
16-
import { DevConfigService, WithConfig } from 'ng-devui/utils/globalConfig';
16+
import { DevConfigService, WithConfig } from 'ng-devui/utils';
1717
import { fromEvent, Subject, Subscription } from 'rxjs';
1818
import { debounceTime, filter, map, takeUntil } from 'rxjs/operators';
1919
import { PopoverComponent } from './popover.component';

‎devui/select/select.component.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,12 @@ import {
3535
addClassToOrigin,
3636
AppendToBodyDirection,
3737
AppendToBodyDirectionsConfig,
38+
DevConfigService,
3839
fadeInOut,
3940
formWithDropDown,
40-
removeClassFromOrigin
41+
removeClassFromOrigin,
42+
WithConfig
4143
} from 'ng-devui/utils';
42-
import { DevConfigService, WithConfig } from 'ng-devui/utils/globalConfig';
4344
import { WindowRef } from 'ng-devui/window-ref';
4445
import { BehaviorSubject, fromEvent, Observable, of, Subscription } from 'rxjs';
4546
import { debounceTime, filter, map, switchMap } from 'rxjs/operators';

‎devui/tags-input/tags.input.component.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import {
1616
import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
1717
import { I18nInterface, I18nService } from 'ng-devui/i18n';
1818
import { ToggleMenuContainerComponent, ToggleMenuListComponent, ToggleMenuSearchComponent } from 'ng-devui/toggle-menu';
19-
import { DevConfigService, WithConfig } from 'ng-devui/utils/globalConfig';
19+
import { DevConfigService, WithConfig } from 'ng-devui/utils';
2020
import { isEmpty } from 'lodash-es';
2121
import { BehaviorSubject, fromEvent, Observable, of, Subscription } from 'rxjs';
2222
import { debounceTime, map, switchMap } from 'rxjs/operators';

‎devui/time-picker/time-picker.component.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,13 @@ import {
2525
addClassToOrigin,
2626
AppendToBodyDirection,
2727
AppendToBodyDirectionsConfig,
28+
DevConfigService,
2829
fadeInOut,
2930
formWithDropDown,
3031
removeClassFromOrigin,
31-
unshiftString
32+
unshiftString,
33+
WithConfig
3234
} from 'ng-devui/utils';
33-
import { DevConfigService, WithConfig } from 'ng-devui/utils/globalConfig';
3435
import { fromEvent, Observable, Subscription } from 'rxjs';
3536
import { debounceTime, filter, map } from 'rxjs/operators';
3637

‎devui/toggle-menu/toggle-menu-container.component.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,12 @@ import {
2828
addClassToOrigin,
2929
AppendToBodyDirection,
3030
AppendToBodyDirectionsConfig,
31+
DevConfigService,
3132
fadeInOut,
3233
formWithDropDown,
33-
removeClassFromOrigin
34+
removeClassFromOrigin,
35+
WithConfig
3436
} from 'ng-devui/utils';
35-
import { DevConfigService, WithConfig } from 'ng-devui/utils/globalConfig';
3637
import { WindowRef } from 'ng-devui/window-ref';
3738
import { ToggleMenuListComponent } from './toggle-menu-list.component';
3839

‎devui/toggle-menu/toggle-menu-operation.component.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from '@angular/core';
2-
import { DevConfigService, WithConfig } from 'ng-devui/utils/globalConfig';
2+
import { DevConfigService, WithConfig } from 'ng-devui/utils';
33

44
@Component({
55
selector: 'd-toggle-menu-operation',

‎devui/tooltip/tooltip.directive.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {
1111
SimpleChanges
1212
} from '@angular/core';
1313
import { OverlayContainerRef } from 'ng-devui/overlay-container';
14-
import { DevConfigService, WithConfig } from 'ng-devui/utils/globalConfig';
14+
import { DevConfigService, WithConfig } from 'ng-devui/utils';
1515
import { fromEvent, Subject } from 'rxjs';
1616
import { debounceTime, filter, map, takeUntil } from 'rxjs/operators';
1717
import { TooltipComponent } from './tooltip.component';

‎devui/tree-select/tree-select.component.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ import {
1919
import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
2020
import { I18nInterface, I18nService } from 'ng-devui/i18n';
2121
import { ICheckboxInput, ITreeItem, OperableTreeComponent, TreeNode } from 'ng-devui/tree';
22-
import { addClassToOrigin, removeClassFromOrigin } from 'ng-devui/utils';
23-
import { DevConfigService, WithConfig } from 'ng-devui/utils/globalConfig';
22+
import { addClassToOrigin, DevConfigService, removeClassFromOrigin, WithConfig } from 'ng-devui/utils';
2423
import { Subject, Subscription } from 'rxjs';
2524
import { debounceTime, distinctUntilChanged, takeUntil } from 'rxjs/operators';
2625
import DefaultIcons from './tree-default-icons';

‎devui/tree/operable-tree.component.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ import {
1414
ViewChildren
1515
} from '@angular/core';
1616
import { I18nInterface, I18nService } from 'ng-devui/i18n';
17-
import { expandCollapseForDomDestroy } from 'ng-devui/utils';
18-
import { DevConfigService, WithConfig } from 'ng-devui/utils/globalConfig';
17+
import { DevConfigService, expandCollapseForDomDestroy, WithConfig } from 'ng-devui/utils';
1918
import { Subscription } from 'rxjs';
2019
import { Dictionary, ITreeItem, ITreeNodeData, TreeNode } from './tree-factory.class';
2120
import { TreeComponent } from './tree.component';

‎devui/tree/tree.component.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import {
1717
} from '@angular/core';
1818
import { I18nInterface, I18nService } from 'ng-devui/i18n';
1919
import { expandCollapseForDomDestroy } from 'ng-devui/utils';
20-
import { DevConfigService, WithConfig } from 'ng-devui/utils/globalConfig';
20+
import { DevConfigService, WithConfig } from 'ng-devui/utils';
2121
import { Subject, Subscription } from 'rxjs';
2222
import { takeUntil } from 'rxjs/operators';
2323
import {

‎devui/utils/public-api.ts

+1
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,4 @@ export * from './popper/popper.module';
1515
export * from './safe-pipe.module';
1616
export * from './safe.pipe';
1717
export * from './tree-utils';
18+
export * from './globalConfig';

0 commit comments

Comments
 (0)