@@ -179,7 +179,7 @@ class ChartList extends React.Component {
this.bodyRef.current.parentNode.scrollTo && this.bodyRef.current.parentNode.scrollTo(0, 0)
}}
>
- <Icon style={{ marginLeft: '4px', fontSize: '12px' }} type="caret-down" />
+ { arrayToTree(chart.groupList, g.code, 'code', 'pcode', 'children').length > 0 && <Icon style={{ marginLeft: '4px', fontSize: '12px' }} type="caret-down" />}
</GroupSelector>
</Tag>
</Breadcrumb.Item>
@@ -37,7 +37,7 @@ class DisplayColumnBox extends React.Component {
};
renderRow = (item) => {
- const { targetColumns, selectedColumns } = this.state;
+ const { targetColumns } = this.state;
let index = targetColumns.findIndex(c => c.name === item.name);
return <span data-key={item.name}>
<span data-key='$name'>{item.label}</span>
@@ -60,6 +60,7 @@ class PopTree extends React.Component {
content={
<Tree
expandedKeys={expandedKeys}
+ selectedKeys={[]}
onExpand={(expandedKeys) => {
this.setState({
expandedKeys
@@ -71,7 +72,7 @@ class PopTree extends React.Component {
{
- <TreeNode title={pGroup.label} key={pGroup.code}>{this.generateTreeNode(treeData)}</TreeNode>
+ this.generateTreeNode(treeData)
}
</Tree>
@@ -171,7 +171,7 @@ class DataSource extends React.Component {
dispatch({ type: 'dataSource/setCurrentGroup', group });
+ { arrayToTree(dataSource.groupList, g.code, 'code', 'pcode', 'children').length > 0 && <Icon style={{ marginLeft: '4px', fontSize: '12px' }} type="caret-down" /> }