Browse Source

报表导出指标看板数据错误问题/报表导出重名处理

zhuth 6 years ago
parent
commit
0812b87c15
1 changed files with 5 additions and 2 deletions
  1. 5 2
      src/models/dashboardDesigner.js

+ 5 - 2
src/models/dashboardDesigner.js

@@ -900,7 +900,7 @@ export default {
                                 type: 'String'
                             })));
                             rows = data.map(d => {
-                                return [d.name, d.key, d.value].concat(d.others.map(o => o.value))
+                                return [d.name, d.value].concat(d.others.map(o => o.value))
                             });
                         }
                     }else if(viewType === 'richText') {
@@ -911,8 +911,11 @@ export default {
                         }];
                         rows = [];
                     }
+                    // 处理重名情况
+                    let name = itemName || `未命名`;
+                    let arr = sheets.filter(s => s.name === name);
                     sheets.push({
-                        name: itemName || new Date().getTime(),
+                        name: arr.length > 0 ? `${name}(${arr.length})` : name,
                         header,
                         columns,
                         rows