bruce-models 2.6.8 → 2.6.9
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 +31 -3
- package/dist/bruce-models.es5.js.map +1 -1
- package/dist/bruce-models.umd.js +31 -3
- package/dist/bruce-models.umd.js.map +1 -1
- package/dist/lib/bruce-models.js +1 -1
- package/dist/lib/calculator/calculator.js +30 -2
- package/dist/lib/calculator/calculator.js.map +1 -1
- package/dist/types/bruce-models.d.ts +1 -1
- package/package.json +1 -1
package/dist/bruce-models.es5.js
CHANGED
|
@@ -5386,7 +5386,7 @@ function parseLegacyPath(path) {
|
|
|
5386
5386
|
if (!path) {
|
|
5387
5387
|
return [];
|
|
5388
5388
|
}
|
|
5389
|
-
|
|
5389
|
+
let paths = [];
|
|
5390
5390
|
if (path.startsWith("${") && path.endsWith("}")) {
|
|
5391
5391
|
path = path.replace("${", "");
|
|
5392
5392
|
path = path.replace("}", "");
|
|
@@ -5397,6 +5397,34 @@ function parseLegacyPath(path) {
|
|
|
5397
5397
|
paths.push([path]);
|
|
5398
5398
|
// Split by backslashes.
|
|
5399
5399
|
paths.push(PathUtils.Parse(path));
|
|
5400
|
+
// Remove duplicates.
|
|
5401
|
+
const tmpPaths = [];
|
|
5402
|
+
for (let i = 0; i < paths.length; i++) {
|
|
5403
|
+
const path = paths[i];
|
|
5404
|
+
let found = false;
|
|
5405
|
+
for (let j = 0; j < tmpPaths.length; j++) {
|
|
5406
|
+
const tmpPath = tmpPaths[j];
|
|
5407
|
+
if (tmpPath.length == path.length) {
|
|
5408
|
+
let match = true;
|
|
5409
|
+
for (let k = 0; k < tmpPath.length; k++) {
|
|
5410
|
+
const tmpPathPart = tmpPath[k];
|
|
5411
|
+
const pathPart = path[k];
|
|
5412
|
+
if (tmpPathPart != pathPart) {
|
|
5413
|
+
match = false;
|
|
5414
|
+
break;
|
|
5415
|
+
}
|
|
5416
|
+
}
|
|
5417
|
+
if (match) {
|
|
5418
|
+
found = true;
|
|
5419
|
+
break;
|
|
5420
|
+
}
|
|
5421
|
+
}
|
|
5422
|
+
}
|
|
5423
|
+
if (!found) {
|
|
5424
|
+
tmpPaths.push(path);
|
|
5425
|
+
}
|
|
5426
|
+
}
|
|
5427
|
+
paths = tmpPaths;
|
|
5400
5428
|
return paths;
|
|
5401
5429
|
}
|
|
5402
5430
|
/**
|
|
@@ -5609,7 +5637,7 @@ var Calculator;
|
|
|
5609
5637
|
const option = value.values[i];
|
|
5610
5638
|
const mapValue = option.fieldValue;
|
|
5611
5639
|
const isMapValueNum = !isNaN(+mapValue);
|
|
5612
|
-
if (isValueNum && isMapValueNum) {
|
|
5640
|
+
if (isValueNum && (isMapValueNum || mapValue.includes("-"))) {
|
|
5613
5641
|
if (+mapValue == +eValue) {
|
|
5614
5642
|
return option.appliedValue;
|
|
5615
5643
|
}
|
|
@@ -11894,7 +11922,7 @@ var DataSource;
|
|
|
11894
11922
|
DataSource.GetList = GetList;
|
|
11895
11923
|
})(DataSource || (DataSource = {}));
|
|
11896
11924
|
|
|
11897
|
-
const VERSION$1 = "2.6.
|
|
11925
|
+
const VERSION$1 = "2.6.9";
|
|
11898
11926
|
|
|
11899
11927
|
export { VERSION$1 as VERSION, AnnDocument, CustomForm, CustomFormContent, 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 };
|
|
11900
11928
|
//# sourceMappingURL=bruce-models.es5.js.map
|