From 5a149d626ae8bc3fa4bddbb53f8caf40f51f6da6 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周三, 04 6月 2025 17:42:13 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
Weben_CMS专用代码生成器/Code/MainForm.Designer.cs | 119 ++++++++++++++++++-----------------------------------------
1 files changed, 36 insertions(+), 83 deletions(-)
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/MainForm.Designer.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/MainForm.Designer.cs"
index 7f6d752..de87009 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/MainForm.Designer.cs"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/MainForm.Designer.cs"
@@ -60,6 +60,7 @@
this.lbl_DataSource = new System.Windows.Forms.Label();
this.cmb_DataSource = new System.Windows.Forms.ComboBox();
this.groupBox2 = new System.Windows.Forms.GroupBox();
+ this.label1 = new System.Windows.Forms.Label();
this.tb_DeleteAlertAttr = new System.Windows.Forms.TextBox();
this.label25 = new System.Windows.Forms.Label();
this.tb_ValidateRepeatName = new System.Windows.Forms.TextBox();
@@ -75,23 +76,17 @@
this.label19 = new System.Windows.Forms.Label();
this.label18 = new System.Windows.Forms.Label();
this.tb_EnumList = new System.Windows.Forms.TextBox();
- this.groupBox3 = new System.Windows.Forms.GroupBox();
- this.tb_importExcelCategroy = new System.Windows.Forms.TextBox();
- this.ck_IsShowImport = new System.Windows.Forms.CheckBox();
- this.label12 = new System.Windows.Forms.Label();
- this.tb_templeteFileDownName = new System.Windows.Forms.TextBox();
- this.label14 = new System.Windows.Forms.Label();
this.tb_FilePath = new System.Windows.Forms.TextBox();
this.btn_SelectFile = new System.Windows.Forms.Button();
this.button1 = new System.Windows.Forms.Button();
+ this.ck_IsDeletefile = new System.Windows.Forms.CheckBox();
this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout();
- this.groupBox3.SuspendLayout();
this.SuspendLayout();
//
// btnPath
//
- this.btnPath.Location = new System.Drawing.Point(453, 723);
+ this.btnPath.Location = new System.Drawing.Point(425, 720);
this.btnPath.Name = "btnPath";
this.btnPath.Size = new System.Drawing.Size(97, 23);
this.btnPath.TabIndex = 1;
@@ -364,6 +359,7 @@
//
// groupBox2
//
+ this.groupBox2.Controls.Add(this.label1);
this.groupBox2.Controls.Add(this.tb_DeleteAlertAttr);
this.groupBox2.Controls.Add(this.label25);
this.groupBox2.Controls.Add(this.tb_ValidateRepeatName);
@@ -379,7 +375,6 @@
this.groupBox2.Controls.Add(this.label19);
this.groupBox2.Controls.Add(this.label18);
this.groupBox2.Controls.Add(this.tb_EnumList);
- this.groupBox2.Controls.Add(this.groupBox3);
this.groupBox2.Controls.Add(this.lblds);
this.groupBox2.Controls.Add(this.tb_VueRootFolerName);
this.groupBox2.Controls.Add(this.tb_TableName);
@@ -403,10 +398,20 @@
this.groupBox2.Controls.Add(this.label7);
this.groupBox2.Location = new System.Drawing.Point(51, 90);
this.groupBox2.Name = "groupBox2";
- this.groupBox2.Size = new System.Drawing.Size(1187, 470);
+ this.groupBox2.Size = new System.Drawing.Size(1283, 470);
this.groupBox2.TabIndex = 46;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "鑷畾涔夐厤缃�";
+ //
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.ForeColor = System.Drawing.Color.Red;
+ this.label1.Location = new System.Drawing.Point(976, 185);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(245, 12);
+ this.label1.TabIndex = 66;
+ this.label1.Text = "濡傛灉涓虹┖锛岀郴缁熼粯璁ゆ墍鏈夊瓧绗︿覆鐨勫睍绀哄垪鏌ヨ";
//
// tb_DeleteAlertAttr
//
@@ -509,10 +514,10 @@
this.label19.AutoSize = true;
this.label19.Location = new System.Drawing.Point(318, 346);
this.label19.Name = "label19";
- this.label19.Size = new System.Drawing.Size(563, 12);
+ this.label19.Size = new System.Drawing.Size(485, 12);
this.label19.TabIndex = 53;
- this.label19.Text = "PurchaseType|PurchaseTypeEnum|PurchaseTypeDesc,MaterialType|MaterialTypeEnum|Mate" +
- "rialTypeDesc";
+ this.label19.Text = "PurchaseType,PurchaseTypeEnum&MaterialType,MaterialTypeEnum&IsMainBranch,YesNoEnu" +
+ "m";
//
// label18
//
@@ -530,67 +535,6 @@
this.tb_EnumList.Name = "tb_EnumList";
this.tb_EnumList.Size = new System.Drawing.Size(369, 104);
this.tb_EnumList.TabIndex = 51;
- //
- // groupBox3
- //
- this.groupBox3.Controls.Add(this.tb_importExcelCategroy);
- this.groupBox3.Controls.Add(this.ck_IsShowImport);
- this.groupBox3.Controls.Add(this.label12);
- this.groupBox3.Controls.Add(this.tb_templeteFileDownName);
- this.groupBox3.Controls.Add(this.label14);
- this.groupBox3.Location = new System.Drawing.Point(28, 316);
- this.groupBox3.Margin = new System.Windows.Forms.Padding(2);
- this.groupBox3.Name = "groupBox3";
- this.groupBox3.Padding = new System.Windows.Forms.Padding(2);
- this.groupBox3.Size = new System.Drawing.Size(272, 118);
- this.groupBox3.TabIndex = 46;
- this.groupBox3.TabStop = false;
- this.groupBox3.Text = "瀵煎叆鍔熻兘";
- //
- // tb_importExcelCategroy
- //
- this.tb_importExcelCategroy.Location = new System.Drawing.Point(143, 86);
- this.tb_importExcelCategroy.Name = "tb_importExcelCategroy";
- this.tb_importExcelCategroy.Size = new System.Drawing.Size(113, 21);
- this.tb_importExcelCategroy.TabIndex = 50;
- //
- // ck_IsShowImport
- //
- this.ck_IsShowImport.AutoSize = true;
- this.ck_IsShowImport.Location = new System.Drawing.Point(21, 30);
- this.ck_IsShowImport.Margin = new System.Windows.Forms.Padding(2);
- this.ck_IsShowImport.Name = "ck_IsShowImport";
- this.ck_IsShowImport.Size = new System.Drawing.Size(108, 16);
- this.ck_IsShowImport.TabIndex = 45;
- this.ck_IsShowImport.Text = "鏄惁鏈夊鍏ュ姛鑳�";
- this.ck_IsShowImport.UseVisualStyleBackColor = true;
- this.ck_IsShowImport.Visible = false;
- this.ck_IsShowImport.CheckedChanged += new System.EventHandler(this.ck_IsShowImport_CheckedChanged);
- //
- // label12
- //
- this.label12.AutoSize = true;
- this.label12.Location = new System.Drawing.Point(9, 94);
- this.label12.Name = "label12";
- this.label12.Size = new System.Drawing.Size(119, 12);
- this.label12.TabIndex = 49;
- this.label12.Text = "涓婁紶鏂囦欢鐨勮姹傚垎绫�:";
- //
- // tb_templeteFileDownName
- //
- this.tb_templeteFileDownName.Location = new System.Drawing.Point(143, 58);
- this.tb_templeteFileDownName.Name = "tb_templeteFileDownName";
- this.tb_templeteFileDownName.Size = new System.Drawing.Size(113, 21);
- this.tb_templeteFileDownName.TabIndex = 48;
- //
- // label14
- //
- this.label14.AutoSize = true;
- this.label14.Location = new System.Drawing.Point(10, 60);
- this.label14.Name = "label14";
- this.label14.Size = new System.Drawing.Size(83, 12);
- this.label14.TabIndex = 47;
- this.label14.Text = "鏂囦欢涓嬭浇鍚嶅瓧:";
//
// tb_FilePath
//
@@ -621,11 +565,26 @@
this.button1.UseVisualStyleBackColor = true;
this.button1.Click += new System.EventHandler(this.button1_Click_1);
//
+ // ck_IsDeletefile
+ //
+ this.ck_IsDeletefile.AutoSize = true;
+ this.ck_IsDeletefile.Checked = true;
+ this.ck_IsDeletefile.CheckState = System.Windows.Forms.CheckState.Checked;
+ this.ck_IsDeletefile.ForeColor = System.Drawing.Color.Red;
+ this.ck_IsDeletefile.Location = new System.Drawing.Point(561, 724);
+ this.ck_IsDeletefile.Name = "ck_IsDeletefile";
+ this.ck_IsDeletefile.Size = new System.Drawing.Size(192, 16);
+ this.ck_IsDeletefile.TabIndex = 50;
+ this.ck_IsDeletefile.Text = "鐢熸垚鍓嶆槸鍚﹀厛娓呯悊鏂囦欢澶圭殑鏂囦欢";
+ this.ck_IsDeletefile.UseVisualStyleBackColor = true;
+ this.ck_IsDeletefile.CheckedChanged += new System.EventHandler(this.ck_IsDeletefile_CheckedChanged);
+ //
// MainForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1250, 831);
+ this.ClientSize = new System.Drawing.Size(1402, 831);
+ this.Controls.Add(this.ck_IsDeletefile);
this.Controls.Add(this.button1);
this.Controls.Add(this.btn_SelectFile);
this.Controls.Add(this.tb_FilePath);
@@ -644,8 +603,6 @@
this.groupBox1.PerformLayout();
this.groupBox2.ResumeLayout(false);
this.groupBox2.PerformLayout();
- this.groupBox3.ResumeLayout(false);
- this.groupBox3.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
@@ -683,12 +640,6 @@
private System.Windows.Forms.Label lbl_DataSource;
private System.Windows.Forms.ComboBox cmb_DataSource;
private System.Windows.Forms.GroupBox groupBox2;
- private System.Windows.Forms.CheckBox ck_IsShowImport;
- private System.Windows.Forms.GroupBox groupBox3;
- private System.Windows.Forms.TextBox tb_importExcelCategroy;
- private System.Windows.Forms.Label label12;
- private System.Windows.Forms.TextBox tb_templeteFileDownName;
- private System.Windows.Forms.Label label14;
private System.Windows.Forms.ComboBox cmb_DataBase;
private System.Windows.Forms.Label label17;
private System.Windows.Forms.Label label18;
@@ -709,6 +660,8 @@
private System.Windows.Forms.TextBox tb_FilePath;
private System.Windows.Forms.Button btn_SelectFile;
private System.Windows.Forms.Button button1;
+ private System.Windows.Forms.Label label1;
+ private System.Windows.Forms.CheckBox ck_IsDeletefile;
}
}
--
Gitblit v1.9.3