<<<<<<< HEAD

config.appendPadding = [10, 30, 10, 15]
const chart = new F2.Chart(config);
chart.source(data, {
	date: {
		range: [0, 1],
		type: 'timeCat',
		mask: 'MM-DD'
	},
	value: {
		tickCount: 0
	}
});
chart.legend({
	position: 'bottom',
	offsetY: 0,
	offsetX: 30
});
chart.area()
	.position('date*value')
	.color('name', ['#5881d3', '#ca66e0'])
	.shape('smooth')
chart.line()
	.position('date*value')
	.color('name', ['#5881d3', '#ca66e0'])
	.shape('smooth', name => {
		if (name === '预期收益率') {
			return 'line';
		}
		if (name === '实际收益率') {
			return 'line';
		}
	});
=======

config.appendPadding = [10, 30, 10, 15]
const chart = new F2.Chart(config);
chart.source(data, {
	date: {
		range: [0, 1],
		type: 'timeCat',
		mask: 'MM-DD'
	},
	value: {
		tickCount: 0
	}
});
chart.legend({
	position: 'bottom',
	offsetY: 0,
	offsetX: 30
});
chart.area()
	.position('date*value')
	.color('name', ['#5881d3', '#ca66e0'])
	.shape('smooth')
chart.line()
	.position('date*value')
	.color('name', ['#5881d3', '#ca66e0'])
	.shape('smooth', name => {
		if (name === '预期收益率') {
			return 'line';
		}
		if (name === '实际收益率') {
			return 'line';
		}
	});
>>>>>>> eba5f5995696e08f67df615fb32054bffa94ae34
chart.render();