|
|
|
@ -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,
|
|
|
|
|
};
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|