SVN r1219
SVN-Revision: r1219
This commit is contained in:
+13
-40
@@ -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)
|
||||
@@ -120,9 +120,6 @@
|
||||
<metadata name="plRight.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="txtEdit.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="lblText.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
|
||||
@@ -66,6 +66,10 @@
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
</Reference>
|
||||
<Reference Include="DevExpress.DataAccess.v15.2.UI, Version=15.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
||||
<Reference Include="DevExpress.Docs.v15.2, Version=15.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\..\..\..\DEV\Components\Bin\Framework\DevExpress.Docs.v15.2.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="DevExpress.Office.v15.2.Core, Version=15.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
</Reference>
|
||||
@@ -274,6 +278,10 @@
|
||||
<Reference Include="itextsharp">
|
||||
<HintPath>..\..\引用DLL\itextsharp.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Kdbndp, Version=8.6.1.1, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\..\引用DLL\Kdbndp.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="libzkfpcsharp">
|
||||
<HintPath>..\..\引用DLL\libzkfpcsharp.dll</HintPath>
|
||||
</Reference>
|
||||
@@ -416,9 +424,6 @@
|
||||
<Compile Include="AutoGridLookUp\AutoGridRevLookUp.cs">
|
||||
<SubType>Component</SubType>
|
||||
</Compile>
|
||||
<Compile Include="AutoGridLookUp\AutoGridRevLookUp.Designer.cs">
|
||||
<DependentUpon>AutoGridRevLookUp.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="AutoGridLookUp\AutoGridRevPopup.cs">
|
||||
<SubType>UserControl</SubType>
|
||||
</Compile>
|
||||
@@ -502,6 +507,12 @@
|
||||
<Compile Include="FrmAddDynamic.Designer.cs">
|
||||
<DependentUpon>FrmAddDynamic.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="FrmAnnouncement.cs">
|
||||
<SubType>Form</SubType>
|
||||
</Compile>
|
||||
<Compile Include="FrmAnnouncement.Designer.cs">
|
||||
<DependentUpon>FrmAnnouncement.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="FrmAutoSqlLoad.cs">
|
||||
<SubType>Form</SubType>
|
||||
</Compile>
|
||||
@@ -514,6 +525,24 @@
|
||||
<Compile Include="FrmBack.Designer.cs">
|
||||
<DependentUpon>FrmBack.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="FrmBaseSelectBatch.cs">
|
||||
<SubType>Form</SubType>
|
||||
</Compile>
|
||||
<Compile Include="FrmBaseSelectBatch.Designer.cs">
|
||||
<DependentUpon>FrmBaseSelectBatch.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="FrmColorDescription.cs">
|
||||
<SubType>Form</SubType>
|
||||
</Compile>
|
||||
<Compile Include="FrmColorDescription.Designer.cs">
|
||||
<DependentUpon>FrmColorDescription.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="FrmCover.cs">
|
||||
<SubType>Form</SubType>
|
||||
</Compile>
|
||||
<Compile Include="FrmCover.Designer.cs">
|
||||
<DependentUpon>FrmCover.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="FrmExamine.cs">
|
||||
<SubType>Form</SubType>
|
||||
</Compile>
|
||||
@@ -538,6 +567,36 @@
|
||||
<Compile Include="FrmDownload.Designer.cs">
|
||||
<DependentUpon>FrmDownload.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="FrmSettingTableName.cs">
|
||||
<SubType>Form</SubType>
|
||||
</Compile>
|
||||
<Compile Include="FrmSettingTableName.Designer.cs">
|
||||
<DependentUpon>FrmSettingTableName.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="FrmTreePicture.cs">
|
||||
<SubType>Form</SubType>
|
||||
</Compile>
|
||||
<Compile Include="FrmTreePicture.Designer.cs">
|
||||
<DependentUpon>FrmTreePicture.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="FrmPicture.cs">
|
||||
<SubType>Form</SubType>
|
||||
</Compile>
|
||||
<Compile Include="FrmPicture.Designer.cs">
|
||||
<DependentUpon>FrmPicture.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="FrmPositioningColumn.cs">
|
||||
<SubType>Form</SubType>
|
||||
</Compile>
|
||||
<Compile Include="FrmPositioningColumn.Designer.cs">
|
||||
<DependentUpon>FrmPositioningColumn.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="FrmProductSched.cs">
|
||||
<SubType>UserControl</SubType>
|
||||
</Compile>
|
||||
<Compile Include="FrmProductSched.Designer.cs">
|
||||
<DependentUpon>FrmProductSched.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="FrmTreeExport.cs">
|
||||
<SubType>Form</SubType>
|
||||
</Compile>
|
||||
@@ -631,6 +690,12 @@
|
||||
<Compile Include="Kuaiji\Class2.cs" />
|
||||
<Compile Include="Kuaiji\Class4.cs" />
|
||||
<Compile Include="Kuaiji\Class5.cs" />
|
||||
<Compile Include="LabApiButtonEdit.cs">
|
||||
<SubType>UserControl</SubType>
|
||||
</Compile>
|
||||
<Compile Include="LabApiButtonEdit.Designer.cs">
|
||||
<DependentUpon>LabApiButtonEdit.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="LabelAutoGridLook.cs">
|
||||
<SubType>UserControl</SubType>
|
||||
</Compile>
|
||||
@@ -640,9 +705,6 @@
|
||||
<Compile Include="AutoGridLookUp\AutoGridLookUp.cs">
|
||||
<SubType>Component</SubType>
|
||||
</Compile>
|
||||
<Compile Include="AutoGridLookUp\AutoGridLookUp.Designer.cs">
|
||||
<DependentUpon>AutoGridLookUp.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="AutoGridLookUp\AutoGridPopup.cs">
|
||||
<SubType>UserControl</SubType>
|
||||
</Compile>
|
||||
@@ -652,9 +714,6 @@
|
||||
<Compile Include="AutoTreeLookUp\AutoTreeLookUp.cs">
|
||||
<SubType>Component</SubType>
|
||||
</Compile>
|
||||
<Compile Include="AutoTreeLookUp\AutoTreeLookUp.Designer.cs">
|
||||
<DependentUpon>AutoTreeLookUp.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="AutoTreeLookUp\AutoTreePopup.cs">
|
||||
<SubType>UserControl</SubType>
|
||||
</Compile>
|
||||
@@ -733,6 +792,12 @@
|
||||
<Compile Include="LabelAutoTreeEdit.Designer.cs">
|
||||
<DependentUpon>LabelAutoTreeEdit.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="LabelBillSourceComboxEdit.cs">
|
||||
<SubType>UserControl</SubType>
|
||||
</Compile>
|
||||
<Compile Include="LabelBillSourceComboxEdit.Designer.cs">
|
||||
<DependentUpon>LabelBillSourceComboxEdit.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="LabelButtonWithCheckbox.cs">
|
||||
<SubType>UserControl</SubType>
|
||||
</Compile>
|
||||
@@ -769,6 +834,12 @@
|
||||
<Compile Include="LabelComboxPopupEdit.Designer.cs">
|
||||
<DependentUpon>LabelComboxPopupEdit.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="LabelDateHalfDayEdit.cs">
|
||||
<SubType>UserControl</SubType>
|
||||
</Compile>
|
||||
<Compile Include="LabelDateHalfDayEdit.Designer.cs">
|
||||
<DependentUpon>LabelDateHalfDayEdit.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="LabelGridSelectEdit.cs">
|
||||
<SubType>UserControl</SubType>
|
||||
</Compile>
|
||||
@@ -805,6 +876,12 @@
|
||||
<Compile Include="LabelMultiAutoTextEdit4.Designer.cs">
|
||||
<DependentUpon>LabelMultiAutoTextEdit4.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="LabelPrompt.cs">
|
||||
<SubType>UserControl</SubType>
|
||||
</Compile>
|
||||
<Compile Include="LabelPrompt.Designer.cs">
|
||||
<DependentUpon>LabelPrompt.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="LabelRadioButtonGroupEdit.cs">
|
||||
<SubType>UserControl</SubType>
|
||||
</Compile>
|
||||
@@ -817,6 +894,12 @@
|
||||
<Compile Include="LabelRichEdit.Designer.cs">
|
||||
<DependentUpon>LabelRichEdit.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="LabelTipWithLink.cs">
|
||||
<SubType>UserControl</SubType>
|
||||
</Compile>
|
||||
<Compile Include="LabelTipWithLink.Designer.cs">
|
||||
<DependentUpon>LabelTipWithLink.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="LabelTitle.cs">
|
||||
<SubType>UserControl</SubType>
|
||||
</Compile>
|
||||
@@ -842,6 +925,7 @@
|
||||
<Compile Include="AuditPanelEx.Designer.cs">
|
||||
<DependentUpon>AuditPanelEx.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Model\AuditChangeLog.cs" />
|
||||
<Compile Include="Model\AuditCommonModel.cs" />
|
||||
<Compile Include="Model\AutoSizeChange.cs" />
|
||||
<Compile Include="Model\DatabaseFormatJudgment.cs" />
|
||||
@@ -850,6 +934,8 @@
|
||||
<Compile Include="Model\GridDragPanel.cs" />
|
||||
<Compile Include="Model\GridDragTreeGrid.cs" />
|
||||
<Compile Include="Model\IDCard\IDCardUtil.cs" />
|
||||
<Compile Include="Model\LabPicUrlPreview.cs" />
|
||||
<Compile Include="Model\LabPicUrlPreview_TreeList.cs" />
|
||||
<Compile Include="Model\ReplaceTranslation.cs" />
|
||||
<Compile Include="Model\MenuStrip\AppointmentMenuStrip.cs" />
|
||||
<Compile Include="Model\MenuStrip\AttachViewMenuStrip.cs" />
|
||||
@@ -862,8 +948,10 @@
|
||||
<Compile Include="Model\GridDragMemo.cs" />
|
||||
<Compile Include="Model\ProgressBarForm.cs" />
|
||||
<Compile Include="Model\PubEvenImpl.cs" />
|
||||
<Compile Include="Model\SignaturePrinting.cs" />
|
||||
<Compile Include="Model\StaticBandedControl.cs" />
|
||||
<Compile Include="Model\StaticControl.cs" />
|
||||
<Compile Include="Model\TreeGridDragTree.cs" />
|
||||
<Compile Include="Model\TreeGridDragGrid.cs" />
|
||||
<Compile Include="Model\WebBrowserUtil.cs" />
|
||||
<Compile Include="ModuleConditionsPanelEx.cs">
|
||||
@@ -975,6 +1063,9 @@
|
||||
<Compile Include="SignControlEx.Designer.cs">
|
||||
<DependentUpon>SignControlEx.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="SpecialDate\SpecialDatePopup.cs">
|
||||
<SubType>UserControl</SubType>
|
||||
</Compile>
|
||||
<Compile Include="SumPanelControl.cs">
|
||||
<SubType>UserControl</SubType>
|
||||
</Compile>
|
||||
@@ -1315,9 +1406,6 @@
|
||||
<EmbeddedResource Include="AuditPanelEx.resx">
|
||||
<DependentUpon>AuditPanelEx.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="AutoGridLookUp\AutoGridRevLookUp.resx">
|
||||
<DependentUpon>AutoGridRevLookUp.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="AutoGridLookUp\AutoGridRevPopup.resx">
|
||||
<DependentUpon>AutoGridRevPopup.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
@@ -1344,12 +1432,24 @@
|
||||
<EmbeddedResource Include="FrmAddDynamic.resx">
|
||||
<DependentUpon>FrmAddDynamic.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="FrmAnnouncement.resx">
|
||||
<DependentUpon>FrmAnnouncement.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="FrmAutoSqlLoad.resx">
|
||||
<DependentUpon>FrmAutoSqlLoad.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="FrmBack.resx">
|
||||
<DependentUpon>FrmBack.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="FrmBaseSelectBatch.resx">
|
||||
<DependentUpon>FrmBaseSelectBatch.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="FrmColorDescription.resx">
|
||||
<DependentUpon>FrmColorDescription.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="FrmCover.resx">
|
||||
<DependentUpon>FrmCover.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="FrmExamine.resx">
|
||||
<DependentUpon>FrmExamine.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
@@ -1362,6 +1462,21 @@
|
||||
<EmbeddedResource Include="FrmDownload.resx">
|
||||
<DependentUpon>FrmDownload.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="FrmSettingTableName.resx">
|
||||
<DependentUpon>FrmSettingTableName.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="FrmTreePicture.resx">
|
||||
<DependentUpon>FrmTreePicture.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="FrmPicture.resx">
|
||||
<DependentUpon>FrmPicture.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="FrmPositioningColumn.resx">
|
||||
<DependentUpon>FrmPositioningColumn.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="FrmProductSched.resx">
|
||||
<DependentUpon>FrmProductSched.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="FrmTreeExport.resx">
|
||||
<DependentUpon>FrmTreeExport.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
@@ -1398,12 +1513,12 @@
|
||||
<EmbeddedResource Include="HighShotMeterTextEdit.resx">
|
||||
<DependentUpon>HighShotMeterTextEdit.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="LabApiButtonEdit.resx">
|
||||
<DependentUpon>LabApiButtonEdit.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="LabelAutoGridLook.resx">
|
||||
<DependentUpon>LabelAutoGridLook.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="AutoGridLookUp\AutoGridLookUp.resx">
|
||||
<DependentUpon>AutoGridLookUp.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="AutoGridLookUp\AutoGridPopup.resx">
|
||||
<DependentUpon>AutoGridPopup.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
@@ -1444,6 +1559,9 @@
|
||||
<EmbeddedResource Include="LabelAutoTreeEdit.resx">
|
||||
<DependentUpon>LabelAutoTreeEdit.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="LabelBillSourceComboxEdit.resx">
|
||||
<DependentUpon>LabelBillSourceComboxEdit.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="LabelButtonWithCheckbox.resx">
|
||||
<DependentUpon>LabelButtonWithCheckbox.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
@@ -1462,6 +1580,9 @@
|
||||
<EmbeddedResource Include="LabelComboxPopupEdit.resx">
|
||||
<DependentUpon>LabelComboxPopupEdit.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="LabelDateHalfDayEdit.resx">
|
||||
<DependentUpon>LabelDateHalfDayEdit.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="LabelGridSelectEdit.resx">
|
||||
<DependentUpon>LabelGridSelectEdit.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
@@ -1480,12 +1601,18 @@
|
||||
<EmbeddedResource Include="LabelMultiAutoTextEdit4.resx">
|
||||
<DependentUpon>LabelMultiAutoTextEdit4.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="LabelPrompt.resx">
|
||||
<DependentUpon>LabelPrompt.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="LabelRadioButtonGroupEdit.resx">
|
||||
<DependentUpon>LabelRadioButtonGroupEdit.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="LabelRichEdit.resx">
|
||||
<DependentUpon>LabelRichEdit.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="LabelTipWithLink.resx">
|
||||
<DependentUpon>LabelTipWithLink.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="LabelTitle.resx">
|
||||
<DependentUpon>LabelTitle.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
@@ -1734,6 +1861,7 @@
|
||||
<EmbedInteropTypes>True</EmbedInteropTypes>
|
||||
</COMReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup />
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<PropertyGroup>
|
||||
<PostBuildEvent>
|
||||
|
||||
@@ -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.
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user