From b33cf11f8c25f4490a7bc5ee32e127d15d6a32e3 Mon Sep 17 00:00:00 2001 From: AICells <1713699517@qq.com> Date: Thu, 16 Jul 2020 15:24:34 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E8=A1=A8=20=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=98=AF=E5=90=A6=E5=AF=BC=E5=87=BAget=5Flist()?= =?UTF-8?q?=E5=87=BD=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config_excel/A_array表示例--cfg_array.xlsx | Bin 15719 -> 15717 bytes config_excel/server/cfg_array_example2.erl | 9 --------- src/decoder.py | 4 ++-- src/writer.py | 3 ++- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/config_excel/A_array表示例--cfg_array.xlsx b/config_excel/A_array表示例--cfg_array.xlsx index bf06c05a8c2e9899fed87021d3b7591db02cf45c..7083208b1978385ede39365df44bdb15018cb336 100644 GIT binary patch delta 10901 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 delta 10886 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 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):