lu
2025-03-21 4d3a6203df1cb2966ca09efbc8125544dba67537
查询
已修改3个文件
317 ■■■■ 文件已修改
DevApp/Gs.DevApp/App.config 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/ShowFilter.Designer.cs 284 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/ShowFilter.cs 29 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/App.config
@@ -28,8 +28,8 @@
        </assemblyBinding>
    </runtime>
    <appSettings>
         <!--<add key="WebApiUrl" value="http://localhost:5263/" />-->
        <add key="WebApiUrl" value="http://192.168.1.145:81/" />
         <add key="WebApiUrl" value="http://localhost:5263/" />
        <!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />-->
        <add key="LogPath" value="logs" />
        <add key="ProductName" value="广深科技 G-MES V2.0" />
        <add key="PageSize" value="50" />
DevApp/Gs.DevApp/UserControl/ShowFilter.Designer.cs
@@ -29,11 +29,14 @@
        /// </summary>
        private void InitializeComponent()
        {
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
            this.panel1 = new System.Windows.Forms.Panel();
            this.btnEsc = new DevExpress.XtraEditors.SimpleButton();
            this.btnQuery = new DevExpress.XtraEditors.SimpleButton();
@@ -42,31 +45,49 @@
            this.gcMain = new DevExpress.XtraGrid.GridControl();
            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.repositoryItemComboBox2 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
            this.gcQuery = new DevExpress.XtraGrid.GridControl();
            this.gvQuery = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.panel2 = new System.Windows.Forms.Panel();
            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.repositoryItemComboBoxSql = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.panQueryBom = new System.Windows.Forms.Panel();
            this.btnQueryEsc = new DevExpress.XtraEditors.SimpleButton();
            this.btnQuerySave = new DevExpress.XtraEditors.SimpleButton();
            this.panQueryTop = new DevExpress.XtraEditors.PanelControl();
            this.layQuery = new DevExpress.XtraLayout.LayoutControl();
            this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
            this.txt_table = new DevExpress.XtraEditors.CheckedComboBoxEdit();
            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
            this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
            this.repositoryItemComboBox2 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
            this.panel1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(repositoryItemButtonEdit1)).BeginInit();
            this.xtraTabPage2.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcQuery)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvQuery)).BeginInit();
            this.panel2.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBoxSql)).BeginInit();
            this.panQueryBom.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.panQueryTop)).BeginInit();
            this.panQueryTop.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.layQuery)).BeginInit();
            this.layQuery.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_table.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox2)).BeginInit();
            this.SuspendLayout();
            // 
            // panel1
@@ -117,14 +138,13 @@
            // 
            // gcMain
            // 
            this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
            this.gcMain.Dock = System.Windows.Forms.DockStyle.Bottom;
            this.gcMain.Location = new System.Drawing.Point(0, 0);
            this.gcMain.MainView = this.gridView1;
            this.gcMain.Name = "gcMain";
            this.gcMain.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
            this.repositoryItemComboBox1,
            this.repositoryItemComboBox2,
            this.repositoryItemButtonEdit1});
            this.repositoryItemComboBox2});
            this.gcMain.Size = new System.Drawing.Size(734, 405);
            this.gcMain.TabIndex = 0;
            this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
@@ -152,13 +172,6 @@
            this.gridColumn1.VisibleIndex = 0;
            this.gridColumn1.Width = 150;
            // 
            // repositoryItemComboBox1
            //
            this.repositoryItemComboBox1.AutoHeight = false;
            this.repositoryItemComboBox1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
            this.repositoryItemComboBox1.Name = "repositoryItemComboBox1";
            //
            // gridColumn2
            // 
            this.gridColumn2.Caption = "查询条件";
@@ -169,13 +182,6 @@
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 1;
            this.gridColumn2.Width = 80;
            //
            // repositoryItemComboBox2
            //
            this.repositoryItemComboBox2.AutoHeight = false;
            this.repositoryItemComboBox2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
            this.repositoryItemComboBox2.Name = "repositoryItemComboBox2";
            // 
            // gridColumn3
            // 
@@ -190,7 +196,14 @@
            // gridColumn4
            // 
            this.gridColumn4.Caption = "移出";
            this.gridColumn4.ColumnEdit = this.repositoryItemButtonEdit1;
            repositoryItemButtonEdit1.AutoHeight = false;
            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移出", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
            repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            this.gridColumn4.ColumnEdit = repositoryItemButtonEdit1;
            this.gridColumn4.MaxWidth = 60;
            this.gridColumn4.MinWidth = 60;
            this.gridColumn4.Name = "gridColumn4";
