From 5d8ae38f9bfc09265870d97c8e92d99be5f97806 Mon Sep 17 00:00:00 2001 From: wyf Date: Tue, 15 Apr 2025 06:14:19 +0000 Subject: [PATCH] SVN r494 SVN-Revision: r494 --- .../Lskj.PubApiSetModule/FrmMain.Designer.cs | 51 ++++++++++++------- 插件库/Lskj.PubApiSetModule/FrmMain.cs | 4 +- 2 files changed, 34 insertions(+), 21 deletions(-) diff --git a/插件库/Lskj.PubApiSetModule/FrmMain.Designer.cs b/插件库/Lskj.PubApiSetModule/FrmMain.Designer.cs index 8890683..47c765f 100644 --- a/插件库/Lskj.PubApiSetModule/FrmMain.Designer.cs +++ b/插件库/Lskj.PubApiSetModule/FrmMain.Designer.cs @@ -94,6 +94,8 @@ namespace Lskj.PubApiSetModule this.unionPmsIdColumn = new DevExpress.XtraGrid.Columns.GridColumn(); this.valueDataTypeColumn = new DevExpress.XtraGrid.Columns.GridColumn(); this.valueDataTypeComboBox = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox(); + this.valueEncryptTypeColumn = new DevExpress.XtraGrid.Columns.GridColumn(); + this.valueEncryptTypeComboBox = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox(); this.flowPanelBottom = new System.Windows.Forms.FlowLayoutPanel(); this.btnPmsSave = new DevExpress.XtraEditors.SimpleButton(); this.btnPmsDelete = new DevExpress.XtraEditors.SimpleButton(); @@ -104,8 +106,7 @@ namespace Lskj.PubApiSetModule this.getMainView = new DevExpress.XtraGrid.Views.Grid.GridView(); this.getGcDetail = new DevExpress.XtraGrid.GridControl(); this.getDetailView = new DevExpress.XtraGrid.Views.Grid.GridView(); - this.valueEncryptTypeColumn = new DevExpress.XtraGrid.Columns.GridColumn(); - this.valueEncryptTypeComboBox = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox(); + this.finshActionMemoExEdit = new DevExpress.XtraEditors.Repository.RepositoryItemMemoExEdit(); ((System.ComponentModel.ISupportInitialize)(this.tabMain)).BeginInit(); this.tabMain.SuspendLayout(); this.sendPage.SuspendLayout(); @@ -134,6 +135,7 @@ namespace Lskj.PubApiSetModule ((System.ComponentModel.ISupportInitialize)(this.allowNullComboBox)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pmsDataSourceMemoExEdit)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.valueDataTypeComboBox)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.valueEncryptTypeComboBox)).BeginInit(); this.flowPanelBottom.SuspendLayout(); this.getPage.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.splitControlGet)).BeginInit(); @@ -142,7 +144,7 @@ namespace Lskj.PubApiSetModule ((System.ComponentModel.ISupportInitialize)(this.getMainView)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.getGcDetail)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.getDetailView)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.valueEncryptTypeComboBox)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.finshActionMemoExEdit)).BeginInit(); this.SuspendLayout(); // // tabMain @@ -210,7 +212,8 @@ namespace Lskj.PubApiSetModule this.pmsTypeComboBox, this.allowShowMsgComboBox, this.eTypeCodeComboBox, - this.disableTagComboBox}); + this.disableTagComboBox, + this.finshActionMemoExEdit}); this.sendGcMain.Size = new System.Drawing.Size(1006, 203); this.sendGcMain.TabIndex = 23; this.sendGcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { @@ -446,6 +449,7 @@ namespace Lskj.PubApiSetModule // finshActionColumn // this.finshActionColumn.Caption = "后处理逻辑"; + this.finshActionColumn.ColumnEdit = this.finshActionMemoExEdit; this.finshActionColumn.FieldName = "finshAction"; this.finshActionColumn.Name = "finshActionColumn"; this.finshActionColumn.Visible = true; @@ -790,6 +794,22 @@ namespace Lskj.PubApiSetModule new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); this.valueDataTypeComboBox.Name = "valueDataTypeComboBox"; // + // valueEncryptTypeColumn + // + this.valueEncryptTypeColumn.Caption = "值转换类型"; + this.valueEncryptTypeColumn.ColumnEdit = this.valueEncryptTypeComboBox; + this.valueEncryptTypeColumn.FieldName = "valueEncryptType"; + this.valueEncryptTypeColumn.Name = "valueEncryptTypeColumn"; + this.valueEncryptTypeColumn.Visible = true; + this.valueEncryptTypeColumn.VisibleIndex = 7; + // + // valueEncryptTypeComboBox + // + this.valueEncryptTypeComboBox.AutoHeight = false; + this.valueEncryptTypeComboBox.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.valueEncryptTypeComboBox.Name = "valueEncryptTypeComboBox"; + // // flowPanelBottom // this.flowPanelBottom.Controls.Add(this.btnPmsSave); @@ -952,21 +972,12 @@ namespace Lskj.PubApiSetModule this.getDetailView.OptionsView.ShowGroupPanel = false; this.getDetailView.PaintStyleName = "Skin"; // - // valueEncryptTypeColumn + // finshActionMemoExEdit // - this.valueEncryptTypeColumn.Caption = "值转换类型"; - this.valueEncryptTypeColumn.ColumnEdit = this.valueEncryptTypeComboBox; - this.valueEncryptTypeColumn.FieldName = "valueEncryptType"; - this.valueEncryptTypeColumn.Name = "valueEncryptTypeColumn"; - this.valueEncryptTypeColumn.Visible = true; - this.valueEncryptTypeColumn.VisibleIndex = 7; - // - // valueEncryptTypeComboBox - // - this.valueEncryptTypeComboBox.AutoHeight = false; - this.valueEncryptTypeComboBox.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + this.finshActionMemoExEdit.AutoHeight = false; + this.finshActionMemoExEdit.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); - this.valueEncryptTypeComboBox.Name = "valueEncryptTypeComboBox"; + this.finshActionMemoExEdit.Name = "finshActionMemoExEdit"; // // FrmMain // @@ -1007,6 +1018,7 @@ namespace Lskj.PubApiSetModule ((System.ComponentModel.ISupportInitialize)(this.allowNullComboBox)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pmsDataSourceMemoExEdit)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.valueDataTypeComboBox)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.valueEncryptTypeComboBox)).EndInit(); this.flowPanelBottom.ResumeLayout(false); this.getPage.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.splitControlGet)).EndInit(); @@ -1015,7 +1027,7 @@ namespace Lskj.PubApiSetModule ((System.ComponentModel.ISupportInitialize)(this.getMainView)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.getGcDetail)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.getDetailView)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.valueEncryptTypeComboBox)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.finshActionMemoExEdit)).EndInit(); this.ResumeLayout(false); } @@ -1081,4 +1093,5 @@ namespace Lskj.PubApiSetModule private DevExpress.XtraEditors.Repository.RepositoryItemComboBox valueTypeComboBox; private DevExpress.XtraGrid.Columns.GridColumn pmsAllowNullColumn; private DevExpress.XtraEditors.Repository.RepositoryItemComboBox allowNullComboBox; - private DevExpress.XtraGrid.Columns.GridColumn pm \ No newline at end of file + private DevExpress.XtraGrid.Columns.GridColumn pmsDataSourceColumn; + private DevExpress.XtraEditors.Repository.RepositoryItemMemoExEdit pmsD \ No newline at end of file diff --git a/插件库/Lskj.PubApiSetModule/FrmMain.cs b/插件库/Lskj.PubApiSetModule/FrmMain.cs index 347f486..d072e2b 100644 --- a/插件库/Lskj.PubApiSetModule/FrmMain.cs +++ b/插件库/Lskj.PubApiSetModule/FrmMain.cs @@ -240,8 +240,8 @@ namespace Lskj.PubApiSetModule allowShowMsgComboBox.Items.Add(new ComBoxModel() { Value = 0, Text = "不提示" }); allowShowMsgComboBox.Items.Add(new ComBoxModel() { Value = 1, Text = "提示" }); //disableTag - disableTagComboBox.Items.Add(new ComBoxModel() { Value = 0, Text = "启用" }); - disableTagComboBox.Items.Add(new ComBoxModel() { Value = 1, Text = "禁用" }); + disableTagComboBox.Items.Add(new ComBoxModel() { Value = 1, Text = "启用" }); + disableTagComboBox.Items.Add(new ComBoxModel() { Value = 0, Text = "禁用" }); #endregion #region 明细表 pmsIdColumn.OptionsColumn.AllowEdit = false;