Skip to content

Commit 60e1bc4

Browse files
authored
Merge pull request #352 from rdkmaster/add-internal-flag-for-internal-classes
add-internal-flag-for-internal-classes
2 parents 2458a89 + 69befcd commit 60e1bc4

File tree

11 files changed

+53
-23
lines changed

11 files changed

+53
-23
lines changed

src/jigsaw/component/common.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ import {Directive, OnInit, ViewContainerRef, Input, NgModule, AfterViewInit} fro
22
import {CommonUtils} from "../core/utils/common-utils";
33
import {PopupService} from "../service/popup.service";
44

5+
/**
6+
* @internal
7+
*/
58
@Directive({
69
selector: '[jigsaw-renderer-host]',
710
})

src/jigsaw/component/fish-bone/fish-bone.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,9 @@ export class JigsawFishBone extends AbstractJigsawComponent implements AfterView
203203
}
204204
}
205205

206+
/**
207+
* @internal
208+
*/
206209
@Component({
207210
selector: 'j-fish-bone-item, jigsaw-fish-bone-item',
208211
templateUrl: './fish-bone-item.html',

src/jigsaw/component/pagination/pagination.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -366,6 +366,9 @@ export class JigsawPagination extends AbstractJigsawComponent implements OnInit,
366366

367367
}
368368

369+
/**
370+
* @internal
371+
*/
369372
@Component({
370373
selector: 'jigsaw-paging-item, j-paging-item',
371374
templateUrl: 'page.html',

src/jigsaw/component/scrollbar/scrollbar.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ import {
1111
} from "@angular/core";
1212
import {AbstractJigsawComponent} from "../common";
1313

14+
/**
15+
* @internal
16+
*/
1417
@Component({
1518
selector: 'jigsaw-scrollbar-handle',
1619
templateUrl: './scrollbar-handle.html'

src/jigsaw/component/select/select.ts

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,17 @@ import {InternalUtils} from '../../core/utils/internal-utils';
1111
import {ArrayCollection} from "../../core/data/array-collection";
1212
import {PerfectScrollbarModule} from "ngx-perfect-scrollbar";
1313

14+
/**
15+
* @internal
16+
*/
1417
@Directive({
1518
selector: '.jigsaw-select-option-list',
1619
host: {
1720
'[style.width]': 'width',
1821
'[style.height]': 'height'
1922
}
2023
})
21-
export class OptionList extends AbstractJigsawComponent {
22-
24+
export class JigsawSelectOptionList extends AbstractJigsawComponent {
2325
}
2426

2527
@Component({
@@ -100,8 +102,8 @@ export class JigsawSelect extends AbstractJigsawComponent implements ControlValu
100102
}
101103

102104
//获取映射的子组件option
103-
@ViewChildren(forwardRef(() => JigsawOption))
104-
private _options: QueryList<JigsawOption> = null;
105+
@ViewChildren(forwardRef(() => JigsawSelectOption))
106+
private _options: QueryList<JigsawSelectOption> = null;
105107

106108
constructor(private _renderer: Renderer2, private _elementRef: ElementRef) {
107109
super();
@@ -183,6 +185,9 @@ export class JigsawSelect extends AbstractJigsawComponent implements ControlValu
183185
}
184186
}
185187

188+
/**
189+
* @internal
190+
*/
186191
@Component({
187192
selector: 'jigsaw-select-option, j-select-option',
188193
templateUrl: 'option.html',
@@ -192,7 +197,7 @@ export class JigsawSelect extends AbstractJigsawComponent implements ControlValu
192197
'[style.line-height]': '_height'
193198
}
194199
})
195-
export class JigsawOption implements OnInit {
200+
export class JigsawSelectOption implements OnInit {
196201
@Input() public optionItem: any;
197202

198203
/**
@@ -233,8 +238,8 @@ export class JigsawOption implements OnInit {
233238

234239
@NgModule({
235240
imports: [CommonModule, FormsModule, PerfectScrollbarModule],
236-
declarations: [JigsawSelect, JigsawOption, OptionList],
237-
exports: [JigsawSelect, JigsawOption]
241+
declarations: [JigsawSelect, JigsawSelectOption, JigsawSelectOptionList],
242+
exports: [JigsawSelect]
238243
})
239244
export class JigsawSelectModule {
240245
}

src/jigsaw/component/slider/slider.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
[ngStyle]="mark.dotStyle"></span>
1111
</div>
1212

13-
<slider-handle *ngFor="let item of _$value;let i = index" value="{{item}}" [key]="i"></slider-handle>
13+
<jigsaw-slider-handle *ngFor="let item of _$value;let i = index" value="{{item}}" [key]="i"></jigsaw-slider-handle>
1414

1515
<div *ngIf="_$marks.length > 0" class="jigsaw-slider-mark">
1616
<span *ngFor="let mark of _$marks" class="jigsaw-slider-mark-text"

src/jigsaw/component/slider/slider.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,11 @@ export class SliderMark {
2626
style?: any;
2727
}
2828

29+
/**
30+
* @internal
31+
*/
2932
@Component({
30-
selector: 'slider-handle',
33+
selector: 'jigsaw-slider-handle',
3134
templateUrl: './slider-handle.html',
3235
encapsulation: ViewEncapsulation.None
3336
})

src/jigsaw/component/table/table-inner.components.ts

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,11 @@ export class TableInternalCellBase implements AfterViewInit {
115115
}
116116
}
117117

118+
/**
119+
* 表头单元格
120+
*
121+
* @internal
122+
*/
118123
@Component({
119124
selector: 'jigsaw-table-header',
120125
template: `
@@ -126,11 +131,6 @@ export class TableInternalCellBase implements AfterViewInit {
126131
</div>
127132
</div>`
128133
})
129-
/**
130-
* 表头单元格
131-
*
132-
* @internal
133-
*/
134134
export class JigsawTableHeaderInternalComponent extends TableInternalCellBase implements OnInit, OnDestroy {
135135
constructor(resolver: ComponentFactoryResolver, changeDetector: ChangeDetectorRef) {
136136
super(resolver, changeDetector);
@@ -199,13 +199,14 @@ export class JigsawTableHeaderInternalComponent extends TableInternalCellBase im
199199
}
200200
}
201201

202+
/**
203+
* 单元格渲染器
204+
* @internal
205+
*/
202206
@Component({
203207
selector: 'jigsaw-table-cell',
204208
template: '<ng-template jigsaw-renderer-host></ng-template>'
205209
})
206-
/**
207-
* 单元格渲染器
208-
*/
209210
export class JigsawTableCellInternalComponent extends TableInternalCellBase implements OnInit, OnDestroy {
210211

211212
private _editable: boolean = false;

src/jigsaw/component/tabs/tab-item.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,9 @@ export abstract class JigsawTabBase extends AbstractJigsawComponent implements O
5757
}
5858
}
5959

60+
/**
61+
* @internal
62+
*/
6063
@Component({
6164
selector: 'jigsaw-tab-label',
6265
template: `
@@ -91,6 +94,9 @@ export class JigsawTabLabel extends JigsawTabBase implements AfterViewInit {
9194

9295
}
9396

97+
/**
98+
* @internal
99+
*/
94100
@Component({
95101
selector: 'jigsaw-tab-content',
96102
host: {

src/jigsaw/component/time/time.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {Subscriber} from "rxjs/Subscriber";
66
import {AbstractJigsawComponent} from "../common";
77
import {TimeGr, TimeService, TimeUnit, TimeWeekStart} from "../../service/time.service";
88
import {PopupInfo, PopupPositionType, PopupService} from "../../service/popup.service";
9-
import {SimpleTooltipComponent} from "../tooltip/tooltip";
9+
import {JigsawSimpleTooltipComponent} from "../tooltip/tooltip";
1010
import {Time, WeekTime} from "../../service/time.types";
1111
import {TranslateHelper} from "../../core/utils/translate-helper";
1212
import {ElementEventHelper, CommonUtils} from "../../core/utils/common-utils";
@@ -477,7 +477,7 @@ export class JigsawTime extends AbstractJigsawComponent implements ControlValueA
477477
this._tooltipInfo.dispose();
478478
this._tooltipInfo = null;
479479
}
480-
this._tooltipInfo = popService.popup(SimpleTooltipComponent, {
480+
this._tooltipInfo = popService.popup(JigsawSimpleTooltipComponent, {
481481
modal: false, //是否模态
482482
pos: {x: $(event.currentTarget).offset().left, y: $(event.currentTarget).offset().top},
483483
posOffset: { //偏移位置

0 commit comments

Comments
 (0)