From 71a0e75ecb56ae643fe1e86188d45f93f48388c9 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 28 八月 2020 14:07:41 +0800
Subject: [PATCH] 2020-08-28
---
src/menu/components/chart/antv-bar/index.jsx | 47 ++++++++++++++++++++++++++++-------------------
1 files changed, 28 insertions(+), 19 deletions(-)
diff --git a/src/menu/components/chart/antv-bar/index.jsx b/src/menu/components/chart/antv-bar/index.jsx
index cf3b9d1..4d2f9fa 100644
--- a/src/menu/components/chart/antv-bar/index.jsx
+++ b/src/menu/components/chart/antv-bar/index.jsx
@@ -6,14 +6,14 @@
import asyncComponent from '@/utils/asyncComponent'
-import zhCN from '@/locales/zh-CN/mob.js'
-import enUS from '@/locales/en-US/mob.js'
-// import ChartCompileForm from './chartcompile'
+import zhCN from '@/locales/zh-CN/model.js'
+import enUS from '@/locales/en-US/model.js'
import './index.scss'
const SettingComponent = asyncComponent(() => import('@/menu/datasourcecomponent'))
const SearchComponent = asyncComponent(() => import('@/menu/searchcomponent'))
const ActionComponent = asyncComponent(() => import('@/menu/actioncomponent'))
+const ChartCompileForm = asyncComponent(() => import('./chartcompile'))
class antvBarLineChart extends Component {
static propTpyes = {
@@ -31,10 +31,23 @@
}
UNSAFE_componentWillMount () {
- const { card, config } = this.props
+ const { card } = this.props
- console.log(config)
if (card.isNew) {
+ let _plot = {
+ chartType: card.type, // 鍥捐〃绫诲瀷
+ enabled: 'false', // 鏄惁浣跨敤鑷畾涔夎缃�
+ datatype: 'query', // 鏁版嵁绫诲瀷鏌ヨ鎴栫粺璁�
+ }
+
+ if (card.subtype === 'bar') {
+ _plot.coordinate = 'angle' // 浜岀淮鍧愭爣鎴栨瀬鍧愭爣
+ _plot.transpose = 'false' // 鍧愭爣杞村彉鎹�
+ } else if (card.subtype === 'bar1') {
+ _plot.coordinate = 'angle'
+ _plot.transpose = 'true'
+ }
+
let _card = {
uuid: card.uuid,
type: card.type,
@@ -44,7 +57,7 @@
scripts: [],
search: [],
action: [],
- plot: {type: card.type, Xaxis: '', Yaxis: null}
+ plot: _plot
}
this.setState({
card: _card
@@ -96,9 +109,9 @@
viewrender = () => {
const { card } = this.state
- if (card.plot.type === 'line') {
+ if (card.plot.chartType === 'line') {
this.linerender()
- } else if (card.plot.type === 'bar') {
+ } else if (card.plot.chartType === 'bar') {
this.barrender()
}
}
@@ -370,8 +383,6 @@
let Y_axis = plot.Yaxis || ['y']
let data = this.getdata(X_axis, Y_axis)
- console.log(plot)
- console.log(data)
if (plot.enabled !== 'true') {
const ds = new DataSet()
@@ -400,7 +411,6 @@
height: plot.height || 400
})
- console.log(dv.rows)
chart.data(dv.rows)
chart.scale('value', {
@@ -521,7 +531,7 @@
<div className="chart-header">
<span className="chart-title">{card.setting.title || ''}</span>
<SearchComponent
- menu={{MenuID: config.uuid, MenuName: config.MenuName}}
+ menu={config}
config={card}
sysRoles={config.sysRoles}
optionLibs={null}
@@ -529,7 +539,8 @@
/>
</div>
<ActionComponent
- menu={{ MenuID: config.uuid, MenuName: config.MenuName, MenuNo: config.MenuNo, fstMenuList: config.fstMenuList }}
+ type="chart"
+ menu={config}
config={card}
tabs={[]}
usefulFields={config.permFuncField || []}
@@ -537,13 +548,11 @@
updateaction={this.updateComponent}
/>
<div className="canvas" id={card.uuid}></div>
- {/* <ChartCompileForm
- plot={plot}
- type={plot.chartType}
- config={this.props.config}
+ <ChartCompileForm
+ config={card}
dict={this.state.dict}
- plotchange={this.plotChange}
- /> */}
+ plotchange={this.updateComponent}
+ />
</div>
)
}
--
Gitblit v1.8.0