lxm1993 发布系统代码 [TrainSys，网页端]

trainsys-core/src/main/resources/liquibase/h2_table.xml

@@ -50,7 +50,7 @@
     </changeSet>
 
     <!--输出实体[BOOK]数据结构 -->
-    <changeSet author="root" id="tab-book-273-3">
+    <changeSet author="root" id="tab-book-276-3">
         <createTable tableName="T_BOOK">
                 <column name="BOOKNAME" remarks="" type="VARCHAR(200)">
                 </column>

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Book.json

@@ -547,6 +547,14 @@
       "stringLength" : 100,
       "enableUserInsert" : true,
       "enableUserUpdate" : true
+    }, {
+      "codeName" : "Field3",
+      "logicName" : "属性3",
+      "name" : "FIELD3",
+      "orderValue" : 1000,
+      "stringLength" : 100,
+      "enableUserInsert" : true,
+      "enableUserUpdate" : true
     }, {
       "codeName" : "OrgId",
       "logicName" : "组织机构标识",
@@ -1337,6 +1345,7 @@
     } ],
     "codeName" : "Field",
     "dEFType" : 1,
+    "dEMSFieldMode" : "STATE1",
     "dataType" : "TEXT",
     "importOrder" : 1000,
     "length" : 100,
@@ -1413,6 +1422,7 @@
     } ],
     "codeName" : "Field2",
     "dEFType" : 1,
+    "dEMSFieldMode" : "STATE2",
     "dataType" : "TEXT",
     "importOrder" : 1000,
     "length" : 100,
@@ -1489,6 +1499,7 @@
     } ],
     "codeName" : "Field3",
     "dEFType" : 1,
+    "dEMSFieldMode" : "STATE3",
     "dataType" : "TEXT",
     "importOrder" : 1000,
     "length" : 100,
@@ -3000,6 +3011,55 @@
     "stringLength" : 100,
     "valueFormat" : "%1$s"
   } ],
