Skip to content

张东亮 / NS100

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 595d6703 由 夏萍
选项

更改关键字添加按钮

1 个父辈 c2637e2c
全部展开
内嵌 并排
正在显示 5 个修改的文件 包含 27 行增加 和 24 行删除
BLL/MaterialEdit.cs
...@@ -144,6 +144,7 @@ namespace BLL ...@@ -144,6 +144,7 @@ namespace BLL
mateName = ""; mateName = "";
keyword = null; keyword = null;
LogNet.log.Info($"code数量：{code.Count}");
code.ForEach((c) => code.ForEach((c) =>
{ {
LogNet.log.Info($"扫描到 {c.Angle}, {c.CodeType},{c.Text}"); LogNet.log.Info($"扫描到 {c.Angle}, {c.CodeType},{c.Text}");
......
SmartScan/SetControl/UsrCodeExtractList.cs
...@@ -26,7 +26,9 @@ namespace SmartScan ...@@ -26,7 +26,9 @@ namespace SmartScan
changed = true; changed = true;
Language.SetLanguage(this); Language.SetLanguage(this);
//var name = LblSplitPart.Text.Trim();
//LblSplitPart.Text= "Field";
//LblSplitPart.Text = "获取分割部分";
this.codeText = codeText; this.codeText = codeText;
this.codeType = codeType; this.codeType = codeType;
CboKeyword.Items.AddRange(BLLCommon.macroKey.ToArray()); CboKeyword.Items.AddRange(BLLCommon.macroKey.ToArray());
......
SmartScan/SetControl/UsrPrintTemplate.Designer.cs
...@@ -33,12 +33,12 @@ namespace SmartScan ...@@ -33,12 +33,12 @@ namespace SmartScan
this.tableLayoutPanel5 = new System.Windows.Forms.TableLayoutPanel(); this.tableLayoutPanel5 = new System.Windows.Forms.TableLayoutPanel();
this.pnlPrintTmpLst = new Asa.FaceControl.FacePanel(); this.pnlPrintTmpLst = new Asa.FaceControl.FacePanel();
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
this.LstLabel = new Asa.FaceControl.FaceListBox();
this.pnlPrintTmpLstOp = new Asa.FaceControl.FacePanel(); this.pnlPrintTmpLstOp = new Asa.FaceControl.FacePanel();
this.BtnAddLabel = new Asa.FaceControl.FaceButton(); this.BtnAddLabel = new Asa.FaceControl.FaceButton();
this.BtnDelLabel = new Asa.FaceControl.FaceButton(); this.BtnDelLabel = new Asa.FaceControl.FaceButton();
this.BtnCopyLabel = new Asa.FaceControl.FaceButton(); this.BtnCopyLabel = new Asa.FaceControl.FaceButton();
this.BtnRenameLabel = new Asa.FaceControl.FaceButton(); this.BtnRenameLabel = new Asa.FaceControl.FaceButton();
this.LstLabel = new Asa.FaceControl.FaceListBox();
this.pnLabelStyle = new Asa.FaceControl.FacePanel(); this.pnLabelStyle = new Asa.FaceControl.FacePanel();
this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
this.pnAllFieldsOfLabel = new Asa.FaceControl.FacePanel(); this.pnAllFieldsOfLabel = new Asa.FaceControl.FacePanel();
...@@ -142,10 +142,25 @@ namespace SmartScan ...@@ -142,10 +142,25 @@ namespace SmartScan
this.tableLayoutPanel1.Name = "tableLayoutPanel1"; this.tableLayoutPanel1.Name = "tableLayoutPanel1";
this.tableLayoutPanel1.RowCount = 2; this.tableLayoutPanel1.RowCount = 2;
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 130F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 145F));
this.tableLayoutPanel1.Size = new System.Drawing.Size(460, 635); this.tableLayoutPanel1.Size = new System.Drawing.Size(460, 635);
this.tableLayoutPanel1.TabIndex = 0; this.tableLayoutPanel1.TabIndex = 0;
// //
// LstLabel
//
this.LstLabel.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20)))));
this.LstLabel.BorderStyle = Asa.FaceControl.ControlShape.Rectangle;
this.LstLabel.BorderWidth = 2;
this.LstLabel.Dock = System.Windows.Forms.DockStyle.Fill;
this.LstLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.LstLabel.Location = new System.Drawing.Point(3, 3);
this.LstLabel.Name = "LstLabel";
this.LstLabel.Padding = new System.Windows.Forms.Padding(3);
this.LstLabel.SelectedIndex = -1;
this.LstLabel.Size = new System.Drawing.Size(454, 484);
this.LstLabel.TabIndex = 0;
this.LstLabel.SelectedIndexChanged += new System.EventHandler(this.LstLabel_SelectedIndexChanged);
//
// pnlPrintTmpLstOp // pnlPrintTmpLstOp
// //
this.pnlPrintTmpLstOp.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20))))); this.pnlPrintTmpLstOp.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20)))));
...@@ -157,11 +172,11 @@ namespace SmartScan ...@@ -157,11 +172,11 @@ namespace SmartScan
this.pnlPrintTmpLstOp.Controls.Add(this.BtnRenameLabel); this.pnlPrintTmpLstOp.Controls.Add(this.BtnRenameLabel);
this.pnlPrintTmpLstOp.Dock = System.Windows.Forms.DockStyle.Fill; this.pnlPrintTmpLstOp.Dock = System.Windows.Forms.DockStyle.Fill;
this.pnlPrintTmpLstOp.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.pnlPrintTmpLstOp.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.pnlPrintTmpLstOp.Location = new System.Drawing.Point(2, 507); this.pnlPrintTmpLstOp.Location = new System.Drawing.Point(2, 492);
this.pnlPrintTmpLstOp.Margin = new System.Windows.Forms.Padding(2); this.pnlPrintTmpLstOp.Margin = new System.Windows.Forms.Padding(2);
this.pnlPrintTmpLstOp.Name = "pnlPrintTmpLstOp"; this.pnlPrintTmpLstOp.Name = "pnlPrintTmpLstOp";
this.pnlPrintTmpLstOp.Padding = new System.Windows.Forms.Padding(2); this.pnlPrintTmpLstOp.Padding = new System.Windows.Forms.Padding(2);
this.pnlPrintTmpLstOp.Size = new System.Drawing.Size(456, 126); this.pnlPrintTmpLstOp.Size = new System.Drawing.Size(456, 141);
this.pnlPrintTmpLstOp.TabIndex = 31; this.pnlPrintTmpLstOp.TabIndex = 31;
this.pnlPrintTmpLstOp.Text = "标签模板操作"; this.pnlPrintTmpLstOp.Text = "标签模板操作";
this.pnlPrintTmpLstOp.TitleFont = new System.Drawing.Font("宋体", 12F); this.pnlPrintTmpLstOp.TitleFont = new System.Drawing.Font("宋体", 12F);
...@@ -177,7 +192,7 @@ namespace SmartScan ...@@ -177,7 +192,7 @@ namespace SmartScan
this.BtnAddLabel.Location = new System.Drawing.Point(6, 34); this.BtnAddLabel.Location = new System.Drawing.Point(6, 34);
this.BtnAddLabel.Name = "BtnAddLabel"; this.BtnAddLabel.Name = "BtnAddLabel";
this.BtnAddLabel.Padding = new System.Windows.Forms.Padding(3); this.BtnAddLabel.Padding = new System.Windows.Forms.Padding(3);
this.BtnAddLabel.Size = new System.Drawing.Size(106, 85); this.BtnAddLabel.Size = new System.Drawing.Size(106, 98);
this.BtnAddLabel.TabIndex = 1; this.BtnAddLabel.TabIndex = 1;
this.BtnAddLabel.Text = "新建标签"; this.BtnAddLabel.Text = "新建标签";
this.BtnAddLabel.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; this.BtnAddLabel.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
...@@ -194,7 +209,7 @@ namespace SmartScan ...@@ -194,7 +209,7 @@ namespace SmartScan
this.BtnDelLabel.Location = new System.Drawing.Point(118, 34); this.BtnDelLabel.Location = new System.Drawing.Point(118, 34);
this.BtnDelLabel.Name = "BtnDelLabel"; this.BtnDelLabel.Name = "BtnDelLabel";
this.BtnDelLabel.Padding = new System.Windows.Forms.Padding(3); this.BtnDelLabel.Padding = new System.Windows.Forms.Padding(3);
this.BtnDelLabel.Size = new System.Drawing.Size(106, 85); this.BtnDelLabel.Size = new System.Drawing.Size(106, 98);
this.BtnDelLabel.TabIndex = 2; this.BtnDelLabel.TabIndex = 2;
this.BtnDelLabel.Text = "删除标签"; this.BtnDelLabel.Text = "删除标签";
this.BtnDelLabel.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; this.BtnDelLabel.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
...@@ -211,7 +226,7 @@ namespace SmartScan ...@@ -211,7 +226,7 @@ namespace SmartScan
this.BtnCopyLabel.Location = new System.Drawing.Point(231, 34); this.BtnCopyLabel.Location = new System.Drawing.Point(231, 34);
this.BtnCopyLabel.Name = "BtnCopyLabel"; this.BtnCopyLabel.Name = "BtnCopyLabel";
this.BtnCopyLabel.Padding = new System.Windows.Forms.Padding(3); this.BtnCopyLabel.Padding = new System.Windows.Forms.Padding(3);
this.BtnCopyLabel.Size = new System.Drawing.Size(106, 85); this.BtnCopyLabel.Size = new System.Drawing.Size(106, 98);
this.BtnCopyLabel.TabIndex = 23; this.BtnCopyLabel.TabIndex = 23;
this.BtnCopyLabel.Text = "复制标签"; this.BtnCopyLabel.Text = "复制标签";
this.BtnCopyLabel.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; this.BtnCopyLabel.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
...@@ -228,27 +243,12 @@ namespace SmartScan ...@@ -228,27 +243,12 @@ namespace SmartScan
this.BtnRenameLabel.Location = new System.Drawing.Point(344, 34); this.BtnRenameLabel.Location = new System.Drawing.Point(344, 34);
this.BtnRenameLabel.Name = "BtnRenameLabel"; this.BtnRenameLabel.Name = "BtnRenameLabel";
this.BtnRenameLabel.Padding = new System.Windows.Forms.Padding(3); this.BtnRenameLabel.Padding = new System.Windows.Forms.Padding(3);
this.BtnRenameLabel.Size = new System.Drawing.Size(106, 85); this.BtnRenameLabel.Size = new System.Drawing.Size(106, 98);
this.BtnRenameLabel.TabIndex = 3; this.BtnRenameLabel.TabIndex = 3;
this.BtnRenameLabel.Text = "重命名"; this.BtnRenameLabel.Text = "重命名";
this.BtnRenameLabel.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; this.BtnRenameLabel.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
this.BtnRenameLabel.Click += new System.EventHandler(this.BtnRenameLabel_Click); this.BtnRenameLabel.Click += new System.EventHandler(this.BtnRenameLabel_Click);
// //
// LstLabel
//
this.LstLabel.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20)))));
this.LstLabel.BorderStyle = Asa.FaceControl.ControlShape.Rectangle;
this.LstLabel.BorderWidth = 2;
this.LstLabel.Dock = System.Windows.Forms.DockStyle.Fill;
this.LstLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.LstLabel.Location = new System.Drawing.Point(3, 3);
this.LstLabel.Name = "LstLabel";
this.LstLabel.Padding = new System.Windows.Forms.Padding(3);
this.LstLabel.SelectedIndex = -1;
this.LstLabel.Size = new System.Drawing.Size(454, 499);
this.LstLabel.TabIndex = 0;
this.LstLabel.SelectedIndexChanged += new System.EventHandler(this.LstLabel_SelectedIndexChanged);
//
// pnLabelStyle // pnLabelStyle
// //
this.pnLabelStyle.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.pnLabelStyle.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!