diff --git a/AIMS.UI/AIMSControls.csproj b/AIMS.UI/AIMSControls.csproj index 3149c78..79edb14 100644 --- a/AIMS.UI/AIMSControls.csproj +++ b/AIMS.UI/AIMSControls.csproj @@ -43,11 +43,11 @@ False - Extensions\DevComponents.DotNetBar.SuperGrid.dll + ..\AIMS\Extensions\DevComponents.DotNetBar.SuperGrid.dll False - ..\..\..\..\..\..\..\Program Files (x86)\DotNetBar for Windows Forms\DevComponents.DotNetBar2.dll + ..\AIMS\Extensions\DevComponents.DotNetBar2.dll False @@ -254,12 +254,30 @@ frmDocumentSingle.cs + + Form + + + frmKB.cs + Form frmTemplateD.cs + + Form + + + frmUserTempPurview.cs + + + Form + + + frmUserTempPurviewDetail.cs + Form @@ -951,10 +969,19 @@ frmDocumentSingle.cs + + frmKB.cs + frmTemplateD.cs Designer + + frmUserTempPurview.cs + + + frmUserTempPurviewDetail.cs + frmDosageKind.cs diff --git a/DocumentManagement/UI/frmKB.Designer.cs b/AIMS.UI/DocManager/frmKB.Designer.cs similarity index 100% rename from DocumentManagement/UI/frmKB.Designer.cs rename to AIMS.UI/DocManager/frmKB.Designer.cs diff --git a/DocumentManagement/UI/frmKB.cs b/AIMS.UI/DocManager/frmKB.cs similarity index 100% rename from DocumentManagement/UI/frmKB.cs rename to AIMS.UI/DocManager/frmKB.cs diff --git a/DocumentManagement/UI/frmKB.resx b/AIMS.UI/DocManager/frmKB.resx similarity index 100% rename from DocumentManagement/UI/frmKB.resx rename to AIMS.UI/DocManager/frmKB.resx diff --git a/DocumentManagement/UI/frmUserTempPurview.Designer.cs b/AIMS.UI/DocManager/frmUserTempPurview.Designer.cs similarity index 100% rename from DocumentManagement/UI/frmUserTempPurview.Designer.cs rename to AIMS.UI/DocManager/frmUserTempPurview.Designer.cs diff --git a/DocumentManagement/UI/frmUserTempPurview.cs b/AIMS.UI/DocManager/frmUserTempPurview.cs similarity index 100% rename from DocumentManagement/UI/frmUserTempPurview.cs rename to AIMS.UI/DocManager/frmUserTempPurview.cs diff --git a/DocumentManagement/UI/frmUserTempPurview.resx b/AIMS.UI/DocManager/frmUserTempPurview.resx similarity index 100% rename from DocumentManagement/UI/frmUserTempPurview.resx rename to AIMS.UI/DocManager/frmUserTempPurview.resx diff --git a/DocumentManagement/UI/frmUserTempPurviewDetail.Designer.cs b/AIMS.UI/DocManager/frmUserTempPurviewDetail.Designer.cs similarity index 100% rename from DocumentManagement/UI/frmUserTempPurviewDetail.Designer.cs rename to AIMS.UI/DocManager/frmUserTempPurviewDetail.Designer.cs diff --git a/DocumentManagement/UI/frmUserTempPurviewDetail.cs b/AIMS.UI/DocManager/frmUserTempPurviewDetail.cs similarity index 100% rename from DocumentManagement/UI/frmUserTempPurviewDetail.cs rename to AIMS.UI/DocManager/frmUserTempPurviewDetail.cs diff --git a/DocumentManagement/UI/frmUserTempPurviewDetail.resx b/AIMS.UI/DocManager/frmUserTempPurviewDetail.resx similarity index 100% rename from DocumentManagement/UI/frmUserTempPurviewDetail.resx rename to AIMS.UI/DocManager/frmUserTempPurviewDetail.resx diff --git a/AIMS.UI/FormMainManage.cs b/AIMS.UI/FormMainManage.cs index 1f811d8..16d296b 100644 --- a/AIMS.UI/FormMainManage.cs +++ b/AIMS.UI/FormMainManage.cs @@ -367,19 +367,9 @@ namespace AIMS } public Form GetForm(string Path) { - object result = null; - if (Path.Contains("AIMS") || Path.Contains("DataDictionary") || Path.Contains("DrugManagement")) - { + object result = null; Type type = Type.GetType(Path); - result = (Form)Activator.CreateInstance(type); - } - else - { - Type typeofControl = null; - Assembly tempAssembly = Assembly.LoadFrom("" + Path.Split('.')[0].ToString() + ".DLL"); - typeofControl = tempAssembly.GetType(Path); - result = (Form)Activator.CreateInstance(typeofControl); - } + result = (Form)Activator.CreateInstance(type); return (Form)result; } diff --git a/AIMS.UI/OperationAfter/frmOperationManage.cs b/AIMS.UI/OperationAfter/frmOperationManage.cs index 157e4e9..6f0ee04 100644 --- a/AIMS.UI/OperationAfter/frmOperationManage.cs +++ b/AIMS.UI/OperationAfter/frmOperationManage.cs @@ -116,7 +116,9 @@ namespace AIMS.OperationAfter.UI } private void timerLoadRescue_Tick(object sender, EventArgs e) { + timerLoadRescue.Enabled=false; btnFind_Click(null, null); + } /// /// 绑定基础表项目数据 到 ComboBox diff --git a/AIMS.UI/PublicUI/MainFormManage.cs b/AIMS.UI/PublicUI/MainFormManage.cs index 1bf2fda..a6cd26c 100644 --- a/AIMS.UI/PublicUI/MainFormManage.cs +++ b/AIMS.UI/PublicUI/MainFormManage.cs @@ -66,20 +66,10 @@ namespace AIMS } } public Form GetForm(string Path) - { - object result = null; - if (Path.Contains("AIMS") ||Path.Contains("DataDictionary") ||Path.Contains("DrugManagement")) - { + { + object result = null; Type type = Type.GetType(Path); - result = (Form)Activator.CreateInstance(type); - } - else - { - Type typeofControl = null; - Assembly tempAssembly = Assembly.LoadFrom("" + Path.Split('.')[0].ToString() + ".DLL"); - typeofControl = tempAssembly.GetType(Path); - result = (Form)Activator.CreateInstance(typeofControl); - } + result = (Form)Activator.CreateInstance(type); return (Form)result; } diff --git a/DocumentManagement/DocumentEntity/DocumentDAL.cs b/DocumentManagement/DocumentEntity/DocumentDAL.cs index 2725fa3..e0439bc 100644 --- a/DocumentManagement/DocumentEntity/DocumentDAL.cs +++ b/DocumentManagement/DocumentEntity/DocumentDAL.cs @@ -50,7 +50,7 @@ namespace DocumentManagement /// 知识树节点排序 /// /// 节点list - internal static void SetOrders(List ls) + public static void SetOrders(List ls) { try { @@ -366,7 +366,7 @@ namespace DocumentManagement return dt; } - internal static void InsertEntry(KBEntry entry) + public static void InsertEntry(KBEntry entry) { try { @@ -418,7 +418,7 @@ namespace DocumentManagement } } - internal static void UpdateEntry(KBEntry entry) + public static void UpdateEntry(KBEntry entry) { try { @@ -455,7 +455,7 @@ namespace DocumentManagement } } - internal static void DeleteEntry(string id) + public static void DeleteEntry(string id) { try { diff --git a/DocumentManagement/DocumentEntity/PrintTemplateDB.cs b/DocumentManagement/DocumentEntity/PrintTemplateDB.cs index 4dcd06a..63d381e 100644 --- a/DocumentManagement/DocumentEntity/PrintTemplateDB.cs +++ b/DocumentManagement/DocumentEntity/PrintTemplateDB.cs @@ -5,7 +5,7 @@ using System.Text; using System.Data; namespace DocumentManagement.DAL { - class PrintTemplateDB + public class PrintTemplateDB { public static void Add(Model.PrintTemplate PrintTemplateObj) { diff --git a/DocumentManagement/DocumentManagement.csproj b/DocumentManagement/DocumentManagement.csproj index 14595ea..766a1cf 100644 --- a/DocumentManagement/DocumentManagement.csproj +++ b/DocumentManagement/DocumentManagement.csproj @@ -12,6 +12,8 @@ DocumentManagement v4.0 512 + + true @@ -40,7 +42,7 @@ False - ..\AIMS\DLL\DevComponents.DotNetBar2.dll + ..\AIMS\Extensions\DevComponents.DotNetBar2.dll False @@ -140,12 +142,6 @@ ExtWriterControl.cs - - Form - - - frmKB.cs - Form @@ -170,18 +166,6 @@ frmTitle.cs - - Form - - - frmUserTempPurview.cs - - - Form - - - frmUserTempPurviewDetail.cs - Form @@ -215,9 +199,6 @@ ExtWriterControl.cs - - frmKB.cs - frmParentSelect.cs @@ -234,12 +215,6 @@ frmTitle.cs - - frmUserTempPurview.cs - - - frmUserTempPurviewDetail.cs - frmViewSelect.cs diff --git a/DocumentManagement/UI/frmTemplate.cs b/DocumentManagement/UI/frmTemplate.cs index 94fb39e..610d173 100644 --- a/DocumentManagement/UI/frmTemplate.cs +++ b/DocumentManagement/UI/frmTemplate.cs @@ -58,9 +58,9 @@ namespace DocumentManagement private FlagXTextRangeProvider provider = new FlagXTextRangeProvider(); - private CompilerResults cr; + //private CompilerResults cr; - private Type type; + //private Type type; public frmTemplate() { @@ -295,96 +295,7 @@ namespace DocumentManagement //} //InitCodeCompiler(); - } - - private void InitCodeCompiler() - { - var providerOptions = new Dictionary(); - providerOptions.Add("CompilerVersion", "v4.0"); - CodeDomProvider cdp = new CSharpCodeProvider(providerOptions); - CompilerParameters cp = new CompilerParameters(); - cp.GenerateExecutable = false; - cp.GenerateInMemory = true; - cp.ReferencedAssemblies.Add("mscorlib.dll"); - cp.ReferencedAssemblies.Add("System.dll"); - cp.ReferencedAssemblies.Add("System.Core.dll"); - cp.ReferencedAssemblies.Add("DCSoft.Writer.dll"); - cp.ReferencedAssemblies.Add("System.Data.Linq.dll"); - cp.ReferencedAssemblies.Add("System.Xml.Linq.dll"); - cp.ReferencedAssemblies.Add("System.Windows.Forms.dll"); - string source = @" -namespace DocumentManagement -{ - using System; - using System.Collections.Generic; - using System.Linq; - using DCSoft.Writer; - using DCSoft.Writer.Dom; - using System.Windows.Forms; - using System.Reflection; - public class BindEvents - { - private XTextDocument doc; - private XTextContainerElement container; - public BindEvents(DCSoft.Writer.Controls.WriterControl myEditControl) - { - doc = myEditControl.Document; - container = myEditControl.Document; - - } - public static void MouseClickEvent(){ -// doc.EditorControl.FreezeUI(); -// -// doc.EditorControl.ReleaseFreezeUI(); -// doc.EditorControl.UpdatePages(); - - } - - - private void SetCheckedValue(string name, bool value) - { - var element = doc.GetElementsByName(name).FirstElement; - if (element != null) - { - var pChecked = element.GetType().GetProperty(""Checked""); - pChecked.SetValue(element, value, null); - } - } - - private bool GetCheckedValue(string name) - { - bool? result = null; - var element = doc.GetElementsByName(name).FirstElement; - if (element != null) - { - var pChecked = element.GetType().GetProperty(""Checked""); - result = Convert.ToBoolean(pChecked.GetValue(element, null)); - } - return result.Value; - } - } -} -"; - cr = cdp.CompileAssemblyFromSource(cp, source); - if (cr.Errors.HasErrors) - { - MessageBox.Show("加载元素事件失败！"); - } - else - { - Assembly a = cr.CompiledAssembly; - type = a.GetTypes().Where(x => x.IsClass).FirstOrDefault(); - Type[] types = new Type[a.GetTypes().Length]; - types[0] = typeof(WriterControl); - ConstructorInfo ci = type.GetConstructor(types); - if (ci != null) - { - object obj = ci.Invoke(new object[] { this.myEditControl }); - } - //myEditControl.Document.GetElementsByName("").FirstElement; - } - } - + } /// /// Handle after load document /// diff --git a/DrawGraph/DrawGraph.csproj b/DrawGraph/DrawGraph.csproj index 96808c7..435e4b5 100644 --- a/DrawGraph/DrawGraph.csproj +++ b/DrawGraph/DrawGraph.csproj @@ -37,7 +37,7 @@ False - ..\AIMS\DLL\DevComponents.DotNetBar2.dll + ..\AIMS\Extensions\DevComponents.DotNetBar2.dll False diff --git a/DrawGraphManagement/DrawGraphManagement.csproj b/DrawGraphManagement/DrawGraphManagement.csproj index 33b1294..525c556 100644 --- a/DrawGraphManagement/DrawGraphManagement.csproj +++ b/DrawGraphManagement/DrawGraphManagement.csproj @@ -72,7 +72,10 @@ ..\AIMS\Extensions\DCSoft.Writer.dll - + + False + ..\AIMS\Extensions\DevComponents.DotNetBar2.dll + False ..\AIMS\Extensions\Newtonsoft.Json.dll