From be94e54dc7cd0eb2e66f25d7def9a873c563564c Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 10 一月 2025 09:53:30 +0800
Subject: [PATCH] 细节

---
 DevApp/Gs.DevApp/UserControl/ShowFilter.cs |  176 +++++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 117 insertions(+), 59 deletions(-)

diff --git a/DevApp/Gs.DevApp/UserControl/ShowFilter.cs b/DevApp/Gs.DevApp/UserControl/ShowFilter.cs
index b3f6a17..8d41cfc 100644
--- a/DevApp/Gs.DevApp/UserControl/ShowFilter.cs
+++ b/DevApp/Gs.DevApp/UserControl/ShowFilter.cs
@@ -1,128 +1,186 @@
-锘縰sing DevExpress.XtraEditors;
-using System;
+锘縰sing System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.Data;
-using System.Drawing;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
-using System.Collections.Generic;
-using DevExpress.XtraEditors.Repository;
+using DevExpress.XtraEditors;
+using DevExpress.XtraEditors.Controls;
 using DevExpress.XtraGrid.Columns;
-using System.Collections;
 using Gs.DevApp.ToolBox;
-using static Gs.DevApp.ToolBox.UtilityHelper;
 
 namespace Gs.DevApp.UserControl
 {
-    public partial class ShowFilter : DevExpress.XtraEditors.XtraForm
+    public partial class ShowFilter : XtraForm
     {
-        public event EventHandler<UpdateParentEventArgs> UpdateParent;
+        private readonly GridColumnCollection _columns;
 
-        private GridColumnCollection _columns;
-        public ShowFilter(GridColumnCollection Columns)
+        public ShowFilter(GridColumnCollection Columns,
+            List<FilterEntity> list = null)
         {
-            this._columns = Columns;
+            FilterList = list;
+            _columns = Columns;
             InitializeComponent();
-            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
+            repositoryItemComboBox1.TextEditStyle =
+                TextEditStyles.DisableTextEditor;
+            repositoryItemComboBox1.SelectedIndexChanged +=
+                RepositoryItemComboBox1_SelectedIndexChanged;
+            repositoryItemComboBox1.ParseEditValue +=
+                RepositoryItemComboBox1_ParseEditValue;
+            repositoryItemComboBox2.TextEditStyle =
+                TextEditStyles.DisableTextEditor;
+            repositoryItemComboBox2.SelectedIndexChanged +=
+                RepositoryItemComboBox2_SelectedIndexChanged;
+            repositoryItemComboBox2.ParseEditValue +=
+                RepositoryItemComboBox2_ParseEditValue;
+            gridView1.OptionsFind.ShowSearchNavButtons = false;
             // this.gridView1.OptionsView.ShowAutoFilterRow = true;
-            this.gridView1.OptionsView.ShowGroupPanel = false;
-            this.btnEsc.Click += BtnEsc_Click;
-            this.btnQuery.Click += BtnQuery_Click;
+            gridView1.OptionsView.ShowGroupPanel = false;
+            btnEsc.Click += BtnEsc_Click;
+            btnQuery.Click += BtnQuery_Click;
             getPageList();
         }
 
+        /// <summary>
+        ///     鏌ヨ闆嗗悎
+        /// </summary>
+        public List<FilterEntity> FilterList { get; set; }
+
+        /// <summary>
+        ///     鍥炶皟浜嬩欢
+        /// </summary>
+        public event EventHandler<UpdateParentEventArgs> UpdateParent;
+
         private void BtnQuery_Click(object sender, EventArgs e)
         {
-            UpdateParent?.Invoke(this, new UpdateParentEventArgs { Data = "hi,杩欓噷鏄煡璇㈡潯浠�" });
-            this.Close();
-        }
+            gridView1.CloseEditor();
+            gridView1.UpdateCurrentRow();
+            var sbWhere = new StringBuilder();
+            var list = new List<FilterEntity>();
+            for (var i = 0; i < gridView1.DataRowCount; i++)
+            {
+                if (string.IsNullOrEmpty(gridView1.GetRowCellValue(i, "field")
+                        .ToString())
+                    || string.IsNullOrEmpty(gridView1
+                        .GetRowCellValue(i, "fieldWhere").ToString())
+                    || string.IsNullOrEmpty(gridView1
+                        .GetRowCellValue(i, "fieldValue").ToString())
+                   )
+                    continue;
+                string _fieId, _fileIdDec;
+                (_fieId, _fileIdDec) =
+                    _getFiled(gridView1.GetRowCellValue(i, "field").ToString());
+                string _fileWhere, _fileWhereDec;
+                (_fileWhere, _fileWhereDec) = _getFiled(gridView1
+                    .GetRowCellValue(i, "fieldWhere").ToString());
+                var _fieldValue = gridView1.GetRowCellValue(i, "fieldValue")
+                    .ToString();
+                if (_fileWhere.Contains("like"))
+                {
+                    _fileWhere = " like ";
+                    _fieldValue = "%" + _fieldValue + "%";
+                }
 
-        private void BtnEsc_Click(object sender, EventArgs e)
-        {
-            this.Close();
+                list.Add(new FilterEntity(_fieId, _fileIdDec, _fileWhere,
+                    _fileWhereDec, _fieldValue));
+            }
+
+            UpdateParent?.Invoke(this,
+                new UpdateParentEventArgs { FilterList = list });
+            Close();
         }
 
         /// <summary>
-        /// 
         /// </summary>
-        /// <param name="curPage">绗嚑椤�</param>
-        /// <param name="pageSize">姣忛〉鍑犳潯</param>
         private void getPageList()
         {
-          
-            repositoryItemComboBox1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
             foreach (GridColumn col in _columns)
-            {
-                CboItemEntity item = new CboItemEntity();
-                item.Text = col.Caption;
-                item.Value = col.FieldName;
-                repositoryItemComboBox1.Items.Add(item);
-            }
-            repositoryItemComboBox1.SelectedIndexChanged += RepositoryItemComboBox1_SelectedIndexChanged;
-            repositoryItemComboBox1.ParseEditValue += RepositoryItemComboBox1_ParseEditValue;
-            Dictionary<string, string> d2 = new Dictionary<string, string>();
+                if (col.Tag != null && col.Tag.ToString().StartsWith("query"))
+                {
+                    var item = new CboItemEntity();
+                    item.Text = col.Tag.ToString().Replace("query_", "") +
+                                "锛�" + col.Caption + "锛�";
+                    //item.Value = col.FieldName;
+                    item.Value = col.Tag.ToString().Replace("query_", "");
+                    repositoryItemComboBox1.Items.Add(item);
+                }
+
+            var d2 = new Dictionary<string, string>();
             d2.Add(">", "澶т簬");
             d2.Add("<", "灏忎簬");
             d2.Add("=", "绛変簬");
             d2.Add("<>", "涓嶇瓑浜�");
             d2.Add("like", "鍖呭惈");
-            foreach (KeyValuePair<string, string> kvp in d2)
+            foreach (var kvp in d2)
             {
-                CboItemEntity item = new CboItemEntity();
-                item.Text = kvp.Value;
+                var item = new CboItemEntity();
+                item.Text = kvp.Key + "锛�" + kvp.Value + "锛�";
                 item.Value = kvp.Key;
                 repositoryItemComboBox2.Items.Add(item);
             }
-            repositoryItemComboBox2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
-            repositoryItemComboBox2.SelectedIndexChanged += RepositoryItemComboBox2_SelectedIndexChanged;
-            repositoryItemComboBox2.ParseEditValue += RepositoryItemComboBox2_ParseEditValue;
+
             try
             {
-                DataTable dt = new DataTable();
+                var dt = new DataTable();
                 dt.Columns.Add("field", typeof(string));
                 dt.Columns.Add("fieldWhere", typeof(string));
                 dt.Columns.Add("fieldValue", typeof(string));
-                dt.Rows.Add(dt.NewRow());
+                foreach (var _sql in FilterList)
+                {
+                    var dr = dt.NewRow();
+                    dr["field"] = _sql.fileId + "锛�" + _sql.fileIdDec;
+                    dr["fieldWhere"] = _sql.fileOper + "锛�" + _sql.fileOperDec;
+                    dr["fieldValue"] = _sql.fileValue.Replace("%", "");
+                    dt.Rows.Add(dr);
+                }
+
                 gcMain.BindingContext = new BindingContext();
                 gcMain.DataSource = dt;
                 gcMain.ForceInitialize();
             }
             catch (Exception ex)
             {
-                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
             }
         }
 
-        private void RepositoryItemComboBox2_ParseEditValue(object sender, DevExpress.XtraEditors.Controls.ConvertEditValueEventArgs e)
+        private (string, string) _getFiled(string _field)
+        {
+            return (_field.Split('锛�')[0], _field.Split('锛�')[1]);
+        }
+
+        private void BtnEsc_Click(object sender, EventArgs e)
+        {
+            Close();
+        }
+
+        private void RepositoryItemComboBox2_ParseEditValue(object sender,
+            ConvertEditValueEventArgs e)
         {
             if (e.Value != null)
             {
-                e.Value = e.Value.ToString(); e.Handled = true;
+                e.Value = e.Value.ToString();
+                e.Handled = true;
             }
         }
 
-        private void RepositoryItemComboBox2_SelectedIndexChanged(object sender, EventArgs e)
+        private void RepositoryItemComboBox2_SelectedIndexChanged(object sender,
+            EventArgs e)
         {
         }
 
-        private void RepositoryItemComboBox1_ParseEditValue(object sender, DevExpress.XtraEditors.Controls.ConvertEditValueEventArgs e)
+        private void RepositoryItemComboBox1_ParseEditValue(object sender,
+            ConvertEditValueEventArgs e)
         {
             if (e.Value != null)
             {
-                e.Value = e.Value.ToString(); e.Handled = true;
+                e.Value = e.Value.ToString();
+                e.Handled = true;
             }
         }
 
-        private void RepositoryItemComboBox1_SelectedIndexChanged(object sender, EventArgs e)
+        private void RepositoryItemComboBox1_SelectedIndexChanged(object sender,
+            EventArgs e)
         {
-
         }
     }
-
-
-
-
 }
\ No newline at end of file

--
Gitblit v1.9.3