SVN r1167

SVN-Revision: r1167

插件库/Lskj.Control/Model/MenuStrip/BaseMenuStrip.cs

@@ -699,6 +699,7 @@ namespace Lskj.Control.Model
         }
 
 
+        //打开导入覆盖控件
         public bool OpenFrmcCover(GridRightMenuModel model, List<string> paramList)
         {
 
@@ -1784,7 +1785,7 @@ namespace Lskj.Control.Model
                         paramList[2] = ReplaceHelper.ReplaceRowParam(rows, url) + "";
                     }
                 }
-                if (model.DllName.ToLower().Contains("p_PubPrint.lsp".ToLower()))
+                if (model.DllName.ToLower().Contains("p_PubPrint.lsp".ToLower())&& !model.CancelDefaultReplace)
                 {
                     string paramsql1 = paramList[2];
                     paramList[2] = ReplaceHelper.ReplaceRowParam(rows, paramsql1, "'", "'");

插件库/Lskj.Control/Model/MenuStrip/RightMenuModel.cs

@@ -129,7 +129,7 @@ namespace Lskj.Control.Model
         /// <value><c>true</c> if [more click]; otherwise, <c>false</c>.</value>
         public bool MoreClick { get { return _moreClick; } }
         /// <summary>
-        /// 右键菜单是否可执参数替换
+        /// 右键菜单是否可执参数替换(合并)
         /// </summary>
         /// <value><c>true</c> if [merg Eexec]; otherwise, <c>false</c>.</value>
         public bool Mergeexec { get { return _mergEexec; } }
@@ -342,6 +342,10 @@ namespace Lskj.Control.Model
         /// 右键验证是否有修改后的数据
         /// </summary>
         public bool VerifyUpdate;
+        /// <summary>
+        /// 右键多选合并不走默认替换（p_PubPrint.lsp）
+        /// </summary>
+        public bool CancelDefaultReplace;
 
 
         /// <summary>
@@ -471,4 +475,6 @@ namespace Lskj.Control.Model
                 this.SqlDirectExecution = string.IsNullOrWhiteSpace(item["SqlDirectExecution"] + "") ? false : "1".Equals(item["SqlDirectExecution"] + "");
             if (item.Table.Columns.Contains("UnionZTid"))
                 this.UnionZTid = string.IsNullOrWhiteSpace(item["UnionZTid"] + "") ? "" : item["UnionZTid"] + "";
-            if (item.Table.Columns.Contains("Di
+            if (item.Table.Columns.Contains("DisableSuccessfulPrompt"))
+                this.DisableSuccessfulPrompt = string.IsNullOrWhiteSpace(item["DisableSuccessfulPrompt"] + "") ? false : "1".Equals(item["DisableSuccessfulPrompt"] + "");
+            if (item.Table.Columns.