diff --git a/office/api/excel.py b/office/api/excel.py index e08aac8279a922c01261060c98007ffc2f71d45e..45691eb95111de9d5a89435debb3ddf4d18c61da 100644 --- a/office/api/excel.py +++ b/office/api/excel.py @@ -40,4 +40,5 @@ def sheet2excel(file_path): # 搜索excel中指定内容的文件、行数、内容详情 # @except_dec() def find_excel_data(search_key: str, target_dir: str): - mainExcel.find_excel_data(search_key, target_dir) + return mainExcel.find_excel_data(search_key, target_dir) + diff --git a/tests/test_excel.py b/tests/test_excel.py index 23a074e0628cd80ed8d2dd28f24828e28e7671c7..705c925cea4c217b6fd75143ba09da2361b438f1 100644 --- a/tests/test_excel.py +++ b/tests/test_excel.py @@ -27,4 +27,5 @@ class TestExcel(unittest.TestCase): ) def test_find_excel_data(self): - find_excel_data(search_key='刘家站垦殖场', target_dir=r'D:\workplace\code\gitee\python-office\contributors\bulabean') + for data in find_excel_data(search_key='刘家站垦殖场', target_dir=r'C:\Users\kelly\workspace\python-office\contributors\bulabean'): + print(data)