Commit 34418ae2 authored by 陈帅's avatar 陈帅

bug: fix autoHeight infinite loop

parent 061a1e7d
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
# dependencies
**/node_modules
/src/utils/request-temp.js
# production
/.vscode
# misc
.DS_Store
npm-debug.log*
yarn-error.log
/coverage
.idea
yarn.lock
package-lock.json
*bak
.vscode
# visual studio code
.history
*.log
functions/mock
.temp/**
# umi
.umi
.umi-production
# screenshot
screenshot
.firebase
\ No newline at end of file
{
"projects": {
"default": "antd-pro"
}
}
ports:
- port: 8000
onOpen: open-preview
tasks:
- init: npm install
command: npm start
/* eslint eqeqeq: 0 */
import React from 'react'; import React from 'react';
export type IReactComponent<P = any> = export type IReactComponent<P = any> =
...@@ -7,6 +6,7 @@ export type IReactComponent<P = any> = ...@@ -7,6 +6,7 @@ export type IReactComponent<P = any> =
| React.ClassicComponentClass<P>; | React.ClassicComponentClass<P>;
function computeHeight(node: HTMLDivElement) { function computeHeight(node: HTMLDivElement) {
node.style.height = '100%';
const totalHeight = parseInt(getComputedStyle(node).height + '', 10); const totalHeight = parseInt(getComputedStyle(node).height + '', 10);
const padding = const padding =
parseInt(getComputedStyle(node).paddingTop + '', 10) + parseInt(getComputedStyle(node).paddingTop + '', 10) +
...@@ -22,14 +22,9 @@ function getAutoHeight(n: HTMLDivElement) { ...@@ -22,14 +22,9 @@ function getAutoHeight(n: HTMLDivElement) {
let node = n; let node = n;
let height = computeHeight(node); let height = computeHeight(node);
const parentNode = node.parentNode as HTMLDivElement;
while (!height) { if (parentNode) {
const parentNode = node.parentNode as HTMLDivElement; height = computeHeight(parentNode);
if (parentNode) {
height = computeHeight(parentNode);
} else {
break;
}
} }
return height; return height;
......
...@@ -59,66 +59,68 @@ const IntroduceRow = ({ loading, visitData }: { loading: boolean; visitData: IVi ...@@ -59,66 +59,68 @@ const IntroduceRow = ({ loading, visitData }: { loading: boolean; visitData: IVi
</ChartCard> </ChartCard>
</Col> </Col>
{/* <Col {...topColResponsiveProps}> <Col {...topColResponsiveProps}>
<ChartCard <ChartCard
bordered={false} bordered={false}
loading={loading} loading={loading}
title={<FormattedMessage id="BLOCK_NAME.analysis.visits" defaultMessage="Visits" />} title={<FormattedMessage id="BLOCK_NAME.analysis.visits" defaultMessage="Visits" />}
action={ action={
<Tooltip <Tooltip
title={ title={
<FormattedMessage id="BLOCK_NAME.analysis.introduce" defaultMessage="Introduce" /> <FormattedMessage id="BLOCK_NAME.analysis.introduce" defaultMessage="Introduce" />
} }
> >
<Icon type="info-circle-o" /> <Icon type="info-circle-o" />
</Tooltip> </Tooltip>
} }
total={numeral(8846).format('0,0')} total={numeral(8846).format('0,0')}
footer={ footer={
<Field <Field
label={ label={
<FormattedMessage id="BLOCK_NAME.analysis.day-visits" defaultMessage="Daily Visits" /> <FormattedMessage
} id="BLOCK_NAME.analysis.day-visits"
value={numeral(1234).format('0,0')} defaultMessage="Daily Visits"
/> />
} }
contentHeight={46} value={numeral(1234).format('0,0')}
> />
<MiniArea color="#975FE4" data={visitData} /> }
</ChartCard> contentHeight={46}
</Col> */} >
<MiniArea color="#975FE4" data={visitData} />
{/* <Col {...topColResponsiveProps}> </ChartCard>
<ChartCard </Col>
bordered={false} <Col {...topColResponsiveProps}>
loading={loading} <ChartCard
title={<FormattedMessage id="BLOCK_NAME.analysis.payments" defaultMessage="Payments" />} bordered={false}
action={ loading={loading}
<Tooltip title={<FormattedMessage id="BLOCK_NAME.analysis.payments" defaultMessage="Payments" />}
title={ action={
<FormattedMessage id="BLOCK_NAME.analysis.introduce" defaultMessage="Introduce" /> <Tooltip
} title={
> <FormattedMessage id="BLOCK_NAME.analysis.introduce" defaultMessage="Introduce" />
<Icon type="info-circle-o" /> }
</Tooltip> >
} <Icon type="info-circle-o" />
total={numeral(6560).format('0,0')} </Tooltip>
footer={ }
<Field total={numeral(6560).format('0,0')}
label={ footer={
<FormattedMessage <Field
id="BLOCK_NAME.analysis.conversion-rate" label={
defaultMessage="Conversion Rate" <FormattedMessage
/> id="BLOCK_NAME.analysis.conversion-rate"
} defaultMessage="Conversion Rate"
value="60%" />
/> }
} value="60%"
contentHeight={46} />
> }
<MiniBar data={visitData} /> contentHeight={46}
</ChartCard> >
</Col> */} <MiniBar data={visitData} />
</ChartCard>
</Col>
<Col {...topColResponsiveProps}> <Col {...topColResponsiveProps}>
<ChartCard <ChartCard
loading={loading} loading={loading}
......
...@@ -11,3 +11,6 @@ declare module '*.bmp'; ...@@ -11,3 +11,6 @@ declare module '*.bmp';
declare module '*.tiff'; declare module '*.tiff';
declare var APP_TYPE: string; declare var APP_TYPE: string;
declare module 'react-fittext';
declare module '@antv/data-set';
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment