lazysdk 0.1.73__py3-none-any.whl → 0.1.75__py3-none-any.whl

lazysdk/lazyexcel.py

@@ -99,9 +99,10 @@ def read_xls(
 def read_xlsx(
         file: str,
         sheet_name: str = None,
+        sheet_index: int = None,
         date_cols: dict = None,
         auto_conv_date: bool = False  # 默认格式：'%Y-%m-%d %H:%M:%S'
-) -> dict:
+):
     """
     读取xlsx表格
     :param file: 文件路径
@@ -109,7 +110,7 @@ def read_xlsx(
     :param date_cols: 按照既定规则转换时间，例如：{'日期': '%Y-%m-%d','时间': '%H:%M:%S'}，就会将表中对应字段转换为对应格式的字符串
     :param auto_conv_date: 自动转换，会将时间类型的数据自动转换为默认格式的字符串
 
-    :returns: 读取结果字典，字典的第一层key为sheet_name
+    :returns: 读取结果字典，字典的第一层key为sheet_name，如果指定了读取哪个sheet，则只返回值list
 
     cell(a,b).data_type 值类型
     n None
@@ -122,12 +123,22 @@ def read_xlsx(
     else:
         data_cols_cols = date_cols.keys()
     table_data_dict = OrderedDict()  # 有序字典
-    table_data = openpyxl.load_workbook(file)  # 打开表
-    for each_sheet in table_data.worksheets:  # 遍历所有sheet
-        if sheet_name is None:
+    table_data = openpyxl.load_workbook(file)  # 加载表内容
+    sheets = table_data.worksheets
+    if sheet_name is None and sheet_index is not None:
+        target_sheet = sheets[sheet_index].title
+    elif sheet_name and not sheet_index:
+        target_sheet = sheet_name
+    elif sheet_name and sheet_index:
+        return 'sheet_name和sheet_index不可同时指定'
+    else:
+        target_sheet = None
+
+    for each_sheet in sheets:  # 遍历所有sheet
+        if not target_sheet:
             pass
         else:
-            if each_sheet.title == sheet_name:  # 判断当前的sheet是否是需要获取数据的sheet
+            if each_sheet.title == target_sheet:  # 判断当前的sheet是否是需要获取数据的sheet
                 pass
             else:
                 continue
@@ -168,7 +179,10 @@ def read_xlsx(
                 pass
             sheet_data_list.append(each_row_data)  # 将每一行的数据dict组织到当前sheet的数据list中
         table_data_dict[each_sheet.title] = sheet_data_list  # 将每个sheet的数据组织到table_data_dict里面
-    return table_data_dict
+    if target_sheet:
+        return table_data_dict[target_sheet]
+    else:
+        return table_data_dict
 
 
 def read(

{lazysdk-0.1.73.dist-info → lazysdk-0.1.75.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lazysdk
-Version: 0.1.73
+Version: 0.1.75
 Summary: 基于Python的懒人包
 Home-page: https://gitee.com/ZeroSeeker/lazysdk
 Author: ZeroSeeker

{lazysdk-0.1.73.dist-info → lazysdk-0.1.75.dist-info}/RECORD

@@ -4,7 +4,7 @@ lazysdk/lazy_id_card.py,sha256=b96SvObDaEavMLIdinbxpleupCEnHihklO-jycl5BJ8,2797
 lazysdk/lazybase64.py,sha256=8jtuH9S1jICXpzxhRLe7xNur_o9TWbT1BRmTshZWYh0,669
 lazysdk/lazydict.py,sha256=E0oSF6qsBvtWtzQsi_sNNL3SyLGaRvSvuRL9avCPTqE,7916
 lazysdk/lazyenv.py,sha256=P6HjO9cbBPzHD_Vs-Ww_GThDq-h9Wn31VSiu9OzTNWI,3024
-lazysdk/lazyexcel.py,sha256=r8_VbCzB1dRhMbK4Dwk-cr5keJCo6AV4r8SYe4O5y6k,15129
+lazysdk/lazyexcel.py,sha256=Ipf2TVMEFp-46ggPwooSFiOnC18pZyw1bmuGlDdKcKk,15632
 lazysdk/lazyfile.py,sha256=KzOKs0lcu2pZgmPvwe0j1B3X3P8349SB31r72nr1CKA,20964
 lazysdk/lazyflask.py,sha256=VUhJqtNz_evVyGOS40FKkkQWWrqGEUZ26cv1RQxS388,727
 lazysdk/lazyhtml.py,sha256=vTtiLPoAhWMzXsDBFsF0DoFSsKbfmuEPjPMOZI_n6ag,1867
@@ -26,8 +26,8 @@ lazysdk/lazyurl.py,sha256=N89QLK2A6vXr9gqp-9vnk9RXv_fOjw171lVl9eEoxtE,1550
 lazysdk/lazywebhook.py,sha256=HwJIZ5j3wUpnEfPkFY-Xq9T_9xdhCJ71dYsWNX22_3Y,8386
 lazysdk/lazywifi.py,sha256=FOvLPTcb6BQE6D8kjfB0TLpfgGxw8jqC3vZbTs6LbD4,716
 lazysdk/showdata.py,sha256=v9TrDWrLl0Fn2JzDzfiISYlZS3uumIXpm9Dpix2XAXg,1678
-lazysdk-0.1.73.dist-info/LICENSE,sha256=OC5E4ENUG6B4dGEVGwUpdsD-D9SZsCVC92NAgaqvE-c,1088
-lazysdk-0.1.73.dist-info/METADATA,sha256=Rwtp2-Gw1rCE-axZ3MLvgrcs4zompKtE6Ysb61_JEP0,1773
-lazysdk-0.1.73.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-lazysdk-0.1.73.dist-info/top_level.txt,sha256=--bGS42ZHUhVeO83y1wfvKFg6OjkTLxQ4V4riqPQljY,8
-lazysdk-0.1.73.dist-info/RECORD,,
+lazysdk-0.1.75.dist-info/LICENSE,sha256=OC5E4ENUG6B4dGEVGwUpdsD-D9SZsCVC92NAgaqvE-c,1088
+lazysdk-0.1.75.dist-info/METADATA,sha256=c0gsB-4fXCOsb2vmtTHcpWsC9Xf8H6ZWtIdbBv4z0Hk,1773
+lazysdk-0.1.75.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+lazysdk-0.1.75.dist-info/top_level.txt,sha256=--bGS42ZHUhVeO83y1wfvKFg6OjkTLxQ4V4riqPQljY,8
+lazysdk-0.1.75.dist-info/RECORD,,