1

lu

2024-12-04 a952e19c231c432c365e649d3b354ec331c5f642

1

 DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.Designer.cs

@@ -102,6 +102,7 @@
            this.gv_createdBy.MinWidth = 25;
            this.gv_createdBy.Name = "gv_createdBy";
            this.gv_createdBy.OptionsColumn.AllowEdit = false;
            this.gv_createdBy.Tag = "query_check_by";
            this.gv_createdBy.Visible = true;
            this.gv_createdBy.VisibleIndex = 8;
            this.gv_createdBy.Width = 94;
@@ -115,6 +116,7 @@
            this.gv_createDate.MinWidth = 25;
            this.gv_createDate.Name = "gv_createDate";
            this.gv_createDate.OptionsColumn.AllowEdit = false;
            this.gv_createDate.Tag = "query_check_date";
            this.gv_createDate.Visible = true;
            this.gv_createDate.VisibleIndex = 7;
            this.gv_createDate.Width = 94;
@@ -128,6 +130,7 @@
            this.gv_flagIncludeDocCode.MinWidth = 25;
            this.gv_flagIncludeDocCode.Name = "gv_flagIncludeDocCode";
            this.gv_flagIncludeDocCode.OptionsColumn.AllowEdit = false;
            this.gv_flagIncludeDocCode.Tag = "query_IS_INCLUDE_DOC";
            this.gv_flagIncludeDocCode.Visible = true;
            this.gv_flagIncludeDocCode.VisibleIndex = 5;
            this.gv_flagIncludeDocCode.Width = 94;
@@ -141,6 +144,7 @@
            this.gv_flagSpilitNo.MinWidth = 25;
            this.gv_flagSpilitNo.Name = "gv_flagSpilitNo";
            this.gv_flagSpilitNo.OptionsColumn.AllowEdit = false;
            this.gv_flagSpilitNo.Tag = "query_IS_SPILIT";
            this.gv_flagSpilitNo.Visible = true;
            this.gv_flagSpilitNo.VisibleIndex = 3;
            this.gv_flagSpilitNo.Width = 94;
@@ -154,6 +158,7 @@
            this.gv_resetZero.MinWidth = 25;
            this.gv_resetZero.Name = "gv_resetZero";
            this.gv_resetZero.OptionsColumn.AllowEdit = false;
            this.gv_resetZero.Tag = "query_RESET_ZERO";
            this.gv_resetZero.Visible = true;
            this.gv_resetZero.VisibleIndex = 4;
            this.gv_resetZero.Width = 94;
@@ -167,6 +172,7 @@
            this.gv_noLength.MinWidth = 25;
            this.gv_noLength.Name = "gv_noLength";
            this.gv_noLength.OptionsColumn.AllowEdit = false;
            this.gv_noLength.Tag = "query_NO_LENGTH";
            this.gv_noLength.Visible = true;
            this.gv_noLength.VisibleIndex = 2;
            this.gv_noLength.Width = 94;
@@ -180,6 +186,7 @@
            this.gv_ruleFormat.MinWidth = 150;
            this.gv_ruleFormat.Name = "gv_ruleFormat";
            this.gv_ruleFormat.OptionsColumn.AllowEdit = false;
            this.gv_ruleFormat.Tag = "query_DOC_FORMAT";
            this.gv_ruleFormat.Visible = true;
            this.gv_ruleFormat.VisibleIndex = 1;
            this.gv_ruleFormat.Width = 150;
@@ -193,6 +200,7 @@
            this.gv_docCode.MinWidth = 25;
            this.gv_docCode.Name = "gv_docCode";
            this.gv_docCode.OptionsColumn.AllowEdit = false;
            this.gv_docCode.Tag = "query_DOC_CODE";
            this.gv_docCode.Visible = true;
            this.gv_docCode.VisibleIndex = 0;
            this.gv_docCode.Width = 94;
