npm - bruce-models - Versions diffs - 1.1.1 → 1.1.3 - Mend

bruce-models 1.1.1 → 1.1.3

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.

Files changed (7) hide show

package/dist/bruce-models.es5.js +28 -19
package/dist/bruce-models.es5.js.map +1 -1
package/dist/bruce-models.umd.js +28 -19
package/dist/bruce-models.umd.js.map +1 -1
package/dist/lib/calculator/calculator.js +28 -19
package/dist/lib/calculator/calculator.js.map +1 -1
package/package.json +1 -1

package/dist/bruce-models.umd.js CHANGED Viewed

@@ -1697,8 +1697,8 @@
             return [];
         }
         if (path.startsWith("${") && path.endsWith("}")) {
-            path.replace("${", "");
-            path.replace("}", "");
+            path = path.replace("${", "");
+            path = path.replace("}", "");
             return exports.PathUtils.ParseLegacy(path);
         }
         return exports.PathUtils.Parse(path);
@@ -1822,31 +1822,40 @@
         Calculator.GetColor = GetColor;
         function GetMappingValue(value, entity) {
             const attrPath = parseLegacyPath(value.field);
-            const eValue = +exports.Entity.GetValue(entity, attrPath);
+            const eValue = exports.Entity.GetValue(entity, attrPath);
+            const isValueNum = !isNaN(+eValue);
             for (let i = 0; i < value.values.length; i++) {
                 const option = value.values[i];
                 const mapValue = option.fieldValue;
-                if (+mapValue == eValue) {
-                    return option.appliedValue;
-                }
-                const mapSplit = mapValue.split("-");
-                if (mapSplit.length == 2) {
-                    const min = mapSplit[0];
-                    const max = mapSplit[1];
-                    if (min != "") {
-                        if (eValue < +min) {
-                            continue;
-                        }
+                const isMapValueNum = !isNaN(+mapValue);
+                if (isValueNum && isMapValueNum) {
+                    if (+mapValue == +eValue) {
+                        return option.appliedValue;
                     }
-                    if (max != "") {
-                        if (eValue > +max) {
+                    const mapSplit = mapValue.split("-");
+                    if (mapSplit.length == 2) {
+                        const min = mapSplit[0];
+                        const max = mapSplit[1];
+                        if (min != "") {
+                            if (+eValue < +min) {
+                                continue;
+                            }
+                        }
+                        if (max != "") {
+                            if (+eValue > +max) {
+                                continue;
+                            }
+                        }
+                        if (min == "" && max == "") {
                             continue;
                         }
+                        return option.appliedValue;
                     }
-                    if (min == "" && max == "") {
-                        continue;
+                }
+                else {
+                    if (mapValue == eValue) {
+                        return option.appliedValue;
                     }
-                    return option.appliedValue;
                 }
             }
             return null;