fantasy-ngzorro 1.3.25 → 1.3.26
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/fantasy-ngzorro.umd.js +21 -10
- package/bundles/fantasy-ngzorro.umd.js.map +1 -1
- package/bundles/fantasy-ngzorro.umd.min.js +1 -1
- package/bundles/fantasy-ngzorro.umd.min.js.map +1 -1
- package/esm2015/hd-form-lines/hd-form-lines.component.js +20 -9
- package/esm5/hd-form-lines/hd-form-lines.component.js +22 -11
- package/fantasy-ngzorro.metadata.json +1 -1
- package/fesm2015/fantasy-ngzorro.js +19 -8
- package/fesm2015/fantasy-ngzorro.js.map +1 -1
- package/fesm5/fantasy-ngzorro.js +21 -10
- package/fesm5/fantasy-ngzorro.js.map +1 -1
- package/hd-form-lines/hd-form-lines.component.d.ts +2 -2
- package/package.json +1 -1
package/fesm5/fantasy-ngzorro.js
CHANGED
|
@@ -1607,11 +1607,13 @@ var HdFormLinesComponent = /** @class */ (function () {
|
|
|
1607
1607
|
dom.down = (/**
|
|
1608
1608
|
* @return {?}
|
|
1609
1609
|
*/
|
|
1610
|
-
function () {
|
|
1610
|
+
function () {
|
|
1611
|
+
});
|
|
1611
1612
|
dom.up = (/**
|
|
1612
1613
|
* @return {?}
|
|
1613
1614
|
*/
|
|
1614
|
-
function () {
|
|
1615
|
+
function () {
|
|
1616
|
+
});
|
|
1615
1617
|
}
|
|
1616
1618
|
}
|
|
1617
1619
|
}
|
|
@@ -1888,7 +1890,8 @@ var HdFormLinesComponent = /** @class */ (function () {
|
|
|
1888
1890
|
else if (dom instanceof ElementRef) {
|
|
1889
1891
|
dom.nativeElement.blur();
|
|
1890
1892
|
}
|
|
1891
|
-
else {
|
|
1893
|
+
else {
|
|
1894
|
+
}
|
|
1892
1895
|
}
|
|
1893
1896
|
};
|
|
1894
1897
|
/**
|
|
@@ -1905,7 +1908,6 @@ var HdFormLinesComponent = /** @class */ (function () {
|
|
|
1905
1908
|
this.activeDomX = x;
|
|
1906
1909
|
this.activeDomY = y;
|
|
1907
1910
|
this.activeDom = this.collectDomList[this.activeDomX][this.activeDomY];
|
|
1908
|
-
console.log('this.activeDom', this.activeDom);
|
|
1909
1911
|
if (this.activeDom instanceof NzSelectComponent) {
|
|
1910
1912
|
this.setActiveSelectedComponentOpen(this.activeDom.open);
|
|
1911
1913
|
}
|
|
@@ -2237,7 +2239,10 @@ var HdFormLinesComponent = /** @class */ (function () {
|
|
|
2237
2239
|
*/
|
|
2238
2240
|
function (item) {
|
|
2239
2241
|
// 新增行 初始数据都为null
|
|
2240
|
-
formGroupObj[item.name] = _this.fb.control({
|
|
2242
|
+
formGroupObj[item.name] = _this.fb.control({
|
|
2243
|
+
value: formLinesDataItem[item.name] === 0 ? 0 : (formLinesDataItem[item.name] || item.value || null),
|
|
2244
|
+
disabled: item.disabled
|
|
2245
|
+
}, item.require ? [Validators.required] : []);
|
|
2241
2246
|
if (item.selectOption && item.selectOption.label) {
|
|
2242
2247
|
formGroupObj[item.selectOption.label] = _this.fb.control(formLinesDataItem[item.selectOption.label] || null, []);
|
|
2243
2248
|
}
|
|
@@ -2524,8 +2529,8 @@ var HdFormLinesComponent = /** @class */ (function () {
|
|
|
2524
2529
|
}), 0);
|
|
2525
2530
|
};
|
|
2526
2531
|
/**
|
|
2527
|
-
|
|
2528
|
-
|
|
2532
|
+
* 定义空的newLineItem 结构
|
|
2533
|
+
*/
|
|
2529
2534
|
/**
|
|
2530
2535
|
* 定义空的newLineItem 结构
|
|
2531
2536
|
* @private
|
|
@@ -2546,7 +2551,10 @@ var HdFormLinesComponent = /** @class */ (function () {
|
|
|
2546
2551
|
*/
|
|
2547
2552
|
function (item) {
|
|
2548
2553
|
// 新增行 初始数据都为null
|
|
2549
|
-
formGroupObj[item.name] = _this.fb.control({
|
|
2554
|
+
formGroupObj[item.name] = _this.fb.control({
|
|
2555
|
+
value: item.value,
|
|
2556
|
+
disabled: item.disabled
|
|
2557
|
+
} || null, item.require && !item.hide ? [Validators.required] : []);
|
|
2550
2558
|
}));
|
|
2551
2559
|
formGroupObj.lineIndex = this.fb.control(this.linesFormArray.controls.length, []);
|
|
2552
2560
|
// 用来标识是否是搜索状态下新增的行
|
|
@@ -2635,7 +2643,10 @@ var HdFormLinesComponent = /** @class */ (function () {
|
|
|
2635
2643
|
*/
|
|
2636
2644
|
function (item) {
|
|
2637
2645
|
// 新增行 初始数据都为null
|
|
2638
|
-
formGroupObj[item.name] = _this.fb.control({
|
|
2646
|
+
formGroupObj[item.name] = _this.fb.control({
|
|
2647
|
+
value: formLinesDataItem[item.name] === 0 ? 0 : (formLinesDataItem[item.name] || item.value || null),
|
|
2648
|
+
disabled: item.disabled
|
|
2649
|
+
}, item.require ? [Validators.required] : []);
|
|
2639
2650
|
if (item.selectOption && item.selectOption.label) {
|
|
2640
2651
|
formGroupObj[item.selectOption.label] = _this.fb.control(formLinesDataItem[item.selectOption.label] || null, []);
|
|
2641
2652
|
}
|
|
@@ -3097,7 +3108,7 @@ var HdFormLinesComponent = /** @class */ (function () {
|
|
|
3097
3108
|
showTotal: [{ type: Input }],
|
|
3098
3109
|
totalOption: [{ type: Input }],
|
|
3099
3110
|
columnsNumber: [{ type: Input }],
|
|
3100
|
-
ViewDomRightTemplate: [{ type: ContentChild, args: [
|
|
3111
|
+
ViewDomRightTemplate: [{ type: ContentChild, args: ['ViewDomRightTemplate', { static: false },] }],
|
|
3101
3112
|
deleteLineEvent: [{ type: Output }]
|
|
3102
3113
|
};
|
|
3103
3114
|
__decorate([
|