@@ -250,6 +258,7 @@
            this.gv_checkStatus.MinWidth = 25;
            this.gv_checkStatus.Name = "gv_checkStatus";
            this.gv_checkStatus.OptionsColumn.AllowEdit = false;
            this.gv_checkStatus.Tag = "query_check_status";
            this.gv_checkStatus.Visible = true;
            this.gv_checkStatus.VisibleIndex = 6;
            this.gv_checkStatus.Width = 94;

 DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs

@@ -2,7 +2,6 @@
using System.Collections.Generic;
using System.Data;
using System.Windows.Forms;
using DevExpress.RichEdit.Export;
using DevExpress.XtraEditors;
using DevExpress.XtraEditors.Controls;
using Gs.DevApp.Entity;
@@ -29,7 +28,7 @@
            {
                UtilityHelper.SetCheckIco(s, picCheckBox, this, "checkStatus", "");
            };
            getPageList(1, UtilityHelper.GetPageSize());
            getPageList(1);
            pageBar1.PagerEvent += PageBar1_PagerEvent;
            getTree();
            txt_docCode.EditValueChanged += Txt_docCode_EditValueChanged;
@@ -43,7 +42,7 @@
            txt_isSpilit.CheckedChanged +=
                Txt_flagIncludeDocCode_CheckedChanged;

           
            Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1);
        }

        /// <summary>
@@ -70,7 +69,7 @@
        /// <param name="pageSize"></param>
        private void PageBar1_PagerEvent(int curPage, int pageSize)
        {
            getPageList(curPage, pageSize);
            getPageList(1);
        }

        /// <summary>
@@ -142,7 +141,7 @@
                if (_rtn.rtnCode > 0)
                {
                    UtilityHelper.JumpToTab(xtraTabControl1, 0);
                    getPageList(1, UtilityHelper.GetPageSize());
                    getPageList(1);
                }

                MsgHelper.Warning("提示：" + _rtn.rtnMsg);
@@ -161,7 +160,7 @@
        private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
        {
            UtilityHelper.JumpToTab(xtraTabControl1, 0);
            getPageList(1, UtilityHelper.GetPageSize());
            getPageList(1);
        }

        /// <summary>
@@ -265,9 +264,9 @@
        /// </summary>
        /// <param name="curPage">第几页</param>
        /// <param name="pageSize">每页几条</param>
        private void getPageList(int curPage, int pageSize)
        private void getPageList(int curPage)
        {
            var pgq = new PageQueryModel(curPage, pageSize, "doc_Code");
            var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "doc_Code");
            var json = JsonConvert.SerializeObject(pgq);
            try
            {

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

@@ -26,20 +26,7 @@
            gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
            getPageList(1, UtilityHelper.GetPageSize());
            pageBar1.PagerEvent += PageBar1_PagerEvent;
            gridView1.CustomDrawRowIndicator += (s, e) =>
            {
                if (e.Info.IsRowIndicator && e.RowHandle >= 0)
                {
                    e.Info.DisplayText = (e.RowHandle + 1).ToString();
                }
            };
            gridView1.CustomDrawEmptyForeground += (s, e) =>
            {
                string str = "暂未查找到匹配的数据!";
                Font f = new Font("微软雅黑", 16);
                Rectangle r = new Rectangle(gridView1.GridControl.Width / 2 - 100, e.Bounds.Top + 45, e.Bounds.Right - 5, e.Bounds.Height - 5);
                e.Graphics.DrawString(str, f, Brushes.Gray, r);
            };
            Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1);
        }

        /// <summary>

 DevApp/Gs.DevApp/DevFrm/Sys/SysHelp.Designer.cs

@@ -154,6 +154,7 @@
            this.gv_guid.MinWidth = 25;
            this.gv_guid.Name = "gv_guid";
            this.gv_guid.OptionsColumn.AllowEdit = false;
            this.gv_guid.Tag = "query_a.upName";
            this.gv_guid.Visible = true;
            this.gv_guid.VisibleIndex = 0;
            this.gv_guid.Width = 94;
