diff --git a/插件库/Lskj.Control/LabelAutoTextEdit.Designer.cs b/插件库/Lskj.Control/LabelAutoTextEdit.Designer.cs
index aba649e..31724a8 100644
--- a/插件库/Lskj.Control/LabelAutoTextEdit.Designer.cs
+++ b/插件库/Lskj.Control/LabelAutoTextEdit.Designer.cs
@@ -29,8 +29,8 @@
private void InitializeComponent()
{
this.plRight = new System.Windows.Forms.Panel();
- this.btnRefresh = new DevExpress.XtraEditors.SimpleButton();
this.txtEdit = new Lskj.Control.AutoGridLookUp();
+ this.btnRefresh = new DevExpress.XtraEditors.SimpleButton();
this.lblText = new System.Windows.Forms.Label();
this.plLeft = new System.Windows.Forms.Panel();
this.plRight.SuspendLayout();
@@ -40,14 +40,24 @@
//
// plRight
//
- this.plRight.Controls.Add(this.btnRefresh);
this.plRight.Controls.Add(this.txtEdit);
+ this.plRight.Controls.Add(this.btnRefresh);
this.plRight.Dock = System.Windows.Forms.DockStyle.Fill;
this.plRight.Location = new System.Drawing.Point(40, 0);
this.plRight.Name = "plRight";
this.plRight.Size = new System.Drawing.Size(122, 21);
this.plRight.TabIndex = 3;
//
+ // txtEdit
+ //
+ this.txtEdit.DataSource = null;
+ this.txtEdit.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.txtEdit.EditValue = "";
+ this.txtEdit.Location = new System.Drawing.Point(0, 0);
+ this.txtEdit.Name = "txtEdit";
+ this.txtEdit.Size = new System.Drawing.Size(88, 20);
+ this.txtEdit.TabIndex = 38;
+ //
// btnRefresh
//
this.btnRefresh.Appearance.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
@@ -60,16 +70,6 @@
this.btnRefresh.Text = "刷新";
this.btnRefresh.Visible = false;
//
- // txtEdit
- //
- this.txtEdit.DataSource = null;
- this.txtEdit.Dock = System.Windows.Forms.DockStyle.Fill;
- this.txtEdit.EditValue = "";
- this.txtEdit.Location = new System.Drawing.Point(0, 0);
- this.txtEdit.Name = "txtEdit";
- this.txtEdit.Size = new System.Drawing.Size(122, 20);
- this.txtEdit.TabIndex = 0;
- //
// lblText
//
this.lblText.AutoSize = true;
@@ -86,31 +86,4 @@
this.plLeft.Dock = System.Windows.Forms.DockStyle.Left;
this.plLeft.Location = new System.Drawing.Point(0, 0);
this.plLeft.Name = "plLeft";
- this.plLeft.Size = new System.Drawing.Size(40, 21);
- this.plLeft.TabIndex = 2;
- //
- // LabelAutoTextEdit
- //
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
- this.BackColor = System.Drawing.Color.Transparent;
- this.Controls.Add(this.plRight);
- this.Controls.Add(this.plLeft);
- this.Name = "LabelAutoTextEdit";
- this.Size = new System.Drawing.Size(162, 21);
- this.plRight.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.txtEdit.Properties)).EndInit();
- this.plLeft.ResumeLayout(false);
- this.plLeft.PerformLayout();
- this.ResumeLayout(false);
-
- }
-
- #endregion
-
- private System.Windows.Forms.Panel plRight;
- private System.Windows.Forms.Label lblText;
- private System.Windows.Forms.Panel plLeft;
- private AutoGridLookUp txtEdit;
- private DevExpress.XtraEditors.SimpleButton btnRefresh;
- }
-}
+ this.plLeft.Size = new System.Drawing.Size(40, 21)
\ No newline at end of file
diff --git a/插件库/Lskj.Control/LabelAutoTreeEdit.resx b/插件库/Lskj.Control/LabelAutoTreeEdit.resx
index da8d846..424da63 100644
--- a/插件库/Lskj.Control/LabelAutoTreeEdit.resx
+++ b/插件库/Lskj.Control/LabelAutoTreeEdit.resx
@@ -120,9 +120,6 @@
True
-
- True
-
True
diff --git a/插件库/Lskj.Control/Lskj.Control.csproj b/插件库/Lskj.Control/Lskj.Control.csproj
index ad938d8..046ed56 100644
--- a/插件库/Lskj.Control/Lskj.Control.csproj
+++ b/插件库/Lskj.Control/Lskj.Control.csproj
@@ -66,6 +66,10 @@
False
+
+ False
+ ..\..\..\..\DEV\Components\Bin\Framework\DevExpress.Docs.v15.2.dll
+
False
@@ -274,6 +278,10 @@
..\..\引用DLL\itextsharp.dll
+
+ False
+ ..\..\引用DLL\Kdbndp.dll
+
..\..\引用DLL\libzkfpcsharp.dll
@@ -416,9 +424,6 @@
Component
-
- AutoGridRevLookUp.cs
-
UserControl
@@ -502,6 +507,12 @@
FrmAddDynamic.cs
+
+ Form
+
+
+ FrmAnnouncement.cs
+
Form
@@ -514,6 +525,24 @@
FrmBack.cs
+
+ Form
+
+
+ FrmBaseSelectBatch.cs
+
+
+ Form
+
+
+ FrmColorDescription.cs
+
+
+ Form
+
+
+ FrmCover.cs
+
Form
@@ -538,6 +567,36 @@
FrmDownload.cs
+
+ Form
+
+
+ FrmSettingTableName.cs
+
+
+ Form
+
+
+ FrmTreePicture.cs
+
+
+ Form
+
+
+ FrmPicture.cs
+
+
+ Form
+
+
+ FrmPositioningColumn.cs
+
+
+ UserControl
+
+
+ FrmProductSched.cs
+
Form
@@ -631,6 +690,12 @@
+
+ UserControl
+
+
+ LabApiButtonEdit.cs
+
UserControl
@@ -640,9 +705,6 @@
Component
-
- AutoGridLookUp.cs
-
UserControl
@@ -652,9 +714,6 @@
Component
-
- AutoTreeLookUp.cs
-
UserControl
@@ -733,6 +792,12 @@
LabelAutoTreeEdit.cs
+
+ UserControl
+
+
+ LabelBillSourceComboxEdit.cs
+
UserControl
@@ -769,6 +834,12 @@
LabelComboxPopupEdit.cs
+
+ UserControl
+
+
+ LabelDateHalfDayEdit.cs
+
UserControl
@@ -805,6 +876,12 @@
LabelMultiAutoTextEdit4.cs
+
+ UserControl
+
+
+ LabelPrompt.cs
+
UserControl
@@ -817,6 +894,12 @@
LabelRichEdit.cs
+
+ UserControl
+
+
+ LabelTipWithLink.cs
+
UserControl
@@ -842,6 +925,7 @@
AuditPanelEx.cs
+
@@ -850,6 +934,8 @@
+
+
@@ -862,8 +948,10 @@
+
+
@@ -975,6 +1063,9 @@
SignControlEx.cs
+
+ UserControl
+
UserControl
@@ -1315,9 +1406,6 @@
AuditPanelEx.cs
-
- AutoGridRevLookUp.cs
-
AutoGridRevPopup.cs
@@ -1344,12 +1432,24 @@
FrmAddDynamic.cs
+
+ FrmAnnouncement.cs
+
FrmAutoSqlLoad.cs
FrmBack.cs
+
+ FrmBaseSelectBatch.cs
+
+
+ FrmColorDescription.cs
+
+
+ FrmCover.cs
+
FrmExamine.cs
@@ -1362,6 +1462,21 @@
FrmDownload.cs
+
+ FrmSettingTableName.cs
+
+
+ FrmTreePicture.cs
+
+
+ FrmPicture.cs
+
+
+ FrmPositioningColumn.cs
+
+
+ FrmProductSched.cs
+
FrmTreeExport.cs
@@ -1398,12 +1513,12 @@
HighShotMeterTextEdit.cs
+
+ LabApiButtonEdit.cs
+
LabelAutoGridLook.cs
-
- AutoGridLookUp.cs
-
AutoGridPopup.cs
@@ -1444,6 +1559,9 @@
LabelAutoTreeEdit.cs
+
+ LabelBillSourceComboxEdit.cs
+
LabelButtonWithCheckbox.cs
@@ -1462,6 +1580,9 @@
LabelComboxPopupEdit.cs
+
+ LabelDateHalfDayEdit.cs
+
LabelGridSelectEdit.cs
@@ -1480,12 +1601,18 @@
LabelMultiAutoTextEdit4.cs
+
+ LabelPrompt.cs
+
LabelRadioButtonGroupEdit.cs
LabelRichEdit.cs
+
+ LabelTipWithLink.cs
+
LabelTitle.cs
@@ -1734,6 +1861,7 @@
True
+
diff --git a/插件库/Lskj.Control/Model/DateFormat.cs b/插件库/Lskj.Control/Model/DateFormat.cs
index a67a8cc..86e8b39 100644
--- a/插件库/Lskj.Control/Model/DateFormat.cs
+++ b/插件库/Lskj.Control/Model/DateFormat.cs
@@ -68,30 +68,4 @@ namespace Lskj.Control.Model
default:
case (int)ControlType.LabDate:
- case (int)ControlType.LabCheckDateEx:
- formatValue = mDate;
- break;
- case (int)ControlType.LabDateTime:
- case (int)ControlType.LabCheckDateTimeEx:
- formatValue = mDateTime;
- break;
- case (int)ControlType.LabDateTimeShort:
- case (int)ControlType.LabCheckDateTimeShort:
- formatValue = mDateTimeShort;
- break;
- case (int)ControlType.LabTime:
- case (int)ControlType.LabCheckTime:
- formatValue = mTime;
- break;
- case (int)ControlType.LabShortTime:
- case (int)ControlType.LabCheckShortTime:
- formatValue = mShortTime;
- break;
- case (int)ControlType.LabShortDate:
- formatValue = mShortDate;
- break;
- }
- return formatValue;
- }
- }
-}
+ case (int)ControlType.
\ No newline at end of file
diff --git a/插件库/Lskj.Control/Model/GridExtend.cs b/插件库/Lskj.Control/Model/GridExtend.cs
index 513bd19..db8437a 100644
--- a/插件库/Lskj.Control/Model/GridExtend.cs
+++ b/插件库/Lskj.Control/Model/GridExtend.cs
@@ -4256,8 +4256,9 @@ namespace Lskj.Control.Model
// 优先复制整个工作表，最大程度保留字体、边框、筛选、列宽等导出格式。
targetPackage.Workbook.Worksheets.Add(sheetName, sourceSheet);
}
- catch
+ catch (Exception ex)
{
+ LogHelper.Instance.WriteError(ex);
// 整表复制失败时，退回到逐格复制，仍然尽量保留单元格样式。
if (targetPackage.Workbook.Worksheets[sheetName] != null)
{
@@ -4399,7 +4400,11 @@ namespace Lskj.Control.Model
if (sourceSheet.View != null)
{
targetSheet.View.ShowGridLines = sourceSheet.View.ShowGridLines;
- targetSheet.View.ZoomScale = sourceSheet.View.ZoomScale;
+ int zoomScale = sourceSheet.View.ZoomScale;
+ if (zoomScale >= 10 && zoomScale <= 400)
+ {
+ targetSheet.View.ZoomScale = zoomScale;
+ }
}
}