bruce-models 2.9.7 → 2.9.8
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 +38 -34
- package/dist/bruce-models.es5.js.map +1 -1
- package/dist/bruce-models.umd.js +38 -34
- package/dist/bruce-models.umd.js.map +1 -1
- package/dist/lib/bruce-models.js +1 -1
- package/dist/lib/entity/entity.js +3 -1
- package/dist/lib/entity/entity.js.map +1 -1
- package/dist/lib/entity/getters/entity-filter-getter.js +2 -0
- package/dist/lib/entity/getters/entity-filter-getter.js.map +1 -1
- package/dist/lib/plugin/plugin.js +32 -32
- package/dist/types/bruce-models.d.ts +1 -1
- package/dist/types/entity/entity.d.ts +1 -0
- package/package.json +1 -1
package/dist/bruce-models.es5.js
CHANGED
|
@@ -2314,6 +2314,7 @@ var Entity;
|
|
|
2314
2314
|
}
|
|
2315
2315
|
Entity.CalculateName = CalculateName;
|
|
2316
2316
|
function GetList(params) {
|
|
2317
|
+
var _a;
|
|
2317
2318
|
return __awaiter(this, void 0, void 0, function* () {
|
|
2318
2319
|
let { api, filter, req: reqParams, viaCdn, viaCdnCacheToken } = params;
|
|
2319
2320
|
if (!api) {
|
|
@@ -2324,8 +2325,9 @@ var Entity;
|
|
|
2324
2325
|
requestFilter = Object.assign({}, filter.entityTypeConditions);
|
|
2325
2326
|
}
|
|
2326
2327
|
if (filter.layerIds != null && filter.layerIds.length > 0) {
|
|
2328
|
+
const operator = (_a = filter.layerIdsOperator) !== null && _a !== void 0 ? _a : "equals";
|
|
2327
2329
|
requestFilter["Bruce.Layer.ID"] = {
|
|
2328
|
-
|
|
2330
|
+
[operator]: filter.layerIds
|
|
2329
2331
|
};
|
|
2330
2332
|
}
|
|
2331
2333
|
if (filter.bounds) {
|
|
@@ -5137,6 +5139,8 @@ var EntityFilterGetter;
|
|
|
5137
5139
|
pageIndex: curCell.FetchPageIndex,
|
|
5138
5140
|
entityTypeId: this.typeId,
|
|
5139
5141
|
layerIds: this.tagIds,
|
|
5142
|
+
// Any tag specified will be allowed.
|
|
5143
|
+
layerIdsOperator: "in",
|
|
5140
5144
|
bounds: curCell.GetBounds(),
|
|
5141
5145
|
sortOrder: Api.ESortOrder.Asc,
|
|
5142
5146
|
entityTypeConditions: this.attrFilter
|
|
@@ -8932,40 +8936,40 @@ var Plugin;
|
|
|
8932
8936
|
window[paramsId] = pluginParams ? pluginParams : {};
|
|
8933
8937
|
const disposeId = ObjectUtils.UId();
|
|
8934
8938
|
const elementId = ObjectUtils.UId();
|
|
8935
|
-
let script = `
|
|
8936
|
-
function run() {
|
|
8937
|
-
${fileContent}
|
|
8938
|
-
|
|
8939
|
-
const paramsId = "${paramsId}";
|
|
8940
|
-
const containerId = "${containerId}";
|
|
8941
|
-
let container;
|
|
8942
|
-
if (containerId) {
|
|
8943
|
-
container = document.getElementById("${containerId}");
|
|
8944
|
-
}
|
|
8945
|
-
|
|
8946
|
-
let pluginHTML = null;
|
|
8947
|
-
if (container) {
|
|
8948
|
-
pluginHTML = document.createElement("div");
|
|
8949
|
-
pluginHTML.id = "${elementId}";
|
|
8950
|
-
container.appendChild(pluginHTML);
|
|
8951
|
-
}
|
|
8952
|
-
|
|
8953
|
-
{TEMPLATE_CODE}
|
|
8954
|
-
const params = window["${paramsId}"];
|
|
8955
|
-
|
|
8956
|
-
window["${disposeId}"] = Run({
|
|
8957
|
-
element: pluginHTML,
|
|
8958
|
-
container: container,
|
|
8959
|
-
pluginParams: params
|
|
8960
|
-
});
|
|
8961
|
-
}
|
|
8962
|
-
run();
|
|
8939
|
+
let script = `
|
|
8940
|
+
function run() {
|
|
8941
|
+
${fileContent}
|
|
8942
|
+
|
|
8943
|
+
const paramsId = "${paramsId}";
|
|
8944
|
+
const containerId = "${containerId}";
|
|
8945
|
+
let container;
|
|
8946
|
+
if (containerId) {
|
|
8947
|
+
container = document.getElementById("${containerId}");
|
|
8948
|
+
}
|
|
8949
|
+
|
|
8950
|
+
let pluginHTML = null;
|
|
8951
|
+
if (container) {
|
|
8952
|
+
pluginHTML = document.createElement("div");
|
|
8953
|
+
pluginHTML.id = "${elementId}";
|
|
8954
|
+
container.appendChild(pluginHTML);
|
|
8955
|
+
}
|
|
8956
|
+
|
|
8957
|
+
{TEMPLATE_CODE}
|
|
8958
|
+
const params = window["${paramsId}"];
|
|
8959
|
+
|
|
8960
|
+
window["${disposeId}"] = Run({
|
|
8961
|
+
element: pluginHTML,
|
|
8962
|
+
container: container,
|
|
8963
|
+
pluginParams: params
|
|
8964
|
+
});
|
|
8965
|
+
}
|
|
8966
|
+
run();
|
|
8963
8967
|
`;
|
|
8964
8968
|
if (script.includes("var template")) {
|
|
8965
|
-
script = script.replace("{TEMPLATE_CODE}", `
|
|
8966
|
-
if (pluginHTML && template) {
|
|
8967
|
-
pluginHTML.innerHTML = template;
|
|
8968
|
-
}
|
|
8969
|
+
script = script.replace("{TEMPLATE_CODE}", `
|
|
8970
|
+
if (pluginHTML && template) {
|
|
8971
|
+
pluginHTML.innerHTML = template;
|
|
8972
|
+
}
|
|
8969
8973
|
`);
|
|
8970
8974
|
}
|
|
8971
8975
|
else {
|
|
@@ -9104,7 +9108,7 @@ var DataSource;
|
|
|
9104
9108
|
DataSource.GetList = GetList;
|
|
9105
9109
|
})(DataSource || (DataSource = {}));
|
|
9106
9110
|
|
|
9107
|
-
const VERSION = "2.9.
|
|
9111
|
+
const VERSION = "2.9.8";
|
|
9108
9112
|
|
|
9109
9113
|
export { VERSION, AnnDocument, CustomForm, AbstractApi, Api, BruceApi, CamApi, IdmApi, GlobalApi, GuardianApi, ApiGetters, Calculator, Bounds, BruceEvent, CacheControl, Camera, Cartes, Carto, Color, DelayQueue, Geometry, UTC, BruceVariable, LRUCache, EntityAttachmentType, EntityAttachment, EntityComment, EntityLink, EntityLod, EntityLodCategory, EntityRelationType, EntityRelation, EntitySource, EntityTag, EntityType, Entity, EntityGlobe, EntityFilterGetter, BatchedDataGetter, EntityCoords, EntityTypeVisualSettings, EntityAttribute, ClientFile, ProgramKey, ZoomControl, MenuItem, ProjectViewBookmark, ProjectView, ProjectViewLegacyTile, ProjectViewTile, PendingAction, MessageBroker, HostingLocation, Style, Tileset, Permission, Session, UserGroup, User, Account, AccountInvite, EncryptUtils, MathUtils, ObjectUtils, PathUtils, UrlUtils, DataLab, ImportCad, ImportCsv, ImportJson, ImportKml, ImportedFile, Markup, Uploader, Plugin, ENVIRONMENT, DataSource };
|
|
9110
9114
|
//# sourceMappingURL=bruce-models.es5.js.map
|