diff --git a/config_excel/A_array表示例--cfg_array.xlsx b/config_excel/A_array表示例--cfg_array.xlsx index bf06c05..7083208 100644 Binary files a/config_excel/A_array表示例--cfg_array.xlsx and b/config_excel/A_array表示例--cfg_array.xlsx differ diff --git a/config_excel/server/cfg_array_example2.erl b/config_excel/server/cfg_array_example2.erl index ab5a516..c47a417 100644 --- a/config_excel/server/cfg_array_example2.erl +++ b/config_excel/server/cfg_array_example2.erl @@ -60,12 +60,3 @@ get(5) -> get(_) -> undefined. -getList() -> - [ - {1} - , {2} - , {3} - , {4} - , {5} - ]. - diff --git a/src/decoder.py b/src/decoder.py index 0eca53f..a5a67ab 100644 --- a/src/decoder.py +++ b/src/decoder.py @@ -443,11 +443,11 @@ class ExcelDoc: wb = openpyxl.load_workbook( self.abspath ) for wb_sheet in wb.worksheets: - Sheeter = self.need_decode( wb_sheet ) + Sheeter, srv_is_list, clt_is_list = self.need_decode( wb_sheet ) if None == Sheeter : color_print.printPink(" covert skip........... sheet name -> %s\n" % wb_sheet.title) continue - sheet = Sheeter( base_name,wb_sheet,srv_writer,clt_writer ) + sheet = Sheeter( base_name,wb_sheet,srv_writer,clt_writer, srv_is_list, clt_is_list ) if sheet.decode_sheet() : sheet.write_files( srv_path,clt_path ) \ No newline at end of file diff --git a/src/writer.py b/src/writer.py index 241bbc9..52e6ed8 100644 --- a/src/writer.py +++ b/src/writer.py @@ -28,7 +28,7 @@ BASE_INDENT = " " INDENT_LIST = {} class Writer(object): - def __init__(self,doc_name,sheet_name, base_name, keys_list, comment_text): + def __init__(self,doc_name,sheet_name, base_name, keys_list, comment_text, is_list): # 文件名包含中文则需要转unicode #self.doc_name = unicode(doc_name, "utf-8") self.doc_name = doc_name @@ -36,6 +36,7 @@ class Writer(object): self.base_name = base_name self.keys_list = keys_list self.comment_text = comment_text + self.is_list = is_list # 文件后缀 def suffix(self):