From b084bd77d01a94c8f0a2d20c86a1f45ba7c8a23c Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 19 四月 2025 14:08:05 +0800
Subject: [PATCH] 页面跳转

---
 DevApp/Gs.DevApp/UserControl/ShowFilter.cs |  269 ++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 191 insertions(+), 78 deletions(-)

diff --git a/DevApp/Gs.DevApp/UserControl/ShowFilter.cs b/DevApp/Gs.DevApp/UserControl/ShowFilter.cs
index d7a4886..8295a70 100644
--- a/DevApp/Gs.DevApp/UserControl/ShowFilter.cs
+++ b/DevApp/Gs.DevApp/UserControl/ShowFilter.cs
@@ -1,22 +1,16 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Data;
-using System.Data.SqlTypes;
-using System.Text;
-using System.Windows.Forms;
-using DevExpress.Pdf.Native.BouncyCastle.Utilities.Collections;
-using DevExpress.PivotGrid.OLAP.Mdx;
-using DevExpress.Utils.DirectXPaint;
-using DevExpress.XtraEditors;
+锘縰sing DevExpress.XtraEditors;
 using DevExpress.XtraEditors.Controls;
-using DevExpress.XtraEditors.Repository;
 using DevExpress.XtraGrid.Columns;
-using DevExpress.XtraGrid.Views.Base.ViewInfo;
-using FastReport.MSChart;
+using DevExpress.XtraGrid.Views.Grid;
 using Gs.DevApp.Entity;
 using Gs.DevApp.ToolBox;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Text;
+using System.Windows.Forms;
 
 namespace Gs.DevApp.UserControl
 {
@@ -37,32 +31,42 @@
             _columns = Columns;
             _fullName = FullName;
             InitializeComponent();
-            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;
             gridView1.OptionsView.ShowGroupPanel = false;
             gvQuery.OptionsView.ShowGroupPanel = false;
             gvTable.OptionsView.ShowGroupPanel = false;
             btnEsc.Click += BtnEsc_Click;
             btnQuery.Click += BtnQuery_Click;
+            //
+            gridView1.IndicatorWidth = gvTable.IndicatorWidth = gvQuery.IndicatorWidth = 50;
+            gridView1.CustomDrawRowIndicator += (s, e) =>
+            {
+                if (e.Info.IsRowIndicator && e.RowHandle >= 0)
+                    e.Info.DisplayText = (e.RowHandle + 1).ToString();
+            };
+            gvTable.CustomDrawRowIndicator += (s, e) =>
+            {
+                if (e.Info.IsRowIndicator && e.RowHandle >= 0)
+                    e.Info.DisplayText = (e.RowHandle + 1).ToString();
+            };
+            gvQuery.CustomDrawRowIndicator += (s, e) =>
+            {
+                if (e.Info.IsRowIndicator && e.RowHandle >= 0)
+                    e.Info.DisplayText = (e.RowHandle + 1).ToString();
+            };
             getPageList();
             //涓嬮潰涓烘煡璇㈤厤缃�
             this.btnSqlTable.Click += BtnSqlTable_Click;
-            getPageListQuery();
+            xtraTabControl1.SelectedPageChanged += (s, e) =>
+            {
+                if (xtraTabControl1.SelectedTabPageIndex == 1)
+                    getPageListQuery();
+            };
         }
-
-
 
         /// <summary>
         ///     鏌ヨ闆嗗悎
@@ -98,16 +102,16 @@
                     .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 });
             Close();
@@ -118,13 +122,13 @@
         private void getPageList()
         {
             foreach (GridColumn col in _columns)
-                if (col.Tag != null && col.Tag.ToString().StartsWith("query"))
+                if (col.Tag != null && !string.IsNullOrEmpty(col.Tag.ToString()))
                 {
                     var item = new CboItemEntity();
-                    item.Text = col.Tag.ToString().Replace("query_", "") +
-                                "锛�" + col.Caption + "锛�";
+                    item.Text = col.Tag.ToString() + "(" + col.Caption + ")";
                     //item.Value = col.FieldName;
-                    item.Value = col.Tag.ToString().Replace("query_", "");
+                    item.Value = col.Tag.ToString();
+                    item.FType = col.UnboundExpression;
                     repositoryItemComboBox1.Items.Add(item);
                 }
 
@@ -137,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,12 +151,14 @@
                 dt.Columns.Add("field", typeof(string));
                 dt.Columns.Add("fieldWhere", 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();
@@ -167,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)
@@ -185,11 +191,6 @@
             }
         }
 
