diff --git a/插件库/Lskj.Control/Model/CommonMenu.cs b/插件库/Lskj.Control/Model/CommonMenu.cs
index 9f8c532..6763ec4 100644
--- a/插件库/Lskj.Control/Model/CommonMenu.cs
+++ b/插件库/Lskj.Control/Model/CommonMenu.cs
@@ -21,6 +21,7 @@ using Lskj.Data;
using System.IO;
using System.Data.SqlClient;
using Lskj.Business;
+using DevExpress.XtraGrid.Views.Grid;
namespace Lskj.Control.Model
{
@@ -29,11 +30,14 @@ namespace Lskj.Control.Model
///
public class CommonMenu
{
+ protected GridControlEx GridControlObj;
+ protected GridView BaseGridView;
private DynamicModel _model;
///
/// 控件面板
///
private MyControl _controlObj;
+ public bool issuccess = true;
///
/// Occurs when [apply before].
///
@@ -43,10 +47,16 @@ namespace Lskj.Control.Model
/// Initializes a new instance of the class.
///
/// 常用工具数据行.
- public CommonMenu(DynamicModel model, MyControl control)
+ public CommonMenu(DynamicModel model, MyControl control, System.Windows.Forms.Control view=null)
{
this._model = model;
this._controlObj = control;
+ if(view!=null) this.GridControlObj = view as GridControlEx;
+ if (this.GridControlObj != null)
+ {
+ this.BaseGridView = this.GridControlObj.GridView;
+ }
+
}
///
@@ -324,6 +334,7 @@ namespace Lskj.Control.Model
/// true if XXXX, false otherwise.
private bool ExecDynamicLinkLibary(GridRightMenuModel model, List paramList)
{
+ issuccess = true;
if (string.IsNullOrWhiteSpace(model.DllName))
{
MessageUtil.Show(ResourceKeys.OperFault + "未配置动态链接库.");
@@ -383,6 +394,10 @@ namespace Lskj.Control.Model
}
form.SubForm.WindowState = model.MaxWindow ? FormWindowState.Maximized : FormWindowState.Normal;
form.SubForm.Text = model.MenuName;
+ if (form.SubForm is BaseForm)
+ {
+ (form.SubForm as BaseForm).ParentView = this.BaseGridView;
+ }
form.SubForm.ShowDialog();
if (DynamicLinkAfter != null)
{
@@ -402,29 +417,4 @@ namespace Lskj.Control.Model
///
/// 说明:
/// 创建人:龚宇超
- /// 创建日期:2017-11-01
- /// 修改人:
- /// 修改日期:
- /// 修改备注:
- /// 版本:1.0
- ///
- /// Name of the libary.
- /// The parameter list.
- /// true if XXXX, false otherwise.
- private bool ExecDelphiLibary(string libaryName, List paramList)
- {
- try
- {
- DelphiHelper.LoadDelphiDll(libaryName, paramList[0], paramList[1], paramList[2], paramList[3], Convert.ToInt32(paramList[4]), paramList[5]);
- return true;
- }
- catch (Exception ex)
- {
- //MessageUtil.Show(ex);
- string Message = ErrorMessage.PromptErrorMessage(ex);
- MessageUtil.Show(Message, ex.Message);
- }
- return false;
- }
- }
-}
+ /// 创建日期
\ No newline at end of file