From b987be8dd8b6bc1fa01810daa1e1a60e58a3c921 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期五, 04 九月 2020 17:24:36 +0800 Subject: [PATCH] 2020-09-04 --- src/menu/components/chart/antv-bar/index.jsx | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/menu/components/chart/antv-bar/index.jsx b/src/menu/components/chart/antv-bar/index.jsx index bff9c9a..581a96b 100644 --- a/src/menu/components/chart/antv-bar/index.jsx +++ b/src/menu/components/chart/antv-bar/index.jsx @@ -11,7 +11,7 @@ import enUS from '@/locales/en-US/model.js' import './index.scss' -const SettingComponent = asyncComponent(() => import('@/menu/datasourcecomponent')) +const SettingComponent = asyncComponent(() => import('@/menu/datasource')) const SearchComponent = asyncComponent(() => import('@/menu/searchcomponent')) const ActionComponent = asyncComponent(() => import('@/menu/actioncomponent')) const ChartCompileForm = asyncComponent(() => import('./chartcompile')) @@ -33,8 +33,7 @@ UNSAFE_componentWillMount () { const { card, config } = this.props - // card.dataName = Utils.getdataName() - // this.props.updateConfig(card) + if (card.isNew) { let _plot = { chartType: card.type, // 鍥捐〃绫诲瀷 @@ -82,7 +81,9 @@ let _card = { uuid: card.uuid, type: card.type, - format: 'array', + format: 'array', // 缁勪欢灞炴�� - 鏁版嵁鏍煎紡 + pageable: false, // 缁勪欢灞炴�� - 鏄惁鍙垎椤� + switchable: false, // 缁勪欢灞炴�� - 鏁版嵁鏄惁鍙垏鎹� dataName: dataName, subtype: card.subtype, setting: {span: 12, height: 400, interType: 'system', name}, @@ -570,10 +571,8 @@ return ( <div className="menu-line-chart-edit-box" style={{height: card.setting.height || 400}}> <SettingComponent - config={{...card, tables: config.tables}} - MenuID={config.uuid} - tableFields={config.tableFields || []} - permFuncField={config.permFuncField || []} + config={card} + menu={config} updateConfig={this.updateComponent} /> <div className="chart-header"> -- Gitblit v1.8.0