@@ -180,6 +181,7 @@
            this.gv_2.MinWidth = 80;
            this.gv_2.Name = "gv_2";
            this.gv_2.OptionsColumn.AllowEdit = false;
            this.gv_2.Tag = "query_a.FSTATUS";
            this.gv_2.Visible = true;
            this.gv_2.VisibleIndex = 1;
            this.gv_2.Width = 80;
@@ -191,6 +193,7 @@
            this.gridColumn5.MinWidth = 25;
            this.gridColumn5.Name = "gridColumn5";
            this.gridColumn5.OptionsColumn.AllowEdit = false;
            this.gridColumn5.Tag = "query_a.fileTitle";
            this.gridColumn5.Visible = true;
            this.gridColumn5.VisibleIndex = 2;
            this.gridColumn5.Width = 94;
@@ -217,6 +220,7 @@
            this.gridColumn4.MinWidth = 25;
            this.gridColumn4.Name = "gridColumn4";
            this.gridColumn4.OptionsColumn.AllowEdit = false;
            this.gridColumn4.Tag = "query_a.fileTitle";
            this.gridColumn4.Visible = true;
            this.gridColumn4.VisibleIndex = 4;
            this.gridColumn4.Width = 94;

 DevApp/Gs.DevApp/DevFrm/Sys/SysHelp.cs

@@ -22,20 +22,7 @@
            this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
            this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
            getPageList(1, UtilityHelper.GetPageSize());
            gridView1.CustomDrawRowIndicator += (s, e) =>
            {
                if (e.Info.IsRowIndicator && e.RowHandle >= 0)
                {
                    e.Info.DisplayText = (e.RowHandle + 1).ToString();
                }
            };
            gridView1.CustomDrawEmptyForeground += (s, e) =>
            {
                string str = "暂未查找到匹配的数据!";
                Font f = new Font("微软雅黑", 16);
                Rectangle r = new Rectangle(gridView1.GridControl.Width / 2 - 100, e.Bounds.Top + 45, e.Bounds.Right - 5, e.Bounds.Height - 5);
                e.Graphics.DrawString(str, f, Brushes.Gray, r);
            };
            Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1);
        }

        /// <summary>

 DevApp/Gs.DevApp/DevFrm/Sys/SysLog.Designer.cs

@@ -136,7 +136,7 @@
            this.gv_msg.MinWidth = 25;
            this.gv_msg.Name = "gv_msg";
            this.gv_msg.OptionsColumn.AllowEdit = false;
            this.gv_msg.Tag = "query_a.MSG";
            this.gv_msg.Tag = "query_MSG";
            this.gv_msg.Visible = true;
            this.gv_msg.VisibleIndex = 3;
            this.gv_msg.Width = 94;
@@ -234,7 +234,7 @@
            this.gv_userName.MinWidth = 25;
            this.gv_userName.Name = "gv_userName";
            this.gv_userName.OptionsColumn.AllowEdit = false;
            this.gv_userName.Tag = "query_a.USER_NAME";
            this.gv_userName.Tag = "query_USER_NAME";
            this.gv_userName.Visible = true;
            this.gv_userName.VisibleIndex = 2;
            this.gv_userName.Width = 94;
@@ -290,7 +290,7 @@
            this.gv_operationTable.MinWidth = 25;
            this.gv_operationTable.Name = "gv_operationTable";
            this.gv_operationTable.OptionsColumn.AllowEdit = false;
            this.gv_operationTable.Tag = "query_a.OPERATION_TABLE";
            this.gv_operationTable.Tag = "query_OPERATION_TABLE";
            this.gv_operationTable.Visible = true;
            this.gv_operationTable.VisibleIndex = 1;
            this.gv_operationTable.Width = 94;
