From f6626b05f1275cc2f8ca77f773d4f6a6af1b0a89 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期一, 21 十一月 2022 16:11:55 +0800 Subject: [PATCH] 2022-11-21 --- src/tabviews/custom/components/chart/custom-chart/index.jsx | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/tabviews/custom/components/chart/custom-chart/index.jsx b/src/tabviews/custom/components/chart/custom-chart/index.jsx index 2680e59..a3f4b6d 100644 --- a/src/tabviews/custom/components/chart/custom-chart/index.jsx +++ b/src/tabviews/custom/components/chart/custom-chart/index.jsx @@ -58,7 +58,8 @@ _sync = false } - _config.style.height = config.plot.height || 400 + _config.plot.height = Utils.getHeight(_config.plot.height) + _config.style.height = 'auto' this.setState({ config: _config, @@ -95,7 +96,7 @@ this.setState({sync: false, data: _data, empty: _data.length === 0}, () => { this.handleData() }) - } else if (config.setting.syncRefresh && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) { + } else if (config.setting.useMSearch && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) { this.setState({}, () => { this.loadData() }) @@ -347,7 +348,9 @@ </div> : null } <NormalHeader config={config} BID={BID} refresh={this.refreshSearch} /> - <div className={'canvas' + (empty ? ' empty' : '')} ref={ref => this.wrap = ref}></div> + <div className="canvas-wrap" style={{height: (config.plot.height + 30) + 'px'}}> + <div className={'canvas' + (empty ? ' empty' : '')} style={{height: config.plot.height + 'px'}} ref={ref => this.wrap = ref}></div> + </div> {empty ? <Empty description={false}/> : null} </div> ) -- Gitblit v1.8.0