fantasy-ngzorro 1.3.43 → 1.3.45
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 -3
- 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-detail-form/hd-detail-form.component.js +2 -2
- package/esm2015/hd-form-lines/hd-form-lines.component.js +15 -3
- package/esm2015/model/common-type.js +3 -1
- package/esm5/hd-detail-form/hd-detail-form.component.js +2 -2
- package/esm5/hd-form-lines/hd-form-lines.component.js +19 -3
- package/esm5/model/common-type.js +3 -1
- package/fantasy-ngzorro.metadata.json +1 -1
- package/fesm2015/fantasy-ngzorro.js +17 -3
- package/fesm2015/fantasy-ngzorro.js.map +1 -1
- package/fesm5/fantasy-ngzorro.js +21 -3
- package/fesm5/fantasy-ngzorro.js.map +1 -1
- package/hd-form-lines/hd-form-lines.component.d.ts +1 -0
- package/model/common-type.d.ts +1 -0
- package/package.json +1 -1
package/fesm5/fantasy-ngzorro.js
CHANGED
|
@@ -292,7 +292,7 @@ var HdDetailFormComponent = /** @class */ (function () {
|
|
|
292
292
|
HdDetailFormComponent.decorators = [
|
|
293
293
|
{ type: Component, args: [{
|
|
294
294
|
selector: 'hd-detail-form',
|
|
295
|
-
template: "<nz-content class=\"hd-detail-form-container\">\n <nz-descriptions [nzColumn]=\"{ xxl: 4, xl: 3, lg: 3, md: 3, sm: 2, xs: 1 }\">\n <ng-container *ngFor=\"let col of formCols\">\n <nz-descriptions-item *ngIf=\"!col.click\" [nzTitle]=\"col.label\">\n <span [ngStyle]=\"{'color': col?.color ? col.color : null}\">{{(col.value === '0' || col.value === 0 || col.value\n )? col.value : '<\u7A7A>'}}</span>\n </nz-descriptions-item>\n <nz-descriptions-item *ngIf=\"col.click\" [nzTitle]=\"col.label\">\n <span [ngStyle]=\"{'color': col?.color ? col.color : null}\">\n <a (click)=\"triggerEvent(col.click || null)\">{{(col.value === '0' || col.value === 0 || col.value\n )? col.value : '<\u7A7A>'}}</a>\n </span>\n </nz-descriptions-item>\n </ng-container>\n </nz-descriptions>\n</nz-content
|
|
295
|
+
template: "<nz-content class=\"hd-detail-form-container\">\n <nz-descriptions [nzColumn]=\"{ xxl: 4, xl: 3, lg: 3, md: 3, sm: 2, xs: 1 }\">\n <ng-container *ngFor=\"let col of formCols\">\n <nz-descriptions-item *ngIf=\"!col.click\" [nzTitle]=\"col.label\">\n <span [ngStyle]=\"{'color': col?.color ? col.color : null}\">{{(col.value === '0' || col.value === 0 || col.value\n )? col.value : '<\u7A7A>'}}</span>\n </nz-descriptions-item>\n <nz-descriptions-item *ngIf=\"col.click\" [nzTitle]=\"col.label\">\n <span [ngStyle]=\"{'color': col?.color ? col.color : null}\" *ngIf=\"col.clickText\">\n {{(col.value === '0' || col.value === 0 || col.value\n )? col.value : '<\u7A7A>'}}\n <a (click)=\"triggerEvent(col.click || null)\"> {{ col.clickText }}</a>\n </span>\n <span [ngStyle]=\"{'color': col?.color ? col.color : null}\" *ngIf=\"!col.clickText\">\n <a (click)=\"triggerEvent(col.click || null)\">{{(col.value === '0' || col.value === 0 || col.value\n )? col.value : '<\u7A7A>'}}</a>\n </span>\n </nz-descriptions-item>\n </ng-container>\n </nz-descriptions>\n</nz-content>\n",
|
|
296
296
|
styles: ["::ng-deep .common-btn-group>a{font-size:12px;font-weight:400;color:#12a34f!important;white-space:nowrap}::ng-deep .common-btn-group .common-danger-btn:hover{color:#f05b24!important}::ng-deep .common-btn-group>a:hover{color:#20bd62!important}::ng-deep .common-btn-group>a:not(:last-child)::after{content:'';margin:0 2px}::ng-deep .common-billNumber>a{color:#3b77e3}button{box-shadow:unset;text-shadow:unset}::ng-deep .ant-form-item-label>label{color:#4b504e}::ng-deep .ant-input-number-input{height:28px}::ng-deep .ant-input-number{height:28px}textarea.ant-input{height:auto;min-height:28px}::ng-deep .ant-select-selection--multiple{min-height:28px}::ng-deep .ant-select-selection__rendered>ul>li{height:22px!important;margin-top:3px!important;line-height:22px!important}::ng-deep .ant-advanced-search-form .ant-form-item{margin-bottom:0!important}::ng-deep .ant-select-selection--single{height:28px!important}::ng-deep .ant-input{height:28px}::ng-deep .ant-input[disabled]:hover{border-color:#d9d9d9!important}::ng-deep .ant-select-selection__rendered{line-height:28px!important}::ng-deep .ant-calendar-range-picker-input{text-align:left!important}::ng-deep .ant-calendar-picker{width:100%!important}::ng-deep .ant-row{margin-right:0!important;margin-left:0!important}::ng-deep .ant-col-6{padding-left:12px;padding-right:12px}::ng-deep .ant-col-12{padding-left:12px;padding-right:12px}::ng-deep .ant-col-18{padding-left:12px;padding-right:12px}::ng-deep .ant-col-24{padding-left:12px;padding-right:12px}::ng-deep .ant-alert-info{background-color:#f5f8f6;border:1px solid #cfe3d4}:host ::ng-deep th{background:#f5f8f6!important;font-weight:700!important;white-space:nowrap;font-size:12px;font-family:PingFangSC-Medium,PingFang SC;color:#2a3634;padding:8px!important;box-sizing:border-box}:host ::ng-deep td{font-weight:400;font-style:normal;font-size:12px;color:#2a3634;text-align:left;white-space:nowrap;padding:8px!important;box-sizing:border-box}::ng-deep .ant-pagination-options{display:inline-flex;align-items:center}::ng-deep .ant-time-picker{width:100%}.ant-input-number-disabled,.ant-input[disabled],.ant-select-disabled{color:#4b504e}.hd-detail-form-container ::ng-deep .ant-descriptions-item-content{word-break:break-all;color:rgba(0,0,0,.85);font-weight:400}.hd-detail-form-container ::ng-deep .ant-descriptions-item-label{color:rgba(0,0,0,.65)}.hd-detail-form-container ::ng-deep .ant-descriptions-item{padding-top:6px!important;padding-bottom:6px!important}.hd-detail-form-container ::ng-deep td{white-space:unset!important}.hd-detail-form-container .ng-star-inserted,.hd-detail-form-container ::ng-deep .ant-descriptions-item{padding-left:0!important}"]
|
|
297
297
|
}] }
|
|
298
298
|
];
|
|
@@ -381,6 +381,8 @@ if (false) {
|
|
|
381
381
|
/** @type {?} */
|
|
382
382
|
HdOption.prototype.hide;
|
|
383
383
|
/** @type {?} */
|
|
384
|
+
HdOption.prototype.clickText;
|
|
385
|
+
/** @type {?} */
|
|
384
386
|
HdOption.prototype.click;
|
|
385
387
|
}
|
|
386
388
|
var SelectOption = /** @class */ (function () {
|
|
@@ -2260,7 +2262,7 @@ var HdFormLinesComponent = /** @class */ (function () {
|
|
|
2260
2262
|
function (item) {
|
|
2261
2263
|
// 新增行 初始数据都为null
|
|
2262
2264
|
formGroupObj[item.name] = _this.fb.control({
|
|
2263
|
-
value: formLinesDataItem[item.name]
|
|
2265
|
+
value: _this.judgeValueIsNotEmpty(formLinesDataItem[item.name]) ? formLinesDataItem[item.name] : (item.value || null),
|
|
2264
2266
|
disabled: item.disabled
|
|
2265
2267
|
}, item.require ? [Validators.required] : []);
|
|
2266
2268
|
if (item.selectOption && item.selectOption.label) {
|
|
@@ -2664,7 +2666,7 @@ var HdFormLinesComponent = /** @class */ (function () {
|
|
|
2664
2666
|
function (item) {
|
|
2665
2667
|
// 新增行 初始数据都为null
|
|
2666
2668
|
formGroupObj[item.name] = _this.fb.control({
|
|
2667
|
-
value: formLinesDataItem[item.name]
|
|
2669
|
+
value: _this.judgeValueIsNotEmpty(formLinesDataItem[item.name]) ? formLinesDataItem[item.name] : (item.value || null),
|
|
2668
2670
|
disabled: item.disabled
|
|
2669
2671
|
}, item.require ? [Validators.required] : []);
|
|
2670
2672
|
if (item.selectOption && item.selectOption.label) {
|
|
@@ -3099,6 +3101,22 @@ var HdFormLinesComponent = /** @class */ (function () {
|
|
|
3099
3101
|
return '<空>';
|
|
3100
3102
|
}
|
|
3101
3103
|
};
|
|
3104
|
+
/**
|
|
3105
|
+
* @param {?} str
|
|
3106
|
+
* @return {?}
|
|
3107
|
+
*/
|
|
3108
|
+
HdFormLinesComponent.prototype.judgeValueIsNotEmpty = /**
|
|
3109
|
+
* @param {?} str
|
|
3110
|
+
* @return {?}
|
|
3111
|
+
*/
|
|
3112
|
+
function (str) {
|
|
3113
|
+
if (str === null && str === undefined) {
|
|
3114
|
+
return false;
|
|
3115
|
+
}
|
|
3116
|
+
else {
|
|
3117
|
+
return true;
|
|
3118
|
+
}
|
|
3119
|
+
};
|
|
3102
3120
|
HdFormLinesComponent.decorators = [
|
|
3103
3121
|
{ type: Component, args: [{
|
|
3104
3122
|
selector: 'hd-form-lines',
|