From ddddb07002201150da9551875c25e75499563249 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 15 一月 2021 15:22:55 +0800
Subject: [PATCH] 2021-01-15

---
 src/menu/components/chart/antv-bar/index.jsx |   46 +++++++++++++++++++++++++++++++++-------------
 1 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/src/menu/components/chart/antv-bar/index.jsx b/src/menu/components/chart/antv-bar/index.jsx
index c2ee506..25074e0 100644
--- a/src/menu/components/chart/antv-bar/index.jsx
+++ b/src/menu/components/chart/antv-bar/index.jsx
@@ -23,6 +23,7 @@
 const PasteComponent = asyncIconComponent(() => import('@/menu/components/share/pastecomponent'))
 const NormalHeader = asyncComponent(() => import('@/menu/components/share/normalheader'))
 const ActionComponent = asyncComponent(() => import('@/menu/components/share/actioncomponent'))
+const UserComponent = asyncIconComponent(() => import('@/menu/components/share/usercomponent'))
 
 class antvBarLineChart extends Component {
   static propTpyes = {
@@ -46,7 +47,7 @@
         enabled: 'false',     // 鏄惁浣跨敤鑷畾涔夎缃�
         datatype: 'query',    // 鏁版嵁绫诲瀷鏌ヨ鎴栫粺璁�
         customs: [],
-        width: 24,
+        width: card.width || 24,
         height: 400,
         barSize: 35,
         name: card.name
@@ -89,6 +90,24 @@
         action: [],
         plot: _plot,
         btnlog: [],
+      }
+
+      if (card.config) {
+        let config = fromJS(card.config).toJS()
+
+        _card.plot = config.plot
+        _card.plot.name = card.name
+        _card.style = config.style
+        _card.headerStyle = config.headerStyle
+
+        _card.action = config.action.map(col => {
+          col.uuid = Utils.getuuid()
+          return col
+        })
+        _card.search = config.search.map(col => {
+          col.uuid = Utils.getuuid()
+          return col
+        })
       }
       this.setState({
         card: _card
@@ -202,7 +221,7 @@
         dv.transform({
           type: 'map',
           callback(row) {
-            row.key = transfield[row.key]
+            row.key = transfield[row.key] || row.key
             return row
           },
         })
@@ -272,12 +291,12 @@
         .line()
         .position(`${X_axis}*value`)
         .shape(plot.shape || 'smooth')
-        .tooltip(`${X_axis}*value`, (name, value) => {
+        .tooltip(`${X_axis}*value*key`, (name, value, type) => {
           if (plot.show === 'percent') {
             value = value + '%'
           }
           return {
-            name: name,
+            name: type,
             value: value
           }
         })
@@ -460,12 +479,12 @@
           .position(`${plot.Xaxis}*${item.name}`)
           .color(item.color)
           .shape(item.shape)
-          .tooltip(`${plot.Xaxis}*${item.name}`, (name, value) => {
+          .tooltip(`${item.name}`, (value) => {
             if (plot.show === 'percent') {
               value = value + '%'
             }
             return {
-              name: name,
+              name: item.name,
               value: value
             }
           })
@@ -492,12 +511,12 @@
           .position(`${plot.Xaxis}*${item.name}`)
           .color(item.color)
           .shape(item.shape)
-          .tooltip(`${plot.Xaxis}*${item.name}`, (name, value) => {
+          .tooltip(`${item.name}`, (value) => {
             if (plot.show === 'percent') {
               value = value + '%'
             }
             return {
-              name: name,
+              name: item.name,
               value: value
             }
           })
@@ -564,7 +583,7 @@
         dv.transform({
           type: 'map',
           callback(row) {
-            row.key = transfield[row.key]
+            row.key = transfield[row.key] || row.key
             return row
           },
         })
@@ -636,12 +655,12 @@
             }
           ])
           .shape(plot.shape || 'rect')
-          .tooltip(`${X_axis}*value`, (name, value) => {
+          .tooltip(`${X_axis}*value*key`, (name, value, key) => {
             if (plot.show === 'percent') {
               value = value + '%'
             }
             return {
-              name: name,
+              name: key,
               value: value
             }
           })
@@ -682,12 +701,12 @@
           .position(`${X_axis}*value`)
           .adjust('stack')
           .shape(plot.shape || 'rect')
-          .tooltip(`${X_axis}*value`, (name, value) => {
+          .tooltip(`${X_axis}*value*key`, (name, value, type) => {
             if (plot.show === 'percent') {
               value = value + '%'
             }
             return {
-              name: name,
+              name: type,
               value: value
             }
           })
@@ -875,6 +894,7 @@
             <PasteComponent config={card} options={['action', 'search', 'form']} updateConfig={this.updateComponent} />
             <Icon className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle} type="font-colors" />
             <LogComponent btnlog={card.btnlog || []} handlelog={this.handleLog} />
+            <UserComponent config={card}/>
             <Icon className="close" title="delete" type="delete" onClick={() => this.props.deletecomponent(card.uuid)} />
             <SettingComponent config={card} updateConfig={this.updateComponent}/>
           </div>

--
Gitblit v1.8.0