From 99c0ccd473e30f029b81feb65975d654528bc3e5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 20 四月 2023 17:58:02 +0800
Subject: [PATCH] 2023-04-20
---
src/menu/components/chart/antv-dashboard/index.jsx | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/src/menu/components/chart/antv-dashboard/index.jsx b/src/menu/components/chart/antv-dashboard/index.jsx
index 22f6b8e..35922a7 100644
--- a/src/menu/components/chart/antv-dashboard/index.jsx
+++ b/src/menu/components/chart/antv-dashboard/index.jsx
@@ -1,14 +1,14 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { Popover } from 'antd'
+import { Popover, message } from 'antd'
import { ToolOutlined, DeleteOutlined, FontColorsOutlined } from '@ant-design/icons'
import { Chart, registerShape } from '@antv/g2'
import MKEmitter from '@/utils/events.js'
import asyncComponent from '@/utils/asyncComponent'
import asyncIconComponent from '@/utils/asyncIconComponent'
-import { resetStyle, getTables } from '@/utils/utils-custom.js'
+import { resetStyle, getTables, getHeight } from '@/utils/utils-custom.js'
import './index.scss'
const SettingComponent = asyncIconComponent(() => import('@/menu/datasource'))
@@ -227,7 +227,7 @@
const chart = new Chart({
container: card.uuid + 'dashboard',
autoFit: true,
- height: this.wrap.offsetHeight - 30,
+ height: getHeight(plot.height)
})
chart.data(data)
@@ -326,7 +326,7 @@
const chart = new Chart({
container: card.uuid + 'dashboard',
autoFit: true,
- height: this.wrap.offsetHeight - 30,
+ height: getHeight(plot.height),
padding: [0, 0, 0, 0],
})
chart.data(data)
@@ -508,7 +508,7 @@
changeStyle = () => {
const { card } = this.state
- MKEmitter.emit('changeStyle', ['background', 'border', 'padding', 'margin', 'shadow'], card.style, this.getStyle)
+ MKEmitter.emit('changeStyle', ['background', 'border', 'padding', 'margin', 'shadow', 'clear'], card.style, this.getStyle)
}
getStyle = (style) => {
@@ -532,9 +532,10 @@
render() {
const { card } = this.state
let _style = resetStyle(card.style)
+ _style.height = 'auto'
return (
- <div className="menu-dashboard-edit-box" style={{..._style, height: card.plot.height || 400}} onClick={this.clickComponent} id={card.uuid}>
+ <div className="menu-dashboard-edit-box" style={_style} onClick={this.clickComponent} id={card.uuid}>
<Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
<div className="mk-popover-control">
<ChartCompileForm config={card} plotchange={this.updateComponent}/>
@@ -549,10 +550,18 @@
<ToolOutlined/>
</Popover>
<NormalHeader hideSearch="true" config={card} updateComponent={this.updateComponent}/>
- <div className="canvas" id={card.uuid + 'dashboard'} ref={ref => this.wrap = ref}></div>
+ <div className="canvas" id={card.uuid + 'dashboard'}></div>
<div className="component-name">
<div className="center">
- <div className="title">{card.name}</div>
+ <div className="title" onDoubleClick={() => {
+ let oInput = document.createElement('input')
+ oInput.value = 'anchor' + card.uuid
+ document.body.appendChild(oInput)
+ oInput.select()
+ document.execCommand('Copy')
+ document.body.removeChild(oInput)
+ message.success('澶嶅埗鎴愬姛銆�')
+ }}>{card.name}</div>
<div className="content">
{card.errors && card.errors.map((err, index) => {
if (err.level === 0) {
--
Gitblit v1.8.0