Merge branch 'main' of git.opencomputing.cn:yumoqing/xls2ddl

xls2crud.py

@@ -17,13 +17,20 @@ xls2crud.py dbname models_dir uidir
 """
 
 def build_dbdesc(models_dir: str) -> dict:
+	print(f'{models_dir=}')
+	mdirs = []
+	if isinstance(models_dir, list):
+		mdirs = models_dir
+	else:
+		mdirs = [models_dir]
 	db_desc = {}
-	for f in listFile(models_dir, suffixs=['.xlsx']):
+	for models_dir in mdirs:
-		print(f'{f} handle ...')
+		for f in listFile(models_dir, suffixs=['.xlsx']):
-		x = xlsxFactory(f)
+			print(f'{f} handle ...')
-		d = x.get_data()
+			x = xlsxFactory(f)
-		tbname = d.summary[0].name
+			d = x.get_data()
-		db_desc.update({tbname:d})
+			tbname = d.summary[0].name
+			db_desc.update({tbname:d})
 	return db_desc
 
 def subtable2toolbar(desc):

xls2ui.py

@@ -18,7 +18,7 @@ if __name__ == '__main__':
 	}
 	"""
 	parser = argparse.ArgumentParser('xls2crud')
-	parser.add_argument('-m', '--models_dir')
+	parser.add_argument('-m', '--models_dir', nargs='+', help="models dirs")
 	parser.add_argument('-o', '--output_dir')
 	parser.add_argument('modulename')
 	parser.add_argument('files', nargs='*')