@qrvey/utils 1.7.0-4 → 1.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.
|
@@ -86,8 +86,10 @@ const defineXYChartFormat = (column, settings) => {
|
|
|
86
86
|
return columnDefaultFormat;
|
|
87
87
|
}
|
|
88
88
|
else if (hasDefaultFormat) {
|
|
89
|
+
if (!(outputFormat === null || outputFormat === void 0 ? void 0 : outputFormat.format))
|
|
90
|
+
return defaultDecimal;
|
|
89
91
|
if (!definition_1.STANDARD_NUMERIC_FORMATS.includes(outputFormat === null || outputFormat === void 0 ? void 0 : outputFormat.format)) {
|
|
90
|
-
return Object.assign(Object.assign({}, outputFormat), { template: outputFormat.format, format: "Duration" });
|
|
92
|
+
return Object.assign(Object.assign({}, outputFormat), { template: outputFormat === null || outputFormat === void 0 ? void 0 : outputFormat.format, format: "Duration" });
|
|
91
93
|
}
|
|
92
94
|
return Object.assign({}, outputFormat);
|
|
93
95
|
}
|
|
@@ -12,7 +12,9 @@ const getScopeSettings_1 = require("./getScopeSettings");
|
|
|
12
12
|
function getScopeColorSetting(settings, scope) {
|
|
13
13
|
const defaultColor = "#C0C0C0";
|
|
14
14
|
const scopeSetting = (0, getScopeSettings_1.getScopeSettings)(settings, scope);
|
|
15
|
-
return
|
|
15
|
+
return settings.filterPanel.colorized &&
|
|
16
|
+
!(0, isEmpty_1.isEmpty)(scopeSetting) &&
|
|
17
|
+
scopeSetting.colorized
|
|
16
18
|
? scopeSetting.color
|
|
17
19
|
: defaultColor;
|
|
18
20
|
}
|
|
@@ -83,8 +83,10 @@ export const defineXYChartFormat = (column, settings) => {
|
|
|
83
83
|
return columnDefaultFormat;
|
|
84
84
|
}
|
|
85
85
|
else if (hasDefaultFormat) {
|
|
86
|
+
if (!(outputFormat === null || outputFormat === void 0 ? void 0 : outputFormat.format))
|
|
87
|
+
return defaultDecimal;
|
|
86
88
|
if (!STANDARD_NUMERIC_FORMATS.includes(outputFormat === null || outputFormat === void 0 ? void 0 : outputFormat.format)) {
|
|
87
|
-
return Object.assign(Object.assign({}, outputFormat), { template: outputFormat.format, format: "Duration" });
|
|
89
|
+
return Object.assign(Object.assign({}, outputFormat), { template: outputFormat === null || outputFormat === void 0 ? void 0 : outputFormat.format, format: "Duration" });
|
|
88
90
|
}
|
|
89
91
|
return Object.assign({}, outputFormat);
|
|
90
92
|
}
|
|
@@ -9,7 +9,9 @@ import { getScopeSettings } from "./getScopeSettings";
|
|
|
9
9
|
export function getScopeColorSetting(settings, scope) {
|
|
10
10
|
const defaultColor = "#C0C0C0";
|
|
11
11
|
const scopeSetting = getScopeSettings(settings, scope);
|
|
12
|
-
return
|
|
12
|
+
return settings.filterPanel.colorized &&
|
|
13
|
+
!isEmpty(scopeSetting) &&
|
|
14
|
+
scopeSetting.colorized
|
|
13
15
|
? scopeSetting.color
|
|
14
16
|
: defaultColor;
|
|
15
17
|
}
|