From ec02022018c44e794fa53e40daa96321daaae4fc Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 02 六月 2025 15:21:30 +0800
Subject: [PATCH] 清理
---
DevApp/Gs.DevApp/UserControl/ShowFilter.cs | 223 +++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 159 insertions(+), 64 deletions(-)
diff --git a/DevApp/Gs.DevApp/UserControl/ShowFilter.cs b/DevApp/Gs.DevApp/UserControl/ShowFilter.cs
index fb5fae4..8a1957c 100644
--- a/DevApp/Gs.DevApp/UserControl/ShowFilter.cs
+++ b/DevApp/Gs.DevApp/UserControl/ShowFilter.cs
@@ -1,9 +1,4 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Data;
-using System.Text;
-using System.Windows.Forms;
-using DevExpress.XtraEditors;
+锘縰sing DevExpress.XtraEditors;
using DevExpress.XtraEditors.Controls;
using DevExpress.XtraGrid.Columns;
using DevExpress.XtraGrid.Views.Grid;
@@ -11,6 +6,11 @@
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
{
@@ -42,7 +42,7 @@
btnEsc.Click += BtnEsc_Click;
btnQuery.Click += BtnQuery_Click;
//
- gridView1.IndicatorWidth=gvTable.IndicatorWidth=gvQuery.IndicatorWidth = 50;
+ gridView1.IndicatorWidth = gvTable.IndicatorWidth = gvQuery.IndicatorWidth = 50;
gridView1.CustomDrawRowIndicator += (s, e) =>
{
if (e.Info.IsRowIndicator && e.RowHandle >= 0)
@@ -102,13 +102,16 @@
.GetRowCellValue(i, "fieldWhere").ToString());
var _fieldValue = gridView1.GetRowCellValue(i, "fieldValue")
.ToString();
+ var _fieldType = gridView1.GetRowCellValue(i, "fieldType")
+ .ToString();
+ //濡傛灉鏄痩ike 瑕佸姞涓婄櫨鍒嗗彿
if (_fileWhere.Contains("like"))
{
- _fileWhere = " like ";
+ _fileWhere = "like";
_fieldValue = "%" + _fieldValue + "%";
}
list.Add(new FilterEntity(_fieId, _fileIdDec, _fileWhere,
- _fileWhereDec, _fieldValue));
+ _fileWhereDec, _fieldValue, _fieldType));
}
UpdateParent?.Invoke(this,
new UpdateParentEventArgs { FilterList = list });
@@ -120,13 +123,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);
}
@@ -139,7 +142,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);
}
@@ -149,12 +152,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();
@@ -169,7 +174,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)
@@ -194,12 +199,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);
}
}
-
/// <summary>
- /// 绉诲嚭涓�琛�
+ /// 绉诲嚭涓�涓煡璇㈡潯浠�
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
@@ -219,8 +240,14 @@
}
- #region MyRegion
+ #region 杩欓噷鏄珮绾х鐞嗗憳浣跨敤鐨�
+
+ /// <summary>
+ /// 淇濆瓨缁戝畾鐨勮〃
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
private void BtnSqlTable_Click(object sender, EventArgs e)
{
if (string.IsNullOrEmpty(_fullName))
@@ -262,7 +289,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();
@@ -274,9 +301,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();
var _obj = new
{
formPath = this._fullName,
@@ -309,8 +386,9 @@
foreach (var a in _job["rtnData"]["list4"])
{
array01.Add(a);
- repositoryItemComboBoxSql.Items.Add(a["tableOtherName"].ToString());
}
+ DataTable dt01 = JsonConvert.DeserializeObject<DataTable>(array01.ToString());
+ repositoryItemSearchLookUpEdit2Sql.DataSource = dt01;
////////////
JArray array = new JArray();
foreach (var a in _job["rtnData"]["list"])
@@ -357,45 +435,14 @@
gvTable.PostEditor();
gvTable.UpdateCurrentRow();
}
- private void repositoryItemButtonEdit2_ButtonClick(object sender, ButtonPressedEventArgs e)
- {
- 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);
- }
- }
- }
- private void repositoryItemComboBoxSql_EditValueChanged(object sender, EventArgs e)
+
+ /// <summary>
+ /// 缂栬緫鍒楁煡璇�
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+
+ private void repositoryItemComboBox3Sql_EditValueChanged(object sender, EventArgs e)
{
ComboBoxEdit comboBox = sender as ComboBoxEdit;
if (comboBox != null)
@@ -405,12 +452,13 @@
string _txt = comboBox.Text.Trim();
var dr = myView.GetDataRow(dataIndex);
var mxGuid = dr["guid"].ToString();
- if (mxGuid.Length > 0 && _txt.Length > 0)
+ if (mxGuid.Length > 0)
{
var _obj = new
{
guid = mxGuid,
- sqlField = _txt
+ fType = 1,
+ sqlFieldType = _txt
};
try
{
@@ -430,6 +478,53 @@
}
}
}
+ /// <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/EditCol",
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode <= 0)
+ {
+ MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+ }
#endregion
+
+
}
}
\ No newline at end of file
--
Gitblit v1.9.3