yumoqing/xls2ddl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bugfix

Browse Source
This commit is contained in:
yumoqing 2025-07-30 13:21:43 +08:00
parent 65bfe86f29
commit 782180805e
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
singletree.py
View File

@ -7,7 +7,7 @@ from xlsxData import xlsxFactory
from appPublic.folderUtils import listFile, _mkdir from appPublic.folderUtils import listFile, _mkdir
from appPublic.myTE import MyTemplateEngine from appPublic.myTE import MyTemplateEngine
from tmpls import data_browser_tmpl, get_data_tmpl, data_new_tmpl, data_update_tmpl, data_delete_tmpl from tmpls import data_browser_tmpl, get_data_tmpl, data_new_tmpl, data_update_tmpl, data_delete_tmpl
from xls2crud import build_dbdesc, field_list, subtable2toolbar from xls2crud import build_dbdesc, field_list, subtable2toolbar, filter_backslash
from tmpls import data_new_tmpl, data_update_tmpl, data_delete_tmpl from tmpls import data_new_tmpl, data_update_tmpl, data_delete_tmpl
ui_tmpl = """ ui_tmpl = """
@ -94,31 +94,31 @@ def gen_tree_ui(d, pat):
e = MyTemplateEngine([]) e = MyTemplateEngine([])
s = e.renders(ui_tmpl, d) s = e.renders(ui_tmpl, d)
with open(os.path.join(pat, f'index.ui'), 'w') as f: with open(os.path.join(pat, f'index.ui'), 'w') as f:
f.write(s) f.write(filter_backslash(s))
def gen_delete_nodedata(d, pat): def gen_delete_nodedata(d, pat):
e = MyTemplateEngine([]) e = MyTemplateEngine([])
s = e.renders(data_delete_tmpl, d) s = e.renders(data_delete_tmpl, d)
with open(os.path.join(pat, f'delete_{d.tblname}.dspy'), 'w') as f: with open(os.path.join(pat, f'delete_{d.tblname}.dspy'), 'w') as f:
f.write(s) f.write(filter_backslash(s))
def gen_update_nodedata(d, pat): def gen_update_nodedata(d, pat):
e = MyTemplateEngine([]) e = MyTemplateEngine([])
s = e.renders(data_update_tmpl, d) s = e.renders(data_update_tmpl, d)
with open(os.path.join(pat, f'update_{d.tblname}.dspy'), 'w') as f: with open(os.path.join(pat, f'update_{d.tblname}.dspy'), 'w') as f:
f.write(s) f.write(filter_backslash(s))
def gen_new_nodedata(d, pat): def gen_new_nodedata(d, pat):
e = MyTemplateEngine([]) e = MyTemplateEngine([])
s = e.renders(data_new_tmpl, d) s = e.renders(data_new_tmpl, d)
with open(os.path.join(pat, f'new_{d.tblname}.dspy'), 'w') as f: with open(os.path.join(pat, f'new_{d.tblname}.dspy'), 'w') as f:
f.write(s) f.write(filter_backslash(s))
def gen_get_nodedata(d, pat): def gen_get_nodedata(d, pat):
e = MyTemplateEngine([]) e = MyTemplateEngine([])
s = e.renders(get_nodes_tmpl, d) s = e.renders(get_nodes_tmpl, d)
with open(os.path.join(pat, f'get_{d.tblname}.dspy'), 'w') as f: with open(os.path.join(pat, f'get_{d.tblname}.dspy'), 'w') as f:
f.write(s) f.write(filter_backslash(s))
def build_tree_ui(tree_data, dbdesc): def build_tree_ui(tree_data, dbdesc):
outdir = tree_data.output_dir outdir = tree_data.output_dir

17
xls2crud.py
View File

@ -229,6 +229,11 @@ from {code.table} a left join
return f"""select {fields} return f"""select {fields}
from {tables}""" from {tables}"""
def filter_backslash(s):
if s is None:
return s
ls = s.split('\\/')
return '/'.join(ls)
def build_data_browser(pat: str, desc: dict): def build_data_browser(pat: str, desc: dict):
desc = desc.copy() desc = desc.copy()
@ -236,28 +241,28 @@ def build_data_browser(pat: str, desc: dict):
e = MyTemplateEngine([]) e = MyTemplateEngine([])
s = e.renders(data_browser_tmpl, desc) s = e.renders(data_browser_tmpl, desc)
with open(os.path.join(pat, f'index.ui'), 'w') as f: with open(os.path.join(pat, f'index.ui'), 'w') as f:
f.write(s) f.write(filter_backslash(s))
def build_data_new(pat: str, desc: dict): def build_data_new(pat: str, desc: dict):
e = MyTemplateEngine([]) e = MyTemplateEngine([])
desc = desc.copy() desc = desc.copy()
s = e.renders(data_new_tmpl, desc) s = e.renders(data_new_tmpl, desc)
with open(os.path.join(pat, f'add_{desc.tblname}.dspy'), 'w') as f: with open(os.path.join(pat, f'add_{desc.tblname}.dspy'), 'w') as f:
f.write(s) f.write(filter_backslash(s))
def build_data_update(pat: str, desc: dict): def build_data_update(pat: str, desc: dict):
e = MyTemplateEngine([]) e = MyTemplateEngine([])
desc = desc.copy() desc = desc.copy()
s = e.renders(data_update_tmpl, desc) s = e.renders(data_update_tmpl, desc)
with open(os.path.join(pat, f'update_{desc.tblname}.dspy'), 'w') as f: with open(os.path.join(pat, f'update_{desc.tblname}.dspy'), 'w') as f:
f.write(s) f.write(filter_backslash(s))
def build_data_delete(pat: str, desc: dict): def build_data_delete(pat: str, desc: dict):
e = MyTemplateEngine([]) e = MyTemplateEngine([])
desc = desc.copy() desc = desc.copy()
s = e.renders(data_delete_tmpl, desc) s = e.renders(data_delete_tmpl, desc)
with open(os.path.join(pat, f'delete_{desc.tblname}.dspy'), 'w') as f: with open(os.path.join(pat, f'delete_{desc.tblname}.dspy'), 'w') as f:
f.write(s) f.write(filter_backslash(s))
def build_get_data(pat: str, desc: dict): def build_get_data(pat: str, desc: dict):
e = MyTemplateEngine([]) e = MyTemplateEngine([])
@ -265,14 +270,14 @@ def build_get_data(pat: str, desc: dict):
desc.sql = construct_get_data_sql(desc) desc.sql = construct_get_data_sql(desc)
s = e.renders(get_data_tmpl, desc) s = e.renders(get_data_tmpl, desc)
with open(os.path.join(pat, f'get_{desc.tblname}.dspy'), 'w') as f: with open(os.path.join(pat, f'get_{desc.tblname}.dspy'), 'w') as f:
f.write(s) f.write(filter_backslash(s))
def build_check_changed(pat:str, desc:dict): def build_check_changed(pat:str, desc:dict):
e = MyTemplateEngine([]) e = MyTemplateEngine([])
desc = desc.copy() desc = desc.copy()
s = e.renders(check_changed_tmpls, desc) s = e.renders(check_changed_tmpls, desc)
with open(os.path.join(pat, 'check_changed.dspy'), 'w') as f: with open(os.path.join(pat, 'check_changed.dspy'), 'w') as f:
f.write(s) f.write(filter_backslash(s))
if __name__ == '__main__': if __name__ == '__main__':
""" """