Merge remote-tracking branch 'origin/master'

啊鑫

2024-12-09 2a8c7b4e3ebe5691fbbe84d8cf285be3f72b7c30

 DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.cs

@@ -218,7 +218,6 @@
                    pageBar1.TotalPages = dddd;
                    pageBar1.RecordCount = dd.rtnData.total;//记录总数
                    pageBar1.CurrentPage = curPage;//当前页
                    pageBar1.setTxt();
                }
                else
                {
@@ -266,5 +265,24 @@
                ToolBox.MsgHelper.Warning("提示：" + ex.Message);
            }
        }

        private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
        {
            var rowhandle = gridView1.FocusedRowHandle;
            if (rowhandle < 0)
                return;
            if (e.Button.Index == 0)
            {
                var dr = gridView1.GetDataRow(rowhandle);
                var mxGuid = dr["guid"].ToString();
                Gs.DevApp.UserControl.ShowUp frm = new Gs.DevApp.UserControl.ShowUp(mxGuid);
                frm.UpdateParent += (ss, ee) =>
                {
                    Gs.DevApp.ToolBox.MsgHelper.ShowInformation("上传成功！");
                    getPageList(1, UtilityHelper.GetPageSize());
                };
                frm.ShowDialog();
            }
        }
    }
}