From 02aed67e6ecb15db19bf91e92fd1ef3d7a768684 Mon Sep 17 00:00:00 2001
From: cyf <cyf@local>
Date: Thu, 6 Feb 2025 06:46:36 +0000
Subject: [PATCH] SVN r241

SVN-Revision: r241
---
 插件库/Lskj.PubModuleDetail/DllBaseClass.cs | 30 +--------------------
 插件库/Lskj.PubModuleDetail/FrmMain.cs      | 28 ++++---------------
 2 files changed, 6 insertions(+), 52 deletions(-)

diff --git a/插件库/Lskj.PubModuleDetail/DllBaseClass.cs b/插件库/Lskj.PubModuleDetail/DllBaseClass.cs
index 75a272a..87e98e5 100644
--- a/插件库/Lskj.PubModuleDetail/DllBaseClass.cs
+++ b/插件库/Lskj.PubModuleDetail/DllBaseClass.cs
@@ -31,32 +31,4 @@ namespace Lskj.PubModuleDetail
                 main.Model = moduleModel;
                 moduleModel.DataCaches = new Dictionary<object, Hashtable>();
                 if (SystemInfo.Instance.OptimizationSpeed) main.GetDataCaches(moduleModel.DataCaches);
-                GridEnum gridEnum = GridEnum.GridView;
-
-                if (!moduleModel.DataCaches.GetValue(main, "FormType", out int formType))
-                {
-                    formType = BaseImpl.GetBaseType(moduleModel.ModuleCode);
-                }
-                if (formType == 1)
-                {
-                    gridEnum = GridEnum.BandedGridView;
-                }
-                if (formType == 2)
-                {
-                    gridEnum = GridEnum.TreeListGridView; // 基础档案暂时注释GridEnum.TreeListGridView此类型,TrcReport和手机端显示卡片冲突.
-                }
-                main.Model.GridEnumObj = gridEnum;
-                this.SubForm = main;
-
-            }
-            catch (Exception ex)
-            {
-                LogUtil.WriteError("Lskj.PubModuleDetail.dll--参数错误-->" + obj.ToString(), ex);
-            }
-        }
-        /// <summary>
-        /// 窗口
-        /// </summary>
-        public Form SubForm { get; set; }
-    }
-}
+             
\ No newline at end of file
diff --git a/插件库/Lskj.PubModuleDetail/FrmMain.cs b/插件库/Lskj.PubModuleDetail/FrmMain.cs
index 7afcfd5..0096dd4 100644
--- a/插件库/Lskj.PubModuleDetail/FrmMain.cs
+++ b/插件库/Lskj.PubModuleDetail/FrmMain.cs
@@ -39,6 +39,7 @@ namespace Lskj.PubModuleDetail
         public FrmMain()
         {
             InitializeComponent();
+            this.Disposed += OnFrmMainDisposed;
         }
 
         /// <summary>
@@ -63,9 +64,9 @@ namespace Lskj.PubModuleDetail
                 }
                 this.Model.Privilege = privilege;
                 this.mControl.LeftCond = Model.LeftCond;//用户控件的左侧条件=动态链接库对象左侧树结构
-                //ModuleConditionsPanelEx mcpex = new ModuleConditionsPanelEx();
-                //mcpex.InitializeControl(new ModuleModel(MainImpl.GetSystemdllTab(this.Model.ModuleCode)), Model);
-                 if (!dataCaches.GetValue(this, "Details", out List<GridDetailModel> details))
+                                                        //ModuleConditionsPanelEx mcpex = new ModuleConditionsPanelEx();
+                                                        //mcpex.InitializeControl(new ModuleModel(MainImpl.GetSystemdllTab(this.Model.ModuleCode)), Model);
+                if (!dataCaches.GetValue(this, "Details", out List<GridDetailModel> details))
                 {
                     details = GetDetails();
                 }
@@ -144,8 +145,6 @@ namespace Lskj.PubModuleDetail
             mControl.GetDataCaches(cachesDic);
         }
 
-
-
         /// <summary>
         /// 关闭模块时发生
         /// </summary>
@@ -186,21 +185,4 @@ namespace Lskj.PubModuleDetail
         /// <para>修改备注：</para>
         /// <para>版本：1.0</para>
         /// </summary>
-        /// <returns>List&lt;GridDetailModel&gt;.</returns>
-        private List<GridDetailModel> GetDetails()
-        {
-            List<GridDetailModel> details = new List<GridDetailModel>();//表格明细对象的集合
-            DataTable table = BaseModuleImpl.GetBaseDetailPages(Model.ModuleCode);// 根据传入的模块编号获得基础档案底部标签的数据
-            foreach (DataRow item in table.Rows)
-            {
-                DataTable gridColumns =  ReportImpl.GetReportDetailColumns(Model.ModuleCode, item["id"] + "");//获取报表明细列
-                details.Add(new GridDetailModel(item, gridColumns, GridCustomColumnStruct.BaseDetailGridView));
-            }
-            return details;
-        }
-
-
-
-
-    }
-}
\ No newline at end of file
+        /// <
\ No newline at end of file