组件模块小重构
Merge remote-tracking branch 'origin/branch_1.1.0' into branch_1.1.0

Conflicts:
	designer/src/main/resources/public/report-ui/src/core/echarts/echarts-plain-original.js
	designer/src/main/resources/public/silkroad/src/report/component-box/components/calendar-config.js
	designer/src/main/resources/public/silkroad/src/report/component-box/main-model.js
	designer/src/main/resources/public/silkroad/src/report/component-box/main-view.js
组件模块小重构