diff --git a/29WxOrder.sln b/29WxOrder.sln index 7773259..cc24cb6 100644 --- a/29WxOrder.sln +++ b/29WxOrder.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.14.36221.1 d17.14 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.36128.20 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "29WxOrderAllBase", "AllBase\29WxOrderAllBase.csproj", "{6461D807-B1C8-45F0-B388-E0CA1A418DE0}" EndProject @@ -11,6 +11,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "29WxOrder", "29WxOrder\29Wx EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "29WxOrderWork", "Work\29WxOrderWork.csproj", "{1AD45D66-6872-4522-ACF0-04E2C0514048}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "29WxOrderWpf", "29WxOrderWpf\29WxOrderWpf.csproj", "{D7884375-E42F-4B89-AA3A-D8E75508D8C7}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -71,12 +73,29 @@ Global {1AD45D66-6872-4522-ACF0-04E2C0514048}.Release|x64.Build.0 = Release|Any CPU {1AD45D66-6872-4522-ACF0-04E2C0514048}.Release|x86.ActiveCfg = Release|x86 {1AD45D66-6872-4522-ACF0-04E2C0514048}.Release|x86.Build.0 = Release|x86 + {D7884375-E42F-4B89-AA3A-D8E75508D8C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D7884375-E42F-4B89-AA3A-D8E75508D8C7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D7884375-E42F-4B89-AA3A-D8E75508D8C7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {D7884375-E42F-4B89-AA3A-D8E75508D8C7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {D7884375-E42F-4B89-AA3A-D8E75508D8C7}.Debug|x64.ActiveCfg = Debug|Any CPU + {D7884375-E42F-4B89-AA3A-D8E75508D8C7}.Debug|x64.Build.0 = Debug|Any CPU + {D7884375-E42F-4B89-AA3A-D8E75508D8C7}.Debug|x86.ActiveCfg = Debug|Any CPU + {D7884375-E42F-4B89-AA3A-D8E75508D8C7}.Debug|x86.Build.0 = Debug|Any CPU + {D7884375-E42F-4B89-AA3A-D8E75508D8C7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D7884375-E42F-4B89-AA3A-D8E75508D8C7}.Release|Any CPU.Build.0 = Release|Any CPU + {D7884375-E42F-4B89-AA3A-D8E75508D8C7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {D7884375-E42F-4B89-AA3A-D8E75508D8C7}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {D7884375-E42F-4B89-AA3A-D8E75508D8C7}.Release|x64.ActiveCfg = Release|Any CPU + {D7884375-E42F-4B89-AA3A-D8E75508D8C7}.Release|x64.Build.0 = Release|Any CPU + {D7884375-E42F-4B89-AA3A-D8E75508D8C7}.Release|x86.ActiveCfg = Release|Any CPU + {D7884375-E42F-4B89-AA3A-D8E75508D8C7}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution {D51A1BB0-17BB-44C3-9129-1F3187E82729} = {1A7830FA-AC8F-40FB-A232-F0626812B8BE} + {D7884375-E42F-4B89-AA3A-D8E75508D8C7} = {1A7830FA-AC8F-40FB-A232-F0626812B8BE} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {38687A61-0347-49AC-98C7-E7F7148C0234} diff --git a/29WxOrder/MainForm.Designer.cs b/29WxOrder/MainForm.Designer.cs index a8310d2..fd333a4 100644 --- a/29WxOrder/MainForm.Designer.cs +++ b/29WxOrder/MainForm.Designer.cs @@ -62,11 +62,7 @@ namespace _29WxOrder this.chkUseMultiBuyer = new DevComponents.DotNetBar.Controls.CheckBoxX(); this.dgvShop = new System.Windows.Forms.DataGridView(); this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); - this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colShopAccount = new System.Windows.Forms.DataGridViewLinkColumn(); - this.colShopName = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colAuthStatus = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colLoginStatus = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.btnSetReceiveAddress = new DevComponents.DotNetBar.PanelEx(); this.pnlLogin1688 = new System.Windows.Forms.Panel(); this.lb1688 = new DevComponents.DotNetBar.LabelX(); @@ -123,10 +119,15 @@ namespace _29WxOrder this.lbSendOrder = new System.Windows.Forms.Label(); this.lbpdtime = new System.Windows.Forms.Label(); this.pnorderadmin = new System.Windows.Forms.Panel(); + this.button2 = new System.Windows.Forms.Button(); this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colShopName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colAuthStatus = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colLoginStatus = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.panel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pbseting)).BeginInit(); this.panel3.SuspendLayout(); @@ -429,6 +430,7 @@ namespace _29WxOrder // splitMain.Panel1 // this.splitMain.Panel1.BackColor = System.Drawing.Color.White; + this.splitMain.Panel1.Controls.Add(this.button2); this.splitMain.Panel1.Controls.Add(this.chkHasLogisticsThenSend); this.splitMain.Panel1.Controls.Add(this.btn电子面单测试); this.splitMain.Panel1.Controls.Add(this.btnExportExcel); @@ -598,7 +600,7 @@ namespace _29WxOrder this.chkUseMultiBuyer.FocusCuesEnabled = false; this.chkUseMultiBuyer.Location = new System.Drawing.Point(993, 83); this.chkUseMultiBuyer.Name = "chkUseMultiBuyer"; - this.chkUseMultiBuyer.Size = new System.Drawing.Size(88, 20); + this.chkUseMultiBuyer.Size = new System.Drawing.Size(90, 20); this.chkUseMultiBuyer.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.chkUseMultiBuyer.TabIndex = 1134; this.chkUseMultiBuyer.Text = "多买手拍单"; @@ -669,13 +671,6 @@ namespace _29WxOrder this.colSelect.ReadOnly = true; this.colSelect.Width = 18; // - // colShopId - // - this.colShopId.HeaderText = "店铺Id"; - this.colShopId.Name = "colShopId"; - this.colShopId.ReadOnly = true; - this.colShopId.Visible = false; - // // colShopAccount // this.colShopAccount.HeaderText = "店铺账号"; @@ -685,27 +680,6 @@ namespace _29WxOrder this.colShopAccount.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; this.colShopAccount.Width = 90; // - // colShopName - // - this.colShopName.HeaderText = "店铺名称"; - this.colShopName.Name = "colShopName"; - this.colShopName.ReadOnly = true; - this.colShopName.Width = 68; - // - // colAuthStatus - // - this.colAuthStatus.HeaderText = "授权状态"; - this.colAuthStatus.Name = "colAuthStatus"; - this.colAuthStatus.ReadOnly = true; - this.colAuthStatus.Width = 58; - // - // colLoginStatus - // - this.colLoginStatus.HeaderText = "登录状态"; - this.colLoginStatus.Name = "colLoginStatus"; - this.colLoginStatus.ReadOnly = true; - this.colLoginStatus.Width = 58; - // // btnSetReceiveAddress // this.btnSetReceiveAddress.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); @@ -1467,7 +1441,7 @@ namespace _29WxOrder this.chkUsePddPifa.FocusCuesEnabled = false; this.chkUsePddPifa.Location = new System.Drawing.Point(1127, 83); this.chkUsePddPifa.Name = "chkUsePddPifa"; - this.chkUsePddPifa.Size = new System.Drawing.Size(101, 20); + this.chkUsePddPifa.Size = new System.Drawing.Size(103, 20); this.chkUsePddPifa.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.chkUsePddPifa.TabIndex = 1106; this.chkUsePddPifa.Text = "多多批发拍单"; @@ -1479,7 +1453,7 @@ namespace _29WxOrder this.pnsku.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.pnsku.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); this.pnsku.Controls.Add(this.pcskuimg); - this.pnsku.Location = new System.Drawing.Point(10, 253); + this.pnsku.Location = new System.Drawing.Point(10, 257); this.pnsku.Name = "pnsku"; this.pnsku.Size = new System.Drawing.Size(220, 220); this.pnsku.TabIndex = 7; @@ -1614,6 +1588,17 @@ namespace _29WxOrder this.pnorderadmin.TabIndex = 7; this.pnorderadmin.Visible = false; // + // button2 + // + this.button2.Location = new System.Drawing.Point(114, 76); + this.button2.Name = "button2"; + this.button2.Size = new System.Drawing.Size(98, 23); + this.button2.TabIndex = 1172; + this.button2.Text = "加载控件测试"; + this.button2.UseVisualStyleBackColor = true; + this.button2.Visible = false; + this.button2.Click += new System.EventHandler(this.button2_Click); + // // dataGridViewTextBoxColumn1 // this.dataGridViewTextBoxColumn1.HeaderText = "店铺名称"; @@ -1643,6 +1628,34 @@ namespace _29WxOrder this.dataGridViewTextBoxColumn4.ReadOnly = true; this.dataGridViewTextBoxColumn4.Width = 48; // + // colShopId + // + this.colShopId.HeaderText = "店铺Id"; + this.colShopId.Name = "colShopId"; + this.colShopId.ReadOnly = true; + this.colShopId.Visible = false; + // + // colShopName + // + this.colShopName.HeaderText = "店铺名称"; + this.colShopName.Name = "colShopName"; + this.colShopName.ReadOnly = true; + this.colShopName.Width = 68; + // + // colAuthStatus + // + this.colAuthStatus.HeaderText = "授权状态"; + this.colAuthStatus.Name = "colAuthStatus"; + this.colAuthStatus.ReadOnly = true; + this.colAuthStatus.Width = 58; + // + // colLoginStatus + // + this.colLoginStatus.HeaderText = "登录状态"; + this.colLoginStatus.Name = "colLoginStatus"; + this.colLoginStatus.ReadOnly = true; + this.colLoginStatus.Width = 58; + // // MainForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -1784,6 +1797,7 @@ namespace _29WxOrder private DevComponents.DotNetBar.PanelEx btnSetMutliBuyer; private System.Windows.Forms.Button btn电子面单测试; private Work.UserComponents.UcCheckBox chkHasLogisticsThenSend; + private System.Windows.Forms.Button button2; } } diff --git a/29WxOrder/MainForm.cs b/29WxOrder/MainForm.cs index 0d8f2e3..4b1f164 100644 --- a/29WxOrder/MainForm.cs +++ b/29WxOrder/MainForm.cs @@ -40,6 +40,7 @@ using Work; using Work.Api; using Work.BaseForms; using Work.BuyUsers; +using _29WxOrder.MyControl; namespace _29WxOrder { @@ -338,6 +339,8 @@ namespace _29WxOrder this.chkReadFinishedRefund.Checked = ConfigHelper.LoadConfig("read_finished_refund"); AfterSaleOrderListForm.IsReadFinishedRefund = this.chkReadFinishedRefund.Checked; this.chkReadFinishedRefund.CheckedChanged += chkReadFinish_CheckedChanged; + + } @@ -3827,5 +3830,20 @@ namespace _29WxOrder } } } + + private void button2_Click(object sender, EventArgs e) + { + //flowLayoutPanel2.BringToFront(); + //Task.Run(() => + //{ + // for (int i = 0; i < 10000; i++) + // { + // Invoke(new Action(() => { this.flowLayoutPanel2.Controls.Add(new MyProSkuItemsControl()); })); + // if (i % 100 == 0) + // Thread.Sleep(1); + + // } + //}); + } } } diff --git a/29WxOrderWpf/29WxOrderWpf.csproj b/29WxOrderWpf/29WxOrderWpf.csproj new file mode 100644 index 0000000..fe66d75 --- /dev/null +++ b/29WxOrderWpf/29WxOrderWpf.csproj @@ -0,0 +1,110 @@ + + + + + Debug + AnyCPU + {D7884375-E42F-4B89-AA3A-D8E75508D8C7} + WinExe + _29WxOrderWpf + 29WxOrderWpf + v4.6.2 + 512 + {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + 4 + true + true + + + AnyCPU + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + AnyCPU + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + ..\DllReference\NaiBa.Util.dll + + + + + + + + + + + 4.0 + + + + + + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + App.xaml + Code + + + MainWindow.xaml + Code + + + + + Code + + + True + True + Resources.resx + + + True + Settings.settings + True + + + ResXFileCodeGenerator + Resources.Designer.cs + + + SettingsSingleFileGenerator + Settings.Designer.cs + + + + + + + + + + + {6461D807-B1C8-45F0-B388-E0CA1A418DE0} + 29WxOrderAllBase + + + + \ No newline at end of file diff --git a/29WxOrderWpf/App.config b/29WxOrderWpf/App.config new file mode 100644 index 0000000..b50c74f --- /dev/null +++ b/29WxOrderWpf/App.config @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/29WxOrderWpf/App.xaml b/29WxOrderWpf/App.xaml new file mode 100644 index 0000000..6318c00 --- /dev/null +++ b/29WxOrderWpf/App.xaml @@ -0,0 +1,9 @@ + + + + + diff --git a/29WxOrderWpf/App.xaml.cs b/29WxOrderWpf/App.xaml.cs new file mode 100644 index 0000000..df202c4 --- /dev/null +++ b/29WxOrderWpf/App.xaml.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Configuration; +using System.Data; +using System.Linq; +using System.Threading.Tasks; +using System.Windows; + +namespace _29WxOrderWpf +{ + /// + /// App.xaml 的交互逻辑 + /// + public partial class App : Application + { + } +} diff --git a/29WxOrderWpf/MainWindow.xaml b/29WxOrderWpf/MainWindow.xaml new file mode 100644 index 0000000..a610684 --- /dev/null +++ b/29WxOrderWpf/MainWindow.xaml @@ -0,0 +1,73 @@ + + + + + + + + + + + +