mirror of
https://github.com/apache/superset.git
synced 2026-05-12 19:35:17 +00:00
feat: Implement support for currencies in more charts (#24594)
(cherry picked from commit d74d7eca23)
This commit is contained in:
committed by
Michael S. Molina
parent
9a96d8cf8b
commit
6b366a2cff
@@ -21,7 +21,6 @@ import d3 from 'd3';
|
||||
import PropTypes from 'prop-types';
|
||||
import { extent as d3Extent } from 'd3-array';
|
||||
import {
|
||||
getNumberFormatter,
|
||||
getSequentialSchemeRegistry,
|
||||
CategoricalColorNamespace,
|
||||
} from '@superset-ui/core';
|
||||
@@ -47,10 +46,9 @@ const propTypes = {
|
||||
setDataMask: PropTypes.func,
|
||||
onContextMenu: PropTypes.func,
|
||||
emitCrossFilters: PropTypes.bool,
|
||||
formatter: PropTypes.object,
|
||||
};
|
||||
|
||||
const formatter = getNumberFormatter();
|
||||
|
||||
function WorldMap(element, props) {
|
||||
const {
|
||||
countryFieldtype,
|
||||
@@ -71,6 +69,7 @@ function WorldMap(element, props) {
|
||||
inContextMenu,
|
||||
filterState,
|
||||
emitCrossFilters,
|
||||
formatter,
|
||||
} = props;
|
||||
const div = d3.select(element);
|
||||
div.classed('superset-legacy-chart-world-map', true);
|
||||
|
||||
@@ -17,6 +17,7 @@
|
||||
* under the License.
|
||||
*/
|
||||
import { rgb } from 'd3-color';
|
||||
import { getValueFormatter } from '@superset-ui/core';
|
||||
|
||||
export default function transformProps(chartProps) {
|
||||
const {
|
||||
@@ -28,6 +29,7 @@ export default function transformProps(chartProps) {
|
||||
inContextMenu,
|
||||
filterState,
|
||||
emitCrossFilters,
|
||||
datasource,
|
||||
} = chartProps;
|
||||
const { onContextMenu, setDataMask } = hooks;
|
||||
const {
|
||||
@@ -40,8 +42,17 @@ export default function transformProps(chartProps) {
|
||||
colorBy,
|
||||
colorScheme,
|
||||
sliceId,
|
||||
metric,
|
||||
} = formData;
|
||||
const { r, g, b } = colorPicker;
|
||||
const { currencyFormats = {}, columnFormats = {} } = datasource;
|
||||
|
||||
const formatter = getValueFormatter(
|
||||
metric,
|
||||
currencyFormats,
|
||||
columnFormats,
|
||||
undefined,
|
||||
);
|
||||
|
||||
return {
|
||||
countryFieldtype,
|
||||
@@ -61,5 +72,6 @@ export default function transformProps(chartProps) {
|
||||
inContextMenu,
|
||||
filterState,
|
||||
emitCrossFilters,
|
||||
formatter,
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user