-        private void RepositoryItemComboBox2_SelectedIndexChanged(object sender,
-            EventArgs e)
-        {
-        }
-
         private void RepositoryItemComboBox1_ParseEditValue(object sender,
             ConvertEditValueEventArgs e)
         {
@@ -197,17 +198,28 @@
             {
                 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);
             }
         }
 
-        private void RepositoryItemComboBox1_SelectedIndexChanged(object sender,
-            EventArgs e)
-        {
-        }
-
-
         /// <summary>
-        /// 绉诲嚭涓�琛�
+        /// 绉诲嚭涓�涓煡璇㈡潯浠�
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -227,17 +239,14 @@
         }
 
 
-        #region MyRegion
+        #region 杩欓噷鏄珮绾х鐞嗗憳浣跨敤鐨�
+
+
         /// <summary>
-        ///     鎴彇琛ㄥ悕
+        /// 淇濆瓨缁戝畾鐨勮〃
         /// </summary>
-        /// <param name="strName"></param>
-        /// <returns></returns>
-        private string _getTableName(string strName)
-        {
-            var _tableName = strName.Split('(')[0];
-            return _tableName;
-        }
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private void BtnSqlTable_Click(object sender, EventArgs e)
         {
             if (string.IsNullOrEmpty(_fullName))
@@ -279,7 +288,7 @@
             {
                 string strJson = UtilityHelper.HttpPost("", "Fm/EditQuery", JsonConvert.SerializeObject(_obj));
                 ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
-                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnData.outMsg);
                 if (_rtn.rtnCode > 0)
                 {
                     getPageListQuery();
@@ -291,12 +300,59 @@
             }
 
         }
+
+        /// <summary>
+        /// 鍒犻櫎缁戝畾琛�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void repositoryItemButtonEdit2_ButtonClick(object sender, ButtonPressedEventArgs e)
+        {
+            gvTable.CloseEditor();
+            gvTable.PostEditor();
+            gvTable.UpdateCurrentRow();
+            var rowhandle = gvTable.FocusedRowHandle;
+            if (rowhandle < 0)
+                return;
+            if (e.Button.Index == 0)
+            {
+                var dr = gvTable.GetDataRow(rowhandle);
+                var mxGuid = dr["guid"].ToString();
+                if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵"))
+                    return;
+                if (string.IsNullOrEmpty(mxGuid))
+                {
+                    gvTable.DeleteRow(rowhandle);
+                    return;
+                }
+                var _obj = new
+                {
+                    guid = mxGuid,
+                };
+                try
+                {
+                    var strJson = UtilityHelper.HttpPost("", "Fm/DeleteQuery", JsonConvert.SerializeObject(_obj));
+                    var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+                    if (_rtn.rtnCode > 0)
+                    {
+                        getPageListQuery();
+                    }
+                    MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+                }
+                catch (Exception ex)
+                {
+                    MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+                }
+            }
+        }
+
+
+        /// <summary>
+        /// 璇诲彇缁戝畾
+        /// </summary>
+
         private void getPageListQuery()
         {
-            repositoryItemComboBoxSql.Items.Clear();
-            repositoryItemComboBoxSql.Items.Add("1");
-            repositoryItemComboBoxSql.Items.Add("1");
-            repositoryItemComboBoxSql.Items.Add("1");
             var _obj = new
             {
                 formPath = this._fullName,
@@ -324,6 +380,14 @@
                 }
                 DataTable dt00 = JsonConvert.DeserializeObject<DataTable>(array00.ToString());
                 this.repositoryItemSearchLookUpEdit1.DataSource = dt00;
+                //璇诲墠閫夋嫨
+                JArray array01 = new JArray();
+                foreach (var a in _job["rtnData"]["list4"])
+                {
+                    array01.Add(a);
+                }
+                DataTable dt01 = JsonConvert.DeserializeObject<DataTable>(array01.ToString());
+                repositoryItemSearchLookUpEdit2Sql.DataSource = dt01;
                 ////////////
                 JArray array = new JArray();
                 foreach (var a in _job["rtnData"]["list"])
@@ -370,37 +434,87 @@
             gvTable.PostEditor();
             gvTable.UpdateCurrentRow();
         }