+  "getAllPSDEMainStates" : [ {
+    "codeName" : "A",
+    "enterStateMode" : "ANY",
+    "logicName" : "状态A",
+    "mSTag" : "a1__a2__a3",
+    "name" : "状态A",
+    "state2Value" : "a2",
+    "state3Value" : "a3",
+    "stateValue" : "a1",
+    "viewActions" : 0,
+    "wFStateMode" : 0,
+    "actionAllowMode" : true,
+    "allowMode" : true,
+    "default" : false,
+    "enableViewActions" : false,
+    "fieldAllowMode" : false,
+    "oPPrivAllowMode" : false
+  }, {
+    "codeName" : "B",
+    "enterStateMode" : "ANY",
+    "logicName" : "状态B",
+    "mSTag" : "b1__b2",
+    "name" : "状态B",
+    "state2Value" : "b2",
+    "stateValue" : "b1",
+    "viewActions" : 0,
+    "wFStateMode" : 0,
+    "actionAllowMode" : false,
+    "allowMode" : false,
+    "default" : false,
+    "enableViewActions" : false,
+    "fieldAllowMode" : false,
+    "oPPrivAllowMode" : false
+  }, {
+    "codeName" : "C",
+    "enterStateMode" : "ANY",
+    "logicName" : "状态C",
+    "mSTag" : "c1",
+    "name" : "状态C",
+    "stateValue" : "c1",
+    "viewActions" : 0,
+    "wFStateMode" : 0,
+    "actionAllowMode" : true,
+    "allowMode" : true,
+    "default" : false,
+    "enableViewActions" : false,
+    "fieldAllowMode" : false,
+    "oPPrivAllowMode" : false
+  } ],
   "getAllPSDEMethodDTOs" : [ {
     "name" : "BookDTO",
     "getPSDEMethodDTOFields" : [ {
@@ -3467,6 +3527,17 @@
       "stdDataType" : 25,
       "stringLength" : 100,
       "type" : "SIMPLE"
+    }, {
+      "logicName" : "属性3",
+      "name" : "Field3",
+      "getPSDEField" : {
+        "name" : "FIELD3",
+        "codeName" : "Field3"
+      },
+      "sourceType" : "DEFGROUPDETAIL",
+      "stdDataType" : 25,
+      "stringLength" : 100,
+      "type" : "SIMPLE"
     }, {
       "logicName" : "组织机构标识",
       "name" : "OrgId",
@@ -3871,6 +3942,16 @@
     "codeName" : "BookId"
   },
   "logicName" : "书",
+  "getMainStatePSDEFields" : [ {
+    "name" : "FIELD",
+    "codeName" : "Field"
+  }, {
+    "name" : "FIELD2",
+    "codeName" : "Field2"
+  }, {
+    "name" : "FIELD3",
+    "codeName" : "Field3"
+  } ],
   "getMajorPSDEField" : {
     "name" : "BOOKNAME",
     "codeName" : "BookName"

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json

@@ -469,6 +469,55 @@
       "id" : "Begin"
     }
   } ],
+  "getAllPSDEMainStates" : [ {
+    "codeName" : "A",
+    "enterStateMode" : "ANY",
+    "logicName" : "状态A",
+    "mSTag" : "a1__a2__a3",
+    "name" : "状态A",
+    "state2Value" : "a2",
+    "state3Value" : "a3",
+    "stateValue" : "a1",
+    "viewActions" : 0,
+    "wFStateMode" : 0,
+    "actionAllowMode" : true,
+    "allowMode" : true,
+    "default" : false,
+    "enableViewActions" : false,
+    "fieldAllowMode" : false,
+    "oPPrivAllowMode" : false
+  }, {
+    "codeName" : "B",
+    "enterStateMode" : "ANY",
+    "logicName" : "状态B",
+    "mSTag" : "b1__b2",
+    "name" : "状态B",
+    "state2Value" : "b2",
+    "stateValue" : "b1",
+    "viewActions" : 0,
+    "wFStateMode" : 0,
+    "actionAllowMode" : false,
+    "allowMode" : false,
+    "default" : false,
+    "enableViewActions" : false,
+    "fieldAllowMode" : false,
+    "oPPrivAllowMode" : false
+  }, {
+    "codeName" : "C",
+    "enterStateMode" : "ANY",
+    "logicName" : "状态C",
+    "mSTag" : "c1",
+    "name" : "状态C",
+    "stateValue" : "c1",
+    "viewActions" : 0,
+    "wFStateMode" : 0,
+    "actionAllowMode" : true,
+    "allowMode" : true,
+    "default" : false,
+    "enableViewActions" : false,
+    "fieldAllowMode" : false,
+    "oPPrivAllowMode" : false
+  } ],
   "getAllPSDEOPPrivs" : [ {
     "logicName" : "建立",
     "name" : "CREATE"
@@ -493,6 +542,16 @@
     "codeName" : "BookId"
   },
   "logicName" : "书",
+  "getMainStatePSAppDEFields" : [ {
+    "name" : "FIELD",
+    "codeName" : "Field"
+  }, {
+    "name" : "FIELD2",
+    "codeName" : "Field2"
+  }, {
+    "name" : "FIELD3",
+    "codeName" : "Field3"
+  } ],
   "getMajorPSAppDEField" : {
     "name" : "BOOKNAME",
     "codeName" : "BookName"
@@ -510,6 +569,7 @@
   "storageMode" : 0,
   "sysAPITag" : "TrainSys",
   "defaultMode" : true,
+  "enableDEMainState" : true,
   "enableFilterActions" : true,
   "enableUICreate" : true,
   "enableUIModify" : true,

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSDATAVIEWS/Usr0815070416.json

@@ -98,6 +98,9 @@
       "name" : "FIELD2",
       "codeName" : "Field2"
     }
+  }, {
+    "dataType" : 25,
+    "name" : "srfmstag"
   } ],
   "pagingSize" : 1000,
   "getRemovePSControlAction" : {

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSDATAVIEWS/Usr0815508508.json

@@ -99,6 +99,9 @@
       "name" : "FIELD2",
       "codeName" : "Field2"
     }
