fix bug
Showing
1 changed file
with
8 additions
and
2 deletions
... | @@ -79,13 +79,19 @@ class BSWorkbook(Workbook): | ... | @@ -79,13 +79,19 @@ class BSWorkbook(Workbook): |
79 | # } | 79 | # } |
80 | 80 | ||
81 | # 第一行关键词 | 81 | # 第一行关键词 |
82 | find_count = 0 | 82 | header_col_list = [] |
83 | for first_row in ws.iter_rows(max_row=1, min_row=1, values_only=True): | 83 | for first_row in ws.iter_rows(max_row=1, min_row=1, values_only=True): |
84 | sheet_header_info.setdefault(ws.title, {}).setdefault(consts.HEADER_KEY, first_row) | 84 | sheet_header_info.setdefault(ws.title, {}).setdefault(consts.HEADER_KEY, first_row) |
85 | for idx, header_value in enumerate(first_row): | 85 | for idx, header_value in enumerate(first_row): |
86 | header_col = self.get_header_col(header_value, classify) | 86 | header_col = self.get_header_col(header_value, classify) |
87 | if header_col is not None: | 87 | if header_col is not None: |
88 | find_count += 1 | 88 | header_col_list.append((idx, header_col)) |
89 | |||
90 | find_count = len(header_col_list) | ||
91 | if find_count < 2: | ||
92 | find_count = 0 | ||
93 | else: | ||
94 | for idx, header_col in header_col_list: | ||
89 | sheet_header_info.setdefault(ws.title, {}).setdefault(header_col, idx) | 95 | sheet_header_info.setdefault(ws.title, {}).setdefault(header_col, idx) |
90 | find_col_set = sheet_header_info.setdefault(ws.title, {}).setdefault(consts.FIND_COL_KEY, set()) | 96 | find_col_set = sheet_header_info.setdefault(ws.title, {}).setdefault(consts.FIND_COL_KEY, set()) |
91 | find_col_set.add(idx) | 97 | find_col_set.add(idx) | ... | ... |
-
Please register or sign in to post a comment