Merge branch 'master' of http://49.233.21.66/liulongfei/VIZ.Package

VIZ.Package.Module/Plugin/ViewModel/PluginViewModel.cs

@@ -180,7 +180,7 @@ namespace VIZ.Package.Module
                 return;
                 return;
             }
             }
 
 
-            PluginInfo plugin = ApplicationDomainEx.PluginInfos.FirstOrDefault(p => p.ID == page.PluginID);
+            PluginInfo plugin = ApplicationDomainEx.PluginInfos.FirstOrDefault(p => p.ID == page.PluginID && p.Group == ApplicationDomainEx.VizConfig.PluginGroup);
             if (plugin == null)
             if (plugin == null)
             {
             {
                 this.SelectedValue = null;
                 this.SelectedValue = null;

VIZ.Package.Module/Setting/Core/ViewModel/SettingWindowModel.cs

@@ -105,7 +105,8 @@ namespace VIZ.Package.Module
             this.IsAlreadyLoaded = true;
             this.IsAlreadyLoaded = true;
 
 
             var settings = ApplicationDomainEx.PluginInfos.Where(p => p.PluginType == PluginType.Setting &&
             var settings = ApplicationDomainEx.PluginInfos.Where(p => p.PluginType == PluginType.Setting &&
-                                                                      !string.IsNullOrWhiteSpace(p.Group));
+                                                                      !string.IsNullOrWhiteSpace(p.Group) &&
+                                                                      (p.Group == ApplicationConstants.APPLICATION_GROUP_NAME || p.Group == ApplicationDomainEx.VizConfig.PluginGroup));
 
 
             foreach (var item in settings)
             foreach (var item in settings)
             {
             {