From 7c03f9d98c2855432de79d02e8e98155a735dfe6 Mon Sep 17 00:00:00 2001 From: chenxi Date: Wed, 10 May 2023 17:15:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E8=A1=A8=E5=B7=A5=E5=85=B7=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0bool=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Tools/tranexcel/type2.py | 11 ++++++++++- Tools/tranexcel2/type2.py | 11 ++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/Tools/tranexcel/type2.py b/Tools/tranexcel/type2.py index 5dae901b4..3c75e5713 100644 --- a/Tools/tranexcel/type2.py +++ b/Tools/tranexcel/type2.py @@ -65,7 +65,16 @@ def format_data(value, t): raise Exception('数据应该是小数: %s' % value) elif t == 'bool': try: - return str(value).lower() + if value is None: + return 'false' + elif str(value).isspace(): + return 'false' + lower_value = str(value).lower() + if lower_value == "0": + return 'false' + elif lower_value == "1": + return 'true' + return lower_value except ValueError: if value == 'null': return 'false' diff --git a/Tools/tranexcel2/type2.py b/Tools/tranexcel2/type2.py index 5dae901b4..3c75e5713 100644 --- a/Tools/tranexcel2/type2.py +++ b/Tools/tranexcel2/type2.py @@ -65,7 +65,16 @@ def format_data(value, t): raise Exception('数据应该是小数: %s' % value) elif t == 'bool': try: - return str(value).lower() + if value is None: + return 'false' + elif str(value).isspace(): + return 'false' + lower_value = str(value).lower() + if lower_value == "0": + return 'false' + elif lower_value == "1": + return 'true' + return lower_value except ValueError: if value == 'null': return 'false'