diff --git a/src/components/BulletWithSort.jsx b/src/components/BulletWithSort.jsx index 6e1ff6e..a4176d4 100644 --- a/src/components/BulletWithSort.jsx +++ b/src/components/BulletWithSort.jsx @@ -13,12 +13,12 @@ export default observer((props) => { // 处理进度图的数据格式, number -> array const dataParser = (origin) => { const { measureField, rangeField, targetField } = extProps; - const maxKPI = Math.max(...(origin || []).map((ele) => ele[targetField])); + const maxKPI = Math.max(...(origin || []).map((ele) => (ele?.[targetField] || 0))); const maxValue = Math.max(...(origin || []).map((ele) => ele[measureField])); const _max = Math.max(maxKPI, maxValue); const sortData = origin.sort(sortBy(measureField)).slice(-itemLength); // 顶格的值定在更远 - const _parseData = sortData?.map((ele) => ({ ...ele, [rangeField]: [0, Math.ceil(_max / 0.9)], [measureField]: [ele[measureField]] })); + const _parseData = sortData?.map((ele) => ({ ...ele, [rangeField]: [0, Math.ceil(_max / 0.9)], [measureField]: [ele[measureField]], [targetField]: (ele?.targetField || 0) })); return _parseData; }; diff --git a/src/components/DataFieldRadio.jsx b/src/components/DataFieldRadio.jsx index 773ec5d..3ad5d63 100644 --- a/src/components/DataFieldRadio.jsx +++ b/src/components/DataFieldRadio.jsx @@ -13,7 +13,7 @@ export default observer((props) => { const defaultVal = dataFieldOptions[0].value; const Component = () => - dataFieldOptions.length < 5 ? ( + dataFieldOptions.length < 6 ? ( handleChange(e.target.value)} defaultValue={defaultVal} {...extProps} /> ) : (