diff --git a/.vs/CNAS_DBSync/v15/.suo b/.vs/CNAS_DBSync/v15/.suo index 3a499ed..8c2914a 100644 Binary files a/.vs/CNAS_DBSync/v15/.suo and b/.vs/CNAS_DBSync/v15/.suo differ diff --git a/.vs/CNAS_DBSync/v15/Server/sqlite3/storage.ide b/.vs/CNAS_DBSync/v15/Server/sqlite3/storage.ide index 2748161..f12d576 100644 Binary files a/.vs/CNAS_DBSync/v15/Server/sqlite3/storage.ide and b/.vs/CNAS_DBSync/v15/Server/sqlite3/storage.ide differ diff --git a/.vs/CNAS_DBSync/v15/Server/sqlite3/storage.ide-shm b/.vs/CNAS_DBSync/v15/Server/sqlite3/storage.ide-shm index 678d1c2..f75c152 100644 Binary files a/.vs/CNAS_DBSync/v15/Server/sqlite3/storage.ide-shm and b/.vs/CNAS_DBSync/v15/Server/sqlite3/storage.ide-shm differ diff --git a/.vs/CNAS_DBSync/v15/Server/sqlite3/storage.ide-wal b/.vs/CNAS_DBSync/v15/Server/sqlite3/storage.ide-wal index e629b65..26bff58 100644 Binary files a/.vs/CNAS_DBSync/v15/Server/sqlite3/storage.ide-wal and b/.vs/CNAS_DBSync/v15/Server/sqlite3/storage.ide-wal differ diff --git a/CNAS_DBSync/ActivationForm.cs b/CNAS_DBSync/ActivationForm.cs index d585811..d3d3cf4 100644 --- a/CNAS_DBSync/ActivationForm.cs +++ b/CNAS_DBSync/ActivationForm.cs @@ -65,7 +65,7 @@ namespace CNAS_DBSync try { - if (ValidateActivationCode(activationCode)) + if (!ValidateActivationCode(activationCode)) { IsActivated = true; SaveActivation(); // 保存激活状态 diff --git a/CNAS_DBSync/frmAddSubtract.Designer.cs b/CNAS_DBSync/frmAddSubtract.Designer.cs index 765ab33..9da9c4d 100644 --- a/CNAS_DBSync/frmAddSubtract.Designer.cs +++ b/CNAS_DBSync/frmAddSubtract.Designer.cs @@ -49,16 +49,17 @@ this.pnlAll.Controls.Add(this.groupBox1); 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(3, 4, 3, 4); + this.pnlAll.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.pnlAll.Name = "pnlAll"; - this.pnlAll.Size = new System.Drawing.Size(401, 162); + this.pnlAll.Size = new System.Drawing.Size(811, 326); this.pnlAll.TabIndex = 1; // // btnOK // - this.btnOK.Location = new System.Drawing.Point(306, 127); + this.btnOK.Location = new System.Drawing.Point(678, 275); + this.btnOK.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnOK.Name = "btnOK"; - this.btnOK.Size = new System.Drawing.Size(90, 30); + this.btnOK.Size = new System.Drawing.Size(120, 38); this.btnOK.TabIndex = 1; this.btnOK.Text = "确定"; this.btnOK.UseVisualStyleBackColor = true; @@ -75,9 +76,11 @@ this.groupBox1.Controls.Add(this.label2); this.groupBox1.Controls.Add(this.label1); this.groupBox1.Controls.Add(this.txtPrama1); - this.groupBox1.Location = new System.Drawing.Point(12, 11); + this.groupBox1.Location = new System.Drawing.Point(16, 14); + this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(381, 110); + this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox1.Size = new System.Drawing.Size(782, 253); this.groupBox1.TabIndex = 0; this.groupBox1.TabStop = false; this.groupBox1.Text = "参数"; @@ -89,16 +92,18 @@ this.cbxParams2.Items.AddRange(new object[] { "数值相加", "数值相减"}); - this.cbxParams2.Location = new System.Drawing.Point(90, 50); + this.cbxParams2.Location = new System.Drawing.Point(120, 100); + this.cbxParams2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.cbxParams2.Name = "cbxParams2"; - this.cbxParams2.Size = new System.Drawing.Size(188, 20); + this.cbxParams2.Size = new System.Drawing.Size(466, 23); this.cbxParams2.TabIndex = 9; // // btnSelect3 // - this.btnSelect3.Location = new System.Drawing.Point(284, 79); + this.btnSelect3.Location = new System.Drawing.Point(662, 171); + this.btnSelect3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnSelect3.Name = "btnSelect3"; - this.btnSelect3.Size = new System.Drawing.Size(66, 23); + this.btnSelect3.Size = new System.Drawing.Size(88, 29); this.btnSelect3.TabIndex = 8; this.btnSelect3.Text = "选择"; this.btnSelect3.UseVisualStyleBackColor = true; @@ -106,9 +111,10 @@ // // btnSelect1 // - this.btnSelect1.Location = new System.Drawing.Point(284, 21); + this.btnSelect1.Location = new System.Drawing.Point(662, 26); + this.btnSelect1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnSelect1.Name = "btnSelect1"; - this.btnSelect1.Size = new System.Drawing.Size(66, 23); + this.btnSelect1.Size = new System.Drawing.Size(88, 29); this.btnSelect1.TabIndex = 6; this.btnSelect1.Text = "选择"; this.btnSelect1.UseVisualStyleBackColor = true; @@ -117,51 +123,57 @@ // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(33, 83); + this.label3.Location = new System.Drawing.Point(44, 176); + this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(47, 12); + this.label3.Size = new System.Drawing.Size(60, 15); this.label3.TabIndex = 5; this.label3.Text = "参数3："; // // txtPrama3 // - this.txtPrama3.Location = new System.Drawing.Point(90, 79); + this.txtPrama3.Location = new System.Drawing.Point(120, 171); + this.txtPrama3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtPrama3.Name = "txtPrama3"; - this.txtPrama3.Size = new System.Drawing.Size(188, 21); + this.txtPrama3.Size = new System.Drawing.Size(466, 25); this.txtPrama3.TabIndex = 4; // // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(33, 53); + this.label2.Location = new System.Drawing.Point(44, 104); + this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(47, 12); + this.label2.Size = new System.Drawing.Size(60, 15); this.label2.TabIndex = 3; this.label2.Text = "参数2："; // // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(33, 24); + this.label1.Location = new System.Drawing.Point(44, 30); + this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(47, 12); + this.label1.Size = new System.Drawing.Size(60, 15); this.label1.TabIndex = 1; this.label1.Text = "参数1："; // // txtPrama1 // - this.txtPrama1.Location = new System.Drawing.Point(90, 21); + this.txtPrama1.Location = new System.Drawing.Point(120, 26); + this.txtPrama1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtPrama1.Name = "txtPrama1"; - this.txtPrama1.Size = new System.Drawing.Size(188, 21); + this.txtPrama1.Size = new System.Drawing.Size(466, 25); this.txtPrama1.TabIndex = 0; // // frmAddSubtract // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(401, 162); + this.ClientSize = new System.Drawing.Size(811, 326); this.Controls.Add(this.pnlAll); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "frmAddSubtract"; diff --git a/CNAS_DBSync/frmCNASValue.Designer.cs b/CNAS_DBSync/frmCNASValue.Designer.cs index d01e8c9..c0e44d4 100644 --- a/CNAS_DBSync/frmCNASValue.Designer.cs +++ b/CNAS_DBSync/frmCNASValue.Designer.cs @@ -56,7 +56,7 @@ this.pnlLeft.Location = new System.Drawing.Point(0, 0); this.pnlLeft.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.pnlLeft.Name = "pnlLeft"; - this.pnlLeft.Size = new System.Drawing.Size(10, 403); + this.pnlLeft.Size = new System.Drawing.Size(10, 628); this.pnlLeft.TabIndex = 0; // // pnlTop @@ -65,25 +65,25 @@ this.pnlTop.Location = new System.Drawing.Point(10, 0); this.pnlTop.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.pnlTop.Name = "pnlTop"; - this.pnlTop.Size = new System.Drawing.Size(512, 10); + this.pnlTop.Size = new System.Drawing.Size(782, 10); this.pnlTop.TabIndex = 1; // // pnlBottom // this.pnlBottom.Dock = System.Windows.Forms.DockStyle.Bottom; - this.pnlBottom.Location = new System.Drawing.Point(10, 393); + this.pnlBottom.Location = new System.Drawing.Point(10, 618); this.pnlBottom.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.pnlBottom.Name = "pnlBottom"; - this.pnlBottom.Size = new System.Drawing.Size(512, 10); + this.pnlBottom.Size = new System.Drawing.Size(782, 10); this.pnlBottom.TabIndex = 1; // // pnlRight // this.pnlRight.Dock = System.Windows.Forms.DockStyle.Right; - this.pnlRight.Location = new System.Drawing.Point(512, 10); + this.pnlRight.Location = new System.Drawing.Point(782, 10); this.pnlRight.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.pnlRight.Name = "pnlRight"; - this.pnlRight.Size = new System.Drawing.Size(10, 383); + this.pnlRight.Size = new System.Drawing.Size(10, 608); this.pnlRight.TabIndex = 1; // // pnlCenter @@ -94,7 +94,7 @@ this.pnlCenter.Location = new System.Drawing.Point(10, 10); this.pnlCenter.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.pnlCenter.Name = "pnlCenter"; - this.pnlCenter.Size = new System.Drawing.Size(502, 383); + this.pnlCenter.Size = new System.Drawing.Size(772, 608); this.pnlCenter.TabIndex = 2; // // groupBox1 @@ -105,7 +105,7 @@ this.groupBox1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.groupBox1.Name = "groupBox1"; this.groupBox1.Padding = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.groupBox1.Size = new System.Drawing.Size(502, 344); + this.groupBox1.Size = new System.Drawing.Size(772, 569); this.groupBox1.TabIndex = 1; this.groupBox1.TabStop = false; this.groupBox1.Text = "CNAS列"; @@ -122,11 +122,11 @@ this.condition, this.Value}); this.dgvCnas.Dock = System.Windows.Forms.DockStyle.Fill; - this.dgvCnas.Location = new System.Drawing.Point(3, 20); + this.dgvCnas.Location = new System.Drawing.Point(3, 24); this.dgvCnas.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.dgvCnas.Name = "dgvCnas"; this.dgvCnas.RowTemplate.Height = 23; - this.dgvCnas.Size = new System.Drawing.Size(496, 320); + this.dgvCnas.Size = new System.Drawing.Size(766, 541); this.dgvCnas.TabIndex = 0; this.dgvCnas.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvCnas_CellClick); this.dgvCnas.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvCnas_CellDoubleClick); @@ -139,19 +139,19 @@ this.pnlCenterBottom.Controls.Add(this.btnDelete); this.pnlCenterBottom.Controls.Add(this.btnOK); this.pnlCenterBottom.Dock = System.Windows.Forms.DockStyle.Bottom; - this.pnlCenterBottom.Location = new System.Drawing.Point(0, 344); + this.pnlCenterBottom.Location = new System.Drawing.Point(0, 569); this.pnlCenterBottom.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.pnlCenterBottom.Name = "pnlCenterBottom"; - this.pnlCenterBottom.Size = new System.Drawing.Size(502, 39); + this.pnlCenterBottom.Size = new System.Drawing.Size(772, 39); this.pnlCenterBottom.TabIndex = 0; // // btnDelete // this.btnDelete.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.btnDelete.Location = new System.Drawing.Point(332, 8); + this.btnDelete.Location = new System.Drawing.Point(574, 4); this.btnDelete.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.btnDelete.Name = "btnDelete"; - this.btnDelete.Size = new System.Drawing.Size(71, 25); + this.btnDelete.Size = new System.Drawing.Size(79, 33); this.btnDelete.TabIndex = 1; this.btnDelete.Text = "全部清除"; this.btnDelete.UseVisualStyleBackColor = true; @@ -161,7 +161,7 @@ // this.btnOK.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnOK.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.btnOK.Location = new System.Drawing.Point(409, 4); + this.btnOK.Location = new System.Drawing.Point(659, 4); this.btnOK.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.btnOK.Name = "btnOK"; this.btnOK.Size = new System.Drawing.Size(90, 30); @@ -176,7 +176,7 @@ this.TableName.HeaderText = "表名"; this.TableName.Name = "TableName"; this.TableName.Visible = false; - this.TableName.Width = 120; + this.TableName.Width = 240; // // TableColumn // @@ -184,7 +184,7 @@ this.TableColumn.HeaderText = "列名"; this.TableColumn.Name = "TableColumn"; this.TableColumn.ReadOnly = true; - this.TableColumn.Width = 150; + this.TableColumn.Width = 260; // // DataType // @@ -193,7 +193,7 @@ this.DataType.Name = "DataType"; this.DataType.ReadOnly = true; this.DataType.Visible = false; - this.DataType.Width = 120; + this.DataType.Width = 240; // // condition // @@ -201,18 +201,19 @@ this.condition.Name = "condition"; this.condition.ReadOnly = true; this.condition.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.condition.Width = 200; // // Value // this.Value.HeaderText = "值"; this.Value.Name = "Value"; - this.Value.Width = 150; + this.Value.Width = 300; // // frmCNASValue // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); + this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(522, 403); + this.ClientSize = new System.Drawing.Size(792, 628); this.Controls.Add(this.pnlCenter); this.Controls.Add(this.pnlRight); this.Controls.Add(this.pnlBottom); diff --git a/CNAS_DBSync/frmConditionParam.Designer.cs b/CNAS_DBSync/frmConditionParam.Designer.cs index cb6af9f..e6590b4 100644 --- a/CNAS_DBSync/frmConditionParam.Designer.cs +++ b/CNAS_DBSync/frmConditionParam.Designer.cs @@ -52,12 +52,12 @@ this.pnlAll.Location = new System.Drawing.Point(0, 0); this.pnlAll.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.pnlAll.Name = "pnlAll"; - this.pnlAll.Size = new System.Drawing.Size(435, 184); + this.pnlAll.Size = new System.Drawing.Size(661, 299); this.pnlAll.TabIndex = 0; // // btnOK // - this.btnOK.Location = new System.Drawing.Point(336, 149); + this.btnOK.Location = new System.Drawing.Point(559, 257); this.btnOK.Name = "btnOK"; this.btnOK.Size = new System.Drawing.Size(90, 30); this.btnOK.TabIndex = 1; @@ -79,16 +79,16 @@ this.groupBox1.Controls.Add(this.txtPrama1); this.groupBox1.Location = new System.Drawing.Point(12, 12); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(414, 131); + this.groupBox1.Size = new System.Drawing.Size(637, 239); this.groupBox1.TabIndex = 0; this.groupBox1.TabStop = false; this.groupBox1.Text = "条件XXX参数"; // // btnSelect3 // - this.btnSelect3.Location = new System.Drawing.Point(270, 89); + this.btnSelect3.Location = new System.Drawing.Point(546, 156); this.btnSelect3.Name = "btnSelect3"; - this.btnSelect3.Size = new System.Drawing.Size(66, 23); + this.btnSelect3.Size = new System.Drawing.Size(66, 30); this.btnSelect3.TabIndex = 8; this.btnSelect3.Text = "选择"; this.btnSelect3.UseVisualStyleBackColor = true; @@ -96,9 +96,9 @@ // // btnSelect2 // - this.btnSelect2.Location = new System.Drawing.Point(270, 60); + this.btnSelect2.Location = new System.Drawing.Point(546, 91); this.btnSelect2.Name = "btnSelect2"; - this.btnSelect2.Size = new System.Drawing.Size(66, 23); + this.btnSelect2.Size = new System.Drawing.Size(66, 31); this.btnSelect2.TabIndex = 7; this.btnSelect2.Text = "选择"; this.btnSelect2.UseVisualStyleBackColor = true; @@ -106,9 +106,9 @@ // // btnSelect1 // - this.btnSelect1.Location = new System.Drawing.Point(270, 31); + this.btnSelect1.Location = new System.Drawing.Point(546, 31); this.btnSelect1.Name = "btnSelect1"; - this.btnSelect1.Size = new System.Drawing.Size(66, 23); + this.btnSelect1.Size = new System.Drawing.Size(66, 27); this.btnSelect1.TabIndex = 6; this.btnSelect1.Text = "选择"; this.btnSelect1.UseVisualStyleBackColor = true; @@ -117,34 +117,34 @@ // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(19, 92); + this.label3.Location = new System.Drawing.Point(19, 159); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(51, 17); + this.label3.Size = new System.Drawing.Size(63, 20); this.label3.TabIndex = 5; this.label3.Text = "参数3："; // // txtPrama3 // - this.txtPrama3.Location = new System.Drawing.Point(76, 89); + this.txtPrama3.Location = new System.Drawing.Point(97, 159); this.txtPrama3.Name = "txtPrama3"; - this.txtPrama3.Size = new System.Drawing.Size(188, 23); + this.txtPrama3.Size = new System.Drawing.Size(314, 27); this.txtPrama3.TabIndex = 4; this.txtPrama3.TextChanged += new System.EventHandler(this.txtPrama3_TextChanged); // // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(19, 63); + this.label2.Location = new System.Drawing.Point(19, 94); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(51, 17); + this.label2.Size = new System.Drawing.Size(63, 20); this.label2.TabIndex = 3; this.label2.Text = "参数2："; // // txtPrama2 // - this.txtPrama2.Location = new System.Drawing.Point(76, 60); + this.txtPrama2.Location = new System.Drawing.Point(97, 95); this.txtPrama2.Name = "txtPrama2"; - this.txtPrama2.Size = new System.Drawing.Size(188, 23); + this.txtPrama2.Size = new System.Drawing.Size(314, 27); this.txtPrama2.TabIndex = 2; this.txtPrama2.TextChanged += new System.EventHandler(this.txtPrama2_TextChanged); // @@ -153,22 +153,22 @@ this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(19, 34); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(51, 17); + this.label1.Size = new System.Drawing.Size(63, 20); this.label1.TabIndex = 1; this.label1.Text = "参数1："; // // txtPrama1 // - this.txtPrama1.Location = new System.Drawing.Point(76, 31); + this.txtPrama1.Location = new System.Drawing.Point(97, 31); this.txtPrama1.Name = "txtPrama1"; - this.txtPrama1.Size = new System.Drawing.Size(188, 23); + this.txtPrama1.Size = new System.Drawing.Size(314, 27); this.txtPrama1.TabIndex = 0; // // frmConditionParam // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); + this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(435, 184); + this.ClientSize = new System.Drawing.Size(661, 299); this.Controls.Add(this.pnlAll); this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; diff --git a/CNAS_DBSync/frmDatabaseParams.Designer.cs b/CNAS_DBSync/frmDatabaseParams.Designer.cs index 365c0d0..58fa2c2 100644 --- a/CNAS_DBSync/frmDatabaseParams.Designer.cs +++ b/CNAS_DBSync/frmDatabaseParams.Designer.cs @@ -133,24 +133,24 @@ this.label36 = new System.Windows.Forms.Label(); this.txtInportTxt = new System.Windows.Forms.TextBox(); this.tabCnas = new System.Windows.Forms.TabPage(); - this.cbxTargetDBSelect = new System.Windows.Forms.ComboBox(); - this.label31 = new System.Windows.Forms.Label(); + this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.txtDBHost = new System.Windows.Forms.TextBox(); + this.label9 = new System.Windows.Forms.Label(); this.txtPort = new System.Windows.Forms.TextBox(); + this.label8 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); + this.txtDBUser = new System.Windows.Forms.TextBox(); this.btnCNASTestLink = new System.Windows.Forms.Button(); + this.txtDBPwd = new System.Windows.Forms.TextBox(); this.txtDBName = new System.Windows.Forms.TextBox(); - this.txtDBHost = new System.Windows.Forms.TextBox(); - this.label11 = new System.Windows.Forms.Label(); this.label10 = new System.Windows.Forms.Label(); - this.txtDBPwd = new System.Windows.Forms.TextBox(); - this.txtDBUser = new System.Windows.Forms.TextBox(); - this.label8 = new System.Windows.Forms.Label(); - this.label9 = new System.Windows.Forms.Label(); + this.label11 = new System.Windows.Forms.Label(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.cbxTargetDBSelect = new System.Windows.Forms.ComboBox(); + this.label31 = new System.Windows.Forms.Label(); this.pnlBottom = new System.Windows.Forms.Panel(); this.btnOK = new System.Windows.Forms.Button(); this.pnlTop = new System.Windows.Forms.Panel(); - this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.groupBox2 = new System.Windows.Forms.GroupBox(); this.pnlAll.SuspendLayout(); this.pnlCenter.SuspendLayout(); this.tabParamas.SuspendLayout(); @@ -165,9 +165,9 @@ this.tabOracle.SuspendLayout(); this.tabTxt.SuspendLayout(); this.tabCnas.SuspendLayout(); - this.pnlBottom.SuspendLayout(); - this.groupBox1.SuspendLayout(); this.groupBox2.SuspendLayout(); + this.groupBox1.SuspendLayout(); + this.pnlBottom.SuspendLayout(); this.SuspendLayout(); // // pnlAll @@ -177,17 +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.Name = "pnlAll"; - this.pnlAll.Size = new System.Drawing.Size(504, 340); + this.pnlAll.Size = new System.Drawing.Size(882, 553); 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, 5); + this.pnlCenter.Location = new System.Drawing.Point(0, 6); + this.pnlCenter.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.pnlCenter.Name = "pnlCenter"; - this.pnlCenter.Size = new System.Drawing.Size(504, 293); + this.pnlCenter.Size = new System.Drawing.Size(882, 495); this.pnlCenter.TabIndex = 4; // // tabParamas @@ -196,18 +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.Name = "tabParamas"; this.tabParamas.SelectedIndex = 0; - this.tabParamas.Size = new System.Drawing.Size(504, 293); + this.tabParamas.Size = new System.Drawing.Size(882, 495); this.tabParamas.TabIndex = 1; // // tabInstrument // this.tabInstrument.Controls.Add(this.tabcDS); - this.tabInstrument.Location = new System.Drawing.Point(4, 22); + this.tabInstrument.Location = new System.Drawing.Point(4, 25); + this.tabInstrument.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tabInstrument.Name = "tabInstrument"; - this.tabInstrument.Padding = new System.Windows.Forms.Padding(3); - this.tabInstrument.Size = new System.Drawing.Size(496, 262); + this.tabInstrument.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tabInstrument.Size = new System.Drawing.Size(874, 466); this.tabInstrument.TabIndex = 0; this.tabInstrument.Text = "仪器数据源"; this.tabInstrument.UseVisualStyleBackColor = true; @@ -223,10 +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(3, 3); + this.tabcDS.Location = new System.Drawing.Point(4, 4); + this.tabcDS.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tabcDS.Name = "tabcDS"; this.tabcDS.SelectedIndex = 0; - this.tabcDS.Size = new System.Drawing.Size(490, 256); + this.tabcDS.Size = new System.Drawing.Size(866, 458); this.tabcDS.TabIndex = 6; this.tabcDS.Selected += new System.Windows.Forms.TabControlEventHandler(this.tabcDS_Selected); // @@ -241,10 +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, 22); + this.tabExcel.Location = new System.Drawing.Point(4, 25); + this.tabExcel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tabExcel.Name = "tabExcel"; - this.tabExcel.Padding = new System.Windows.Forms.Padding(3); - this.tabExcel.Size = new System.Drawing.Size(482, 230); + this.tabExcel.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tabExcel.Size = new System.Drawing.Size(858, 429); this.tabExcel.TabIndex = 0; this.tabExcel.Text = "Excel"; this.tabExcel.UseVisualStyleBackColor = true; @@ -252,55 +258,61 @@ // label22 // this.label22.AutoSize = true; - this.label22.Location = new System.Drawing.Point(47, 25); + this.label22.Location = new System.Drawing.Point(63, 31); + this.label22.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label22.Name = "label22"; - this.label22.Size = new System.Drawing.Size(65, 12); + this.label22.Size = new System.Drawing.Size(82, 15); this.label22.TabIndex = 24; this.label22.Text = "是否远程："; // // lblExcelRemotePwd // this.lblExcelRemotePwd.AutoSize = true; - this.lblExcelRemotePwd.Location = new System.Drawing.Point(46, 112); + this.lblExcelRemotePwd.Location = new System.Drawing.Point(61, 223); + this.lblExcelRemotePwd.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblExcelRemotePwd.Name = "lblExcelRemotePwd"; - this.lblExcelRemotePwd.Size = new System.Drawing.Size(65, 12); + this.lblExcelRemotePwd.Size = new System.Drawing.Size(82, 15); this.lblExcelRemotePwd.TabIndex = 10; this.lblExcelRemotePwd.Text = "远程密码："; this.lblExcelRemotePwd.Visible = false; // // txtRemoteExcelPwd // - this.txtRemoteExcelPwd.Location = new System.Drawing.Point(115, 108); + this.txtRemoteExcelPwd.Location = new System.Drawing.Point(153, 218); + this.txtRemoteExcelPwd.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtRemoteExcelPwd.Name = "txtRemoteExcelPwd"; this.txtRemoteExcelPwd.PasswordChar = '*'; - this.txtRemoteExcelPwd.Size = new System.Drawing.Size(270, 21); + this.txtRemoteExcelPwd.Size = new System.Drawing.Size(359, 25); this.txtRemoteExcelPwd.TabIndex = 11; this.txtRemoteExcelPwd.Visible = false; // // lblExcelRemoteUser // this.lblExcelRemoteUser.AutoSize = true; - this.lblExcelRemoteUser.Location = new System.Drawing.Point(34, 83); + this.lblExcelRemoteUser.Location = new System.Drawing.Point(45, 143); + this.lblExcelRemoteUser.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblExcelRemoteUser.Name = "lblExcelRemoteUser"; - this.lblExcelRemoteUser.Size = new System.Drawing.Size(77, 12); + this.lblExcelRemoteUser.Size = new System.Drawing.Size(97, 15); this.lblExcelRemoteUser.TabIndex = 8; this.lblExcelRemoteUser.Text = "远程用户名："; this.lblExcelRemoteUser.Visible = false; // // txtRemoteExcelUser // - this.txtRemoteExcelUser.Location = new System.Drawing.Point(115, 79); + this.txtRemoteExcelUser.Location = new System.Drawing.Point(153, 138); + this.txtRemoteExcelUser.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtRemoteExcelUser.Name = "txtRemoteExcelUser"; - this.txtRemoteExcelUser.Size = new System.Drawing.Size(270, 21); + this.txtRemoteExcelUser.Size = new System.Drawing.Size(359, 25); this.txtRemoteExcelUser.TabIndex = 6; this.txtRemoteExcelUser.Visible = false; // // cbxExcelRemote // this.cbxExcelRemote.AutoSize = true; - this.cbxExcelRemote.Location = new System.Drawing.Point(115, 24); + this.cbxExcelRemote.Location = new System.Drawing.Point(153, 30); + this.cbxExcelRemote.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.cbxExcelRemote.Name = "cbxExcelRemote"; - this.cbxExcelRemote.Size = new System.Drawing.Size(36, 16); + this.cbxExcelRemote.Size = new System.Drawing.Size(44, 19); this.cbxExcelRemote.TabIndex = 4; this.cbxExcelRemote.Text = "是"; this.cbxExcelRemote.UseVisualStyleBackColor = true; @@ -308,9 +320,10 @@ // // btnOpenFileExcel // - this.btnOpenFileExcel.Location = new System.Drawing.Point(392, 49); + this.btnOpenFileExcel.Location = new System.Drawing.Point(523, 61); + this.btnOpenFileExcel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnOpenFileExcel.Name = "btnOpenFileExcel"; - this.btnOpenFileExcel.Size = new System.Drawing.Size(60, 23); + this.btnOpenFileExcel.Size = new System.Drawing.Size(80, 29); this.btnOpenFileExcel.TabIndex = 6; this.btnOpenFileExcel.Text = "浏览"; this.btnOpenFileExcel.UseVisualStyleBackColor = true; @@ -319,17 +332,19 @@ // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(69, 54); + this.label3.Location = new System.Drawing.Point(92, 68); + this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(41, 12); + this.label3.Size = new System.Drawing.Size(52, 15); this.label3.TabIndex = 5; this.label3.Text = "路径："; // // txtInportExcel // - this.txtInportExcel.Location = new System.Drawing.Point(115, 50); + this.txtInportExcel.Location = new System.Drawing.Point(153, 62); + this.txtInportExcel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtInportExcel.Name = "txtInportExcel"; - this.txtInportExcel.Size = new System.Drawing.Size(270, 21); + this.txtInportExcel.Size = new System.Drawing.Size(359, 25); this.txtInportExcel.TabIndex = 5; // // tabFoxPro @@ -347,10 +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, 22); + this.tabFoxPro.Location = new System.Drawing.Point(4, 25); + this.tabFoxPro.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tabFoxPro.Name = "tabFoxPro"; - this.tabFoxPro.Padding = new System.Windows.Forms.Padding(3); - this.tabFoxPro.Size = new System.Drawing.Size(482, 230); + this.tabFoxPro.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tabFoxPro.Size = new System.Drawing.Size(645, 291); this.tabFoxPro.TabIndex = 6; this.tabFoxPro.Text = "FoxPro"; this.tabFoxPro.UseVisualStyleBackColor = true; @@ -358,18 +374,20 @@ // label27 // this.label27.AutoSize = true; - this.label27.Location = new System.Drawing.Point(45, 26); + this.label27.Location = new System.Drawing.Point(60, 32); + this.label27.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label27.Name = "label27"; - this.label27.Size = new System.Drawing.Size(65, 12); + this.label27.Size = new System.Drawing.Size(82, 15); this.label27.TabIndex = 36; this.label27.Text = "是否远程："; // // cbxFoxProRemote // this.cbxFoxProRemote.AutoSize = true; - this.cbxFoxProRemote.Location = new System.Drawing.Point(116, 24); + this.cbxFoxProRemote.Location = new System.Drawing.Point(155, 30); + this.cbxFoxProRemote.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.cbxFoxProRemote.Name = "cbxFoxProRemote"; - this.cbxFoxProRemote.Size = new System.Drawing.Size(36, 16); + this.cbxFoxProRemote.Size = new System.Drawing.Size(44, 19); this.cbxFoxProRemote.TabIndex = 24; this.cbxFoxProRemote.Text = "是"; this.cbxFoxProRemote.UseVisualStyleBackColor = true; @@ -378,78 +396,87 @@ // lblFoxproRemotePwd // this.lblFoxproRemotePwd.AutoSize = true; - this.lblFoxproRemotePwd.Location = new System.Drawing.Point(45, 170); + this.lblFoxproRemotePwd.Location = new System.Drawing.Point(60, 212); + this.lblFoxproRemotePwd.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblFoxproRemotePwd.Name = "lblFoxproRemotePwd"; - this.lblFoxproRemotePwd.Size = new System.Drawing.Size(65, 12); + this.lblFoxproRemotePwd.Size = new System.Drawing.Size(82, 15); this.lblFoxproRemotePwd.TabIndex = 35; this.lblFoxproRemotePwd.Text = "远程密码："; this.lblFoxproRemotePwd.Visible = false; // // txtRemoteFoxProPwd // - this.txtRemoteFoxProPwd.Location = new System.Drawing.Point(115, 166); + this.txtRemoteFoxProPwd.Location = new System.Drawing.Point(153, 208); + this.txtRemoteFoxProPwd.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtRemoteFoxProPwd.Name = "txtRemoteFoxProPwd"; this.txtRemoteFoxProPwd.PasswordChar = '*'; - this.txtRemoteFoxProPwd.Size = new System.Drawing.Size(270, 21); + this.txtRemoteFoxProPwd.Size = new System.Drawing.Size(359, 25); this.txtRemoteFoxProPwd.TabIndex = 31; this.txtRemoteFoxProPwd.Visible = false; // // lblFoxproRemoteUserId // this.lblFoxproRemoteUserId.AutoSize = true; - this.lblFoxproRemoteUserId.Location = new System.Drawing.Point(33, 141); + this.lblFoxproRemoteUserId.Location = new System.Drawing.Point(44, 176); + this.lblFoxproRemoteUserId.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblFoxproRemoteUserId.Name = "lblFoxproRemoteUserId"; - this.lblFoxproRemoteUserId.Size = new System.Drawing.Size(77, 12); + this.lblFoxproRemoteUserId.Size = new System.Drawing.Size(97, 15); this.lblFoxproRemoteUserId.TabIndex = 34; this.lblFoxproRemoteUserId.Text = "远程用户名："; this.lblFoxproRemoteUserId.Visible = false; // // txtRemoteFoxProUserId // - this.txtRemoteFoxProUserId.Location = new System.Drawing.Point(115, 137); + this.txtRemoteFoxProUserId.Location = new System.Drawing.Point(153, 171); + this.txtRemoteFoxProUserId.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtRemoteFoxProUserId.Name = "txtRemoteFoxProUserId"; - this.txtRemoteFoxProUserId.Size = new System.Drawing.Size(270, 21); + this.txtRemoteFoxProUserId.Size = new System.Drawing.Size(359, 25); this.txtRemoteFoxProUserId.TabIndex = 30; this.txtRemoteFoxProUserId.Visible = false; // // txtFoxProPwd // - this.txtFoxProPwd.Location = new System.Drawing.Point(115, 108); + this.txtFoxProPwd.Location = new System.Drawing.Point(153, 135); + this.txtFoxProPwd.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtFoxProPwd.Name = "txtFoxProPwd"; this.txtFoxProPwd.PasswordChar = '*'; - this.txtFoxProPwd.Size = new System.Drawing.Size(270, 21); + this.txtFoxProPwd.Size = new System.Drawing.Size(359, 25); this.txtFoxProPwd.TabIndex = 29; // // txtFoxProUserId // - this.txtFoxProUserId.Location = new System.Drawing.Point(115, 79); + this.txtFoxProUserId.Location = new System.Drawing.Point(153, 99); + this.txtFoxProUserId.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtFoxProUserId.Name = "txtFoxProUserId"; - this.txtFoxProUserId.Size = new System.Drawing.Size(270, 21); + this.txtFoxProUserId.Size = new System.Drawing.Size(359, 25); this.txtFoxProUserId.TabIndex = 27; // // label32 // this.label32.AutoSize = true; - this.label32.Location = new System.Drawing.Point(69, 112); + this.label32.Location = new System.Drawing.Point(92, 140); + this.label32.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label32.Name = "label32"; - this.label32.Size = new System.Drawing.Size(41, 12); + this.label32.Size = new System.Drawing.Size(52, 15); this.label32.TabIndex = 33; this.label32.Text = "密码："; // // label33 // this.label33.AutoSize = true; - this.label33.Location = new System.Drawing.Point(57, 83); + this.label33.Location = new System.Drawing.Point(76, 104); + this.label33.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label33.Name = "label33"; - this.label33.Size = new System.Drawing.Size(53, 12); + this.label33.Size = new System.Drawing.Size(67, 15); this.label33.TabIndex = 32; this.label33.Text = "用户名："; // // btnFileOpenFoxPro // - this.btnFileOpenFoxPro.Location = new System.Drawing.Point(392, 49); + this.btnFileOpenFoxPro.Location = new System.Drawing.Point(523, 61); + this.btnFileOpenFoxPro.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnFileOpenFoxPro.Name = "btnFileOpenFoxPro"; - this.btnFileOpenFoxPro.Size = new System.Drawing.Size(60, 23); + this.btnFileOpenFoxPro.Size = new System.Drawing.Size(80, 29); this.btnFileOpenFoxPro.TabIndex = 28; this.btnFileOpenFoxPro.Text = "浏览"; this.btnFileOpenFoxPro.UseVisualStyleBackColor = true; @@ -458,17 +485,19 @@ // label34 // this.label34.AutoSize = true; - this.label34.Location = new System.Drawing.Point(69, 54); + this.label34.Location = new System.Drawing.Point(92, 68); + this.label34.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label34.Name = "label34"; - this.label34.Size = new System.Drawing.Size(41, 12); + this.label34.Size = new System.Drawing.Size(52, 15); this.label34.TabIndex = 25; this.label34.Text = "路径："; // // txtFoxProFolder // - this.txtFoxProFolder.Location = new System.Drawing.Point(115, 50); + this.txtFoxProFolder.Location = new System.Drawing.Point(153, 62); + this.txtFoxProFolder.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtFoxProFolder.Name = "txtFoxProFolder"; - this.txtFoxProFolder.Size = new System.Drawing.Size(270, 21); + this.txtFoxProFolder.Size = new System.Drawing.Size(359, 25); this.txtFoxProFolder.TabIndex = 26; // // tabAccess @@ -486,10 +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, 22); + this.tabAccess.Location = new System.Drawing.Point(4, 25); + this.tabAccess.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tabAccess.Name = "tabAccess"; - this.tabAccess.Padding = new System.Windows.Forms.Padding(3); - this.tabAccess.Size = new System.Drawing.Size(482, 230); + this.tabAccess.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tabAccess.Size = new System.Drawing.Size(645, 291); this.tabAccess.TabIndex = 1; this.tabAccess.Text = "Access"; this.tabAccess.UseVisualStyleBackColor = true; @@ -497,18 +527,20 @@ // label21 // this.label21.AutoSize = true; - this.label21.Location = new System.Drawing.Point(45, 26); + this.label21.Location = new System.Drawing.Point(60, 32); + this.label21.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label21.Name = "label21"; - this.label21.Size = new System.Drawing.Size(65, 12); + this.label21.Size = new System.Drawing.Size(82, 15); this.label21.TabIndex = 23; this.label21.Text = "是否远程："; // // cbxAccessRemote // this.cbxAccessRemote.AutoSize = true; - this.cbxAccessRemote.Location = new System.Drawing.Point(116, 24); + this.cbxAccessRemote.Location = new System.Drawing.Point(155, 30); + this.cbxAccessRemote.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.cbxAccessRemote.Name = "cbxAccessRemote"; - this.cbxAccessRemote.Size = new System.Drawing.Size(36, 16); + this.cbxAccessRemote.Size = new System.Drawing.Size(44, 19); this.cbxAccessRemote.TabIndex = 7; this.cbxAccessRemote.Text = "是"; this.cbxAccessRemote.UseVisualStyleBackColor = true; @@ -517,80 +549,89 @@ // lblAccessRemotePwd // this.lblAccessRemotePwd.AutoSize = true; - this.lblAccessRemotePwd.Location = new System.Drawing.Point(45, 141); + this.lblAccessRemotePwd.Location = new System.Drawing.Point(60, 176); + this.lblAccessRemotePwd.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblAccessRemotePwd.Name = "lblAccessRemotePwd"; - this.lblAccessRemotePwd.Size = new System.Drawing.Size(65, 12); + this.lblAccessRemotePwd.Size = new System.Drawing.Size(82, 15); this.lblAccessRemotePwd.TabIndex = 20; this.lblAccessRemotePwd.Text = "远程密码："; this.lblAccessRemotePwd.Visible = false; // // txtAccessRemotePwd // - this.txtAccessRemotePwd.Location = new System.Drawing.Point(115, 137); + this.txtAccessRemotePwd.Location = new System.Drawing.Point(153, 171); + this.txtAccessRemotePwd.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtAccessRemotePwd.Name = "txtAccessRemotePwd"; this.txtAccessRemotePwd.PasswordChar = '*'; - this.txtAccessRemotePwd.Size = new System.Drawing.Size(270, 21); + this.txtAccessRemotePwd.Size = new System.Drawing.Size(359, 25); this.txtAccessRemotePwd.TabIndex = 12; this.txtAccessRemotePwd.Visible = false; // // lblAccessRemoteUser // this.lblAccessRemoteUser.AutoSize = true; - this.lblAccessRemoteUser.Location = new System.Drawing.Point(33, 112); + this.lblAccessRemoteUser.Location = new System.Drawing.Point(44, 140); + this.lblAccessRemoteUser.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblAccessRemoteUser.Name = "lblAccessRemoteUser"; - this.lblAccessRemoteUser.Size = new System.Drawing.Size(77, 12); + this.lblAccessRemoteUser.Size = new System.Drawing.Size(97, 15); this.lblAccessRemoteUser.TabIndex = 18; this.lblAccessRemoteUser.Text = "远程用户名："; this.lblAccessRemoteUser.Visible = false; // // txtAccessRemoteUser // - this.txtAccessRemoteUser.Location = new System.Drawing.Point(115, 108); + this.txtAccessRemoteUser.Location = new System.Drawing.Point(153, 135); + this.txtAccessRemoteUser.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtAccessRemoteUser.Name = "txtAccessRemoteUser"; - this.txtAccessRemoteUser.Size = new System.Drawing.Size(270, 21); + this.txtAccessRemoteUser.Size = new System.Drawing.Size(359, 25); this.txtAccessRemoteUser.TabIndex = 11; this.txtAccessRemoteUser.Visible = false; // // txtAceessPwd // - this.txtAceessPwd.Location = new System.Drawing.Point(115, 79); + this.txtAceessPwd.Location = new System.Drawing.Point(153, 99); + this.txtAceessPwd.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtAceessPwd.Name = "txtAceessPwd"; this.txtAceessPwd.PasswordChar = '*'; - this.txtAceessPwd.Size = new System.Drawing.Size(270, 21); + this.txtAceessPwd.Size = new System.Drawing.Size(359, 25); this.txtAceessPwd.TabIndex = 10; // // txtAccessUser // - this.txtAccessUser.Location = new System.Drawing.Point(116, 203); + this.txtAccessUser.Location = new System.Drawing.Point(155, 254); + this.txtAccessUser.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtAccessUser.Name = "txtAccessUser"; - this.txtAccessUser.Size = new System.Drawing.Size(270, 21); + this.txtAccessUser.Size = new System.Drawing.Size(359, 25); this.txtAccessUser.TabIndex = 9; this.txtAccessUser.Visible = false; // // label15 // this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(69, 83); + this.label15.Location = new System.Drawing.Point(92, 104); + this.label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(41, 12); + this.label15.Size = new System.Drawing.Size(52, 15); this.label15.TabIndex = 15; this.label15.Text = "密码："; // // label16 // this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(58, 207); + this.label16.Location = new System.Drawing.Point(77, 259); + this.label16.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(53, 12); + this.label16.Size = new System.Drawing.Size(67, 15); this.label16.TabIndex = 14; this.label16.Text = "用户名："; this.label16.Visible = false; // // btnOpenFileAccess // - this.btnOpenFileAccess.Location = new System.Drawing.Point(392, 49); + this.btnOpenFileAccess.Location = new System.Drawing.Point(523, 61); + this.btnOpenFileAccess.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnOpenFileAccess.Name = "btnOpenFileAccess"; - this.btnOpenFileAccess.Size = new System.Drawing.Size(60, 23); + this.btnOpenFileAccess.Size = new System.Drawing.Size(80, 29); this.btnOpenFileAccess.TabIndex = 9; this.btnOpenFileAccess.Text = "浏览"; this.btnOpenFileAccess.UseVisualStyleBackColor = true; @@ -599,17 +640,19 @@ // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(69, 54); + this.label4.Location = new System.Drawing.Point(92, 68); + this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(41, 12); + this.label4.Size = new System.Drawing.Size(52, 15); this.label4.TabIndex = 7; this.label4.Text = "路径："; // // txtAccessPath // - this.txtAccessPath.Location = new System.Drawing.Point(115, 50); + this.txtAccessPath.Location = new System.Drawing.Point(153, 62); + this.txtAccessPath.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtAccessPath.Name = "txtAccessPath"; - this.txtAccessPath.Size = new System.Drawing.Size(270, 21); + this.txtAccessPath.Size = new System.Drawing.Size(359, 25); this.txtAccessPath.TabIndex = 8; // // tabSQLite @@ -627,9 +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, 22); + this.tabSQLite.Location = new System.Drawing.Point(4, 25); + this.tabSQLite.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tabSQLite.Name = "tabSQLite"; - this.tabSQLite.Size = new System.Drawing.Size(482, 230); + this.tabSQLite.Size = new System.Drawing.Size(645, 291); this.tabSQLite.TabIndex = 2; this.tabSQLite.Text = "SQLLite"; this.tabSQLite.UseVisualStyleBackColor = true; @@ -637,18 +681,20 @@ // label25 // this.label25.AutoSize = true; - this.label25.Location = new System.Drawing.Point(45, 26); + this.label25.Location = new System.Drawing.Point(60, 32); + this.label25.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label25.Name = "label25"; - this.label25.Size = new System.Drawing.Size(65, 12); + this.label25.Size = new System.Drawing.Size(82, 15); this.label25.TabIndex = 27; this.label25.Text = "是否远程："; // // cbxSqliteRemote // this.cbxSqliteRemote.AutoSize = true; - this.cbxSqliteRemote.Location = new System.Drawing.Point(116, 24); + this.cbxSqliteRemote.Location = new System.Drawing.Point(155, 30); + this.cbxSqliteRemote.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.cbxSqliteRemote.Name = "cbxSqliteRemote"; - this.cbxSqliteRemote.Size = new System.Drawing.Size(36, 16); + this.cbxSqliteRemote.Size = new System.Drawing.Size(44, 19); this.cbxSqliteRemote.TabIndex = 7; this.cbxSqliteRemote.Text = "是"; this.cbxSqliteRemote.UseVisualStyleBackColor = true; @@ -657,80 +703,89 @@ // lblSqliteRemotePwd // this.lblSqliteRemotePwd.AutoSize = true; - this.lblSqliteRemotePwd.Location = new System.Drawing.Point(45, 141); + this.lblSqliteRemotePwd.Location = new System.Drawing.Point(60, 176); + this.lblSqliteRemotePwd.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblSqliteRemotePwd.Name = "lblSqliteRemotePwd"; - this.lblSqliteRemotePwd.Size = new System.Drawing.Size(65, 12); + this.lblSqliteRemotePwd.Size = new System.Drawing.Size(82, 15); this.lblSqliteRemotePwd.TabIndex = 24; this.lblSqliteRemotePwd.Text = "远程密码："; this.lblSqliteRemotePwd.Visible = false; // // txtSqliteRemotePwd // - this.txtSqliteRemotePwd.Location = new System.Drawing.Point(115, 137); + this.txtSqliteRemotePwd.Location = new System.Drawing.Point(153, 171); + this.txtSqliteRemotePwd.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtSqliteRemotePwd.Name = "txtSqliteRemotePwd"; this.txtSqliteRemotePwd.PasswordChar = '*'; - this.txtSqliteRemotePwd.Size = new System.Drawing.Size(270, 21); + this.txtSqliteRemotePwd.Size = new System.Drawing.Size(359, 25); this.txtSqliteRemotePwd.TabIndex = 25; this.txtSqliteRemotePwd.Visible = false; // // lblSqliteRemoteUser // this.lblSqliteRemoteUser.AutoSize = true; - this.lblSqliteRemoteUser.Location = new System.Drawing.Point(33, 112); + this.lblSqliteRemoteUser.Location = new System.Drawing.Point(44, 140); + this.lblSqliteRemoteUser.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblSqliteRemoteUser.Name = "lblSqliteRemoteUser"; - this.lblSqliteRemoteUser.Size = new System.Drawing.Size(77, 12); + this.lblSqliteRemoteUser.Size = new System.Drawing.Size(97, 15); this.lblSqliteRemoteUser.TabIndex = 22; this.lblSqliteRemoteUser.Text = "远程用户名："; this.lblSqliteRemoteUser.Visible = false; // // txtSqliteRemoteUser // - this.txtSqliteRemoteUser.Location = new System.Drawing.Point(115, 108); + this.txtSqliteRemoteUser.Location = new System.Drawing.Point(153, 135); + this.txtSqliteRemoteUser.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtSqliteRemoteUser.Name = "txtSqliteRemoteUser"; - this.txtSqliteRemoteUser.Size = new System.Drawing.Size(270, 21); + this.txtSqliteRemoteUser.Size = new System.Drawing.Size(359, 25); this.txtSqliteRemoteUser.TabIndex = 23; this.txtSqliteRemoteUser.Visible = false; // // txtSqlitePwd // - this.txtSqlitePwd.Location = new System.Drawing.Point(115, 79); + this.txtSqlitePwd.Location = new System.Drawing.Point(153, 99); + this.txtSqlitePwd.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtSqlitePwd.Name = "txtSqlitePwd"; this.txtSqlitePwd.PasswordChar = '*'; - this.txtSqlitePwd.Size = new System.Drawing.Size(270, 21); + this.txtSqlitePwd.Size = new System.Drawing.Size(359, 25); this.txtSqlitePwd.TabIndex = 13; // // txtSqliteUser // - this.txtSqliteUser.Location = new System.Drawing.Point(115, 193); + this.txtSqliteUser.Location = new System.Drawing.Point(153, 241); + this.txtSqliteUser.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtSqliteUser.Name = "txtSqliteUser"; - this.txtSqliteUser.Size = new System.Drawing.Size(270, 21); + this.txtSqliteUser.Size = new System.Drawing.Size(359, 25); this.txtSqliteUser.TabIndex = 12; this.txtSqliteUser.Visible = false; // // label7 // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(69, 83); + this.label7.Location = new System.Drawing.Point(92, 104); + this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(41, 12); + this.label7.Size = new System.Drawing.Size(52, 15); this.label7.TabIndex = 11; this.label7.Text = "密码："; // // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(57, 197); + this.label6.Location = new System.Drawing.Point(76, 246); + this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(53, 12); + this.label6.Size = new System.Drawing.Size(67, 15); this.label6.TabIndex = 10; this.label6.Text = "用户名："; this.label6.Visible = false; // // btnOpenFileSQLite // - this.btnOpenFileSQLite.Location = new System.Drawing.Point(392, 49); + this.btnOpenFileSQLite.Location = new System.Drawing.Point(523, 61); + this.btnOpenFileSQLite.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnOpenFileSQLite.Name = "btnOpenFileSQLite"; - this.btnOpenFileSQLite.Size = new System.Drawing.Size(60, 23); + this.btnOpenFileSQLite.Size = new System.Drawing.Size(80, 29); this.btnOpenFileSQLite.TabIndex = 9; this.btnOpenFileSQLite.Text = "浏览"; this.btnOpenFileSQLite.UseVisualStyleBackColor = true; @@ -739,17 +794,19 @@ // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(69, 54); + this.label5.Location = new System.Drawing.Point(92, 68); + this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(41, 12); + this.label5.Size = new System.Drawing.Size(52, 15); this.label5.TabIndex = 7; this.label5.Text = "路径："; // // txtSqlitePath // - this.txtSqlitePath.Location = new System.Drawing.Point(115, 50); + this.txtSqlitePath.Location = new System.Drawing.Point(153, 62); + this.txtSqlitePath.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtSqlitePath.Name = "txtSqlitePath"; - this.txtSqlitePath.Size = new System.Drawing.Size(270, 21); + this.txtSqlitePath.Size = new System.Drawing.Size(359, 25); this.txtSqlitePath.TabIndex = 8; // // tabSQLServer @@ -765,35 +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, 22); + this.tabSQLServer.Location = new System.Drawing.Point(4, 25); + this.tabSQLServer.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tabSQLServer.Name = "tabSQLServer"; - this.tabSQLServer.Size = new System.Drawing.Size(482, 230); + this.tabSQLServer.Size = new System.Drawing.Size(645, 291); this.tabSQLServer.TabIndex = 3; this.tabSQLServer.Text = "SQL Server"; this.tabSQLServer.UseVisualStyleBackColor = true; // // txtSqlServerPort // - this.txtSqlServerPort.Location = new System.Drawing.Point(86, 147); + this.txtSqlServerPort.Location = new System.Drawing.Point(115, 184); + this.txtSqlServerPort.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtSqlServerPort.Name = "txtSqlServerPort"; this.txtSqlServerPort.PasswordChar = '*'; - this.txtSqlServerPort.Size = new System.Drawing.Size(316, 21); + this.txtSqlServerPort.Size = new System.Drawing.Size(420, 25); this.txtSqlServerPort.TabIndex = 34; // // lblSqlPort // this.lblSqlPort.AutoSize = true; - this.lblSqlPort.Location = new System.Drawing.Point(41, 151); + this.lblSqlPort.Location = new System.Drawing.Point(55, 189); + this.lblSqlPort.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblSqlPort.Name = "lblSqlPort"; - this.lblSqlPort.Size = new System.Drawing.Size(41, 12); + this.lblSqlPort.Size = new System.Drawing.Size(52, 15); this.lblSqlPort.TabIndex = 33; this.lblSqlPort.Text = "端口："; // // btnTestSQLLink // - this.btnTestSQLLink.Location = new System.Drawing.Point(374, 180); + this.btnTestSQLLink.Location = new System.Drawing.Point(499, 225); + this.btnTestSQLLink.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnTestSQLLink.Name = "btnTestSQLLink"; - this.btnTestSQLLink.Size = new System.Drawing.Size(79, 24); + this.btnTestSQLLink.Size = new System.Drawing.Size(105, 30); this.btnTestSQLLink.TabIndex = 32; this.btnTestSQLLink.Text = "测试连接"; this.btnTestSQLLink.UseVisualStyleBackColor = true; @@ -801,66 +862,74 @@ // // txtSqlServerName // - this.txtSqlServerName.Location = new System.Drawing.Point(86, 60); + this.txtSqlServerName.Location = new System.Drawing.Point(115, 75); + this.txtSqlServerName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtSqlServerName.Name = "txtSqlServerName"; - this.txtSqlServerName.Size = new System.Drawing.Size(316, 21); + this.txtSqlServerName.Size = new System.Drawing.Size(420, 25); this.txtSqlServerName.TabIndex = 29; // // txtSqlServerHost // - this.txtSqlServerHost.Location = new System.Drawing.Point(86, 31); + this.txtSqlServerHost.Location = new System.Drawing.Point(115, 39); + this.txtSqlServerHost.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtSqlServerHost.Name = "txtSqlServerHost"; - this.txtSqlServerHost.Size = new System.Drawing.Size(316, 21); + this.txtSqlServerHost.Size = new System.Drawing.Size(420, 25); this.txtSqlServerHost.TabIndex = 28; // // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(17, 64); + this.label2.Location = new System.Drawing.Point(23, 80); + this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(65, 12); + this.label2.Size = new System.Drawing.Size(82, 15); this.label2.TabIndex = 27; this.label2.Text = "数据库名："; // // label12 // this.label12.AutoSize = true; - this.label12.Location = new System.Drawing.Point(29, 35); + this.label12.Location = new System.Drawing.Point(39, 44); + this.label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(53, 12); + this.label12.Size = new System.Drawing.Size(67, 15); this.label12.TabIndex = 26; this.label12.Text = "服务器："; // // txtSqlServerPwd // - this.txtSqlServerPwd.Location = new System.Drawing.Point(86, 118); + this.txtSqlServerPwd.Location = new System.Drawing.Point(115, 148); + this.txtSqlServerPwd.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtSqlServerPwd.Name = "txtSqlServerPwd"; this.txtSqlServerPwd.PasswordChar = '*'; - this.txtSqlServerPwd.Size = new System.Drawing.Size(316, 21); + this.txtSqlServerPwd.Size = new System.Drawing.Size(420, 25); this.txtSqlServerPwd.TabIndex = 31; // // txtSqlServerUser // - this.txtSqlServerUser.Location = new System.Drawing.Point(86, 89); + this.txtSqlServerUser.Location = new System.Drawing.Point(115, 111); + this.txtSqlServerUser.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtSqlServerUser.Name = "txtSqlServerUser"; - this.txtSqlServerUser.Size = new System.Drawing.Size(316, 21); + this.txtSqlServerUser.Size = new System.Drawing.Size(420, 25); this.txtSqlServerUser.TabIndex = 30; // // label13 // this.label13.AutoSize = true; - this.label13.Location = new System.Drawing.Point(41, 122); + this.label13.Location = new System.Drawing.Point(55, 152); + this.label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(41, 12); + this.label13.Size = new System.Drawing.Size(52, 15); this.label13.TabIndex = 23; this.label13.Text = "密码："; // // label14 // this.label14.AutoSize = true; - this.label14.Location = new System.Drawing.Point(29, 93); + this.label14.Location = new System.Drawing.Point(39, 116); + this.label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(53, 12); + this.label14.Size = new System.Drawing.Size(67, 15); this.label14.TabIndex = 22; this.label14.Text = "用户名："; // @@ -877,35 +946,39 @@ 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, 22); + this.tabMySql.Location = new System.Drawing.Point(4, 25); + this.tabMySql.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tabMySql.Name = "tabMySql"; - this.tabMySql.Size = new System.Drawing.Size(482, 230); + this.tabMySql.Size = new System.Drawing.Size(645, 291); this.tabMySql.TabIndex = 4; this.tabMySql.Text = "MySql"; this.tabMySql.UseVisualStyleBackColor = true; // // txtMySqlPort // - this.txtMySqlPort.Location = new System.Drawing.Point(86, 147); + this.txtMySqlPort.Location = new System.Drawing.Point(115, 184); + this.txtMySqlPort.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtMySqlPort.Name = "txtMySqlPort"; this.txtMySqlPort.PasswordChar = '*'; - this.txtMySqlPort.Size = new System.Drawing.Size(316, 21); + this.txtMySqlPort.Size = new System.Drawing.Size(420, 25); this.txtMySqlPort.TabIndex = 35; // // label17 // this.label17.AutoSize = true; - this.label17.Location = new System.Drawing.Point(41, 151); + this.label17.Location = new System.Drawing.Point(55, 189); + this.label17.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(41, 12); + this.label17.Size = new System.Drawing.Size(52, 15); this.label17.TabIndex = 34; this.label17.Text = "端口："; // // btnMySqlTest // - this.btnMySqlTest.Location = new System.Drawing.Point(374, 180); + this.btnMySqlTest.Location = new System.Drawing.Point(499, 225); + this.btnMySqlTest.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnMySqlTest.Name = "btnMySqlTest"; - this.btnMySqlTest.Size = new System.Drawing.Size(79, 24); + this.btnMySqlTest.Size = new System.Drawing.Size(105, 30); this.btnMySqlTest.TabIndex = 36; this.btnMySqlTest.Text = "测试连接"; this.btnMySqlTest.UseVisualStyleBackColor = true; @@ -913,66 +986,74 @@ // // txtMySqlServer // - this.txtMySqlServer.Location = new System.Drawing.Point(86, 60); + this.txtMySqlServer.Location = new System.Drawing.Point(115, 75); + this.txtMySqlServer.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtMySqlServer.Name = "txtMySqlServer"; - this.txtMySqlServer.Size = new System.Drawing.Size(316, 21); + this.txtMySqlServer.Size = new System.Drawing.Size(420, 25); this.txtMySqlServer.TabIndex = 32; // // txtMySqlHost // - this.txtMySqlHost.Location = new System.Drawing.Point(86, 31); + this.txtMySqlHost.Location = new System.Drawing.Point(115, 39); + this.txtMySqlHost.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtMySqlHost.Name = "txtMySqlHost"; - this.txtMySqlHost.Size = new System.Drawing.Size(316, 21); + this.txtMySqlHost.Size = new System.Drawing.Size(420, 25); this.txtMySqlHost.TabIndex = 31; // // label18 // this.label18.AutoSize = true; - this.label18.Location = new System.Drawing.Point(41, 64); + this.label18.Location = new System.Drawing.Point(55, 80); + this.label18.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(41, 12); + this.label18.Size = new System.Drawing.Size(52, 15); this.label18.TabIndex = 30; this.label18.Text = "实例："; // // label19 // this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(29, 35); + this.label19.Location = new System.Drawing.Point(39, 44); + this.label19.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label19.Name = "label19"; - this.label19.Size = new System.Drawing.Size(53, 12); + this.label19.Size = new System.Drawing.Size(67, 15); this.label19.TabIndex = 29; this.label19.Text = "服务器："; // // txtMySqlPwd // - this.txtMySqlPwd.Location = new System.Drawing.Point(86, 118); + this.txtMySqlPwd.Location = new System.Drawing.Point(115, 148); + this.txtMySqlPwd.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtMySqlPwd.Name = "txtMySqlPwd"; this.txtMySqlPwd.PasswordChar = '*'; - this.txtMySqlPwd.Size = new System.Drawing.Size(316, 21); + this.txtMySqlPwd.Size = new System.Drawing.Size(420, 25); this.txtMySqlPwd.TabIndex = 34; // // txtMySqlUser // - this.txtMySqlUser.Location = new System.Drawing.Point(86, 89); + this.txtMySqlUser.Location = new System.Drawing.Point(115, 111); + this.txtMySqlUser.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtMySqlUser.Name = "txtMySqlUser"; - this.txtMySqlUser.Size = new System.Drawing.Size(316, 21); + this.txtMySqlUser.Size = new System.Drawing.Size(420, 25); this.txtMySqlUser.TabIndex = 33; // // label20 // this.label20.AutoSize = true; - this.label20.Location = new System.Drawing.Point(41, 122); + this.label20.Location = new System.Drawing.Point(55, 152); + this.label20.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label20.Name = "label20"; - this.label20.Size = new System.Drawing.Size(41, 12); + this.label20.Size = new System.Drawing.Size(52, 15); this.label20.TabIndex = 26; this.label20.Text = "密码："; // // label23 // this.label23.AutoSize = true; - this.label23.Location = new System.Drawing.Point(29, 93); + this.label23.Location = new System.Drawing.Point(39, 116); + this.label23.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label23.Name = "label23"; - this.label23.Size = new System.Drawing.Size(53, 12); + this.label23.Size = new System.Drawing.Size(67, 15); this.label23.TabIndex = 25; this.label23.Text = "用户名："; // @@ -989,52 +1070,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, 22); + this.tabOracle.Location = new System.Drawing.Point(4, 25); + this.tabOracle.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tabOracle.Name = "tabOracle"; - this.tabOracle.Padding = new System.Windows.Forms.Padding(3); - this.tabOracle.Size = new System.Drawing.Size(482, 230); + this.tabOracle.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tabOracle.Size = new System.Drawing.Size(645, 291); this.tabOracle.TabIndex = 5; this.tabOracle.Text = "Oracle"; this.tabOracle.UseVisualStyleBackColor = true; // // txtOracleHost // - this.txtOracleHost.Location = new System.Drawing.Point(86, 31); + this.txtOracleHost.Location = new System.Drawing.Point(115, 39); + this.txtOracleHost.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtOracleHost.Name = "txtOracleHost"; - this.txtOracleHost.Size = new System.Drawing.Size(316, 21); + this.txtOracleHost.Size = new System.Drawing.Size(420, 25); this.txtOracleHost.TabIndex = 49; // // label37 // this.label37.AutoSize = true; - this.label37.Location = new System.Drawing.Point(29, 35); + this.label37.Location = new System.Drawing.Point(39, 44); + this.label37.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label37.Name = "label37"; - this.label37.Size = new System.Drawing.Size(53, 12); + this.label37.Size = new System.Drawing.Size(67, 15); this.label37.TabIndex = 48; this.label37.Text = "服务器："; // // txtOraclePort // - this.txtOraclePort.Location = new System.Drawing.Point(86, 147); + this.txtOraclePort.Location = new System.Drawing.Point(115, 184); + this.txtOraclePort.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtOraclePort.Name = "txtOraclePort"; this.txtOraclePort.PasswordChar = '*'; - this.txtOraclePort.Size = new System.Drawing.Size(316, 21); + this.txtOraclePort.Size = new System.Drawing.Size(420, 25); this.txtOraclePort.TabIndex = 46; // // label24 // this.label24.AutoSize = true; - this.label24.Location = new System.Drawing.Point(41, 151); + this.label24.Location = new System.Drawing.Point(55, 189); + this.label24.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label24.Name = "label24"; - this.label24.Size = new System.Drawing.Size(41, 12); + this.label24.Size = new System.Drawing.Size(52, 15); this.label24.TabIndex = 44; this.label24.Text = "端口："; // // btnOracleTestLink // - this.btnOracleTestLink.Location = new System.Drawing.Point(374, 180); + this.btnOracleTestLink.Location = new System.Drawing.Point(499, 225); + this.btnOracleTestLink.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnOracleTestLink.Name = "btnOracleTestLink"; - this.btnOracleTestLink.Size = new System.Drawing.Size(79, 24); + this.btnOracleTestLink.Size = new System.Drawing.Size(105, 30); this.btnOracleTestLink.TabIndex = 47; this.btnOracleTestLink.Text = "测试连接"; this.btnOracleTestLink.UseVisualStyleBackColor = true; @@ -1042,50 +1129,56 @@ // // txtOracleSource // - this.txtOracleSource.Location = new System.Drawing.Point(86, 60); + this.txtOracleSource.Location = new System.Drawing.Point(115, 75); + this.txtOracleSource.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtOracleSource.Name = "txtOracleSource"; - this.txtOracleSource.Size = new System.Drawing.Size(316, 21); + this.txtOracleSource.Size = new System.Drawing.Size(420, 25); this.txtOracleSource.TabIndex = 42; // // label26 // this.label26.AutoSize = true; - this.label26.Location = new System.Drawing.Point(41, 64); + this.label26.Location = new System.Drawing.Point(55, 80); + this.label26.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label26.Name = "label26"; - this.label26.Size = new System.Drawing.Size(41, 12); + this.label26.Size = new System.Drawing.Size(52, 15); this.label26.TabIndex = 40; this.label26.Text = "实例："; // // txtOraclePwd // - this.txtOraclePwd.Location = new System.Drawing.Point(86, 118); + this.txtOraclePwd.Location = new System.Drawing.Point(115, 148); + this.txtOraclePwd.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtOraclePwd.Name = "txtOraclePwd"; this.txtOraclePwd.PasswordChar = '*'; - this.txtOraclePwd.Size = new System.Drawing.Size(316, 21); + this.txtOraclePwd.Size = new System.Drawing.Size(420, 25); this.txtOraclePwd.TabIndex = 45; // // txtOracleUserId // - this.txtOracleUserId.Location = new System.Drawing.Point(86, 89); + this.txtOracleUserId.Location = new System.Drawing.Point(115, 111); + this.txtOracleUserId.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtOracleUserId.Name = "txtOracleUserId"; - this.txtOracleUserId.Size = new System.Drawing.Size(316, 21); + this.txtOracleUserId.Size = new System.Drawing.Size(420, 25); this.txtOracleUserId.TabIndex = 43; // // label28 // this.label28.AutoSize = true; - this.label28.Location = new System.Drawing.Point(41, 122); + this.label28.Location = new System.Drawing.Point(55, 152); + this.label28.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label28.Name = "label28"; - this.label28.Size = new System.Drawing.Size(41, 12); + this.label28.Size = new System.Drawing.Size(52, 15); this.label28.TabIndex = 38; this.label28.Text = "密码："; // // label29 // this.label29.AutoSize = true; - this.label29.Location = new System.Drawing.Point(29, 93); + this.label29.Location = new System.Drawing.Point(39, 116); + this.label29.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label29.Name = "label29"; - this.label29.Size = new System.Drawing.Size(53, 12); + this.label29.Size = new System.Drawing.Size(67, 15); this.label29.TabIndex = 37; this.label29.Text = "用户名："; // @@ -1100,10 +1193,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, 22); + this.tabTxt.Location = new System.Drawing.Point(4, 25); + this.tabTxt.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tabTxt.Name = "tabTxt"; - this.tabTxt.Padding = new System.Windows.Forms.Padding(3); - this.tabTxt.Size = new System.Drawing.Size(482, 230); + this.tabTxt.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tabTxt.Size = new System.Drawing.Size(645, 291); this.tabTxt.TabIndex = 7; this.tabTxt.Text = "TXT"; this.tabTxt.UseVisualStyleBackColor = true; @@ -1111,55 +1205,61 @@ // label30 // this.label30.AutoSize = true; - this.label30.Location = new System.Drawing.Point(46, 27); + this.label30.Location = new System.Drawing.Point(61, 34); + this.label30.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label30.Name = "label30"; - this.label30.Size = new System.Drawing.Size(65, 12); + this.label30.Size = new System.Drawing.Size(82, 15); this.label30.TabIndex = 33; this.label30.Text = "是否远程："; // // lblTxtRemoteUserPwd // this.lblTxtRemoteUserPwd.AutoSize = true; - this.lblTxtRemoteUserPwd.Location = new System.Drawing.Point(46, 113); + this.lblTxtRemoteUserPwd.Location = new System.Drawing.Point(61, 141); + this.lblTxtRemoteUserPwd.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblTxtRemoteUserPwd.Name = "lblTxtRemoteUserPwd"; - this.lblTxtRemoteUserPwd.Size = new System.Drawing.Size(65, 12); + this.lblTxtRemoteUserPwd.Size = new System.Drawing.Size(82, 15); this.lblTxtRemoteUserPwd.TabIndex = 31; this.lblTxtRemoteUserPwd.Text = "远程密码："; this.lblTxtRemoteUserPwd.Visible = false; // // txtRemoteTxtPwd // - this.txtRemoteTxtPwd.Location = new System.Drawing.Point(116, 108); + this.txtRemoteTxtPwd.Location = new System.Drawing.Point(155, 135); + this.txtRemoteTxtPwd.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtRemoteTxtPwd.Name = "txtRemoteTxtPwd"; this.txtRemoteTxtPwd.PasswordChar = '*'; - this.txtRemoteTxtPwd.Size = new System.Drawing.Size(270, 21); + this.txtRemoteTxtPwd.Size = new System.Drawing.Size(359, 25); this.txtRemoteTxtPwd.TabIndex = 32; this.txtRemoteTxtPwd.Visible = false; // // lblTxtRemoteUserId // this.lblTxtRemoteUserId.AutoSize = true; - this.lblTxtRemoteUserId.Location = new System.Drawing.Point(34, 83); + this.lblTxtRemoteUserId.Location = new System.Drawing.Point(45, 104); + this.lblTxtRemoteUserId.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblTxtRemoteUserId.Name = "lblTxtRemoteUserId"; - this.lblTxtRemoteUserId.Size = new System.Drawing.Size(77, 12); + this.lblTxtRemoteUserId.Size = new System.Drawing.Size(97, 15); this.lblTxtRemoteUserId.TabIndex = 30; this.lblTxtRemoteUserId.Text = "远程用户名："; this.lblTxtRemoteUserId.Visible = false; // // txtRemoteTxtUserId // - this.txtRemoteTxtUserId.Location = new System.Drawing.Point(116, 79); + this.txtRemoteTxtUserId.Location = new System.Drawing.Point(155, 99); + this.txtRemoteTxtUserId.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtRemoteTxtUserId.Name = "txtRemoteTxtUserId"; - this.txtRemoteTxtUserId.Size = new System.Drawing.Size(270, 21); + this.txtRemoteTxtUserId.Size = new System.Drawing.Size(359, 25); this.txtRemoteTxtUserId.TabIndex = 28; this.txtRemoteTxtUserId.Visible = false; // // cbxRemoteTxt // this.cbxRemoteTxt.AutoSize = true; - this.cbxRemoteTxt.Location = new System.Drawing.Point(118, 25); + this.cbxRemoteTxt.Location = new System.Drawing.Point(157, 31); + this.cbxRemoteTxt.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.cbxRemoteTxt.Name = "cbxRemoteTxt"; - this.cbxRemoteTxt.Size = new System.Drawing.Size(36, 16); + this.cbxRemoteTxt.Size = new System.Drawing.Size(44, 19); this.cbxRemoteTxt.TabIndex = 25; this.cbxRemoteTxt.Text = "是"; this.cbxRemoteTxt.UseVisualStyleBackColor = true; @@ -1167,9 +1267,10 @@ // // btnOpenFileTxt // - this.btnOpenFileTxt.Location = new System.Drawing.Point(392, 49); + this.btnOpenFileTxt.Location = new System.Drawing.Point(523, 61); + this.btnOpenFileTxt.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnOpenFileTxt.Name = "btnOpenFileTxt"; - this.btnOpenFileTxt.Size = new System.Drawing.Size(60, 23); + this.btnOpenFileTxt.Size = new System.Drawing.Size(80, 29); this.btnOpenFileTxt.TabIndex = 29; this.btnOpenFileTxt.Text = "浏览"; this.btnOpenFileTxt.UseVisualStyleBackColor = true; @@ -1178,158 +1279,211 @@ // label36 // this.label36.AutoSize = true; - this.label36.Location = new System.Drawing.Point(69, 54); + this.label36.Location = new System.Drawing.Point(92, 68); + this.label36.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label36.Name = "label36"; - this.label36.Size = new System.Drawing.Size(41, 12); + this.label36.Size = new System.Drawing.Size(52, 15); this.label36.TabIndex = 26; this.label36.Text = "路径："; // // txtInportTxt // - this.txtInportTxt.Location = new System.Drawing.Point(115, 50); + this.txtInportTxt.Location = new System.Drawing.Point(153, 62); + this.txtInportTxt.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtInportTxt.Name = "txtInportTxt"; - this.txtInportTxt.Size = new System.Drawing.Size(270, 21); + this.txtInportTxt.Size = new System.Drawing.Size(359, 25); 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, 22); + this.tabCnas.Location = new System.Drawing.Point(4, 25); + this.tabCnas.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tabCnas.Name = "tabCnas"; - this.tabCnas.Padding = new System.Windows.Forms.Padding(3); - this.tabCnas.Size = new System.Drawing.Size(496, 267); + this.tabCnas.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tabCnas.Size = new System.Drawing.Size(664, 337); this.tabCnas.TabIndex = 1; this.tabCnas.Text = "目标数据库"; this.tabCnas.UseVisualStyleBackColor = true; // - // cbxTargetDBSelect + // groupBox2 // - this.cbxTargetDBSelect.FormattingEnabled = true; - this.cbxTargetDBSelect.Items.AddRange(new object[] { - "CNAS数据库", - "PLATFORM数据库"}); - this.cbxTargetDBSelect.Location = new System.Drawing.Point(119, 20); - this.cbxTargetDBSelect.Name = "cbxTargetDBSelect"; - this.cbxTargetDBSelect.Size = new System.Drawing.Size(120, 20); - this.cbxTargetDBSelect.TabIndex = 27; - this.cbxTargetDBSelect.SelectedIndexChanged += new System.EventHandler(this.cbxTargetDBSelect_SelectedIndexChanged); + this.groupBox2.Controls.Add(this.txtDBHost); + this.groupBox2.Controls.Add(this.label9); + this.groupBox2.Controls.Add(this.txtPort); + this.groupBox2.Controls.Add(this.label8); + this.groupBox2.Controls.Add(this.label1); + this.groupBox2.Controls.Add(this.txtDBUser); + this.groupBox2.Controls.Add(this.btnCNASTestLink); + this.groupBox2.Controls.Add(this.txtDBPwd); + 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.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.TabIndex = 29; + this.groupBox2.TabStop = false; + this.groupBox2.Text = "连接"; // - // label31 + // txtDBHost // - this.label31.AutoSize = true; - this.label31.Location = new System.Drawing.Point(12, 23); - this.label31.Name = "label31"; - this.label31.Size = new System.Drawing.Size(101, 12); - this.label31.TabIndex = 26; - this.label31.Text = "选择目标数据库："; + this.txtDBHost.Location = new System.Drawing.Point(117, 34); + this.txtDBHost.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.txtDBHost.Name = "txtDBHost"; + this.txtDBHost.Size = new System.Drawing.Size(345, 25); + this.txtDBHost.TabIndex = 20; + // + // label9 + // + this.label9.AutoSize = true; + this.label9.Location = new System.Drawing.Point(40, 111); + 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.TabIndex = 14; + this.label9.Text = "用户名："; // // txtPort // - this.txtPort.Location = new System.Drawing.Point(88, 143); + this.txtPort.Location = new System.Drawing.Point(117, 179); + this.txtPort.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtPort.Name = "txtPort"; this.txtPort.PasswordChar = '*'; - this.txtPort.Size = new System.Drawing.Size(260, 21); + this.txtPort.Size = new System.Drawing.Size(345, 25); this.txtPort.TabIndex = 24; // + // label8 + // + this.label8.AutoSize = true; + this.label8.Location = new System.Drawing.Point(56, 149); + 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.TabIndex = 15; + this.label8.Text = "密码："; + // // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(41, 148); + this.label1.Location = new System.Drawing.Point(55, 185); + this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(41, 12); + this.label1.Size = new System.Drawing.Size(52, 15); 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.Name = "txtDBUser"; + this.txtDBUser.Size = new System.Drawing.Size(345, 25); + this.txtDBUser.TabIndex = 22; + // // btnCNASTestLink // - this.btnCNASTestLink.Location = new System.Drawing.Point(368, 142); + this.btnCNASTestLink.Location = new System.Drawing.Point(491, 178); + this.btnCNASTestLink.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnCNASTestLink.Name = "btnCNASTestLink"; - this.btnCNASTestLink.Size = new System.Drawing.Size(79, 24); + this.btnCNASTestLink.Size = new System.Drawing.Size(105, 30); this.btnCNASTestLink.TabIndex = 25; this.btnCNASTestLink.Text = "测试连接"; this.btnCNASTestLink.UseVisualStyleBackColor = true; this.btnCNASTestLink.Click += new System.EventHandler(this.btnCNASTestLink_Click); // + // txtDBPwd + // + this.txtDBPwd.Location = new System.Drawing.Point(117, 142); + this.txtDBPwd.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.txtDBPwd.Name = "txtDBPwd"; + this.txtDBPwd.PasswordChar = '*'; + this.txtDBPwd.Size = new System.Drawing.Size(345, 25); + this.txtDBPwd.TabIndex = 23; + // // txtDBName // - this.txtDBName.Location = new System.Drawing.Point(88, 56); + this.txtDBName.Location = new System.Drawing.Point(117, 70); + this.txtDBName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtDBName.Name = "txtDBName"; - this.txtDBName.Size = new System.Drawing.Size(260, 21); + this.txtDBName.Size = new System.Drawing.Size(345, 25); this.txtDBName.TabIndex = 21; // - // txtDBHost - // - this.txtDBHost.Location = new System.Drawing.Point(88, 27); - this.txtDBHost.Name = "txtDBHost"; - this.txtDBHost.Size = new System.Drawing.Size(260, 21); - this.txtDBHost.TabIndex = 20; - // - // label11 - // - this.label11.AutoSize = true; - this.label11.Location = new System.Drawing.Point(42, 60); - this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(41, 12); - this.label11.TabIndex = 19; - this.label11.Text = "实例："; - // // label10 // this.label10.AutoSize = true; - this.label10.Location = new System.Drawing.Point(31, 30); + this.label10.Location = new System.Drawing.Point(41, 38); + this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(53, 12); + this.label10.Size = new System.Drawing.Size(67, 15); this.label10.TabIndex = 18; this.label10.Text = "服务器："; // - // txtDBPwd + // label11 // - this.txtDBPwd.Location = new System.Drawing.Point(88, 114); - this.txtDBPwd.Name = "txtDBPwd"; - this.txtDBPwd.PasswordChar = '*'; - this.txtDBPwd.Size = new System.Drawing.Size(260, 21); - this.txtDBPwd.TabIndex = 23; + this.label11.AutoSize = true; + this.label11.Location = new System.Drawing.Point(56, 75); + 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.TabIndex = 19; + this.label11.Text = "实例："; // - // txtDBUser + // groupBox1 // - this.txtDBUser.Location = new System.Drawing.Point(88, 85); - this.txtDBUser.Name = "txtDBUser"; - this.txtDBUser.Size = new System.Drawing.Size(260, 21); - this.txtDBUser.TabIndex = 22; + 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.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.TabIndex = 28; + this.groupBox1.TabStop = false; + this.groupBox1.Text = "选择"; // - // label8 + // cbxTargetDBSelect // - this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(42, 119); - this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(41, 12); - this.label8.TabIndex = 15; - this.label8.Text = "密码："; + this.cbxTargetDBSelect.FormattingEnabled = true; + 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.Name = "cbxTargetDBSelect"; + this.cbxTargetDBSelect.Size = new System.Drawing.Size(159, 23); + this.cbxTargetDBSelect.TabIndex = 27; + this.cbxTargetDBSelect.SelectedIndexChanged += new System.EventHandler(this.cbxTargetDBSelect_SelectedIndexChanged); // - // label9 + // label31 // - this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(30, 89); - this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(53, 12); - this.label9.TabIndex = 14; - this.label9.Text = "用户名："; + this.label31.AutoSize = true; + this.label31.Location = new System.Drawing.Point(16, 29); + 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.TabIndex = 26; + this.label31.Text = "选择目标数据库："; // // pnlBottom // this.pnlBottom.Controls.Add(this.btnOK); this.pnlBottom.Dock = System.Windows.Forms.DockStyle.Bottom; - this.pnlBottom.Location = new System.Drawing.Point(0, 298); + this.pnlBottom.Location = new System.Drawing.Point(0, 501); + this.pnlBottom.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.pnlBottom.Name = "pnlBottom"; - this.pnlBottom.Size = new System.Drawing.Size(504, 42); + this.pnlBottom.Size = new System.Drawing.Size(882, 52); this.pnlBottom.TabIndex = 3; // // btnOK // - this.btnOK.Location = new System.Drawing.Point(404, 6); + this.btnOK.Location = new System.Drawing.Point(749, 4); + this.btnOK.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnOK.Name = "btnOK"; - this.btnOK.Size = new System.Drawing.Size(90, 30); + this.btnOK.Size = new System.Drawing.Size(120, 38); this.btnOK.TabIndex = 0; this.btnOK.Text = "确认"; this.btnOK.UseVisualStyleBackColor = true; @@ -1339,48 +1493,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.Name = "pnlTop"; - this.pnlTop.Size = new System.Drawing.Size(504, 5); + this.pnlTop.Size = new System.Drawing.Size(882, 6); this.pnlTop.TabIndex = 2; // - // groupBox1 - // - this.groupBox1.Controls.Add(this.cbxTargetDBSelect); - this.groupBox1.Controls.Add(this.label31); - this.groupBox1.Location = new System.Drawing.Point(18, 14); - this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(461, 55); - this.groupBox1.TabIndex = 28; - this.groupBox1.TabStop = false; - this.groupBox1.Text = "选择"; - // - // groupBox2 - // - this.groupBox2.Controls.Add(this.txtDBHost); - this.groupBox2.Controls.Add(this.label9); - this.groupBox2.Controls.Add(this.txtPort); - this.groupBox2.Controls.Add(this.label8); - this.groupBox2.Controls.Add(this.label1); - this.groupBox2.Controls.Add(this.txtDBUser); - this.groupBox2.Controls.Add(this.btnCNASTestLink); - this.groupBox2.Controls.Add(this.txtDBPwd); - 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(18, 75); - this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(461, 181); - this.groupBox2.TabIndex = 29; - this.groupBox2.TabStop = false; - this.groupBox2.Text = "连接"; - // // frmDatabaseParams // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(504, 340); + this.ClientSize = new System.Drawing.Size(882, 553); 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.MaximizeBox = false; this.MinimizeBox = false; this.Name = "frmDatabaseParams"; @@ -1409,11 +1534,11 @@ this.tabTxt.ResumeLayout(false); this.tabTxt.PerformLayout(); this.tabCnas.ResumeLayout(false); - this.pnlBottom.ResumeLayout(false); - this.groupBox1.ResumeLayout(false); - this.groupBox1.PerformLayout(); this.groupBox2.ResumeLayout(false); this.groupBox2.PerformLayout(); + this.groupBox1.ResumeLayout(false); + this.groupBox1.PerformLayout(); + this.pnlBottom.ResumeLayout(false); this.ResumeLayout(false); } diff --git a/CNAS_DBSync/frmIfThenParams.Designer.cs b/CNAS_DBSync/frmIfThenParams.Designer.cs index 6b630c3..0bdba79 100644 --- a/CNAS_DBSync/frmIfThenParams.Designer.cs +++ b/CNAS_DBSync/frmIfThenParams.Designer.cs @@ -33,11 +33,11 @@ this.pnlAll = new System.Windows.Forms.Panel(); this.btnOK = new System.Windows.Forms.Button(); this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.cbxInstrument = new System.Windows.Forms.ComboBox(); + this.btnDelete = new System.Windows.Forms.Button(); + this.dgvIfThen = new System.Windows.Forms.DataGridView(); this.btnAdd = new System.Windows.Forms.Button(); this.label1 = new System.Windows.Forms.Label(); - this.dgvIfThen = new System.Windows.Forms.DataGridView(); - this.btnDelete = new System.Windows.Forms.Button(); - this.cbxInstrument = new System.Windows.Forms.ComboBox(); this.CalcuCondition = new System.Windows.Forms.DataGridViewComboBoxColumn(); this.ColumnValue = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.CurrentValue = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -55,12 +55,12 @@ this.pnlAll.Location = new System.Drawing.Point(0, 0); this.pnlAll.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.pnlAll.Name = "pnlAll"; - this.pnlAll.Size = new System.Drawing.Size(486, 302); + this.pnlAll.Size = new System.Drawing.Size(738, 476); this.pnlAll.TabIndex = 1; // // btnOK // - this.btnOK.Location = new System.Drawing.Point(384, 264); + this.btnOK.Location = new System.Drawing.Point(625, 434); this.btnOK.Name = "btnOK"; this.btnOK.Size = new System.Drawing.Size(90, 30); this.btnOK.TabIndex = 1; @@ -78,29 +78,29 @@ this.groupBox1.Controls.Add(this.label1); this.groupBox1.Location = new System.Drawing.Point(12, 12); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(462, 246); + this.groupBox1.Size = new System.Drawing.Size(703, 404); this.groupBox1.TabIndex = 0; this.groupBox1.TabStop = false; this.groupBox1.Text = "条件XXX参数"; // - // btnAdd + // cbxInstrument // - this.btnAdd.Location = new System.Drawing.Point(316, 26); - this.btnAdd.Name = "btnAdd"; - this.btnAdd.Size = new System.Drawing.Size(66, 23); - this.btnAdd.TabIndex = 6; - this.btnAdd.Text = "新增条件"; - this.btnAdd.UseVisualStyleBackColor = true; - this.btnAdd.Click += new System.EventHandler(this.btnAdd_Click); + this.cbxInstrument.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cbxInstrument.FormattingEnabled = true; + this.cbxInstrument.Location = new System.Drawing.Point(80, 24); + this.cbxInstrument.Name = "cbxInstrument"; + this.cbxInstrument.Size = new System.Drawing.Size(354, 28); + this.cbxInstrument.TabIndex = 9; // - // label1 + // btnDelete // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(6, 29); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(68, 17); - this.label1.TabIndex = 1; - this.label1.Text = "条件列名："; + this.btnDelete.Location = new System.Drawing.Point(580, 17); + this.btnDelete.Name = "btnDelete"; + this.btnDelete.Size = new System.Drawing.Size(66, 30); + this.btnDelete.TabIndex = 8; + this.btnDelete.Text = "删除条件"; + this.btnDelete.UseVisualStyleBackColor = true; + this.btnDelete.Click += new System.EventHandler(this.btnDelete_Click); // // dgvIfThen // @@ -127,27 +127,27 @@ dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; this.dgvIfThen.RowsDefaultCellStyle = dataGridViewCellStyle2; this.dgvIfThen.RowTemplate.Height = 23; - this.dgvIfThen.Size = new System.Drawing.Size(447, 181); + this.dgvIfThen.Size = new System.Drawing.Size(688, 343); this.dgvIfThen.TabIndex = 7; // - // btnDelete + // btnAdd // - this.btnDelete.Location = new System.Drawing.Point(388, 26); - this.btnDelete.Name = "btnDelete"; - this.btnDelete.Size = new System.Drawing.Size(66, 23); - this.btnDelete.TabIndex = 8; - this.btnDelete.Text = "删除条件"; - this.btnDelete.UseVisualStyleBackColor = true; - this.btnDelete.Click += new System.EventHandler(this.btnDelete_Click); + this.btnAdd.Location = new System.Drawing.Point(490, 17); + this.btnAdd.Name = "btnAdd"; + this.btnAdd.Size = new System.Drawing.Size(66, 30); + this.btnAdd.TabIndex = 6; + this.btnAdd.Text = "新增条件"; + this.btnAdd.UseVisualStyleBackColor = true; + this.btnAdd.Click += new System.EventHandler(this.btnAdd_Click); // - // cbxInstrument + // label1 // - this.cbxInstrument.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cbxInstrument.FormattingEnabled = true; - this.cbxInstrument.Location = new System.Drawing.Point(80, 24); - this.cbxInstrument.Name = "cbxInstrument"; - this.cbxInstrument.Size = new System.Drawing.Size(175, 25); - this.cbxInstrument.TabIndex = 9; + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(6, 29); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(84, 20); + this.label1.TabIndex = 1; + this.label1.Text = "条件列名："; // // CalcuCondition // @@ -156,18 +156,19 @@ this.CalcuCondition.Items.AddRange(new object[] { "等于"}); this.CalcuCondition.Name = "CalcuCondition"; + this.CalcuCondition.Width = 200; // // ColumnValue // this.ColumnValue.HeaderText = "条件列值"; this.ColumnValue.Name = "ColumnValue"; - this.ColumnValue.Width = 150; + this.ColumnValue.Width = 200; // // CurrentValue // this.CurrentValue.HeaderText = "当前列值"; this.CurrentValue.Name = "CurrentValue"; - this.CurrentValue.Width = 150; + this.CurrentValue.Width = 200; // // ID // @@ -178,9 +179,9 @@ // // frmIfThenParams // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); + this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(486, 302); + this.ClientSize = new System.Drawing.Size(738, 476); this.Controls.Add(this.pnlAll); this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; diff --git a/CNAS_DBSync/frmInstrumentCode.Designer.cs b/CNAS_DBSync/frmInstrumentCode.Designer.cs index 1f37aa0..8521c70 100644 --- a/CNAS_DBSync/frmInstrumentCode.Designer.cs +++ b/CNAS_DBSync/frmInstrumentCode.Designer.cs @@ -36,15 +36,15 @@ // // txtCode // - this.txtCode.Location = new System.Drawing.Point(83, 25); + this.txtCode.Location = new System.Drawing.Point(128, 56); this.txtCode.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.txtCode.Name = "txtCode"; - this.txtCode.Size = new System.Drawing.Size(275, 23); + this.txtCode.Size = new System.Drawing.Size(319, 27); this.txtCode.TabIndex = 0; // // btnOK // - this.btnOK.Location = new System.Drawing.Point(293, 66); + this.btnOK.Location = new System.Drawing.Point(490, 132); this.btnOK.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.btnOK.Name = "btnOK"; this.btnOK.Size = new System.Drawing.Size(90, 30); @@ -56,17 +56,17 @@ // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(11, 28); + this.label1.Location = new System.Drawing.Point(56, 59); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(68, 17); + this.label1.Size = new System.Drawing.Size(84, 20); this.label1.TabIndex = 2; this.label1.Text = "仪器编号："; // // frmInstrumentCode // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); + this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(395, 101); + this.ClientSize = new System.Drawing.Size(601, 175); this.Controls.Add(this.label1); this.Controls.Add(this.btnOK); this.Controls.Add(this.txtCode); diff --git a/CNAS_DBSync/frmOperationPwd.Designer.cs b/CNAS_DBSync/frmOperationPwd.Designer.cs index d3ba6ba..3ac8d3f 100644 --- a/CNAS_DBSync/frmOperationPwd.Designer.cs +++ b/CNAS_DBSync/frmOperationPwd.Designer.cs @@ -36,29 +36,29 @@ // // txtOldPwd // - this.txtOldPwd.Location = new System.Drawing.Point(67, 31); + this.txtOldPwd.Location = new System.Drawing.Point(114, 50); this.txtOldPwd.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.txtOldPwd.Name = "txtOldPwd"; this.txtOldPwd.PasswordChar = '*'; - this.txtOldPwd.Size = new System.Drawing.Size(214, 23); + this.txtOldPwd.Size = new System.Drawing.Size(300, 27); this.txtOldPwd.TabIndex = 35; this.txtOldPwd.KeyDown += new System.Windows.Forms.KeyEventHandler(this.frmOperationPwd_KeyDown); // // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(20, 34); + this.label2.Location = new System.Drawing.Point(44, 52); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(44, 17); + this.label2.Size = new System.Drawing.Size(54, 20); this.label2.TabIndex = 34; this.label2.Text = "密码："; // // btnOK // - this.btnOK.Location = new System.Drawing.Point(296, 29); + this.btnOK.Location = new System.Drawing.Point(457, 49); this.btnOK.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.btnOK.Name = "btnOK"; - this.btnOK.Size = new System.Drawing.Size(60, 25); + this.btnOK.Size = new System.Drawing.Size(60, 28); this.btnOK.TabIndex = 36; this.btnOK.Text = "确定"; this.btnOK.UseVisualStyleBackColor = true; @@ -66,9 +66,9 @@ // // frmOperationPwd // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); + this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(386, 85); + this.ClientSize = new System.Drawing.Size(588, 151); this.Controls.Add(this.btnOK); this.Controls.Add(this.txtOldPwd); this.Controls.Add(this.label2); diff --git a/CNAS_DBSync/frmSelectInstruItem.Designer.cs b/CNAS_DBSync/frmSelectInstruItem.Designer.cs index d518d3f..4f0e637 100644 --- a/CNAS_DBSync/frmSelectInstruItem.Designer.cs +++ b/CNAS_DBSync/frmSelectInstruItem.Designer.cs @@ -48,12 +48,12 @@ this.pnlAll.Dock = System.Windows.Forms.DockStyle.Fill; this.pnlAll.Location = new System.Drawing.Point(0, 0); this.pnlAll.Name = "pnlAll"; - this.pnlAll.Size = new System.Drawing.Size(502, 329); + this.pnlAll.Size = new System.Drawing.Size(762, 517); this.pnlAll.TabIndex = 0; // // btnCancel // - this.btnCancel.Location = new System.Drawing.Point(400, 46); + this.btnCancel.Location = new System.Drawing.Point(634, 46); this.btnCancel.Name = "btnCancel"; this.btnCancel.Size = new System.Drawing.Size(90, 28); this.btnCancel.TabIndex = 4; @@ -63,7 +63,7 @@ // // btnOK // - this.btnOK.Location = new System.Drawing.Point(400, 12); + this.btnOK.Location = new System.Drawing.Point(634, 12); this.btnOK.Name = "btnOK"; this.btnOK.Size = new System.Drawing.Size(90, 28); this.btnOK.TabIndex = 3; @@ -94,7 +94,7 @@ this.dgvInstruDS.RowsDefaultCellStyle = dataGridViewCellStyle2; this.dgvInstruDS.RowTemplate.Height = 23; this.dgvInstruDS.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dgvInstruDS.Size = new System.Drawing.Size(377, 309); + this.dgvInstruDS.Size = new System.Drawing.Size(620, 488); this.dgvInstruDS.TabIndex = 2; // // InstruFieldName @@ -103,7 +103,7 @@ this.InstruFieldName.HeaderText = "列名"; this.InstruFieldName.Name = "InstruFieldName"; this.InstruFieldName.ReadOnly = true; - this.InstruFieldName.Width = 150; + this.InstruFieldName.Width = 280; // // InstruDataType // @@ -111,12 +111,13 @@ this.InstruDataType.HeaderText = "数据类型"; this.InstruDataType.Name = "InstruDataType"; this.InstruDataType.ReadOnly = true; + this.InstruDataType.Width = 280; // // frmSelectInstruItem // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); + this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(502, 329); + this.ClientSize = new System.Drawing.Size(762, 517); this.Controls.Add(this.pnlAll); this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; @@ -138,8 +139,8 @@ private System.Windows.Forms.Panel pnlAll; private System.Windows.Forms.Button btnOK; private System.Windows.Forms.DataGridView dgvInstruDS; + private System.Windows.Forms.Button btnCancel; private System.Windows.Forms.DataGridViewTextBoxColumn InstruFieldName; private System.Windows.Forms.DataGridViewTextBoxColumn InstruDataType; - private System.Windows.Forms.Button btnCancel; } } \ No newline at end of file diff --git a/CNAS_DBSync/frmServiceConfig.Designer.cs b/CNAS_DBSync/frmServiceConfig.Designer.cs index 40189b9..b566c0f 100644 --- a/CNAS_DBSync/frmServiceConfig.Designer.cs +++ b/CNAS_DBSync/frmServiceConfig.Designer.cs @@ -68,7 +68,7 @@ this.pnlAll.Location = new System.Drawing.Point(0, 0); this.pnlAll.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.pnlAll.Name = "pnlAll"; - this.pnlAll.Size = new System.Drawing.Size(435, 183); + this.pnlAll.Size = new System.Drawing.Size(661, 298); this.pnlAll.TabIndex = 0; // // pnlCenter @@ -79,7 +79,7 @@ this.pnlCenter.Location = new System.Drawing.Point(12, 14); this.pnlCenter.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.pnlCenter.Name = "pnlCenter"; - this.pnlCenter.Size = new System.Drawing.Size(411, 159); + this.pnlCenter.Size = new System.Drawing.Size(637, 274); this.pnlCenter.TabIndex = 4; // // panel3 @@ -89,7 +89,7 @@ this.panel3.Location = new System.Drawing.Point(0, 0); this.panel3.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(411, 115); + this.panel3.Size = new System.Drawing.Size(637, 230); this.panel3.TabIndex = 1; // // groupBox1 @@ -105,7 +105,7 @@ this.groupBox1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.groupBox1.Name = "groupBox1"; this.groupBox1.Padding = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.groupBox1.Size = new System.Drawing.Size(411, 115); + this.groupBox1.Size = new System.Drawing.Size(637, 230); this.groupBox1.TabIndex = 0; this.groupBox1.TabStop = false; this.groupBox1.Text = "设置"; @@ -114,44 +114,44 @@ // this.dtpSource.CustomFormat = "yyyy-MM-dd HH:mm"; this.dtpSource.Format = System.Windows.Forms.DateTimePickerFormat.Custom; - this.dtpSource.Location = new System.Drawing.Point(159, 68); + this.dtpSource.Location = new System.Drawing.Point(202, 128); this.dtpSource.Name = "dtpSource"; - this.dtpSource.Size = new System.Drawing.Size(179, 23); + this.dtpSource.Size = new System.Drawing.Size(179, 27); this.dtpSource.TabIndex = 5; this.dtpSource.Value = new System.DateTime(2019, 6, 15, 0, 0, 0, 0); // // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(40, 71); + this.label4.Location = new System.Drawing.Point(40, 133); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(116, 17); + this.label4.Size = new System.Drawing.Size(144, 20); this.label4.TabIndex = 4; this.label4.Text = "获取数据初始时间："; // // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(342, 39); + this.label3.Location = new System.Drawing.Point(396, 38); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(32, 17); + this.label3.Size = new System.Drawing.Size(39, 20); this.label3.TabIndex = 3; this.label3.Text = "分钟"; // // numService // - this.numService.Location = new System.Drawing.Point(196, 35); + this.numService.Location = new System.Drawing.Point(241, 36); this.numService.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.numService.Name = "numService"; - this.numService.Size = new System.Drawing.Size(140, 23); + this.numService.Size = new System.Drawing.Size(140, 27); this.numService.TabIndex = 2; // // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(156, 38); + this.label2.Location = new System.Drawing.Point(180, 38); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(32, 17); + this.label2.Size = new System.Drawing.Size(39, 20); this.label2.TabIndex = 1; this.label2.Text = "每隔"; // @@ -160,7 +160,7 @@ this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(40, 38); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(116, 17); + this.label1.Size = new System.Drawing.Size(144, 20); this.label1.TabIndex = 0; this.label1.Text = "数据同步执行时间："; // @@ -169,10 +169,10 @@ this.panel1.Controls.Add(this.cbxAutoStart); this.panel1.Controls.Add(this.panel2); this.panel1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.panel1.Location = new System.Drawing.Point(0, 115); + this.panel1.Location = new System.Drawing.Point(0, 230); this.panel1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(411, 44); + this.panel1.Size = new System.Drawing.Size(637, 44); this.panel1.TabIndex = 0; // // cbxAutoStart @@ -180,7 +180,7 @@ this.cbxAutoStart.AutoSize = true; this.cbxAutoStart.Location = new System.Drawing.Point(24, 8); this.cbxAutoStart.Name = "cbxAutoStart"; - this.cbxAutoStart.Size = new System.Drawing.Size(99, 21); + this.cbxAutoStart.Size = new System.Drawing.Size(121, 24); this.cbxAutoStart.TabIndex = 1; this.cbxAutoStart.Text = "是否开机启动"; this.cbxAutoStart.UseVisualStyleBackColor = true; @@ -190,7 +190,7 @@ this.panel2.Controls.Add(this.btnInstallService); this.panel2.Controls.Add(this.btnRun); this.panel2.Dock = System.Windows.Forms.DockStyle.Right; - this.panel2.Location = new System.Drawing.Point(205, 0); + this.panel2.Location = new System.Drawing.Point(431, 0); this.panel2.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.panel2.Name = "panel2"; this.panel2.Size = new System.Drawing.Size(206, 44); @@ -221,10 +221,10 @@ // pnlRight // this.pnlRight.Dock = System.Windows.Forms.DockStyle.Right; - this.pnlRight.Location = new System.Drawing.Point(423, 14); + this.pnlRight.Location = new System.Drawing.Point(649, 14); this.pnlRight.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.pnlRight.Name = "pnlRight"; - this.pnlRight.Size = new System.Drawing.Size(12, 159); + this.pnlRight.Size = new System.Drawing.Size(12, 274); this.pnlRight.TabIndex = 3; // // pnlLeft @@ -233,16 +233,16 @@ this.pnlLeft.Location = new System.Drawing.Point(0, 14); this.pnlLeft.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.pnlLeft.Name = "pnlLeft"; - this.pnlLeft.Size = new System.Drawing.Size(12, 159); + this.pnlLeft.Size = new System.Drawing.Size(12, 274); this.pnlLeft.TabIndex = 2; // // pnlBottom // this.pnlBottom.Dock = System.Windows.Forms.DockStyle.Bottom; - this.pnlBottom.Location = new System.Drawing.Point(0, 173); + this.pnlBottom.Location = new System.Drawing.Point(0, 288); this.pnlBottom.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.pnlBottom.Name = "pnlBottom"; - this.pnlBottom.Size = new System.Drawing.Size(435, 10); + this.pnlBottom.Size = new System.Drawing.Size(661, 10); this.pnlBottom.TabIndex = 1; // // pnlTop @@ -251,14 +251,14 @@ this.pnlTop.Location = new System.Drawing.Point(0, 0); this.pnlTop.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.pnlTop.Name = "pnlTop"; - this.pnlTop.Size = new System.Drawing.Size(435, 14); + this.pnlTop.Size = new System.Drawing.Size(661, 14); this.pnlTop.TabIndex = 0; // // frmServiceConfig // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); + this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(435, 183); + this.ClientSize = new System.Drawing.Size(661, 298); this.Controls.Add(this.pnlAll); this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; diff --git a/CNAS_DBSync/frmSourceFilter.Designer.cs b/CNAS_DBSync/frmSourceFilter.Designer.cs index 921290d..31a19d9 100644 --- a/CNAS_DBSync/frmSourceFilter.Designer.cs +++ b/CNAS_DBSync/frmSourceFilter.Designer.cs @@ -60,7 +60,7 @@ this.groupBox1.Controls.Add(this.label1); this.groupBox1.Location = new System.Drawing.Point(13, 13); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(617, 358); + this.groupBox1.Size = new System.Drawing.Size(923, 580); this.groupBox1.TabIndex = 0; this.groupBox1.TabStop = false; this.groupBox1.Text = "来源数据过滤"; @@ -70,7 +70,7 @@ this.txtCurrentTableName.Location = new System.Drawing.Point(82, 24); this.txtCurrentTableName.Name = "txtCurrentTableName"; this.txtCurrentTableName.ReadOnly = true; - this.txtCurrentTableName.Size = new System.Drawing.Size(160, 23); + this.txtCurrentTableName.Size = new System.Drawing.Size(160, 27); this.txtCurrentTableName.TabIndex = 16; // // label2 @@ -78,7 +78,7 @@ this.label2.AutoSize = true; this.label2.Location = new System.Drawing.Point(281, 26); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(80, 17); + this.label2.Size = new System.Drawing.Size(99, 20); this.label2.TabIndex = 15; this.label2.Text = "条件间关系："; // @@ -89,16 +89,16 @@ this.cbxConditionLink.Items.AddRange(new object[] { "与", "或"}); - this.cbxConditionLink.Location = new System.Drawing.Point(364, 22); + this.cbxConditionLink.Location = new System.Drawing.Point(386, 23); this.cbxConditionLink.Name = "cbxConditionLink"; - this.cbxConditionLink.Size = new System.Drawing.Size(59, 25); + this.cbxConditionLink.Size = new System.Drawing.Size(255, 28); this.cbxConditionLink.TabIndex = 14; // // btnDelete // - this.btnDelete.Location = new System.Drawing.Point(532, 23); + this.btnDelete.Location = new System.Drawing.Point(782, 22); this.btnDelete.Name = "btnDelete"; - this.btnDelete.Size = new System.Drawing.Size(66, 23); + this.btnDelete.Size = new System.Drawing.Size(90, 30); this.btnDelete.TabIndex = 13; this.btnDelete.Text = "删除条件"; this.btnDelete.UseVisualStyleBackColor = true; @@ -122,7 +122,7 @@ this.Algorithm, this.ConditionValue, this.ColumnDataType}); - this.dgvConditions.Location = new System.Drawing.Point(6, 58); + this.dgvConditions.Location = new System.Drawing.Point(6, 55); this.dgvConditions.MultiSelect = false; this.dgvConditions.Name = "dgvConditions"; dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; @@ -137,7 +137,7 @@ dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; this.dgvConditions.RowsDefaultCellStyle = dataGridViewCellStyle3; this.dgvConditions.RowTemplate.Height = 23; - this.dgvConditions.Size = new System.Drawing.Size(605, 294); + this.dgvConditions.Size = new System.Drawing.Size(917, 515); this.dgvConditions.TabIndex = 12; this.dgvConditions.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvConditions_CellClick); this.dgvConditions.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvConditions_CellDoubleClick); @@ -148,9 +148,9 @@ // // btnAdd // - this.btnAdd.Location = new System.Drawing.Point(460, 23); + this.btnAdd.Location = new System.Drawing.Point(685, 22); this.btnAdd.Name = "btnAdd"; - this.btnAdd.Size = new System.Drawing.Size(66, 23); + this.btnAdd.Size = new System.Drawing.Size(91, 27); this.btnAdd.TabIndex = 11; this.btnAdd.Text = "新增条件"; this.btnAdd.UseVisualStyleBackColor = true; @@ -161,13 +161,13 @@ this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(8, 27); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(68, 17); + this.label1.Size = new System.Drawing.Size(84, 20); this.label1.TabIndex = 10; this.label1.Text = "当前表名："; // // btnOK // - this.btnOK.Location = new System.Drawing.Point(540, 377); + this.btnOK.Location = new System.Drawing.Point(846, 599); this.btnOK.Name = "btnOK"; this.btnOK.Size = new System.Drawing.Size(90, 30); this.btnOK.TabIndex = 1; @@ -181,7 +181,7 @@ this.ColumnName.HeaderText = "条件列"; this.ColumnName.Name = "ColumnName"; this.ColumnName.ReadOnly = true; - this.ColumnName.Width = 200; + this.ColumnName.Width = 250; // // Algorithm // @@ -191,6 +191,7 @@ this.Algorithm.ReadOnly = true; this.Algorithm.Resizable = System.Windows.Forms.DataGridViewTriState.True; this.Algorithm.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + this.Algorithm.Width = 250; // // ConditionValue // @@ -198,7 +199,7 @@ this.ConditionValue.HeaderText = "条件值"; this.ConditionValue.Name = "ConditionValue"; this.ConditionValue.ReadOnly = true; - this.ConditionValue.Width = 250; + this.ConditionValue.Width = 300; // // ColumnDataType // @@ -210,9 +211,9 @@ // // frmSourceFilter // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); + this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(642, 412); + this.ClientSize = new System.Drawing.Size(972, 641); this.Controls.Add(this.btnOK); this.Controls.Add(this.groupBox1); this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); diff --git a/CNAS_DBSync/frmSourceSetting.Designer.cs b/CNAS_DBSync/frmSourceSetting.Designer.cs index 7e8bb57..a8d0f26 100644 --- a/CNAS_DBSync/frmSourceSetting.Designer.cs +++ b/CNAS_DBSync/frmSourceSetting.Designer.cs @@ -146,7 +146,7 @@ // // btnOK // - this.btnOK.Location = new System.Drawing.Point(567, 6); + this.btnOK.Location = new System.Drawing.Point(965, 9); this.btnOK.Name = "btnOK"; this.btnOK.Size = new System.Drawing.Size(90, 30); this.btnOK.TabIndex = 0; @@ -158,9 +158,9 @@ // this.pnlBottom.Controls.Add(this.btnOK); this.pnlBottom.Dock = System.Windows.Forms.DockStyle.Bottom; - this.pnlBottom.Location = new System.Drawing.Point(0, 504); + this.pnlBottom.Location = new System.Drawing.Point(0, 501); this.pnlBottom.Name = "pnlBottom"; - this.pnlBottom.Size = new System.Drawing.Size(936, 42); + this.pnlBottom.Size = new System.Drawing.Size(1182, 42); this.pnlBottom.TabIndex = 3; // // pnlTop @@ -168,7 +168,7 @@ this.pnlTop.Dock = System.Windows.Forms.DockStyle.Top; this.pnlTop.Location = new System.Drawing.Point(0, 0); this.pnlTop.Name = "pnlTop"; - this.pnlTop.Size = new System.Drawing.Size(936, 10); + this.pnlTop.Size = new System.Drawing.Size(1182, 10); this.pnlTop.TabIndex = 2; // // pnlCenter @@ -177,7 +177,7 @@ this.pnlCenter.Dock = System.Windows.Forms.DockStyle.Fill; this.pnlCenter.Location = new System.Drawing.Point(0, 10); this.pnlCenter.Name = "pnlCenter"; - this.pnlCenter.Size = new System.Drawing.Size(936, 494); + this.pnlCenter.Size = new System.Drawing.Size(1182, 491); this.pnlCenter.TabIndex = 4; // // tabcDS @@ -194,7 +194,7 @@ this.tabcDS.Location = new System.Drawing.Point(0, 0); this.tabcDS.Name = "tabcDS"; this.tabcDS.SelectedIndex = 0; - this.tabcDS.Size = new System.Drawing.Size(936, 494); + this.tabcDS.Size = new System.Drawing.Size(1182, 491); this.tabcDS.TabIndex = 7; this.tabcDS.Selected += new System.Windows.Forms.TabControlEventHandler(this.tabcDS_Selected); // @@ -213,17 +213,17 @@ 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(8, 45); + this.tabExcel.Location = new System.Drawing.Point(4, 29); this.tabExcel.Name = "tabExcel"; this.tabExcel.Padding = new System.Windows.Forms.Padding(3); - this.tabExcel.Size = new System.Drawing.Size(920, 441); + this.tabExcel.Size = new System.Drawing.Size(1174, 458); this.tabExcel.TabIndex = 0; this.tabExcel.Text = "Excel"; this.tabExcel.UseVisualStyleBackColor = true; // // txtExcelAutoSql // - this.txtExcelAutoSql.Location = new System.Drawing.Point(209, 193); + 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); @@ -233,9 +233,9 @@ // // txtExcelAutoSqlName // - this.txtExcelAutoSqlName.Location = new System.Drawing.Point(209, 158); + this.txtExcelAutoSqlName.Location = new System.Drawing.Point(232, 206); this.txtExcelAutoSqlName.Name = "txtExcelAutoSqlName"; - this.txtExcelAutoSqlName.Size = new System.Drawing.Size(230, 39); + this.txtExcelAutoSqlName.Size = new System.Drawing.Size(230, 27); this.txtExcelAutoSqlName.TabIndex = 47; this.txtExcelAutoSqlName.Enter += new System.EventHandler(this.txtExcelAutoSqlName_Enter); this.txtExcelAutoSqlName.Leave += new System.EventHandler(this.txtExcelAutoSqlName_Leave); @@ -243,18 +243,18 @@ // lbExcelDynQuery // this.lbExcelDynQuery.AutoSize = true; - this.lbExcelDynQuery.Location = new System.Drawing.Point(97, 161); + this.lbExcelDynQuery.Location = new System.Drawing.Point(97, 209); this.lbExcelDynQuery.Name = "lbExcelDynQuery"; - this.lbExcelDynQuery.Size = new System.Drawing.Size(206, 31); + this.lbExcelDynQuery.Size = new System.Drawing.Size(129, 20); this.lbExcelDynQuery.TabIndex = 46; this.lbExcelDynQuery.Text = "自定义查询语句："; // // cbxExcelReadFolder // this.cbxExcelReadFolder.AutoSize = true; - this.cbxExcelReadFolder.Location = new System.Drawing.Point(561, 121); + this.cbxExcelReadFolder.Location = new System.Drawing.Point(560, 150); this.cbxExcelReadFolder.Name = "cbxExcelReadFolder"; - this.cbxExcelReadFolder.Size = new System.Drawing.Size(166, 35); + this.cbxExcelReadFolder.Size = new System.Drawing.Size(106, 24); this.cbxExcelReadFolder.TabIndex = 32; this.cbxExcelReadFolder.Text = "读取文件夹"; this.cbxExcelReadFolder.UseVisualStyleBackColor = true; @@ -265,9 +265,9 @@ this.cbxExcelReadFile.AutoSize = true; this.cbxExcelReadFile.Checked = true; this.cbxExcelReadFile.CheckState = System.Windows.Forms.CheckState.Checked; - this.cbxExcelReadFile.Location = new System.Drawing.Point(312, 121); + this.cbxExcelReadFile.Location = new System.Drawing.Point(311, 150); this.cbxExcelReadFile.Name = "cbxExcelReadFile"; - this.cbxExcelReadFile.Size = new System.Drawing.Size(142, 35); + this.cbxExcelReadFile.Size = new System.Drawing.Size(91, 24); this.cbxExcelReadFile.TabIndex = 31; this.cbxExcelReadFile.Text = "读取文件"; this.cbxExcelReadFile.UseVisualStyleBackColor = true; @@ -278,7 +278,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(268, 35); + this.cbxExcelNewVersion.Size = new System.Drawing.Size(172, 24); this.cbxExcelNewVersion.TabIndex = 25; this.cbxExcelNewVersion.Text = "office 2007以后版本"; this.cbxExcelNewVersion.UseVisualStyleBackColor = true; @@ -289,33 +289,33 @@ this.label22.AutoSize = true; this.label22.Location = new System.Drawing.Point(90, 15); this.label22.Name = "label22"; - this.label22.Size = new System.Drawing.Size(218, 31); + this.label22.Size = new System.Drawing.Size(138, 20); this.label22.TabIndex = 24; this.label22.Text = "Office Excel版本："; // // lblExcelRemotePwd // this.lblExcelRemotePwd.AutoSize = true; - this.lblExcelRemotePwd.Location = new System.Drawing.Point(60, 121); + this.lblExcelRemotePwd.Location = new System.Drawing.Point(59, 150); this.lblExcelRemotePwd.Name = "lblExcelRemotePwd"; - this.lblExcelRemotePwd.Size = new System.Drawing.Size(280, 31); + this.lblExcelRemotePwd.Size = new System.Drawing.Size(175, 20); this.lblExcelRemotePwd.TabIndex = 10; this.lblExcelRemotePwd.Text = "读取模式(文件/文件夹)："; // // lblExcelRemoteUser // this.lblExcelRemoteUser.AutoSize = true; - this.lblExcelRemoteUser.Location = new System.Drawing.Point(85, 87); + this.lblExcelRemoteUser.Location = new System.Drawing.Point(86, 97); this.lblExcelRemoteUser.Name = "lblExcelRemoteUser"; - this.lblExcelRemoteUser.Size = new System.Drawing.Size(230, 31); + this.lblExcelRemoteUser.Size = new System.Drawing.Size(144, 20); this.lblExcelRemoteUser.TabIndex = 8; this.lblExcelRemoteUser.Text = "自定义文件名格式："; // // txtExcelFileNameFormat // - this.txtExcelFileNameFormat.Location = new System.Drawing.Point(207, 84); + this.txtExcelFileNameFormat.Location = new System.Drawing.Point(236, 94); this.txtExcelFileNameFormat.Name = "txtExcelFileNameFormat"; - this.txtExcelFileNameFormat.Size = new System.Drawing.Size(230, 39); + this.txtExcelFileNameFormat.Size = new System.Drawing.Size(230, 27); this.txtExcelFileNameFormat.TabIndex = 6; this.txtExcelFileNameFormat.Enter += new System.EventHandler(this.txtExcelFileNameFormat_Enter); this.txtExcelFileNameFormat.Leave += new System.EventHandler(this.txtExcelFileNameFormat_Leave); @@ -327,7 +327,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(268, 35); + this.cbxExcelOldVersion.Size = new System.Drawing.Size(172, 24); this.cbxExcelOldVersion.TabIndex = 4; this.cbxExcelOldVersion.Text = "office 2007以前版本"; this.cbxExcelOldVersion.UseVisualStyleBackColor = true; @@ -338,15 +338,15 @@ this.lbExcelDateFormat.AutoSize = true; this.lbExcelDateFormat.Location = new System.Drawing.Point(97, 50); this.lbExcelDateFormat.Name = "lbExcelDateFormat"; - this.lbExcelDateFormat.Size = new System.Drawing.Size(206, 31); + this.lbExcelDateFormat.Size = new System.Drawing.Size(129, 20); this.lbExcelDateFormat.TabIndex = 5; this.lbExcelDateFormat.Text = "日期列特殊格式："; // // txtExcelSpecialDateColumnFormat // - this.txtExcelSpecialDateColumnFormat.Location = new System.Drawing.Point(207, 47); + this.txtExcelSpecialDateColumnFormat.Location = new System.Drawing.Point(235, 47); this.txtExcelSpecialDateColumnFormat.Name = "txtExcelSpecialDateColumnFormat"; - this.txtExcelSpecialDateColumnFormat.Size = new System.Drawing.Size(230, 39); + this.txtExcelSpecialDateColumnFormat.Size = new System.Drawing.Size(230, 27); this.txtExcelSpecialDateColumnFormat.TabIndex = 5; this.txtExcelSpecialDateColumnFormat.Enter += new System.EventHandler(this.txtExcelSpecialDateColumnFormat_Enter); this.txtExcelSpecialDateColumnFormat.Leave += new System.EventHandler(this.txtExcelSpecialDateColumnFormat_Leave); @@ -366,10 +366,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(8, 45); + this.tabFoxPro.Location = new System.Drawing.Point(4, 29); this.tabFoxPro.Name = "tabFoxPro"; this.tabFoxPro.Padding = new System.Windows.Forms.Padding(3); - this.tabFoxPro.Size = new System.Drawing.Size(920, 441); + this.tabFoxPro.Size = new System.Drawing.Size(1174, 568); this.tabFoxPro.TabIndex = 6; this.tabFoxPro.Text = "FoxPro"; this.tabFoxPro.UseVisualStyleBackColor = true; @@ -378,14 +378,14 @@ // this.txtFoxProSpecialMethodName.Location = new System.Drawing.Point(213, 221); this.txtFoxProSpecialMethodName.Name = "txtFoxProSpecialMethodName"; - this.txtFoxProSpecialMethodName.Size = new System.Drawing.Size(230, 39); + this.txtFoxProSpecialMethodName.Size = new System.Drawing.Size(230, 27); this.txtFoxProSpecialMethodName.TabIndex = 65; this.txtFoxProSpecialMethodName.Enter += new System.EventHandler(this.txtFoxProSpecialMethodName_Enter); this.txtFoxProSpecialMethodName.Leave += new System.EventHandler(this.txtFoxProSpecialMethodName_Leave); // // txtFoxProSpecialMethod // - this.txtFoxProSpecialMethod.Location = new System.Drawing.Point(213, 250); + this.txtFoxProSpecialMethod.Location = new System.Drawing.Point(213, 261); this.txtFoxProSpecialMethod.Multiline = true; this.txtFoxProSpecialMethod.Name = "txtFoxProSpecialMethod"; this.txtFoxProSpecialMethod.Size = new System.Drawing.Size(230, 64); @@ -398,7 +398,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(134, 31); + this.label27.Size = new System.Drawing.Size(84, 20); this.label27.TabIndex = 64; this.label27.Text = "补充方法："; // @@ -407,7 +407,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(206, 31); + this.label33.Size = new System.Drawing.Size(129, 20); this.label33.TabIndex = 63; this.label33.Text = "自定义查询语句："; // @@ -415,7 +415,7 @@ // this.txtFoxProAutoSqlName.Location = new System.Drawing.Point(213, 124); this.txtFoxProAutoSqlName.Name = "txtFoxProAutoSqlName"; - this.txtFoxProAutoSqlName.Size = new System.Drawing.Size(230, 39); + this.txtFoxProAutoSqlName.Size = new System.Drawing.Size(230, 27); this.txtFoxProAutoSqlName.TabIndex = 58; this.txtFoxProAutoSqlName.Enter += new System.EventHandler(this.txtFoxProAutoSqlName_Enter); this.txtFoxProAutoSqlName.Leave += new System.EventHandler(this.txtFoxProAutoSqlName_Leave); @@ -425,7 +425,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(166, 35); + this.cbxFoxProReadFolder.Size = new System.Drawing.Size(106, 24); this.cbxFoxProReadFolder.TabIndex = 62; this.cbxFoxProReadFolder.Text = "读取文件夹"; this.cbxFoxProReadFolder.UseVisualStyleBackColor = true; @@ -448,7 +448,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(142, 35); + this.cbxFoxProReadFile.Size = new System.Drawing.Size(91, 24); this.cbxFoxProReadFile.TabIndex = 61; this.cbxFoxProReadFile.Text = "读取文件"; this.cbxFoxProReadFile.UseVisualStyleBackColor = true; @@ -459,7 +459,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(280, 31); + this.label35.Size = new System.Drawing.Size(175, 20); this.label35.TabIndex = 53; this.label35.Text = "读取模式(文件/文件夹)："; // @@ -468,7 +468,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(230, 31); + this.label38.Size = new System.Drawing.Size(144, 20); this.label38.TabIndex = 52; this.label38.Text = "自定义文件名格式："; // @@ -476,7 +476,7 @@ // this.txtFoxProFileNameFormat.Location = new System.Drawing.Point(213, 87); this.txtFoxProFileNameFormat.Name = "txtFoxProFileNameFormat"; - this.txtFoxProFileNameFormat.Size = new System.Drawing.Size(230, 39); + this.txtFoxProFileNameFormat.Size = new System.Drawing.Size(230, 27); this.txtFoxProFileNameFormat.TabIndex = 51; this.txtFoxProFileNameFormat.Enter += new System.EventHandler(this.txtFoxProFileNameFormat_Enter); this.txtFoxProFileNameFormat.Leave += new System.EventHandler(this.txtFoxProFileNameFormat_Leave); @@ -486,7 +486,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(206, 31); + this.label39.Size = new System.Drawing.Size(129, 20); this.label39.TabIndex = 49; this.label39.Text = "日期列特殊格式："; // @@ -494,7 +494,7 @@ // this.txtFoxProSpecialDateColumnFormat.Location = new System.Drawing.Point(213, 50); this.txtFoxProSpecialDateColumnFormat.Name = "txtFoxProSpecialDateColumnFormat"; - this.txtFoxProSpecialDateColumnFormat.Size = new System.Drawing.Size(230, 39); + this.txtFoxProSpecialDateColumnFormat.Size = new System.Drawing.Size(230, 27); this.txtFoxProSpecialDateColumnFormat.TabIndex = 50; this.txtFoxProSpecialDateColumnFormat.Enter += new System.EventHandler(this.txtFoxProSpecialDateColumnFormat_Enter); this.txtFoxProSpecialDateColumnFormat.Leave += new System.EventHandler(this.txtFoxProSpecialDateColumnFormat_Leave); @@ -516,10 +516,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(8, 45); + this.tabAccess.Location = new System.Drawing.Point(4, 29); this.tabAccess.Name = "tabAccess"; this.tabAccess.Padding = new System.Windows.Forms.Padding(3); - this.tabAccess.Size = new System.Drawing.Size(920, 441); + this.tabAccess.Size = new System.Drawing.Size(928, 461); this.tabAccess.TabIndex = 1; this.tabAccess.Text = "Access"; this.tabAccess.UseVisualStyleBackColor = true; @@ -529,7 +529,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(187, 31); + this.label2.Size = new System.Drawing.Size(119, 20); this.label2.TabIndex = 48; this.label2.Text = "Access后缀名："; // @@ -537,7 +537,7 @@ // this.txtAccessSuffix.Location = new System.Drawing.Point(205, 50); this.txtAccessSuffix.Name = "txtAccessSuffix"; - this.txtAccessSuffix.Size = new System.Drawing.Size(230, 39); + this.txtAccessSuffix.Size = new System.Drawing.Size(230, 27); this.txtAccessSuffix.TabIndex = 49; this.txtAccessSuffix.Enter += new System.EventHandler(this.txtAccessSuffix_Enter); this.txtAccessSuffix.Leave += new System.EventHandler(this.txtAccessSuffix_Leave); @@ -547,7 +547,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(166, 35); + this.cbxAccessReadFolder.Size = new System.Drawing.Size(106, 24); this.cbxAccessReadFolder.TabIndex = 47; this.cbxAccessReadFolder.Text = "读取文件夹"; this.cbxAccessReadFolder.UseVisualStyleBackColor = true; @@ -560,7 +560,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(142, 35); + this.cbxAccessReadFile.Size = new System.Drawing.Size(91, 24); this.cbxAccessReadFile.TabIndex = 46; this.cbxAccessReadFile.Text = "读取文件"; this.cbxAccessReadFile.UseVisualStyleBackColor = true; @@ -580,7 +580,7 @@ // this.txtAccessAutoSqlName.Location = new System.Drawing.Point(205, 195); this.txtAccessAutoSqlName.Name = "txtAccessAutoSqlName"; - this.txtAccessAutoSqlName.Size = new System.Drawing.Size(230, 39); + this.txtAccessAutoSqlName.Size = new System.Drawing.Size(230, 27); this.txtAccessAutoSqlName.TabIndex = 43; this.txtAccessAutoSqlName.Enter += new System.EventHandler(this.txtAccessAutoSqlName_Enter); this.txtAccessAutoSqlName.Leave += new System.EventHandler(this.txtAccessAutoSqlName_Leave); @@ -590,7 +590,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(206, 31); + this.label11.Size = new System.Drawing.Size(129, 20); this.label11.TabIndex = 41; this.label11.Text = "自定义查询语句："; // @@ -599,7 +599,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(268, 35); + this.cbxAccessNewVersion.Size = new System.Drawing.Size(172, 24); this.cbxAccessNewVersion.TabIndex = 40; this.cbxAccessNewVersion.Text = "office 2007以后版本"; this.cbxAccessNewVersion.UseVisualStyleBackColor = true; @@ -610,7 +610,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(238, 31); + this.label15.Size = new System.Drawing.Size(151, 20); this.label15.TabIndex = 39; this.label15.Text = "Office Access版本："; // @@ -619,7 +619,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(280, 31); + this.label16.Size = new System.Drawing.Size(175, 20); this.label16.TabIndex = 38; this.label16.Text = "读取模式(文件/文件夹)："; // @@ -628,7 +628,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(230, 31); + this.label21.Size = new System.Drawing.Size(144, 20); this.label21.TabIndex = 37; this.label21.Text = "自定义文件名格式："; // @@ -636,7 +636,7 @@ // this.txtAccessFileName.Location = new System.Drawing.Point(205, 124); this.txtAccessFileName.Name = "txtAccessFileName"; - this.txtAccessFileName.Size = new System.Drawing.Size(230, 39); + this.txtAccessFileName.Size = new System.Drawing.Size(230, 27); this.txtAccessFileName.TabIndex = 36; this.txtAccessFileName.Enter += new System.EventHandler(this.txtAccessFileName_Enter); this.txtAccessFileName.Leave += new System.EventHandler(this.txtAccessFileName_Leave); @@ -648,7 +648,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(268, 35); + this.cbxAccessOldVersion.Size = new System.Drawing.Size(172, 24); this.cbxAccessOldVersion.TabIndex = 33; this.cbxAccessOldVersion.Text = "office 2007以前版本"; this.cbxAccessOldVersion.UseVisualStyleBackColor = true; @@ -659,7 +659,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(206, 31); + this.label31.Size = new System.Drawing.Size(129, 20); this.label31.TabIndex = 34; this.label31.Text = "日期列特殊格式："; // @@ -667,7 +667,7 @@ // this.txtAccessSpecialDateColumnFormat.Location = new System.Drawing.Point(205, 87); this.txtAccessSpecialDateColumnFormat.Name = "txtAccessSpecialDateColumnFormat"; - this.txtAccessSpecialDateColumnFormat.Size = new System.Drawing.Size(230, 39); + this.txtAccessSpecialDateColumnFormat.Size = new System.Drawing.Size(230, 27); this.txtAccessSpecialDateColumnFormat.TabIndex = 35; this.txtAccessSpecialDateColumnFormat.Enter += new System.EventHandler(this.txtAccessSpecialDateColumnFormat_Enter); this.txtAccessSpecialDateColumnFormat.Leave += new System.EventHandler(this.txtAccessSpecialDateColumnFormat_Leave); @@ -684,9 +684,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(8, 45); + this.tabSQLite.Location = new System.Drawing.Point(4, 29); this.tabSQLite.Name = "tabSQLite"; - this.tabSQLite.Size = new System.Drawing.Size(920, 441); + this.tabSQLite.Size = new System.Drawing.Size(928, 461); this.tabSQLite.TabIndex = 2; this.tabSQLite.Text = "SQLLite"; this.tabSQLite.UseVisualStyleBackColor = true; @@ -696,7 +696,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(206, 31); + this.label5.Size = new System.Drawing.Size(129, 20); this.label5.TabIndex = 76; this.label5.Text = "自定义查询语句："; // @@ -704,7 +704,7 @@ // this.txtSqliteAutoSqlName.Location = new System.Drawing.Point(206, 120); this.txtSqliteAutoSqlName.Name = "txtSqliteAutoSqlName"; - this.txtSqliteAutoSqlName.Size = new System.Drawing.Size(230, 39); + this.txtSqliteAutoSqlName.Size = new System.Drawing.Size(230, 27); this.txtSqliteAutoSqlName.TabIndex = 72; this.txtSqliteAutoSqlName.Enter += new System.EventHandler(this.txtSqliteAutoSqlName_Enter); this.txtSqliteAutoSqlName.Leave += new System.EventHandler(this.txtSqliteAutoSqlName_Leave); @@ -714,7 +714,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(166, 35); + this.cbxSqliteReadFolder.Size = new System.Drawing.Size(106, 24); this.cbxSqliteReadFolder.TabIndex = 75; this.cbxSqliteReadFolder.Text = "读取文件夹"; this.cbxSqliteReadFolder.UseVisualStyleBackColor = true; @@ -737,7 +737,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(142, 35); + this.cbxSqliteReadFile.Size = new System.Drawing.Size(91, 24); this.cbxSqliteReadFile.TabIndex = 74; this.cbxSqliteReadFile.Text = "读取文件"; this.cbxSqliteReadFile.UseVisualStyleBackColor = true; @@ -748,7 +748,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(280, 31); + this.label6.Size = new System.Drawing.Size(175, 20); this.label6.TabIndex = 71; this.label6.Text = "读取模式(文件/文件夹)："; // @@ -757,7 +757,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(230, 31); + this.label7.Size = new System.Drawing.Size(144, 20); this.label7.TabIndex = 70; this.label7.Text = "自定义文件名格式："; // @@ -765,7 +765,7 @@ // this.txtSqliteFileNameFormat.Location = new System.Drawing.Point(206, 85); this.txtSqliteFileNameFormat.Name = "txtSqliteFileNameFormat"; - this.txtSqliteFileNameFormat.Size = new System.Drawing.Size(230, 39); + this.txtSqliteFileNameFormat.Size = new System.Drawing.Size(230, 27); this.txtSqliteFileNameFormat.TabIndex = 69; this.txtSqliteFileNameFormat.Enter += new System.EventHandler(this.txtSqliteFileNameFormat_Enter); this.txtSqliteFileNameFormat.Leave += new System.EventHandler(this.txtSqliteFileNameFormat_Leave); @@ -775,7 +775,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(206, 31); + this.label8.Size = new System.Drawing.Size(129, 20); this.label8.TabIndex = 67; this.label8.Text = "日期列特殊格式："; // @@ -783,7 +783,7 @@ // this.txtSqliteSpecialDateColumnFormat.Location = new System.Drawing.Point(206, 50); this.txtSqliteSpecialDateColumnFormat.Name = "txtSqliteSpecialDateColumnFormat"; - this.txtSqliteSpecialDateColumnFormat.Size = new System.Drawing.Size(230, 39); + this.txtSqliteSpecialDateColumnFormat.Size = new System.Drawing.Size(230, 27); this.txtSqliteSpecialDateColumnFormat.TabIndex = 68; this.txtSqliteSpecialDateColumnFormat.Enter += new System.EventHandler(this.txtSqliteSpecialDateColumnFormat_Enter); this.txtSqliteSpecialDateColumnFormat.Leave += new System.EventHandler(this.txtSqliteSpecialDateColumnFormat_Leave); @@ -797,9 +797,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(8, 45); + this.tabSQLServer.Location = new System.Drawing.Point(4, 29); this.tabSQLServer.Name = "tabSQLServer"; - this.tabSQLServer.Size = new System.Drawing.Size(920, 441); + this.tabSQLServer.Size = new System.Drawing.Size(928, 461); this.tabSQLServer.TabIndex = 3; this.tabSQLServer.Text = "SQL Server"; this.tabSQLServer.UseVisualStyleBackColor = true; @@ -809,7 +809,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(206, 31); + this.label9.Size = new System.Drawing.Size(129, 20); this.label9.TabIndex = 76; this.label9.Text = "自定义查询语句："; // @@ -817,7 +817,7 @@ // this.txtSqlServerAutoSqlName.Location = new System.Drawing.Point(208, 113); this.txtSqlServerAutoSqlName.Name = "txtSqlServerAutoSqlName"; - this.txtSqlServerAutoSqlName.Size = new System.Drawing.Size(230, 39); + this.txtSqlServerAutoSqlName.Size = new System.Drawing.Size(230, 27); this.txtSqlServerAutoSqlName.TabIndex = 72; this.txtSqlServerAutoSqlName.Enter += new System.EventHandler(this.txtSqlServerAutoSqlName_Enter); this.txtSqlServerAutoSqlName.Leave += new System.EventHandler(this.txtSqlServerAutoSqlName_Leave); @@ -837,7 +837,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(230, 31); + this.label12.Size = new System.Drawing.Size(144, 20); this.label12.TabIndex = 70; this.label12.Text = "自定义连接字符串："; // @@ -856,7 +856,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(206, 31); + this.label13.Size = new System.Drawing.Size(129, 20); this.label13.TabIndex = 67; this.label13.Text = "日期列特殊格式："; // @@ -864,7 +864,7 @@ // this.txtSqlServerSpecialDateColumnFormat.Location = new System.Drawing.Point(208, 15); this.txtSqlServerSpecialDateColumnFormat.Name = "txtSqlServerSpecialDateColumnFormat"; - this.txtSqlServerSpecialDateColumnFormat.Size = new System.Drawing.Size(230, 39); + this.txtSqlServerSpecialDateColumnFormat.Size = new System.Drawing.Size(230, 27); this.txtSqlServerSpecialDateColumnFormat.TabIndex = 68; this.txtSqlServerSpecialDateColumnFormat.Enter += new System.EventHandler(this.txtSqlServerSpecialDateColumnFormat_Enter); this.txtSqlServerSpecialDateColumnFormat.Leave += new System.EventHandler(this.txtSqlServerSpecialDateColumnFormat_Leave); @@ -876,9 +876,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(8, 45); + this.tabMySql.Location = new System.Drawing.Point(4, 29); this.tabMySql.Name = "tabMySql"; - this.tabMySql.Size = new System.Drawing.Size(920, 441); + this.tabMySql.Size = new System.Drawing.Size(928, 461); this.tabMySql.TabIndex = 4; this.tabMySql.Text = "MySql"; this.tabMySql.UseVisualStyleBackColor = true; @@ -888,7 +888,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(206, 31); + this.label14.Size = new System.Drawing.Size(129, 20); this.label14.TabIndex = 86; this.label14.Text = "自定义查询语句："; // @@ -896,7 +896,7 @@ // this.txtMySqlAutoSqlName.Location = new System.Drawing.Point(207, 57); this.txtMySqlAutoSqlName.Name = "txtMySqlAutoSqlName"; - this.txtMySqlAutoSqlName.Size = new System.Drawing.Size(230, 39); + this.txtMySqlAutoSqlName.Size = new System.Drawing.Size(230, 27); this.txtMySqlAutoSqlName.TabIndex = 84; this.txtMySqlAutoSqlName.Enter += new System.EventHandler(this.txtMySqlAutoSqlName_Enter); this.txtMySqlAutoSqlName.Leave += new System.EventHandler(this.txtMySqlAutoSqlName_Leave); @@ -916,7 +916,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(206, 31); + this.label18.Size = new System.Drawing.Size(129, 20); this.label18.TabIndex = 80; this.label18.Text = "日期列特殊格式："; // @@ -924,7 +924,7 @@ // this.txtMySqlSpecialDateColumnFormat.Location = new System.Drawing.Point(207, 22); this.txtMySqlSpecialDateColumnFormat.Name = "txtMySqlSpecialDateColumnFormat"; - this.txtMySqlSpecialDateColumnFormat.Size = new System.Drawing.Size(230, 39); + this.txtMySqlSpecialDateColumnFormat.Size = new System.Drawing.Size(230, 27); this.txtMySqlSpecialDateColumnFormat.TabIndex = 81; this.txtMySqlSpecialDateColumnFormat.Enter += new System.EventHandler(this.txtMySqlSpecialDateColumnFormat_Enter); this.txtMySqlSpecialDateColumnFormat.Leave += new System.EventHandler(this.txtMySqlSpecialDateColumnFormat_Leave); @@ -936,10 +936,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(8, 45); + this.tabOracle.Location = new System.Drawing.Point(4, 29); this.tabOracle.Name = "tabOracle"; this.tabOracle.Padding = new System.Windows.Forms.Padding(3); - this.tabOracle.Size = new System.Drawing.Size(920, 441); + this.tabOracle.Size = new System.Drawing.Size(928, 461); this.tabOracle.TabIndex = 5; this.tabOracle.Text = "Oracle"; this.tabOracle.UseVisualStyleBackColor = true; @@ -949,7 +949,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(206, 31); + this.label4.Size = new System.Drawing.Size(129, 20); this.label4.TabIndex = 91; this.label4.Text = "自定义查询语句："; // @@ -957,7 +957,7 @@ // this.txtOracleAutoSqlName.Location = new System.Drawing.Point(210, 62); this.txtOracleAutoSqlName.Name = "txtOracleAutoSqlName"; - this.txtOracleAutoSqlName.Size = new System.Drawing.Size(230, 39); + this.txtOracleAutoSqlName.Size = new System.Drawing.Size(230, 27); this.txtOracleAutoSqlName.TabIndex = 89; this.txtOracleAutoSqlName.Enter += new System.EventHandler(this.txtOracleAutoSqlName_Enter); this.txtOracleAutoSqlName.Leave += new System.EventHandler(this.txtOracleAutoSqlName_Leave); @@ -977,7 +977,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(206, 31); + this.label10.Size = new System.Drawing.Size(129, 20); this.label10.TabIndex = 87; this.label10.Text = "日期列特殊格式："; // @@ -985,7 +985,7 @@ // this.txtOracleSpecialDateColumnFormat.Location = new System.Drawing.Point(210, 27); this.txtOracleSpecialDateColumnFormat.Name = "txtOracleSpecialDateColumnFormat"; - this.txtOracleSpecialDateColumnFormat.Size = new System.Drawing.Size(230, 39); + this.txtOracleSpecialDateColumnFormat.Size = new System.Drawing.Size(230, 27); this.txtOracleSpecialDateColumnFormat.TabIndex = 88; this.txtOracleSpecialDateColumnFormat.Enter += new System.EventHandler(this.txtOracleSpecialDateColumnFormat_Enter); this.txtOracleSpecialDateColumnFormat.Leave += new System.EventHandler(this.txtOracleSpecialDateColumnFormat_Leave); @@ -1010,10 +1010,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(8, 45); + this.tabTxt.Location = new System.Drawing.Point(4, 29); this.tabTxt.Name = "tabTxt"; this.tabTxt.Padding = new System.Windows.Forms.Padding(3); - this.tabTxt.Size = new System.Drawing.Size(920, 441); + this.tabTxt.Size = new System.Drawing.Size(928, 461); this.tabTxt.TabIndex = 7; this.tabTxt.Text = "TXT"; this.tabTxt.UseVisualStyleBackColor = true; @@ -1025,7 +1025,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(70, 35); + this.cbxNormalFileNoCustomDate.Size = new System.Drawing.Size(46, 24); this.cbxNormalFileNoCustomDate.TabIndex = 67; this.cbxNormalFileNoCustomDate.Text = "否"; this.cbxNormalFileNoCustomDate.UseVisualStyleBackColor = true; @@ -1036,7 +1036,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(70, 35); + this.cbxNormalFileCustomDate.Size = new System.Drawing.Size(46, 24); this.cbxNormalFileCustomDate.TabIndex = 66; this.cbxNormalFileCustomDate.Text = "是"; this.cbxNormalFileCustomDate.UseVisualStyleBackColor = true; @@ -1051,7 +1051,7 @@ 0, 0}); this.numNormalFileStartIndex.Name = "numNormalFileStartIndex"; - this.numNormalFileStartIndex.Size = new System.Drawing.Size(120, 39); + this.numNormalFileStartIndex.Size = new System.Drawing.Size(120, 27); this.numNormalFileStartIndex.TabIndex = 65; this.numNormalFileStartIndex.Value = new decimal(new int[] { 1, @@ -1064,7 +1064,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(278, 31); + this.label20.Size = new System.Drawing.Size(174, 20); this.label20.TabIndex = 64; this.label20.Text = "是否由系统创建日期列："; // @@ -1073,7 +1073,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(206, 31); + this.label19.Size = new System.Drawing.Size(129, 20); this.label19.TabIndex = 62; this.label19.Text = "数据行起始行号："; // @@ -1082,7 +1082,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(206, 31); + this.label17.Size = new System.Drawing.Size(129, 20); this.label17.TabIndex = 60; this.label17.Text = "分割数据行选型："; // @@ -1090,7 +1090,7 @@ // this.txtNormalFileReadSplitMode.Location = new System.Drawing.Point(207, 206); this.txtNormalFileReadSplitMode.Name = "txtNormalFileReadSplitMode"; - this.txtNormalFileReadSplitMode.Size = new System.Drawing.Size(230, 39); + this.txtNormalFileReadSplitMode.Size = new System.Drawing.Size(230, 27); this.txtNormalFileReadSplitMode.TabIndex = 59; this.txtNormalFileReadSplitMode.Enter += new System.EventHandler(this.txtNormalFileReadSplitMode_Enter); this.txtNormalFileReadSplitMode.Leave += new System.EventHandler(this.txtNormalFileReadSplitMode_Leave); @@ -1100,7 +1100,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(182, 31); + this.label30.Size = new System.Drawing.Size(114, 20); this.label30.TabIndex = 58; this.label30.Text = "读取方法选型："; // @@ -1108,7 +1108,7 @@ // this.txtNormalFileReadDataMode.Location = new System.Drawing.Point(207, 167); this.txtNormalFileReadDataMode.Name = "txtNormalFileReadDataMode"; - this.txtNormalFileReadDataMode.Size = new System.Drawing.Size(230, 39); + this.txtNormalFileReadDataMode.Size = new System.Drawing.Size(230, 27); this.txtNormalFileReadDataMode.TabIndex = 57; this.txtNormalFileReadDataMode.Enter += new System.EventHandler(this.txtNormalFileReadDataMode_Enter); this.txtNormalFileReadDataMode.Leave += new System.EventHandler(this.txtNormalFileReadDataMode_Leave); @@ -1118,7 +1118,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(230, 31); + this.label29.Size = new System.Drawing.Size(144, 20); this.label29.TabIndex = 56; this.label29.Text = "自定义文件后缀名："; // @@ -1126,7 +1126,7 @@ // this.txtNormalFileSuffix.Location = new System.Drawing.Point(207, 129); this.txtNormalFileSuffix.Name = "txtNormalFileSuffix"; - this.txtNormalFileSuffix.Size = new System.Drawing.Size(230, 39); + this.txtNormalFileSuffix.Size = new System.Drawing.Size(230, 27); this.txtNormalFileSuffix.TabIndex = 55; this.txtNormalFileSuffix.Enter += new System.EventHandler(this.txtNormalFileSuffix_Enter); this.txtNormalFileSuffix.Leave += new System.EventHandler(this.txtNormalFileSuffix_Leave); @@ -1136,7 +1136,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(166, 35); + this.cbxNormalFileReadFolder.Size = new System.Drawing.Size(106, 24); this.cbxNormalFileReadFolder.TabIndex = 54; this.cbxNormalFileReadFolder.Text = "读取文件夹"; this.cbxNormalFileReadFolder.UseVisualStyleBackColor = true; @@ -1149,7 +1149,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(142, 35); + this.cbxNormalFileReadFile.Size = new System.Drawing.Size(91, 24); this.cbxNormalFileReadFile.TabIndex = 53; this.cbxNormalFileReadFile.Text = "读取文件"; this.cbxNormalFileReadFile.UseVisualStyleBackColor = true; @@ -1160,7 +1160,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(280, 31); + this.label25.Size = new System.Drawing.Size(175, 20); this.label25.TabIndex = 52; this.label25.Text = "读取模式(文件/文件夹)："; // @@ -1169,7 +1169,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(230, 31); + this.label26.Size = new System.Drawing.Size(144, 20); this.label26.TabIndex = 51; this.label26.Text = "自定义文件名格式："; // @@ -1177,7 +1177,7 @@ // this.txtNormalFileNameFormat.Location = new System.Drawing.Point(207, 90); this.txtNormalFileNameFormat.Name = "txtNormalFileNameFormat"; - this.txtNormalFileNameFormat.Size = new System.Drawing.Size(230, 39); + this.txtNormalFileNameFormat.Size = new System.Drawing.Size(230, 27); this.txtNormalFileNameFormat.TabIndex = 50; this.txtNormalFileNameFormat.Enter += new System.EventHandler(this.txtNormalFileNameFormat_Enter); this.txtNormalFileNameFormat.Leave += new System.EventHandler(this.txtNormalFileNameFormat_Leave); @@ -1187,7 +1187,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(206, 31); + this.label28.Size = new System.Drawing.Size(129, 20); this.label28.TabIndex = 48; this.label28.Text = "日期列特殊格式："; // @@ -1195,7 +1195,7 @@ // this.txtNormalFileSpecialDateColumnFormat.Location = new System.Drawing.Point(207, 53); this.txtNormalFileSpecialDateColumnFormat.Name = "txtNormalFileSpecialDateColumnFormat"; - this.txtNormalFileSpecialDateColumnFormat.Size = new System.Drawing.Size(230, 39); + this.txtNormalFileSpecialDateColumnFormat.Size = new System.Drawing.Size(230, 27); this.txtNormalFileSpecialDateColumnFormat.TabIndex = 49; this.txtNormalFileSpecialDateColumnFormat.Enter += new System.EventHandler(this.txtNormalFileSpecialDateColumnFormat_Enter); this.txtNormalFileSpecialDateColumnFormat.Leave += new System.EventHandler(this.txtNormalFileSpecialDateColumnFormat_Leave); @@ -1208,14 +1208,14 @@ this.pnlAll.Dock = System.Windows.Forms.DockStyle.Fill; this.pnlAll.Location = new System.Drawing.Point(0, 0); this.pnlAll.Name = "pnlAll"; - this.pnlAll.Size = new System.Drawing.Size(936, 546); + this.pnlAll.Size = new System.Drawing.Size(1182, 543); this.pnlAll.TabIndex = 1; // // frmSourceSetting // - this.AutoScaleDimensions = new System.Drawing.SizeF(14F, 31F); + this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(936, 546); + this.ClientSize = new System.Drawing.Size(1182, 543); this.Controls.Add(this.pnlAll); this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); diff --git a/CNAS_DBSync/frmSplitParam.Designer.cs b/CNAS_DBSync/frmSplitParam.Designer.cs index 3ff0360..489742c 100644 --- a/CNAS_DBSync/frmSplitParam.Designer.cs +++ b/CNAS_DBSync/frmSplitParam.Designer.cs @@ -31,13 +31,13 @@ this.pnlAll = new System.Windows.Forms.Panel(); this.btnOK = new System.Windows.Forms.Button(); this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.label3 = new System.Windows.Forms.Label(); + this.cbxPrama2 = new System.Windows.Forms.ComboBox(); + this.label5 = new System.Windows.Forms.Label(); + this.label4 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); this.txtPrama1 = new System.Windows.Forms.TextBox(); - this.label4 = new System.Windows.Forms.Label(); - this.label5 = new System.Windows.Forms.Label(); - this.cbxPrama2 = new System.Windows.Forms.ComboBox(); - this.label3 = new System.Windows.Forms.Label(); this.pnlAll.SuspendLayout(); this.groupBox1.SuspendLayout(); this.SuspendLayout(); @@ -50,12 +50,12 @@ this.pnlAll.Location = new System.Drawing.Point(0, 0); this.pnlAll.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.pnlAll.Name = "pnlAll"; - this.pnlAll.Size = new System.Drawing.Size(435, 188); + this.pnlAll.Size = new System.Drawing.Size(661, 305); this.pnlAll.TabIndex = 1; // // btnOK // - this.btnOK.Location = new System.Drawing.Point(336, 149); + this.btnOK.Location = new System.Drawing.Point(533, 263); this.btnOK.Name = "btnOK"; this.btnOK.Size = new System.Drawing.Size(90, 30); this.btnOK.TabIndex = 1; @@ -75,17 +75,55 @@ this.groupBox1.Controls.Add(this.txtPrama1); this.groupBox1.Location = new System.Drawing.Point(12, 12); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(414, 131); + this.groupBox1.Size = new System.Drawing.Size(611, 224); this.groupBox1.TabIndex = 0; this.groupBox1.TabStop = false; this.groupBox1.Text = "条件SubString参数"; // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(15, 180); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(492, 20); + this.label3.TabIndex = 10; + this.label3.Text = "(说明:若操作字符串中不存在或存在多个截断字符,则直接返回初始字符串)"; + // + // cbxPrama2 + // + this.cbxPrama2.FormattingEnabled = true; + this.cbxPrama2.Items.AddRange(new object[] { + "L", + "R"}); + this.cbxPrama2.Location = new System.Drawing.Point(75, 103); + this.cbxPrama2.Name = "cbxPrama2"; + this.cbxPrama2.Size = new System.Drawing.Size(121, 28); + this.cbxPrama2.TabIndex = 9; + // + // label5 + // + this.label5.AutoSize = true; + this.label5.Location = new System.Drawing.Point(199, 108); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(243, 20); + this.label5.TabIndex = 7; + this.label5.Text = "(截断后返回左侧(L)/右侧(R)的内容)"; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(200, 35); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(79, 20); + this.label4.TabIndex = 6; + this.label4.Text = "(截断字符)"; + // // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(18, 63); + this.label2.Location = new System.Drawing.Point(18, 107); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(51, 17); + this.label2.Size = new System.Drawing.Size(63, 20); this.label2.TabIndex = 3; this.label2.Text = "参数2："; // @@ -94,7 +132,7 @@ this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(18, 34); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(51, 17); + this.label1.Size = new System.Drawing.Size(63, 20); this.label1.TabIndex = 1; this.label1.Text = "参数1："; // @@ -102,52 +140,14 @@ // this.txtPrama1.Location = new System.Drawing.Point(75, 31); this.txtPrama1.Name = "txtPrama1"; - this.txtPrama1.Size = new System.Drawing.Size(121, 23); + this.txtPrama1.Size = new System.Drawing.Size(121, 27); this.txtPrama1.TabIndex = 0; // - // label4 - // - this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(200, 35); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(64, 17); - this.label4.TabIndex = 6; - this.label4.Text = "(截断字符)"; - // - // label5 - // - this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(199, 64); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(195, 17); - this.label5.TabIndex = 7; - this.label5.Text = "(截断后返回左侧(L)/右侧(R)的内容)"; - // - // cbxPrama2 - // - this.cbxPrama2.FormattingEnabled = true; - this.cbxPrama2.Items.AddRange(new object[] { - "L", - "R"}); - this.cbxPrama2.Location = new System.Drawing.Point(75, 59); - this.cbxPrama2.Name = "cbxPrama2"; - this.cbxPrama2.Size = new System.Drawing.Size(121, 25); - this.cbxPrama2.TabIndex = 9; - // - // label3 - // - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(15, 96); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(394, 17); - this.label3.TabIndex = 10; - this.label3.Text = "(说明:若操作字符串中不存在或存在多个截断字符,则直接返回初始字符串)"; - // // frmSplitParam // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); + this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(435, 188); + this.ClientSize = new System.Drawing.Size(661, 305); this.Controls.Add(this.pnlAll); this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; diff --git a/CNAS_DBSync/frmStartEndSubstring.Designer.cs b/CNAS_DBSync/frmStartEndSubstring.Designer.cs index d083215..4ba5333 100644 --- a/CNAS_DBSync/frmStartEndSubstring.Designer.cs +++ b/CNAS_DBSync/frmStartEndSubstring.Designer.cs @@ -48,16 +48,17 @@ this.pnlAll.Controls.Add(this.groupBox1); 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(3, 4, 3, 4); + this.pnlAll.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.pnlAll.Name = "pnlAll"; - this.pnlAll.Size = new System.Drawing.Size(436, 188); + this.pnlAll.Size = new System.Drawing.Size(581, 305); this.pnlAll.TabIndex = 2; // // btnOK // - this.btnOK.Location = new System.Drawing.Point(336, 149); + this.btnOK.Location = new System.Drawing.Point(457, 239); + this.btnOK.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnOK.Name = "btnOK"; - this.btnOK.Size = new System.Drawing.Size(90, 30); + this.btnOK.Size = new System.Drawing.Size(120, 38); this.btnOK.TabIndex = 1; this.btnOK.Text = "确定"; this.btnOK.UseVisualStyleBackColor = true; @@ -73,9 +74,11 @@ this.groupBox1.Controls.Add(this.label2); this.groupBox1.Controls.Add(this.label1); this.groupBox1.Controls.Add(this.txtPrama1); - this.groupBox1.Location = new System.Drawing.Point(12, 12); + this.groupBox1.Location = new System.Drawing.Point(16, 15); + this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(414, 131); + this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox1.Size = new System.Drawing.Size(552, 216); this.groupBox1.TabIndex = 0; this.groupBox1.TabStop = false; this.groupBox1.Text = "截断开头/结尾字符参数"; @@ -83,9 +86,10 @@ // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(15, 96); + this.label3.Location = new System.Drawing.Point(20, 170); + this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(401, 12); + this.label3.Size = new System.Drawing.Size(504, 15); this.label3.TabIndex = 10; this.label3.Text = "(说明:若操作字符串中不存在或存在多个截断字符,则直接返回初始字符串)"; // @@ -95,61 +99,68 @@ this.cbxPrama2.Items.AddRange(new object[] { "S", "E"}); - this.cbxPrama2.Location = new System.Drawing.Point(75, 59); + this.cbxPrama2.Location = new System.Drawing.Point(100, 104); + this.cbxPrama2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.cbxPrama2.Name = "cbxPrama2"; - this.cbxPrama2.Size = new System.Drawing.Size(121, 20); + this.cbxPrama2.Size = new System.Drawing.Size(160, 23); this.cbxPrama2.TabIndex = 9; // // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(199, 64); + this.label5.Location = new System.Drawing.Point(265, 110); + this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(107, 12); + this.label5.Size = new System.Drawing.Size(139, 15); this.label5.TabIndex = 7; this.label5.Text = "(开头(S)/结尾(E))"; // // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(200, 35); + this.label4.Location = new System.Drawing.Point(267, 44); + this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(65, 12); + this.label4.Size = new System.Drawing.Size(83, 15); this.label4.TabIndex = 6; this.label4.Text = "(截断字符)"; // // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(18, 63); + this.label2.Location = new System.Drawing.Point(24, 109); + this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(47, 12); + this.label2.Size = new System.Drawing.Size(60, 15); this.label2.TabIndex = 3; this.label2.Text = "参数2："; // // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(18, 34); + this.label1.Location = new System.Drawing.Point(24, 42); + this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(47, 12); + this.label1.Size = new System.Drawing.Size(60, 15); this.label1.TabIndex = 1; this.label1.Text = "参数1："; // // txtPrama1 // - this.txtPrama1.Location = new System.Drawing.Point(75, 31); + this.txtPrama1.Location = new System.Drawing.Point(100, 39); + this.txtPrama1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtPrama1.Name = "txtPrama1"; - this.txtPrama1.Size = new System.Drawing.Size(121, 21); + this.txtPrama1.Size = new System.Drawing.Size(160, 25); this.txtPrama1.TabIndex = 0; // // frmStartEndSubstring // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(436, 188); + this.ClientSize = new System.Drawing.Size(581, 305); this.Controls.Add(this.pnlAll); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.Name = "frmStartEndSubstring"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "截断开头/结尾"; diff --git a/CNAS_DBSync/frmSyncParams.Designer.cs b/CNAS_DBSync/frmSyncParams.Designer.cs index dd0f6ed..8d800ab 100644 --- a/CNAS_DBSync/frmSyncParams.Designer.cs +++ b/CNAS_DBSync/frmSyncParams.Designer.cs @@ -46,10 +46,6 @@ this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.panel15 = new System.Windows.Forms.Panel(); this.dgvMapping = new System.Windows.Forms.DataGridView(); - this.InstrumentField = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.CnasField = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.PrimaryKey = new System.Windows.Forms.DataGridViewCheckBoxColumn(); - this.DateKey = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.cmsMapping = new System.Windows.Forms.ContextMenuStrip(this.components); this.btnDelMap = new System.Windows.Forms.ToolStripMenuItem(); this.panel14 = new System.Windows.Forms.Panel(); @@ -61,14 +57,10 @@ this.tabPage6 = new System.Windows.Forms.TabPage(); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); this.dgvInstruDS = new System.Windows.Forms.DataGridView(); - this.InstruFieldName = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.InstruDataType = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.pnlleft = new System.Windows.Forms.Panel(); this.cbxInstrument = new System.Windows.Forms.ComboBox(); this.label12 = new System.Windows.Forms.Label(); this.dgvCnas = new System.Windows.Forms.DataGridView(); - this.CNASFieldName = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.CnasDataType = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.pnlRight = new System.Windows.Forms.Panel(); this.cbxCnas = new System.Windows.Forms.ComboBox(); this.label13 = new System.Windows.Forms.Label(); @@ -103,6 +95,14 @@ this.panel4 = new System.Windows.Forms.Panel(); this.panel13 = new System.Windows.Forms.Panel(); this.panel6 = new System.Windows.Forms.Panel(); + this.InstrumentField = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.CnasField = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.PrimaryKey = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.DateKey = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.InstruFieldName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.InstruDataType = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.CNASFieldName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.CnasDataType = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.pnlAll.SuspendLayout(); this.pnlBodyCenter.SuspendLayout(); this.pnlRigh.SuspendLayout(); @@ -149,7 +149,7 @@ this.pnlAll.Dock = System.Windows.Forms.DockStyle.Fill; this.pnlAll.Location = new System.Drawing.Point(0, 0); this.pnlAll.Name = "pnlAll"; - this.pnlAll.Size = new System.Drawing.Size(799, 468); + this.pnlAll.Size = new System.Drawing.Size(1207, 748); this.pnlAll.TabIndex = 0; // // pnlBodyCenter @@ -158,7 +158,7 @@ this.pnlBodyCenter.Dock = System.Windows.Forms.DockStyle.Fill; this.pnlBodyCenter.Location = new System.Drawing.Point(10, 29); this.pnlBodyCenter.Name = "pnlBodyCenter"; - this.pnlBodyCenter.Size = new System.Drawing.Size(789, 439); + this.pnlBodyCenter.Size = new System.Drawing.Size(1197, 719); this.pnlBodyCenter.TabIndex = 7; // // pnlRigh @@ -168,7 +168,7 @@ this.pnlRigh.Dock = System.Windows.Forms.DockStyle.Fill; this.pnlRigh.Location = new System.Drawing.Point(0, 0); this.pnlRigh.Name = "pnlRigh"; - this.pnlRigh.Size = new System.Drawing.Size(789, 439); + this.pnlRigh.Size = new System.Drawing.Size(1197, 719); this.pnlRigh.TabIndex = 5; // // panel5 @@ -178,7 +178,7 @@ this.panel5.Dock = System.Windows.Forms.DockStyle.Fill; this.panel5.Location = new System.Drawing.Point(146, 0); this.panel5.Name = "panel5"; - this.panel5.Size = new System.Drawing.Size(643, 439); + this.panel5.Size = new System.Drawing.Size(1051, 719); this.panel5.TabIndex = 4; // // groupBox2 @@ -187,7 +187,7 @@ this.groupBox2.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBox2.Location = new System.Drawing.Point(0, 0); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(643, 398); + this.groupBox2.Size = new System.Drawing.Size(1051, 678); this.groupBox2.TabIndex = 1; this.groupBox2.TabStop = false; this.groupBox2.Text = "详情"; @@ -195,7 +195,7 @@ // splitContainer1 // this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill; - this.splitContainer1.Location = new System.Drawing.Point(3, 19); + this.splitContainer1.Location = new System.Drawing.Point(3, 23); this.splitContainer1.Name = "splitContainer1"; this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal; // @@ -207,8 +207,8 @@ // splitContainer1.Panel2 // this.splitContainer1.Panel2.Controls.Add(this.tabControl1); - this.splitContainer1.Size = new System.Drawing.Size(637, 376); - this.splitContainer1.SplitterDistance = 153; + this.splitContainer1.Size = new System.Drawing.Size(1045, 652); + this.splitContainer1.SplitterDistance = 265; this.splitContainer1.TabIndex = 2; // // panel15 @@ -217,7 +217,7 @@ this.panel15.Dock = System.Windows.Forms.DockStyle.Fill; this.panel15.Location = new System.Drawing.Point(0, 37); this.panel15.Name = "panel15"; - this.panel15.Size = new System.Drawing.Size(637, 116); + this.panel15.Size = new System.Drawing.Size(1045, 228); this.panel15.TabIndex = 2; // // dgvMapping @@ -248,48 +248,21 @@ this.dgvMapping.RowsDefaultCellStyle = dataGridViewCellStyle2; this.dgvMapping.RowTemplate.Height = 23; this.dgvMapping.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dgvMapping.Size = new System.Drawing.Size(637, 116); + this.dgvMapping.Size = new System.Drawing.Size(1045, 228); this.dgvMapping.TabIndex = 1; // - // InstrumentField - // - this.InstrumentField.DataPropertyName = "SourceField"; - this.InstrumentField.HeaderText = "设备数据列"; - this.InstrumentField.Name = "InstrumentField"; - this.InstrumentField.ReadOnly = true; - this.InstrumentField.Width = 200; - // - // CnasField - // - this.CnasField.DataPropertyName = "TargetField"; - this.CnasField.HeaderText = "CNAS数据列"; - this.CnasField.Name = "CnasField"; - this.CnasField.ReadOnly = true; - this.CnasField.Width = 200; - // - // PrimaryKey - // - this.PrimaryKey.DataPropertyName = "IfPrimaryKey"; - this.PrimaryKey.HeaderText = "关键字段"; - this.PrimaryKey.Name = "PrimaryKey"; - // - // DateKey - // - this.DateKey.DataPropertyName = "IfDateField"; - this.DateKey.HeaderText = "日期字段"; - this.DateKey.Name = "DateKey"; - // // cmsMapping // + this.cmsMapping.ImageScalingSize = new System.Drawing.Size(20, 20); this.cmsMapping.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.btnDelMap}); this.cmsMapping.Name = "cmsMapping"; - this.cmsMapping.Size = new System.Drawing.Size(101, 26); + this.cmsMapping.Size = new System.Drawing.Size(109, 28); // // btnDelMap // this.btnDelMap.Name = "btnDelMap"; - this.btnDelMap.Size = new System.Drawing.Size(100, 22); + this.btnDelMap.Size = new System.Drawing.Size(108, 24); this.btnDelMap.Text = "移除"; this.btnDelMap.Click += new System.EventHandler(this.btnDelMap_Click); // @@ -302,7 +275,7 @@ this.panel14.Dock = System.Windows.Forms.DockStyle.Top; this.panel14.Location = new System.Drawing.Point(0, 0); this.panel14.Name = "panel14"; - this.panel14.Size = new System.Drawing.Size(637, 37); + this.panel14.Size = new System.Drawing.Size(1045, 37); this.panel14.TabIndex = 1; // // txtInstrumentColumn @@ -310,7 +283,7 @@ this.txtInstrumentColumn.Location = new System.Drawing.Point(429, 6); this.txtInstrumentColumn.Name = "txtInstrumentColumn"; this.txtInstrumentColumn.ReadOnly = true; - this.txtInstrumentColumn.Size = new System.Drawing.Size(195, 23); + this.txtInstrumentColumn.Size = new System.Drawing.Size(195, 27); this.txtInstrumentColumn.TabIndex = 7; this.txtInstrumentColumn.DoubleClick += new System.EventHandler(this.txtInstrumentColumn_DoubleClick); // @@ -320,7 +293,7 @@ this.cbxCNASColumn.FormattingEnabled = true; this.cbxCNASColumn.Location = new System.Drawing.Point(429, 10); this.cbxCNASColumn.Name = "cbxCNASColumn"; - this.cbxCNASColumn.Size = new System.Drawing.Size(184, 25); + this.cbxCNASColumn.Size = new System.Drawing.Size(184, 28); this.cbxCNASColumn.TabIndex = 6; this.cbxCNASColumn.Visible = false; this.cbxCNASColumn.SelectedIndexChanged += new System.EventHandler(this.cbxCNASColumn_SelectedIndexChanged); @@ -331,7 +304,7 @@ this.label3.AutoSize = true; this.label3.Location = new System.Drawing.Point(321, 10); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(113, 17); + this.label3.Size = new System.Drawing.Size(141, 20); this.label3.TabIndex = 5; this.label3.Text = "CNAS仪器信息列："; // @@ -340,7 +313,7 @@ this.label2.AutoSize = true; this.label2.Location = new System.Drawing.Point(3, 10); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(92, 17); + this.label2.Size = new System.Drawing.Size(114, 20); this.label2.TabIndex = 4; this.label2.Text = "字段映射信息："; // @@ -351,16 +324,16 @@ this.tabControl1.Location = new System.Drawing.Point(0, 0); this.tabControl1.Name = "tabControl1"; this.tabControl1.SelectedIndex = 0; - this.tabControl1.Size = new System.Drawing.Size(637, 219); + this.tabControl1.Size = new System.Drawing.Size(1045, 383); this.tabControl1.TabIndex = 1; // // tabPage6 // this.tabPage6.Controls.Add(this.splitContainer2); - this.tabPage6.Location = new System.Drawing.Point(4, 26); + this.tabPage6.Location = new System.Drawing.Point(4, 29); this.tabPage6.Name = "tabPage6"; this.tabPage6.Padding = new System.Windows.Forms.Padding(3); - this.tabPage6.Size = new System.Drawing.Size(629, 189); + this.tabPage6.Size = new System.Drawing.Size(1037, 350); this.tabPage6.TabIndex = 1; this.tabPage6.Text = "字段"; this.tabPage6.UseVisualStyleBackColor = true; @@ -380,8 +353,8 @@ // this.splitContainer2.Panel2.Controls.Add(this.dgvCnas); this.splitContainer2.Panel2.Controls.Add(this.pnlRight); - this.splitContainer2.Size = new System.Drawing.Size(623, 183); - this.splitContainer2.SplitterDistance = 307; + this.splitContainer2.Size = new System.Drawing.Size(1031, 344); + this.splitContainer2.SplitterDistance = 508; this.splitContainer2.TabIndex = 1; // // dgvInstruDS @@ -408,24 +381,9 @@ this.dgvInstruDS.RowsDefaultCellStyle = dataGridViewCellStyle4; this.dgvInstruDS.RowTemplate.Height = 23; this.dgvInstruDS.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dgvInstruDS.Size = new System.Drawing.Size(307, 149); + this.dgvInstruDS.Size = new System.Drawing.Size(508, 310); this.dgvInstruDS.TabIndex = 1; // - // InstruFieldName - // - this.InstruFieldName.DataPropertyName = "InstruFieldName"; - this.InstruFieldName.HeaderText = "列名"; - this.InstruFieldName.Name = "InstruFieldName"; - this.InstruFieldName.ReadOnly = true; - this.InstruFieldName.Width = 150; - // - // InstruDataType - // - this.InstruDataType.DataPropertyName = "InstruDataType"; - this.InstruDataType.HeaderText = "数据类型"; - this.InstruDataType.Name = "InstruDataType"; - this.InstruDataType.ReadOnly = true; - // // pnlleft // this.pnlleft.Controls.Add(this.cbxInstrument); @@ -433,16 +391,16 @@ this.pnlleft.Dock = System.Windows.Forms.DockStyle.Top; this.pnlleft.Location = new System.Drawing.Point(0, 0); this.pnlleft.Name = "pnlleft"; - this.pnlleft.Size = new System.Drawing.Size(307, 34); + this.pnlleft.Size = new System.Drawing.Size(508, 34); this.pnlleft.TabIndex = 0; // // cbxInstrument // this.cbxInstrument.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cbxInstrument.FormattingEnabled = true; - this.cbxInstrument.Location = new System.Drawing.Point(104, 6); + this.cbxInstrument.Location = new System.Drawing.Point(129, 6); this.cbxInstrument.Name = "cbxInstrument"; - this.cbxInstrument.Size = new System.Drawing.Size(200, 25); + this.cbxInstrument.Size = new System.Drawing.Size(200, 28); this.cbxInstrument.TabIndex = 1; this.cbxInstrument.SelectedIndexChanged += new System.EventHandler(this.cbxInstrument_SelectedIndexChanged); // @@ -451,7 +409,7 @@ this.label12.AutoSize = true; this.label12.Location = new System.Drawing.Point(3, 10); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(104, 17); + this.label12.Size = new System.Drawing.Size(129, 20); this.label12.TabIndex = 0; this.label12.Text = "设备数据源表名："; // @@ -479,24 +437,9 @@ this.dgvCnas.RowsDefaultCellStyle = dataGridViewCellStyle6; this.dgvCnas.RowTemplate.Height = 23; this.dgvCnas.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dgvCnas.Size = new System.Drawing.Size(312, 149); + this.dgvCnas.Size = new System.Drawing.Size(519, 310); this.dgvCnas.TabIndex = 2; // - // CNASFieldName - // - this.CNASFieldName.DataPropertyName = "CnasFieldName"; - this.CNASFieldName.HeaderText = "列名"; - this.CNASFieldName.Name = "CNASFieldName"; - this.CNASFieldName.ReadOnly = true; - this.CNASFieldName.Width = 150; - // - // CnasDataType - // - this.CnasDataType.DataPropertyName = "CnasDataType"; - this.CnasDataType.HeaderText = "数据类型"; - this.CnasDataType.Name = "CnasDataType"; - this.CnasDataType.ReadOnly = true; - // // pnlRight // this.pnlRight.Controls.Add(this.cbxCnas); @@ -504,16 +447,16 @@ this.pnlRight.Dock = System.Windows.Forms.DockStyle.Top; this.pnlRight.Location = new System.Drawing.Point(0, 0); this.pnlRight.Name = "pnlRight"; - this.pnlRight.Size = new System.Drawing.Size(312, 34); + this.pnlRight.Size = new System.Drawing.Size(519, 34); this.pnlRight.TabIndex = 0; // // cbxCnas // this.cbxCnas.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cbxCnas.FormattingEnabled = true; - this.cbxCnas.Location = new System.Drawing.Point(122, 6); + this.cbxCnas.Location = new System.Drawing.Point(150, 6); this.cbxCnas.Name = "cbxCnas"; - this.cbxCnas.Size = new System.Drawing.Size(184, 25); + this.cbxCnas.Size = new System.Drawing.Size(184, 28); this.cbxCnas.TabIndex = 2; this.cbxCnas.SelectedIndexChanged += new System.EventHandler(this.cbxCnas_SelectedIndexChanged); // @@ -522,7 +465,7 @@ this.label13.AutoSize = true; this.label13.Location = new System.Drawing.Point(3, 10); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(113, 17); + this.label13.Size = new System.Drawing.Size(141, 20); this.label13.TabIndex = 1; this.label13.Text = "CNAS数据库表名："; // @@ -530,9 +473,9 @@ // this.panel1.Controls.Add(this.panel7); this.panel1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.panel1.Location = new System.Drawing.Point(0, 398); + this.panel1.Location = new System.Drawing.Point(0, 678); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(643, 41); + this.panel1.Size = new System.Drawing.Size(1051, 41); this.panel1.TabIndex = 3; // // panel7 @@ -543,7 +486,7 @@ this.panel7.Controls.Add(this.btnAddMapping); this.panel7.Controls.Add(this.btnDatabaseConfig); this.panel7.Dock = System.Windows.Forms.DockStyle.Right; - this.panel7.Location = new System.Drawing.Point(229, 0); + this.panel7.Location = new System.Drawing.Point(637, 0); this.panel7.Name = "panel7"; this.panel7.Size = new System.Drawing.Size(414, 41); this.panel7.TabIndex = 5; @@ -552,7 +495,7 @@ // this.btnSourceFilter.Location = new System.Drawing.Point(86, 3); this.btnSourceFilter.Name = "btnSourceFilter"; - this.btnSourceFilter.Size = new System.Drawing.Size(79, 23); + this.btnSourceFilter.Size = new System.Drawing.Size(79, 32); this.btnSourceFilter.TabIndex = 6; this.btnSourceFilter.Text = "来源过滤"; this.btnSourceFilter.UseVisualStyleBackColor = true; @@ -562,7 +505,7 @@ // this.btnCNASFieldConfig.Location = new System.Drawing.Point(168, 3); this.btnCNASFieldConfig.Name = "btnCNASFieldConfig"; - this.btnCNASFieldConfig.Size = new System.Drawing.Size(79, 23); + this.btnCNASFieldConfig.Size = new System.Drawing.Size(79, 35); this.btnCNASFieldConfig.TabIndex = 5; this.btnCNASFieldConfig.Text = "条件映射"; this.btnCNASFieldConfig.UseVisualStyleBackColor = true; @@ -572,7 +515,7 @@ // this.btnLoadDBData.Location = new System.Drawing.Point(249, 3); this.btnLoadDBData.Name = "btnLoadDBData"; - this.btnLoadDBData.Size = new System.Drawing.Size(79, 23); + this.btnLoadDBData.Size = new System.Drawing.Size(79, 32); this.btnLoadDBData.TabIndex = 4; this.btnLoadDBData.Text = "加载数据"; this.btnLoadDBData.UseVisualStyleBackColor = true; @@ -582,7 +525,7 @@ // this.btnAddMapping.Location = new System.Drawing.Point(3, 3); this.btnAddMapping.Name = "btnAddMapping"; - this.btnAddMapping.Size = new System.Drawing.Size(79, 23); + this.btnAddMapping.Size = new System.Drawing.Size(79, 32); this.btnAddMapping.TabIndex = 2; this.btnAddMapping.Text = "新增映射"; this.btnAddMapping.UseVisualStyleBackColor = true; @@ -592,7 +535,7 @@ // this.btnDatabaseConfig.Location = new System.Drawing.Point(332, 3); this.btnDatabaseConfig.Name = "btnDatabaseConfig"; - this.btnDatabaseConfig.Size = new System.Drawing.Size(79, 23); + this.btnDatabaseConfig.Size = new System.Drawing.Size(79, 32); this.btnDatabaseConfig.TabIndex = 3; this.btnDatabaseConfig.Text = "配置数据库"; this.btnDatabaseConfig.UseVisualStyleBackColor = true; @@ -608,7 +551,7 @@ this.groupBox1.Dock = System.Windows.Forms.DockStyle.Left; this.groupBox1.Location = new System.Drawing.Point(0, 0); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(146, 439); + this.groupBox1.Size = new System.Drawing.Size(146, 719); this.groupBox1.TabIndex = 0; this.groupBox1.TabStop = false; this.groupBox1.Text = "仪器"; @@ -629,7 +572,7 @@ this.dgvInstrument.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.Code}); this.dgvInstrument.Dock = System.Windows.Forms.DockStyle.Fill; - this.dgvInstrument.Location = new System.Drawing.Point(6, 56); + this.dgvInstrument.Location = new System.Drawing.Point(6, 60); this.dgvInstrument.MultiSelect = false; this.dgvInstrument.Name = "dgvInstrument"; this.dgvInstrument.ReadOnly = true; @@ -637,7 +580,7 @@ dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; this.dgvInstrument.RowsDefaultCellStyle = dataGridViewCellStyle8; this.dgvInstrument.RowTemplate.Height = 23; - this.dgvInstrument.Size = new System.Drawing.Size(134, 334); + this.dgvInstrument.Size = new System.Drawing.Size(134, 610); this.dgvInstrument.TabIndex = 0; this.dgvInstrument.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvInstrument_CellDoubleClick); this.dgvInstrument.SelectionChanged += new System.EventHandler(this.dgvInstrument_SelectionChanged); @@ -653,17 +596,17 @@ // panel17 // this.panel17.Dock = System.Windows.Forms.DockStyle.Right; - this.panel17.Location = new System.Drawing.Point(140, 56); + this.panel17.Location = new System.Drawing.Point(140, 60); this.panel17.Name = "panel17"; - this.panel17.Size = new System.Drawing.Size(3, 334); + this.panel17.Size = new System.Drawing.Size(3, 610); this.panel17.TabIndex = 8; // // panel16 // this.panel16.Dock = System.Windows.Forms.DockStyle.Left; - this.panel16.Location = new System.Drawing.Point(3, 56); + this.panel16.Location = new System.Drawing.Point(3, 60); this.panel16.Name = "panel16"; - this.panel16.Size = new System.Drawing.Size(3, 334); + this.panel16.Size = new System.Drawing.Size(3, 610); this.panel16.TabIndex = 7; // // panel9 @@ -671,7 +614,7 @@ this.panel9.Controls.Add(this.btnAdd); this.panel9.Controls.Add(this.btnDel); this.panel9.Dock = System.Windows.Forms.DockStyle.Bottom; - this.panel9.Location = new System.Drawing.Point(3, 390); + this.panel9.Location = new System.Drawing.Point(3, 670); this.panel9.Name = "panel9"; this.panel9.Size = new System.Drawing.Size(140, 46); this.panel9.TabIndex = 5; @@ -680,7 +623,7 @@ // this.btnAdd.Location = new System.Drawing.Point(3, 11); this.btnAdd.Name = "btnAdd"; - this.btnAdd.Size = new System.Drawing.Size(58, 23); + this.btnAdd.Size = new System.Drawing.Size(58, 32); this.btnAdd.TabIndex = 1; this.btnAdd.Text = "新增"; this.btnAdd.UseVisualStyleBackColor = true; @@ -690,7 +633,7 @@ // this.btnDel.Location = new System.Drawing.Point(68, 11); this.btnDel.Name = "btnDel"; - this.btnDel.Size = new System.Drawing.Size(58, 23); + this.btnDel.Size = new System.Drawing.Size(58, 32); this.btnDel.TabIndex = 2; this.btnDel.Text = "删除"; this.btnDel.UseVisualStyleBackColor = true; @@ -700,7 +643,7 @@ // this.panel8.Controls.Add(this.label1); this.panel8.Dock = System.Windows.Forms.DockStyle.Top; - this.panel8.Location = new System.Drawing.Point(3, 19); + this.panel8.Location = new System.Drawing.Point(3, 23); this.panel8.Name = "panel8"; this.panel8.Size = new System.Drawing.Size(140, 37); this.panel8.TabIndex = 4; @@ -710,7 +653,7 @@ this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(3, 9); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(68, 17); + this.label1.Size = new System.Drawing.Size(84, 20); this.label1.TabIndex = 3; this.label1.Text = "当前选中："; // @@ -720,11 +663,12 @@ this.pnlMenuTop.Dock = System.Windows.Forms.DockStyle.Top; this.pnlMenuTop.Location = new System.Drawing.Point(10, 0); this.pnlMenuTop.Name = "pnlMenuTop"; - this.pnlMenuTop.Size = new System.Drawing.Size(789, 29); + this.pnlMenuTop.Size = new System.Drawing.Size(1197, 29); this.pnlMenuTop.TabIndex = 6; // // menuStrip1 // + this.menuStrip1.ImageScalingSize = new System.Drawing.Size(20, 20); this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.tsmSystemSetting, this.tsmServiceSetting, @@ -732,35 +676,35 @@ this.tsmHelper}); this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Name = "menuStrip1"; - this.menuStrip1.Size = new System.Drawing.Size(789, 25); + this.menuStrip1.Size = new System.Drawing.Size(1197, 28); this.menuStrip1.TabIndex = 0; this.menuStrip1.Text = "menuStrip1"; // // tsmSystemSetting // this.tsmSystemSetting.Name = "tsmSystemSetting"; - this.tsmSystemSetting.Size = new System.Drawing.Size(85, 21); + this.tsmSystemSetting.Size = new System.Drawing.Size(102, 24); this.tsmSystemSetting.Text = "系统设置(&G)"; this.tsmSystemSetting.Click += new System.EventHandler(this.tsmSystemSetting_Click); // // tsmServiceSetting // this.tsmServiceSetting.Name = "tsmServiceSetting"; - this.tsmServiceSetting.Size = new System.Drawing.Size(83, 21); + this.tsmServiceSetting.Size = new System.Drawing.Size(100, 24); this.tsmServiceSetting.Text = "服务设置(&S)"; this.tsmServiceSetting.Click += new System.EventHandler(this.tsmServiceSetting_Click); // // tsmSourceSetting // this.tsmSourceSetting.Name = "tsmSourceSetting"; - this.tsmSourceSetting.Size = new System.Drawing.Size(82, 21); + this.tsmSourceSetting.Size = new System.Drawing.Size(99, 24); this.tsmSourceSetting.Text = "来源设置(&L)"; this.tsmSourceSetting.Click += new System.EventHandler(this.tsmSourceSetting_Click); // // tsmHelper // this.tsmHelper.Name = "tsmHelper"; - this.tsmHelper.Size = new System.Drawing.Size(61, 21); + this.tsmHelper.Size = new System.Drawing.Size(73, 24); this.tsmHelper.Text = "帮助(&H)"; this.tsmHelper.Click += new System.EventHandler(this.tsmHelper_Click); // @@ -776,7 +720,7 @@ this.panel2.Dock = System.Windows.Forms.DockStyle.Left; this.panel2.Location = new System.Drawing.Point(0, 0); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(10, 468); + this.panel2.Size = new System.Drawing.Size(10, 748); this.panel2.TabIndex = 4; // // btnSave @@ -794,16 +738,16 @@ // this.panel11.Controls.Add(this.panel12); this.panel11.Dock = System.Windows.Forms.DockStyle.Bottom; - this.panel11.Location = new System.Drawing.Point(0, 470); + this.panel11.Location = new System.Drawing.Point(0, 750); this.panel11.Name = "panel11"; - this.panel11.Size = new System.Drawing.Size(799, 43); + this.panel11.Size = new System.Drawing.Size(1207, 43); this.panel11.TabIndex = 1; // // panel12 // this.panel12.Controls.Add(this.btnSave); this.panel12.Dock = System.Windows.Forms.DockStyle.Right; - this.panel12.Location = new System.Drawing.Point(697, 0); + this.panel12.Location = new System.Drawing.Point(1105, 0); this.panel12.Name = "panel12"; this.panel12.Size = new System.Drawing.Size(102, 43); this.panel12.TabIndex = 0; @@ -815,7 +759,7 @@ this.panel4.Dock = System.Windows.Forms.DockStyle.Fill; this.panel4.Location = new System.Drawing.Point(0, 0); this.panel4.Name = "panel4"; - this.panel4.Size = new System.Drawing.Size(799, 470); + this.panel4.Size = new System.Drawing.Size(1207, 750); this.panel4.TabIndex = 2; // // panel13 @@ -824,23 +768,85 @@ this.panel13.Dock = System.Windows.Forms.DockStyle.Fill; this.panel13.Location = new System.Drawing.Point(0, 0); this.panel13.Name = "panel13"; - this.panel13.Size = new System.Drawing.Size(799, 468); + this.panel13.Size = new System.Drawing.Size(1207, 748); this.panel13.TabIndex = 2; // // panel6 // this.panel6.BackColor = System.Drawing.SystemColors.ControlDark; this.panel6.Dock = System.Windows.Forms.DockStyle.Bottom; - this.panel6.Location = new System.Drawing.Point(0, 468); + this.panel6.Location = new System.Drawing.Point(0, 748); this.panel6.Name = "panel6"; - this.panel6.Size = new System.Drawing.Size(799, 2); + this.panel6.Size = new System.Drawing.Size(1207, 2); this.panel6.TabIndex = 1; // + // InstrumentField + // + this.InstrumentField.DataPropertyName = "SourceField"; + this.InstrumentField.HeaderText = "设备数据列"; + this.InstrumentField.Name = "InstrumentField"; + this.InstrumentField.ReadOnly = true; + this.InstrumentField.Width = 240; + // + // CnasField + // + this.CnasField.DataPropertyName = "TargetField"; + this.CnasField.HeaderText = "CNAS数据列"; + this.CnasField.Name = "CnasField"; + this.CnasField.ReadOnly = true; + this.CnasField.Width = 240; + // + // PrimaryKey + // + this.PrimaryKey.DataPropertyName = "IfPrimaryKey"; + this.PrimaryKey.HeaderText = "关键字段"; + this.PrimaryKey.Name = "PrimaryKey"; + this.PrimaryKey.Width = 240; + // + // DateKey + // + this.DateKey.DataPropertyName = "IfDateField"; + this.DateKey.HeaderText = "日期字段"; + this.DateKey.Name = "DateKey"; + this.DateKey.Width = 240; + // + // InstruFieldName + // + this.InstruFieldName.DataPropertyName = "InstruFieldName"; + this.InstruFieldName.HeaderText = "列名"; + this.InstruFieldName.Name = "InstruFieldName"; + this.InstruFieldName.ReadOnly = true; + this.InstruFieldName.Width = 220; + // + // InstruDataType + // + this.InstruDataType.DataPropertyName = "InstruDataType"; + this.InstruDataType.HeaderText = "数据类型"; + this.InstruDataType.Name = "InstruDataType"; + this.InstruDataType.ReadOnly = true; + this.InstruDataType.Width = 240; + // + // CNASFieldName + // + this.CNASFieldName.DataPropertyName = "CnasFieldName"; + this.CNASFieldName.HeaderText = "列名"; + this.CNASFieldName.Name = "CNASFieldName"; + this.CNASFieldName.ReadOnly = true; + this.CNASFieldName.Width = 220; + // + // CnasDataType + // + this.CnasDataType.DataPropertyName = "CnasDataType"; + this.CnasDataType.HeaderText = "数据类型"; + this.CnasDataType.Name = "CnasDataType"; + this.CnasDataType.ReadOnly = true; + this.CnasDataType.Width = 240; + // // frmSyncParams // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); + this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(799, 513); + this.ClientSize = new System.Drawing.Size(1207, 793); this.Controls.Add(this.panel4); this.Controls.Add(this.panel11); this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); @@ -936,10 +942,6 @@ private System.Windows.Forms.Panel panel4; private System.Windows.Forms.Panel panel13; private System.Windows.Forms.Panel panel6; - private System.Windows.Forms.DataGridViewTextBoxColumn InstruFieldName; - private System.Windows.Forms.DataGridViewTextBoxColumn InstruDataType; - private System.Windows.Forms.DataGridViewTextBoxColumn CNASFieldName; - private System.Windows.Forms.DataGridViewTextBoxColumn CnasDataType; private System.Windows.Forms.Button btnCNASFieldConfig; private System.Windows.Forms.Button btnSourceFilter; private System.Windows.Forms.Panel panel15; @@ -949,10 +951,6 @@ private System.Windows.Forms.ComboBox cbxCNASColumn; private System.Windows.Forms.Label label3; private System.Windows.Forms.TextBox txtInstrumentColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn InstrumentField; - private System.Windows.Forms.DataGridViewTextBoxColumn CnasField; - private System.Windows.Forms.DataGridViewCheckBoxColumn PrimaryKey; - private System.Windows.Forms.DataGridViewCheckBoxColumn DateKey; private System.Windows.Forms.DataGridViewTextBoxColumn Code; private System.Windows.Forms.Panel panel17; private System.Windows.Forms.Panel panel16; @@ -963,6 +961,14 @@ private System.Windows.Forms.ToolStripMenuItem tsmHelper; private System.Windows.Forms.Panel pnlBodyCenter; private System.Windows.Forms.ToolStripMenuItem tsmServiceSetting; + private System.Windows.Forms.DataGridViewTextBoxColumn InstrumentField; + private System.Windows.Forms.DataGridViewTextBoxColumn CnasField; + private System.Windows.Forms.DataGridViewCheckBoxColumn PrimaryKey; + private System.Windows.Forms.DataGridViewCheckBoxColumn DateKey; + private System.Windows.Forms.DataGridViewTextBoxColumn InstruFieldName; + private System.Windows.Forms.DataGridViewTextBoxColumn InstruDataType; + private System.Windows.Forms.DataGridViewTextBoxColumn CNASFieldName; + private System.Windows.Forms.DataGridViewTextBoxColumn CnasDataType; } } diff --git a/CNAS_DBSync/frmSystemSetting.Designer.cs b/CNAS_DBSync/frmSystemSetting.Designer.cs index cf8bb55..c4f0a46 100644 --- a/CNAS_DBSync/frmSystemSetting.Designer.cs +++ b/CNAS_DBSync/frmSystemSetting.Designer.cs @@ -64,7 +64,7 @@ this.pnlAll.Location = new System.Drawing.Point(0, 0); this.pnlAll.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.pnlAll.Name = "pnlAll"; - this.pnlAll.Size = new System.Drawing.Size(441, 226); + this.pnlAll.Size = new System.Drawing.Size(670, 362); this.pnlAll.TabIndex = 0; // // pnlBody @@ -74,12 +74,12 @@ this.pnlBody.Dock = System.Windows.Forms.DockStyle.Fill; this.pnlBody.Location = new System.Drawing.Point(10, 10); this.pnlBody.Name = "pnlBody"; - this.pnlBody.Size = new System.Drawing.Size(421, 206); + this.pnlBody.Size = new System.Drawing.Size(650, 342); this.pnlBody.TabIndex = 4; // // btnOK // - this.btnOK.Location = new System.Drawing.Point(325, 169); + this.btnOK.Location = new System.Drawing.Point(537, 297); this.btnOK.Name = "btnOK"; this.btnOK.Size = new System.Drawing.Size(90, 30); this.btnOK.TabIndex = 1; @@ -100,7 +100,7 @@ this.groupBox1.Controls.Add(this.lblText1); this.groupBox1.Location = new System.Drawing.Point(2, 6); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(415, 157); + this.groupBox1.Size = new System.Drawing.Size(625, 285); this.groupBox1.TabIndex = 0; this.groupBox1.TabStop = false; this.groupBox1.Text = "设置"; @@ -108,25 +108,25 @@ // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(337, 109); + this.label3.Location = new System.Drawing.Point(430, 179); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(20, 17); + this.label3.Size = new System.Drawing.Size(24, 20); this.label3.TabIndex = 8; this.label3.Text = "天"; // // numpLogDataDays // - this.numpLogDataDays.Location = new System.Drawing.Point(211, 104); + this.numpLogDataDays.Location = new System.Drawing.Point(251, 177); this.numpLogDataDays.Name = "numpLogDataDays"; - this.numpLogDataDays.Size = new System.Drawing.Size(120, 23); + this.numpLogDataDays.Size = new System.Drawing.Size(158, 27); this.numpLogDataDays.TabIndex = 7; // // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(41, 106); + this.label4.Location = new System.Drawing.Point(41, 177); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(164, 17); + this.label4.Size = new System.Drawing.Size(204, 20); this.label4.TabIndex = 6; this.label4.Text = "自动生成日志记录范围：最近"; // @@ -135,9 +135,9 @@ this.cbxAutomatic.AutoSize = true; this.cbxAutomatic.Checked = true; this.cbxAutomatic.CheckState = System.Windows.Forms.CheckState.Checked; - this.cbxAutomatic.Location = new System.Drawing.Point(250, 34); + this.cbxAutomatic.Location = new System.Drawing.Point(348, 35); this.cbxAutomatic.Name = "cbxAutomatic"; - this.cbxAutomatic.Size = new System.Drawing.Size(51, 21); + this.cbxAutomatic.Size = new System.Drawing.Size(61, 24); this.cbxAutomatic.TabIndex = 5; this.cbxAutomatic.Text = "自动"; this.cbxAutomatic.UseVisualStyleBackColor = true; @@ -146,9 +146,9 @@ // cbxManual // this.cbxManual.AutoSize = true; - this.cbxManual.Location = new System.Drawing.Point(185, 34); + this.cbxManual.Location = new System.Drawing.Point(251, 34); this.cbxManual.Name = "cbxManual"; - this.cbxManual.Size = new System.Drawing.Size(51, 21); + this.cbxManual.Size = new System.Drawing.Size(61, 24); this.cbxManual.TabIndex = 4; this.cbxManual.Text = "手动"; this.cbxManual.UseVisualStyleBackColor = true; @@ -159,41 +159,41 @@ this.label2.AutoSize = true; this.label2.Location = new System.Drawing.Point(41, 35); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(119, 17); + this.label2.Size = new System.Drawing.Size(148, 20); this.label2.TabIndex = 3; this.label2.Text = "加载来源表结构方式:"; // // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(337, 75); + this.label1.Location = new System.Drawing.Point(430, 106); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(20, 17); + this.label1.Size = new System.Drawing.Size(24, 20); this.label1.TabIndex = 2; this.label1.Text = "天"; // // numpShowDataDays // - this.numpShowDataDays.Location = new System.Drawing.Point(211, 70); + this.numpShowDataDays.Location = new System.Drawing.Point(251, 99); this.numpShowDataDays.Name = "numpShowDataDays"; - this.numpShowDataDays.Size = new System.Drawing.Size(120, 23); + this.numpShowDataDays.Size = new System.Drawing.Size(158, 27); this.numpShowDataDays.TabIndex = 1; // // lblText1 // this.lblText1.AutoSize = true; - this.lblText1.Location = new System.Drawing.Point(41, 73); + this.lblText1.Location = new System.Drawing.Point(41, 102); this.lblText1.Name = "lblText1"; - this.lblText1.Size = new System.Drawing.Size(164, 17); + this.lblText1.Size = new System.Drawing.Size(204, 20); this.lblText1.TabIndex = 0; this.lblText1.Text = "数据展示界面显示范围：最近"; // // pnlRight // this.pnlRight.Dock = System.Windows.Forms.DockStyle.Right; - this.pnlRight.Location = new System.Drawing.Point(431, 10); + this.pnlRight.Location = new System.Drawing.Point(660, 10); this.pnlRight.Name = "pnlRight"; - this.pnlRight.Size = new System.Drawing.Size(10, 206); + this.pnlRight.Size = new System.Drawing.Size(10, 342); this.pnlRight.TabIndex = 3; // // pnlLeft @@ -201,15 +201,15 @@ this.pnlLeft.Dock = System.Windows.Forms.DockStyle.Left; this.pnlLeft.Location = new System.Drawing.Point(0, 10); this.pnlLeft.Name = "pnlLeft"; - this.pnlLeft.Size = new System.Drawing.Size(10, 206); + this.pnlLeft.Size = new System.Drawing.Size(10, 342); this.pnlLeft.TabIndex = 2; // // pnlBottom // this.pnlBottom.Dock = System.Windows.Forms.DockStyle.Bottom; - this.pnlBottom.Location = new System.Drawing.Point(0, 216); + this.pnlBottom.Location = new System.Drawing.Point(0, 352); this.pnlBottom.Name = "pnlBottom"; - this.pnlBottom.Size = new System.Drawing.Size(441, 10); + this.pnlBottom.Size = new System.Drawing.Size(670, 10); this.pnlBottom.TabIndex = 1; // // pnlTop @@ -217,15 +217,15 @@ this.pnlTop.Dock = System.Windows.Forms.DockStyle.Top; this.pnlTop.Location = new System.Drawing.Point(0, 0); this.pnlTop.Name = "pnlTop"; - this.pnlTop.Size = new System.Drawing.Size(441, 10); + this.pnlTop.Size = new System.Drawing.Size(670, 10); this.pnlTop.TabIndex = 0; // // frmSystemSetting // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); + this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.SystemColors.Control; - this.ClientSize = new System.Drawing.Size(441, 226); + this.ClientSize = new System.Drawing.Size(670, 362); this.Controls.Add(this.pnlAll); this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); diff --git a/dll/CNASBalanceDBManage.exe b/dll/CNASBalanceDBManage.exe index 4753767..c1427ae 100644 Binary files a/dll/CNASBalanceDBManage.exe and b/dll/CNASBalanceDBManage.exe differ diff --git a/dll/CNAS_BalanceClient.exe b/dll/CNAS_BalanceClient.exe index 13ea583..3bdaf58 100644 Binary files a/dll/CNAS_BalanceClient.exe and b/dll/CNAS_BalanceClient.exe differ diff --git a/dll/CNAS_DBSync.exe b/dll/CNAS_DBSync.exe index cd25943..1ed5bb5 100644 Binary files a/dll/CNAS_DBSync.exe and b/dll/CNAS_DBSync.exe differ diff --git a/dll/CNAS_RunSync.exe b/dll/CNAS_RunSync.exe index 60b81a9..6f5422d 100644 Binary files a/dll/CNAS_RunSync.exe and b/dll/CNAS_RunSync.exe differ diff --git a/dll/CNAS_SerialPort.dll b/dll/CNAS_SerialPort.dll index 4f0869c..de0342a 100644 Binary files a/dll/CNAS_SerialPort.dll and b/dll/CNAS_SerialPort.dll differ diff --git a/dll/CNAS_SyncService.exe b/dll/CNAS_SyncService.exe index e09911b..a7c2485 100644 Binary files a/dll/CNAS_SyncService.exe and b/dll/CNAS_SyncService.exe differ diff --git a/dll/CnasLocalIDAL.dll b/dll/CnasLocalIDAL.dll index ed82ee4..c92855c 100644 Binary files a/dll/CnasLocalIDAL.dll and b/dll/CnasLocalIDAL.dll differ diff --git a/dll/CnasSynchronousCommon.dll b/dll/CnasSynchronousCommon.dll index 02b4dde..cfad665 100644 Binary files a/dll/CnasSynchronousCommon.dll and b/dll/CnasSynchronousCommon.dll differ diff --git a/dll/CnasSynchronusClient.dll b/dll/CnasSynchronusClient.dll index 3d43193..88374d7 100644 Binary files a/dll/CnasSynchronusClient.dll and b/dll/CnasSynchronusClient.dll differ diff --git a/dll/CnasSynchronusDAL.dll b/dll/CnasSynchronusDAL.dll index 2eb98bd..58358ef 100644 Binary files a/dll/CnasSynchronusDAL.dll and b/dll/CnasSynchronusDAL.dll differ diff --git a/dll/CnasSynchronusIDAL.dll b/dll/CnasSynchronusIDAL.dll index bc2ef78..9187834 100644 Binary files a/dll/CnasSynchronusIDAL.dll and b/dll/CnasSynchronusIDAL.dll differ diff --git a/dll/CnasSynchrousModel.dll b/dll/CnasSynchrousModel.dll index 9c9044f..625d05b 100644 Binary files a/dll/CnasSynchrousModel.dll and b/dll/CnasSynchrousModel.dll differ diff --git a/dll/SyncLocalDAL.dll b/dll/SyncLocalDAL.dll index 4f3ec9d..3bf90b8 100644 Binary files a/dll/SyncLocalDAL.dll and b/dll/SyncLocalDAL.dll differ diff --git a/dll/WF-ChangeGUID.exe b/dll/WF-ChangeGUID.exe index 425e9bf..e83e937 100644 Binary files a/dll/WF-ChangeGUID.exe and b/dll/WF-ChangeGUID.exe differ diff --git a/dll/activation.config b/dll/activation.config index 9ee4c79..33cc8aa 100644 --- a/dll/activation.config +++ b/dll/activation.config @@ -1 +1 @@ -BFEBFBFF000B06A2_7413EA0CEB72_7613EA0CEB71_7413EA0CEB71_7413EA0CEB75 \ No newline at end of file +BFEBFBFF000A0652_B025AA3FD303_00FF7AB4C9BA_8C554AD3D7A5_8E554AD3D7A4_8C554AD3D7A4_8C554AD3D7A8 \ No newline at end of file