@@ -198,50 +211,107 @@
            this.gridColumn4.VisibleIndex = 3;
            this.gridColumn4.Width = 60;
            // 
            // repositoryItemButtonEdit1
            //
            this.repositoryItemButtonEdit1.AutoHeight = false;
            editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移出", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
            //
            // xtraTabPage2
            // 
            this.xtraTabPage2.Controls.Add(this.panel2);
            this.xtraTabPage2.Controls.Add(this.panQueryTop);
            this.xtraTabPage2.Controls.Add(this.gcQuery);
            this.xtraTabPage2.Controls.Add(this.panQueryBom);
            this.xtraTabPage2.Name = "xtraTabPage2";
            this.xtraTabPage2.Size = new System.Drawing.Size(734, 461);
            this.xtraTabPage2.Text = "高级查询配置";
            // 
            // gcQuery
            // 
            this.gcQuery.Dock = System.Windows.Forms.DockStyle.Fill;
            this.gcQuery.Location = new System.Drawing.Point(0, 0);
            this.gcQuery.Dock = System.Windows.Forms.DockStyle.Bottom;
            this.gcQuery.Location = new System.Drawing.Point(0, 44);
            this.gcQuery.MainView = this.gvQuery;
            this.gcQuery.Name = "gcQuery";
            this.gcQuery.Size = new System.Drawing.Size(734, 461);
            this.gcQuery.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
            this.repositoryItemComboBoxSql});
            this.gcQuery.Size = new System.Drawing.Size(734, 361);
            this.gcQuery.TabIndex = 0;
            this.gcQuery.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvQuery});
            // 
            // gvQuery
            // 
            this.gvQuery.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gridColumn5,
            this.gridColumn6,
            this.gridColumn7,
            this.gridColumn8,
            this.gridColumn9});
            this.gvQuery.GridControl = this.gcQuery;
            this.gvQuery.Name = "gvQuery";
            // 
            // panel2
            // gridColumn5
            // 
            this.panel2.Controls.Add(this.btnQueryEsc);
            this.panel2.Controls.Add(this.btnQuerySave);
            this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom;
            this.panel2.Location = new System.Drawing.Point(0, 405);
            this.panel2.Name = "panel2";
            this.panel2.Size = new System.Drawing.Size(734, 56);
            this.panel2.TabIndex = 2;
            this.gridColumn5.Caption = "列名";
            this.gridColumn5.FieldName = "gvColName";
            this.gridColumn5.MinWidth = 25;
            this.gridColumn5.Name = "gridColumn5";
            this.gridColumn5.Visible = true;
            this.gridColumn5.VisibleIndex = 0;
            this.gridColumn5.Width = 94;
            //
            // gridColumn6
            //
            this.gridColumn6.Caption = "列标题";
            this.gridColumn6.FieldName = "gvColCaption";
            this.gridColumn6.MinWidth = 25;
            this.gridColumn6.Name = "gridColumn6";
            this.gridColumn6.Visible = true;
            this.gridColumn6.VisibleIndex = 1;
            this.gridColumn6.Width = 94;
            //
            // gridColumn7
            //
            this.gridColumn7.Caption = "对应字段";
            this.gridColumn7.ColumnEdit = this.repositoryItemComboBoxSql;
            this.gridColumn7.FieldName = "gvTag";
            this.gridColumn7.MinWidth = 25;
            this.gridColumn7.Name = "gridColumn7";
            this.gridColumn7.Visible = true;
            this.gridColumn7.VisibleIndex = 2;
            this.gridColumn7.Width = 94;
            //
            // repositoryItemComboBoxSql
            //
            this.repositoryItemComboBoxSql.AutoHeight = false;
            this.repositoryItemComboBoxSql.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
            this.repositoryItemComboBoxSql.Name = "repositoryItemComboBoxSql";
            this.repositoryItemComboBoxSql.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
            //
            // gridColumn8
            //
            this.gridColumn8.Caption = "最后修改人";
            this.gridColumn8.FieldName = "lastUpdateBy";
            this.gridColumn8.MinWidth = 25;
            this.gridColumn8.Name = "gridColumn8";
            this.gridColumn8.Visible = true;
            this.gridColumn8.VisibleIndex = 3;
            this.gridColumn8.Width = 94;
            //
            // gridColumn9
            //
            this.gridColumn9.Caption = "最后修改时间";
            this.gridColumn9.FieldName = "lastUpdateDate";
            this.gridColumn9.MinWidth = 25;
            this.gridColumn9.Name = "gridColumn9";
            this.gridColumn9.Visible = true;
            this.gridColumn9.VisibleIndex = 4;
            this.gridColumn9.Width = 94;
            //
            // panQueryBom
            //
            this.panQueryBom.Controls.Add(this.btnQueryEsc);
            this.panQueryBom.Controls.Add(this.btnQuerySave);
            this.panQueryBom.Dock = System.Windows.Forms.DockStyle.Bottom;
            this.panQueryBom.Location = new System.Drawing.Point(0, 405);
            this.panQueryBom.Name = "panQueryBom";
            this.panQueryBom.Size = new System.Drawing.Size(734, 56);
            this.panQueryBom.TabIndex = 2;
            // 
            // btnQueryEsc
            // 
