From cc3e65e7829889926306935b620e1690f2005fd9 Mon Sep 17 00:00:00 2001 From: wyf Date: Mon, 21 Apr 2025 08:27:01 +0000 Subject: [PATCH] SVN r503 SVN-Revision: r503 --- .../Lskj.PubApiSetModule/FrmMain.Designer.cs | 115 ++++++++++++------ 插件库/Lskj.PubApiSetModule/FrmMain.cs | 33 ++++- 2 files changed, 106 insertions(+), 42 deletions(-) diff --git a/插件库/Lskj.PubApiSetModule/FrmMain.Designer.cs b/插件库/Lskj.PubApiSetModule/FrmMain.Designer.cs index 503ed39..251fa34 100644 --- a/插件库/Lskj.PubApiSetModule/FrmMain.Designer.cs +++ b/插件库/Lskj.PubApiSetModule/FrmMain.Designer.cs @@ -73,6 +73,8 @@ namespace Lskj.PubApiSetModule this.allowShowMsgComboBox = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox(); this.disableTagColumn = new DevExpress.XtraGrid.Columns.GridColumn(); this.disableTagComboBox = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox(); + this.isTokenErrorCondColumn = new DevExpress.XtraGrid.Columns.GridColumn(); + this.orderValueColumn = new DevExpress.XtraGrid.Columns.GridColumn(); this.flowPanelTop = new System.Windows.Forms.FlowLayoutPanel(); this.btnApiSave = new DevExpress.XtraEditors.SimpleButton(); this.btnApiDelete = new DevExpress.XtraEditors.SimpleButton(); @@ -107,7 +109,8 @@ 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.isTokenErrorCondColumn = new DevExpress.XtraGrid.Columns.GridColumn(); + this.btnApiRefresh = new DevExpress.XtraEditors.SimpleButton(); + this.btnPmsRefresh = new DevExpress.XtraEditors.SimpleButton(); ((System.ComponentModel.ISupportInitialize)(this.tabMain)).BeginInit(); this.tabMain.SuspendLayout(); this.sendPage.SuspendLayout(); @@ -156,7 +159,7 @@ namespace Lskj.PubApiSetModule this.tabMain.Location = new System.Drawing.Point(0, 0); this.tabMain.Name = "tabMain"; this.tabMain.SelectedTabPage = this.sendPage; - this.tabMain.Size = new System.Drawing.Size(1012, 555); + this.tabMain.Size = new System.Drawing.Size(921, 555); this.tabMain.TabIndex = 6; this.tabMain.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.sendPage, @@ -166,7 +169,7 @@ namespace Lskj.PubApiSetModule // this.sendPage.Controls.Add(this.splitControlSend); this.sendPage.Name = "sendPage"; - this.sendPage.Size = new System.Drawing.Size(1006, 526); + this.sendPage.Size = new System.Drawing.Size(915, 526); this.sendPage.Text = "推送接口"; // // splitControlSend @@ -185,7 +188,7 @@ namespace Lskj.PubApiSetModule this.splitControlSend.Panel2.Controls.Add(this.sendGcDetail); this.splitControlSend.Panel2.Controls.Add(this.flowPanelBottom); this.splitControlSend.Panel2.Text = "Panel2"; - this.splitControlSend.Size = new System.Drawing.Size(1006, 526); + this.splitControlSend.Size = new System.Drawing.Size(915, 526); this.splitControlSend.SplitterPosition = 237; this.splitControlSend.TabIndex = 4; this.splitControlSend.Text = "splitContainerControl1"; @@ -215,7 +218,7 @@ namespace Lskj.PubApiSetModule this.eTypeCodeComboBox, this.disableTagComboBox, this.finshActionMemoExEdit}); - this.sendGcMain.Size = new System.Drawing.Size(1006, 203); + this.sendGcMain.Size = new System.Drawing.Size(915, 203); this.sendGcMain.TabIndex = 23; this.sendGcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.sendMainView}); @@ -255,7 +258,8 @@ namespace Lskj.PubApiSetModule this.ContentTypeColumn, this.allowShowMsgColumn, this.disableTagColumn, - this.isTokenErrorCondColumn}); + this.isTokenErrorCondColumn, + this.orderValueColumn}); this.sendMainView.GridControl = this.sendGcMain; this.sendMainView.IndicatorWidth = 40; this.sendMainView.Name = "sendMainView"; @@ -405,7 +409,7 @@ namespace Lskj.PubApiSetModule this.eTypeColumn.FieldName = "eType"; this.eTypeColumn.Name = "eTypeColumn"; this.eTypeColumn.Visible = true; - this.eTypeColumn.VisibleIndex = 11; + this.eTypeColumn.VisibleIndex = 12; this.eTypeColumn.Width = 100; // // eTypeComboBox @@ -422,7 +426,7 @@ namespace Lskj.PubApiSetModule this.eTypeCodeColumn.FieldName = "eTypeCode"; this.eTypeCodeColumn.Name = "eTypeCodeColumn"; this.eTypeCodeColumn.Visible = true; - this.eTypeCodeColumn.VisibleIndex = 12; + this.eTypeCodeColumn.VisibleIndex = 13; // // eTypeCodeComboBox // @@ -445,7 +449,7 @@ namespace Lskj.PubApiSetModule this.finshDataPmColumn.FieldName = "finshDataPm"; this.finshDataPmColumn.Name = "finshDataPmColumn"; this.finshDataPmColumn.Visible = true; - this.finshDataPmColumn.VisibleIndex = 14; + this.finshDataPmColumn.VisibleIndex = 15; this.finshDataPmColumn.Width = 80; // // finshActionColumn @@ -455,7 +459,7 @@ namespace Lskj.PubApiSetModule this.finshActionColumn.FieldName = "finshAction"; this.finshActionColumn.Name = "finshActionColumn"; this.finshActionColumn.Visible = true; - this.finshActionColumn.VisibleIndex = 13; + this.finshActionColumn.VisibleIndex = 14; this.finshActionColumn.Width = 100; // // finshActionMemoExEdit @@ -472,7 +476,7 @@ namespace Lskj.PubApiSetModule this.isSucceedCondColumn.FieldName = "isSucceedCond"; this.isSucceedCondColumn.Name = "isSucceedCondColumn"; this.isSucceedCondColumn.Visible = true; - this.isSucceedCondColumn.VisibleIndex = 15; + this.isSucceedCondColumn.VisibleIndex = 16; // // isSucceedCondMemoExEdit // @@ -487,7 +491,7 @@ namespace Lskj.PubApiSetModule this.tokenApiIdColumn.FieldName = "tokenApiId"; this.tokenApiIdColumn.Name = "tokenApiIdColumn"; this.tokenApiIdColumn.Visible = true; - this.tokenApiIdColumn.VisibleIndex = 20; + this.tokenApiIdColumn.VisibleIndex = 21; // // tokenTypeColumn // @@ -496,7 +500,7 @@ namespace Lskj.PubApiSetModule this.tokenTypeColumn.FieldName = "tokenType"; this.tokenTypeColumn.Name = "tokenTypeColumn"; this.tokenTypeColumn.Visible = true; - this.tokenTypeColumn.VisibleIndex = 17; + this.tokenTypeColumn.VisibleIndex = 18; // // tokenTypeComboBox // @@ -512,7 +516,7 @@ namespace Lskj.PubApiSetModule this.pmsTypeColumn.FieldName = "pmsType"; this.pmsTypeColumn.Name = "pmsTypeColumn"; this.pmsTypeColumn.Visible = true; - this.pmsTypeColumn.VisibleIndex = 18; + this.pmsTypeColumn.VisibleIndex = 19; // // pmsTypeComboBox // @@ -527,7 +531,7 @@ namespace Lskj.PubApiSetModule this.ContentTypeColumn.FieldName = "ContentType"; this.ContentTypeColumn.Name = "ContentTypeColumn"; this.ContentTypeColumn.Visible = true; - this.ContentTypeColumn.VisibleIndex = 19; + this.ContentTypeColumn.VisibleIndex = 20; // // allowShowMsgColumn // @@ -536,7 +540,7 @@ namespace Lskj.PubApiSetModule this.allowShowMsgColumn.FieldName = "allowShowMsg"; this.allowShowMsgColumn.Name = "allowShowMsgColumn"; this.allowShowMsgColumn.Visible = true; - this.allowShowMsgColumn.VisibleIndex = 21; + this.allowShowMsgColumn.VisibleIndex = 22; // // allowShowMsgComboBox // @@ -552,7 +556,7 @@ namespace Lskj.PubApiSetModule this.disableTagColumn.FieldName = "disableTag"; this.disableTagColumn.Name = "disableTagColumn"; this.disableTagColumn.Visible = true; - this.disableTagColumn.VisibleIndex = 22; + this.disableTagColumn.VisibleIndex = 23; // // disableTagComboBox // @@ -561,23 +565,40 @@ namespace Lskj.PubApiSetModule new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); this.disableTagComboBox.Name = "disableTagComboBox"; // + // isTokenErrorCondColumn + // + this.isTokenErrorCondColumn.Caption = "token失败条件"; + this.isTokenErrorCondColumn.FieldName = "isTokenErrorCond"; + this.isTokenErrorCondColumn.Name = "isTokenErrorCondColumn"; + this.isTokenErrorCondColumn.Visible = true; + this.isTokenErrorCondColumn.VisibleIndex = 17; + // + // orderValueColumn + // + this.orderValueColumn.Caption = "执行顺序"; + this.orderValueColumn.FieldName = "orderValue"; + this.orderValueColumn.Name = "orderValueColumn"; + this.orderValueColumn.Visible = true; + this.orderValueColumn.VisibleIndex = 11; + // // flowPanelTop // this.flowPanelTop.Controls.Add(this.btnApiSave); this.flowPanelTop.Controls.Add(this.btnApiDelete); this.flowPanelTop.Controls.Add(this.btnApiAdd); + this.flowPanelTop.Controls.Add(this.btnApiRefresh); this.flowPanelTop.Dock = System.Windows.Forms.DockStyle.Bottom; this.flowPanelTop.FlowDirection = System.Windows.Forms.FlowDirection.RightToLeft; this.flowPanelTop.Location = new System.Drawing.Point(0, 203); this.flowPanelTop.Name = "flowPanelTop"; - this.flowPanelTop.Size = new System.Drawing.Size(1006, 34); + this.flowPanelTop.Size = new System.Drawing.Size(915, 34); this.flowPanelTop.TabIndex = 22; // // btnApiSave // this.btnApiSave.Appearance.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnApiSave.Appearance.Options.UseFont = true; - this.btnApiSave.Location = new System.Drawing.Point(923, 3); + this.btnApiSave.Location = new System.Drawing.Point(832, 3); this.btnApiSave.Name = "btnApiSave"; this.btnApiSave.Size = new System.Drawing.Size(80, 28); this.btnApiSave.TabIndex = 13; @@ -588,7 +609,7 @@ namespace Lskj.PubApiSetModule // this.btnApiDelete.Appearance.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnApiDelete.Appearance.Options.UseFont = true; - this.btnApiDelete.Location = new System.Drawing.Point(837, 3); + this.btnApiDelete.Location = new System.Drawing.Point(746, 3); this.btnApiDelete.Name = "btnApiDelete"; this.btnApiDelete.Size = new System.Drawing.Size(80, 28); this.btnApiDelete.TabIndex = 14; @@ -599,7 +620,7 @@ namespace Lskj.PubApiSetModule // this.btnApiAdd.Appearance.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnApiAdd.Appearance.Options.UseFont = true; - this.btnApiAdd.Location = new System.Drawing.Point(751, 3); + this.btnApiAdd.Location = new System.Drawing.Point(660, 3); this.btnApiAdd.Name = "btnApiAdd"; this.btnApiAdd.Size = new System.Drawing.Size(80, 28); this.btnApiAdd.TabIndex = 15; @@ -625,7 +646,7 @@ namespace Lskj.PubApiSetModule this.valueMemoExEdit, this.valueDataTypeComboBox, this.valueEncryptTypeComboBox}); - this.sendGcDetail.Size = new System.Drawing.Size(1006, 250); + this.sendGcDetail.Size = new System.Drawing.Size(915, 250); this.sendGcDetail.TabIndex = 24; this.sendGcDetail.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.sendDetailView}); @@ -824,18 +845,19 @@ namespace Lskj.PubApiSetModule this.flowPanelBottom.Controls.Add(this.btnPmsSave); this.flowPanelBottom.Controls.Add(this.btnPmsDelete); this.flowPanelBottom.Controls.Add(this.btnPmsAdd); + this.flowPanelBottom.Controls.Add(this.btnPmsRefresh); this.flowPanelBottom.Dock = System.Windows.Forms.DockStyle.Bottom; this.flowPanelBottom.FlowDirection = System.Windows.Forms.FlowDirection.RightToLeft; this.flowPanelBottom.Location = new System.Drawing.Point(0, 250); this.flowPanelBottom.Name = "flowPanelBottom"; - this.flowPanelBottom.Size = new System.Drawing.Size(1006, 34); + this.flowPanelBottom.Size = new System.Drawing.Size(915, 34); this.flowPanelBottom.TabIndex = 23; // // btnPmsSave // this.btnPmsSave.Appearance.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnPmsSave.Appearance.Options.UseFont = true; - this.btnPmsSave.Location = new System.Drawing.Point(923, 3); + this.btnPmsSave.Location = new System.Drawing.Point(832, 3); this.btnPmsSave.Name = "btnPmsSave"; this.btnPmsSave.Size = new System.Drawing.Size(80, 28); this.btnPmsSave.TabIndex = 16; @@ -846,7 +868,7 @@ namespace Lskj.PubApiSetModule // this.btnPmsDelete.Appearance.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnPmsDelete.Appearance.Options.UseFont = true; - this.btnPmsDelete.Location = new System.Drawing.Point(837, 3); + this.btnPmsDelete.Location = new System.Drawing.Point(746, 3); this.btnPmsDelete.Name = "btnPmsDelete"; this.btnPmsDelete.Size = new System.Drawing.Size(80, 28); this.btnPmsDelete.TabIndex = 17; @@ -857,7 +879,7 @@ namespace Lskj.PubApiSetModule // this.btnPmsAdd.Appearance.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnPmsAdd.Appearance.Options.UseFont = true; - this.btnPmsAdd.Location = new System.Drawing.Point(751, 3); + this.btnPmsAdd.Location = new System.Drawing.Point(660, 3); this.btnPmsAdd.Name = "btnPmsAdd"; this.btnPmsAdd.Size = new System.Drawing.Size(80, 28); this.btnPmsAdd.TabIndex = 18; @@ -868,7 +890,7 @@ namespace Lskj.PubApiSetModule // this.getPage.Controls.Add(this.splitControlGet); this.getPage.Name = "getPage"; - this.getPage.Size = new System.Drawing.Size(1006, 526); + this.getPage.Size = new System.Drawing.Size(915, 526); this.getPage.Text = "接收接口"; // // splitControlGet @@ -885,7 +907,7 @@ namespace Lskj.PubApiSetModule this.splitControlGet.Panel1.Text = "Panel1"; this.splitControlGet.Panel2.Controls.Add(this.getGcDetail); this.splitControlGet.Panel2.Text = "Panel2"; - this.splitControlGet.Size = new System.Drawing.Size(1006, 526); + this.splitControlGet.Size = new System.Drawing.Size(915, 526); this.splitControlGet.SplitterPosition = 237; this.splitControlGet.TabIndex = 5; this.splitControlGet.Text = "splitContainerControl1"; @@ -901,7 +923,7 @@ namespace Lskj.PubApiSetModule this.getGcMain.MainView = this.getMainView; this.getGcMain.Margin = new System.Windows.Forms.Padding(4); this.getGcMain.Name = "getGcMain"; - this.getGcMain.Size = new System.Drawing.Size(1006, 237); + this.getGcMain.Size = new System.Drawing.Size(915, 237); this.getGcMain.TabIndex = 5; this.getGcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.getMainView}); @@ -947,7 +969,7 @@ namespace Lskj.PubApiSetModule this.getGcDetail.MainView = this.getDetailView; this.getGcDetail.Margin = new System.Windows.Forms.Padding(4); this.getGcDetail.Name = "getGcDetail"; - this.getGcDetail.Size = new System.Drawing.Size(1006, 284); + this.getGcDetail.Size = new System.Drawing.Size(915, 284); this.getGcDetail.TabIndex = 5; this.getGcDetail.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.getDetailView}); @@ -981,13 +1003,27 @@ namespace Lskj.PubApiSetModule this.getDetailView.OptionsView.ShowGroupPanel = false; this.getDetailView.PaintStyleName = "Skin"; // - // isTokenErrorCondColumn + // btnApiRefresh // - this.isTokenErrorCondColumn.Caption = "token失败条件"; - this.isTokenErrorCondColumn.FieldName = "isTokenErrorCond"; - this.isTokenErrorCondColumn.Name = "isTokenErrorCondColumn"; - this.isTokenErrorCondColumn.Visible = true; - this.isTokenErrorCondColumn.VisibleIndex = 16; + this.btnApiRefresh.Appearance.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.btnApiRefresh.Appearance.Options.UseFont = true; + this.btnApiRefresh.Location = new System.Drawing.Point(574, 3); + this.btnApiRefresh.Name = "btnApiRefresh"; + this.btnApiRefresh.Size = new System.Drawing.Size(80, 28); + this.btnApiRefresh.TabIndex = 16; + this.btnApiRefresh.TabStop = false; + this.btnApiRefresh.Text = "刷新(&R)"; + // + // btnPmsRefresh + // + this.btnPmsRefresh.Appearance.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.btnPmsRefresh.Appearance.Options.UseFont = true; + this.btnPmsRefresh.Location = new System.Drawing.Point(574, 3); + this.btnPmsRefresh.Name = "btnPmsRefresh"; + this.btnPmsRefresh.Size = new System.Drawing.Size(80, 28); + this.btnPmsRefresh.TabIndex = 19; + this.btnPmsRefresh.TabStop = false; + this.btnPmsRefresh.Text = "刷新(&R)"; // // FrmMain // @@ -996,7 +1032,7 @@ namespace Lskj.PubApiSetModule this.Appearance.Options.UseFont = true; this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1012, 555); + this.ClientSize = new System.Drawing.Size(921, 555); this.Controls.Add(this.tabMain); this.Name = "FrmMain"; this.Text = "FrmMain"; @@ -1105,4 +1141,7 @@ namespace Lskj.PubApiSetModule private DevExpress.XtraEditors.Repository.RepositoryItemComboBox allowNullComboBox; private DevExpress.XtraGrid.Columns.GridColumn pmsDataSourceColumn; private DevExpress.XtraEditors.Repository.RepositoryItemMemoExEdit pmsDataSourceMemoExEdit; - private DevExpress.XtraGrid.Columns.GridColumn uni \ No newline at end of file + private DevExpress.XtraGrid.Columns.GridColumn unionPmsIdColumn; + private DevExpress.XtraGrid.Columns.GridColumn valueDataTypeColumn; + private DevExpress.XtraEditors.Repository.RepositoryItemComboBox valueDataTypeComboBox; + private Syst \ No newline at end of file diff --git a/插件库/Lskj.PubApiSetModule/FrmMain.cs b/插件库/Lskj.PubApiSetModule/FrmMain.cs index 3008adf..47d1f45 100644 --- a/插件库/Lskj.PubApiSetModule/FrmMain.cs +++ b/插件库/Lskj.PubApiSetModule/FrmMain.cs @@ -53,11 +53,13 @@ namespace Lskj.PubApiSetModule sendDetailView.InitNewRow += OnViewInitNewRow; sendMainView.FocusedRowObjectChanged += OnFocusedRowObjectChanged; btnApiAdd.Click += OnBtnAddClick; - btnApiDelete.Click += OnBtnDeleteClick; - btnApiSave.Click += OnBtnSaveClick; btnPmsAdd.Click += OnBtnAddClick; - btnPmsDelete.Click += OnBtnDeleteClick; + btnApiSave.Click += OnBtnSaveClick; btnPmsSave.Click += OnBtnSaveClick; + btnApiDelete.Click += OnBtnDeleteClick; + btnPmsDelete.Click += OnBtnDeleteClick; + btnApiRefresh.Click += OnBtnRefreshClick; + btnPmsRefresh.Click += OnBtnRefreshClick; } /// /// 添加按钮点击 @@ -122,6 +124,28 @@ namespace Lskj.PubApiSetModule } } /// + /// 刷新数据 + /// + /// + /// + private void OnBtnRefreshClick(object sender, EventArgs e) + { + if (sender == btnApiRefresh) + { + int rowHandle = sendMainView.FocusedRowHandle; + InitApiTabDataSource(); + sendMainView.FocusedRowHandle = rowHandle; + } + else if (sender == btnPmsRefresh) + { + DataRow focusedRow = sendMainView.GetFocusedDataRow(); + string apiId = focusedRow["id"] + ""; + int rowHandle = sendDetailView.FocusedRowHandle; + InitApiPmsTabDataSource(apiId); + sendDetailView.FocusedRowHandle = rowHandle; + } + } + /// /// 选中行改变时 /// /// @@ -222,6 +246,7 @@ namespace Lskj.PubApiSetModule eTypeComboBox.Items.Add(new ComBoxModel() { Value = "BeforeModuleContextMenu", Text = "右键执行前" }); eTypeComboBox.Items.Add(new ComBoxModel() { Value = "AfterModuleAuditStateChange", Text = "审核执行后" }); eTypeComboBox.Items.Add(new ComBoxModel() { Value = "BeforeModuleAuditStateChange", Text = "审核执行前" }); + eTypeComboBox.Items.Add(new ComBoxModel() { Value = "BeforeUploadFile", Text = "文件上传前" }); eTypeComboBox.Items.Add(new ComBoxModel() { Value = "AfterUploadFile", Text = "文件上传后" }); //tokenType tokenTypeComboBox.Items.Add(new ComBoxModel() { Value = 0, Text = "Token文本" }); @@ -324,7 +349,7 @@ namespace Lskj.PubApiSetModule colDic.Add("isTokenErrorCond", "varchar(100)"); colDic.Add("tokenApiId", "int"); colDic.Add("tokenType", "int"); - colDic.Add("dynamicToken", "varchar(200)"); + colDic.Add("dynamicToken", "varchar(2000)"); colDic.Add("pmsType", "int"); colDic.Add("allowShowMsg", "int"); colDic.Add("ContentType", "varchar(200)");