Skip to content

V
VIZ.Package
Commit 31e4a854 by liulongfei
Options

插件模块修改

parent 8d60e45b
Showing with 36 additions and 42 deletions
VIZ.Package.Domain/Plugin/PluginInfo.cs
...@@ -38,11 +38,6 @@ namespace VIZ.Package.Domain ...@@ -38,11 +38,6 @@ namespace VIZ.Package.Domain
public Type ViewType { get; set; } public Type ViewType { get; set; }
/// <summary> /// <summary>
/// 设置视图类型
/// </summary>
public Type SettingViewType { get; set; }
/// <summary>
/// 插件类型 /// 插件类型
/// </summary> /// </summary>
public PluginType PluginType { get; set; } public PluginType PluginType { get; set; }
......
VIZ.Package.Domain/Plugin/PluginType.cs
...@@ -19,6 +19,11 @@ namespace VIZ.Package.Domain ...@@ -19,6 +19,11 @@ namespace VIZ.Package.Domain
/// <summary> /// <summary>
/// 页插件 /// 页插件
/// </summary> /// </summary>
Page Page,
/// <summary>
/// 设置插件
/// </summary>
Setting
} }
} }
VIZ.Package.Module/Setting/Conn/ConnPluginLifeCycle.cs
...@@ -35,7 +35,8 @@ namespace VIZ.Package.Module ...@@ -35,7 +35,8 @@ namespace VIZ.Package.Module
PluginInfo info = new PluginInfo(); PluginInfo info = new PluginInfo();
info.ID = PLUGIN_ID; info.ID = PLUGIN_ID;
info.Name = PLUGIN_NAME; info.Name = PLUGIN_NAME;
info.SettingViewType = typeof(ConnSettingView); info.PluginType = PluginType.Setting;
info.ViewType = typeof(ConnSettingView);
return info; return info;
} }
......
VIZ.Package.Module/Setting/Core/ViewModel/SettingWindowModel.cs
...@@ -94,22 +94,13 @@ namespace VIZ.Package.Module ...@@ -94,22 +94,13 @@ namespace VIZ.Package.Module
this.IsAlreadyLoaded = true; this.IsAlreadyLoaded = true;
var modules = ApplicationDomainEx.PluginInfos.Where(p => p.PluginType == PluginType.Module && p.SettingViewType != null); var settings = ApplicationDomainEx.PluginInfos.Where(p => p.PluginType == PluginType.Setting);
var templates = ApplicationDomainEx.PluginInfos.Where(p => p.PluginType == PluginType.Page && p.SettingViewType != null);
foreach (var item in modules) foreach (var item in settings)
{ {
SettingPageModel config = new SettingPageModel(); SettingPageModel config = new SettingPageModel();
config.Name = item.Name; config.Name = item.Name;
config.ViewType = item.SettingViewType; config.ViewType = item.ViewType;
this.ItemsSource.Add(config);
}
foreach (var item in templates)
{
SettingPageModel config = new SettingPageModel();
config.Name = item.Name;
config.ViewType = item.SettingViewType;
this.ItemsSource.Add(config); this.ItemsSource.Add(config);
} }
......
VIZ.Package.Module/Setting/Media/MediaSettingPluginLifeCycle.cs
...@@ -35,7 +35,8 @@ namespace VIZ.Package.Module ...@@ -35,7 +35,8 @@ namespace VIZ.Package.Module
PluginInfo info = new PluginInfo(); PluginInfo info = new PluginInfo();
info.ID = PLUGIN_ID; info.ID = PLUGIN_ID;
info.Name = PLUGIN_NAME; info.Name = PLUGIN_NAME;
info.SettingViewType = typeof(MediaSettingView); info.PluginType = PluginType.Setting;
info.ViewType = typeof(MediaSettingView);
return info; return info;
} }
......
VIZ.Package.Module/Setting/VizConfig/VizConfigSettingPluginLifeCycle.cs
...@@ -35,8 +35,9 @@ namespace VIZ.Package.Module ...@@ -35,8 +35,9 @@ namespace VIZ.Package.Module
PluginInfo info = new PluginInfo(); PluginInfo info = new PluginInfo();
info.ID = PLUGIN_ID; info.ID = PLUGIN_ID;
info.Name = PLUGIN_NAME; info.Name = PLUGIN_NAME;
info.SettingViewType = typeof(VizConfigSettingView); info.PluginType = PluginType.Setting;
info.ViewType = typeof(VizConfigSettingView);
return info; return info;
} }
......
VIZ.Package.sln
...@@ -133,80 +133,80 @@ Global ...@@ -133,80 +133,80 @@ Global
{5E259876-8FA4-4AD1-9D91-07A76ABC2A16}.Debug|x64.Build.0 = Debug|x64 {5E259876-8FA4-4AD1-9D91-07A76ABC2A16}.Debug|x64.Build.0 = Debug|x64
{5E259876-8FA4-4AD1-9D91-07A76ABC2A16}.Release|Any CPU.ActiveCfg = Release|Any CPU {5E259876-8FA4-4AD1-9D91-07A76ABC2A16}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5E259876-8FA4-4AD1-9D91-07A76ABC2A16}.Release|Any CPU.Build.0 = Release|Any CPU {5E259876-8FA4-4AD1-9D91-07A76ABC2A16}.Release|Any CPU.Build.0 = Release|Any CPU
{5E259876-8FA4-4AD1-9D91-07A76ABC2A16}.Release|x64.ActiveCfg = Release|Any CPU {5E259876-8FA4-4AD1-9D91-07A76ABC2A16}.Release|x64.ActiveCfg = Release|x64
{5E259876-8FA4-4AD1-9D91-07A76ABC2A16}.Release|x64.Build.0 = Release|Any CPU {5E259876-8FA4-4AD1-9D91-07A76ABC2A16}.Release|x64.Build.0 = Release|x64
{5BF08A07-9405-4F5D-A7F7-9D9EE17D6DD0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {5BF08A07-9405-4F5D-A7F7-9D9EE17D6DD0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5BF08A07-9405-4F5D-A7F7-9D9EE17D6DD0}.Debug|Any CPU.Build.0 = Debug|Any CPU {5BF08A07-9405-4F5D-A7F7-9D9EE17D6DD0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5BF08A07-9405-4F5D-A7F7-9D9EE17D6DD0}.Debug|x64.ActiveCfg = Debug|x64 {5BF08A07-9405-4F5D-A7F7-9D9EE17D6DD0}.Debug|x64.ActiveCfg = Debug|x64
{5BF08A07-9405-4F5D-A7F7-9D9EE17D6DD0}.Debug|x64.Build.0 = Debug|x64 {5BF08A07-9405-4F5D-A7F7-9D9EE17D6DD0}.Debug|x64.Build.0 = Debug|x64
{5BF08A07-9405-4F5D-A7F7-9D9EE17D6DD0}.Release|Any CPU.ActiveCfg = Release|Any CPU {5BF08A07-9405-4F5D-A7F7-9D9EE17D6DD0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5BF08A07-9405-4F5D-A7F7-9D9EE17D6DD0}.Release|Any CPU.Build.0 = Release|Any CPU {5BF08A07-9405-4F5D-A7F7-9D9EE17D6DD0}.Release|Any CPU.Build.0 = Release|Any CPU
{5BF08A07-9405-4F5D-A7F7-9D9EE17D6DD0}.Release|x64.ActiveCfg = Release|Any CPU {5BF08A07-9405-4F5D-A7F7-9D9EE17D6DD0}.Release|x64.ActiveCfg = Release|x64
{5BF08A07-9405-4F5D-A7F7-9D9EE17D6DD0}.Release|x64.Build.0 = Release|Any CPU {5BF08A07-9405-4F5D-A7F7-9D9EE17D6DD0}.Release|x64.Build.0 = Release|x64
{9C7D3994-340A-480F-8D06-92C562137810}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9C7D3994-340A-480F-8D06-92C562137810}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9C7D3994-340A-480F-8D06-92C562137810}.Debug|Any CPU.Build.0 = Debug|Any CPU {9C7D3994-340A-480F-8D06-92C562137810}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9C7D3994-340A-480F-8D06-92C562137810}.Debug|x64.ActiveCfg = Debug|x64 {9C7D3994-340A-480F-8D06-92C562137810}.Debug|x64.ActiveCfg = Debug|x64
{9C7D3994-340A-480F-8D06-92C562137810}.Debug|x64.Build.0 = Debug|x64 {9C7D3994-340A-480F-8D06-92C562137810}.Debug|x64.Build.0 = Debug|x64
{9C7D3994-340A-480F-8D06-92C562137810}.Release|Any CPU.ActiveCfg = Release|Any CPU {9C7D3994-340A-480F-8D06-92C562137810}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9C7D3994-340A-480F-8D06-92C562137810}.Release|Any CPU.Build.0 = Release|Any CPU {9C7D3994-340A-480F-8D06-92C562137810}.Release|Any CPU.Build.0 = Release|Any CPU
{9C7D3994-340A-480F-8D06-92C562137810}.Release|x64.ActiveCfg = Release|Any CPU {9C7D3994-340A-480F-8D06-92C562137810}.Release|x64.ActiveCfg = Release|x64
{9C7D3994-340A-480F-8D06-92C562137810}.Release|x64.Build.0 = Release|Any CPU {9C7D3994-340A-480F-8D06-92C562137810}.Release|x64.Build.0 = Release|x64
{DBAEAE47-1F2D-4B05-82C3-ABF7CC33AA2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {DBAEAE47-1F2D-4B05-82C3-ABF7CC33AA2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DBAEAE47-1F2D-4B05-82C3-ABF7CC33AA2D}.Debug|Any CPU.Build.0 = Debug|Any CPU {DBAEAE47-1F2D-4B05-82C3-ABF7CC33AA2D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DBAEAE47-1F2D-4B05-82C3-ABF7CC33AA2D}.Debug|x64.ActiveCfg = Debug|x64 {DBAEAE47-1F2D-4B05-82C3-ABF7CC33AA2D}.Debug|x64.ActiveCfg = Debug|x64
{DBAEAE47-1F2D-4B05-82C3-ABF7CC33AA2D}.Debug|x64.Build.0 = Debug|x64 {DBAEAE47-1F2D-4B05-82C3-ABF7CC33AA2D}.Debug|x64.Build.0 = Debug|x64
{DBAEAE47-1F2D-4B05-82C3-ABF7CC33AA2D}.Release|Any CPU.ActiveCfg = Release|Any CPU {DBAEAE47-1F2D-4B05-82C3-ABF7CC33AA2D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DBAEAE47-1F2D-4B05-82C3-ABF7CC33AA2D}.Release|Any CPU.Build.0 = Release|Any CPU {DBAEAE47-1F2D-4B05-82C3-ABF7CC33AA2D}.Release|Any CPU.Build.0 = Release|Any CPU
{DBAEAE47-1F2D-4B05-82C3-ABF7CC33AA2D}.Release|x64.ActiveCfg = Release|Any CPU {DBAEAE47-1F2D-4B05-82C3-ABF7CC33AA2D}.Release|x64.ActiveCfg = Release|x64
{DBAEAE47-1F2D-4B05-82C3-ABF7CC33AA2D}.Release|x64.Build.0 = Release|Any CPU {DBAEAE47-1F2D-4B05-82C3-ABF7CC33AA2D}.Release|x64.Build.0 = Release|x64
{E4912BCE-BC90-4457-9EE3-06435496D979}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E4912BCE-BC90-4457-9EE3-06435496D979}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E4912BCE-BC90-4457-9EE3-06435496D979}.Debug|Any CPU.Build.0 = Debug|Any CPU {E4912BCE-BC90-4457-9EE3-06435496D979}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E4912BCE-BC90-4457-9EE3-06435496D979}.Debug|x64.ActiveCfg = Debug|x64 {E4912BCE-BC90-4457-9EE3-06435496D979}.Debug|x64.ActiveCfg = Debug|x64
{E4912BCE-BC90-4457-9EE3-06435496D979}.Debug|x64.Build.0 = Debug|x64 {E4912BCE-BC90-4457-9EE3-06435496D979}.Debug|x64.Build.0 = Debug|x64
{E4912BCE-BC90-4457-9EE3-06435496D979}.Release|Any CPU.ActiveCfg = Release|Any CPU {E4912BCE-BC90-4457-9EE3-06435496D979}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E4912BCE-BC90-4457-9EE3-06435496D979}.Release|Any CPU.Build.0 = Release|Any CPU {E4912BCE-BC90-4457-9EE3-06435496D979}.Release|Any CPU.Build.0 = Release|Any CPU
{E4912BCE-BC90-4457-9EE3-06435496D979}.Release|x64.ActiveCfg = Release|Any CPU {E4912BCE-BC90-4457-9EE3-06435496D979}.Release|x64.ActiveCfg = Release|x64
{E4912BCE-BC90-4457-9EE3-06435496D979}.Release|x64.Build.0 = Release|Any CPU {E4912BCE-BC90-4457-9EE3-06435496D979}.Release|x64.Build.0 = Release|x64
{BF693C2D-3DE8-463B-8394-A0667DCA7B42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {BF693C2D-3DE8-463B-8394-A0667DCA7B42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BF693C2D-3DE8-463B-8394-A0667DCA7B42}.Debug|Any CPU.Build.0 = Debug|Any CPU {BF693C2D-3DE8-463B-8394-A0667DCA7B42}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BF693C2D-3DE8-463B-8394-A0667DCA7B42}.Debug|x64.ActiveCfg = Debug|x64 {BF693C2D-3DE8-463B-8394-A0667DCA7B42}.Debug|x64.ActiveCfg = Debug|x64
{BF693C2D-3DE8-463B-8394-A0667DCA7B42}.Debug|x64.Build.0 = Debug|x64 {BF693C2D-3DE8-463B-8394-A0667DCA7B42}.Debug|x64.Build.0 = Debug|x64
{BF693C2D-3DE8-463B-8394-A0667DCA7B42}.Release|Any CPU.ActiveCfg = Release|Any CPU {BF693C2D-3DE8-463B-8394-A0667DCA7B42}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BF693C2D-3DE8-463B-8394-A0667DCA7B42}.Release|Any CPU.Build.0 = Release|Any CPU {BF693C2D-3DE8-463B-8394-A0667DCA7B42}.Release|Any CPU.Build.0 = Release|Any CPU
{BF693C2D-3DE8-463B-8394-A0667DCA7B42}.Release|x64.ActiveCfg = Release|Any CPU {BF693C2D-3DE8-463B-8394-A0667DCA7B42}.Release|x64.ActiveCfg = Release|x64
{BF693C2D-3DE8-463B-8394-A0667DCA7B42}.Release|x64.Build.0 = Release|Any CPU {BF693C2D-3DE8-463B-8394-A0667DCA7B42}.Release|x64.Build.0 = Release|x64
{6FD4C0F0-8A00-4DB8-924B-A3CD9A45297F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6FD4C0F0-8A00-4DB8-924B-A3CD9A45297F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6FD4C0F0-8A00-4DB8-924B-A3CD9A45297F}.Debug|Any CPU.Build.0 = Debug|Any CPU {6FD4C0F0-8A00-4DB8-924B-A3CD9A45297F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6FD4C0F0-8A00-4DB8-924B-A3CD9A45297F}.Debug|x64.ActiveCfg = Debug|x64 {6FD4C0F0-8A00-4DB8-924B-A3CD9A45297F}.Debug|x64.ActiveCfg = Debug|x64
{6FD4C0F0-8A00-4DB8-924B-A3CD9A45297F}.Debug|x64.Build.0 = Debug|x64 {6FD4C0F0-8A00-4DB8-924B-A3CD9A45297F}.Debug|x64.Build.0 = Debug|x64
{6FD4C0F0-8A00-4DB8-924B-A3CD9A45297F}.Release|Any CPU.ActiveCfg = Release|Any CPU {6FD4C0F0-8A00-4DB8-924B-A3CD9A45297F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6FD4C0F0-8A00-4DB8-924B-A3CD9A45297F}.Release|Any CPU.Build.0 = Release|Any CPU {6FD4C0F0-8A00-4DB8-924B-A3CD9A45297F}.Release|Any CPU.Build.0 = Release|Any CPU
{6FD4C0F0-8A00-4DB8-924B-A3CD9A45297F}.Release|x64.ActiveCfg = Release|Any CPU {6FD4C0F0-8A00-4DB8-924B-A3CD9A45297F}.Release|x64.ActiveCfg = Release|x64
{6FD4C0F0-8A00-4DB8-924B-A3CD9A45297F}.Release|x64.Build.0 = Release|Any CPU {6FD4C0F0-8A00-4DB8-924B-A3CD9A45297F}.Release|x64.Build.0 = Release|x64
{421527F6-37B8-4615-9317-FFD5E272181B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {421527F6-37B8-4615-9317-FFD5E272181B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{421527F6-37B8-4615-9317-FFD5E272181B}.Debug|Any CPU.Build.0 = Debug|Any CPU {421527F6-37B8-4615-9317-FFD5E272181B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{421527F6-37B8-4615-9317-FFD5E272181B}.Debug|x64.ActiveCfg = Debug|x64 {421527F6-37B8-4615-9317-FFD5E272181B}.Debug|x64.ActiveCfg = Debug|x64
{421527F6-37B8-4615-9317-FFD5E272181B}.Debug|x64.Build.0 = Debug|x64 {421527F6-37B8-4615-9317-FFD5E272181B}.Debug|x64.Build.0 = Debug|x64
{421527F6-37B8-4615-9317-FFD5E272181B}.Release|Any CPU.ActiveCfg = Release|Any CPU {421527F6-37B8-4615-9317-FFD5E272181B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{421527F6-37B8-4615-9317-FFD5E272181B}.Release|Any CPU.Build.0 = Release|Any CPU {421527F6-37B8-4615-9317-FFD5E272181B}.Release|Any CPU.Build.0 = Release|Any CPU
{421527F6-37B8-4615-9317-FFD5E272181B}.Release|x64.ActiveCfg = Release|Any CPU {421527F6-37B8-4615-9317-FFD5E272181B}.Release|x64.ActiveCfg = Release|x64
{421527F6-37B8-4615-9317-FFD5E272181B}.Release|x64.Build.0 = Release|Any CPU {421527F6-37B8-4615-9317-FFD5E272181B}.Release|x64.Build.0 = Release|x64
{327EA1F4-F23C-418A-A2EF-DA4F1039B333}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {327EA1F4-F23C-418A-A2EF-DA4F1039B333}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{327EA1F4-F23C-418A-A2EF-DA4F1039B333}.Debug|Any CPU.Build.0 = Debug|Any CPU {327EA1F4-F23C-418A-A2EF-DA4F1039B333}.Debug|Any CPU.Build.0 = Debug|Any CPU
{327EA1F4-F23C-418A-A2EF-DA4F1039B333}.Debug|x64.ActiveCfg = Debug|x64 {327EA1F4-F23C-418A-A2EF-DA4F1039B333}.Debug|x64.ActiveCfg = Debug|x64
{327EA1F4-F23C-418A-A2EF-DA4F1039B333}.Debug|x64.Build.0 = Debug|x64 {327EA1F4-F23C-418A-A2EF-DA4F1039B333}.Debug|x64.Build.0 = Debug|x64
{327EA1F4-F23C-418A-A2EF-DA4F1039B333}.Release|Any CPU.ActiveCfg = Release|Any CPU {327EA1F4-F23C-418A-A2EF-DA4F1039B333}.Release|Any CPU.ActiveCfg = Release|Any CPU
{327EA1F4-F23C-418A-A2EF-DA4F1039B333}.Release|Any CPU.Build.0 = Release|Any CPU {327EA1F4-F23C-418A-A2EF-DA4F1039B333}.Release|Any CPU.Build.0 = Release|Any CPU
{327EA1F4-F23C-418A-A2EF-DA4F1039B333}.Release|x64.ActiveCfg = Release|Any CPU {327EA1F4-F23C-418A-A2EF-DA4F1039B333}.Release|x64.ActiveCfg = Release|x64
{327EA1F4-F23C-418A-A2EF-DA4F1039B333}.Release|x64.Build.0 = Release|Any CPU {327EA1F4-F23C-418A-A2EF-DA4F1039B333}.Release|x64.Build.0 = Release|x64
{680C8D29-A993-492E-9E1A-DA80513ADBFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {680C8D29-A993-492E-9E1A-DA80513ADBFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{680C8D29-A993-492E-9E1A-DA80513ADBFE}.Debug|Any CPU.Build.0 = Debug|Any CPU {680C8D29-A993-492E-9E1A-DA80513ADBFE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{680C8D29-A993-492E-9E1A-DA80513ADBFE}.Debug|x64.ActiveCfg = Debug|x64 {680C8D29-A993-492E-9E1A-DA80513ADBFE}.Debug|x64.ActiveCfg = Debug|x64
{680C8D29-A993-492E-9E1A-DA80513ADBFE}.Debug|x64.Build.0 = Debug|x64 {680C8D29-A993-492E-9E1A-DA80513ADBFE}.Debug|x64.Build.0 = Debug|x64
{680C8D29-A993-492E-9E1A-DA80513ADBFE}.Release|Any CPU.ActiveCfg = Release|Any CPU {680C8D29-A993-492E-9E1A-DA80513ADBFE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{680C8D29-A993-492E-9E1A-DA80513ADBFE}.Release|Any CPU.Build.0 = Release|Any CPU {680C8D29-A993-492E-9E1A-DA80513ADBFE}.Release|Any CPU.Build.0 = Release|Any CPU
{680C8D29-A993-492E-9E1A-DA80513ADBFE}.Release|x64.ActiveCfg = Release|Any CPU {680C8D29-A993-492E-9E1A-DA80513ADBFE}.Release|x64.ActiveCfg = Release|x64
{680C8D29-A993-492E-9E1A-DA80513ADBFE}.Release|x64.Build.0 = Release|Any CPU {680C8D29-A993-492E-9E1A-DA80513ADBFE}.Release|x64.Build.0 = Release|x64
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment