Merge branch 'master' of http://git.gs-mes.com:8080/r/~kyy/LW_MesClient

cnf

2025-07-24 262746cb15ee6779f24adeca62eded6389df6ef9

 DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs

@@ -2294,6 +2294,13 @@
            }
        }

        /// <summary>
        /// gridview 全选，取消全选
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        /// <param name="gcMain"></param>
        /// <param name="gridView1"></param>
        public static void CustomMouseUp(object sender, MouseEventArgs e, DevExpress.XtraGrid.GridControl gcMain, DevExpress.XtraGrid.Views.Grid.GridView gridView1)
        {
            GridColumn checkBoxColumn = gridView1.Columns[0];
@@ -2314,10 +2321,27 @@
                    else
                    {
                        checkBoxColumn.Tag = "1";
                        /********2025-07-23修补过滤bug 故注释 beg ************/
                        //foreach (DataRow row in _Table.Rows)
                        //{
                        //    row["chkInt"] = true;
                        //}
                        /********2025-07-23修补过滤bug 故注释 end ************/

                        /********2025-07-23修补过滤bug beg ************/
                        System.Collections.IList ftRow = gridView1.DataController.GetAllFilteredAndSortedRows();
                        System.Collections.ArrayList ftAry = new System.Collections.ArrayList();
                        foreach (System.Data.DataRowView _ft in ftRow)
                        {
                            string guid = _ft["guid"].ToString();
                            ftAry.Add(guid);
                        }
                        foreach (DataRow row in _Table.Rows)
                        {
                            row["chkInt"] = true;
                            if (ftAry.Contains(row["guid"].ToString()))
                                row["chkInt"] = true;
                        }
                        /********2025-07-23修补过滤bug end ************/
                    }
                    gcMain.BindingContext = new BindingContext();
                    gcMain.DataSource = _Table;