1.解决主页kpi导航当点击二级菜单，三级菜单的时候，子流程就会错位，错行问题

Min
1 parent 22f37fa0
Showing 1 changed file with 84 additions and 11 deletions
src/components/IndexCenter/IndexCenter.js
@@ -389,18 +389,91 @@ class IndexCenter extends Component {
             }
             const count = Number(item.dToDayNum);
             if (!Object.keys(flowJson).includes(sChildFlow)) {
-              const columnsNew = lodash.cloneDeep(columns);
-              columnsNew[columnsNew.length - 1].render = (text, record, index) => {
-                const { sChildDetailFlow, sId } = record;
-                const textNew = sChildDetailFlow;
-                const obj = {
-                  children: textNew !== null ? <div><span className={styles.tdSpan}>{textNew}</span></div> : '',
-                  props: {},
-                };
-                obj.props.rowSpan = this.mergeCells1(textNew, tableData, 'sChildDetailFlow', sId, record);
-                return obj;
+              // 为第二级菜单创建正确的 columns
+              const columnsNew = [
+                {
+                  title: columnDepartment,
+                  dataIndex: 'sDepart',
+                  width: '14%',
+                  render: text => (
+                    <div
+                      style={{
+                        display: 'grid',
+                      }}
+                    >
+                      <span
+                        style={{
+                          textOverflow: 'ellipsis',
+                          overflow: 'hidden',
+                          whiteSpace: 'nowrap',
+                        }}
+                        title={text}
+                      >{text}</span>
+                    </div>
+                  ),
+                }, {
+                  title: columnWorkMatters,
+                  dataIndex: 'sMenuUnMemo',
+                  width: '30%',
+                  render: (text, record) => <div><a
+                    onClick={() => {
+                      this.handleDoubleClick(record);
+                    }}
+                    style={{ color: '#006d75' }}
+                  >{text}</a></div>,
+                }, {
+                  title: columnContent,
+                  dataIndex: 'sMenuWorkFruit',
+                  width: '30%',
+                  render: (text, record) => {
+                    const { sResultModelId } = record;
+                    if (commonUtils.isNotEmptyArr(sResultModelId)) {
+                      return <div><a
+                        onClick={() => {
+                          this.handleJumpToResultModel(record);
+                        }}
+                        style={{ color: '#2f54eb' }}
+                      >{text}</a></div>
+                    } else {
+                      return <div><span>{text}</span></div>
+                    }
+                  },
+                }, {
+                  title: TodayAffair,
+                  dataIndex: 'dToDayNum',
+                  width: '7%',
+                  render: text => <div className={styles.divSpan}><span className={styles.tdSpan1}>{text}</span></div>,
+                }, {
+                  title: unclearedTotal,
+                  dataIndex: 'dTobeDone',
+                  width: '6%',
+                  render: text => <div className={styles.divSpan}><span className={styles.tdSpan2}>{text}</span></div>,
+                }, {
+                  title: '子流程',
+                  dataIndex: 'sChildDetailFlow',
+                  width: '10%',
+                  render: (text, record, index) => {
+                    const textNew = text || '';
+                    const obj = {
+                      children: <div><span className={styles.tdSpan}>{textNew}</span></div>,
+                      props: {}
+                    };
+                    // 为第二级菜单使用 mergeCells 函数计算合并单元格
+                    // 使用当前行所在的数据数组作为数据源
+                    if (record.parentData) {
+                      obj.props.rowSpan = this.mergeCells(textNew, record.parentData, 'sChildDetailFlow', index);
+                    } else if (this.state.tableData) {
+                      obj.props.rowSpan = this.mergeCells(textNew, this.state.tableData, 'sChildDetailFlow', index);
+                    } else {
+                      obj.props.rowSpan = 1;
+                    }
+                    return obj;
+                  }
+                }
+              ];
+              if (sNotShowChildFlow) {
+                columnsNew.pop();
               }
-              // columnsNew.pop();
               flowJson[sChildFlow] = {
                 showName: sChildFlow,
                 sId: `tableTreeData_1_${flowIndex}`,