Skip to content

Commit 97621a7

Browse files
rhlinrhlin
committed
fix: ifx patch items with '||[]' with wrong position
1 parent 6a004b6 commit 97621a7

2 files changed

Lines changed: 21 additions & 21 deletions

File tree

‎patches/@opentiny__ng-checkbox.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/fesm2020/opentiny-ng-checkbox.mjs b/fesm2020/opentiny-ng-checkbox.mjs
2-
index 6b33941eea01dd43c553ea92ea8dcf179ebebc41..14b3f1babe5f71a3f36646c18ac5a55a31da414b 100644
2+
index 6b33941eea01dd43c553ea92ea8dcf179ebebc41..306a70a0f49bca6e723be8a1a79dfa5f03383dca 100644
33
--- a/fesm2020/opentiny-ng-checkbox.mjs
44
+++ b/fesm2020/opentiny-ng-checkbox.mjs
55
@@ -734,14 +734,14 @@ class TiCheckboxGroupComponent extends TiFormComponent {
@@ -15,7 +15,7 @@ index 6b33941eea01dd43c553ea92ea8dcf179ebebc41..14b3f1babe5f71a3f36646c18ac5a55a
1515
'[class.ti-checkboxgroup-vertical]': 'direction === "vertical"',
1616
'[class.ti-checkboxgroup-defalut-item]': '!itemTemplate'
1717
- }, changeDetection: ChangeDetectionStrategy.OnPush, providers: [TiFormComponent.getValueAccessor(TiCheckboxGroupComponent)], template: "<span style=\"display: none\">\r\n <input\r\n type=\"checkbox\"\r\n tiCheckgroup\r\n [items]=\"items\"\r\n [(checkeds)]=\"checkeds\"\r\n [valueKey]=\"valueKey\"\r\n (checkedsChange)=\"onCheckedsChange($event)\"\r\n />\r\n</span>\r\n<ng-container *ngFor=\"let item of items;let i = index\">\r\n <ng-container *ngIf=\"itemTemplate else defaultTemplate;\">\r\n <!-- \u81EA\u5B9A\u4E49label -->\r\n <span class=\"checkbox-group-item\">\r\n <input type=\"checkbox\" [id]=\"item.id\" tiCheckitem [item]=\"item\" [disabled]=\"item.disabled\" />\r\n <ng-container *ngTemplateOutlet=\"itemTemplate;context: {$implicit: item,index: i}\"></ng-container>\r\n </span>\r\n </ng-container>\r\n <ng-template #defaultTemplate>\r\n <!-- \u9ED8\u8BA4label -->\r\n <input type=\"checkbox\" [id]=\"appendId(item.id || i)\" tiCheckitem [item]=\"item\" [label]=\"item[labelKey]\" [disabled]=\"item.disabled\" />\r\n </ng-template>\r\n</ng-container>\r\n", styles: ["ti-checkbox-group{display:inline-flex;flex-wrap:wrap;line-height:1.5em;vertical-align:bottom}ti-checkbox-group .ti3-checkbox{display:inline-flex!important;align-items:flex-start!important;flex-shrink:0;line-height:1.5em!important}ti-checkbox-group.ti-checkboxgroup-vertical{flex-direction:column}ti-checkbox-group.ti-checkboxgroup-vertical input[type=checkbox][tiCheckbox]+.ti3-checkbox,ti-checkbox-group.ti-checkboxgroup-vertical .checkbox-group-item{line-height:28px!important;line-height:var(--ti-common-size-7x, 28px)!important;flex-shrink:0}.checkbox-group-item{display:inline-flex}ti-checkbox-group.ti-checkboxgroup-horizon.ti-checkboxgroup-defalut-item label.ti3-checkbox{margin-right:20px;margin-right:var(--ti-common-space-5x, 20px)}\n"] }]
18-
+ }, changeDetection: ChangeDetectionStrategy.OnPush, providers: [TiFormComponent.getValueAccessor(TiCheckboxGroupComponent)], template: "<span style=\"display: none\">\r\n <input\r\n type=\"checkbox\"\r\n tiCheckgroup\r\n [items]=\"items\"\r\n [(checkeds)]=\"checkeds\"\r\n [valueKey]=\"valueKey\"\r\n (checkedsChange)=\"onCheckedsChange($event)\"\r\n />\r\n</span>\r\n<ng-container *ngFor=\"let item of items;let i = index\">\r\n <ng-container *ngIf=\"itemTemplate else defaultTemplate;\">\r\n <!-- \u81EA\u5B9A\u4E49label -->\r\n <span class=\"checkbox-group-item\">\r\n <input type=\"checkbox\" [id]=\"item.id\" tiCheckitem [item]=\"item\" [disabled]=\"item.disabled\" />\r\n <ng-container *ngTemplateOutlet=\"itemTemplate;context: {$implicit: item,index: i}\"></ng-container>\r\n </span>\r\n </ng-container>\r\n <ng-template #defaultTemplate>\r\n <!-- \u9ED8\u8BA4label -->\r\n <input type=\"checkbox\" [id]=\"appendId(item.id || i)\" tiCheckitem [item]=\"item || []\" [label]=\"item[labelKey]\" [disabled]=\"item.disabled\" />\r\n </ng-template>\r\n</ng-container>\r\n", styles: ["ti-checkbox-group{display:inline-flex;flex-wrap:wrap;line-height:1.5em;vertical-align:bottom}ti-checkbox-group .ti3-checkbox{display:inline-flex!important;align-items:flex-start!important;flex-shrink:0;line-height:1.5em!important}ti-checkbox-group.ti-checkboxgroup-vertical{flex-direction:column}ti-checkbox-group.ti-checkboxgroup-vertical input[type=checkbox][tiCheckbox]+.ti3-checkbox,ti-checkbox-group.ti-checkboxgroup-vertical .checkbox-group-item{line-height:28px!important;line-height:var(--ti-common-size-7x, 28px)!important;flex-shrink:0}.checkbox-group-item{display:inline-flex}ti-checkbox-group.ti-checkboxgroup-horizon.ti-checkboxgroup-defalut-item label.ti3-checkbox{margin-right:20px;margin-right:var(--ti-common-space-5x, 20px)}\n"] }]
18+
+ }, changeDetection: ChangeDetectionStrategy.OnPush, providers: [TiFormComponent.getValueAccessor(TiCheckboxGroupComponent)], template: "<span style=\"display: none\">\r\n <input\r\n type=\"checkbox\"\r\n tiCheckgroup\r\n [items]=\"items || []\"\r\n [(checkeds)]=\"checkeds\"\r\n [valueKey]=\"valueKey\"\r\n (checkedsChange)=\"onCheckedsChange($event)\"\r\n />\r\n</span>\r\n<ng-container *ngFor=\"let item of items;let i = index\">\r\n <ng-container *ngIf=\"itemTemplate else defaultTemplate;\">\r\n <!-- \u81EA\u5B9A\u4E49label -->\r\n <span class=\"checkbox-group-item\">\r\n <input type=\"checkbox\" [id]=\"item.id\" tiCheckitem [item]=\"item\" [disabled]=\"item.disabled\" />\r\n <ng-container *ngTemplateOutlet=\"itemTemplate;context: {$implicit: item,index: i}\"></ng-container>\r\n </span>\r\n </ng-container>\r\n <ng-template #defaultTemplate>\r\n <!-- \u9ED8\u8BA4label -->\r\n <input type=\"checkbox\" [id]=\"appendId(item.id || i)\" tiCheckitem [item]=\"item\" [label]=\"item[labelKey]\" [disabled]=\"item.disabled\" />\r\n </ng-template>\r\n</ng-container>\r\n", styles: ["ti-checkbox-group{display:inline-flex;flex-wrap:wrap;line-height:1.5em;vertical-align:bottom}ti-checkbox-group .ti3-checkbox{display:inline-flex!important;align-items:flex-start!important;flex-shrink:0;line-height:1.5em!important}ti-checkbox-group.ti-checkboxgroup-vertical{flex-direction:column}ti-checkbox-group.ti-checkboxgroup-vertical input[type=checkbox][tiCheckbox]+.ti3-checkbox,ti-checkbox-group.ti-checkboxgroup-vertical .checkbox-group-item{line-height:28px!important;line-height:var(--ti-common-size-7x, 28px)!important;flex-shrink:0}.checkbox-group-item{display:inline-flex}ti-checkbox-group.ti-checkboxgroup-horizon.ti-checkboxgroup-defalut-item label.ti3-checkbox{margin-right:20px;margin-right:var(--ti-common-space-5x, 20px)}\n"] }]
1919
}], propDecorators: { items: [{
2020
type: Input
2121
}], labelKey: [{

0 commit comments

Comments
 (0)