bruce-models 1.8.5 → 1.8.7
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/dist/bruce-models.es5.js +12 -8
- package/dist/bruce-models.es5.js.map +1 -1
- package/dist/bruce-models.umd.js +12 -8
- package/dist/bruce-models.umd.js.map +1 -1
- package/dist/lib/api/abstract-api.js +1 -1
- package/dist/lib/api/abstract-api.js.map +1 -1
- package/dist/lib/entity/entity-attachment.js +1 -1
- package/dist/lib/entity/entity-attachment.js.map +1 -1
- package/dist/lib/entity/getters/entity-filter-getter.js +10 -6
- package/dist/lib/entity/getters/entity-filter-getter.js.map +1 -1
- package/package.json +1 -1
package/dist/bruce-models.es5.js
CHANGED
|
@@ -681,7 +681,7 @@ class AbstractApi {
|
|
|
681
681
|
}
|
|
682
682
|
else {
|
|
683
683
|
formData = new FormData();
|
|
684
|
-
if (params.formData) {
|
|
684
|
+
if (params === null || params === void 0 ? void 0 : params.formData) {
|
|
685
685
|
for (const key in params.formData) {
|
|
686
686
|
formData.append(key, params.formData[key]);
|
|
687
687
|
}
|
|
@@ -3046,7 +3046,7 @@ var EntityAttachment;
|
|
|
3046
3046
|
throw ("Entity ID, Type ID, and File are required.");
|
|
3047
3047
|
}
|
|
3048
3048
|
const url = `entity/${entityId}/attachment/${typeId}`;
|
|
3049
|
-
const res = yield api.UPLOAD(url, file, reqParams);
|
|
3049
|
+
const res = yield api.UPLOAD(url, file, Api.PrepReqParams(reqParams));
|
|
3050
3050
|
api.Cache.RemoveByStartsWith(GetListCacheKey(entityId));
|
|
3051
3051
|
return {
|
|
3052
3052
|
attachment: res
|
|
@@ -4372,7 +4372,7 @@ var EntityFilterGetter;
|
|
|
4372
4372
|
this.viewAreaSub();
|
|
4373
4373
|
}
|
|
4374
4374
|
else {
|
|
4375
|
-
this.getterLoopId
|
|
4375
|
+
this.getterLoopId += 1;
|
|
4376
4376
|
this.viewAreaDispose();
|
|
4377
4377
|
}
|
|
4378
4378
|
}
|
|
@@ -4414,13 +4414,14 @@ var EntityFilterGetter;
|
|
|
4414
4414
|
let curCellIndex = cells.length > 0 ? 0 : null;
|
|
4415
4415
|
let postedScanning = false;
|
|
4416
4416
|
let postedLoading = false;
|
|
4417
|
+
let total = 0;
|
|
4417
4418
|
while (retryAttempts > 0 && curCellIndex != null) {
|
|
4418
|
-
if (this.getterLoopId != loopId) {
|
|
4419
|
-
break;
|
|
4420
|
-
}
|
|
4421
4419
|
if (retryDelay > 0) {
|
|
4422
4420
|
yield delay(retryDelay);
|
|
4423
4421
|
}
|
|
4422
|
+
if (this.getterLoopId != loopId) {
|
|
4423
|
+
break;
|
|
4424
|
+
}
|
|
4424
4425
|
if (!postedScanning) {
|
|
4425
4426
|
this.postStatus({ msg: EStatus.Scanning, revoking: false });
|
|
4426
4427
|
postedScanning = true;
|
|
@@ -4435,13 +4436,13 @@ var EntityFilterGetter;
|
|
|
4435
4436
|
continue;
|
|
4436
4437
|
}
|
|
4437
4438
|
try {
|
|
4438
|
-
|
|
4439
|
+
let { entities } = yield Entity.GetList({
|
|
4439
4440
|
api: this.api,
|
|
4440
4441
|
filter: {
|
|
4441
4442
|
pageSize: PAGE_SIZE,
|
|
4442
4443
|
pageIndex: curCell.FetchPageIndex,
|
|
4443
4444
|
entityTypeId: this.typeId,
|
|
4444
|
-
|
|
4445
|
+
layerIds: this.tagIds,
|
|
4445
4446
|
bounds: curCell.GetBounds(),
|
|
4446
4447
|
sortOrder: Api.ESortOrder.Asc,
|
|
4447
4448
|
entityTypeConditions: this.attrFilter
|
|
@@ -4455,6 +4456,9 @@ var EntityFilterGetter;
|
|
|
4455
4456
|
if (this.getterLoopId != loopId) {
|
|
4456
4457
|
break;
|
|
4457
4458
|
}
|
|
4459
|
+
if (entities.length) {
|
|
4460
|
+
total += entities.length;
|
|
4461
|
+
}
|
|
4458
4462
|
if (!postedLoading) {
|
|
4459
4463
|
this.postStatus({ msg: EStatus.Loading, revoking: false });
|
|
4460
4464
|
postedLoading = true;
|