@@ -325,7 +325,7 @@
            this.gv_operationTime.MinWidth = 25;
            this.gv_operationTime.Name = "gv_operationTime";
            this.gv_operationTime.OptionsColumn.AllowEdit = false;
            this.gv_operationTime.ToolTip = "query_a.OPERATION_TIME";
            this.gv_operationTime.Tag = "query_OPERATION_TIME";
            this.gv_operationTime.Visible = true;
            this.gv_operationTime.VisibleIndex = 0;
            this.gv_operationTime.Width = 94;
@@ -374,13 +374,17 @@
            // 
            // toolBarMenu1
            // 
            this.toolBarMenu1.chkParameter = null;
            this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
            this.toolBarMenu1.guidKey = null;
            this.toolBarMenu1.isSetBtn = false;
            this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
            this.toolBarMenu1.Name = "toolBarMenu1";
            
            this.toolBarMenu1.rptParameter = null;
            this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
            this.toolBarMenu1.TabIndex = 0;
            this.toolBarMenu1.xlsInService = null;
            this.toolBarMenu1.xlsOutParameter = null;
            // 
            // gcMain
            // 

 DevApp/Gs.DevApp/DevFrm/Sys/SysLog.cs

@@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Data;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using DevExpress.XtraEditors;
using Gs.DevApp.Entity;
@@ -20,16 +21,16 @@
            InitializeComponent();
            toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
            toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
            getPageList(1, UtilityHelper.GetPageSize());
            getPageList(1);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1);
            pageBar1.PagerEvent += PageBar1_PagerEvent;
            gridView1.IndicatorWidth = 50;
            gridView1.CustomDrawRowIndicator += (s, e) =>
            {
                if (e.Info.IsRowIndicator && e.RowHandle >= 0)
                    e.Info.DisplayText = (e.RowHandle + 1).ToString();
            };
        }

        private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
            await Task.Delay(100);
            getPageList(1);
        }
        /// <summary>
        ///     分页事件
        /// </summary>
@@ -37,7 +38,7 @@
        /// <param name="pageSize"></param>
        private void PageBar1_PagerEvent(int curPage, int pageSize)
        {
            getPageList(curPage, pageSize);
            getPageList(curPage);
        }

        /// <summary>
