igniteui-webcomponents-data-grids 7.1.0-alpha.2 → 7.1.0-beta.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bundles/igniteui-webcomponents-data-grids.umd.js +7623 -7085
- package/bundles/igniteui-webcomponents-data-grids.umd.min.js +1 -1
- package/esm2015/lib/CanvasCellPresenterBase.js +4 -4
- package/esm2015/lib/CanvasContentCellModelHelper.js +5 -5
- package/esm2015/lib/CanvasDateTimeCellPresenter.js +8 -8
- package/esm2015/lib/CanvasGridCellBase.js +2 -2
- package/esm2015/lib/CanvasImageCellPresenter.js +7 -7
- package/esm2015/lib/CanvasNumericCellPresenter.js +8 -8
- package/esm2015/lib/CanvasSectionHeaderCellPresenter.js +9 -9
- package/esm2015/lib/CanvasSummaryCellPresenter.js +6 -6
- package/esm2015/lib/CanvasTemplateCellPresenter.js +2 -2
- package/esm2015/lib/CanvasTemplateHeaderCellPresenter.js +2 -2
- package/esm2015/lib/CanvasTextCellPresenter.js +9 -9
- package/esm2015/lib/CanvasTextHeaderCellPresenter.js +7 -7
- package/esm2015/lib/CellPresenterBase.js +37 -34
- package/esm2015/lib/CheckboxListView_combined.js +24 -24
- package/esm2015/lib/ColumnChooserView_combined.js +9 -9
- package/esm2015/lib/ColumnFilterCondition_combined.js +5293 -5010
- package/esm2015/lib/ColumnGroupingView_combined.js +4 -4
- package/esm2015/lib/ColumnPinningView_combined.js +11 -11
- package/esm2015/lib/ComparisonOperatorSelectorView_combined.js +6 -6
- package/esm2015/lib/ContentCellModelHelper.js +10 -10
- package/esm2015/lib/DataGridCellLayoutPanel.js +10 -10
- package/esm2015/lib/DataGridScrollerKeyboardListener.js +2 -2
- package/esm2015/lib/DataGridToolbarView_combined.js +2 -2
- package/esm2015/lib/DateTimeCellPresenter.js +9 -9
- package/esm2015/lib/EditorCell.js +292 -292
- package/esm2015/lib/EditorCellPresenter.js +26 -26
- package/esm2015/lib/FilterCell.js +269 -269
- package/esm2015/lib/FilterCellPresenter.js +15 -15
- package/esm2015/lib/GridCellBase.js +167 -150
- package/esm2015/lib/GridColumnFilterOptionsView_combined.js +10 -10
- package/esm2015/lib/GridColumnGroupOptionsView_combined.js +7 -7
- package/esm2015/lib/GridColumnHideOptionsView_combined.js +3 -3
- package/esm2015/lib/GridColumnMoveOptionsView_combined.js +1 -1
- package/esm2015/lib/GridColumnOptionsView_combined.js +1 -1
- package/esm2015/lib/GridColumnPinOptionsView_combined.js +4 -4
- package/esm2015/lib/GridColumnSortOptionsView_combined.js +2 -2
- package/esm2015/lib/GridColumnSummaryOptionsView_combined.js +7 -7
- package/esm2015/lib/GridExternalWrapper.js +6 -6
- package/esm2015/lib/GridFilterDialogView_combined.js +2 -2
- package/esm2015/lib/GridStyleRepository.js +118 -113
- package/esm2015/lib/GridStyleRepositoryKeys.js +1 -1
- package/esm2015/lib/ImageCell.js +57 -57
- package/esm2015/lib/ImageCellPresenter.js +15 -15
- package/esm2015/lib/MultiColumnComboBoxView_combined.js +9 -9
- package/esm2015/lib/NumericCell.js +8 -8
- package/esm2015/lib/NumericCellPresenter.js +9 -9
- package/esm2015/lib/PropertyEditorView_combined.js +19 -19
- package/esm2015/lib/SectionHeaderCell.js +20 -20
- package/esm2015/lib/SectionHeaderCellPresenter.js +10 -10
- package/esm2015/lib/SummaryCell.js +45 -45
- package/esm2015/lib/SummaryCellPresenter.js +10 -10
- package/esm2015/lib/TemplateCell.js +15 -15
- package/esm2015/lib/TemplateCellPresenter.js +3 -3
- package/esm2015/lib/TemplateHeader.js +4 -4
- package/esm2015/lib/TemplateHeaderCell.js +5 -5
- package/esm2015/lib/TemplateHeaderCellModel.js +18 -18
- package/esm2015/lib/TemplateHeaderCellPresenter.js +3 -3
- package/esm2015/lib/TemplateSectionHeader.js +1 -1
- package/esm2015/lib/TextCell.js +29 -29
- package/esm2015/lib/TextCellPresenter.js +10 -10
- package/esm2015/lib/TextHeaderCell.js +184 -184
- package/esm2015/lib/TextHeaderCellPresenter.js +52 -52
- package/esm2015/lib/TextIconSetConditionalStyle.js +1 -1
- package/esm2015/lib/VerticalSeparatorCell.js +37 -37
- package/esm2015/lib/igc-cell-info.js +97 -79
- package/esm2015/lib/igc-column-moving-separator-component.js +9 -9
- package/esm2015/lib/igc-column-resizing-separator-component.js +6 -6
- package/esm2015/lib/igc-combo-box-column-component.js +10 -10
- package/esm2015/lib/igc-data-grid-column-component.js +291 -261
- package/esm2015/lib/igc-data-grid-component.js +20 -0
- package/esm2015/lib/igc-date-time-cell-info.js +12 -12
- package/esm2015/lib/igc-date-time-column-component.js +23 -23
- package/esm2015/lib/igc-definition-base-component.js +12 -12
- package/esm2015/lib/igc-editor-cell-info.js +23 -23
- package/esm2015/lib/igc-filter-cell-info.js +26 -26
- package/esm2015/lib/igc-filter-row-definition-component.js +12 -12
- package/esm2015/lib/igc-header-component.js +24 -24
- package/esm2015/lib/igc-image-cell-info.js +6 -6
- package/esm2015/lib/igc-image-column-component.js +12 -12
- package/esm2015/lib/igc-numeric-cell-info.js +35 -26
- package/esm2015/lib/igc-numeric-column-component.js +46 -35
- package/esm2015/lib/igc-section-header-cell-info.js +6 -6
- package/esm2015/lib/igc-section-header-component.js +58 -24
- package/esm2015/lib/igc-summary-cell-info.js +9 -9
- package/esm2015/lib/igc-summary-row-component.js +24 -24
- package/esm2015/lib/igc-template-cell-info.js +2 -2
- package/esm2015/lib/igc-template-header-cell-info.js +2 -2
- package/esm2015/lib/igc-text-cell-info.js +2 -2
- package/esm2015/lib/igc-text-column-component.js +9 -9
- package/esm2015/lib/igc-text-header-cell-info.js +38 -38
- package/esm5/lib/CanvasCellPresenterBase.js +4 -4
- package/esm5/lib/CanvasContentCellModelHelper.js +5 -5
- package/esm5/lib/CanvasDateTimeCellPresenter.js +8 -8
- package/esm5/lib/CanvasGridCellBase.js +2 -2
- package/esm5/lib/CanvasImageCellPresenter.js +7 -7
- package/esm5/lib/CanvasNumericCellPresenter.js +8 -8
- package/esm5/lib/CanvasSectionHeaderCellPresenter.js +9 -9
- package/esm5/lib/CanvasSummaryCellPresenter.js +6 -6
- package/esm5/lib/CanvasTemplateCellPresenter.js +2 -2
- package/esm5/lib/CanvasTemplateHeaderCellPresenter.js +2 -2
- package/esm5/lib/CanvasTextCellPresenter.js +9 -9
- package/esm5/lib/CanvasTextHeaderCellPresenter.js +7 -7
- package/esm5/lib/CellPresenterBase.js +37 -34
- package/esm5/lib/CheckboxListView_combined.js +24 -24
- package/esm5/lib/ColumnChooserView_combined.js +9 -9
- package/esm5/lib/ColumnFilterCondition_combined.js +5100 -4765
- package/esm5/lib/ColumnGroupingView_combined.js +4 -4
- package/esm5/lib/ColumnPinningView_combined.js +11 -11
- package/esm5/lib/ComparisonOperatorSelectorView_combined.js +6 -6
- package/esm5/lib/ContentCellModelHelper.js +10 -10
- package/esm5/lib/DataGridCellLayoutPanel.js +10 -10
- package/esm5/lib/DataGridScrollerKeyboardListener.js +2 -2
- package/esm5/lib/DataGridToolbarView_combined.js +2 -2
- package/esm5/lib/DateTimeCellPresenter.js +9 -9
- package/esm5/lib/EditorCell.js +277 -277
- package/esm5/lib/EditorCellPresenter.js +26 -26
- package/esm5/lib/FilterCell.js +259 -259
- package/esm5/lib/FilterCellPresenter.js +15 -15
- package/esm5/lib/GridCellBase.js +164 -143
- package/esm5/lib/GridColumnFilterOptionsView_combined.js +10 -10
- package/esm5/lib/GridColumnGroupOptionsView_combined.js +7 -7
- package/esm5/lib/GridColumnHideOptionsView_combined.js +3 -3
- package/esm5/lib/GridColumnMoveOptionsView_combined.js +1 -1
- package/esm5/lib/GridColumnOptionsView_combined.js +1 -1
- package/esm5/lib/GridColumnPinOptionsView_combined.js +4 -4
- package/esm5/lib/GridColumnSortOptionsView_combined.js +2 -2
- package/esm5/lib/GridColumnSummaryOptionsView_combined.js +7 -7
- package/esm5/lib/GridExternalWrapper.js +6 -6
- package/esm5/lib/GridFilterDialogView_combined.js +2 -2
- package/esm5/lib/GridStyleRepository.js +118 -113
- package/esm5/lib/GridStyleRepositoryKeys.js +1 -1
- package/esm5/lib/ImageCell.js +57 -57
- package/esm5/lib/ImageCellPresenter.js +15 -15
- package/esm5/lib/MultiColumnComboBoxView_combined.js +9 -9
- package/esm5/lib/NumericCell.js +8 -8
- package/esm5/lib/NumericCellPresenter.js +9 -9
- package/esm5/lib/PropertyEditorView_combined.js +19 -19
- package/esm5/lib/SectionHeaderCell.js +20 -20
- package/esm5/lib/SectionHeaderCellPresenter.js +10 -10
- package/esm5/lib/SummaryCell.js +45 -45
- package/esm5/lib/SummaryCellPresenter.js +10 -10
- package/esm5/lib/TemplateCell.js +15 -15
- package/esm5/lib/TemplateCellPresenter.js +3 -3
- package/esm5/lib/TemplateHeader.js +4 -4
- package/esm5/lib/TemplateHeaderCell.js +5 -5
- package/esm5/lib/TemplateHeaderCellModel.js +17 -17
- package/esm5/lib/TemplateHeaderCellPresenter.js +3 -3
- package/esm5/lib/TemplateSectionHeader.js +1 -1
- package/esm5/lib/TextCell.js +29 -29
- package/esm5/lib/TextCellPresenter.js +10 -10
- package/esm5/lib/TextHeaderCell.js +182 -182
- package/esm5/lib/TextHeaderCellPresenter.js +52 -52
- package/esm5/lib/TextIconSetConditionalStyle.js +1 -1
- package/esm5/lib/VerticalSeparatorCell.js +37 -37
- package/esm5/lib/igc-cell-info.js +105 -79
- package/esm5/lib/igc-column-moving-separator-component.js +9 -9
- package/esm5/lib/igc-column-resizing-separator-component.js +6 -6
- package/esm5/lib/igc-combo-box-column-component.js +10 -10
- package/esm5/lib/igc-data-grid-column-component.js +303 -261
- package/esm5/lib/igc-data-grid-component.js +28 -0
- package/esm5/lib/igc-date-time-cell-info.js +12 -12
- package/esm5/lib/igc-date-time-column-component.js +23 -23
- package/esm5/lib/igc-definition-base-component.js +12 -12
- package/esm5/lib/igc-editor-cell-info.js +23 -23
- package/esm5/lib/igc-filter-cell-info.js +26 -26
- package/esm5/lib/igc-filter-row-definition-component.js +12 -12
- package/esm5/lib/igc-header-component.js +24 -24
- package/esm5/lib/igc-image-cell-info.js +6 -6
- package/esm5/lib/igc-image-column-component.js +12 -12
- package/esm5/lib/igc-numeric-cell-info.js +39 -26
- package/esm5/lib/igc-numeric-column-component.js +50 -35
- package/esm5/lib/igc-section-header-cell-info.js +6 -6
- package/esm5/lib/igc-section-header-component.js +74 -24
- package/esm5/lib/igc-summary-cell-info.js +9 -9
- package/esm5/lib/igc-summary-row-component.js +24 -24
- package/esm5/lib/igc-template-cell-info.js +2 -2
- package/esm5/lib/igc-template-header-cell-info.js +2 -2
- package/esm5/lib/igc-text-cell-info.js +2 -2
- package/esm5/lib/igc-text-column-component.js +9 -9
- package/esm5/lib/igc-text-header-cell-info.js +38 -38
- package/fesm2015/igniteui-webcomponents-data-grids.js +7778 -7348
- package/fesm5/igniteui-webcomponents-data-grids.js +7623 -7085
- package/lib/ColumnFilterCondition_combined.d.ts +1341 -1292
- package/lib/EditorCell.d.ts +67 -67
- package/lib/FilterCell.d.ts +55 -55
- package/lib/GridCellBase.d.ts +64 -61
- package/lib/GridStyleRepositoryKeys.d.ts +28 -27
- package/lib/ImageCell.d.ts +17 -17
- package/lib/NumericCell.d.ts +2 -2
- package/lib/SectionHeaderCell.d.ts +4 -4
- package/lib/SummaryCell.d.ts +10 -10
- package/lib/TemplateCell.d.ts +5 -5
- package/lib/TemplateHeader.d.ts +1 -1
- package/lib/TemplateHeaderCell.d.ts +2 -2
- package/lib/TemplateHeaderCellModel.d.ts +7 -7
- package/lib/TemplateSectionHeader.d.ts +1 -1
- package/lib/TextCell.d.ts +7 -7
- package/lib/TextHeaderCell.d.ts +30 -30
- package/lib/VerticalSeparatorCell.d.ts +8 -8
- package/lib/igc-cell-info.d.ts +10 -0
- package/lib/igc-data-grid-column-component.d.ts +15 -0
- package/lib/igc-data-grid-component.d.ts +10 -0
- package/lib/igc-numeric-cell-info.d.ts +5 -0
- package/lib/igc-numeric-column-component.d.ts +6 -0
- package/lib/igc-section-header-component.d.ts +14 -0
- package/package.json +4 -4
|
@@ -12,35 +12,35 @@ let TemplateHeaderCellModel = /*@__PURE__*/ (() => {
|
|
|
12
12
|
class TemplateHeaderCellModel extends TemplateCellModel {
|
|
13
13
|
constructor() {
|
|
14
14
|
super(...arguments);
|
|
15
|
-
this.
|
|
15
|
+
this.od = false;
|
|
16
16
|
}
|
|
17
|
-
get
|
|
18
|
-
return this.
|
|
17
|
+
get oe() {
|
|
18
|
+
return this.od;
|
|
19
19
|
}
|
|
20
|
-
set
|
|
21
|
-
let b = this.
|
|
22
|
-
this.
|
|
23
|
-
if (this.
|
|
24
|
-
this.
|
|
20
|
+
set oe(a) {
|
|
21
|
+
let b = this.od;
|
|
22
|
+
this.od = a;
|
|
23
|
+
if (this.od != b) {
|
|
24
|
+
this.mk("IsFilterUIVisible", TemplateHeaderCellModel.of, b, this.od);
|
|
25
25
|
}
|
|
26
26
|
}
|
|
27
|
-
|
|
28
|
-
super.
|
|
27
|
+
mt(a, b) {
|
|
28
|
+
super.mt(a, b);
|
|
29
29
|
if (a == "IsFilterUIVisible") {
|
|
30
|
-
this.
|
|
30
|
+
this.oe = b;
|
|
31
31
|
}
|
|
32
32
|
}
|
|
33
|
-
|
|
33
|
+
l5(a) {
|
|
34
34
|
switch (a) {
|
|
35
35
|
case "IsFilterUIVisible": return Boolean_$type;
|
|
36
36
|
}
|
|
37
|
-
return super.
|
|
37
|
+
return super.l5(a);
|
|
38
38
|
}
|
|
39
|
-
|
|
39
|
+
ih(a) {
|
|
40
40
|
if (a == "IsFilterUIVisible") {
|
|
41
|
-
return this.
|
|
41
|
+
return this.oe;
|
|
42
42
|
}
|
|
43
|
-
return super.
|
|
43
|
+
return super.ih(a);
|
|
44
44
|
}
|
|
45
45
|
b(a) {
|
|
46
46
|
if (a == null) {
|
|
@@ -48,12 +48,12 @@ let TemplateHeaderCellModel = /*@__PURE__*/ (() => {
|
|
|
48
48
|
}
|
|
49
49
|
a = super.b(a);
|
|
50
50
|
let b = a;
|
|
51
|
-
b.ae = this.
|
|
51
|
+
b.ae = this.ob;
|
|
52
52
|
return b;
|
|
53
53
|
}
|
|
54
54
|
}
|
|
55
55
|
TemplateHeaderCellModel.$t = /*@__PURE__*/ markType(TemplateHeaderCellModel, 'TemplateHeaderCellModel', TemplateCellModel.$);
|
|
56
|
-
TemplateHeaderCellModel.
|
|
56
|
+
TemplateHeaderCellModel.of = /*@__PURE__*/ CellModel.f9("IsFilterUIVisible");
|
|
57
57
|
return TemplateHeaderCellModel;
|
|
58
58
|
})();
|
|
59
59
|
export { TemplateHeaderCellModel };
|
|
@@ -21,13 +21,13 @@ let TemplateHeaderCellPresenter = /*@__PURE__*/ (() => {
|
|
|
21
21
|
super.b(a);
|
|
22
22
|
let b = this.d.actualColumns._inner[a.l.a5];
|
|
23
23
|
let c = b.header;
|
|
24
|
-
if (a.bc(CellModel.fp) || a.bc(CellModel.
|
|
24
|
+
if (a.bc(CellModel.fp) || a.bc(CellModel.h7)) {
|
|
25
25
|
let d = Math.min(1, Math.max(0, a.c7));
|
|
26
26
|
let e = a.cs * (1 - d);
|
|
27
|
-
this.e.
|
|
27
|
+
this.e.d0.element.setRawStyleProperty("opacity", e.toString());
|
|
28
28
|
}
|
|
29
29
|
let f = a;
|
|
30
|
-
c.
|
|
30
|
+
c.hu(f, this.e.d0);
|
|
31
31
|
}
|
|
32
32
|
}
|
|
33
33
|
TemplateHeaderCellPresenter.$t = /*@__PURE__*/ markType(TemplateHeaderCellPresenter, 'TemplateHeaderCellPresenter', CellPresenterBase.$);
|
|
@@ -20,7 +20,7 @@ let TemplateSectionHeader = /*@__PURE__*/ (() => {
|
|
|
20
20
|
n(a) {
|
|
21
21
|
return new TemplateSectionHeaderCellModel();
|
|
22
22
|
}
|
|
23
|
-
|
|
23
|
+
ic(a, b) {
|
|
24
24
|
if (this.cellUpdating != null) {
|
|
25
25
|
this.cellUpdating(this, ((() => {
|
|
26
26
|
let $ret = new TemplateSectionHeaderCellUpdatingEventArgs();
|
package/esm2015/lib/TextCell.js
CHANGED
|
@@ -8,53 +8,53 @@ import { GridCellBase } from "./GridCellBase";
|
|
|
8
8
|
import { markType } from "igniteui-webcomponents-core";
|
|
9
9
|
let TextCell = /*@__PURE__*/ (() => {
|
|
10
10
|
class TextCell extends GridCellBase {
|
|
11
|
-
get
|
|
12
|
-
return this.
|
|
11
|
+
get d0() {
|
|
12
|
+
return this.dz;
|
|
13
13
|
}
|
|
14
|
-
|
|
15
|
-
super.
|
|
14
|
+
dd(a, b) {
|
|
15
|
+
super.dd(a, b);
|
|
16
16
|
let c = Math.max(0, a - b - (this.bd + this.bf + this.be));
|
|
17
|
-
if (this.
|
|
18
|
-
this.
|
|
19
|
-
this.
|
|
17
|
+
if (this.d2 != c) {
|
|
18
|
+
this.d2 = c;
|
|
19
|
+
this.dz.setRawStyleProperty("max-width", c.toString() + "px");
|
|
20
20
|
}
|
|
21
21
|
}
|
|
22
|
-
|
|
23
|
-
super.
|
|
22
|
+
c2(a, b) {
|
|
23
|
+
super.c2(a, b);
|
|
24
24
|
let c = Math.max(0, a - b);
|
|
25
|
-
if (this.
|
|
26
|
-
this.
|
|
27
|
-
this.
|
|
25
|
+
if (this.d1 != c) {
|
|
26
|
+
this.d1 = c;
|
|
27
|
+
this.dz.setRawStyleProperty("max-height", c.toString() + "px");
|
|
28
28
|
}
|
|
29
29
|
}
|
|
30
30
|
constructor(a) {
|
|
31
31
|
super(a);
|
|
32
|
-
this.
|
|
33
|
-
this.
|
|
34
|
-
this.
|
|
32
|
+
this.dz = null;
|
|
33
|
+
this.d2 = -1;
|
|
34
|
+
this.d1 = -1;
|
|
35
35
|
this.ar.setRawStyleProperty("text-align", "left");
|
|
36
36
|
this.ar.setRawStyleProperty("vertical-align", "middle");
|
|
37
|
-
this.
|
|
38
|
-
this.
|
|
39
|
-
this.
|
|
40
|
-
this.
|
|
41
|
-
this.
|
|
42
|
-
this.
|
|
43
|
-
this.ar.append(this.
|
|
37
|
+
this.dz = a.createElement("span");
|
|
38
|
+
this.dz.setRawStyleProperty("display", "inline-block");
|
|
39
|
+
this.dz.setRawStyleProperty("overflow", "hidden");
|
|
40
|
+
this.dz.setRawStyleProperty("white-space", "nowrap");
|
|
41
|
+
this.dz.setRawStyleProperty("text-overflow", "ellipsis");
|
|
42
|
+
this.dc(this.dz, 1);
|
|
43
|
+
this.ar.append(this.dz);
|
|
44
44
|
}
|
|
45
|
-
|
|
46
|
-
super.
|
|
47
|
-
if (a == this.
|
|
48
|
-
this.
|
|
45
|
+
c1(a, b) {
|
|
46
|
+
super.c1(a, b);
|
|
47
|
+
if (a == this.dz) {
|
|
48
|
+
this.dz.setRawStyleProperty("line-height", (this.bg - this.bh).toString() + "px");
|
|
49
49
|
}
|
|
50
50
|
}
|
|
51
51
|
get_ae() {
|
|
52
52
|
return true;
|
|
53
53
|
}
|
|
54
|
-
|
|
55
|
-
super.
|
|
54
|
+
cl(a, b, c) {
|
|
55
|
+
super.cl(a, b, c);
|
|
56
56
|
if (a == "Indent" || a == "IsCollapsable") {
|
|
57
|
-
this.
|
|
57
|
+
this.dz.setRawStyleProperty("margin-left", this.bd + this.bf + this.be + "px");
|
|
58
58
|
}
|
|
59
59
|
}
|
|
60
60
|
}
|
|
@@ -20,26 +20,26 @@ let TextCellPresenter = /*@__PURE__*/ (() => {
|
|
|
20
20
|
super.b(a);
|
|
21
21
|
let b = a;
|
|
22
22
|
if (a.a7) {
|
|
23
|
-
if (a.bc(TextCellModel.
|
|
24
|
-
b.
|
|
25
|
-
this.d.
|
|
23
|
+
if (a.bc(TextCellModel.n9) || a.bc(TextCellModel.h5) || a.bc(TextCellModel.gz)) {
|
|
24
|
+
b.k1 = this.e(b);
|
|
25
|
+
this.d.c9(this.d.d0, b.k1);
|
|
26
26
|
}
|
|
27
|
-
ContentCellModelHelper.a(this.a.am, b, this.a.ar, this.d.
|
|
27
|
+
ContentCellModelHelper.a(this.a.am, b, this.a.ar, this.d.d0, this.a);
|
|
28
28
|
}
|
|
29
29
|
}
|
|
30
30
|
e(a) {
|
|
31
|
-
if (a.
|
|
32
|
-
return a.
|
|
31
|
+
if (a.ly != null) {
|
|
32
|
+
return a.ly;
|
|
33
33
|
}
|
|
34
|
-
if (a.
|
|
35
|
-
return a.
|
|
34
|
+
if (a.ob != null) {
|
|
35
|
+
return a.ob;
|
|
36
36
|
}
|
|
37
37
|
else {
|
|
38
|
-
if (a.
|
|
38
|
+
if (a.ii == null) {
|
|
39
39
|
return "";
|
|
40
40
|
}
|
|
41
41
|
else {
|
|
42
|
-
return a.
|
|
42
|
+
return a.ii.toString();
|
|
43
43
|
}
|
|
44
44
|
}
|
|
45
45
|
}
|