SVN r495

SVN-Revision: r495

插件库/Lskj.PubApiSetModule/FrmMain.Designer.cs

@@ -60,6 +60,7 @@ namespace Lskj.PubApiSetModule
             this.actionDelayColumn = new DevExpress.XtraGrid.Columns.GridColumn();
             this.finshDataPmColumn = new DevExpress.XtraGrid.Columns.GridColumn();
             this.finshActionColumn = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.finshActionMemoExEdit = new DevExpress.XtraEditors.Repository.RepositoryItemMemoExEdit();
             this.isSucceedCondColumn = new DevExpress.XtraGrid.Columns.GridColumn();
             this.isSucceedCondMemoExEdit = new DevExpress.XtraEditors.Repository.RepositoryItemMemoExEdit();
             this.tokenApiIdColumn = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -106,7 +107,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.finshActionMemoExEdit = new DevExpress.XtraEditors.Repository.RepositoryItemMemoExEdit();
+            this.isTokenErrorCondColumn = new DevExpress.XtraGrid.Columns.GridColumn();
             ((System.ComponentModel.ISupportInitialize)(this.tabMain)).BeginInit();
             this.tabMain.SuspendLayout();
             this.sendPage.SuspendLayout();
@@ -121,6 +122,7 @@ namespace Lskj.PubApiSetModule
             ((System.ComponentModel.ISupportInitialize)(this.actionTypeComboBox)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.eTypeComboBox)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.eTypeCodeComboBox)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.finshActionMemoExEdit)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.isSucceedCondMemoExEdit)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.tokenTypeComboBox)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.pmsTypeComboBox)).BeginInit();
@@ -144,7 +146,6 @@ 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.finshActionMemoExEdit)).BeginInit();
             this.SuspendLayout();
             // 
             // tabMain
@@ -253,7 +254,8 @@ namespace Lskj.PubApiSetModule
             this.pmsTypeColumn,
             this.ContentTypeColumn,
             this.allowShowMsgColumn,
-            this.disableTagColumn});
+            this.disableTagColumn,
+            this.isTokenErrorCondColumn});
             this.sendMainView.GridControl = this.sendGcMain;
             this.sendMainView.IndicatorWidth = 40;
             this.sendMainView.Name = "sendMainView";
@@ -456,6 +458,13 @@ namespace Lskj.PubApiSetModule
             this.finshActionColumn.VisibleIndex = 13;
             this.finshActionColumn.Width = 100;
             // 
+            // finshActionMemoExEdit
+            // 
+            this.finshActionMemoExEdit.AutoHeight = false;
+            this.finshActionMemoExEdit.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.finshActionMemoExEdit.Name = "finshActionMemoExEdit";
+            // 
             // isSucceedCondColumn
             // 
             this.isSucceedCondColumn.Caption = "执行成功条件";
@@ -478,7 +487,7 @@ namespace Lskj.PubApiSetModule
             this.tokenApiIdColumn.FieldName = "tokenApiId";
             this.tokenApiIdColumn.Name = "tokenApiIdColumn";
             this.tokenApiIdColumn.Visible = true;
-            this.tokenApiIdColumn.VisibleIndex = 19;
+            this.tokenApiIdColumn.VisibleIndex = 20;
             // 
             // tokenTypeColumn
             // 
@@ -487,7 +496,7 @@ namespace Lskj.PubApiSetModule
             this.tokenTypeColumn.FieldName = "tokenType";
             this.tokenTypeColumn.Name = "tokenTypeColumn";
             this.tokenTypeColumn.Visible = true;
-            this.tokenTypeColumn.VisibleIndex = 16;
+            this.tokenTypeColumn.VisibleIndex = 17;
             // 
             // tokenTypeComboBox
             // 
@@ -503,7 +512,7 @@ namespace Lskj.PubApiSetModule
             this.pmsTypeColumn.FieldName = "pmsType";
             this.pmsTypeColumn.Name = "pmsTypeColumn";
             this.pmsTypeColumn.Visible = true;
