提交当前本机整理版本

插件库/Lskj.Report/DllBaseClass.cs

@@ -34,4 +34,33 @@ namespace Lskj.Report
                 GridEnum gridEnum = GridEnum.GridView;
 
 
-                if (!reportModel.DataCaches.GetValu
+                if (!reportModel.DataCaches.GetValue(mainForm, "FormType", out int formType))
+                {
+                    formType = BaseImpl.GetBaseType(reportModel.ModuleCode);
+                }
+                if (formType == 1)
+                {
+                    gridEnum = GridEnum.BandedGridView;
+                }
+                if (formType == 2)
+                {
+                    gridEnum = GridEnum.TreeListGridView; // 基础档案暂时注释GridEnum.TreeListGridView此类型,TrcReport和手机端显示卡片冲突.
+                }
+
+                mainForm.Model.GridEnumObj = gridEnum;
+                this.SubForm = mainForm;
+
+            }
+            catch (Exception ex)
+            {
+                MessageUtil.Show(ex);
+                LogHelper.Instance.WriteError(ex);
+                LogUtil.WriteError("Lskj.Report.dll--参数错误-->" + obj.ToString(), ex);
+            }
+        }
+        /// <summary>
+        /// 窗口
+        /// </summary>
+        public Form SubForm { get; set; }
+    }
+}

插件库/Lskj.Report/FrmMain.cs

@@ -151,4 +151,24 @@ namespace Lskj.Report
                 }
                 return details;
             }));
-            Task<int> formTypeTask 
+            Task<int> formTypeTask = cachesDic.AddTask(this, "FormType", new Task<int>(() =>
+            {
+                return BaseImpl.GetBaseType(Model.ModuleCode);
+            }));
+            Task<string> privilegeTask = cachesDic.AddTask(this, "Privilege", new Task<string>(() =>
+            {
+                return Model.Privilege.Equals("3") ? "1" : Model.ModuleId > 0 ? BaseImpl.GetUserPurviewsByMenuId(Model.ModuleId + "") + "" : BaseImpl.GetUserPurviewsByMenuCode(Model.ModuleCode) + "";// 权限(1.有操作权限.0.无权限.2.只读权限.3.右键配置权限全部开放)
+            }));
+            //添加数据到mControl
+            cachesDic.AddTask(mControl, "DynamicModel", dynamicModelTask);
+            cachesDic.AddTask(mControl, "SystemDllRow", systemDllRowTask);
+            cachesDic.AddTask(mControl, "SysModel", sysModelTask);
+            cachesDic.AddTask(mControl, "Details", detailTask);
+            //获取mControl控件的数据
+            mControl.GetDataCaches(cachesDic);
+        }
+
+
+
+    }
+}