链接状态

VIZ.Package.Domain/Plugin/IPluginView.cs

@@ -14,26 +14,26 @@ namespace VIZ.Package.Domain
         /// <summary>
         /// 上版
         /// </summary>
-        /// <param name="conn">连接</param>
-        void TakIn(ConnModel conn);
+        /// <param name="conns">连接</param>
+        void TakIn(IList<ConnModel> conns);
 
         /// <summary>
         /// 继续
         /// </summary>
-        /// <param name="conn">连接</param>
-        void TakeContinue(ConnModel conn);
+        /// <param name="conns">连接</param>
+        void TakeContinue(IList<ConnModel> conns);
 
         /// <summary>
         /// 下版子
         /// </summary>
-        /// <param name="conn">连接</param>
-        void TakeOut(ConnModel conn);
+        /// <param name="conns">连接</param>
+        void TakeOut(IList<ConnModel> conns);
 
         /// <summary>
         /// 更新
         /// </summary>
-        /// <param name="conn">连接</param>
-        void TakeUpdate(ConnModel conn);
+        /// <param name="conns">连接</param>
+        void TakeUpdate(IList<ConnModel> conns);
 
         /// <summary>
         /// 预览上版子

VIZ.Package.Module/Control/ViewModel/ControlViewModel.cs

@@ -77,9 +77,9 @@ namespace VIZ.Package.Module
                 {
                     this.vizCommandService.TakeIn(conn, ApplicationDomainEx.CurrentPage.ScenePath, ApplicationDomainEx.CurrentPage.Layer);
                 },
-                pluginAction: (view, conn) =>
+                pluginAction: (view, conns) =>
                 {
-                    view.TakIn(conn);
+                    view.TakIn(conns);
                 });
         }
 
@@ -102,9 +102,9 @@ namespace VIZ.Package.Module
                 {
                     this.vizCommandService.Continue(conn, ApplicationDomainEx.CurrentPage.ScenePath, ApplicationDomainEx.CurrentPage.Layer);
                 },
-                pluginAction: (view, conn) =>
+                pluginAction: (view, conns) =>
                 {
-                    view.TakeContinue(conn);
+                    view.TakeContinue(conns);
                 });
         }
 
@@ -127,9 +127,9 @@ namespace VIZ.Package.Module
                 {
                     this.vizCommandService.TakeOut(conn, ApplicationDomainEx.CurrentPage.Layer);
                 },
-                pluginAction: (view, conn) =>
+                pluginAction: (view, conns) =>
                 {
-                    view.TakeOut(conn);
+                    view.TakeOut(conns);
                 });
         }
 
@@ -152,9 +152,9 @@ namespace VIZ.Package.Module
                 {
                     this.vizCommandControlObjectService.SetControlObject(conn, obj);
                 },
-                pluginAction: (view, conn) =>
+                pluginAction: (view, conns) =>
                 {
-                    view.TakeUpdate(conn);
+                    view.TakeUpdate(conns);
                 });
         }
 
@@ -169,7 +169,7 @@ namespace VIZ.Package.Module
         /// </summary>
         /// <param name="controlObjectAction">控制对象行为</param>
         /// <param name="pluginAction">插件行为</param>
-        private void Execute(Action<ControlObjectModel, ConnModel> controlObjectAction, Action<IPluginView, ConnModel> pluginAction)
+        private void Execute(Action<ControlObjectModel, ConnModel> controlObjectAction, Action<IPluginView, IList<ConnModel>> pluginAction)
         {
             // 是否拥有打开的页或模板页
             if (ApplicationDomainEx.CurrentPage == null)
@@ -217,19 +217,13 @@ namespace VIZ.Package.Module
             if (view == null)
                 return;
 
-            foreach (var item in group.Items)
+            try
             {
-                if (!item.IsEnabled || !item.IsConnected)
-                    continue;
-
-                try
-                {
-                    pluginAction(view, item);
-                }
-                catch (Exception ex)
-                {
-                    log.Error(ex);
-                }
+                pluginAction(view, group.Items.Where(p => p.IsEnabled && p.IsConnected).ToList());
+            }
+            catch (Exception ex)
+            {
+                log.Error(ex);
             }
         }
     }