-            this.pmsTypeColumn.VisibleIndex = 17;
+            this.pmsTypeColumn.VisibleIndex = 18;
             // 
             // pmsTypeComboBox
             // 
@@ -518,7 +527,7 @@ namespace Lskj.PubApiSetModule
             this.ContentTypeColumn.FieldName = "ContentType";
             this.ContentTypeColumn.Name = "ContentTypeColumn";
             this.ContentTypeColumn.Visible = true;
-            this.ContentTypeColumn.VisibleIndex = 18;
+            this.ContentTypeColumn.VisibleIndex = 19;
             // 
             // allowShowMsgColumn
             // 
@@ -527,7 +536,7 @@ namespace Lskj.PubApiSetModule
             this.allowShowMsgColumn.FieldName = "allowShowMsg";
             this.allowShowMsgColumn.Name = "allowShowMsgColumn";
             this.allowShowMsgColumn.Visible = true;
-            this.allowShowMsgColumn.VisibleIndex = 20;
+            this.allowShowMsgColumn.VisibleIndex = 21;
             // 
             // allowShowMsgComboBox
             // 
@@ -543,7 +552,7 @@ namespace Lskj.PubApiSetModule
             this.disableTagColumn.FieldName = "disableTag";
             this.disableTagColumn.Name = "disableTagColumn";
             this.disableTagColumn.Visible = true;
-            this.disableTagColumn.VisibleIndex = 21;
+            this.disableTagColumn.VisibleIndex = 22;
             // 
             // disableTagComboBox
             // 
@@ -972,12 +981,13 @@ namespace Lskj.PubApiSetModule
             this.getDetailView.OptionsView.ShowGroupPanel = false;
             this.getDetailView.PaintStyleName = "Skin";
             // 
-            // finshActionMemoExEdit
+            // isTokenErrorCondColumn
             // 
-            this.finshActionMemoExEdit.AutoHeight = false;
-            this.finshActionMemoExEdit.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.finshActionMemoExEdit.Name = "finshActionMemoExEdit";
+            this.isTokenErrorCondColumn.Caption = "token失败条件";
+            this.isTokenErrorCondColumn.FieldName = "isTokenErrorCond";
+            this.isTokenErrorCondColumn.Name = "isTokenErrorCondColumn";
+            this.isTokenErrorCondColumn.Visible = true;
+            this.isTokenErrorCondColumn.VisibleIndex = 16;
             // 
             // FrmMain
             // 
@@ -1004,6 +1014,7 @@ namespace Lskj.PubApiSetModule
             ((System.ComponentModel.ISupportInitialize)(this.actionTypeComboBox)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.eTypeComboBox)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.eTypeCodeComboBox)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.finshActionMemoExEdit)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.isSucceedCondMemoExEdit)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.tokenTypeComboBox)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.pmsTypeComboBox)).EndInit();
@@ -1027,7 +1038,6 @@ 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.finshActionMemoExEdit)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -1094,4 +1104,5 @@ namespace Lskj.PubApiSetModule
         private DevExpress.XtraGrid.Columns.GridColumn pmsAllowNullColumn;
         private DevExpress.XtraEditors.Repository.RepositoryItemComboBox allowNullComboBox;
         private DevExpress.XtraGrid.Columns.GridColumn pmsDataSourceColumn;
-        private DevExpress.XtraEditors.Repository.RepositoryItemMemoExEdit pmsD
+        private DevExpress.XtraEditors.Repository.RepositoryItemMemoExEdit pmsDataSourceMemoExEdit;
+        private DevExpress.XtraGrid.Columns.GridColumn uni

插件库/Lskj.PubApiSetModule/FrmMain.cs

@@ -321,6 +321,7 @@ namespace Lskj.PubApiSetModule
                 colDic.Add("finshAction", "varchar(8000)");
                 colDic.Add("orderValue", "int");
                 colDic.Add("isSucceedCond", "varchar(100)");
+                colDic.Add("isTokenErrorCond", "varchar(100)");
                 colDic.Add("tokenApiId", "int");
                 colDic.Add("tokenType", "int");
                 colDic.Add("dynamicToken", "varchar(200)");