Browse Source

数据源图表分组tag下三角隐藏逻辑

zhuth 6 years ago
parent
commit
f882d824bb

+ 1 - 1
src/components/chart/list.jsx

@@ -179,7 +179,7 @@ class ChartList extends React.Component {
                                 this.bodyRef.current.parentNode.scrollTo && this.bodyRef.current.parentNode.scrollTo(0, 0)
                                 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>
                         </GroupSelector>
                     </Tag>
                     </Tag>
                 </Breadcrumb.Item>
                 </Breadcrumb.Item>

+ 1 - 1
src/components/chartDesigner/sections/displayColumnBox.jsx

@@ -37,7 +37,7 @@ class DisplayColumnBox extends React.Component {
     };
     };
 
 
     renderRow = (item) => {
     renderRow = (item) => {
-        const { targetColumns, selectedColumns } = this.state;
+        const { targetColumns } = this.state;
         let index = targetColumns.findIndex(c => c.name === item.name);
         let index = targetColumns.findIndex(c => c.name === item.name);
         return <span data-key={item.name}>
         return <span data-key={item.name}>
             <span data-key='$name'>{item.label}</span>
             <span data-key='$name'>{item.label}</span>

+ 2 - 1
src/components/common/groupSelector/popover.jsx

@@ -60,6 +60,7 @@ class PopTree extends React.Component {
                 content={
                 content={
                     <Tree
                     <Tree
                         expandedKeys={expandedKeys}
                         expandedKeys={expandedKeys}
+                        selectedKeys={[]}
                         onExpand={(expandedKeys) => {
                         onExpand={(expandedKeys) => {
                             this.setState({
                             this.setState({
                                 expandedKeys
                                 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>
                     </Tree>
                 }
                 }

+ 1 - 1
src/components/dataSource/list.jsx

@@ -171,7 +171,7 @@ class DataSource extends React.Component {
                                 dispatch({ type: 'dataSource/setCurrentGroup', group });
                                 dispatch({ type: 'dataSource/setCurrentGroup', group });
                             }}
                             }}
                         >
                         >
-                            <Icon style={{ marginLeft: '4px', fontSize: '12px' }} type="caret-down" />
+                            { arrayToTree(dataSource.groupList, g.code, 'code', 'pcode', 'children').length > 0 && <Icon style={{ marginLeft: '4px', fontSize: '12px' }} type="caret-down" /> }
                         </GroupSelector>
                         </GroupSelector>
                     </Tag>
                     </Tag>
                 </Breadcrumb.Item>
                 </Breadcrumb.Item>