diff --git a/TEMUKJD CEFv138.sln b/TEMUKJD CEFv138.sln index 81b0c98..f23554d 100644 --- a/TEMUKJD CEFv138.sln +++ b/TEMUKJD CEFv138.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 18 -VisualStudioVersion = 18.8.12023.21 +# Visual Studio Version 17 +VisualStudioVersion = 17.14.36221.1 d17.14 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AllBase", "AllBase\AllBase.csproj", "{6461D807-B1C8-45F0-B388-E0CA1A418DE0}" EndProject @@ -49,8 +49,8 @@ Global {38E74D4C-2D8D-47D2-8A23-417C3C57ADE5}.Release|x86.Build.0 = Release|x86 {B8EE868D-56CD-4647-BBA5-04BEF24FF9F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B8EE868D-56CD-4647-BBA5-04BEF24FF9F6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B8EE868D-56CD-4647-BBA5-04BEF24FF9F6}.Debug|x64.ActiveCfg = Debug|Any CPU - {B8EE868D-56CD-4647-BBA5-04BEF24FF9F6}.Debug|x64.Build.0 = Debug|Any CPU + {B8EE868D-56CD-4647-BBA5-04BEF24FF9F6}.Debug|x64.ActiveCfg = Debug|x64 + {B8EE868D-56CD-4647-BBA5-04BEF24FF9F6}.Debug|x64.Build.0 = Debug|x64 {B8EE868D-56CD-4647-BBA5-04BEF24FF9F6}.Debug|x86.ActiveCfg = Debug|Any CPU {B8EE868D-56CD-4647-BBA5-04BEF24FF9F6}.Debug|x86.Build.0 = Debug|Any CPU {B8EE868D-56CD-4647-BBA5-04BEF24FF9F6}.Release|Any CPU.ActiveCfg = Release|Any CPU diff --git a/TEMUKJD/PDDForms/ProductSelectForms/CloudGoodsForm.Designer.cs b/TEMUKJD/PDDForms/ProductSelectForms/CloudGoodsForm.Designer.cs index ee4bbf8..26796c8 100644 --- a/TEMUKJD/PDDForms/ProductSelectForms/CloudGoodsForm.Designer.cs +++ b/TEMUKJD/PDDForms/ProductSelectForms/CloudGoodsForm.Designer.cs @@ -504,13 +504,14 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.ucSplitPage1.CurrentPage = 1; this.ucSplitPage1.Dock = System.Windows.Forms.DockStyle.Right; - this.ucSplitPage1.IsShowPageSize = false; + this.ucSplitPage1.IsShowPageSize = true; this.ucSplitPage1.IsShowTotalCount = true; - this.ucSplitPage1.Location = new System.Drawing.Point(1115, 0); + this.ucSplitPage1.Location = new System.Drawing.Point(1015, 0); this.ucSplitPage1.Margin = new System.Windows.Forms.Padding(0); + this.ucSplitPage1.MaxPageSizeValue = 2000; this.ucSplitPage1.Name = "ucSplitPage1"; this.ucSplitPage1.PageSize = 50; - this.ucSplitPage1.Size = new System.Drawing.Size(362, 25); + this.ucSplitPage1.Size = new System.Drawing.Size(462, 25); this.ucSplitPage1.TabIndex = 4; this.ucSplitPage1.TotalCount = ((long)(0)); this.ucSplitPage1.TotalPage = 1; diff --git a/TEMUKJD/PDDForms/ProductSelectForms/CloudGoodsForm.cs b/TEMUKJD/PDDForms/ProductSelectForms/CloudGoodsForm.cs index af41232..db16cc6 100644 --- a/TEMUKJD/PDDForms/ProductSelectForms/CloudGoodsForm.cs +++ b/TEMUKJD/PDDForms/ProductSelectForms/CloudGoodsForm.cs @@ -416,7 +416,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms { catName = GlobalConfig.PddCatList.FirstOrDefault(a => a.cat_id == item.CatId2)?.cat_name ?? ""; } - WXDBProdUploadForm.Instance.lstTemuDBProductSelect.Add(new TemuDBProductSelect + WXDBProdUploadForm.lstTemuDBProductSelect.Add(new TemuDBProductSelect { //out_product_Id = item.GoodsId.ToString(), spu_id = item.GoodsId.ToString(), @@ -433,7 +433,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms err++; } } - NaiBa.Util.Helper.ConfigHelper.SaveConfig("wx_db_prod_upload_list", WXDBProdUploadForm.Instance.lstTemuDBProductSelect); + NaiBa.Util.Helper.ConfigHelper.SaveConfig("wx_db_prod_upload_list", WXDBProdUploadForm.lstTemuDBProductSelect); BaseMsgForm.ShowInfo($"导入完成！{succ} 成功 {err} 失败"); } } diff --git a/TEMUKJD/UserControls/UcSplitPage.cs b/TEMUKJD/UserControls/UcSplitPage.cs index 1eb9426..3616659 100644 --- a/TEMUKJD/UserControls/UcSplitPage.cs +++ b/TEMUKJD/UserControls/UcSplitPage.cs @@ -32,6 +32,32 @@ namespace TemuKJD.UserControls } } } + + int maxPageSizeValue = 5000; + /// + /// 是否显示每页条数(启用每页条数功能) + /// + [Description("每页条数最大值"), Category("UserProperty")] + public int MaxPageSizeValue + { + get + { + return maxPageSizeValue; + } + set + { + if (maxPageSizeValue != value) + { + maxPageSizeValue = value; + foreach (var item in new string[] { "50", "100","200","500","1000","2000","5000" }) + { + if (item.ParseToInt() > maxPageSizeValue) + this.cmbPageSize.Items.Remove(item); + } + this.Invalidate(); + } + } + } /// /// 是否显示总条数 /// diff --git a/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs b/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs index 2d3c218..fe954f2 100644 --- a/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs +++ b/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs @@ -44,11 +44,11 @@ namespace TemuKJD.WXForms.ProductForms { public static WXDBProdUploadForm Instance { get; set; } = null; public static ConcurrentList lstWXShopTokenInfo = new ConcurrentList(); + public static ConcurrentList lstTemuDBProductSelect = new ConcurrentList(); - public CancellationTokenSource cancellationTokenSource { get; set; } = null; + public CancellationTokenSource cancellationTokenSource { get; set; } = null; public bool IsWxNotUseSoftwareDefaultAddressOnce { get; set; } = false; - public ConcurrentList lstTemuDBProductSelect = new ConcurrentList(); ConcurrentList lstAddPriceRule = new ConcurrentList(); bool isInit = false; @@ -1157,7 +1157,7 @@ namespace TemuKJD.WXForms.ProductForms lstTemuDBProductSelect.Remove(selectProd); } - NaiBa.Util.Helper.ConfigHelper.SaveConfig("wx_db_prod_upload_list", this.lstTemuDBProductSelect); + NaiBa.Util.Helper.ConfigHelper.SaveConfig("wx_db_prod_upload_list", lstTemuDBProductSelect); Invoke(new Action(() => { lblWaitToUp.Text = "待上传 " + lstTemuDBProductSelect.Count + " 件"; @@ -6311,7 +6311,7 @@ namespace TemuKJD.WXForms.ProductForms selectProd.id = 1; if (lstTemuDBProductSelect.Count > 0) selectProd.id = lstTemuDBProductSelect.Max(p => p.id) + 1; - this.lstTemuDBProductSelect.Add(selectProd); + lstTemuDBProductSelect.Add(selectProd); addCount--; if (addCount <= 0) @@ -6326,7 +6326,7 @@ namespace TemuKJD.WXForms.ProductForms if (addCount <= 0) break; } - NaiBa.Util.Helper.ConfigHelper.SaveConfig("wx_db_prod_upload_list", this.lstTemuDBProductSelect); + NaiBa.Util.Helper.ConfigHelper.SaveConfig("wx_db_prod_upload_list", lstTemuDBProductSelect); } Invoke(new Action(() => @@ -6601,8 +6601,8 @@ namespace TemuKJD.WXForms.ProductForms if (BaseMsgForm.ShowConfirm("确定清空待上传商品吗？清空后不可恢复！").DialogResult == DialogResult.Cancel) return; - this.lstTemuDBProductSelect.Clear(); - NaiBa.Util.Helper.ConfigHelper.SaveConfig("wx_db_prod_upload_list", this.lstTemuDBProductSelect); + lstTemuDBProductSelect.Clear(); + NaiBa.Util.Helper.ConfigHelper.SaveConfig("wx_db_prod_upload_list", lstTemuDBProductSelect); lblWaitToUp.Text = "待上传 " + lstTemuDBProductSelect.Count + " 件"; } @@ -6711,7 +6711,7 @@ namespace TemuKJD.WXForms.ProductForms PDDDBProdUploadSelectCacheForm selectCacheForm = new PDDDBProdUploadSelectCacheForm(lstTemuDBProductSelect); selectCacheForm.ShowDialog(); - NaiBa.Util.Helper.ConfigHelper.SaveConfig("wx_db_prod_upload_list", this.lstTemuDBProductSelect); + NaiBa.Util.Helper.ConfigHelper.SaveConfig("wx_db_prod_upload_list", lstTemuDBProductSelect); lblWaitToUp.Text = "待上传 " + lstTemuDBProductSelect.Count + " 件"; } @@ -7057,7 +7057,7 @@ namespace TemuKJD.WXForms.ProductForms var cates = GlobalConfig.WxCatBoundList.Where(b => b.cat_bound <= boundMax && b.cat_bound >= boundMin); lstTemuDBProductSelect.RemoveAll(p => !cates.Any(c => c.leaf_id.ParseToString() == p.wx_cat_leaf)); - NaiBa.Util.Helper.ConfigHelper.SaveConfig("wx_db_prod_upload_list", this.lstTemuDBProductSelect); + NaiBa.Util.Helper.ConfigHelper.SaveConfig("wx_db_prod_upload_list", lstTemuDBProductSelect); lblWaitToUp.Text = "待上传 " + lstTemuDBProductSelect.Count + " 件"; } @@ -7254,7 +7254,7 @@ namespace TemuKJD.WXForms.ProductForms private void btnProdDb_Click(object sender, EventArgs e) { - WXSelectDBProdListForm.Instance.lstTemuDBProductSelect = this.lstTemuDBProductSelect; + WXSelectDBProdListForm.Instance.lstTemuDBProductSelect = lstTemuDBProductSelect; WXSelectDBProdListForm.Instance.cmbSourceType.Items.Clear(); WXSelectDBProdListForm.Instance.cmbSourceType.Items.AddRange(this.cmbSourceType.Items.Cast().ToArray()); WXSelectDBProdListForm.Instance.SaveComplete -= dbProdList_SaveComplete; @@ -7265,7 +7265,7 @@ namespace TemuKJD.WXForms.ProductForms public void dbProdList_SaveComplete(object obj) { - NaiBa.Util.Helper.ConfigHelper.SaveConfig("wx_db_prod_upload_list", this.lstTemuDBProductSelect); + NaiBa.Util.Helper.ConfigHelper.SaveConfig("wx_db_prod_upload_list", lstTemuDBProductSelect); Invoke(new Action(() => { lblWaitToUp.Text = "待上传 " + lstTemuDBProductSelect.Count + " 件"; diff --git a/TEMUKJD/WXForms/ProductForms/WXSelectDBProdListForm.cs b/TEMUKJD/WXForms/ProductForms/WXSelectDBProdListForm.cs index e598f33..c08d628 100644 --- a/TEMUKJD/WXForms/ProductForms/WXSelectDBProdListForm.cs +++ b/TEMUKJD/WXForms/ProductForms/WXSelectDBProdListForm.cs @@ -928,9 +928,9 @@ namespace TemuKJD.WXForms.ProductForms selectProd.is_fission_title = true; selectProd.out_product_Id = prod.id.ToString(); selectProd.id = 1; - if (WXDBProdUploadForm.Instance.lstTemuDBProductSelect.Count > 0) - selectProd.id = WXDBProdUploadForm.Instance.lstTemuDBProductSelect.Max(p => p.id) + 1; - WXDBProdUploadForm.Instance.lstTemuDBProductSelect.Add(selectProd); + if (WXDBProdUploadForm.lstTemuDBProductSelect.Count > 0) + selectProd.id = WXDBProdUploadForm.lstTemuDBProductSelect.Max(p => p.id) + 1; + WXDBProdUploadForm.lstTemuDBProductSelect.Add(selectProd); } } diff --git a/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.cs b/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.cs index b79ac5f..14a2714 100644 --- a/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.cs +++ b/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.cs @@ -1106,12 +1106,12 @@ namespace TemuKJD.WXForms.ProductForms selectProd.is_fission_title = true; selectProd.out_product_Id = prod.id.ToString(); selectProd.id = 1; - if (WXDBProdUploadForm.Instance.lstTemuDBProductSelect.Count > 0) - selectProd.id = WXDBProdUploadForm.Instance.lstTemuDBProductSelect.Max(p => p.id) + 1; - WXDBProdUploadForm.Instance.lstTemuDBProductSelect.Add(selectProd); + if (WXDBProdUploadForm.lstTemuDBProductSelect.Count > 0) + selectProd.id = WXDBProdUploadForm.lstTemuDBProductSelect.Max(p => p.id) + 1; + WXDBProdUploadForm.lstTemuDBProductSelect.Add(selectProd); } } - WXDBProdUploadForm.Instance.dbProdList_SaveComplete(WXDBProdUploadForm.Instance.lstTemuDBProductSelect); + WXDBProdUploadForm.Instance.dbProdList_SaveComplete(WXDBProdUploadForm.lstTemuDBProductSelect); } }