@farris/ui-list-filter 0.1.19 → 0.1.21
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/farris-ui-list-filter.umd.js +21 -7
- package/bundles/farris-ui-list-filter.umd.js.map +1 -1
- package/bundles/farris-ui-list-filter.umd.min.js +1 -1
- package/bundles/farris-ui-list-filter.umd.min.js.map +1 -1
- package/esm2015/lib/controlcomponent/helpcomponent.ts/help.component.js +6 -2
- package/esm2015/lib/controlcomponent/numbercomponent/number.component.js +10 -2
- package/esm2015/lib/entity/controltype/help/helpcontrol.js +6 -1
- package/esm2015/lib/list-filter.component.js +16 -7
- package/esm2015/lib/service/list-filter.service.js +2 -1
- package/esm5/lib/controlcomponent/helpcomponent.ts/help.component.js +6 -2
- package/esm5/lib/controlcomponent/numbercomponent/number.component.js +10 -2
- package/esm5/lib/entity/controltype/help/helpcontrol.js +6 -1
- package/esm5/lib/list-filter.component.js +16 -7
- package/esm5/lib/service/list-filter.service.js +2 -1
- package/farris-ui-list-filter.metadata.json +1 -1
- package/fesm2015/farris-ui-list-filter.js +23 -9
- package/fesm2015/farris-ui-list-filter.js.map +1 -1
- package/fesm5/farris-ui-list-filter.js +23 -9
- package/fesm5/farris-ui-list-filter.js.map +1 -1
- package/lib/controlcomponent/helpcomponent.ts/help.component.d.ts +1 -0
- package/lib/controlcomponent/numbercomponent/number.component.d.ts +2 -0
- package/lib/entity/controltype/help/helpcontrol.d.ts +2 -0
- package/lib/list-filter.component.d.ts +1 -0
- package/package.json +1 -1
|
@@ -2325,6 +2325,7 @@
|
|
|
2325
2325
|
lookupEdit.required = filedSchema.control.hasOwnProperty('required') ? filedSchema.control.required : false;
|
|
2326
2326
|
lookupEdit.placeholder = filedSchema.control.placeholder ? filedSchema.control.placeholder : '';
|
|
2327
2327
|
lookupEdit.clearFields = filedSchema.control.hasOwnProperty('clearFields') ? filedSchema.control.clearFields : '';
|
|
2328
|
+
lookupEdit.editable = filedSchema.control.hasOwnProperty('editable') ? filedSchema.control.editable : false;
|
|
2328
2329
|
return lookupEdit;
|
|
2329
2330
|
};
|
|
2330
2331
|
/**
|
|
@@ -4236,6 +4237,8 @@
|
|
|
4236
4237
|
// 是否禁用
|
|
4237
4238
|
this.disabled = false;
|
|
4238
4239
|
this.filterPaddingNone = false;
|
|
4240
|
+
// 默认值是空值时执行查询,兼容旧方式
|
|
4241
|
+
this.defaultEmptyValueSearch = true;
|
|
4239
4242
|
this.query = new i0.EventEmitter();
|
|
4240
4243
|
this.clear = new i0.EventEmitter();
|
|
4241
4244
|
this.searchChange = new i0.EventEmitter();
|
|
@@ -4314,11 +4317,15 @@
|
|
|
4314
4317
|
*/ function (configs) {
|
|
4315
4318
|
var _this = this;
|
|
4316
4319
|
this._defaultValue = configs;
|
|
4317
|
-
|
|
4318
|
-
|
|
4319
|
-
|
|
4320
|
-
|
|
4321
|
-
|
|
4320
|
+
/** @type {?} */
|
|
4321
|
+
var canFilter = this.defaultEmptyValueSearch || configs && configs.length > 0;
|
|
4322
|
+
if (canFilter) {
|
|
4323
|
+
setTimeout(( /**
|
|
4324
|
+
* @return {?}
|
|
4325
|
+
*/function () {
|
|
4326
|
+
_this.setFilterValue(_this._defaultValue);
|
|
4327
|
+
}));
|
|
4328
|
+
}
|
|
4322
4329
|
},
|
|
4323
4330
|
enumerable: true,
|
|
4324
4331
|
configurable: true
|
|
@@ -5195,6 +5202,7 @@
|
|
|
5195
5202
|
filterClass: [{ type: i0.Input }],
|
|
5196
5203
|
filterPaddingNone: [{ type: i0.Input }],
|
|
5197
5204
|
filterType: [{ type: i0.Input }],
|
|
5205
|
+
defaultEmptyValueSearch: [{ type: i0.Input }],
|
|
5198
5206
|
defaultValue: [{ type: i0.Input }],
|
|
5199
5207
|
query: [{ type: i0.Output }],
|
|
5200
5208
|
clear: [{ type: i0.Output }],
|
|
@@ -5601,6 +5609,7 @@
|
|
|
5601
5609
|
* 判断是否显示label
|
|
5602
5610
|
*/
|
|
5603
5611
|
this.showlabel = true;
|
|
5612
|
+
this.editable = false;
|
|
5604
5613
|
/**
|
|
5605
5614
|
* 某个字段发生值变化事件时,需要同步清空的字段,可能不是当前字段
|
|
5606
5615
|
*/
|
|
@@ -5786,6 +5795,7 @@
|
|
|
5786
5795
|
else {
|
|
5787
5796
|
this.textValue = helpValue.textValue;
|
|
5788
5797
|
}
|
|
5798
|
+
this.editable = !!helpList_1.editable;
|
|
5789
5799
|
}
|
|
5790
5800
|
};
|
|
5791
5801
|
// getConditionItemStyle(field: QueryCondition, controlType: any) {
|
|
@@ -5824,7 +5834,7 @@
|
|
|
5824
5834
|
HelpComponent.decorators = [
|
|
5825
5835
|
{ type: i0.Component, args: [{
|
|
5826
5836
|
selector: 'app-filter-help',
|
|
5827
|
-
template: "<label class=\"col-form-label\" *ngIf=\"item && showlabel\" title=\"{{getConditionItemTitle(item)}}\">\r\n <span class=\"farris-label-info text-danger\" *ngIf=\"item.control.required\">*</span>\r\n <span class=\"farris-label-text\">{{item.fieldName}}</span>\r\n</label>\r\n<div class=\"farris-input-wrap\" *ngIf=\"item\">\r\n <farris-lookup-grid\r\n id=\"{{instanceId}}\"\r\n [uri]=\"uri\"\r\n [title]=\"title\"\r\n [idField]=\"idField\" \r\n [textField]=\"textField\" \r\n [valueField]=\"valueField\" \r\n [(ngModel)]=\"textValue\"\r\n [displayType]=\"displayType\"\r\n [editable]=\"
|
|
5837
|
+
template: "<label class=\"col-form-label\" *ngIf=\"item && showlabel\" title=\"{{getConditionItemTitle(item)}}\">\r\n <span class=\"farris-label-info text-danger\" *ngIf=\"item.control.required\">*</span>\r\n <span class=\"farris-label-text\">{{item.fieldName}}</span>\r\n</label>\r\n<div class=\"farris-input-wrap\" *ngIf=\"item\">\r\n <farris-lookup-grid\r\n id=\"{{instanceId}}\"\r\n [uri]=\"uri\"\r\n [title]=\"title\"\r\n [idField]=\"idField\" \r\n [textField]=\"textField\" \r\n [valueField]=\"valueField\" \r\n [(ngModel)]=\"textValue\"\r\n [displayType]=\"displayType\"\r\n [editable]=\"editable\"\r\n [readonly]=\"disabled\"\r\n (clear)=\"clearData($event)\"\r\n (selectedData)=\"selectedDataHandler($event)\"\r\n [placeholder]=\"placeholder\"\r\n [mapFields]=\"mapFields\"\r\n [dictPicking]=\"preEventCmd\"\r\n [dictPicked]=\"postEventCmd\"\r\n [context]=\"context\"\r\n [enableFullTree]=\"enableFullTree\"\r\n [loadTreeDataType]=\"loadTreeDataType\"\r\n [singleSelect]=\"singleSelect\"\r\n [expandLevel]=\"expandLevel\"\r\n [enableCascade]=\"enableCascade\"\r\n [clear-fields]=\"clearFields\"\r\n [useFavorite]=\"true\"\r\n >\r\n </farris-lookup-grid>\r\n\r\n <!-- [dictPicked]=\"onSearch\" -->\r\n <!-- (selectedData)=\"selectedDataHandler($event)\" -->\r\n</div>"
|
|
5828
5838
|
// providers: [{ provide: ServerSideToken, useClass: LookupHttpBeQueryService }]
|
|
5829
5839
|
}] }
|
|
5830
5840
|
];
|
|
@@ -6392,6 +6402,10 @@
|
|
|
6392
6402
|
else {
|
|
6393
6403
|
this.endPlaceHolder = this.item.endPlaceHolder;
|
|
6394
6404
|
}
|
|
6405
|
+
if (!this.bigNumber) {
|
|
6406
|
+
this.min = -2147483648;
|
|
6407
|
+
this.max = 2147483647;
|
|
6408
|
+
}
|
|
6395
6409
|
}
|
|
6396
6410
|
(( /** @type {?} */(this.item.value))).clear$.subscribe(( /**
|
|
6397
6411
|
* @return {?}
|
|
@@ -6535,7 +6549,7 @@
|
|
|
6535
6549
|
NumberComponent.decorators = [
|
|
6536
6550
|
{ type: i0.Component, args: [{
|
|
6537
6551
|
selector: 'app-filter-number',
|
|
6538
|
-
template: "<label class=\"col-form-label\" *ngIf=\"item && showlabel\" title=\"{{getConditionItemTitle(item)}}\">\r\n <span class=\"farris-label-info text-danger\" *ngIf=\"item.control.required\">*</span>\r\n <span class=\"farris-label-text\">{{item.fieldName}}</span>\r\n</label>\r\n<div class=\"farris-input-wrap d-flex\">\r\n <farris-number-range class=\"f-utils-fill-flex-row\" [canNull]=\"canNull\" [disabled]=\"disabled\" [beginValue]=\"beginValue\" [endValue]=\"endValue\" \r\n (beginValueChange)=\"beginValueChange($event)\" (endValueChange)=\"endValueChange($event)\" (valueChange)=\"numberChange($event)\" \r\n [beginPlaceHolder]=\"beginPlaceHolder\" [endPlaceHolder]=\"endPlaceHolder\" [placeholder]=\"placeholder\" [precision]=\"precision\" [bigNumber]=\"bigNumber\"></farris-number-range>\r\n</div>",
|
|
6552
|
+
template: "<label class=\"col-form-label\" *ngIf=\"item && showlabel\" title=\"{{getConditionItemTitle(item)}}\">\r\n <span class=\"farris-label-info text-danger\" *ngIf=\"item.control.required\">*</span>\r\n <span class=\"farris-label-text\">{{item.fieldName}}</span>\r\n</label>\r\n<div class=\"farris-input-wrap d-flex\">\r\n <farris-number-range class=\"f-utils-fill-flex-row\" [canNull]=\"canNull\" [disabled]=\"disabled\" [beginValue]=\"beginValue\" [endValue]=\"endValue\" \r\n (beginValueChange)=\"beginValueChange($event)\" (endValueChange)=\"endValueChange($event)\" (valueChange)=\"numberChange($event)\" \r\n [min]=\"min\" [max]=\"max\"\r\n [beginPlaceHolder]=\"beginPlaceHolder\" [endPlaceHolder]=\"endPlaceHolder\" [placeholder]=\"placeholder\" [precision]=\"precision\" [bigNumber]=\"bigNumber\"></farris-number-range>\r\n</div>",
|
|
6539
6553
|
styles: [""]
|
|
6540
6554
|
}] }
|
|
6541
6555
|
];
|