From cd97ece1d7eaa2146ef1dcc44c8e7880d9c9e1f8 Mon Sep 17 00:00:00 2001
From: OCEAN <1010331798@qq.com>
Date: Fri, 14 Feb 2025 08:25:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=86=E7=A0=81=E5=8A=A0=E5=AF=86=20sql?=
=?UTF-8?q?=E6=96=87=E6=9C=AC=E6=A1=86=E4=BC=98=E5=8C=96=20=20=E6=9D=A1?=
=?UTF-8?q?=E4=BB=B6=E6=98=A0=E5=B0=84=E5=A2=9E=E5=8A=A0=E5=88=B015?=
=?UTF-8?q?=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
CNASBalanceDBManage/App.config | 2 +-
CNAS_Authorize/App.config | 2 +-
CNAS_BalanceClient/App.config | 2 +-
CNAS_DBSync/App.config | 2 +-
CNAS_DBSync/frmDatabaseParams.Designer.cs | 658 ++++++-----
CNAS_DBSync/frmSourceFilter.cs | 4 +-
CNAS_DBSync/frmSourceSetting.Designer.cs | 206 ++--
CNAS_RunSync/Program.cs | 5 +-
CNAS_RunSync/app.config | 2 +-
CNAS_SyncService/App.config | 2 +-
CnasSynchronusClient/FileOperation.cs | 7 +-
WF-ChangeGUID/App.config | 2 +-
dll/CNASBalanceDBManage.exe.config | 2 +-
dll/CNAS_BalanceClient.exe.config | 2 +-
dll/CNAS_DBSync.exe | Bin 230400 -> 230400 bytes
dll/CNAS_DBSync.exe.config | 2 +-
dll/CNAS_RunSync.exe | Bin 54272 -> 54272 bytes
dll/CNAS_RunSync.exe.config | 2 +-
dll/CNAS_SyncService.exe.config | 2 +-
dll/CnasSynchronusClient.dll | Bin 75776 -> 75776 bytes
dll/Data/SyncInStrumentData.mes | 2 +-
dll/ErrorLog/20250213.txt | 1312 +++++++++++++++++++++
dll/ErrorLog/20250213.txt20250213.txt | 101 ++
dll/ServiceLog/20250213.txt | 14 +
dll/WF-ChangeGUID.exe.config | 2 +-
dll/activation.config | 2 +-
26 files changed, 1887 insertions(+), 450 deletions(-)
diff --git a/CNASBalanceDBManage/App.config b/CNASBalanceDBManage/App.config
index b24213d..8b2fee3 100644
--- a/CNASBalanceDBManage/App.config
+++ b/CNASBalanceDBManage/App.config
@@ -5,7 +5,7 @@
-
+
diff --git a/CNAS_Authorize/App.config b/CNAS_Authorize/App.config
index a5fb8f8..afef51e 100644
--- a/CNAS_Authorize/App.config
+++ b/CNAS_Authorize/App.config
@@ -2,7 +2,7 @@
-
+
diff --git a/CNAS_BalanceClient/App.config b/CNAS_BalanceClient/App.config
index 4c0c27d..2758824 100644
--- a/CNAS_BalanceClient/App.config
+++ b/CNAS_BalanceClient/App.config
@@ -5,7 +5,7 @@
-
+
diff --git a/CNAS_DBSync/App.config b/CNAS_DBSync/App.config
index 1eff40e..54404d6 100644
--- a/CNAS_DBSync/App.config
+++ b/CNAS_DBSync/App.config
@@ -16,7 +16,7 @@
-
+
diff --git a/CNAS_DBSync/frmDatabaseParams.Designer.cs b/CNAS_DBSync/frmDatabaseParams.Designer.cs
index 58fa2c2..734636f 100644
--- a/CNAS_DBSync/frmDatabaseParams.Designer.cs
+++ b/CNAS_DBSync/frmDatabaseParams.Designer.cs
@@ -177,19 +177,19 @@
this.pnlAll.Controls.Add(this.pnlTop);
this.pnlAll.Dock = System.Windows.Forms.DockStyle.Fill;
this.pnlAll.Location = new System.Drawing.Point(0, 0);
- this.pnlAll.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.pnlAll.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.pnlAll.Name = "pnlAll";
- this.pnlAll.Size = new System.Drawing.Size(882, 553);
+ this.pnlAll.Size = new System.Drawing.Size(992, 664);
this.pnlAll.TabIndex = 0;
//
// pnlCenter
//
this.pnlCenter.Controls.Add(this.tabParamas);
this.pnlCenter.Dock = System.Windows.Forms.DockStyle.Fill;
- this.pnlCenter.Location = new System.Drawing.Point(0, 6);
- this.pnlCenter.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.pnlCenter.Location = new System.Drawing.Point(0, 7);
+ this.pnlCenter.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.pnlCenter.Name = "pnlCenter";
- this.pnlCenter.Size = new System.Drawing.Size(882, 495);
+ this.pnlCenter.Size = new System.Drawing.Size(992, 595);
this.pnlCenter.TabIndex = 4;
//
// tabParamas
@@ -198,20 +198,20 @@
this.tabParamas.Controls.Add(this.tabCnas);
this.tabParamas.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabParamas.Location = new System.Drawing.Point(0, 0);
- this.tabParamas.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.tabParamas.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.tabParamas.Name = "tabParamas";
this.tabParamas.SelectedIndex = 0;
- this.tabParamas.Size = new System.Drawing.Size(882, 495);
+ this.tabParamas.Size = new System.Drawing.Size(992, 595);
this.tabParamas.TabIndex = 1;
//
// tabInstrument
//
this.tabInstrument.Controls.Add(this.tabcDS);
- this.tabInstrument.Location = new System.Drawing.Point(4, 25);
- this.tabInstrument.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.tabInstrument.Location = new System.Drawing.Point(4, 28);
+ this.tabInstrument.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.tabInstrument.Name = "tabInstrument";
- this.tabInstrument.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.tabInstrument.Size = new System.Drawing.Size(874, 466);
+ this.tabInstrument.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.tabInstrument.Size = new System.Drawing.Size(984, 563);
this.tabInstrument.TabIndex = 0;
this.tabInstrument.Text = "仪器数据源";
this.tabInstrument.UseVisualStyleBackColor = true;
@@ -227,11 +227,11 @@
this.tabcDS.Controls.Add(this.tabOracle);
this.tabcDS.Controls.Add(this.tabTxt);
this.tabcDS.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tabcDS.Location = new System.Drawing.Point(4, 4);
- this.tabcDS.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.tabcDS.Location = new System.Drawing.Point(4, 5);
+ this.tabcDS.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.tabcDS.Name = "tabcDS";
this.tabcDS.SelectedIndex = 0;
- this.tabcDS.Size = new System.Drawing.Size(866, 458);
+ this.tabcDS.Size = new System.Drawing.Size(976, 553);
this.tabcDS.TabIndex = 6;
this.tabcDS.Selected += new System.Windows.Forms.TabControlEventHandler(this.tabcDS_Selected);
//
@@ -246,11 +246,11 @@
this.tabExcel.Controls.Add(this.btnOpenFileExcel);
this.tabExcel.Controls.Add(this.label3);
this.tabExcel.Controls.Add(this.txtInportExcel);
- this.tabExcel.Location = new System.Drawing.Point(4, 25);
- this.tabExcel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.tabExcel.Location = new System.Drawing.Point(4, 28);
+ this.tabExcel.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.tabExcel.Name = "tabExcel";
- this.tabExcel.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.tabExcel.Size = new System.Drawing.Size(858, 429);
+ this.tabExcel.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.tabExcel.Size = new System.Drawing.Size(968, 521);
this.tabExcel.TabIndex = 0;
this.tabExcel.Text = "Excel";
this.tabExcel.UseVisualStyleBackColor = true;
@@ -258,61 +258,61 @@
// label22
//
this.label22.AutoSize = true;
- this.label22.Location = new System.Drawing.Point(63, 31);
+ this.label22.Location = new System.Drawing.Point(71, 37);
this.label22.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label22.Name = "label22";
- this.label22.Size = new System.Drawing.Size(82, 15);
+ this.label22.Size = new System.Drawing.Size(98, 18);
this.label22.TabIndex = 24;
this.label22.Text = "是否远程:";
//
// lblExcelRemotePwd
//
this.lblExcelRemotePwd.AutoSize = true;
- this.lblExcelRemotePwd.Location = new System.Drawing.Point(61, 223);
+ this.lblExcelRemotePwd.Location = new System.Drawing.Point(69, 268);
this.lblExcelRemotePwd.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblExcelRemotePwd.Name = "lblExcelRemotePwd";
- this.lblExcelRemotePwd.Size = new System.Drawing.Size(82, 15);
+ this.lblExcelRemotePwd.Size = new System.Drawing.Size(98, 18);
this.lblExcelRemotePwd.TabIndex = 10;
this.lblExcelRemotePwd.Text = "远程密码:";
this.lblExcelRemotePwd.Visible = false;
//
// txtRemoteExcelPwd
//
- this.txtRemoteExcelPwd.Location = new System.Drawing.Point(153, 218);
- this.txtRemoteExcelPwd.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtRemoteExcelPwd.Location = new System.Drawing.Point(172, 262);
+ this.txtRemoteExcelPwd.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtRemoteExcelPwd.Name = "txtRemoteExcelPwd";
this.txtRemoteExcelPwd.PasswordChar = '*';
- this.txtRemoteExcelPwd.Size = new System.Drawing.Size(359, 25);
+ this.txtRemoteExcelPwd.Size = new System.Drawing.Size(403, 28);
this.txtRemoteExcelPwd.TabIndex = 11;
this.txtRemoteExcelPwd.Visible = false;
//
// lblExcelRemoteUser
//
this.lblExcelRemoteUser.AutoSize = true;
- this.lblExcelRemoteUser.Location = new System.Drawing.Point(45, 143);
+ this.lblExcelRemoteUser.Location = new System.Drawing.Point(51, 172);
this.lblExcelRemoteUser.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblExcelRemoteUser.Name = "lblExcelRemoteUser";
- this.lblExcelRemoteUser.Size = new System.Drawing.Size(97, 15);
+ this.lblExcelRemoteUser.Size = new System.Drawing.Size(116, 18);
this.lblExcelRemoteUser.TabIndex = 8;
this.lblExcelRemoteUser.Text = "远程用户名:";
this.lblExcelRemoteUser.Visible = false;
//
// txtRemoteExcelUser
//
- this.txtRemoteExcelUser.Location = new System.Drawing.Point(153, 138);
- this.txtRemoteExcelUser.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtRemoteExcelUser.Location = new System.Drawing.Point(172, 166);
+ this.txtRemoteExcelUser.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtRemoteExcelUser.Name = "txtRemoteExcelUser";
- this.txtRemoteExcelUser.Size = new System.Drawing.Size(359, 25);
+ this.txtRemoteExcelUser.Size = new System.Drawing.Size(403, 28);
this.txtRemoteExcelUser.TabIndex = 6;
this.txtRemoteExcelUser.Visible = false;
//
// cbxExcelRemote
//
this.cbxExcelRemote.AutoSize = true;
- this.cbxExcelRemote.Location = new System.Drawing.Point(153, 30);
- this.cbxExcelRemote.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.cbxExcelRemote.Location = new System.Drawing.Point(172, 36);
+ this.cbxExcelRemote.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.cbxExcelRemote.Name = "cbxExcelRemote";
- this.cbxExcelRemote.Size = new System.Drawing.Size(44, 19);
+ this.cbxExcelRemote.Size = new System.Drawing.Size(52, 22);
this.cbxExcelRemote.TabIndex = 4;
this.cbxExcelRemote.Text = "是";
this.cbxExcelRemote.UseVisualStyleBackColor = true;
@@ -320,10 +320,10 @@
//
// btnOpenFileExcel
//
- this.btnOpenFileExcel.Location = new System.Drawing.Point(523, 61);
- this.btnOpenFileExcel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.btnOpenFileExcel.Location = new System.Drawing.Point(588, 73);
+ this.btnOpenFileExcel.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.btnOpenFileExcel.Name = "btnOpenFileExcel";
- this.btnOpenFileExcel.Size = new System.Drawing.Size(80, 29);
+ this.btnOpenFileExcel.Size = new System.Drawing.Size(90, 35);
this.btnOpenFileExcel.TabIndex = 6;
this.btnOpenFileExcel.Text = "浏览";
this.btnOpenFileExcel.UseVisualStyleBackColor = true;
@@ -332,19 +332,19 @@
// label3
//
this.label3.AutoSize = true;
- this.label3.Location = new System.Drawing.Point(92, 68);
+ this.label3.Location = new System.Drawing.Point(104, 82);
this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(52, 15);
+ this.label3.Size = new System.Drawing.Size(62, 18);
this.label3.TabIndex = 5;
this.label3.Text = "路径:";
//
// txtInportExcel
//
- this.txtInportExcel.Location = new System.Drawing.Point(153, 62);
- this.txtInportExcel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtInportExcel.Location = new System.Drawing.Point(172, 74);
+ this.txtInportExcel.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtInportExcel.Name = "txtInportExcel";
- this.txtInportExcel.Size = new System.Drawing.Size(359, 25);
+ this.txtInportExcel.Size = new System.Drawing.Size(403, 28);
this.txtInportExcel.TabIndex = 5;
//
// tabFoxPro
@@ -362,11 +362,11 @@
this.tabFoxPro.Controls.Add(this.btnFileOpenFoxPro);
this.tabFoxPro.Controls.Add(this.label34);
this.tabFoxPro.Controls.Add(this.txtFoxProFolder);
- this.tabFoxPro.Location = new System.Drawing.Point(4, 25);
- this.tabFoxPro.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.tabFoxPro.Location = new System.Drawing.Point(4, 28);
+ this.tabFoxPro.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.tabFoxPro.Name = "tabFoxPro";
- this.tabFoxPro.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.tabFoxPro.Size = new System.Drawing.Size(645, 291);
+ this.tabFoxPro.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.tabFoxPro.Size = new System.Drawing.Size(966, 518);
this.tabFoxPro.TabIndex = 6;
this.tabFoxPro.Text = "FoxPro";
this.tabFoxPro.UseVisualStyleBackColor = true;
@@ -374,20 +374,20 @@
// label27
//
this.label27.AutoSize = true;
- this.label27.Location = new System.Drawing.Point(60, 32);
+ this.label27.Location = new System.Drawing.Point(68, 38);
this.label27.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label27.Name = "label27";
- this.label27.Size = new System.Drawing.Size(82, 15);
+ this.label27.Size = new System.Drawing.Size(98, 18);
this.label27.TabIndex = 36;
this.label27.Text = "是否远程:";
//
// cbxFoxProRemote
//
this.cbxFoxProRemote.AutoSize = true;
- this.cbxFoxProRemote.Location = new System.Drawing.Point(155, 30);
- this.cbxFoxProRemote.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.cbxFoxProRemote.Location = new System.Drawing.Point(174, 36);
+ this.cbxFoxProRemote.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.cbxFoxProRemote.Name = "cbxFoxProRemote";
- this.cbxFoxProRemote.Size = new System.Drawing.Size(44, 19);
+ this.cbxFoxProRemote.Size = new System.Drawing.Size(52, 22);
this.cbxFoxProRemote.TabIndex = 24;
this.cbxFoxProRemote.Text = "是";
this.cbxFoxProRemote.UseVisualStyleBackColor = true;
@@ -396,87 +396,87 @@
// lblFoxproRemotePwd
//
this.lblFoxproRemotePwd.AutoSize = true;
- this.lblFoxproRemotePwd.Location = new System.Drawing.Point(60, 212);
+ this.lblFoxproRemotePwd.Location = new System.Drawing.Point(68, 254);
this.lblFoxproRemotePwd.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblFoxproRemotePwd.Name = "lblFoxproRemotePwd";
- this.lblFoxproRemotePwd.Size = new System.Drawing.Size(82, 15);
+ this.lblFoxproRemotePwd.Size = new System.Drawing.Size(98, 18);
this.lblFoxproRemotePwd.TabIndex = 35;
this.lblFoxproRemotePwd.Text = "远程密码:";
this.lblFoxproRemotePwd.Visible = false;
//
// txtRemoteFoxProPwd
//
- this.txtRemoteFoxProPwd.Location = new System.Drawing.Point(153, 208);
- this.txtRemoteFoxProPwd.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtRemoteFoxProPwd.Location = new System.Drawing.Point(172, 250);
+ this.txtRemoteFoxProPwd.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtRemoteFoxProPwd.Name = "txtRemoteFoxProPwd";
this.txtRemoteFoxProPwd.PasswordChar = '*';
- this.txtRemoteFoxProPwd.Size = new System.Drawing.Size(359, 25);
+ this.txtRemoteFoxProPwd.Size = new System.Drawing.Size(403, 28);
this.txtRemoteFoxProPwd.TabIndex = 31;
this.txtRemoteFoxProPwd.Visible = false;
//
// lblFoxproRemoteUserId
//
this.lblFoxproRemoteUserId.AutoSize = true;
- this.lblFoxproRemoteUserId.Location = new System.Drawing.Point(44, 176);
+ this.lblFoxproRemoteUserId.Location = new System.Drawing.Point(50, 211);
this.lblFoxproRemoteUserId.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblFoxproRemoteUserId.Name = "lblFoxproRemoteUserId";
- this.lblFoxproRemoteUserId.Size = new System.Drawing.Size(97, 15);
+ this.lblFoxproRemoteUserId.Size = new System.Drawing.Size(116, 18);
this.lblFoxproRemoteUserId.TabIndex = 34;
this.lblFoxproRemoteUserId.Text = "远程用户名:";
this.lblFoxproRemoteUserId.Visible = false;
//
// txtRemoteFoxProUserId
//
- this.txtRemoteFoxProUserId.Location = new System.Drawing.Point(153, 171);
- this.txtRemoteFoxProUserId.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtRemoteFoxProUserId.Location = new System.Drawing.Point(172, 205);
+ this.txtRemoteFoxProUserId.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtRemoteFoxProUserId.Name = "txtRemoteFoxProUserId";
- this.txtRemoteFoxProUserId.Size = new System.Drawing.Size(359, 25);
+ this.txtRemoteFoxProUserId.Size = new System.Drawing.Size(403, 28);
this.txtRemoteFoxProUserId.TabIndex = 30;
this.txtRemoteFoxProUserId.Visible = false;
//
// txtFoxProPwd
//
- this.txtFoxProPwd.Location = new System.Drawing.Point(153, 135);
- this.txtFoxProPwd.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtFoxProPwd.Location = new System.Drawing.Point(172, 162);
+ this.txtFoxProPwd.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtFoxProPwd.Name = "txtFoxProPwd";
this.txtFoxProPwd.PasswordChar = '*';
- this.txtFoxProPwd.Size = new System.Drawing.Size(359, 25);
+ this.txtFoxProPwd.Size = new System.Drawing.Size(403, 28);
this.txtFoxProPwd.TabIndex = 29;
//
// txtFoxProUserId
//
- this.txtFoxProUserId.Location = new System.Drawing.Point(153, 99);
- this.txtFoxProUserId.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtFoxProUserId.Location = new System.Drawing.Point(172, 119);
+ this.txtFoxProUserId.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtFoxProUserId.Name = "txtFoxProUserId";
- this.txtFoxProUserId.Size = new System.Drawing.Size(359, 25);
+ this.txtFoxProUserId.Size = new System.Drawing.Size(403, 28);
this.txtFoxProUserId.TabIndex = 27;
//
// label32
//
this.label32.AutoSize = true;
- this.label32.Location = new System.Drawing.Point(92, 140);
+ this.label32.Location = new System.Drawing.Point(104, 168);
this.label32.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label32.Name = "label32";
- this.label32.Size = new System.Drawing.Size(52, 15);
+ this.label32.Size = new System.Drawing.Size(62, 18);
this.label32.TabIndex = 33;
this.label32.Text = "密码:";
//
// label33
//
this.label33.AutoSize = true;
- this.label33.Location = new System.Drawing.Point(76, 104);
+ this.label33.Location = new System.Drawing.Point(86, 125);
this.label33.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label33.Name = "label33";
- this.label33.Size = new System.Drawing.Size(67, 15);
+ this.label33.Size = new System.Drawing.Size(80, 18);
this.label33.TabIndex = 32;
this.label33.Text = "用户名:";
//
// btnFileOpenFoxPro
//
- this.btnFileOpenFoxPro.Location = new System.Drawing.Point(523, 61);
- this.btnFileOpenFoxPro.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.btnFileOpenFoxPro.Location = new System.Drawing.Point(588, 73);
+ this.btnFileOpenFoxPro.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.btnFileOpenFoxPro.Name = "btnFileOpenFoxPro";
- this.btnFileOpenFoxPro.Size = new System.Drawing.Size(80, 29);
+ this.btnFileOpenFoxPro.Size = new System.Drawing.Size(90, 35);
this.btnFileOpenFoxPro.TabIndex = 28;
this.btnFileOpenFoxPro.Text = "浏览";
this.btnFileOpenFoxPro.UseVisualStyleBackColor = true;
@@ -485,19 +485,19 @@
// label34
//
this.label34.AutoSize = true;
- this.label34.Location = new System.Drawing.Point(92, 68);
+ this.label34.Location = new System.Drawing.Point(104, 82);
this.label34.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label34.Name = "label34";
- this.label34.Size = new System.Drawing.Size(52, 15);
+ this.label34.Size = new System.Drawing.Size(62, 18);
this.label34.TabIndex = 25;
this.label34.Text = "路径:";
//
// txtFoxProFolder
//
- this.txtFoxProFolder.Location = new System.Drawing.Point(153, 62);
- this.txtFoxProFolder.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtFoxProFolder.Location = new System.Drawing.Point(172, 74);
+ this.txtFoxProFolder.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtFoxProFolder.Name = "txtFoxProFolder";
- this.txtFoxProFolder.Size = new System.Drawing.Size(359, 25);
+ this.txtFoxProFolder.Size = new System.Drawing.Size(403, 28);
this.txtFoxProFolder.TabIndex = 26;
//
// tabAccess
@@ -515,11 +515,11 @@
this.tabAccess.Controls.Add(this.btnOpenFileAccess);
this.tabAccess.Controls.Add(this.label4);
this.tabAccess.Controls.Add(this.txtAccessPath);
- this.tabAccess.Location = new System.Drawing.Point(4, 25);
- this.tabAccess.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.tabAccess.Location = new System.Drawing.Point(4, 28);
+ this.tabAccess.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.tabAccess.Name = "tabAccess";
- this.tabAccess.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.tabAccess.Size = new System.Drawing.Size(645, 291);
+ this.tabAccess.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.tabAccess.Size = new System.Drawing.Size(966, 518);
this.tabAccess.TabIndex = 1;
this.tabAccess.Text = "Access";
this.tabAccess.UseVisualStyleBackColor = true;
@@ -527,20 +527,20 @@
// label21
//
this.label21.AutoSize = true;
- this.label21.Location = new System.Drawing.Point(60, 32);
+ this.label21.Location = new System.Drawing.Point(68, 38);
this.label21.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label21.Name = "label21";
- this.label21.Size = new System.Drawing.Size(82, 15);
+ this.label21.Size = new System.Drawing.Size(98, 18);
this.label21.TabIndex = 23;
this.label21.Text = "是否远程:";
//
// cbxAccessRemote
//
this.cbxAccessRemote.AutoSize = true;
- this.cbxAccessRemote.Location = new System.Drawing.Point(155, 30);
- this.cbxAccessRemote.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.cbxAccessRemote.Location = new System.Drawing.Point(174, 36);
+ this.cbxAccessRemote.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.cbxAccessRemote.Name = "cbxAccessRemote";
- this.cbxAccessRemote.Size = new System.Drawing.Size(44, 19);
+ this.cbxAccessRemote.Size = new System.Drawing.Size(52, 22);
this.cbxAccessRemote.TabIndex = 7;
this.cbxAccessRemote.Text = "是";
this.cbxAccessRemote.UseVisualStyleBackColor = true;
@@ -549,89 +549,89 @@
// lblAccessRemotePwd
//
this.lblAccessRemotePwd.AutoSize = true;
- this.lblAccessRemotePwd.Location = new System.Drawing.Point(60, 176);
+ this.lblAccessRemotePwd.Location = new System.Drawing.Point(68, 211);
this.lblAccessRemotePwd.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblAccessRemotePwd.Name = "lblAccessRemotePwd";
- this.lblAccessRemotePwd.Size = new System.Drawing.Size(82, 15);
+ this.lblAccessRemotePwd.Size = new System.Drawing.Size(98, 18);
this.lblAccessRemotePwd.TabIndex = 20;
this.lblAccessRemotePwd.Text = "远程密码:";
this.lblAccessRemotePwd.Visible = false;
//
// txtAccessRemotePwd
//
- this.txtAccessRemotePwd.Location = new System.Drawing.Point(153, 171);
- this.txtAccessRemotePwd.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtAccessRemotePwd.Location = new System.Drawing.Point(172, 205);
+ this.txtAccessRemotePwd.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtAccessRemotePwd.Name = "txtAccessRemotePwd";
this.txtAccessRemotePwd.PasswordChar = '*';
- this.txtAccessRemotePwd.Size = new System.Drawing.Size(359, 25);
+ this.txtAccessRemotePwd.Size = new System.Drawing.Size(403, 28);
this.txtAccessRemotePwd.TabIndex = 12;
this.txtAccessRemotePwd.Visible = false;
//
// lblAccessRemoteUser
//
this.lblAccessRemoteUser.AutoSize = true;
- this.lblAccessRemoteUser.Location = new System.Drawing.Point(44, 140);
+ this.lblAccessRemoteUser.Location = new System.Drawing.Point(50, 168);
this.lblAccessRemoteUser.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblAccessRemoteUser.Name = "lblAccessRemoteUser";
- this.lblAccessRemoteUser.Size = new System.Drawing.Size(97, 15);
+ this.lblAccessRemoteUser.Size = new System.Drawing.Size(116, 18);
this.lblAccessRemoteUser.TabIndex = 18;
this.lblAccessRemoteUser.Text = "远程用户名:";
this.lblAccessRemoteUser.Visible = false;
//
// txtAccessRemoteUser
//
- this.txtAccessRemoteUser.Location = new System.Drawing.Point(153, 135);
- this.txtAccessRemoteUser.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtAccessRemoteUser.Location = new System.Drawing.Point(172, 162);
+ this.txtAccessRemoteUser.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtAccessRemoteUser.Name = "txtAccessRemoteUser";
- this.txtAccessRemoteUser.Size = new System.Drawing.Size(359, 25);
+ this.txtAccessRemoteUser.Size = new System.Drawing.Size(403, 28);
this.txtAccessRemoteUser.TabIndex = 11;
this.txtAccessRemoteUser.Visible = false;
//
// txtAceessPwd
//
- this.txtAceessPwd.Location = new System.Drawing.Point(153, 99);
- this.txtAceessPwd.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtAceessPwd.Location = new System.Drawing.Point(172, 119);
+ this.txtAceessPwd.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtAceessPwd.Name = "txtAceessPwd";
this.txtAceessPwd.PasswordChar = '*';
- this.txtAceessPwd.Size = new System.Drawing.Size(359, 25);
+ this.txtAceessPwd.Size = new System.Drawing.Size(403, 28);
this.txtAceessPwd.TabIndex = 10;
//
// txtAccessUser
//
- this.txtAccessUser.Location = new System.Drawing.Point(155, 254);
- this.txtAccessUser.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtAccessUser.Location = new System.Drawing.Point(174, 305);
+ this.txtAccessUser.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtAccessUser.Name = "txtAccessUser";
- this.txtAccessUser.Size = new System.Drawing.Size(359, 25);
+ this.txtAccessUser.Size = new System.Drawing.Size(403, 28);
this.txtAccessUser.TabIndex = 9;
this.txtAccessUser.Visible = false;
//
// label15
//
this.label15.AutoSize = true;
- this.label15.Location = new System.Drawing.Point(92, 104);
+ this.label15.Location = new System.Drawing.Point(104, 125);
this.label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label15.Name = "label15";
- this.label15.Size = new System.Drawing.Size(52, 15);
+ this.label15.Size = new System.Drawing.Size(62, 18);
this.label15.TabIndex = 15;
this.label15.Text = "密码:";
//
// label16
//
this.label16.AutoSize = true;
- this.label16.Location = new System.Drawing.Point(77, 259);
+ this.label16.Location = new System.Drawing.Point(87, 311);
this.label16.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label16.Name = "label16";
- this.label16.Size = new System.Drawing.Size(67, 15);
+ this.label16.Size = new System.Drawing.Size(80, 18);
this.label16.TabIndex = 14;
this.label16.Text = "用户名:";
this.label16.Visible = false;
//
// btnOpenFileAccess
//
- this.btnOpenFileAccess.Location = new System.Drawing.Point(523, 61);
- this.btnOpenFileAccess.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.btnOpenFileAccess.Location = new System.Drawing.Point(588, 73);
+ this.btnOpenFileAccess.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.btnOpenFileAccess.Name = "btnOpenFileAccess";
- this.btnOpenFileAccess.Size = new System.Drawing.Size(80, 29);
+ this.btnOpenFileAccess.Size = new System.Drawing.Size(90, 35);
this.btnOpenFileAccess.TabIndex = 9;
this.btnOpenFileAccess.Text = "浏览";
this.btnOpenFileAccess.UseVisualStyleBackColor = true;
@@ -640,19 +640,19 @@
// label4
//
this.label4.AutoSize = true;
- this.label4.Location = new System.Drawing.Point(92, 68);
+ this.label4.Location = new System.Drawing.Point(104, 82);
this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(52, 15);
+ this.label4.Size = new System.Drawing.Size(62, 18);
this.label4.TabIndex = 7;
this.label4.Text = "路径:";
//
// txtAccessPath
//
- this.txtAccessPath.Location = new System.Drawing.Point(153, 62);
- this.txtAccessPath.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtAccessPath.Location = new System.Drawing.Point(172, 74);
+ this.txtAccessPath.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtAccessPath.Name = "txtAccessPath";
- this.txtAccessPath.Size = new System.Drawing.Size(359, 25);
+ this.txtAccessPath.Size = new System.Drawing.Size(403, 28);
this.txtAccessPath.TabIndex = 8;
//
// tabSQLite
@@ -670,10 +670,10 @@
this.tabSQLite.Controls.Add(this.btnOpenFileSQLite);
this.tabSQLite.Controls.Add(this.label5);
this.tabSQLite.Controls.Add(this.txtSqlitePath);
- this.tabSQLite.Location = new System.Drawing.Point(4, 25);
- this.tabSQLite.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.tabSQLite.Location = new System.Drawing.Point(4, 28);
+ this.tabSQLite.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.tabSQLite.Name = "tabSQLite";
- this.tabSQLite.Size = new System.Drawing.Size(645, 291);
+ this.tabSQLite.Size = new System.Drawing.Size(966, 518);
this.tabSQLite.TabIndex = 2;
this.tabSQLite.Text = "SQLLite";
this.tabSQLite.UseVisualStyleBackColor = true;
@@ -681,20 +681,20 @@
// label25
//
this.label25.AutoSize = true;
- this.label25.Location = new System.Drawing.Point(60, 32);
+ this.label25.Location = new System.Drawing.Point(68, 38);
this.label25.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label25.Name = "label25";
- this.label25.Size = new System.Drawing.Size(82, 15);
+ this.label25.Size = new System.Drawing.Size(98, 18);
this.label25.TabIndex = 27;
this.label25.Text = "是否远程:";
//
// cbxSqliteRemote
//
this.cbxSqliteRemote.AutoSize = true;
- this.cbxSqliteRemote.Location = new System.Drawing.Point(155, 30);
- this.cbxSqliteRemote.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.cbxSqliteRemote.Location = new System.Drawing.Point(174, 36);
+ this.cbxSqliteRemote.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.cbxSqliteRemote.Name = "cbxSqliteRemote";
- this.cbxSqliteRemote.Size = new System.Drawing.Size(44, 19);
+ this.cbxSqliteRemote.Size = new System.Drawing.Size(52, 22);
this.cbxSqliteRemote.TabIndex = 7;
this.cbxSqliteRemote.Text = "是";
this.cbxSqliteRemote.UseVisualStyleBackColor = true;
@@ -703,89 +703,89 @@
// lblSqliteRemotePwd
//
this.lblSqliteRemotePwd.AutoSize = true;
- this.lblSqliteRemotePwd.Location = new System.Drawing.Point(60, 176);
+ this.lblSqliteRemotePwd.Location = new System.Drawing.Point(68, 211);
this.lblSqliteRemotePwd.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblSqliteRemotePwd.Name = "lblSqliteRemotePwd";
- this.lblSqliteRemotePwd.Size = new System.Drawing.Size(82, 15);
+ this.lblSqliteRemotePwd.Size = new System.Drawing.Size(98, 18);
this.lblSqliteRemotePwd.TabIndex = 24;
this.lblSqliteRemotePwd.Text = "远程密码:";
this.lblSqliteRemotePwd.Visible = false;
//
// txtSqliteRemotePwd
//
- this.txtSqliteRemotePwd.Location = new System.Drawing.Point(153, 171);
- this.txtSqliteRemotePwd.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtSqliteRemotePwd.Location = new System.Drawing.Point(172, 205);
+ this.txtSqliteRemotePwd.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtSqliteRemotePwd.Name = "txtSqliteRemotePwd";
this.txtSqliteRemotePwd.PasswordChar = '*';
- this.txtSqliteRemotePwd.Size = new System.Drawing.Size(359, 25);
+ this.txtSqliteRemotePwd.Size = new System.Drawing.Size(403, 28);
this.txtSqliteRemotePwd.TabIndex = 25;
this.txtSqliteRemotePwd.Visible = false;
//
// lblSqliteRemoteUser
//
this.lblSqliteRemoteUser.AutoSize = true;
- this.lblSqliteRemoteUser.Location = new System.Drawing.Point(44, 140);
+ this.lblSqliteRemoteUser.Location = new System.Drawing.Point(50, 168);
this.lblSqliteRemoteUser.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblSqliteRemoteUser.Name = "lblSqliteRemoteUser";
- this.lblSqliteRemoteUser.Size = new System.Drawing.Size(97, 15);
+ this.lblSqliteRemoteUser.Size = new System.Drawing.Size(116, 18);
this.lblSqliteRemoteUser.TabIndex = 22;
this.lblSqliteRemoteUser.Text = "远程用户名:";
this.lblSqliteRemoteUser.Visible = false;
//
// txtSqliteRemoteUser
//
- this.txtSqliteRemoteUser.Location = new System.Drawing.Point(153, 135);
- this.txtSqliteRemoteUser.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtSqliteRemoteUser.Location = new System.Drawing.Point(172, 162);
+ this.txtSqliteRemoteUser.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtSqliteRemoteUser.Name = "txtSqliteRemoteUser";
- this.txtSqliteRemoteUser.Size = new System.Drawing.Size(359, 25);
+ this.txtSqliteRemoteUser.Size = new System.Drawing.Size(403, 28);
this.txtSqliteRemoteUser.TabIndex = 23;
this.txtSqliteRemoteUser.Visible = false;
//
// txtSqlitePwd
//
- this.txtSqlitePwd.Location = new System.Drawing.Point(153, 99);
- this.txtSqlitePwd.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtSqlitePwd.Location = new System.Drawing.Point(172, 119);
+ this.txtSqlitePwd.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtSqlitePwd.Name = "txtSqlitePwd";
this.txtSqlitePwd.PasswordChar = '*';
- this.txtSqlitePwd.Size = new System.Drawing.Size(359, 25);
+ this.txtSqlitePwd.Size = new System.Drawing.Size(403, 28);
this.txtSqlitePwd.TabIndex = 13;
//
// txtSqliteUser
//
- this.txtSqliteUser.Location = new System.Drawing.Point(153, 241);
- this.txtSqliteUser.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtSqliteUser.Location = new System.Drawing.Point(172, 289);
+ this.txtSqliteUser.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtSqliteUser.Name = "txtSqliteUser";
- this.txtSqliteUser.Size = new System.Drawing.Size(359, 25);
+ this.txtSqliteUser.Size = new System.Drawing.Size(403, 28);
this.txtSqliteUser.TabIndex = 12;
this.txtSqliteUser.Visible = false;
//
// label7
//
this.label7.AutoSize = true;
- this.label7.Location = new System.Drawing.Point(92, 104);
+ this.label7.Location = new System.Drawing.Point(104, 125);
this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(52, 15);
+ this.label7.Size = new System.Drawing.Size(62, 18);
this.label7.TabIndex = 11;
this.label7.Text = "密码:";
//
// label6
//
this.label6.AutoSize = true;
- this.label6.Location = new System.Drawing.Point(76, 246);
+ this.label6.Location = new System.Drawing.Point(86, 295);
this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(67, 15);
+ this.label6.Size = new System.Drawing.Size(80, 18);
this.label6.TabIndex = 10;
this.label6.Text = "用户名:";
this.label6.Visible = false;
//
// btnOpenFileSQLite
//
- this.btnOpenFileSQLite.Location = new System.Drawing.Point(523, 61);
- this.btnOpenFileSQLite.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.btnOpenFileSQLite.Location = new System.Drawing.Point(588, 73);
+ this.btnOpenFileSQLite.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.btnOpenFileSQLite.Name = "btnOpenFileSQLite";
- this.btnOpenFileSQLite.Size = new System.Drawing.Size(80, 29);
+ this.btnOpenFileSQLite.Size = new System.Drawing.Size(90, 35);
this.btnOpenFileSQLite.TabIndex = 9;
this.btnOpenFileSQLite.Text = "浏览";
this.btnOpenFileSQLite.UseVisualStyleBackColor = true;
@@ -794,19 +794,19 @@
// label5
//
this.label5.AutoSize = true;
- this.label5.Location = new System.Drawing.Point(92, 68);
+ this.label5.Location = new System.Drawing.Point(104, 82);
this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(52, 15);
+ this.label5.Size = new System.Drawing.Size(62, 18);
this.label5.TabIndex = 7;
this.label5.Text = "路径:";
//
// txtSqlitePath
//
- this.txtSqlitePath.Location = new System.Drawing.Point(153, 62);
- this.txtSqlitePath.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtSqlitePath.Location = new System.Drawing.Point(172, 74);
+ this.txtSqlitePath.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtSqlitePath.Name = "txtSqlitePath";
- this.txtSqlitePath.Size = new System.Drawing.Size(359, 25);
+ this.txtSqlitePath.Size = new System.Drawing.Size(403, 28);
this.txtSqlitePath.TabIndex = 8;
//
// tabSQLServer
@@ -822,39 +822,39 @@
this.tabSQLServer.Controls.Add(this.txtSqlServerUser);
this.tabSQLServer.Controls.Add(this.label13);
this.tabSQLServer.Controls.Add(this.label14);
- this.tabSQLServer.Location = new System.Drawing.Point(4, 25);
- this.tabSQLServer.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.tabSQLServer.Location = new System.Drawing.Point(4, 28);
+ this.tabSQLServer.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.tabSQLServer.Name = "tabSQLServer";
- this.tabSQLServer.Size = new System.Drawing.Size(645, 291);
+ this.tabSQLServer.Size = new System.Drawing.Size(966, 518);
this.tabSQLServer.TabIndex = 3;
this.tabSQLServer.Text = "SQL Server";
this.tabSQLServer.UseVisualStyleBackColor = true;
//
// txtSqlServerPort
//
- this.txtSqlServerPort.Location = new System.Drawing.Point(115, 184);
- this.txtSqlServerPort.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtSqlServerPort.Location = new System.Drawing.Point(129, 221);
+ this.txtSqlServerPort.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtSqlServerPort.Name = "txtSqlServerPort";
this.txtSqlServerPort.PasswordChar = '*';
- this.txtSqlServerPort.Size = new System.Drawing.Size(420, 25);
+ this.txtSqlServerPort.Size = new System.Drawing.Size(472, 28);
this.txtSqlServerPort.TabIndex = 34;
//
// lblSqlPort
//
this.lblSqlPort.AutoSize = true;
- this.lblSqlPort.Location = new System.Drawing.Point(55, 189);
+ this.lblSqlPort.Location = new System.Drawing.Point(62, 227);
this.lblSqlPort.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblSqlPort.Name = "lblSqlPort";
- this.lblSqlPort.Size = new System.Drawing.Size(52, 15);
+ this.lblSqlPort.Size = new System.Drawing.Size(62, 18);
this.lblSqlPort.TabIndex = 33;
this.lblSqlPort.Text = "端口:";
//
// btnTestSQLLink
//
- this.btnTestSQLLink.Location = new System.Drawing.Point(499, 225);
- this.btnTestSQLLink.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.btnTestSQLLink.Location = new System.Drawing.Point(561, 270);
+ this.btnTestSQLLink.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.btnTestSQLLink.Name = "btnTestSQLLink";
- this.btnTestSQLLink.Size = new System.Drawing.Size(105, 30);
+ this.btnTestSQLLink.Size = new System.Drawing.Size(118, 36);
this.btnTestSQLLink.TabIndex = 32;
this.btnTestSQLLink.Text = "测试连接";
this.btnTestSQLLink.UseVisualStyleBackColor = true;
@@ -862,74 +862,74 @@
//
// txtSqlServerName
//
- this.txtSqlServerName.Location = new System.Drawing.Point(115, 75);
- this.txtSqlServerName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtSqlServerName.Location = new System.Drawing.Point(129, 90);
+ this.txtSqlServerName.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtSqlServerName.Name = "txtSqlServerName";
- this.txtSqlServerName.Size = new System.Drawing.Size(420, 25);
+ this.txtSqlServerName.Size = new System.Drawing.Size(472, 28);
this.txtSqlServerName.TabIndex = 29;
//
// txtSqlServerHost
//
- this.txtSqlServerHost.Location = new System.Drawing.Point(115, 39);
- this.txtSqlServerHost.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtSqlServerHost.Location = new System.Drawing.Point(129, 47);
+ this.txtSqlServerHost.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtSqlServerHost.Name = "txtSqlServerHost";
- this.txtSqlServerHost.Size = new System.Drawing.Size(420, 25);
+ this.txtSqlServerHost.Size = new System.Drawing.Size(472, 28);
this.txtSqlServerHost.TabIndex = 28;
//
// label2
//
this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(23, 80);
+ this.label2.Location = new System.Drawing.Point(26, 96);
this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(82, 15);
+ this.label2.Size = new System.Drawing.Size(98, 18);
this.label2.TabIndex = 27;
this.label2.Text = "数据库名:";
//
// label12
//
this.label12.AutoSize = true;
- this.label12.Location = new System.Drawing.Point(39, 44);
+ this.label12.Location = new System.Drawing.Point(44, 53);
this.label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label12.Name = "label12";
- this.label12.Size = new System.Drawing.Size(67, 15);
+ this.label12.Size = new System.Drawing.Size(80, 18);
this.label12.TabIndex = 26;
this.label12.Text = "服务器:";
//
// txtSqlServerPwd
//
- this.txtSqlServerPwd.Location = new System.Drawing.Point(115, 148);
- this.txtSqlServerPwd.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtSqlServerPwd.Location = new System.Drawing.Point(129, 178);
+ this.txtSqlServerPwd.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtSqlServerPwd.Name = "txtSqlServerPwd";
this.txtSqlServerPwd.PasswordChar = '*';
- this.txtSqlServerPwd.Size = new System.Drawing.Size(420, 25);
+ this.txtSqlServerPwd.Size = new System.Drawing.Size(472, 28);
this.txtSqlServerPwd.TabIndex = 31;
//
// txtSqlServerUser
//
- this.txtSqlServerUser.Location = new System.Drawing.Point(115, 111);
- this.txtSqlServerUser.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtSqlServerUser.Location = new System.Drawing.Point(129, 133);
+ this.txtSqlServerUser.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtSqlServerUser.Name = "txtSqlServerUser";
- this.txtSqlServerUser.Size = new System.Drawing.Size(420, 25);
+ this.txtSqlServerUser.Size = new System.Drawing.Size(472, 28);
this.txtSqlServerUser.TabIndex = 30;
//
// label13
//
this.label13.AutoSize = true;
- this.label13.Location = new System.Drawing.Point(55, 152);
+ this.label13.Location = new System.Drawing.Point(62, 182);
this.label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label13.Name = "label13";
- this.label13.Size = new System.Drawing.Size(52, 15);
+ this.label13.Size = new System.Drawing.Size(62, 18);
this.label13.TabIndex = 23;
this.label13.Text = "密码:";
//
// label14
//
this.label14.AutoSize = true;
- this.label14.Location = new System.Drawing.Point(39, 116);
+ this.label14.Location = new System.Drawing.Point(44, 139);
this.label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label14.Name = "label14";
- this.label14.Size = new System.Drawing.Size(67, 15);
+ this.label14.Size = new System.Drawing.Size(80, 18);
this.label14.TabIndex = 22;
this.label14.Text = "用户名:";
//
@@ -946,39 +946,38 @@
this.tabMySql.Controls.Add(this.txtMySqlUser);
this.tabMySql.Controls.Add(this.label20);
this.tabMySql.Controls.Add(this.label23);
- this.tabMySql.Location = new System.Drawing.Point(4, 25);
- this.tabMySql.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.tabMySql.Location = new System.Drawing.Point(4, 28);
+ this.tabMySql.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.tabMySql.Name = "tabMySql";
- this.tabMySql.Size = new System.Drawing.Size(645, 291);
+ this.tabMySql.Size = new System.Drawing.Size(968, 521);
this.tabMySql.TabIndex = 4;
this.tabMySql.Text = "MySql";
this.tabMySql.UseVisualStyleBackColor = true;
//
// txtMySqlPort
//
- this.txtMySqlPort.Location = new System.Drawing.Point(115, 184);
- this.txtMySqlPort.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtMySqlPort.Location = new System.Drawing.Point(129, 221);
+ this.txtMySqlPort.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtMySqlPort.Name = "txtMySqlPort";
- this.txtMySqlPort.PasswordChar = '*';
- this.txtMySqlPort.Size = new System.Drawing.Size(420, 25);
+ this.txtMySqlPort.Size = new System.Drawing.Size(472, 28);
this.txtMySqlPort.TabIndex = 35;
//
// label17
//
this.label17.AutoSize = true;
- this.label17.Location = new System.Drawing.Point(55, 189);
+ this.label17.Location = new System.Drawing.Point(62, 227);
this.label17.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label17.Name = "label17";
- this.label17.Size = new System.Drawing.Size(52, 15);
+ this.label17.Size = new System.Drawing.Size(62, 18);
this.label17.TabIndex = 34;
this.label17.Text = "端口:";
//
// btnMySqlTest
//
- this.btnMySqlTest.Location = new System.Drawing.Point(499, 225);
- this.btnMySqlTest.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.btnMySqlTest.Location = new System.Drawing.Point(561, 270);
+ this.btnMySqlTest.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.btnMySqlTest.Name = "btnMySqlTest";
- this.btnMySqlTest.Size = new System.Drawing.Size(105, 30);
+ this.btnMySqlTest.Size = new System.Drawing.Size(118, 36);
this.btnMySqlTest.TabIndex = 36;
this.btnMySqlTest.Text = "测试连接";
this.btnMySqlTest.UseVisualStyleBackColor = true;
@@ -986,74 +985,73 @@
//
// txtMySqlServer
//
- this.txtMySqlServer.Location = new System.Drawing.Point(115, 75);
- this.txtMySqlServer.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtMySqlServer.Location = new System.Drawing.Point(129, 90);
+ this.txtMySqlServer.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtMySqlServer.Name = "txtMySqlServer";
- this.txtMySqlServer.Size = new System.Drawing.Size(420, 25);
+ this.txtMySqlServer.Size = new System.Drawing.Size(472, 28);
this.txtMySqlServer.TabIndex = 32;
//
// txtMySqlHost
//
- this.txtMySqlHost.Location = new System.Drawing.Point(115, 39);
- this.txtMySqlHost.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtMySqlHost.Location = new System.Drawing.Point(129, 47);
+ this.txtMySqlHost.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtMySqlHost.Name = "txtMySqlHost";
- this.txtMySqlHost.Size = new System.Drawing.Size(420, 25);
+ this.txtMySqlHost.Size = new System.Drawing.Size(472, 28);
this.txtMySqlHost.TabIndex = 31;
//
// label18
//
this.label18.AutoSize = true;
- this.label18.Location = new System.Drawing.Point(55, 80);
+ this.label18.Location = new System.Drawing.Point(62, 96);
this.label18.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label18.Name = "label18";
- this.label18.Size = new System.Drawing.Size(52, 15);
+ this.label18.Size = new System.Drawing.Size(62, 18);
this.label18.TabIndex = 30;
this.label18.Text = "实例:";
//
// label19
//
this.label19.AutoSize = true;
- this.label19.Location = new System.Drawing.Point(39, 44);
+ this.label19.Location = new System.Drawing.Point(44, 53);
this.label19.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label19.Name = "label19";
- this.label19.Size = new System.Drawing.Size(67, 15);
+ this.label19.Size = new System.Drawing.Size(80, 18);
this.label19.TabIndex = 29;
this.label19.Text = "服务器:";
//
// txtMySqlPwd
//
- this.txtMySqlPwd.Location = new System.Drawing.Point(115, 148);
- this.txtMySqlPwd.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtMySqlPwd.Location = new System.Drawing.Point(129, 178);
+ this.txtMySqlPwd.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtMySqlPwd.Name = "txtMySqlPwd";
- this.txtMySqlPwd.PasswordChar = '*';
- this.txtMySqlPwd.Size = new System.Drawing.Size(420, 25);
+ this.txtMySqlPwd.Size = new System.Drawing.Size(472, 28);
this.txtMySqlPwd.TabIndex = 34;
//
// txtMySqlUser
//
- this.txtMySqlUser.Location = new System.Drawing.Point(115, 111);
- this.txtMySqlUser.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtMySqlUser.Location = new System.Drawing.Point(129, 133);
+ this.txtMySqlUser.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtMySqlUser.Name = "txtMySqlUser";
- this.txtMySqlUser.Size = new System.Drawing.Size(420, 25);
+ this.txtMySqlUser.Size = new System.Drawing.Size(472, 28);
this.txtMySqlUser.TabIndex = 33;
//
// label20
//
this.label20.AutoSize = true;
- this.label20.Location = new System.Drawing.Point(55, 152);
+ this.label20.Location = new System.Drawing.Point(62, 182);
this.label20.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label20.Name = "label20";
- this.label20.Size = new System.Drawing.Size(52, 15);
+ this.label20.Size = new System.Drawing.Size(62, 18);
this.label20.TabIndex = 26;
this.label20.Text = "密码:";
//
// label23
//
this.label23.AutoSize = true;
- this.label23.Location = new System.Drawing.Point(39, 116);
+ this.label23.Location = new System.Drawing.Point(44, 139);
this.label23.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label23.Name = "label23";
- this.label23.Size = new System.Drawing.Size(67, 15);
+ this.label23.Size = new System.Drawing.Size(80, 18);
this.label23.TabIndex = 25;
this.label23.Text = "用户名:";
//
@@ -1070,58 +1068,58 @@
this.tabOracle.Controls.Add(this.txtOracleUserId);
this.tabOracle.Controls.Add(this.label28);
this.tabOracle.Controls.Add(this.label29);
- this.tabOracle.Location = new System.Drawing.Point(4, 25);
- this.tabOracle.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.tabOracle.Location = new System.Drawing.Point(4, 28);
+ this.tabOracle.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.tabOracle.Name = "tabOracle";
- this.tabOracle.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.tabOracle.Size = new System.Drawing.Size(645, 291);
+ this.tabOracle.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.tabOracle.Size = new System.Drawing.Size(966, 518);
this.tabOracle.TabIndex = 5;
this.tabOracle.Text = "Oracle";
this.tabOracle.UseVisualStyleBackColor = true;
//
// txtOracleHost
//
- this.txtOracleHost.Location = new System.Drawing.Point(115, 39);
- this.txtOracleHost.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtOracleHost.Location = new System.Drawing.Point(129, 47);
+ this.txtOracleHost.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtOracleHost.Name = "txtOracleHost";
- this.txtOracleHost.Size = new System.Drawing.Size(420, 25);
+ this.txtOracleHost.Size = new System.Drawing.Size(472, 28);
this.txtOracleHost.TabIndex = 49;
//
// label37
//
this.label37.AutoSize = true;
- this.label37.Location = new System.Drawing.Point(39, 44);
+ this.label37.Location = new System.Drawing.Point(44, 53);
this.label37.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label37.Name = "label37";
- this.label37.Size = new System.Drawing.Size(67, 15);
+ this.label37.Size = new System.Drawing.Size(80, 18);
this.label37.TabIndex = 48;
this.label37.Text = "服务器:";
//
// txtOraclePort
//
- this.txtOraclePort.Location = new System.Drawing.Point(115, 184);
- this.txtOraclePort.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtOraclePort.Location = new System.Drawing.Point(129, 221);
+ this.txtOraclePort.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtOraclePort.Name = "txtOraclePort";
this.txtOraclePort.PasswordChar = '*';
- this.txtOraclePort.Size = new System.Drawing.Size(420, 25);
+ this.txtOraclePort.Size = new System.Drawing.Size(472, 28);
this.txtOraclePort.TabIndex = 46;
//
// label24
//
this.label24.AutoSize = true;
- this.label24.Location = new System.Drawing.Point(55, 189);
+ this.label24.Location = new System.Drawing.Point(62, 227);
this.label24.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label24.Name = "label24";
- this.label24.Size = new System.Drawing.Size(52, 15);
+ this.label24.Size = new System.Drawing.Size(62, 18);
this.label24.TabIndex = 44;
this.label24.Text = "端口:";
//
// btnOracleTestLink
//
- this.btnOracleTestLink.Location = new System.Drawing.Point(499, 225);
- this.btnOracleTestLink.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.btnOracleTestLink.Location = new System.Drawing.Point(561, 270);
+ this.btnOracleTestLink.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.btnOracleTestLink.Name = "btnOracleTestLink";
- this.btnOracleTestLink.Size = new System.Drawing.Size(105, 30);
+ this.btnOracleTestLink.Size = new System.Drawing.Size(118, 36);
this.btnOracleTestLink.TabIndex = 47;
this.btnOracleTestLink.Text = "测试连接";
this.btnOracleTestLink.UseVisualStyleBackColor = true;
@@ -1129,56 +1127,56 @@
//
// txtOracleSource
//
- this.txtOracleSource.Location = new System.Drawing.Point(115, 75);
- this.txtOracleSource.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtOracleSource.Location = new System.Drawing.Point(129, 90);
+ this.txtOracleSource.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtOracleSource.Name = "txtOracleSource";
- this.txtOracleSource.Size = new System.Drawing.Size(420, 25);
+ this.txtOracleSource.Size = new System.Drawing.Size(472, 28);
this.txtOracleSource.TabIndex = 42;
//
// label26
//
this.label26.AutoSize = true;
- this.label26.Location = new System.Drawing.Point(55, 80);
+ this.label26.Location = new System.Drawing.Point(62, 96);
this.label26.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label26.Name = "label26";
- this.label26.Size = new System.Drawing.Size(52, 15);
+ this.label26.Size = new System.Drawing.Size(62, 18);
this.label26.TabIndex = 40;
this.label26.Text = "实例:";
//
// txtOraclePwd
//
- this.txtOraclePwd.Location = new System.Drawing.Point(115, 148);
- this.txtOraclePwd.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtOraclePwd.Location = new System.Drawing.Point(129, 178);
+ this.txtOraclePwd.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtOraclePwd.Name = "txtOraclePwd";
this.txtOraclePwd.PasswordChar = '*';
- this.txtOraclePwd.Size = new System.Drawing.Size(420, 25);
+ this.txtOraclePwd.Size = new System.Drawing.Size(472, 28);
this.txtOraclePwd.TabIndex = 45;
//
// txtOracleUserId
//
- this.txtOracleUserId.Location = new System.Drawing.Point(115, 111);
- this.txtOracleUserId.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtOracleUserId.Location = new System.Drawing.Point(129, 133);
+ this.txtOracleUserId.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtOracleUserId.Name = "txtOracleUserId";
- this.txtOracleUserId.Size = new System.Drawing.Size(420, 25);
+ this.txtOracleUserId.Size = new System.Drawing.Size(472, 28);
this.txtOracleUserId.TabIndex = 43;
//
// label28
//
this.label28.AutoSize = true;
- this.label28.Location = new System.Drawing.Point(55, 152);
+ this.label28.Location = new System.Drawing.Point(62, 182);
this.label28.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label28.Name = "label28";
- this.label28.Size = new System.Drawing.Size(52, 15);
+ this.label28.Size = new System.Drawing.Size(62, 18);
this.label28.TabIndex = 38;
this.label28.Text = "密码:";
//
// label29
//
this.label29.AutoSize = true;
- this.label29.Location = new System.Drawing.Point(39, 116);
+ this.label29.Location = new System.Drawing.Point(44, 139);
this.label29.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label29.Name = "label29";
- this.label29.Size = new System.Drawing.Size(67, 15);
+ this.label29.Size = new System.Drawing.Size(80, 18);
this.label29.TabIndex = 37;
this.label29.Text = "用户名:";
//
@@ -1193,11 +1191,11 @@
this.tabTxt.Controls.Add(this.btnOpenFileTxt);
this.tabTxt.Controls.Add(this.label36);
this.tabTxt.Controls.Add(this.txtInportTxt);
- this.tabTxt.Location = new System.Drawing.Point(4, 25);
- this.tabTxt.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.tabTxt.Location = new System.Drawing.Point(4, 28);
+ this.tabTxt.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.tabTxt.Name = "tabTxt";
- this.tabTxt.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.tabTxt.Size = new System.Drawing.Size(645, 291);
+ this.tabTxt.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.tabTxt.Size = new System.Drawing.Size(966, 518);
this.tabTxt.TabIndex = 7;
this.tabTxt.Text = "TXT";
this.tabTxt.UseVisualStyleBackColor = true;
@@ -1205,61 +1203,61 @@
// label30
//
this.label30.AutoSize = true;
- this.label30.Location = new System.Drawing.Point(61, 34);
+ this.label30.Location = new System.Drawing.Point(69, 41);
this.label30.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label30.Name = "label30";
- this.label30.Size = new System.Drawing.Size(82, 15);
+ this.label30.Size = new System.Drawing.Size(98, 18);
this.label30.TabIndex = 33;
this.label30.Text = "是否远程:";
//
// lblTxtRemoteUserPwd
//
this.lblTxtRemoteUserPwd.AutoSize = true;
- this.lblTxtRemoteUserPwd.Location = new System.Drawing.Point(61, 141);
+ this.lblTxtRemoteUserPwd.Location = new System.Drawing.Point(69, 169);
this.lblTxtRemoteUserPwd.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblTxtRemoteUserPwd.Name = "lblTxtRemoteUserPwd";
- this.lblTxtRemoteUserPwd.Size = new System.Drawing.Size(82, 15);
+ this.lblTxtRemoteUserPwd.Size = new System.Drawing.Size(98, 18);
this.lblTxtRemoteUserPwd.TabIndex = 31;
this.lblTxtRemoteUserPwd.Text = "远程密码:";
this.lblTxtRemoteUserPwd.Visible = false;
//
// txtRemoteTxtPwd
//
- this.txtRemoteTxtPwd.Location = new System.Drawing.Point(155, 135);
- this.txtRemoteTxtPwd.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtRemoteTxtPwd.Location = new System.Drawing.Point(174, 162);
+ this.txtRemoteTxtPwd.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtRemoteTxtPwd.Name = "txtRemoteTxtPwd";
this.txtRemoteTxtPwd.PasswordChar = '*';
- this.txtRemoteTxtPwd.Size = new System.Drawing.Size(359, 25);
+ this.txtRemoteTxtPwd.Size = new System.Drawing.Size(403, 28);
this.txtRemoteTxtPwd.TabIndex = 32;
this.txtRemoteTxtPwd.Visible = false;
//
// lblTxtRemoteUserId
//
this.lblTxtRemoteUserId.AutoSize = true;
- this.lblTxtRemoteUserId.Location = new System.Drawing.Point(45, 104);
+ this.lblTxtRemoteUserId.Location = new System.Drawing.Point(51, 125);
this.lblTxtRemoteUserId.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblTxtRemoteUserId.Name = "lblTxtRemoteUserId";
- this.lblTxtRemoteUserId.Size = new System.Drawing.Size(97, 15);
+ this.lblTxtRemoteUserId.Size = new System.Drawing.Size(116, 18);
this.lblTxtRemoteUserId.TabIndex = 30;
this.lblTxtRemoteUserId.Text = "远程用户名:";
this.lblTxtRemoteUserId.Visible = false;
//
// txtRemoteTxtUserId
//
- this.txtRemoteTxtUserId.Location = new System.Drawing.Point(155, 99);
- this.txtRemoteTxtUserId.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtRemoteTxtUserId.Location = new System.Drawing.Point(174, 119);
+ this.txtRemoteTxtUserId.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtRemoteTxtUserId.Name = "txtRemoteTxtUserId";
- this.txtRemoteTxtUserId.Size = new System.Drawing.Size(359, 25);
+ this.txtRemoteTxtUserId.Size = new System.Drawing.Size(403, 28);
this.txtRemoteTxtUserId.TabIndex = 28;
this.txtRemoteTxtUserId.Visible = false;
//
// cbxRemoteTxt
//
this.cbxRemoteTxt.AutoSize = true;
- this.cbxRemoteTxt.Location = new System.Drawing.Point(157, 31);
- this.cbxRemoteTxt.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.cbxRemoteTxt.Location = new System.Drawing.Point(177, 37);
+ this.cbxRemoteTxt.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.cbxRemoteTxt.Name = "cbxRemoteTxt";
- this.cbxRemoteTxt.Size = new System.Drawing.Size(44, 19);
+ this.cbxRemoteTxt.Size = new System.Drawing.Size(52, 22);
this.cbxRemoteTxt.TabIndex = 25;
this.cbxRemoteTxt.Text = "是";
this.cbxRemoteTxt.UseVisualStyleBackColor = true;
@@ -1267,10 +1265,10 @@
//
// btnOpenFileTxt
//
- this.btnOpenFileTxt.Location = new System.Drawing.Point(523, 61);
- this.btnOpenFileTxt.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.btnOpenFileTxt.Location = new System.Drawing.Point(588, 73);
+ this.btnOpenFileTxt.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.btnOpenFileTxt.Name = "btnOpenFileTxt";
- this.btnOpenFileTxt.Size = new System.Drawing.Size(80, 29);
+ this.btnOpenFileTxt.Size = new System.Drawing.Size(90, 35);
this.btnOpenFileTxt.TabIndex = 29;
this.btnOpenFileTxt.Text = "浏览";
this.btnOpenFileTxt.UseVisualStyleBackColor = true;
@@ -1279,30 +1277,30 @@
// label36
//
this.label36.AutoSize = true;
- this.label36.Location = new System.Drawing.Point(92, 68);
+ this.label36.Location = new System.Drawing.Point(104, 82);
this.label36.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label36.Name = "label36";
- this.label36.Size = new System.Drawing.Size(52, 15);
+ this.label36.Size = new System.Drawing.Size(62, 18);
this.label36.TabIndex = 26;
this.label36.Text = "路径:";
//
// txtInportTxt
//
- this.txtInportTxt.Location = new System.Drawing.Point(153, 62);
- this.txtInportTxt.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtInportTxt.Location = new System.Drawing.Point(172, 74);
+ this.txtInportTxt.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtInportTxt.Name = "txtInportTxt";
- this.txtInportTxt.Size = new System.Drawing.Size(359, 25);
+ this.txtInportTxt.Size = new System.Drawing.Size(403, 28);
this.txtInportTxt.TabIndex = 27;
//
// tabCnas
//
this.tabCnas.Controls.Add(this.groupBox2);
this.tabCnas.Controls.Add(this.groupBox1);
- this.tabCnas.Location = new System.Drawing.Point(4, 25);
- this.tabCnas.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.tabCnas.Location = new System.Drawing.Point(4, 28);
+ this.tabCnas.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.tabCnas.Name = "tabCnas";
- this.tabCnas.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.tabCnas.Size = new System.Drawing.Size(664, 337);
+ this.tabCnas.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.tabCnas.Size = new System.Drawing.Size(984, 562);
this.tabCnas.TabIndex = 1;
this.tabCnas.Text = "目标数据库";
this.tabCnas.UseVisualStyleBackColor = true;
@@ -1320,76 +1318,76 @@
this.groupBox2.Controls.Add(this.txtDBName);
this.groupBox2.Controls.Add(this.label10);
this.groupBox2.Controls.Add(this.label11);
- this.groupBox2.Location = new System.Drawing.Point(24, 94);
- this.groupBox2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.groupBox2.Location = new System.Drawing.Point(27, 113);
+ this.groupBox2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.groupBox2.Name = "groupBox2";
- this.groupBox2.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.groupBox2.Size = new System.Drawing.Size(615, 226);
+ this.groupBox2.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.groupBox2.Size = new System.Drawing.Size(692, 271);
this.groupBox2.TabIndex = 29;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "连接";
//
// txtDBHost
//
- this.txtDBHost.Location = new System.Drawing.Point(117, 34);
- this.txtDBHost.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtDBHost.Location = new System.Drawing.Point(132, 41);
+ this.txtDBHost.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtDBHost.Name = "txtDBHost";
- this.txtDBHost.Size = new System.Drawing.Size(345, 25);
+ this.txtDBHost.Size = new System.Drawing.Size(388, 28);
this.txtDBHost.TabIndex = 20;
//
// label9
//
this.label9.AutoSize = true;
- this.label9.Location = new System.Drawing.Point(40, 111);
+ this.label9.Location = new System.Drawing.Point(45, 133);
this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label9.Name = "label9";
- this.label9.Size = new System.Drawing.Size(67, 15);
+ this.label9.Size = new System.Drawing.Size(80, 18);
this.label9.TabIndex = 14;
this.label9.Text = "用户名:";
//
// txtPort
//
- this.txtPort.Location = new System.Drawing.Point(117, 179);
- this.txtPort.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtPort.Location = new System.Drawing.Point(132, 215);
+ this.txtPort.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtPort.Name = "txtPort";
this.txtPort.PasswordChar = '*';
- this.txtPort.Size = new System.Drawing.Size(345, 25);
+ this.txtPort.Size = new System.Drawing.Size(388, 28);
this.txtPort.TabIndex = 24;
//
// label8
//
this.label8.AutoSize = true;
- this.label8.Location = new System.Drawing.Point(56, 149);
+ this.label8.Location = new System.Drawing.Point(63, 179);
this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(52, 15);
+ this.label8.Size = new System.Drawing.Size(62, 18);
this.label8.TabIndex = 15;
this.label8.Text = "密码:";
//
// label1
//
this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(55, 185);
+ this.label1.Location = new System.Drawing.Point(62, 222);
this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(52, 15);
+ this.label1.Size = new System.Drawing.Size(62, 18);
this.label1.TabIndex = 23;
this.label1.Text = "端口:";
//
// txtDBUser
//
- this.txtDBUser.Location = new System.Drawing.Point(117, 106);
- this.txtDBUser.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtDBUser.Location = new System.Drawing.Point(132, 127);
+ this.txtDBUser.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtDBUser.Name = "txtDBUser";
- this.txtDBUser.Size = new System.Drawing.Size(345, 25);
+ this.txtDBUser.Size = new System.Drawing.Size(388, 28);
this.txtDBUser.TabIndex = 22;
//
// btnCNASTestLink
//
- this.btnCNASTestLink.Location = new System.Drawing.Point(491, 178);
- this.btnCNASTestLink.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.btnCNASTestLink.Location = new System.Drawing.Point(552, 214);
+ this.btnCNASTestLink.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.btnCNASTestLink.Name = "btnCNASTestLink";
- this.btnCNASTestLink.Size = new System.Drawing.Size(105, 30);
+ this.btnCNASTestLink.Size = new System.Drawing.Size(118, 36);
this.btnCNASTestLink.TabIndex = 25;
this.btnCNASTestLink.Text = "测试连接";
this.btnCNASTestLink.UseVisualStyleBackColor = true;
@@ -1397,38 +1395,38 @@
//
// txtDBPwd
//
- this.txtDBPwd.Location = new System.Drawing.Point(117, 142);
- this.txtDBPwd.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtDBPwd.Location = new System.Drawing.Point(132, 170);
+ this.txtDBPwd.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtDBPwd.Name = "txtDBPwd";
this.txtDBPwd.PasswordChar = '*';
- this.txtDBPwd.Size = new System.Drawing.Size(345, 25);
+ this.txtDBPwd.Size = new System.Drawing.Size(388, 28);
this.txtDBPwd.TabIndex = 23;
//
// txtDBName
//
- this.txtDBName.Location = new System.Drawing.Point(117, 70);
- this.txtDBName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtDBName.Location = new System.Drawing.Point(132, 84);
+ this.txtDBName.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtDBName.Name = "txtDBName";
- this.txtDBName.Size = new System.Drawing.Size(345, 25);
+ this.txtDBName.Size = new System.Drawing.Size(388, 28);
this.txtDBName.TabIndex = 21;
//
// label10
//
this.label10.AutoSize = true;
- this.label10.Location = new System.Drawing.Point(41, 38);
+ this.label10.Location = new System.Drawing.Point(46, 46);
this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label10.Name = "label10";
- this.label10.Size = new System.Drawing.Size(67, 15);
+ this.label10.Size = new System.Drawing.Size(80, 18);
this.label10.TabIndex = 18;
this.label10.Text = "服务器:";
//
// label11
//
this.label11.AutoSize = true;
- this.label11.Location = new System.Drawing.Point(56, 75);
+ this.label11.Location = new System.Drawing.Point(63, 90);
this.label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label11.Name = "label11";
- this.label11.Size = new System.Drawing.Size(52, 15);
+ this.label11.Size = new System.Drawing.Size(62, 18);
this.label11.TabIndex = 19;
this.label11.Text = "实例:";
//
@@ -1436,11 +1434,11 @@
//
this.groupBox1.Controls.Add(this.cbxTargetDBSelect);
this.groupBox1.Controls.Add(this.label31);
- this.groupBox1.Location = new System.Drawing.Point(24, 18);
- this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.groupBox1.Location = new System.Drawing.Point(27, 22);
+ this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.groupBox1.Name = "groupBox1";
- this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.groupBox1.Size = new System.Drawing.Size(615, 69);
+ this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.groupBox1.Size = new System.Drawing.Size(692, 83);
this.groupBox1.TabIndex = 28;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "选择";
@@ -1451,20 +1449,20 @@
this.cbxTargetDBSelect.Items.AddRange(new object[] {
"CNAS数据库",
"PLATFORM数据库"});
- this.cbxTargetDBSelect.Location = new System.Drawing.Point(159, 25);
- this.cbxTargetDBSelect.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.cbxTargetDBSelect.Location = new System.Drawing.Point(179, 30);
+ this.cbxTargetDBSelect.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.cbxTargetDBSelect.Name = "cbxTargetDBSelect";
- this.cbxTargetDBSelect.Size = new System.Drawing.Size(159, 23);
+ this.cbxTargetDBSelect.Size = new System.Drawing.Size(178, 26);
this.cbxTargetDBSelect.TabIndex = 27;
this.cbxTargetDBSelect.SelectedIndexChanged += new System.EventHandler(this.cbxTargetDBSelect_SelectedIndexChanged);
//
// label31
//
this.label31.AutoSize = true;
- this.label31.Location = new System.Drawing.Point(16, 29);
+ this.label31.Location = new System.Drawing.Point(18, 35);
this.label31.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label31.Name = "label31";
- this.label31.Size = new System.Drawing.Size(127, 15);
+ this.label31.Size = new System.Drawing.Size(152, 18);
this.label31.TabIndex = 26;
this.label31.Text = "选择目标数据库:";
//
@@ -1472,18 +1470,18 @@
//
this.pnlBottom.Controls.Add(this.btnOK);
this.pnlBottom.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.pnlBottom.Location = new System.Drawing.Point(0, 501);
- this.pnlBottom.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.pnlBottom.Location = new System.Drawing.Point(0, 602);
+ this.pnlBottom.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.pnlBottom.Name = "pnlBottom";
- this.pnlBottom.Size = new System.Drawing.Size(882, 52);
+ this.pnlBottom.Size = new System.Drawing.Size(992, 62);
this.pnlBottom.TabIndex = 3;
//
// btnOK
//
- this.btnOK.Location = new System.Drawing.Point(749, 4);
- this.btnOK.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.btnOK.Location = new System.Drawing.Point(843, 5);
+ this.btnOK.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.btnOK.Name = "btnOK";
- this.btnOK.Size = new System.Drawing.Size(120, 38);
+ this.btnOK.Size = new System.Drawing.Size(135, 46);
this.btnOK.TabIndex = 0;
this.btnOK.Text = "确认";
this.btnOK.UseVisualStyleBackColor = true;
@@ -1493,19 +1491,19 @@
//
this.pnlTop.Dock = System.Windows.Forms.DockStyle.Top;
this.pnlTop.Location = new System.Drawing.Point(0, 0);
- this.pnlTop.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.pnlTop.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.pnlTop.Name = "pnlTop";
- this.pnlTop.Size = new System.Drawing.Size(882, 6);
+ this.pnlTop.Size = new System.Drawing.Size(992, 7);
this.pnlTop.TabIndex = 2;
//
// frmDatabaseParams
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(882, 553);
+ this.ClientSize = new System.Drawing.Size(992, 664);
this.Controls.Add(this.pnlAll);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
- this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "frmDatabaseParams";
diff --git a/CNAS_DBSync/frmSourceFilter.cs b/CNAS_DBSync/frmSourceFilter.cs
index 0eb8823..f92b527 100644
--- a/CNAS_DBSync/frmSourceFilter.cs
+++ b/CNAS_DBSync/frmSourceFilter.cs
@@ -215,9 +215,9 @@ namespace CNAS_DBSync
private void btnAdd_Click(object sender, EventArgs e)
{
//最多支持5个条件,否则无限制的条件将极大影响性能
- if (lstFilterConditions.Count == 5)
+ if (lstFilterConditions.Count == 15)
{
- MessageBox.Show("最多增加5项条件。");
+ MessageBox.Show("最多增加15项条件。");
return;
}
//添加一条空数据
diff --git a/CNAS_DBSync/frmSourceSetting.Designer.cs b/CNAS_DBSync/frmSourceSetting.Designer.cs
index a8d0f26..6990799 100644
--- a/CNAS_DBSync/frmSourceSetting.Designer.cs
+++ b/CNAS_DBSync/frmSourceSetting.Designer.cs
@@ -213,10 +213,10 @@
this.tabExcel.Controls.Add(this.cbxExcelOldVersion);
this.tabExcel.Controls.Add(this.lbExcelDateFormat);
this.tabExcel.Controls.Add(this.txtExcelSpecialDateColumnFormat);
- this.tabExcel.Location = new System.Drawing.Point(4, 29);
+ this.tabExcel.Location = new System.Drawing.Point(4, 33);
this.tabExcel.Name = "tabExcel";
this.tabExcel.Padding = new System.Windows.Forms.Padding(3);
- this.tabExcel.Size = new System.Drawing.Size(1174, 458);
+ this.tabExcel.Size = new System.Drawing.Size(1174, 454);
this.tabExcel.TabIndex = 0;
this.tabExcel.Text = "Excel";
this.tabExcel.UseVisualStyleBackColor = true;
@@ -226,7 +226,8 @@
this.txtExcelAutoSql.Location = new System.Drawing.Point(232, 250);
this.txtExcelAutoSql.Multiline = true;
this.txtExcelAutoSql.Name = "txtExcelAutoSql";
- this.txtExcelAutoSql.Size = new System.Drawing.Size(501, 184);
+ this.txtExcelAutoSql.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
+ this.txtExcelAutoSql.Size = new System.Drawing.Size(819, 186);
this.txtExcelAutoSql.TabIndex = 48;
this.txtExcelAutoSql.Enter += new System.EventHandler(this.txtExcelAutoSql_Enter);
this.txtExcelAutoSql.Leave += new System.EventHandler(this.txtExcelAutoSql_Leave);
@@ -235,7 +236,7 @@
//
this.txtExcelAutoSqlName.Location = new System.Drawing.Point(232, 206);
this.txtExcelAutoSqlName.Name = "txtExcelAutoSqlName";
- this.txtExcelAutoSqlName.Size = new System.Drawing.Size(230, 27);
+ this.txtExcelAutoSqlName.Size = new System.Drawing.Size(230, 31);
this.txtExcelAutoSqlName.TabIndex = 47;
this.txtExcelAutoSqlName.Enter += new System.EventHandler(this.txtExcelAutoSqlName_Enter);
this.txtExcelAutoSqlName.Leave += new System.EventHandler(this.txtExcelAutoSqlName_Leave);
@@ -245,7 +246,7 @@
this.lbExcelDynQuery.AutoSize = true;
this.lbExcelDynQuery.Location = new System.Drawing.Point(97, 209);
this.lbExcelDynQuery.Name = "lbExcelDynQuery";
- this.lbExcelDynQuery.Size = new System.Drawing.Size(129, 20);
+ this.lbExcelDynQuery.Size = new System.Drawing.Size(154, 24);
this.lbExcelDynQuery.TabIndex = 46;
this.lbExcelDynQuery.Text = "自定义查询语句:";
//
@@ -254,7 +255,7 @@
this.cbxExcelReadFolder.AutoSize = true;
this.cbxExcelReadFolder.Location = new System.Drawing.Point(560, 150);
this.cbxExcelReadFolder.Name = "cbxExcelReadFolder";
- this.cbxExcelReadFolder.Size = new System.Drawing.Size(106, 24);
+ this.cbxExcelReadFolder.Size = new System.Drawing.Size(126, 28);
this.cbxExcelReadFolder.TabIndex = 32;
this.cbxExcelReadFolder.Text = "读取文件夹";
this.cbxExcelReadFolder.UseVisualStyleBackColor = true;
@@ -267,7 +268,7 @@
this.cbxExcelReadFile.CheckState = System.Windows.Forms.CheckState.Checked;
this.cbxExcelReadFile.Location = new System.Drawing.Point(311, 150);
this.cbxExcelReadFile.Name = "cbxExcelReadFile";
- this.cbxExcelReadFile.Size = new System.Drawing.Size(91, 24);
+ this.cbxExcelReadFile.Size = new System.Drawing.Size(108, 28);
this.cbxExcelReadFile.TabIndex = 31;
this.cbxExcelReadFile.Text = "读取文件";
this.cbxExcelReadFile.UseVisualStyleBackColor = true;
@@ -278,7 +279,7 @@
this.cbxExcelNewVersion.AutoSize = true;
this.cbxExcelNewVersion.Location = new System.Drawing.Point(561, 14);
this.cbxExcelNewVersion.Name = "cbxExcelNewVersion";
- this.cbxExcelNewVersion.Size = new System.Drawing.Size(172, 24);
+ this.cbxExcelNewVersion.Size = new System.Drawing.Size(204, 28);
this.cbxExcelNewVersion.TabIndex = 25;
this.cbxExcelNewVersion.Text = "office 2007以后版本";
this.cbxExcelNewVersion.UseVisualStyleBackColor = true;
@@ -289,7 +290,7 @@
this.label22.AutoSize = true;
this.label22.Location = new System.Drawing.Point(90, 15);
this.label22.Name = "label22";
- this.label22.Size = new System.Drawing.Size(138, 20);
+ this.label22.Size = new System.Drawing.Size(163, 24);
this.label22.TabIndex = 24;
this.label22.Text = "Office Excel版本:";
//
@@ -298,7 +299,7 @@
this.lblExcelRemotePwd.AutoSize = true;
this.lblExcelRemotePwd.Location = new System.Drawing.Point(59, 150);
this.lblExcelRemotePwd.Name = "lblExcelRemotePwd";
- this.lblExcelRemotePwd.Size = new System.Drawing.Size(175, 20);
+ this.lblExcelRemotePwd.Size = new System.Drawing.Size(210, 24);
this.lblExcelRemotePwd.TabIndex = 10;
this.lblExcelRemotePwd.Text = "读取模式(文件/文件夹):";
//
@@ -307,7 +308,7 @@
this.lblExcelRemoteUser.AutoSize = true;
this.lblExcelRemoteUser.Location = new System.Drawing.Point(86, 97);
this.lblExcelRemoteUser.Name = "lblExcelRemoteUser";
- this.lblExcelRemoteUser.Size = new System.Drawing.Size(144, 20);
+ this.lblExcelRemoteUser.Size = new System.Drawing.Size(172, 24);
this.lblExcelRemoteUser.TabIndex = 8;
this.lblExcelRemoteUser.Text = "自定义文件名格式:";
//
@@ -315,7 +316,7 @@
//
this.txtExcelFileNameFormat.Location = new System.Drawing.Point(236, 94);
this.txtExcelFileNameFormat.Name = "txtExcelFileNameFormat";
- this.txtExcelFileNameFormat.Size = new System.Drawing.Size(230, 27);
+ this.txtExcelFileNameFormat.Size = new System.Drawing.Size(230, 31);
this.txtExcelFileNameFormat.TabIndex = 6;
this.txtExcelFileNameFormat.Enter += new System.EventHandler(this.txtExcelFileNameFormat_Enter);
this.txtExcelFileNameFormat.Leave += new System.EventHandler(this.txtExcelFileNameFormat_Leave);
@@ -327,7 +328,7 @@
this.cbxExcelOldVersion.CheckState = System.Windows.Forms.CheckState.Checked;
this.cbxExcelOldVersion.Location = new System.Drawing.Point(312, 14);
this.cbxExcelOldVersion.Name = "cbxExcelOldVersion";
- this.cbxExcelOldVersion.Size = new System.Drawing.Size(172, 24);
+ this.cbxExcelOldVersion.Size = new System.Drawing.Size(204, 28);
this.cbxExcelOldVersion.TabIndex = 4;
this.cbxExcelOldVersion.Text = "office 2007以前版本";
this.cbxExcelOldVersion.UseVisualStyleBackColor = true;
@@ -338,7 +339,7 @@
this.lbExcelDateFormat.AutoSize = true;
this.lbExcelDateFormat.Location = new System.Drawing.Point(97, 50);
this.lbExcelDateFormat.Name = "lbExcelDateFormat";
- this.lbExcelDateFormat.Size = new System.Drawing.Size(129, 20);
+ this.lbExcelDateFormat.Size = new System.Drawing.Size(154, 24);
this.lbExcelDateFormat.TabIndex = 5;
this.lbExcelDateFormat.Text = "日期列特殊格式:";
//
@@ -346,7 +347,7 @@
//
this.txtExcelSpecialDateColumnFormat.Location = new System.Drawing.Point(235, 47);
this.txtExcelSpecialDateColumnFormat.Name = "txtExcelSpecialDateColumnFormat";
- this.txtExcelSpecialDateColumnFormat.Size = new System.Drawing.Size(230, 27);
+ this.txtExcelSpecialDateColumnFormat.Size = new System.Drawing.Size(230, 31);
this.txtExcelSpecialDateColumnFormat.TabIndex = 5;
this.txtExcelSpecialDateColumnFormat.Enter += new System.EventHandler(this.txtExcelSpecialDateColumnFormat_Enter);
this.txtExcelSpecialDateColumnFormat.Leave += new System.EventHandler(this.txtExcelSpecialDateColumnFormat_Leave);
@@ -366,10 +367,10 @@
this.tabFoxPro.Controls.Add(this.txtFoxProFileNameFormat);
this.tabFoxPro.Controls.Add(this.label39);
this.tabFoxPro.Controls.Add(this.txtFoxProSpecialDateColumnFormat);
- this.tabFoxPro.Location = new System.Drawing.Point(4, 29);
+ this.tabFoxPro.Location = new System.Drawing.Point(4, 33);
this.tabFoxPro.Name = "tabFoxPro";
this.tabFoxPro.Padding = new System.Windows.Forms.Padding(3);
- this.tabFoxPro.Size = new System.Drawing.Size(1174, 568);
+ this.tabFoxPro.Size = new System.Drawing.Size(1174, 454);
this.tabFoxPro.TabIndex = 6;
this.tabFoxPro.Text = "FoxPro";
this.tabFoxPro.UseVisualStyleBackColor = true;
@@ -378,7 +379,7 @@
//
this.txtFoxProSpecialMethodName.Location = new System.Drawing.Point(213, 221);
this.txtFoxProSpecialMethodName.Name = "txtFoxProSpecialMethodName";
- this.txtFoxProSpecialMethodName.Size = new System.Drawing.Size(230, 27);
+ this.txtFoxProSpecialMethodName.Size = new System.Drawing.Size(230, 31);
this.txtFoxProSpecialMethodName.TabIndex = 65;
this.txtFoxProSpecialMethodName.Enter += new System.EventHandler(this.txtFoxProSpecialMethodName_Enter);
this.txtFoxProSpecialMethodName.Leave += new System.EventHandler(this.txtFoxProSpecialMethodName_Leave);
@@ -398,7 +399,7 @@
this.label27.AutoSize = true;
this.label27.Location = new System.Drawing.Point(133, 224);
this.label27.Name = "label27";
- this.label27.Size = new System.Drawing.Size(84, 20);
+ this.label27.Size = new System.Drawing.Size(100, 24);
this.label27.TabIndex = 64;
this.label27.Text = "补充方法:";
//
@@ -407,7 +408,7 @@
this.label33.AutoSize = true;
this.label33.Location = new System.Drawing.Point(97, 127);
this.label33.Name = "label33";
- this.label33.Size = new System.Drawing.Size(129, 20);
+ this.label33.Size = new System.Drawing.Size(154, 24);
this.label33.TabIndex = 63;
this.label33.Text = "自定义查询语句:";
//
@@ -415,7 +416,7 @@
//
this.txtFoxProAutoSqlName.Location = new System.Drawing.Point(213, 124);
this.txtFoxProAutoSqlName.Name = "txtFoxProAutoSqlName";
- this.txtFoxProAutoSqlName.Size = new System.Drawing.Size(230, 27);
+ this.txtFoxProAutoSqlName.Size = new System.Drawing.Size(230, 31);
this.txtFoxProAutoSqlName.TabIndex = 58;
this.txtFoxProAutoSqlName.Enter += new System.EventHandler(this.txtFoxProAutoSqlName_Enter);
this.txtFoxProAutoSqlName.Leave += new System.EventHandler(this.txtFoxProAutoSqlName_Leave);
@@ -425,7 +426,7 @@
this.cbxFoxProReadFolder.AutoSize = true;
this.cbxFoxProReadFolder.Location = new System.Drawing.Point(296, 14);
this.cbxFoxProReadFolder.Name = "cbxFoxProReadFolder";
- this.cbxFoxProReadFolder.Size = new System.Drawing.Size(106, 24);
+ this.cbxFoxProReadFolder.Size = new System.Drawing.Size(126, 28);
this.cbxFoxProReadFolder.TabIndex = 62;
this.cbxFoxProReadFolder.Text = "读取文件夹";
this.cbxFoxProReadFolder.UseVisualStyleBackColor = true;
@@ -448,7 +449,7 @@
this.cbxFoxProReadFile.CheckState = System.Windows.Forms.CheckState.Checked;
this.cbxFoxProReadFile.Location = new System.Drawing.Point(215, 14);
this.cbxFoxProReadFile.Name = "cbxFoxProReadFile";
- this.cbxFoxProReadFile.Size = new System.Drawing.Size(91, 24);
+ this.cbxFoxProReadFile.Size = new System.Drawing.Size(108, 28);
this.cbxFoxProReadFile.TabIndex = 61;
this.cbxFoxProReadFile.Text = "读取文件";
this.cbxFoxProReadFile.UseVisualStyleBackColor = true;
@@ -459,7 +460,7 @@
this.label35.AutoSize = true;
this.label35.Location = new System.Drawing.Point(60, 15);
this.label35.Name = "label35";
- this.label35.Size = new System.Drawing.Size(175, 20);
+ this.label35.Size = new System.Drawing.Size(210, 24);
this.label35.TabIndex = 53;
this.label35.Text = "读取模式(文件/文件夹):";
//
@@ -468,7 +469,7 @@
this.label38.AutoSize = true;
this.label38.Location = new System.Drawing.Point(85, 90);
this.label38.Name = "label38";
- this.label38.Size = new System.Drawing.Size(144, 20);
+ this.label38.Size = new System.Drawing.Size(172, 24);
this.label38.TabIndex = 52;
this.label38.Text = "自定义文件名格式:";
//
@@ -476,7 +477,7 @@
//
this.txtFoxProFileNameFormat.Location = new System.Drawing.Point(213, 87);
this.txtFoxProFileNameFormat.Name = "txtFoxProFileNameFormat";
- this.txtFoxProFileNameFormat.Size = new System.Drawing.Size(230, 27);
+ this.txtFoxProFileNameFormat.Size = new System.Drawing.Size(230, 31);
this.txtFoxProFileNameFormat.TabIndex = 51;
this.txtFoxProFileNameFormat.Enter += new System.EventHandler(this.txtFoxProFileNameFormat_Enter);
this.txtFoxProFileNameFormat.Leave += new System.EventHandler(this.txtFoxProFileNameFormat_Leave);
@@ -486,7 +487,7 @@
this.label39.AutoSize = true;
this.label39.Location = new System.Drawing.Point(97, 53);
this.label39.Name = "label39";
- this.label39.Size = new System.Drawing.Size(129, 20);
+ this.label39.Size = new System.Drawing.Size(154, 24);
this.label39.TabIndex = 49;
this.label39.Text = "日期列特殊格式:";
//
@@ -494,7 +495,7 @@
//
this.txtFoxProSpecialDateColumnFormat.Location = new System.Drawing.Point(213, 50);
this.txtFoxProSpecialDateColumnFormat.Name = "txtFoxProSpecialDateColumnFormat";
- this.txtFoxProSpecialDateColumnFormat.Size = new System.Drawing.Size(230, 27);
+ this.txtFoxProSpecialDateColumnFormat.Size = new System.Drawing.Size(230, 31);
this.txtFoxProSpecialDateColumnFormat.TabIndex = 50;
this.txtFoxProSpecialDateColumnFormat.Enter += new System.EventHandler(this.txtFoxProSpecialDateColumnFormat_Enter);
this.txtFoxProSpecialDateColumnFormat.Leave += new System.EventHandler(this.txtFoxProSpecialDateColumnFormat_Leave);
@@ -516,10 +517,10 @@
this.tabAccess.Controls.Add(this.cbxAccessOldVersion);
this.tabAccess.Controls.Add(this.label31);
this.tabAccess.Controls.Add(this.txtAccessSpecialDateColumnFormat);
- this.tabAccess.Location = new System.Drawing.Point(4, 29);
+ this.tabAccess.Location = new System.Drawing.Point(4, 33);
this.tabAccess.Name = "tabAccess";
this.tabAccess.Padding = new System.Windows.Forms.Padding(3);
- this.tabAccess.Size = new System.Drawing.Size(928, 461);
+ this.tabAccess.Size = new System.Drawing.Size(1174, 454);
this.tabAccess.TabIndex = 1;
this.tabAccess.Text = "Access";
this.tabAccess.UseVisualStyleBackColor = true;
@@ -529,7 +530,7 @@
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(106, 53);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(119, 20);
+ this.label2.Size = new System.Drawing.Size(139, 24);
this.label2.TabIndex = 48;
this.label2.Text = "Access后缀名:";
//
@@ -537,7 +538,7 @@
//
this.txtAccessSuffix.Location = new System.Drawing.Point(205, 50);
this.txtAccessSuffix.Name = "txtAccessSuffix";
- this.txtAccessSuffix.Size = new System.Drawing.Size(230, 27);
+ this.txtAccessSuffix.Size = new System.Drawing.Size(230, 31);
this.txtAccessSuffix.TabIndex = 49;
this.txtAccessSuffix.Enter += new System.EventHandler(this.txtAccessSuffix_Enter);
this.txtAccessSuffix.Leave += new System.EventHandler(this.txtAccessSuffix_Leave);
@@ -547,7 +548,7 @@
this.cbxAccessReadFolder.AutoSize = true;
this.cbxAccessReadFolder.Location = new System.Drawing.Point(290, 161);
this.cbxAccessReadFolder.Name = "cbxAccessReadFolder";
- this.cbxAccessReadFolder.Size = new System.Drawing.Size(106, 24);
+ this.cbxAccessReadFolder.Size = new System.Drawing.Size(126, 28);
this.cbxAccessReadFolder.TabIndex = 47;
this.cbxAccessReadFolder.Text = "读取文件夹";
this.cbxAccessReadFolder.UseVisualStyleBackColor = true;
@@ -560,7 +561,7 @@
this.cbxAccessReadFile.CheckState = System.Windows.Forms.CheckState.Checked;
this.cbxAccessReadFile.Location = new System.Drawing.Point(208, 161);
this.cbxAccessReadFile.Name = "cbxAccessReadFile";
- this.cbxAccessReadFile.Size = new System.Drawing.Size(91, 24);
+ this.cbxAccessReadFile.Size = new System.Drawing.Size(108, 28);
this.cbxAccessReadFile.TabIndex = 46;
this.cbxAccessReadFile.Text = "读取文件";
this.cbxAccessReadFile.UseVisualStyleBackColor = true;
@@ -571,7 +572,8 @@
this.txtAccessAutoSql.Location = new System.Drawing.Point(205, 227);
this.txtAccessAutoSql.Multiline = true;
this.txtAccessAutoSql.Name = "txtAccessAutoSql";
- this.txtAccessAutoSql.Size = new System.Drawing.Size(286, 75);
+ this.txtAccessAutoSql.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
+ this.txtAccessAutoSql.Size = new System.Drawing.Size(846, 203);
this.txtAccessAutoSql.TabIndex = 45;
this.txtAccessAutoSql.Enter += new System.EventHandler(this.txtAccessAutoSql_Enter);
this.txtAccessAutoSql.Leave += new System.EventHandler(this.txtAccessAutoSql_Leave);
@@ -580,7 +582,7 @@
//
this.txtAccessAutoSqlName.Location = new System.Drawing.Point(205, 195);
this.txtAccessAutoSqlName.Name = "txtAccessAutoSqlName";
- this.txtAccessAutoSqlName.Size = new System.Drawing.Size(230, 27);
+ this.txtAccessAutoSqlName.Size = new System.Drawing.Size(230, 31);
this.txtAccessAutoSqlName.TabIndex = 43;
this.txtAccessAutoSqlName.Enter += new System.EventHandler(this.txtAccessAutoSqlName_Enter);
this.txtAccessAutoSqlName.Leave += new System.EventHandler(this.txtAccessAutoSqlName_Leave);
@@ -590,7 +592,7 @@
this.label11.AutoSize = true;
this.label11.Location = new System.Drawing.Point(97, 198);
this.label11.Name = "label11";
- this.label11.Size = new System.Drawing.Size(129, 20);
+ this.label11.Size = new System.Drawing.Size(154, 24);
this.label11.TabIndex = 41;
this.label11.Text = "自定义查询语句:";
//
@@ -599,7 +601,7 @@
this.cbxAccessNewVersion.AutoSize = true;
this.cbxAccessNewVersion.Location = new System.Drawing.Point(352, 14);
this.cbxAccessNewVersion.Name = "cbxAccessNewVersion";
- this.cbxAccessNewVersion.Size = new System.Drawing.Size(172, 24);
+ this.cbxAccessNewVersion.Size = new System.Drawing.Size(204, 28);
this.cbxAccessNewVersion.TabIndex = 40;
this.cbxAccessNewVersion.Text = "office 2007以后版本";
this.cbxAccessNewVersion.UseVisualStyleBackColor = true;
@@ -610,7 +612,7 @@
this.label15.AutoSize = true;
this.label15.Location = new System.Drawing.Point(80, 15);
this.label15.Name = "label15";
- this.label15.Size = new System.Drawing.Size(151, 20);
+ this.label15.Size = new System.Drawing.Size(177, 24);
this.label15.TabIndex = 39;
this.label15.Text = "Office Access版本:";
//
@@ -619,7 +621,7 @@
this.label16.AutoSize = true;
this.label16.Location = new System.Drawing.Point(60, 161);
this.label16.Name = "label16";
- this.label16.Size = new System.Drawing.Size(175, 20);
+ this.label16.Size = new System.Drawing.Size(210, 24);
this.label16.TabIndex = 38;
this.label16.Text = "读取模式(文件/文件夹):";
//
@@ -628,7 +630,7 @@
this.label21.AutoSize = true;
this.label21.Location = new System.Drawing.Point(85, 127);
this.label21.Name = "label21";
- this.label21.Size = new System.Drawing.Size(144, 20);
+ this.label21.Size = new System.Drawing.Size(172, 24);
this.label21.TabIndex = 37;
this.label21.Text = "自定义文件名格式:";
//
@@ -636,7 +638,7 @@
//
this.txtAccessFileName.Location = new System.Drawing.Point(205, 124);
this.txtAccessFileName.Name = "txtAccessFileName";
- this.txtAccessFileName.Size = new System.Drawing.Size(230, 27);
+ this.txtAccessFileName.Size = new System.Drawing.Size(230, 31);
this.txtAccessFileName.TabIndex = 36;
this.txtAccessFileName.Enter += new System.EventHandler(this.txtAccessFileName_Enter);
this.txtAccessFileName.Leave += new System.EventHandler(this.txtAccessFileName_Leave);
@@ -648,7 +650,7 @@
this.cbxAccessOldVersion.CheckState = System.Windows.Forms.CheckState.Checked;
this.cbxAccessOldVersion.Location = new System.Drawing.Point(206, 14);
this.cbxAccessOldVersion.Name = "cbxAccessOldVersion";
- this.cbxAccessOldVersion.Size = new System.Drawing.Size(172, 24);
+ this.cbxAccessOldVersion.Size = new System.Drawing.Size(204, 28);
this.cbxAccessOldVersion.TabIndex = 33;
this.cbxAccessOldVersion.Text = "office 2007以前版本";
this.cbxAccessOldVersion.UseVisualStyleBackColor = true;
@@ -659,7 +661,7 @@
this.label31.AutoSize = true;
this.label31.Location = new System.Drawing.Point(97, 90);
this.label31.Name = "label31";
- this.label31.Size = new System.Drawing.Size(129, 20);
+ this.label31.Size = new System.Drawing.Size(154, 24);
this.label31.TabIndex = 34;
this.label31.Text = "日期列特殊格式:";
//
@@ -667,7 +669,7 @@
//
this.txtAccessSpecialDateColumnFormat.Location = new System.Drawing.Point(205, 87);
this.txtAccessSpecialDateColumnFormat.Name = "txtAccessSpecialDateColumnFormat";
- this.txtAccessSpecialDateColumnFormat.Size = new System.Drawing.Size(230, 27);
+ this.txtAccessSpecialDateColumnFormat.Size = new System.Drawing.Size(230, 31);
this.txtAccessSpecialDateColumnFormat.TabIndex = 35;
this.txtAccessSpecialDateColumnFormat.Enter += new System.EventHandler(this.txtAccessSpecialDateColumnFormat_Enter);
this.txtAccessSpecialDateColumnFormat.Leave += new System.EventHandler(this.txtAccessSpecialDateColumnFormat_Leave);
@@ -684,9 +686,9 @@
this.tabSQLite.Controls.Add(this.txtSqliteFileNameFormat);
this.tabSQLite.Controls.Add(this.label8);
this.tabSQLite.Controls.Add(this.txtSqliteSpecialDateColumnFormat);
- this.tabSQLite.Location = new System.Drawing.Point(4, 29);
+ this.tabSQLite.Location = new System.Drawing.Point(4, 33);
this.tabSQLite.Name = "tabSQLite";
- this.tabSQLite.Size = new System.Drawing.Size(928, 461);
+ this.tabSQLite.Size = new System.Drawing.Size(1174, 454);
this.tabSQLite.TabIndex = 2;
this.tabSQLite.Text = "SQLLite";
this.tabSQLite.UseVisualStyleBackColor = true;
@@ -696,7 +698,7 @@
this.label5.AutoSize = true;
this.label5.Location = new System.Drawing.Point(97, 123);
this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(129, 20);
+ this.label5.Size = new System.Drawing.Size(154, 24);
this.label5.TabIndex = 76;
this.label5.Text = "自定义查询语句:";
//
@@ -704,7 +706,7 @@
//
this.txtSqliteAutoSqlName.Location = new System.Drawing.Point(206, 120);
this.txtSqliteAutoSqlName.Name = "txtSqliteAutoSqlName";
- this.txtSqliteAutoSqlName.Size = new System.Drawing.Size(230, 27);
+ this.txtSqliteAutoSqlName.Size = new System.Drawing.Size(230, 31);
this.txtSqliteAutoSqlName.TabIndex = 72;
this.txtSqliteAutoSqlName.Enter += new System.EventHandler(this.txtSqliteAutoSqlName_Enter);
this.txtSqliteAutoSqlName.Leave += new System.EventHandler(this.txtSqliteAutoSqlName_Leave);
@@ -714,7 +716,7 @@
this.cbxSqliteReadFolder.AutoSize = true;
this.cbxSqliteReadFolder.Location = new System.Drawing.Point(288, 15);
this.cbxSqliteReadFolder.Name = "cbxSqliteReadFolder";
- this.cbxSqliteReadFolder.Size = new System.Drawing.Size(106, 24);
+ this.cbxSqliteReadFolder.Size = new System.Drawing.Size(126, 28);
this.cbxSqliteReadFolder.TabIndex = 75;
this.cbxSqliteReadFolder.Text = "读取文件夹";
this.cbxSqliteReadFolder.UseVisualStyleBackColor = true;
@@ -725,7 +727,8 @@
this.txtSqliteAutoSql.Location = new System.Drawing.Point(206, 151);
this.txtSqliteAutoSql.Multiline = true;
this.txtSqliteAutoSql.Name = "txtSqliteAutoSql";
- this.txtSqliteAutoSql.Size = new System.Drawing.Size(230, 76);
+ this.txtSqliteAutoSql.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
+ this.txtSqliteAutoSql.Size = new System.Drawing.Size(845, 260);
this.txtSqliteAutoSql.TabIndex = 73;
this.txtSqliteAutoSql.Enter += new System.EventHandler(this.txtSqliteAutoSql_Enter);
this.txtSqliteAutoSql.Leave += new System.EventHandler(this.txtSqliteAutoSql_Leave);
@@ -737,7 +740,7 @@
this.cbxSqliteReadFile.CheckState = System.Windows.Forms.CheckState.Checked;
this.cbxSqliteReadFile.Location = new System.Drawing.Point(206, 15);
this.cbxSqliteReadFile.Name = "cbxSqliteReadFile";
- this.cbxSqliteReadFile.Size = new System.Drawing.Size(91, 24);
+ this.cbxSqliteReadFile.Size = new System.Drawing.Size(108, 28);
this.cbxSqliteReadFile.TabIndex = 74;
this.cbxSqliteReadFile.Text = "读取文件";
this.cbxSqliteReadFile.UseVisualStyleBackColor = true;
@@ -748,7 +751,7 @@
this.label6.AutoSize = true;
this.label6.Location = new System.Drawing.Point(60, 16);
this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(175, 20);
+ this.label6.Size = new System.Drawing.Size(210, 24);
this.label6.TabIndex = 71;
this.label6.Text = "读取模式(文件/文件夹):";
//
@@ -757,7 +760,7 @@
this.label7.AutoSize = true;
this.label7.Location = new System.Drawing.Point(85, 88);
this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(144, 20);
+ this.label7.Size = new System.Drawing.Size(172, 24);
this.label7.TabIndex = 70;
this.label7.Text = "自定义文件名格式:";
//
@@ -765,7 +768,7 @@
//
this.txtSqliteFileNameFormat.Location = new System.Drawing.Point(206, 85);
this.txtSqliteFileNameFormat.Name = "txtSqliteFileNameFormat";
- this.txtSqliteFileNameFormat.Size = new System.Drawing.Size(230, 27);
+ this.txtSqliteFileNameFormat.Size = new System.Drawing.Size(230, 31);
this.txtSqliteFileNameFormat.TabIndex = 69;
this.txtSqliteFileNameFormat.Enter += new System.EventHandler(this.txtSqliteFileNameFormat_Enter);
this.txtSqliteFileNameFormat.Leave += new System.EventHandler(this.txtSqliteFileNameFormat_Leave);
@@ -775,7 +778,7 @@
this.label8.AutoSize = true;
this.label8.Location = new System.Drawing.Point(97, 53);
this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(129, 20);
+ this.label8.Size = new System.Drawing.Size(154, 24);
this.label8.TabIndex = 67;
this.label8.Text = "日期列特殊格式:";
//
@@ -783,7 +786,7 @@
//
this.txtSqliteSpecialDateColumnFormat.Location = new System.Drawing.Point(206, 50);
this.txtSqliteSpecialDateColumnFormat.Name = "txtSqliteSpecialDateColumnFormat";
- this.txtSqliteSpecialDateColumnFormat.Size = new System.Drawing.Size(230, 27);
+ this.txtSqliteSpecialDateColumnFormat.Size = new System.Drawing.Size(230, 31);
this.txtSqliteSpecialDateColumnFormat.TabIndex = 68;
this.txtSqliteSpecialDateColumnFormat.Enter += new System.EventHandler(this.txtSqliteSpecialDateColumnFormat_Enter);
this.txtSqliteSpecialDateColumnFormat.Leave += new System.EventHandler(this.txtSqliteSpecialDateColumnFormat_Leave);
@@ -797,9 +800,9 @@
this.tabSQLServer.Controls.Add(this.txtSqlServerConnection);
this.tabSQLServer.Controls.Add(this.label13);
this.tabSQLServer.Controls.Add(this.txtSqlServerSpecialDateColumnFormat);
- this.tabSQLServer.Location = new System.Drawing.Point(4, 29);
+ this.tabSQLServer.Location = new System.Drawing.Point(4, 33);
this.tabSQLServer.Name = "tabSQLServer";
- this.tabSQLServer.Size = new System.Drawing.Size(928, 461);
+ this.tabSQLServer.Size = new System.Drawing.Size(1174, 454);
this.tabSQLServer.TabIndex = 3;
this.tabSQLServer.Text = "SQL Server";
this.tabSQLServer.UseVisualStyleBackColor = true;
@@ -809,7 +812,7 @@
this.label9.AutoSize = true;
this.label9.Location = new System.Drawing.Point(98, 116);
this.label9.Name = "label9";
- this.label9.Size = new System.Drawing.Size(129, 20);
+ this.label9.Size = new System.Drawing.Size(154, 24);
this.label9.TabIndex = 76;
this.label9.Text = "自定义查询语句:";
//
@@ -817,7 +820,7 @@
//
this.txtSqlServerAutoSqlName.Location = new System.Drawing.Point(208, 113);
this.txtSqlServerAutoSqlName.Name = "txtSqlServerAutoSqlName";
- this.txtSqlServerAutoSqlName.Size = new System.Drawing.Size(230, 27);
+ this.txtSqlServerAutoSqlName.Size = new System.Drawing.Size(230, 31);
this.txtSqlServerAutoSqlName.TabIndex = 72;
this.txtSqlServerAutoSqlName.Enter += new System.EventHandler(this.txtSqlServerAutoSqlName_Enter);
this.txtSqlServerAutoSqlName.Leave += new System.EventHandler(this.txtSqlServerAutoSqlName_Leave);
@@ -827,7 +830,8 @@
this.txtSqlServerAutoSql.Location = new System.Drawing.Point(208, 145);
this.txtSqlServerAutoSql.Multiline = true;
this.txtSqlServerAutoSql.Name = "txtSqlServerAutoSql";
- this.txtSqlServerAutoSql.Size = new System.Drawing.Size(230, 60);
+ this.txtSqlServerAutoSql.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
+ this.txtSqlServerAutoSql.Size = new System.Drawing.Size(843, 279);
this.txtSqlServerAutoSql.TabIndex = 73;
this.txtSqlServerAutoSql.Enter += new System.EventHandler(this.txtSqlServerAutoSql_Enter);
this.txtSqlServerAutoSql.Leave += new System.EventHandler(this.txtSqlServerAutoSql_Leave);
@@ -837,7 +841,7 @@
this.label12.AutoSize = true;
this.label12.Location = new System.Drawing.Point(86, 53);
this.label12.Name = "label12";
- this.label12.Size = new System.Drawing.Size(144, 20);
+ this.label12.Size = new System.Drawing.Size(172, 24);
this.label12.TabIndex = 70;
this.label12.Text = "自定义连接字符串:";
//
@@ -856,7 +860,7 @@
this.label13.AutoSize = true;
this.label13.Location = new System.Drawing.Point(98, 18);
this.label13.Name = "label13";
- this.label13.Size = new System.Drawing.Size(129, 20);
+ this.label13.Size = new System.Drawing.Size(154, 24);
this.label13.TabIndex = 67;
this.label13.Text = "日期列特殊格式:";
//
@@ -864,7 +868,7 @@
//
this.txtSqlServerSpecialDateColumnFormat.Location = new System.Drawing.Point(208, 15);
this.txtSqlServerSpecialDateColumnFormat.Name = "txtSqlServerSpecialDateColumnFormat";
- this.txtSqlServerSpecialDateColumnFormat.Size = new System.Drawing.Size(230, 27);
+ this.txtSqlServerSpecialDateColumnFormat.Size = new System.Drawing.Size(230, 31);
this.txtSqlServerSpecialDateColumnFormat.TabIndex = 68;
this.txtSqlServerSpecialDateColumnFormat.Enter += new System.EventHandler(this.txtSqlServerSpecialDateColumnFormat_Enter);
this.txtSqlServerSpecialDateColumnFormat.Leave += new System.EventHandler(this.txtSqlServerSpecialDateColumnFormat_Leave);
@@ -876,9 +880,9 @@
this.tabMySql.Controls.Add(this.txtMySqlAutoSql);
this.tabMySql.Controls.Add(this.label18);
this.tabMySql.Controls.Add(this.txtMySqlSpecialDateColumnFormat);
- this.tabMySql.Location = new System.Drawing.Point(4, 29);
+ this.tabMySql.Location = new System.Drawing.Point(4, 33);
this.tabMySql.Name = "tabMySql";
- this.tabMySql.Size = new System.Drawing.Size(928, 461);
+ this.tabMySql.Size = new System.Drawing.Size(1174, 454);
this.tabMySql.TabIndex = 4;
this.tabMySql.Text = "MySql";
this.tabMySql.UseVisualStyleBackColor = true;
@@ -888,7 +892,7 @@
this.label14.AutoSize = true;
this.label14.Location = new System.Drawing.Point(99, 60);
this.label14.Name = "label14";
- this.label14.Size = new System.Drawing.Size(129, 20);
+ this.label14.Size = new System.Drawing.Size(154, 24);
this.label14.TabIndex = 86;
this.label14.Text = "自定义查询语句:";
//
@@ -896,7 +900,7 @@
//
this.txtMySqlAutoSqlName.Location = new System.Drawing.Point(207, 57);
this.txtMySqlAutoSqlName.Name = "txtMySqlAutoSqlName";
- this.txtMySqlAutoSqlName.Size = new System.Drawing.Size(230, 27);
+ this.txtMySqlAutoSqlName.Size = new System.Drawing.Size(230, 31);
this.txtMySqlAutoSqlName.TabIndex = 84;
this.txtMySqlAutoSqlName.Enter += new System.EventHandler(this.txtMySqlAutoSqlName_Enter);
this.txtMySqlAutoSqlName.Leave += new System.EventHandler(this.txtMySqlAutoSqlName_Leave);
@@ -906,7 +910,8 @@
this.txtMySqlAutoSql.Location = new System.Drawing.Point(207, 89);
this.txtMySqlAutoSql.Multiline = true;
this.txtMySqlAutoSql.Name = "txtMySqlAutoSql";
- this.txtMySqlAutoSql.Size = new System.Drawing.Size(230, 72);
+ this.txtMySqlAutoSql.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
+ this.txtMySqlAutoSql.Size = new System.Drawing.Size(844, 339);
this.txtMySqlAutoSql.TabIndex = 85;
this.txtMySqlAutoSql.Enter += new System.EventHandler(this.txtMySqlAutoSql_Enter);
this.txtMySqlAutoSql.Leave += new System.EventHandler(this.txtMySqlAutoSql_Leave);
@@ -916,7 +921,7 @@
this.label18.AutoSize = true;
this.label18.Location = new System.Drawing.Point(97, 25);
this.label18.Name = "label18";
- this.label18.Size = new System.Drawing.Size(129, 20);
+ this.label18.Size = new System.Drawing.Size(154, 24);
this.label18.TabIndex = 80;
this.label18.Text = "日期列特殊格式:";
//
@@ -924,7 +929,7 @@
//
this.txtMySqlSpecialDateColumnFormat.Location = new System.Drawing.Point(207, 22);
this.txtMySqlSpecialDateColumnFormat.Name = "txtMySqlSpecialDateColumnFormat";
- this.txtMySqlSpecialDateColumnFormat.Size = new System.Drawing.Size(230, 27);
+ this.txtMySqlSpecialDateColumnFormat.Size = new System.Drawing.Size(230, 31);
this.txtMySqlSpecialDateColumnFormat.TabIndex = 81;
this.txtMySqlSpecialDateColumnFormat.Enter += new System.EventHandler(this.txtMySqlSpecialDateColumnFormat_Enter);
this.txtMySqlSpecialDateColumnFormat.Leave += new System.EventHandler(this.txtMySqlSpecialDateColumnFormat_Leave);
@@ -936,10 +941,10 @@
this.tabOracle.Controls.Add(this.txtOracleAutoSql);
this.tabOracle.Controls.Add(this.label10);
this.tabOracle.Controls.Add(this.txtOracleSpecialDateColumnFormat);
- this.tabOracle.Location = new System.Drawing.Point(4, 29);
+ this.tabOracle.Location = new System.Drawing.Point(4, 33);
this.tabOracle.Name = "tabOracle";
this.tabOracle.Padding = new System.Windows.Forms.Padding(3);
- this.tabOracle.Size = new System.Drawing.Size(928, 461);
+ this.tabOracle.Size = new System.Drawing.Size(1174, 454);
this.tabOracle.TabIndex = 5;
this.tabOracle.Text = "Oracle";
this.tabOracle.UseVisualStyleBackColor = true;
@@ -949,7 +954,7 @@
this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(102, 65);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(129, 20);
+ this.label4.Size = new System.Drawing.Size(154, 24);
this.label4.TabIndex = 91;
this.label4.Text = "自定义查询语句:";
//
@@ -957,7 +962,7 @@
//
this.txtOracleAutoSqlName.Location = new System.Drawing.Point(210, 62);
this.txtOracleAutoSqlName.Name = "txtOracleAutoSqlName";
- this.txtOracleAutoSqlName.Size = new System.Drawing.Size(230, 27);
+ this.txtOracleAutoSqlName.Size = new System.Drawing.Size(230, 31);
this.txtOracleAutoSqlName.TabIndex = 89;
this.txtOracleAutoSqlName.Enter += new System.EventHandler(this.txtOracleAutoSqlName_Enter);
this.txtOracleAutoSqlName.Leave += new System.EventHandler(this.txtOracleAutoSqlName_Leave);
@@ -967,7 +972,8 @@
this.txtOracleAutoSql.Location = new System.Drawing.Point(210, 94);
this.txtOracleAutoSql.Multiline = true;
this.txtOracleAutoSql.Name = "txtOracleAutoSql";
- this.txtOracleAutoSql.Size = new System.Drawing.Size(230, 72);
+ this.txtOracleAutoSql.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
+ this.txtOracleAutoSql.Size = new System.Drawing.Size(841, 339);
this.txtOracleAutoSql.TabIndex = 90;
this.txtOracleAutoSql.Enter += new System.EventHandler(this.txtOracleAutoSql_Enter);
this.txtOracleAutoSql.Leave += new System.EventHandler(this.txtOracleAutoSql_Leave);
@@ -977,7 +983,7 @@
this.label10.AutoSize = true;
this.label10.Location = new System.Drawing.Point(97, 30);
this.label10.Name = "label10";
- this.label10.Size = new System.Drawing.Size(129, 20);
+ this.label10.Size = new System.Drawing.Size(154, 24);
this.label10.TabIndex = 87;
this.label10.Text = "日期列特殊格式:";
//
@@ -985,7 +991,7 @@
//
this.txtOracleSpecialDateColumnFormat.Location = new System.Drawing.Point(210, 27);
this.txtOracleSpecialDateColumnFormat.Name = "txtOracleSpecialDateColumnFormat";
- this.txtOracleSpecialDateColumnFormat.Size = new System.Drawing.Size(230, 27);
+ this.txtOracleSpecialDateColumnFormat.Size = new System.Drawing.Size(230, 31);
this.txtOracleSpecialDateColumnFormat.TabIndex = 88;
this.txtOracleSpecialDateColumnFormat.Enter += new System.EventHandler(this.txtOracleSpecialDateColumnFormat_Enter);
this.txtOracleSpecialDateColumnFormat.Leave += new System.EventHandler(this.txtOracleSpecialDateColumnFormat_Leave);
@@ -1010,10 +1016,10 @@
this.tabTxt.Controls.Add(this.txtNormalFileNameFormat);
this.tabTxt.Controls.Add(this.label28);
this.tabTxt.Controls.Add(this.txtNormalFileSpecialDateColumnFormat);
- this.tabTxt.Location = new System.Drawing.Point(4, 29);
+ this.tabTxt.Location = new System.Drawing.Point(4, 33);
this.tabTxt.Name = "tabTxt";
this.tabTxt.Padding = new System.Windows.Forms.Padding(3);
- this.tabTxt.Size = new System.Drawing.Size(928, 461);
+ this.tabTxt.Size = new System.Drawing.Size(1174, 454);
this.tabTxt.TabIndex = 7;
this.tabTxt.Text = "TXT";
this.tabTxt.UseVisualStyleBackColor = true;
@@ -1025,7 +1031,7 @@
this.cbxNormalFileNoCustomDate.CheckState = System.Windows.Forms.CheckState.Checked;
this.cbxNormalFileNoCustomDate.Location = new System.Drawing.Point(270, 283);
this.cbxNormalFileNoCustomDate.Name = "cbxNormalFileNoCustomDate";
- this.cbxNormalFileNoCustomDate.Size = new System.Drawing.Size(46, 24);
+ this.cbxNormalFileNoCustomDate.Size = new System.Drawing.Size(54, 28);
this.cbxNormalFileNoCustomDate.TabIndex = 67;
this.cbxNormalFileNoCustomDate.Text = "否";
this.cbxNormalFileNoCustomDate.UseVisualStyleBackColor = true;
@@ -1036,7 +1042,7 @@
this.cbxNormalFileCustomDate.AutoSize = true;
this.cbxNormalFileCustomDate.Location = new System.Drawing.Point(208, 283);
this.cbxNormalFileCustomDate.Name = "cbxNormalFileCustomDate";
- this.cbxNormalFileCustomDate.Size = new System.Drawing.Size(46, 24);
+ this.cbxNormalFileCustomDate.Size = new System.Drawing.Size(54, 28);
this.cbxNormalFileCustomDate.TabIndex = 66;
this.cbxNormalFileCustomDate.Text = "是";
this.cbxNormalFileCustomDate.UseVisualStyleBackColor = true;
@@ -1051,7 +1057,7 @@
0,
0});
this.numNormalFileStartIndex.Name = "numNormalFileStartIndex";
- this.numNormalFileStartIndex.Size = new System.Drawing.Size(120, 27);
+ this.numNormalFileStartIndex.Size = new System.Drawing.Size(120, 31);
this.numNormalFileStartIndex.TabIndex = 65;
this.numNormalFileStartIndex.Value = new decimal(new int[] {
1,
@@ -1064,7 +1070,7 @@
this.label20.AutoSize = true;
this.label20.Location = new System.Drawing.Point(61, 283);
this.label20.Name = "label20";
- this.label20.Size = new System.Drawing.Size(174, 20);
+ this.label20.Size = new System.Drawing.Size(208, 24);
this.label20.TabIndex = 64;
this.label20.Text = "是否由系统创建日期列:";
//
@@ -1073,7 +1079,7 @@
this.label19.AutoSize = true;
this.label19.Location = new System.Drawing.Point(97, 248);
this.label19.Name = "label19";
- this.label19.Size = new System.Drawing.Size(129, 20);
+ this.label19.Size = new System.Drawing.Size(154, 24);
this.label19.TabIndex = 62;
this.label19.Text = "数据行起始行号:";
//
@@ -1082,7 +1088,7 @@
this.label17.AutoSize = true;
this.label17.Location = new System.Drawing.Point(97, 209);
this.label17.Name = "label17";
- this.label17.Size = new System.Drawing.Size(129, 20);
+ this.label17.Size = new System.Drawing.Size(154, 24);
this.label17.TabIndex = 60;
this.label17.Text = "分割数据行选型:";
//
@@ -1090,7 +1096,7 @@
//
this.txtNormalFileReadSplitMode.Location = new System.Drawing.Point(207, 206);
this.txtNormalFileReadSplitMode.Name = "txtNormalFileReadSplitMode";
- this.txtNormalFileReadSplitMode.Size = new System.Drawing.Size(230, 27);
+ this.txtNormalFileReadSplitMode.Size = new System.Drawing.Size(230, 31);
this.txtNormalFileReadSplitMode.TabIndex = 59;
this.txtNormalFileReadSplitMode.Enter += new System.EventHandler(this.txtNormalFileReadSplitMode_Enter);
this.txtNormalFileReadSplitMode.Leave += new System.EventHandler(this.txtNormalFileReadSplitMode_Leave);
@@ -1100,7 +1106,7 @@
this.label30.AutoSize = true;
this.label30.Location = new System.Drawing.Point(109, 170);
this.label30.Name = "label30";
- this.label30.Size = new System.Drawing.Size(114, 20);
+ this.label30.Size = new System.Drawing.Size(136, 24);
this.label30.TabIndex = 58;
this.label30.Text = "读取方法选型:";
//
@@ -1108,7 +1114,7 @@
//
this.txtNormalFileReadDataMode.Location = new System.Drawing.Point(207, 167);
this.txtNormalFileReadDataMode.Name = "txtNormalFileReadDataMode";
- this.txtNormalFileReadDataMode.Size = new System.Drawing.Size(230, 27);
+ this.txtNormalFileReadDataMode.Size = new System.Drawing.Size(230, 31);
this.txtNormalFileReadDataMode.TabIndex = 57;
this.txtNormalFileReadDataMode.Enter += new System.EventHandler(this.txtNormalFileReadDataMode_Enter);
this.txtNormalFileReadDataMode.Leave += new System.EventHandler(this.txtNormalFileReadDataMode_Leave);
@@ -1118,7 +1124,7 @@
this.label29.AutoSize = true;
this.label29.Location = new System.Drawing.Point(85, 132);
this.label29.Name = "label29";
- this.label29.Size = new System.Drawing.Size(144, 20);
+ this.label29.Size = new System.Drawing.Size(172, 24);
this.label29.TabIndex = 56;
this.label29.Text = "自定义文件后缀名:";
//
@@ -1126,7 +1132,7 @@
//
this.txtNormalFileSuffix.Location = new System.Drawing.Point(207, 129);
this.txtNormalFileSuffix.Name = "txtNormalFileSuffix";
- this.txtNormalFileSuffix.Size = new System.Drawing.Size(230, 27);
+ this.txtNormalFileSuffix.Size = new System.Drawing.Size(230, 31);
this.txtNormalFileSuffix.TabIndex = 55;
this.txtNormalFileSuffix.Enter += new System.EventHandler(this.txtNormalFileSuffix_Enter);
this.txtNormalFileSuffix.Leave += new System.EventHandler(this.txtNormalFileSuffix_Leave);
@@ -1136,7 +1142,7 @@
this.cbxNormalFileReadFolder.AutoSize = true;
this.cbxNormalFileReadFolder.Location = new System.Drawing.Point(288, 20);
this.cbxNormalFileReadFolder.Name = "cbxNormalFileReadFolder";
- this.cbxNormalFileReadFolder.Size = new System.Drawing.Size(106, 24);
+ this.cbxNormalFileReadFolder.Size = new System.Drawing.Size(126, 28);
this.cbxNormalFileReadFolder.TabIndex = 54;
this.cbxNormalFileReadFolder.Text = "读取文件夹";
this.cbxNormalFileReadFolder.UseVisualStyleBackColor = true;
@@ -1149,7 +1155,7 @@
this.cbxNormalFileReadFile.CheckState = System.Windows.Forms.CheckState.Checked;
this.cbxNormalFileReadFile.Location = new System.Drawing.Point(207, 20);
this.cbxNormalFileReadFile.Name = "cbxNormalFileReadFile";
- this.cbxNormalFileReadFile.Size = new System.Drawing.Size(91, 24);
+ this.cbxNormalFileReadFile.Size = new System.Drawing.Size(108, 28);
this.cbxNormalFileReadFile.TabIndex = 53;
this.cbxNormalFileReadFile.Text = "读取文件";
this.cbxNormalFileReadFile.UseVisualStyleBackColor = true;
@@ -1160,7 +1166,7 @@
this.label25.AutoSize = true;
this.label25.Location = new System.Drawing.Point(60, 20);
this.label25.Name = "label25";
- this.label25.Size = new System.Drawing.Size(175, 20);
+ this.label25.Size = new System.Drawing.Size(210, 24);
this.label25.TabIndex = 52;
this.label25.Text = "读取模式(文件/文件夹):";
//
@@ -1169,7 +1175,7 @@
this.label26.AutoSize = true;
this.label26.Location = new System.Drawing.Point(85, 93);
this.label26.Name = "label26";
- this.label26.Size = new System.Drawing.Size(144, 20);
+ this.label26.Size = new System.Drawing.Size(172, 24);
this.label26.TabIndex = 51;
this.label26.Text = "自定义文件名格式:";
//
@@ -1177,7 +1183,7 @@
//
this.txtNormalFileNameFormat.Location = new System.Drawing.Point(207, 90);
this.txtNormalFileNameFormat.Name = "txtNormalFileNameFormat";
- this.txtNormalFileNameFormat.Size = new System.Drawing.Size(230, 27);
+ this.txtNormalFileNameFormat.Size = new System.Drawing.Size(230, 31);
this.txtNormalFileNameFormat.TabIndex = 50;
this.txtNormalFileNameFormat.Enter += new System.EventHandler(this.txtNormalFileNameFormat_Enter);
this.txtNormalFileNameFormat.Leave += new System.EventHandler(this.txtNormalFileNameFormat_Leave);
@@ -1187,7 +1193,7 @@
this.label28.AutoSize = true;
this.label28.Location = new System.Drawing.Point(97, 56);
this.label28.Name = "label28";
- this.label28.Size = new System.Drawing.Size(129, 20);
+ this.label28.Size = new System.Drawing.Size(154, 24);
this.label28.TabIndex = 48;
this.label28.Text = "日期列特殊格式:";
//
@@ -1195,7 +1201,7 @@
//
this.txtNormalFileSpecialDateColumnFormat.Location = new System.Drawing.Point(207, 53);
this.txtNormalFileSpecialDateColumnFormat.Name = "txtNormalFileSpecialDateColumnFormat";
- this.txtNormalFileSpecialDateColumnFormat.Size = new System.Drawing.Size(230, 27);
+ this.txtNormalFileSpecialDateColumnFormat.Size = new System.Drawing.Size(230, 31);
this.txtNormalFileSpecialDateColumnFormat.TabIndex = 49;
this.txtNormalFileSpecialDateColumnFormat.Enter += new System.EventHandler(this.txtNormalFileSpecialDateColumnFormat_Enter);
this.txtNormalFileSpecialDateColumnFormat.Leave += new System.EventHandler(this.txtNormalFileSpecialDateColumnFormat_Leave);
@@ -1213,7 +1219,7 @@
//
// frmSourceSetting
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 24F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1182, 543);
this.Controls.Add(this.pnlAll);
diff --git a/CNAS_RunSync/Program.cs b/CNAS_RunSync/Program.cs
index 31f1aab..81fa610 100644
--- a/CNAS_RunSync/Program.cs
+++ b/CNAS_RunSync/Program.cs
@@ -20,7 +20,8 @@ namespace CNAS_RunSync
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
string strMsg = "";
- CheckAvailability(ref strMsg);
+
+ //CheckAvailability(ref strMsg);
if (strMsg == "")
Application.Run(new frmSynchrousMain());
else
@@ -59,7 +60,7 @@ namespace CNAS_RunSync
return;
}
//3 验证是否存在于CNAS数据库相应表中
- bool bIfChecked= CnasDataOperationFact.CnasDataOperation().CheckMacMessage(Cnasdb, strLocalMac);
+ bool bIfChecked = CnasDataOperationFact.CnasDataOperation().CheckMacMessage(Cnasdb, strLocalMac);
if (!bIfChecked)
{
strErrorMsg = "当前电脑没有使用权限,请联系管理员。";
diff --git a/CNAS_RunSync/app.config b/CNAS_RunSync/app.config
index 82607d6..4c47e64 100644
--- a/CNAS_RunSync/app.config
+++ b/CNAS_RunSync/app.config
@@ -5,7 +5,7 @@
-
+
diff --git a/CNAS_SyncService/App.config b/CNAS_SyncService/App.config
index 12752ef..86a9d5a 100644
--- a/CNAS_SyncService/App.config
+++ b/CNAS_SyncService/App.config
@@ -5,7 +5,7 @@
-
+
diff --git a/CnasSynchronusClient/FileOperation.cs b/CnasSynchronusClient/FileOperation.cs
index 6bd1775..9d13d1a 100644
--- a/CnasSynchronusClient/FileOperation.cs
+++ b/CnasSynchronusClient/FileOperation.cs
@@ -3,7 +3,9 @@ using CnasSynchrousModel;
using System;
using System.Collections.Generic;
using System.Configuration;
+using System.IO;
using System.Linq;
+using System.Security.Cryptography;
using System.Text;
namespace CnasSynchronusClient
@@ -12,9 +14,10 @@ namespace CnasSynchronusClient
{
private static readonly string strLocalConfigPath = FileHelper.getBasePath() + @"\Data\";
private static readonly string strLocalDocumentPath= FileHelper.getBasePath() + @"\Document\";
- private static readonly string strInitalPwd = ConfigurationManager.AppSettings["InitalOperationPwd"].ToString(); //默认初始密码
+ private static readonly string strInitalPwd = EncryptionOperation.Decrypt(ConfigurationManager.AppSettings["InitalOperationPwd"].ToString(), "NZJXD--CnasClientJXDJXDJ");
private static readonly string strLocalConfigPath_2 = FileHelper.getBasePath() + @"\DataConfig\";
+
///
/// 从本地读取CNAS数据库连接
///
@@ -352,4 +355,6 @@ namespace CnasSynchronusClient
return bIfSuccess;
}
}
+
+
}
diff --git a/WF-ChangeGUID/App.config b/WF-ChangeGUID/App.config
index b8bf9e1..383ecdc 100644
--- a/WF-ChangeGUID/App.config
+++ b/WF-ChangeGUID/App.config
@@ -2,6 +2,6 @@
-
+
diff --git a/dll/CNASBalanceDBManage.exe.config b/dll/CNASBalanceDBManage.exe.config
index b24213d..8b2fee3 100644
--- a/dll/CNASBalanceDBManage.exe.config
+++ b/dll/CNASBalanceDBManage.exe.config
@@ -5,7 +5,7 @@
-
+
diff --git a/dll/CNAS_BalanceClient.exe.config b/dll/CNAS_BalanceClient.exe.config
index 4c0c27d..2758824 100644
--- a/dll/CNAS_BalanceClient.exe.config
+++ b/dll/CNAS_BalanceClient.exe.config
@@ -5,7 +5,7 @@
-
+
diff --git a/dll/CNAS_DBSync.exe b/dll/CNAS_DBSync.exe
index 342ee0d6c4bb3b45d843ba813e5711026cbbd130..bb4474f08a4dbc0540298b72cc15a90a2f66ed1d 100644
GIT binary patch
delta 13697
zcmZ{r30zItAHdJ=zP!r%-fLBv_fjYog-A@6!C>sWY}p1A;t`sV6qB7Uo$PCN%7m9~
z$WpQ!X6)NAGmL#0gTep*JNKOX-YfWgc)s_yp7T5FeKjSm{FJov^V1v(v#b5LV78C6
zX5oU(-O9IJs3GkM{#m6V9h?^Ux|BVnA!U*G%Ni0v^L;hJa!;rR8|7q3@=Zo<_NOKO
zl}IUa-&-Q5T!65rDL}M4bA2Vt6v)oKGIfzwLTSfN4NuHp+t~)Rj+W)$3d9TbetJG
zOR{!u8_n0oDstDk5t;!;gFJt3ltXhu{~FfZzht=LN@Ef7*HnRRNA*m+@E
z8Kp)adCj~?O>NUw`PRG!nz87v()=&AiuHOqX1<%!Jrm~psoJaO*Y{>pqkl2SYgEVo
z%=gpOF}lm%3%Yu@kx;KyF}-oB-mC?FnrNe+yko%t%}`?}**!f%6NS+`riXI>t&7=B
zQ01C!SE%sxJJv6PeIdz&cSY$%7ZR(KItwm3J=Wo%nQNl=t?J+jUBH
z*m4nX*T_W!HO)*Px#WyJl1(t`x&*ys+MWuJvqKuT0g6*12V0SXJv+HhMG3Y`!X9S
zMR=1LrRipzBu6fe&~(6}#4ir}R55>1UF9$4#r$*eK&6;%m+)eyEeZQnF)yih7ni6h
zzymr2Fo{AhJ30#->a%sR#^k}
zUS;}%jZITn$@!e9YA;!3b$n!1Bo<*(`f6T-2CJhq-A(o6iK`nZwcNWp>Ql9xta@@;
z!)sZ84X@?OHQdkDHJ_ZAi&VQRYt;;L+pYa*Vop)jve)@Js&nwlI$pMbEMB&OS)VLh
zwraaSimG3
z%a*LF#%#0(q8m+oy84zZ+f-HimyK4(A2upwlN)T}{XK3|ltVXDHIVZ*MJk2+XVWJO
zH%;}`ZZj|3*v-6fS2uGikmfUCSN+g(}7
z4`fGaf{o$whity+)z1kvDw&vmEV^@ILa+v(}?`
z9>P$-W&DFvHF|p!MxX+%hJ6e%1Au9mp5IzFVs5S@>Ts#
z`>aE6#y(!(J^Og>|L*%-eUGTtE%x*J4&VRj`W{skukN>|r8$6Mj4^WU1AJi_dEm1Z
zDNxP#9`mQmCp2{$!2T=_g*0sXy^X9s0>y5ID#S((oXZoFJD~Pn{2aTo5L-
z79{;p8%=X#pnT^L-+X-XqcqJ;o8&(Ed{bGPAEi|`-8J&9e0~i6H{ZIp*Eo!aW;`Lq
z9*$5B&Fc?~t*iK9>xP=n{|>8*tQ>G8(i`_BVyseZF}kU$PCCMOxwS{SeQKk=rRupJ
zifc&6!tI$uI3MluHosNfSLriR0
zl_QSxDKX|ajy+~>!oy_o)iy)*aPWAT>fzP#5KSXfu3WW<52isyQMmfvl(PiiEeaLc
zBo)hMp6V<3gf*M4Crn=iuvYw9GV%;nTRy>O*PatyMV5F1ES}|DRk!*{YnJ^_;sUDl
zNta?-%v5z3pR{Ii_+*H_hOtI5y*bJP>UzpuIWL5qiqbSPM$02l@o}-~R6nejdoha#
zs%O(_Kkt$^TP9TMW$Y~XJ#F^J;}9`^QOy1i)&AjWKP}rPjb5_rndTY;-t2mxspn|I
z;{(A91U=KOVl?(yG2?XASbLV=+l^6j&9g?YZ}5s%{0=RvnnTax0*@ybVyq$0JsYoF
zPPOO!O0oNVCAr2qAFZxQWkTjt-$mfgZ}gdxeEzwJk9m&5uI2^GXIV3)!@MD<9y8}@jg7z)GI3NK@h9I!;E@BLFqiyEOawbxIGPh_
z2Op?pWInl|Wl#Wlw!LG2yQ)H2%#mN~$38t4mEU<+;U3(MdFedG(n;EttRW!Ma$
zv4B4`k-$j5stQ>UL?2XzeNfwyRSg;dG@y3^zy*3){t19yU>M?u@pOa)1zf;RCX#uP
zWk7Y9BtbsC9SrXH@oz9(g1hu=2-02pM+jVm_nh8aey#ypklg&~xe#yzH_Nk{&{$x}T
z7K=`c0AI+rY>0r`5@vEO5(+VswGHsYjm9>Frx0%G^(A}_(B85(3UDM1v&1!qG7_X%
z5}QKv(okT@Zv%nO;7cENg-9r%RlC7Z{~Z`0t}B0MG!ck{XIzX8Otsl-iM=$d8;tZg
zZ>Kp4HBC6nh|x%^cZYb7H+I6wOo)eFV)UfDyMqZT(o5YTB0Q*yEmS|$F-|u6jOm8a
z;=1#Y%0p9J4;z^~(q=tiylWpj(->wt+~`Bk_CViB^jQyx_LyO(fUn0KO!$Tb*J#?m
zC+cL=sXbw+b}dio8GCe=>Z75B7T-FsEc-;`qo;IoG<-#m^#T`qF&Yd|hW;6il`v9W
zFRZVTR_z6IJ=#{aHKMCspp(782xI8OUeMh`w$tgxbVO(L?2S4Wn$Q~pJc{gex-%W#
zo0h!ZkO)|#I(;EhDgZjFFSgFPnk{I8O_|>53lpFbjqV34HG{An@A_doM$k$z@Re4?
z{5A$3Rir<}U`rBcPK?r$f*6Q*U2ErbG&*JFpzZskdPh2{KlFi<^h|%qa(!&4H-_o4
zzW-qW>Lt;Q1F*UJ09$rrS$3jV-3Ox1Q(A8z)GFs|rxQ=}dw~a?GZ1HD8M=BP_C}bU
zc${4WZw~~sM}IrvcqSB08#W02TjV7E1SYsXuyZ*8T`K*fAByT7X|16+DD{E1b`N9<
ztYZ!^g(P}&DDPBwk=9gcYAJm*P!$Ks<+bW*Hs#22wgPw8K=V#K?Chc1j&
z)VasVT!wZTj$M1wE>NspV)Ag9=ke4|INUCa`XkW)7#ckSvk>Jv&K_ClgAwS{qq?o@
zM%sK@0!BhTR<4*h@Keh*BM!z?<35V57D;GlY@=q($Xt>7jY97|?YvL1d8Y$L;jmA!
z6DBhkY}h{>g}HU4Wk+Mxw%935MFnfs7?|3!syW~RkWLv5^TJQtDdXFJWegO{QhC@~
z&61Hhi8eFC&}w{^6jR27rGxQnRhg0bDZOA;SEax)%8dDP47TyPUEt}cs1BEjV<1KC
z@ls=z9Wb$C$^k5vMD2uA=Y!nz`t(?qUQHXD>{6SE}941TCu>+#k}t!zS;;oVLA$}
ztzckk!&=dqwZc2m)~)LjmHdt+qVqX+_6zNtJ4{saE1GCqb{rTZJjjnhLXBkJw4J
zG06lxQ8Z71(OUebfo;wEQ?RFA&>JbZc8P@~Fclw_p{-MGk22V!O4O1HK^`@0*c!GO
zU8+OoO)5+aFr_JOi_N-4EN-NlHzV_4x^@}_K|DP>O_?;mPlM_FWH5O;&cRJIeL6-u
zU>7OVF4D#6xX%1;CtS=Tuyv--51401I{60}>*`k1mgf?tz_t%<8Y(2wYH7G`ifwce
zd-Rm7sa=R4z&9IHv`!mpig*wkf{n2*%EA8}K&V+~BPFNX1-y$JPT6sqC$Jm!FA;!oi+yo@hF--2fV6R2t@;Y
zCt5n#LrTm;|8f2ZW*7Bw5V)6h3NBB~9`wZ=2rXR?1#7BQL|uA^LKy8k7v@4e%j3Dw
zR)dH22I(*yy3>v6P~DliUQ@-x>_V@lLseKwB^h;d=>i!~&9^LXW!&i99QQv-PakK%H<)#O3V}ZFS^Iv(468;g#c?4e9