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
|
@@ -1812,11 +1812,13 @@
|
|
|
1812
1812
|
dom.down = (/**
|
|
1813
1813
|
* @return {?}
|
|
1814
1814
|
*/
|
|
1815
|
-
function () {
|
|
1815
|
+
function () {
|
|
1816
|
+
});
|
|
1816
1817
|
dom.up = (/**
|
|
1817
1818
|
* @return {?}
|
|
1818
1819
|
*/
|
|
1819
|
-
function () {
|
|
1820
|
+
function () {
|
|
1821
|
+
});
|
|
1820
1822
|
}
|
|
1821
1823
|
}
|
|
1822
1824
|
}
|
|
@@ -2093,7 +2095,8 @@
|
|
|
2093
2095
|
else if (dom instanceof core.ElementRef) {
|
|
2094
2096
|
dom.nativeElement.blur();
|
|
2095
2097
|
}
|
|
2096
|
-
else {
|
|
2098
|
+
else {
|
|
2099
|
+
}
|
|
2097
2100
|
}
|
|
2098
2101
|
};
|
|
2099
2102
|
/**
|
|
@@ -2110,7 +2113,6 @@
|
|
|
2110
2113
|
this.activeDomX = x;
|
|
2111
2114
|
this.activeDomY = y;
|
|
2112
2115
|
this.activeDom = this.collectDomList[this.activeDomX][this.activeDomY];
|
|
2113
|
-
console.log('this.activeDom', this.activeDom);
|
|
2114
2116
|
if (this.activeDom instanceof ngZorroAntd.NzSelectComponent) {
|
|
2115
2117
|
this.setActiveSelectedComponentOpen(this.activeDom.open);
|
|
2116
2118
|
}
|
|
@@ -2442,7 +2444,10 @@
|
|
|
2442
2444
|
*/
|
|
2443
2445
|
function (item) {
|
|
2444
2446
|
// 新增行 初始数据都为null
|
|
2445
|
-
formGroupObj[item.name] = _this.fb.control({
|
|
2447
|
+
formGroupObj[item.name] = _this.fb.control({
|
|
2448
|
+
value: formLinesDataItem[item.name] === 0 ? 0 : (formLinesDataItem[item.name] || item.value || null),
|
|
2449
|
+
disabled: item.disabled
|
|
2450
|
+
}, item.require ? [forms.Validators.required] : []);
|
|
2446
2451
|
if (item.selectOption && item.selectOption.label) {
|
|
2447
2452
|
formGroupObj[item.selectOption.label] = _this.fb.control(formLinesDataItem[item.selectOption.label] || null, []);
|
|
2448
2453
|
}
|
|
@@ -2729,8 +2734,8 @@
|
|
|
2729
2734
|
}), 0);
|
|
2730
2735
|
};
|
|
2731
2736
|
/**
|
|
2732
|
-
|
|
2733
|
-
|
|
2737
|
+
* 定义空的newLineItem 结构
|
|
2738
|
+
*/
|
|
2734
2739
|
/**
|
|
2735
2740
|
* 定义空的newLineItem 结构
|
|
2736
2741
|
* @private
|
|
@@ -2751,7 +2756,10 @@
|
|
|
2751
2756
|
*/
|
|
2752
2757
|
function (item) {
|
|
2753
2758
|
// 新增行 初始数据都为null
|
|
2754
|
-
formGroupObj[item.name] = _this.fb.control({
|
|
2759
|
+
formGroupObj[item.name] = _this.fb.control({
|
|
2760
|
+
value: item.value,
|
|
2761
|
+
disabled: item.disabled
|
|
2762
|
+
} || null, item.require && !item.hide ? [forms.Validators.required] : []);
|
|
2755
2763
|
}));
|
|
2756
2764
|
formGroupObj.lineIndex = this.fb.control(this.linesFormArray.controls.length, []);
|
|
2757
2765
|
// 用来标识是否是搜索状态下新增的行
|
|
@@ -2840,7 +2848,10 @@
|
|
|
2840
2848
|
*/
|
|
2841
2849
|
function (item) {
|
|
2842
2850
|
// 新增行 初始数据都为null
|
|
2843
|
-
formGroupObj[item.name] = _this.fb.control({
|
|
2851
|
+
formGroupObj[item.name] = _this.fb.control({
|
|
2852
|
+
value: formLinesDataItem[item.name] === 0 ? 0 : (formLinesDataItem[item.name] || item.value || null),
|
|
2853
|
+
disabled: item.disabled
|
|
2854
|
+
}, item.require ? [forms.Validators.required] : []);
|
|
2844
2855
|
if (item.selectOption && item.selectOption.label) {
|
|
2845
2856
|
formGroupObj[item.selectOption.label] = _this.fb.control(formLinesDataItem[item.selectOption.label] || null, []);
|
|
2846
2857
|
}
|
|
@@ -3302,7 +3313,7 @@
|
|
|
3302
3313
|
showTotal: [{ type: core.Input }],
|
|
3303
3314
|
totalOption: [{ type: core.Input }],
|
|
3304
3315
|
columnsNumber: [{ type: core.Input }],
|
|
3305
|
-
ViewDomRightTemplate: [{ type: core.ContentChild, args: [
|
|
3316
|
+
ViewDomRightTemplate: [{ type: core.ContentChild, args: ['ViewDomRightTemplate', { static: false },] }],
|
|
3306
3317
|
deleteLineEvent: [{ type: core.Output }]
|
|
3307
3318
|
};
|
|
3308
3319
|
__decorate([
|