SVN r485

SVN-Revision: r485

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

@@ -1048,6 +1048,11 @@ namespace Lskj.Control.Model
                             tp.Controls.Add(form.SubForm);
                             tp.ShowCloseButton = DefaultBoolean.True;
                             tp.Dock = DockStyle.Fill;
+                            //配置了右键刷新的情况下，在当前页签关闭时触发刷新
+                            if ( model.Refresh && this.OnRightCallback != null)
+                            {
+                                tp.Disposed += new EventHandler(OnTp_Disposed);
+                            }
                             ERPInfo.Instance.PageControl.TabPages.Add(tp);
                             ERPInfo.Instance.PageControl.SelectedTabPage = tp;
                             if (isPrivateDll)
@@ -1060,7 +1065,8 @@ namespace Lskj.Control.Model
                             }
                             form.SubForm.Show();
                             ERPInfo.Instance.ModuleForms.Add(guid, module);
-                            tp.Disposed += new EventHandler(OnTp_Disposed);
+                            //直接页签打开模块会直接向后面运行，默认返回false避免外面执行右键刷新
+                            return false;
                         }
                         break;
                 }
@@ -1442,7 +1448,7 @@ namespace Lskj.Control.Model
                         string paramsql1 = paramList[3];
                         paramList[3] = ReplaceHelper.ReplaceRowParam(rows, paramsql1, "'", "'");
                     }
-                }
+                } 
                 else if (model.DllName.ToLower().Contains("Lskj.PubArgoxPrint.dll".ToLower()))
                 {
                     string mainsql = paramList[2];
@@ -1622,4 +1628,28 @@ namespace Lskj.Control.Model
                         DataRow[] dataRows = columnsTab.Select().Where(n => (n["name"] + "").Equals(colunmField.Key)).ToArray();
                         if (dataRows.Length == 0)
                         {
-                            string a
+                            string addColSql = string.Format("alter table P_PrivateDllTab add {0} {1}", colunmField.Key, colunmField.Value);
+                            SqlHelper.ExecuteNonQuery(addColSql);//添加列
+                        }
+                    }
+                }
+                else
+                {
+                    string createTabSql = "create table P_PrivateDllTab(id int IDENTITY(1,1) NOT NULL,{0})";
+                    string createCol = string.Empty;
+                    foreach (KeyValuePair<string, string> colunmField in colDic)
+                    {
+                        createCol += string.Format("{0} {1},", colunmField.Key, colunmField.Value);
+                    }
+                    createTabSql = string.Format(createTabSql, createCol.TrimEnd(','));
+                    SqlHelper.ExecuteNonQuery(createTabSql);//创建表
+                }
+                return true;
+            }
+            catch (Exception)
+            {
+                return false;
+            }
+        }
+    }
+}