+  }, {
+    "dataType" : 25,
+    "name" : "srfmstag"
   } ],
   "pagingSize" : 1000,
   "getRemovePSControlAction" : {

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSFORMS/EditorTest.json

@@ -1787,34 +1787,34 @@
             "getPSAppViewLogics" : [ {
               "logicTrigger" : "CUSTOM",
               "logicType" : "APPVIEWUIACTION",
-              "name" : "grid_uagridcolumn1_u479f517_click",
+              "name" : "grid_uagridcolumn1_ua98d563_click",
               "getPSAppViewUIAction" : {
                 "modelref" : true,
-                "id" : "表格界面_编辑操作"
+                "id" : "表格界面_行编辑开关操作"
               }
             }, {
               "logicTrigger" : "CUSTOM",
               "logicType" : "APPVIEWUIACTION",
-              "name" : "grid_uagridcolumn1_ua98d563_click",
+              "name" : "grid_uagridcolumn1_u479f517_click",
               "getPSAppViewUIAction" : {
                 "modelref" : true,
-                "id" : "表格界面_行编辑开关操作"
+                "id" : "表格界面_编辑操作"
               }
             } ],
             "getPSAppViewUIActions" : [ {
-              "name" : "表格界面_编辑操作",
+              "name" : "表格界面_行编辑开关操作",
               "getPSUIAction" : {
                 "modelref" : true,
-                "id" : "Edit"
+                "id" : "ToggleRowEdit"
               },
-              "uIActionTarget" : "SINGLEKEY",
               "xDataControlName" : "grid"
             }, {
-              "name" : "表格界面_行编辑开关操作",
+              "name" : "表格界面_编辑操作",
               "getPSUIAction" : {
                 "modelref" : true,
-                "id" : "ToggleRowEdit"
+                "id" : "Edit"
               },
+              "uIActionTarget" : "SINGLEKEY",
               "xDataControlName" : "grid"
             } ],
             "getPSControlHandler" : {
@@ -2032,6 +2032,28 @@
                 "codeName" : "A046596b6afb50f9e5b",
                 "name" : "操作列",
                 "getPSUIActionGroupDetails" : [ {
+                  "detailType" : "DEUIACTION",
+                  "name" : "ua98d563",
+                  "getPSUIAction" : {
+                    "caption" : "行编辑",
+                    "codeName" : "ToggleRowEdit",
+                    "fullCodeName" : "ToggleRowEdit",
+                    "name" : "表格界面_行编辑开关操作",
+                    "getPSSysImage" : {
+                      "glyph" : "xf0ce@FontAwesome",
+                      "cssClass" : "fa fa-table"
+                    },
+                    "predefinedType" : "GRIDVIEW_ROWEDITACTION",
+                    "timeout" : 60000,
+                    "uIActionMode" : "SYS",
+                    "uIActionTag" : "ToggleRowEdit",
+                    "uIActionType" : "DEUIACTION",
+                    "enableToggleMode" : true
+                  },
+                  "addSeparator" : false,
+                  "showCaption" : true,
+                  "showIcon" : false
+                }, {
                   "detailType" : "DEUIACTION",
                   "name" : "u479f517",
                   "getPSUIAction" : {
@@ -2059,28 +2081,6 @@
                   "addSeparator" : true,
                   "showCaption" : true,
                   "showIcon" : true
-                }, {
-                  "detailType" : "DEUIACTION",
-                  "name" : "ua98d563",
-                  "getPSUIAction" : {
-                    "caption" : "行编辑",
-                    "codeName" : "ToggleRowEdit",
-                    "fullCodeName" : "ToggleRowEdit",
-                    "name" : "表格界面_行编辑开关操作",
-                    "getPSSysImage" : {
-                      "glyph" : "xf0ce@FontAwesome",
-                      "cssClass" : "fa fa-table"
-                    },
-                    "predefinedType" : "GRIDVIEW_ROWEDITACTION",
-                    "timeout" : 60000,
-                    "uIActionMode" : "SYS",
-                    "uIActionTag" : "ToggleRowEdit",
-                    "uIActionType" : "DEUIACTION",
-                    "enableToggleMode" : true
-                  },
-                  "addSeparator" : false,
-                  "showCaption" : true,
-                  "showIcon" : false
                 } ]
               },
               "width" : 100,

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSGRIDS/Main.json

@@ -214,6 +214,9 @@
       "name" : "FIELD2",
       "codeName" : "Field2"
     }
+  }, {
+    "dataType" : 25,
+    "name" : "srfmstag"
   } ],
   "getPSDEGridEditItems" : [ {
     "caption" : "属性9",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSGRIDS/TestEditorGrid.json

@@ -429,6 +429,9 @@
       "name" : "FIELD2",
       "codeName" : "Field2"
     }
+  }, {
+    "dataType" : 25,
+    "name" : "srfmstag"
   } ],
   "getPSDEGridEditItemUpdates" : [ {
     "codeName" : "test11",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSGRIDS/Main.json

@@ -18,34 +18,34 @@
   "getPSAppViewLogics" : [ {
     "logicTrigger" : "CUSTOM",
     "logicType" : "APPVIEWUIACTION",
-    "name" : "grid_uagridcolumn1_u479f517_click",
+    "name" : "grid_uagridcolumn1_ua98d563_click",
     "getPSAppViewUIAction" : {
       "modelref" : true,
-      "id" : "表格界面_编辑操作"
+      "id" : "表格界面_行编辑开关操作"
     }
   }, {
     "logicTrigger" : "CUSTOM",
     "logicType" : "APPVIEWUIACTION",
-    "name" : "grid_uagridcolumn1_ua98d563_click",
+    "name" : "grid_uagridcolumn1_u479f517_click",
     "getPSAppViewUIAction" : {
       "modelref" : true,
-      "id" : "表格界面_行编辑开关操作"
+      "id" : "表格界面_编辑操作"
     }
   } ],
   "getPSAppViewUIActions" : [ {
-    "name" : "表格界面_编辑操作",
+    "name" : "表格界面_行编辑开关操作",
     "getPSUIAction" : {
       "modelref" : true,
-      "id" : "Edit"
+      "id" : "ToggleRowEdit"
     },
-    "uIActionTarget" : "SINGLEKEY",
     "xDataControlName" : "grid"
   }, {
-    "name" : "表格界面_行编辑开关操作",
+    "name" : "表格界面_编辑操作",
     "getPSUIAction" : {
       "modelref" : true,
-      "id" : "ToggleRowEdit"
+      "id" : "Edit"
     },
+    "uIActionTarget" : "SINGLEKEY",
     "xDataControlName" : "grid"
   } ],
   "getPSControlLogics" : [ {
@@ -176,6 +176,28 @@
       "codeName" : "A046596b6afb50f9e5b",
       "name" : "操作列",
       "getPSUIActionGroupDetails" : [ {
+        "detailType" : "DEUIACTION",
+        "name" : "ua98d563",
+        "getPSUIAction" : {
+          "caption" : "行编辑",
+          "codeName" : "ToggleRowEdit",
+          "fullCodeName" : "ToggleRowEdit",
+          "name" : "表格界面_行编辑开关操作",
+          "getPSSysImage" : {
+            "glyph" : "xf0ce@FontAwesome",
+            "cssClass" : "fa fa-table"
+          },
+          "predefinedType" : "GRIDVIEW_ROWEDITACTION",
+          "timeout" : 60000,
+          "uIActionMode" : "SYS",
+          "uIActionTag" : "ToggleRowEdit",
+          "uIActionType" : "DEUIACTION",
+          "enableToggleMode" : true
+        },
+        "addSeparator" : false,
+        "showCaption" : true,
+        "showIcon" : false
+      }, {
         "detailType" : "DEUIACTION",
         "name" : "u479f517",
         "getPSUIAction" : {
@@ -203,28 +225,6 @@
         "addSeparator" : true,
         "showCaption" : true,
         "showIcon" : true
-      }, {
-        "detailType" : "DEUIACTION",
-        "name" : "ua98d563",
-        "getPSUIAction" : {
-          "caption" : "行编辑",
-          "codeName" : "ToggleRowEdit",
-          "fullCodeName" : "ToggleRowEdit",
-          "name" : "表格界面_行编辑开关操作",
-          "getPSSysImage" : {
-            "glyph" : "xf0ce@FontAwesome",
-            "cssClass" : "fa fa-table"
-          },
-          "predefinedType" : "GRIDVIEW_ROWEDITACTION",
-          "timeout" : 60000,
-          "uIActionMode" : "SYS",
-          "uIActionTag" : "ToggleRowEdit",
-          "uIActionType" : "DEUIACTION",
-          "enableToggleMode" : true
-        },
-        "addSeparator" : false,
-        "showCaption" : true,
-        "showIcon" : false
       } ]
     },
     "width" : 100,

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Student/PSFORMS/Main.json

@@ -580,34 +580,34 @@
           "getPSAppViewLogics" : [ {
             "logicTrigger" : "CUSTOM",
             "logicType" : "APPVIEWUIACTION",
-            "name" : "grid_uagridcolumn1_u479f517_click",
+            "name" : "grid_uagridcolumn1_ua98d563_click",
             "getPSAppViewUIAction" : {
               "modelref" : true,
-              "id" : "表格界面_编辑操作"
+              "id" : "表格界面_行编辑开关操作"
             }
           }, {
             "logicTrigger" : "CUSTOM",
             "logicType" : "APPVIEWUIACTION",
-            "name" : "grid_uagridcolumn1_ua98d563_click",
+            "name" : "grid_uagridcolumn1_u479f517_click",
             "getPSAppViewUIAction" : {
               "modelref" : true,
-              "id" : "表格界面_行编辑开关操作"
+              "id" : "表格界面_编辑操作"
             }
           } ],
           "getPSAppViewUIActions" : [ {
-            "name" : "表格界面_编辑操作",
+            "name" : "表格界面_行编辑开关操作",
             "getPSUIAction" : {
               "modelref" : true,
-              "id" : "Edit"
+              "id" : "ToggleRowEdit"
             },
-            "uIActionTarget" : "SINGLEKEY",
             "xDataControlName" : "grid"
           }, {
-            "name" : "表格界面_行编辑开关操作",
+            "name" : "表格界面_编辑操作",
             "getPSUIAction" : {
               "modelref" : true,
-              "id" : "ToggleRowEdit"
+              "id" : "Edit"
             },
+            "uIActionTarget" : "SINGLEKEY",
             "xDataControlName" : "grid"
           } ],
           "getPSControlHandler" : {
@@ -825,6 +825,28 @@
               "codeName" : "A046596b6afb50f9e5b",
               "name" : "操作列",
               "getPSUIActionGroupDetails" : [ {
+                "detailType" : "DEUIACTION",
+                "name" : "ua98d563",
+                "getPSUIAction" : {
+                  "caption" : "行编辑",
+                  "codeName" : "ToggleRowEdit",
+                  "fullCodeName" : "ToggleRowEdit",
+                  "name" : "表格界面_行编辑开关操作",
+                  "getPSSysImage" : {
+                    "glyph" : "xf0ce@FontAwesome",
+                    "cssClass" : "fa fa-table"
+                  },
+                  "predefinedType" : "GRIDVIEW_ROWEDITACTION",
+                  "timeout" : 60000,
+                  "uIActionMode" : "SYS",
+                  "uIActionTag" : "ToggleRowEdit",
+                  "uIActionType" : "DEUIACTION",
+                  "enableToggleMode" : true
+                },
+                "addSeparator" : false,
+                "showCaption" : true,
+                "showIcon" : false
+              }, {
                 "detailType" : "DEUIACTION",
                 "name" : "u479f517",
                 "getPSUIAction" : {
@@ -852,28 +874,6 @@
                 "addSeparator" : true,
                 "showCaption" : true,
                 "showIcon" : true
-              }, {
-                "detailType" : "DEUIACTION",
-                "name" : "ua98d563",
-                "getPSUIAction" : {
-                  "caption" : "行编辑",
-                  "codeName" : "ToggleRowEdit",
-                  "fullCodeName" : "ToggleRowEdit",
-                  "name" : "表格界面_行编辑开关操作",
-                  "getPSSysImage" : {
-                    "glyph" : "xf0ce@FontAwesome",
-                    "cssClass" : "fa fa-table"
-                  },
-                  "predefinedType" : "GRIDVIEW_ROWEDITACTION",
-                  "timeout" : 60000,
-                  "uIActionMode" : "SYS",
-                  "uIActionTag" : "ToggleRowEdit",
-                  "uIActionType" : "DEUIACTION",
-                  "enableToggleMode" : true
-                },
-                "addSeparator" : false,
-                "showCaption" : true,
-                "showIcon" : false
               } ]
             },
             "width" : 100,

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoGridView.json

@@ -373,34 +373,34 @@
     "getPSAppViewLogics" : [ {
       "logicTrigger" : "CUSTOM",
       "logicType" : "APPVIEWUIACTION",
-      "name" : "grid_uagridcolumn1_u479f517_click",
+      "name" : "grid_uagridcolumn1_ua98d563_click",
       "getPSAppViewUIAction" : {
         "modelref" : true,
-        "id" : "表格界面_编辑操作"
+        "id" : "表格界面_行编辑开关操作"
       }
     }, {
       "logicTrigger" : "CUSTOM",
       "logicType" : "APPVIEWUIACTION",
-      "name" : "grid_uagridcolumn1_ua98d563_click",
+      "name" : "grid_uagridcolumn1_u479f517_click",
       "getPSAppViewUIAction" : {
         "modelref" : true,
-        "id" : "表格界面_行编辑开关操作"
+        "id" : "表格界面_编辑操作"
       }
     } ],
     "getPSAppViewUIActions" : [ {
-      "name" : "表格界面_编辑操作",
+      "name" : "表格界面_行编辑开关操作",
       "getPSUIAction" : {
         "modelref" : true,
-        "id" : "Edit"
+        "id" : "ToggleRowEdit"
       },
-      "uIActionTarget" : "SINGLEKEY",
       "xDataControlName" : "grid"
     }, {
-      "name" : "表格界面_行编辑开关操作",
+      "name" : "表格界面_编辑操作",
       "getPSUIAction" : {
         "modelref" : true,
-        "id" : "ToggleRowEdit"
+        "id" : "Edit"
       },
+      "uIActionTarget" : "SINGLEKEY",
       "xDataControlName" : "grid"
     } ],
     "getPSControlHandler" : {
@@ -618,6 +618,28 @@
         "codeName" : "A046596b6afb50f9e5b",
         "name" : "操作列",
         "getPSUIActionGroupDetails" : [ {
+          "detailType" : "DEUIACTION",
+          "name" : "ua98d563",
+          "getPSUIAction" : {
+            "caption" : "行编辑",
+            "codeName" : "ToggleRowEdit",
+            "fullCodeName" : "ToggleRowEdit",
+            "name" : "表格界面_行编辑开关操作",
+            "getPSSysImage" : {
+              "glyph" : "xf0ce@FontAwesome",
+              "cssClass" : "fa fa-table"
+            },
+            "predefinedType" : "GRIDVIEW_ROWEDITACTION",
+            "timeout" : 60000,
+            "uIActionMode" : "SYS",
+            "uIActionTag" : "ToggleRowEdit",
+            "uIActionType" : "DEUIACTION",
+            "enableToggleMode" : true
+          },
+          "addSeparator" : false,
+          "showCaption" : true,
+          "showIcon" : false
+        }, {
           "detailType" : "DEUIACTION",
           "name" : "u479f517",
           "getPSUIAction" : {
@@ -645,28 +667,6 @@
           "addSeparator" : true,
           "showCaption" : true,
           "showIcon" : true
-        }, {
-          "detailType" : "DEUIACTION",
-          "name" : "ua98d563",
-          "getPSUIAction" : {
-            "caption" : "行编辑",
-            "codeName" : "ToggleRowEdit",
-            "fullCodeName" : "ToggleRowEdit",
-            "name" : "表格界面_行编辑开关操作",
-            "getPSSysImage" : {
-              "glyph" : "xf0ce@FontAwesome",
-              "cssClass" : "fa fa-table"
-            },
-            "predefinedType" : "GRIDVIEW_ROWEDITACTION",
-            "timeout" : 60000,
-            "uIActionMode" : "SYS",
-            "uIActionTag" : "ToggleRowEdit",
-            "uIActionType" : "DEUIACTION",
-            "enableToggleMode" : true
-          },
-          "addSeparator" : false,
-          "showCaption" : true,
-          "showIcon" : false
         } ]
       },
       "width" : 100,

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoStuInfoList.json

@@ -425,34 +425,34 @@
     "getPSAppViewLogics" : [ {
       "logicTrigger" : "CUSTOM",
       "logicType" : "APPVIEWUIACTION",
-      "name" : "grid_uagridcolumn1_u479f517_click",
+      "name" : "grid_uagridcolumn1_ua98d563_click",
       "getPSAppViewUIAction" : {
         "modelref" : true,
-        "id" : "表格界面_编辑操作"
+        "id" : "表格界面_行编辑开关操作"
       }
     }, {
       "logicTrigger" : "CUSTOM",
       "logicType" : "APPVIEWUIACTION",
-      "name" : "grid_uagridcolumn1_ua98d563_click",
+      "name" : "grid_uagridcolumn1_u479f517_click",
       "getPSAppViewUIAction" : {
         "modelref" : true,
-        "id" : "表格界面_行编辑开关操作"
+        "id" : "表格界面_编辑操作"
       }
     } ],
     "getPSAppViewUIActions" : [ {
-      "name" : "表格界面_编辑操作",
+      "name" : "表格界面_行编辑开关操作",
       "getPSUIAction" : {
         "modelref" : true,
-        "id" : "Edit"
+        "id" : "ToggleRowEdit"
       },
-      "uIActionTarget" : "SINGLEKEY",
       "xDataControlName" : "grid"
     }, {
-      "name" : "表格界面_行编辑开关操作",
+      "name" : "表格界面_编辑操作",
       "getPSUIAction" : {
         "modelref" : true,
-        "id" : "ToggleRowEdit"
+        "id" : "Edit"
       },
+      "uIActionTarget" : "SINGLEKEY",
       "xDataControlName" : "grid"
     } ],
     "getPSControlHandler" : {
@@ -670,6 +670,28 @@
         "codeName" : "A046596b6afb50f9e5b",
         "name" : "操作列",
         "getPSUIActionGroupDetails" : [ {
+          "detailType" : "DEUIACTION",
+          "name" : "ua98d563",
+          "getPSUIAction" : {
+            "caption" : "行编辑",
+            "codeName" : "ToggleRowEdit",
+            "fullCodeName" : "ToggleRowEdit",
+            "name" : "表格界面_行编辑开关操作",
+            "getPSSysImage" : {
+              "glyph" : "xf0ce@FontAwesome",
+              "cssClass" : "fa fa-table"
+            },
+            "predefinedType" : "GRIDVIEW_ROWEDITACTION",
+            "timeout" : 60000,
+            "uIActionMode" : "SYS",
+            "uIActionTag" : "ToggleRowEdit",
+            "uIActionType" : "DEUIACTION",
+            "enableToggleMode" : true
+          },
+          "addSeparator" : false,
+          "showCaption" : true,
+          "showIcon" : false
+        }, {
           "detailType" : "DEUIACTION",
           "name" : "u479f517",
           "getPSUIAction" : {
@@ -697,28 +719,6 @@
           "addSeparator" : true,
           "showCaption" : true,
           "showIcon" : true
-        }, {
-          "detailType" : "DEUIACTION",
-          "name" : "ua98d563",
-          "getPSUIAction" : {
-            "caption" : "行编辑",
-            "codeName" : "ToggleRowEdit",
-            "fullCodeName" : "ToggleRowEdit",
-            "name" : "表格界面_行编辑开关操作",
-            "getPSSysImage" : {
-              "glyph" : "xf0ce@FontAwesome",
-              "cssClass" : "fa fa-table"
-            },
-            "predefinedType" : "GRIDVIEW_ROWEDITACTION",
-            "timeout" : 60000,
-            "uIActionMode" : "SYS",
-            "uIActionTag" : "ToggleRowEdit",
-            "uIActionType" : "DEUIACTION",
-            "enableToggleMode" : true
-          },
-          "addSeparator" : false,
-          "showCaption" : true,
-          "showIcon" : false
         } ]
       },
       "width" : 100,

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookBookEditViewEditorTest.json

@@ -1924,34 +1924,34 @@
               "getPSAppViewLogics" : [ {
                 "logicTrigger" : "CUSTOM",
                 "logicType" : "APPVIEWUIACTION",
-                "name" : "grid_uagridcolumn1_u479f517_click",
+                "name" : "grid_uagridcolumn1_ua98d563_click",
                 "getPSAppViewUIAction" : {
                   "modelref" : true,
-                  "id" : "表格界面_编辑操作"
+                  "id" : "表格界面_行编辑开关操作"
                 }
               }, {
                 "logicTrigger" : "CUSTOM",
                 "logicType" : "APPVIEWUIACTION",
-                "name" : "grid_uagridcolumn1_ua98d563_click",
+                "name" : "grid_uagridcolumn1_u479f517_click",
                 "getPSAppViewUIAction" : {
                   "modelref" : true,
-                  "id" : "表格界面_行编辑开关操作"
+                  "id" : "表格界面_编辑操作"
                 }
               } ],
               "getPSAppViewUIActions" : [ {
-                "name" : "表格界面_编辑操作",
+                "name" : "表格界面_行编辑开关操作",
                 "getPSUIAction" : {
                   "modelref" : true,
-                  "id" : "Edit"
+                  "id" : "ToggleRowEdit"
                 },
-                "uIActionTarget" : "SINGLEKEY",
                 "xDataControlName" : "grid"
               }, {
-                "name" : "表格界面_行编辑开关操作",
+                "name" : "表格界面_编辑操作",
                 "getPSUIAction" : {
                   "modelref" : true,
-                  "id" : "ToggleRowEdit"
+                  "id" : "Edit"
                 },
+                "uIActionTarget" : "SINGLEKEY",
                 "xDataControlName" : "grid"
               } ],
               "getPSControlHandler" : {
@@ -2169,6 +2169,28 @@
                   "codeName" : "A046596b6afb50f9e5b",
                   "name" : "操作列",
                   "getPSUIActionGroupDetails" : [ {
+                    "detailType" : "DEUIACTION",
+                    "name" : "ua98d563",
+                    "getPSUIAction" : {
+                      "caption" : "行编辑",
+                      "codeName" : "ToggleRowEdit",
+                      "fullCodeName" : "ToggleRowEdit",
+                      "name" : "表格界面_行编辑开关操作",
+                      "getPSSysImage" : {
+                        "glyph" : "xf0ce@FontAwesome",
+                        "cssClass" : "fa fa-table"
+                      },
+                      "predefinedType" : "GRIDVIEW_ROWEDITACTION",
+                      "timeout" : 60000,
+                      "uIActionMode" : "SYS",
+                      "uIActionTag" : "ToggleRowEdit",
+                      "uIActionType" : "DEUIACTION",
+                      "enableToggleMode" : true
+                    },
+                    "addSeparator" : false,
+                    "showCaption" : true,
+                    "showIcon" : false
+                  }, {
                     "detailType" : "DEUIACTION",
                     "name" : "u479f517",
                     "getPSUIAction" : {
@@ -2196,28 +2218,6 @@
                     "addSeparator" : true,
                     "showCaption" : true,
                     "showIcon" : true
-                  }, {
-                    "detailType" : "DEUIACTION",
-                    "name" : "ua98d563",
-                    "getPSUIAction" : {
-                      "caption" : "行编辑",
-                      "codeName" : "ToggleRowEdit",
-                      "fullCodeName" : "ToggleRowEdit",
-                      "name" : "表格界面_行编辑开关操作",
-                      "getPSSysImage" : {
-                        "glyph" : "xf0ce@FontAwesome",
-                        "cssClass" : "fa fa-table"
-                      },
-                      "predefinedType" : "GRIDVIEW_ROWEDITACTION",
-                      "timeout" : 60000,
-                      "uIActionMode" : "SYS",
-                      "uIActionTag" : "ToggleRowEdit",
-                      "uIActionType" : "DEUIACTION",
-                      "enableToggleMode" : true
-                    },
-                    "addSeparator" : false,
-                    "showCaption" : true,
-                    "showIcon" : false
                   } ]
                 },
                 "width" : 100,

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookDefaultDataView.json

@@ -376,6 +376,9 @@
         "name" : "FIELD2",
         "codeName" : "Field2"
       }
+    }, {
+      "dataType" : 25,
+      "name" : "srfmstag"
     } ],
     "pagingSize" : 1000,
     "getRemovePSControlAction" : {

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookGridView.json

@@ -644,6 +644,9 @@
         "name" : "FIELD2",
         "codeName" : "Field2"
       }
+    }, {
+      "dataType" : 25,
+      "name" : "srfmstag"
     } ],
     "getPSDEGridEditItems" : [ {
       "caption" : "属性9",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr0815395468DataViewExpView.json

@@ -245,6 +245,9 @@
           "name" : "FIELD2",
           "codeName" : "Field2"
         }
+      }, {
+        "dataType" : 25,
+        "name" : "srfmstag"
       } ],
       "pagingSize" : 1000,
       "getRemovePSControlAction" : {

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr2GridView.json

@@ -618,6 +618,9 @@
         "name" : "FIELD2",
         "codeName" : "Field2"
       }
+    }, {
+      "dataType" : 25,
+      "name" : "srfmstag"
     } ],
     "getPSDEGridEditItemUpdates" : [ {
       "codeName" : "test11",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/studentEditView.json

@@ -1566,34 +1566,34 @@
             "getPSAppViewLogics" : [ {
               "logicTrigger" : "CUSTOM",
               "logicType" : "APPVIEWUIACTION",
-              "name" : "grid_uagridcolumn1_u479f517_click",
+              "name" : "grid_uagridcolumn1_ua98d563_click",
               "getPSAppViewUIAction" : {
                 "modelref" : true,
-                "id" : "表格界面_编辑操作"
+                "id" : "表格界面_行编辑开关操作"
               }
             }, {
               "logicTrigger" : "CUSTOM",
               "logicType" : "APPVIEWUIACTION",
-              "name" : "grid_uagridcolumn1_ua98d563_click",
+              "name" : "grid_uagridcolumn1_u479f517_click",
               "getPSAppViewUIAction" : {
                 "modelref" : true,
-                "id" : "表格界面_行编辑开关操作"
+                "id" : "表格界面_编辑操作"
               }
             } ],
             "getPSAppViewUIActions" : [ {
-              "name" : "表格界面_编辑操作",
+              "name" : "表格界面_行编辑开关操作",
               "getPSUIAction" : {
                 "modelref" : true,
-                "id" : "Edit"
+                "id" : "ToggleRowEdit"
               },
-              "uIActionTarget" : "SINGLEKEY",
               "xDataControlName" : "grid"
             }, {
-              "name" : "表格界面_行编辑开关操作",
+              "name" : "表格界面_编辑操作",
               "getPSUIAction" : {
                 "modelref" : true,
-                "id" : "ToggleRowEdit"
+                "id" : "Edit"
               },
+              "uIActionTarget" : "SINGLEKEY",
               "xDataControlName" : "grid"
             } ],
             "getPSControlHandler" : {
@@ -1811,6 +1811,28 @@
                 "codeName" : "A046596b6afb50f9e5b",
                 "name" : "操作列",
                 "getPSUIActionGroupDetails" : [ {
+                  "detailType" : "DEUIACTION",
+                  "name" : "ua98d563",
+                  "getPSUIAction" : {
+                    "caption" : "行编辑",
+                    "codeName" : "ToggleRowEdit",
+                    "fullCodeName" : "ToggleRowEdit",
+                    "name" : "表格界面_行编辑开关操作",
+                    "getPSSysImage" : {
+                      "glyph" : "xf0ce@FontAwesome",
+                      "cssClass" : "fa fa-table"
+                    },
+                    "predefinedType" : "GRIDVIEW_ROWEDITACTION",
+                    "timeout" : 60000,
+                    "uIActionMode" : "SYS",
+                    "uIActionTag" : "ToggleRowEdit",
+                    "uIActionType" : "DEUIACTION",
+                    "enableToggleMode" : true
+                  },
+                  "addSeparator" : false,
+                  "showCaption" : true,
+                  "showIcon" : false
+                }, {
                   "detailType" : "DEUIACTION",
                   "name" : "u479f517",
                   "getPSUIAction" : {
@@ -1838,28 +1860,6 @@
                   "addSeparator" : true,
                   "showCaption" : true,
                   "showIcon" : true
-                }, {
-                  "detailType" : "DEUIACTION",
-                  "name" : "ua98d563",
-                  "getPSUIAction" : {
-                    "caption" : "行编辑",
-                    "codeName" : "ToggleRowEdit",
-                    "fullCodeName" : "ToggleRowEdit",
-                    "name" : "表格界面_行编辑开关操作",
-                    "getPSSysImage" : {
-                      "glyph" : "xf0ce@FontAwesome",
-                      "cssClass" : "fa fa-table"
-                    },
-                    "predefinedType" : "GRIDVIEW_ROWEDITACTION",
-                    "timeout" : 60000,
-                    "uIActionMode" : "SYS",
-                    "uIActionTag" : "ToggleRowEdit",
-                    "uIActionType" : "DEUIACTION",
-                    "enableToggleMode" : true
-                  },
-                  "addSeparator" : false,
-                  "showCaption" : true,
-                  "showIcon" : false
                 } ]
               },
               "width" : 100,