From 9096edb026d5d411fddeeb4281b24d67160567d2 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期日, 23 三月 2025 09:39:31 +0800
Subject: [PATCH] 查询

---
 DevApp/Gs.DevApp/UserControl/ShowFilter.cs |   43 +++++++++++++++++++++++++++++++------------
 1 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/DevApp/Gs.DevApp/UserControl/ShowFilter.cs b/DevApp/Gs.DevApp/UserControl/ShowFilter.cs
index 7c20e5e..e2818e7 100644
--- a/DevApp/Gs.DevApp/UserControl/ShowFilter.cs
+++ b/DevApp/Gs.DevApp/UserControl/ShowFilter.cs
@@ -67,7 +67,7 @@
                     getPageListQuery();
             };
         }
-
+      
         /// <summary>
         ///     鏌ヨ闆嗗悎
         /// </summary>
@@ -102,13 +102,15 @@
                     .GetRowCellValue(i, "fieldWhere").ToString());
                 var _fieldValue = gridView1.GetRowCellValue(i, "fieldValue")
                     .ToString();
+                var _fieldType = gridView1.GetRowCellValue(i, "fieldType")
+                  .ToString();
                 if (_fileWhere.Contains("like"))
                 {
                     _fileWhere = " like ";
                     _fieldValue = "%" + _fieldValue + "%";
                 }
                 list.Add(new FilterEntity(_fieId, _fileIdDec, _fileWhere,
-                    _fileWhereDec, _fieldValue));
+                    _fileWhereDec, _fieldValue, _fieldType));
             }
             UpdateParent?.Invoke(this,
                 new UpdateParentEventArgs { FilterList = list });
@@ -123,9 +125,10 @@
                 if (col.Tag != null && !string.IsNullOrEmpty(col.Tag.ToString()))
                 {
                     var item = new CboItemEntity();
-                    item.Text = col.Tag.ToString() + "锛�" + col.Caption + "锛�";
+                    item.Text = col.Tag.ToString() + "(" + col.Caption + ")";
                     //item.Value = col.FieldName;
                     item.Value = col.Tag.ToString();
+                    item.FType = col.UnboundExpression;
                     repositoryItemComboBox1.Items.Add(item);
                 }
 
@@ -138,7 +141,7 @@
             foreach (var kvp in d2)
             {
                 var item = new CboItemEntity();
-                item.Text = kvp.Key + "锛�" + kvp.Value + "锛�";
+                item.Text = kvp.Key + "(" + kvp.Value + ")";
                 item.Value = kvp.Key;
                 repositoryItemComboBox2.Items.Add(item);
             }
@@ -147,13 +150,15 @@
                 var dt = new DataTable();
                 dt.Columns.Add("field", typeof(string));
                 dt.Columns.Add("fieldWhere", typeof(string));
-                dt.Columns.Add("fieldValue", typeof(string));
+                dt.Columns.Add("fieldValue", typeof(string)); 
+                dt.Columns.Add("fieldType", typeof(string));
                 foreach (var _sql in FilterList)
                 {
                     var dr = dt.NewRow();
-                    dr["field"] = _sql.fileId + "锛�" + _sql.fileIdDec;
-                    dr["fieldWhere"] = _sql.fileOper + "锛�" + _sql.fileOperDec;
+                    dr["field"] = _sql.fileId + "(" + _sql.fileIdDec;
+                    dr["fieldWhere"] = _sql.fileOper + "(" + _sql.fileOperDec;
                     dr["fieldValue"] = _sql.fileValue.Replace("%", "");
+                    dr["fieldType"] = _sql.fileType;
                     dt.Rows.Add(dr);
                 }
                 gcMain.BindingContext = new BindingContext();
@@ -168,7 +173,7 @@
 
         private (string, string) _getFiled(string _field)
         {
-            return (_field.Split('锛�')[0], _field.Split('锛�')[1]);
+            return (_field.Split('(')[0], _field.Split('(')[1]);
         }
 
         private void BtnEsc_Click(object sender, EventArgs e)
@@ -193,10 +198,25 @@
             {
                 e.Value = e.Value.ToString();
                 e.Handled = true;
-
+               
             }
         }
-
+        private void repositoryItemComboBox1_SelectedValueChanged(object sender, EventArgs e)
+        {
+            ComboBoxEdit comboBox = sender as ComboBoxEdit;
+            if (comboBox != null)
+            {
+                CboItemEntity _itm = comboBox.EditValue as CboItemEntity;
+                string dddd = _itm.Value.ToString();
+                string ccc = _itm.Text.ToString();
+                string yyy = _itm.FType.ToString();
+                GridView myView = (gcMain.MainView as GridView);
+                int dataIndex = myView.GetDataSourceRowIndex(myView.FocusedRowHandle);
+                myView.CloseEditor();
+                myView.UpdateCurrentRow();
+                myView.SetRowCellValue(dataIndex, "fieldType", yyy);
+            }
+        }
 
         /// <summary>
         /// 绉诲嚭涓�琛�
@@ -468,8 +488,7 @@
                 }
             }
         }
+
         #endregion
-
-
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3