@@ -47,6 +48,9 @@
        /// <param name="e"></param>
        private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
        {
            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
            gridView1.ActiveFilter.Clear();
            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
            var frm = new ShowFilter(gridView1.Columns, _filterList);
            frm.UpdateParent += Frm_UpdateParent;
            frm.ShowDialog();
@@ -60,7 +64,7 @@
        private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
        {
            _filterList = e.FilterList;
            getPageList(1, pageBar1.RowsCount);
            getPageList(1);
        }

        /// <summary>
@@ -70,44 +74,54 @@
        /// <param name="e"></param>
        private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
        {
            UtilityHelper.JumpToTab(xtraTabControl1, 0);
            getPageList(1, UtilityHelper.GetPageSize());
            _filterList.Clear();
            if (gridView1.ActiveFilter.Count > 0)
            {
                gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
                gridView1.ActiveFilter.Clear();
                gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
            }
            getPageList(1);
        }

        /// <summary>
        /// </summary>
        /// <param name="curPage">第几页</param>
        /// <param name="pageSize">每页几条</param>
        private void getPageList(int curPage, int pageSize)
        private async void getPageList(int curPage)
        {
            var _sbSqlWhere = new StringBuilder();
            foreach (var itm in _filterList)
                _sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" +
                                   itm.fileValue + "'");
            var pgq = new PageQueryModel(curPage, pageSize, "OPERATION_TIME",
            UcLoading _loading = new UcLoading();
            var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
            var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "OPERATION_TIME",
                "desc", "", _sbSqlWhere.ToString());
            var json = JsonConvert.SerializeObject(pgq);
            try
            {
                var strReturn =
                    UtilityHelper.HttpPost("", "SysLog/GetListPage", json);
                    await UtilityHelper.HttpPostAsync("", "SysLog/GetListPage", json);
                var dd = UtilityHelper.ReturnToTablePage(strReturn);
                if (dd.rtnCode > 0)
                {
                    DataTable dt = dd.rtnData.list;
                    gcMain.BindingContext = new BindingContext();
                    gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
                    if (dt.Rows.Count > 0)
                    {
                    gcMain.DataSource = dt;
                    gcMain.ForceInitialize();
                    int dddd = dd.rtnData.pages;//总页
                    pageBar1.TotalPages = dddd;
                    pageBar1.RecordCount = dd.rtnData.total;//记录总数
                    }
                    else
                        UtilityHelper.SetDefaultTable(gcMain, gridView1);
                    gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
                    pageBar1.TotalPages = dd.rtnData.pages;//总页
                    pageBar1.CurrentPage = curPage;//当前页
                    pageBar1.setTxt();
                    pageBar1.RecordCount = dd.rtnData.total;//总记录数
                }
                else
                {
                    ToolBox.MsgHelper.ShowError("提示：" + dd.rtnMsg);
                }
                _loading.Close();
            }
            catch (Exception ex)
            {

 DevApp/Gs.DevApp/DevFrm/Sys/SysLog.resx

@@ -59,8 +59,7 @@
              : using a System.ComponentModel.TypeConverter
              : and then encoded with base64 encoding.
      -->
    <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root"
                xmlns="">
  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
        <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
        <xsd:element name="root" msdata:IsDataSet="true">
            <xsd:complexType>
@@ -68,11 +67,9 @@
                    <xsd:element name="metadata">
                        <xsd:complexType>
                            <xsd:sequence>
                                <xsd:element name="value" type="xsd:string"
                                             minOccurs="0"/>
                <xsd:element name="value" type="xsd:string" minOccurs="0" />
                            </xsd:sequence>
                            <xsd:attribute name="name" use="required"
                                           type="xsd:string"/>
              <xsd:attribute name="name" use="required" type="xsd:string" />
                            <xsd:attribute name="type" type="xsd:string"/>
                            <xsd:attribute name="mimetype" type="xsd:string"/>
                            <xsd:attribute ref="xml:space"/>
@@ -87,28 +84,21 @@
                    <xsd:element name="data">
                        <xsd:complexType>
                            <xsd:sequence>
                                <xsd:element name="value" type="xsd:string"
                                             minOccurs="0" msdata:Ordinal="1"/>
                                <xsd:element name="comment" type="xsd:string"
                                             minOccurs="0" msdata:Ordinal="2"/>
                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
                            </xsd:sequence>
                            <xsd:attribute name="name" type="xsd:string"
                                           use="required" msdata:Ordinal="1"/>
                            <xsd:attribute name="type" type="xsd:string"
                                           msdata:Ordinal="3"/>
                            <xsd:attribute name="mimetype" type="xsd:string"
                                           msdata:Ordinal="4"/>
              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
                            <xsd:attribute ref="xml:space"/>
                        </xsd:complexType>
                    </xsd:element>
                    <xsd:element name="resheader">
                        <xsd:complexType>
                            <xsd:sequence>
                                <xsd:element name="value" type="xsd:string"
                                             minOccurs="0" msdata:Ordinal="1"/>
                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
                            </xsd:sequence>
                            <xsd:attribute name="name" type="xsd:string"
                                           use="required"/>
              <xsd:attribute name="name" type="xsd:string" use="required" />
                        </xsd:complexType>
                    </xsd:element>
                </xsd:choice>
@@ -122,13 +112,9 @@
        <value>2.0</value>
    </resheader>
    <resheader name="reader">
        <value>System.Resources.ResXResourceReader, System.Windows.Forms,
            Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
        </value>
    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
    </resheader>
    <resheader name="writer">
        <value>System.Resources.ResXResourceWriter, System.Windows.Forms,
            Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
        </value>
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
    </resheader>
</root>