...

2026-05-22 07:01:23 +08:00 · 2017-01-31 05:55:30 -08:00
parent 4f0b9ef6ca
commit 09063c4ac5
4 changed files with 9900 additions and 8671 deletions
@@ -5607,6 +5607,10 @@ GuiTemplateInstanceLoader
 				{
 					List<ITypeDescriptor*> tds;
 					tds.Add(typeInfo.typeDescriptor);
+					if (typeInfo.typeDescriptor == description::GetTypeDescriptor<GuiToolstripButtonTemplate>())
+					{
+						int a = 0;
+					}

 					for (vint i = 0; i < tds.Count(); i++)
 					{
@@ -5695,14 +5699,14 @@ GuiTemplateInstanceLoader
 						block->statements.Add(assignStat);
 					}

-					if (auto stat = InitializeRootInstance(typeInfo, variableName, arguments, errors))
+					if (auto stat = InitializeRootInstance(resolvingResult, typeInfo, variableName, arguments, errors))
 					{
 						CopyFrom(block->statements, stat.Cast<WfBlockStatement>()->statements, true);
 					}
 					return block;
 				}

-				Ptr<workflow::WfStatement> InitializeRootInstance(const TypeInfo& typeInfo, GlobalStringKey variableName, ArgumentMap& arguments, collections::List<WString>& errors)
+				Ptr<workflow::WfStatement> InitializeRootInstance(types::ResolvingResult& resolvingResult, const TypeInfo& typeInfo, GlobalStringKey variableName, ArgumentMap& arguments, collections::List<WString>& errors)override
 				{
 					if (arguments.Count() > 0)
 					{