From 797d3919986d987447cb4d18b009e632734b82ea Mon Sep 17 00:00:00 2001 From: wyf Date: Sat, 12 Apr 2025 07:21:12 +0000 Subject: [PATCH] SVN r480 SVN-Revision: r480 --- 插件库/Lskj.Control/LabelImageEdit.cs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/插件库/Lskj.Control/LabelImageEdit.cs b/插件库/Lskj.Control/LabelImageEdit.cs index 2882cba..7d39096 100644 --- a/插件库/Lskj.Control/LabelImageEdit.cs +++ b/插件库/Lskj.Control/LabelImageEdit.cs @@ -143,7 +143,7 @@ namespace Lskj.Control /// The is empty. public override bool IsEmpty() { - return base.Model != null && base.Model.IsEmpty && this.imgFile.Image != null; + return base.Model != null && base.Model.IsEmpty && this.imgFile.Image == null; } /// /// 说明:图片是否改变 @@ -347,14 +347,14 @@ namespace Lskj.Control { try { - string url = string.Format(this.DownloadUrl, ERPInfo.Instance.UserName, ERPInfo.Instance.Password, "", "0"); - // 固定传入参数(窗口标题、操作员ID、操作员名称、权限、模版编号) - string[] defaultArgs = string.Format(ModuleArgs.DefaultArgs, "预览", ERPInfo.Instance.UserId, ERPInfo.Instance.UserName, "2", "").Split('~'); - string[] menuArgs = new string[] { "", "", url } ; - string[] args = defaultArgs.Concat(menuArgs).ToArray(); - IForm form = FormHelper.LoadDllForm("Lskj.PubBrower.dll", args); - DialogResult result = form.SubForm.ShowDialog(); - + string url = string.Format(this.DownloadUrl, ERPInfo.Instance.UserName, ERPInfo.Instance.Password, "", "0"); + // 固定传入参数(窗口标题、操作员ID、操作员名称、权限、模版编号) + string[] defaultArgs = string.Format(ModuleArgs.DefaultArgs, "预览", ERPInfo.Instance.UserId, ERPInfo.Instance.UserName, "2", "").Split('~'); + string[] menuArgs = new string[] { "", "", url }; + string[] args = defaultArgs.Concat(menuArgs).ToArray(); + IForm form = FormHelper.LoadDllForm("Lskj.PubBrower.dll", args); + DialogResult result = form.SubForm.ShowDialog(); + } catch (Exception ex) {