@@ -258,6 +328,78 @@
            this.btnQuerySave.Size = new System.Drawing.Size(94, 29);
            this.btnQuerySave.TabIndex = 0;
            this.btnQuerySave.Text = "确定保存";
            //
            // panQueryTop
            //
            this.panQueryTop.Controls.Add(this.layQuery);
            this.panQueryTop.Dock = System.Windows.Forms.DockStyle.Fill;
            this.panQueryTop.Location = new System.Drawing.Point(0, 0);
            this.panQueryTop.Name = "panQueryTop";
            this.panQueryTop.Size = new System.Drawing.Size(734, 44);
            this.panQueryTop.TabIndex = 3;
            //
            // layQuery
            //
            this.layQuery.Controls.Add(this.txt_table);
            this.layQuery.Dock = System.Windows.Forms.DockStyle.Fill;
            this.layQuery.Location = new System.Drawing.Point(2, 2);
            this.layQuery.Name = "layQuery";
            this.layQuery.Root = this.Root;
            this.layQuery.Size = new System.Drawing.Size(730, 40);
            this.layQuery.TabIndex = 283;
            this.layQuery.Text = "layoutControl1";
            //
            // Root
            //
            this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
            this.Root.GroupBordersVisible = false;
            this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
            this.layoutControlItem1});
            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.Root.Name = "Root";
            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition1.Width = 100D;
            this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
            columnDefinition1});
            rowDefinition1.Height = 100D;
            rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
            this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
            rowDefinition1});
            this.Root.Size = new System.Drawing.Size(709, 48);
            this.Root.TextVisible = false;
            //
            // txt_table
            //
            this.txt_table.Location = new System.Drawing.Point(69, 12);
            this.txt_table.Name = "txt_table";
            this.txt_table.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
            this.txt_table.Size = new System.Drawing.Size(628, 24);
            this.txt_table.StyleController = this.layQuery;
            this.txt_table.TabIndex = 283;
            //
            // layoutControlItem1
            //
            this.layoutControlItem1.Control = this.txt_table;
            this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
            this.layoutControlItem1.Name = "layoutControlItem1";
            this.layoutControlItem1.Size = new System.Drawing.Size(689, 28);
            this.layoutControlItem1.Text = "关联表";
            this.layoutControlItem1.TextSize = new System.Drawing.Size(45, 18);
            //
            // repositoryItemComboBox1
            //
            this.repositoryItemComboBox1.AutoHeight = false;
            this.repositoryItemComboBox1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
            this.repositoryItemComboBox1.Name = "repositoryItemComboBox1";
            //
            // repositoryItemComboBox2
            //
            this.repositoryItemComboBox2.AutoHeight = false;
            this.repositoryItemComboBox2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
            this.repositoryItemComboBox2.Name = "repositoryItemComboBox2";
            // 
            // ShowFilter
            // 
@@ -278,13 +420,21 @@
            this.xtraTabPage1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(repositoryItemButtonEdit1)).EndInit();
            this.xtraTabPage2.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.gcQuery)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvQuery)).EndInit();
            this.panel2.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBoxSql)).EndInit();
            this.panQueryBom.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.panQueryTop)).EndInit();
            this.panQueryTop.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.layQuery)).EndInit();
            this.layQuery.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_table.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox2)).EndInit();
            this.ResumeLayout(false);
        }
@@ -296,19 +446,29 @@
        private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
        private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
        private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox1;
        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox2;
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
        private DevExpress.XtraGrid.GridControl gcMain;
        private System.Windows.Forms.Panel panel2;
        private System.Windows.Forms.Panel panQueryBom;
        private DevExpress.XtraEditors.SimpleButton btnQueryEsc;
        private DevExpress.XtraEditors.SimpleButton btnQuerySave;
        private DevExpress.XtraGrid.GridControl gcQuery;
        private DevExpress.XtraGrid.Views.Grid.GridView gvQuery;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBoxSql;
        private DevExpress.XtraEditors.PanelControl panQueryTop;
        private DevExpress.XtraLayout.LayoutControl layQuery;
        private DevExpress.XtraEditors.CheckedComboBoxEdit txt_table;
        private DevExpress.XtraLayout.LayoutControlGroup Root;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox1;
        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox2;
    }
}
DevApp/Gs.DevApp/UserControl/ShowFilter.cs
@@ -6,6 +6,7 @@
using DevExpress.Utils.DirectXPaint;
using DevExpress.XtraEditors;
using DevExpress.XtraEditors.Controls;
using DevExpress.XtraEditors.Repository;
using DevExpress.XtraGrid.Columns;
using DevExpress.XtraGrid.Views.Base.ViewInfo;
using FastReport.MSChart;
@@ -219,16 +220,32 @@
        #region MyRegion
        private void getPageListQuery()
        {
            var _colList = new List<dynamic>();
            foreach (GridColumn col in _columns)
            {
                _colList.Add(col.Name.ToString());
            }
            //foreach (GridColumn col in _columns)
            //    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);
            //    }
            repositoryItemComboBoxSql.Items.Clear();
            repositoryItemComboBoxSql.Items.Add("1");
            repositoryItemComboBoxSql.Items.Add("1");
            repositoryItemComboBoxSql.Items.Add("1");
            var _obj = new
            {
                formPath = this._fullName,
                colArray = _colList
                list = new List<dynamic>(),
            };
            foreach (GridColumn col in _columns)
            {
                _obj.list.Add(new {
                  colName=  col.Name.ToString(),
                  colCap=col.Caption
                });
            }
            try
            {
                var strJson = UtilityHelper.HttpPost("",