-        private void repositoryItemButtonEdit2_ButtonClick(object sender, ButtonPressedEventArgs e)
+
+        /// <summary>
+        /// 缂栬緫鍒楁煡璇�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+
+        private void repositoryItemComboBox3Sql_EditValueChanged(object sender, EventArgs e)
         {
-            var rowhandle = gvTable.FocusedRowHandle;
-            if (rowhandle < 0)
-                return;
-            if (e.Button.Index == 0)
+            ComboBoxEdit comboBox = sender as ComboBoxEdit;
+            if (comboBox != null)
             {
-                var dr = gvTable.GetDataRow(rowhandle);
+                GridView myView = (gcQuery.MainView as GridView);
+                int dataIndex = myView.GetDataSourceRowIndex(myView.FocusedRowHandle);
+                string _txt = comboBox.Text.Trim();
+                var dr = myView.GetDataRow(dataIndex);
                 var mxGuid = dr["guid"].ToString();
-                if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵"))
-                    return;
-                if (string.IsNullOrEmpty(mxGuid))
+                if (mxGuid.Length > 0)
                 {
-                    gvTable.DeleteRow(rowhandle);
-                    return;
+                    var _obj = new
+                    {
+                        guid = mxGuid,
+                        fType = 1,
+                        sqlFieldType = _txt
+                    };
+                    try
+                    {
+                        var strJson = UtilityHelper.HttpPost("",
+                            "Fm/EditCol",
+                            JsonConvert.SerializeObject(_obj));
+                        var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+                        if (_rtn.rtnCode <= 0)
+                        {
+                            MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+                    }
                 }
+            }
+        }
+        /// <summary>
+        /// 缂栬緫鍒楁煡璇�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void repositoryItemSearchLookUpEdit2Sql_EditValueChanged(object sender, EventArgs e)
+        {
+            string _txt = "";
+            SearchLookUpEdit LookupEdit = sender as SearchLookUpEdit;
+            DataRowView SelectedDataRow = (DataRowView)LookupEdit.GetSelectedDataRow();
+            if (SelectedDataRow != null)
+                _txt = SelectedDataRow["tableOtherName"].ToString();
+            GridView myView = (gcQuery.MainView as GridView);
+            int dataIndex = myView.GetDataSourceRowIndex(myView.FocusedRowHandle);
+            var dr = myView.GetDataRow(dataIndex);
+            var mxGuid = dr["guid"].ToString();
+            gvQuery.SetFocusedRowCellValue("sqlField", _txt);
+            gvQuery.CloseEditor();
+            gvQuery.PostEditor();
+            gvQuery.UpdateCurrentRow();
+            if (mxGuid.Length > 0)
+            {
                 var _obj = new
                 {
                     guid = mxGuid,
+                    sqlField = _txt,
+                    fType = 0,
                 };
                 try
                 {
                     var strJson = UtilityHelper.HttpPost("",
-                        "Fm/DeleteQuery",
+                        "Fm/EditCol",
                         JsonConvert.SerializeObject(_obj));
                     var _rtn = UtilityHelper.ReturnToDynamic(strJson);
-                    if (_rtn.rtnCode > 0)
+                    if (_rtn.rtnCode <= 0)
                     {
-                        if (_rtn.rtnCode > 0) getPageListQuery();
+                        MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
                     }
-                    MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
                 }
                 catch (Exception ex)
                 {
@@ -408,7 +522,6 @@
                 }
             }
         }
-
         #endregion
 
 

--
Gitblit v1.9.3