diff --git a/src/charts/Orders.jsx b/src/charts/Orders.jsx index 55e6b29..eabb648 100644 --- a/src/charts/Orders.jsx +++ b/src/charts/Orders.jsx @@ -34,7 +34,7 @@ class Orders extends Component { // xAxis: { // type: 'timeCat', // }, - smooth: true, + // smooth: true, legend: { position: 'right-top', title: { diff --git a/src/components/MixYnQ.jsx b/src/components/MixYnQ.jsx index 1a24c28..d990e1d 100644 --- a/src/components/MixYnQ.jsx +++ b/src/components/MixYnQ.jsx @@ -1,5 +1,5 @@ import { observer } from 'mobx-react'; -import { Mix } from '@ant-design/plots'; +import { Mix, getCanvasPattern } from '@ant-design/plots'; import { merge, isEmpty, cloneDeep } from '../utils/commons'; import { dataFieldAlias } from '../libs/ht'; @@ -66,7 +66,18 @@ export default observer((props) => { // lineDash: [2, 2], lineWidth: 0.5, }, - },]; + }, + ]; + + const pattern = (datum, color) => { + return getCanvasPattern({ + type: String(datum.yGroup).includes(' ') ? 'line' : '', + cfg: { + backgroundColor: color, + }, + }); + }; + const MixConfig = { appendPadding: 15, height: 600, @@ -147,7 +158,7 @@ export default observer((props) => { // color: '#b32b19', // color: '#f58269', legend: false, // {}, - smooth: true, + // smooth: true, yAxis: { type: 'linear', tickCount: 4, @@ -162,6 +173,8 @@ export default observer((props) => { }, }, label: false, + color: COLOR_SETS2, + pattern, }, }, { @@ -181,7 +194,7 @@ export default observer((props) => { { yField: dataFieldAlias[yFields[1]] } ), // color: '#1AAF8B', - smooth: true, + // smooth: true, point: { size: 4, shape: 'cicle', @@ -202,6 +215,17 @@ export default observer((props) => { lineWidth: 1, }, }, + lineStyle: (datum) => { + if (String(datum.yGroup).includes(' ')) { + return { + lineDash: [4, 4], + opacity: 0.75, + }; + } + return { + opacity: 1, + }; + }, }, }, { diff --git a/src/views/Home.jsx b/src/views/Home.jsx index 22d87b2..f9b3ecb 100644 --- a/src/views/Home.jsx +++ b/src/views/Home.jsx @@ -133,7 +133,7 @@ export default observer(() => { xAxis: { type: 'cat', }, - smooth: true, + // smooth: true, point: { size: 4, shape: 'cicle', diff --git a/src/views/Orders.jsx b/src/views/Orders.jsx index d9d8241..12bae62 100644 --- a/src/views/Orders.jsx +++ b/src/views/Orders.jsx @@ -290,7 +290,7 @@ class Orders extends Component { return ret; }, }, - smooth: true, + // smooth: true, }; const pie_config = { appendPadding: 10, diff --git a/src/views/Sale_KPI.jsx b/src/views/Sale_KPI.jsx index 0c83bb2..5e5800b 100644 --- a/src/views/Sale_KPI.jsx +++ b/src/views/Sale_KPI.jsx @@ -151,7 +151,7 @@ const Sale_KPI = () => { r.push(targetRow, valRow, processRow); return r; }, []); - const lineConfig = { appendPadding: 10, xField: 'groupDateVal', yField: 'SumML', seriesField: 'groupsLabel', isGroup: true, smooth: true, meta: comm.cloneDeep(dataFieldAlias), }; + const lineConfig = { appendPadding: 10, xField: 'groupDateVal', yField: 'SumML', seriesField: 'groupsLabel', isGroup: true, smooth: false, meta: comm.cloneDeep(dataFieldAlias), }; return (