bruce-models 2.9.6 → 2.9.8

package/dist/bruce-models.umd.js

@@ -270,36 +270,32 @@
             }
         }
         GetCacheItem(key, reqParams) {
-            return __awaiter(this, void 0, void 0, function* () {
-                let noCache = reqParams === null || reqParams === void 0 ? void 0 : reqParams.noCache;
-                if (noCache == null) {
-                    noCache = exports.Api.DEFAULT_NO_CACHE;
-                }
-                if (noCache) {
-                    return null;
-                }
-                return this.Cache.Get(key);
-            });
+            let noCache = reqParams === null || reqParams === void 0 ? void 0 : reqParams.noCache;
+            if (noCache == null) {
+                noCache = exports.Api.DEFAULT_NO_CACHE;
+            }
+            if (noCache) {
+                return null;
+            }
+            return this.Cache.Get(key);
         }
         SetCacheItem(params) {
-            return __awaiter(this, void 0, void 0, function* () {
-                let { key, value, duration, req } = params;
-                let noCache = req === null || req === void 0 ? void 0 : req.noCache;
-                if (noCache == null) {
-                    noCache = exports.Api.DEFAULT_NO_CACHE;
-                }
-                if (noCache) {
-                    return;
-                }
-                if (isNaN(duration)) {
-                    duration = exports.Api.DEFAULT_CACHE_DURATION;
-                }
-                yield this.Cache.Set({
-                    id: key,
-                    data: value,
-                    duration,
-                    persistence: "memory"
-                });
+            let { key, value, duration, req } = params;
+            let noCache = req === null || req === void 0 ? void 0 : req.noCache;
+            if (noCache == null) {
+                noCache = exports.Api.DEFAULT_NO_CACHE;
+            }
+            if (noCache) {
+                return;
+            }
+            if (isNaN(duration)) {
+                duration = exports.Api.DEFAULT_CACHE_DURATION;
+            }
+            this.Cache.Set({
+                id: key,
+                data: value,
+                duration,
+                persistence: "memory"
             });
         }
         GetSessionId() {
@@ -2275,6 +2271,7 @@
         }
         Entity.CalculateName = CalculateName;
         function GetList(params) {
+            var _a;
             return __awaiter(this, void 0, void 0, function* () {
                 let { api, filter, req: reqParams, viaCdn, viaCdnCacheToken } = params;
                 if (!api) {
@@ -2285,8 +2282,9 @@
                     requestFilter = Object.assign({}, filter.entityTypeConditions);
                 }
                 if (filter.layerIds != null && filter.layerIds.length > 0) {
+                    const operator = (_a = filter.layerIdsOperator) !== null && _a !== void 0 ? _a : "equals";
                     requestFilter["Bruce.Layer.ID"] = {
-                        equals: filter.layerIds
+                        [operator]: filter.layerIds
                     };
                 }
                 if (filter.bounds) {
@@ -5015,6 +5013,8 @@
                                     pageIndex: curCell.FetchPageIndex,
                                     entityTypeId: this.typeId,
                                     layerIds: this.tagIds,
+                                    // Any tag specified will be allowed.
+                                    layerIdsOperator: "in",
                                     bounds: curCell.GetBounds(),
                                     sortOrder: exports.Api.ESortOrder.Asc,
                                     entityTypeConditions: this.attrFilter
@@ -8703,40 +8703,40 @@
                 window[paramsId] = pluginParams ? pluginParams : {};
                 const disposeId = exports.ObjectUtils.UId();
                 const elementId = exports.ObjectUtils.UId();
-                let script = `
-            function run() {
-                ${fileContent}
-
-                const paramsId = "${paramsId}";
-                const containerId = "${containerId}";
-                let container;
-                if (containerId) {
-                    container = document.getElementById("${containerId}");
-                }
-
-                let pluginHTML = null;
-                if (container) {
-                    pluginHTML = document.createElement("div");
-                    pluginHTML.id = "${elementId}";
-                    container.appendChild(pluginHTML);
-                }
-
-                {TEMPLATE_CODE}
-                const params = window["${paramsId}"];
-
-                window["${disposeId}"] = Run({
-                    element: pluginHTML,
-                    container: container,
-                    pluginParams: params
-                });
-            }
-            run();
+                let script = `
+            function run() {
+                ${fileContent}
+
+                const paramsId = "${paramsId}";
+                const containerId = "${containerId}";
+                let container;
+                if (containerId) {
+                    container = document.getElementById("${containerId}");
+                }
+
+                let pluginHTML = null;
+                if (container) {
+                    pluginHTML = document.createElement("div");
+                    pluginHTML.id = "${elementId}";
+                    container.appendChild(pluginHTML);
+                }
+
+                {TEMPLATE_CODE}
+                const params = window["${paramsId}"];
+
+                window["${disposeId}"] = Run({
+                    element: pluginHTML,
+                    container: container,
+                    pluginParams: params
+                });
+            }
+            run();
         `;
                 if (script.includes("var template")) {
-                    script = script.replace("{TEMPLATE_CODE}", `
-                if (pluginHTML && template) {
-                    pluginHTML.innerHTML = template;
-                }
+                    script = script.replace("{TEMPLATE_CODE}", `
+                if (pluginHTML && template) {
+                    pluginHTML.innerHTML = template;
+                }
             `);
                 }
                 else {
@@ -8874,7 +8874,7 @@
         DataSource.GetList = GetList;
     })(exports.DataSource || (exports.DataSource = {}));
 
-    const VERSION = "2.9.6";
+    const VERSION = "2.9.8";
 
     exports.VERSION = VERSION;
     exports.AbstractApi = AbstractApi;