bruce-models 2.6.8 → 2.7.0
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/dist/types/project/menu-item.d.ts +6 -6
- package/package.json +1 -1
package/dist/bruce-models.umd.js
CHANGED
|
@@ -5335,7 +5335,7 @@
|
|
|
5335
5335
|
if (!path) {
|
|
5336
5336
|
return [];
|
|
5337
5337
|
}
|
|
5338
|
-
|
|
5338
|
+
let paths = [];
|
|
5339
5339
|
if (path.startsWith("${") && path.endsWith("}")) {
|
|
5340
5340
|
path = path.replace("${", "");
|
|
5341
5341
|
path = path.replace("}", "");
|
|
@@ -5346,6 +5346,34 @@
|
|
|
5346
5346
|
paths.push([path]);
|
|
5347
5347
|
// Split by backslashes.
|
|
5348
5348
|
paths.push(exports.PathUtils.Parse(path));
|
|
5349
|
+
// Remove duplicates.
|
|
5350
|
+
const tmpPaths = [];
|
|
5351
|
+
for (let i = 0; i < paths.length; i++) {
|
|
5352
|
+
const path = paths[i];
|
|
5353
|
+
let found = false;
|
|
5354
|
+
for (let j = 0; j < tmpPaths.length; j++) {
|
|
5355
|
+
const tmpPath = tmpPaths[j];
|
|
5356
|
+
if (tmpPath.length == path.length) {
|
|
5357
|
+
let match = true;
|
|
5358
|
+
for (let k = 0; k < tmpPath.length; k++) {
|
|
5359
|
+
const tmpPathPart = tmpPath[k];
|
|
5360
|
+
const pathPart = path[k];
|
|
5361
|
+
if (tmpPathPart != pathPart) {
|
|
5362
|
+
match = false;
|
|
5363
|
+
break;
|
|
5364
|
+
}
|
|
5365
|
+
}
|
|
5366
|
+
if (match) {
|
|
5367
|
+
found = true;
|
|
5368
|
+
break;
|
|
5369
|
+
}
|
|
5370
|
+
}
|
|
5371
|
+
}
|
|
5372
|
+
if (!found) {
|
|
5373
|
+
tmpPaths.push(path);
|
|
5374
|
+
}
|
|
5375
|
+
}
|
|
5376
|
+
paths = tmpPaths;
|
|
5349
5377
|
return paths;
|
|
5350
5378
|
}
|
|
5351
5379
|
(function (Calculator) {
|
|
@@ -5553,7 +5581,7 @@
|
|
|
5553
5581
|
const option = value.values[i];
|
|
5554
5582
|
const mapValue = option.fieldValue;
|
|
5555
5583
|
const isMapValueNum = !isNaN(+mapValue);
|
|
5556
|
-
if (isValueNum && isMapValueNum) {
|
|
5584
|
+
if (isValueNum && (isMapValueNum || mapValue.includes("-"))) {
|
|
5557
5585
|
if (+mapValue == +eValue) {
|
|
5558
5586
|
return option.appliedValue;
|
|
5559
5587
|
}
|
|
@@ -11659,7 +11687,7 @@
|
|
|
11659
11687
|
DataSource.GetList = GetList;
|
|
11660
11688
|
})(exports.DataSource || (exports.DataSource = {}));
|
|
11661
11689
|
|
|
11662
|
-
const VERSION$1 = "2.
|
|
11690
|
+
const VERSION$1 = "2.7.0";
|
|
11663
11691
|
|
|
11664
11692
|
exports.VERSION = VERSION$1;
|
|
11665
11693
|
exports.AbstractApi = AbstractApi;
|