bruce-models 1.8.5 → 1.8.6
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 +10 -6
- package/dist/bruce-models.es5.js.map +1 -1
- package/dist/bruce-models.umd.js +10 -6
- package/dist/bruce-models.umd.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.umd.js
CHANGED
|
@@ -4260,7 +4260,7 @@
|
|
|
4260
4260
|
this.viewAreaSub();
|
|
4261
4261
|
}
|
|
4262
4262
|
else {
|
|
4263
|
-
this.getterLoopId
|
|
4263
|
+
this.getterLoopId += 1;
|
|
4264
4264
|
this.viewAreaDispose();
|
|
4265
4265
|
}
|
|
4266
4266
|
}
|
|
@@ -4302,13 +4302,14 @@
|
|
|
4302
4302
|
let curCellIndex = cells.length > 0 ? 0 : null;
|
|
4303
4303
|
let postedScanning = false;
|
|
4304
4304
|
let postedLoading = false;
|
|
4305
|
+
let total = 0;
|
|
4305
4306
|
while (retryAttempts > 0 && curCellIndex != null) {
|
|
4306
|
-
if (this.getterLoopId != loopId) {
|
|
4307
|
-
break;
|
|
4308
|
-
}
|
|
4309
4307
|
if (retryDelay > 0) {
|
|
4310
4308
|
yield delay(retryDelay);
|
|
4311
4309
|
}
|
|
4310
|
+
if (this.getterLoopId != loopId) {
|
|
4311
|
+
break;
|
|
4312
|
+
}
|
|
4312
4313
|
if (!postedScanning) {
|
|
4313
4314
|
this.postStatus({ msg: EStatus.Scanning, revoking: false });
|
|
4314
4315
|
postedScanning = true;
|
|
@@ -4323,13 +4324,13 @@
|
|
|
4323
4324
|
continue;
|
|
4324
4325
|
}
|
|
4325
4326
|
try {
|
|
4326
|
-
|
|
4327
|
+
let { entities } = yield exports.Entity.GetList({
|
|
4327
4328
|
api: this.api,
|
|
4328
4329
|
filter: {
|
|
4329
4330
|
pageSize: PAGE_SIZE,
|
|
4330
4331
|
pageIndex: curCell.FetchPageIndex,
|
|
4331
4332
|
entityTypeId: this.typeId,
|
|
4332
|
-
|
|
4333
|
+
layerIds: this.tagIds,
|
|
4333
4334
|
bounds: curCell.GetBounds(),
|
|
4334
4335
|
sortOrder: exports.Api.ESortOrder.Asc,
|
|
4335
4336
|
entityTypeConditions: this.attrFilter
|
|
@@ -4343,6 +4344,9 @@
|
|
|
4343
4344
|
if (this.getterLoopId != loopId) {
|
|
4344
4345
|
break;
|
|
4345
4346
|
}
|
|
4347
|
+
if (entities.length) {
|
|
4348
|
+
total += entities.length;
|
|
4349
|
+
}
|
|
4346
4350
|
if (!postedLoading) {
|
|
4347
4351
|
this.postStatus({ msg: EStatus.Loading, revoking: false });
|
|
4348
4352
|
postedLoading = true;
|