Skip to content
Snippets Groups Projects
Commit 88e52afe authored by Bensong Liu's avatar Bensong Liu
Browse files

Merge branch 'allow_explicit_arg' into master

parents cae3ae12 70fec4db
No related branches found
No related tags found
No related merge requests found
...@@ -21,9 +21,14 @@ namespace CIS { ...@@ -21,9 +21,14 @@ namespace CIS {
class Flow; class Flow;
class Metadata; class Metadata;
class Activity { class ActivityBase {
public: private:
friend Flow; friend Flow;
virtual rlib::string generateXaml() const = 0;
};
class Activity : private ActivityBase {
public:
// All `Name` should not contain QuotationMark(") // All `Name` should not contain QuotationMark(")
Activity(string displayName, string className, string entityName = "") Activity(string displayName, string className, string entityName = "")
: displayName(Utility::HtmlEscapeString(displayName)), className(className), entityName(entityName), taskId(Utility::GenUUID()) {} : displayName(Utility::HtmlEscapeString(displayName)), className(className), entityName(entityName), taskId(Utility::GenUUID()) {}
...@@ -50,7 +55,7 @@ namespace CIS { ...@@ -50,7 +55,7 @@ namespace CIS {
auto inputSettingsString = ",\n"_rs.join(inputSettingStrings); auto inputSettingsString = ",\n"_rs.join(inputSettingStrings);
return rlib::string(templates::ACTIVITY_DICT_TEMPLATE_UNESCAPED).replace_once("__TEMPLATE_ARG_DictLines", inputSettingsString); return rlib::string(templates::ACTIVITY_DICT_TEMPLATE_UNESCAPED).replace_once("__TEMPLATE_ARG_DictLines", inputSettingsString);
} }
auto generateXaml() const { virtual rlib::string generateXaml() const {
rlib::string xamlCode; rlib::string xamlCode;
if(inputSettings.empty()) { if(inputSettings.empty()) {
...@@ -75,9 +80,13 @@ namespace CIS { ...@@ -75,9 +80,13 @@ namespace CIS {
} }
}; };
class ManualOperation : private ActivityBase {
};
class Flow { class Flow {
public: public:
Flow(const Activity &activity) { Flow(const ActivityBase &activity) {
xamlCode = activity.generateXaml(); xamlCode = activity.generateXaml();
} }
Flow(rlib::string xamlCode) : xamlCode(xamlCode) {} Flow(rlib::string xamlCode) : xamlCode(xamlCode) {}
......
...@@ -94,6 +94,17 @@ __TEMPLATE_ARG_XtraAssemblies </sco:Collection> ...@@ -94,6 +94,17 @@ __TEMPLATE_ARG_XtraAssemblies </sco:Collection>
)XAML"; )XAML";
constexpr auto STD_XAML_TAIL = "</Activity>"; constexpr auto STD_XAML_TAIL = "</Activity>";
constexpr auto MANUAL_OPERATION_XAML =
R"XAML( <mwcwa:ManualOperation DeprecatedTaskId="{x:Null}" TaskId="{x:Null}" DisplayName="__TEMPLATE_ARG_DisplayName" MonitoringSystems="icm" WaitUntilFinish="True">
<mwcwa:ManualOperation.AdditionalContent>
<InArgument x:TypeArguments="x:String">
<mca:CSharpValue x:TypeArguments="x:String">__TEMPLATE_ARG_CodeLines</mca:CSharpValue>
</InArgument>
</mwcwa:ManualOperation.AdditionalContent>
</mwcwa:ManualOperation>
)XAML";
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment