Merge remote-tracking branch 'amis/master'
This commit is contained in:
commit
aea7aeccee
|
@ -101,6 +101,7 @@ export class Chart extends React.Component<ChartProps> {
|
|||
[
|
||||
'echarts',
|
||||
'echarts/extension/dataTool',
|
||||
'echarts/extension/bmap/bmap',
|
||||
'echarts/map/js/china',
|
||||
'echarts/map/js/world'
|
||||
],
|
||||
|
|
|
@ -515,7 +515,7 @@ export default class FormControl extends React.PureComponent<
|
|||
render() {
|
||||
const {
|
||||
render,
|
||||
control: {pipeIn, pipeOut, ...control},
|
||||
control: {pipeIn, pipeOut, onChange, ...control},
|
||||
formMode,
|
||||
controlWidth,
|
||||
type,
|
||||
|
|
Loading…
Reference in New Issue