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

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

@@ -169,7 +169,7 @@
     </changeSet>
 
     <!--输出实体[PHONE]数据结构 -->
-    <changeSet author="root" id="tab-phone-253-6">
+    <changeSet author="root" id="tab-phone-255-6">
         <createTable tableName="T_PHONE">
                 <column name="PHONEID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_PHONE"/>
@@ -268,7 +268,7 @@
     </changeSet>
 
     <!--输出实体[STUDENT]数据结构 -->
-    <changeSet author="root" id="tab-student-79-10">
+    <changeSet author="root" id="tab-student-80-10">
         <createTable tableName="T_STUDENT">
                 <column name="CREATEMAN" remarks="" type="VARCHAR(60)">
                 </column>

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

@@ -2211,6 +2211,14 @@
     "rTMOSFilePath" : "psmodeldata$psdataentities/EditView2",
     "realModelSubType" : "DEEDITVIEW2",
     "realModelType" : "PSDEVIEWBASE"
+  }, {
+    "codeName" : "GridExpView",
+    "logicName" : "手机实体表格导航视图",
+    "mOSFilePath" : "psmodeldata$psdataentities/GridExpView",
+    "name" : "手机实体表格导航视图",
+    "rTMOSFilePath" : "psmodeldata$psdataentities/GridExpView",
+    "realModelSubType" : "DEGRIDEXPVIEW",
+    "realModelType" : "PSDEVIEWBASE"
   }, {
     "codeName" : "PickupView",
     "logicName" : "手机实体数据选择视图",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/Phone.json

@@ -136,6 +136,10 @@
     "modelref" : true,
     "path" : "PSSYSAPPS/TemplatePublish/PSAPPDEVIEWS/phoneUsr2EditView.json",
     "viewType" : "DEEDITVIEW"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/TemplatePublish/PSAPPDEVIEWS/phoneGridExpView.json",
+    "viewType" : "DEGRIDEXPVIEW"
   } ],
   "getAllPSDEOPPrivs" : [ {
     "logicName" : "建立",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSSYSAPP.json

@@ -982,16 +982,16 @@
     "mOSFilePath" : "pssysapps/TemplatePublish/psappviewmsggroups/VMGroup2",
     "name" : "视图消息组2",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息2",
+      "name" : "视图消息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
       }
     }, {
-      "name" : "视图消息",
+      "name" : "视图消息2",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
       }
     } ],
     "rTMOSFilePath" : "pssysapps/TemplatePublish/psappviewmsggroups/VMGroup2"
@@ -1110,6 +1110,12 @@
     "viewType" : "DEEDITVIEW",
     "resource" : "Phone",
     "view" : "Usr2EditView"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/TemplatePublish/PSAPPDEVIEWS/phoneGridExpView.json",
+    "viewType" : "DEGRIDEXPVIEW",
+    "resource" : "Phone",
+    "view" : "GridExpView"
   } ],
   "getAllPSDEOPPrivs" : [ {
     "logicName" : "建立",
@@ -3803,6 +3809,10 @@
         "modelref" : true,
         "path" : "PSSYSAPPS/TemplatePublish/PSAPPDEVIEWS/phoneUsr2EditView.json",
         "viewType" : "DEEDITVIEW"
+      }, {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/TemplatePublish/PSAPPDEVIEWS/phoneGridExpView.json",
+        "viewType" : "DEGRIDEXPVIEW"
       } ],
       "getAllPSDEOPPrivs" : [ {
         "logicName" : "建立",

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

@@ -2812,6 +2812,60 @@
     "requestParamType" : "ENTITY",
     "requestPath" : "/select",
     "builtinMethod" : false
+  }, {
+    "codeName" : "WFClose",
+    "methodType" : "WFACTION",
+    "name" : "WFCLOSE",
+    "rTMOSFilePath" : "pssysapps/Web/psappdataentities/Book/psappdemethods/WFClose",
+    "builtinMethod" : true
+  }, {
+    "codeName" : "WFGoto",
+    "methodType" : "WFACTION",
+    "name" : "WFGOTO",
+    "rTMOSFilePath" : "pssysapps/Web/psappdataentities/Book/psappdemethods/WFGoto",
+    "builtinMethod" : true
+  }, {
+    "codeName" : "WFMarkRead",
+    "methodType" : "WFACTION",
+    "name" : "WFMARKREAD",
+    "rTMOSFilePath" : "pssysapps/Web/psappdataentities/Book/psappdemethods/WFMarkRead",
+    "builtinMethod" : true
+  }, {
+    "codeName" : "WFReassign",
+    "methodType" : "WFACTION",
+    "name" : "WFREASSIGN",
+    "rTMOSFilePath" : "pssysapps/Web/psappdataentities/Book/psappdemethods/WFReassign",
+    "builtinMethod" : true
+  }, {
+    "codeName" : "WFRestart",
+    "methodType" : "WFACTION",
+    "name" : "WFRESTART",
+    "rTMOSFilePath" : "pssysapps/Web/psappdataentities/Book/psappdemethods/WFRestart",
+    "builtinMethod" : true
+  }, {
+    "codeName" : "WFRollback",
+    "methodType" : "WFACTION",
+    "name" : "WFROLLBACK",
+    "rTMOSFilePath" : "pssysapps/Web/psappdataentities/Book/psappdemethods/WFRollback",
+    "builtinMethod" : true
+  }, {
+    "codeName" : "WFSendBack",
+    "methodType" : "WFACTION",
+    "name" : "WFSENDBACK",
+    "rTMOSFilePath" : "pssysapps/Web/psappdataentities/Book/psappdemethods/WFSendBack",
+    "builtinMethod" : true
+  }, {
+    "codeName" : "WFStart",
+    "methodType" : "WFACTION",
+    "name" : "WFSTART",
+    "rTMOSFilePath" : "pssysapps/Web/psappdataentities/Book/psappdemethods/WFStart",
+    "builtinMethod" : true
+  }, {
+    "codeName" : "WFSubmit",
+    "methodType" : "WFACTION",
+    "name" : "WFSUBMIT",
+    "rTMOSFilePath" : "pssysapps/Web/psappdataentities/Book/psappdemethods/WFSubmit",
+    "builtinMethod" : true
   } ],
   "getAllPSAppDEUILogics" : [ {
     "codeName" : "test",
@@ -3088,6 +3142,6 @@
   "enableUICreate" : true,
   "enableUIModify" : true,
   "enableUIRemove" : true,
-  "enableWFActions" : false,
+  "enableWFActions" : true,
   "major" : true
 }
\ No newline at end of file

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

@@ -3780,11 +3780,11 @@
   },
   "getWFStartPSControlAction" : {
     "modelref" : true,
-    "id" : "WFSTART"
+    "id" : "wfstart"
   },
   "getWFSubmitPSControlAction" : {
     "modelref" : true,
-    "id" : "WFSUBMIT"
+    "id" : "wfsubmit"
   },
   "noTabHeader" : false,
   "modelid" : "228C9548-3E8F-4CBC-9E21-07EBCC596865",

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

@@ -44,11 +44,11 @@
   },
   "getWFStartPSControlAction" : {
     "modelref" : true,
-    "id" : "WFSTART"
+    "id" : "wfstart"
   },
   "getWFSubmitPSControlAction" : {
     "modelref" : true,
-    "id" : "WFSUBMIT"
+    "id" : "wfsubmit"
   },
   "noTabHeader" : false,
   "modelid" : "ff1fe450591e81f2b7a0cc41f0559e8f_form",

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

@@ -1195,11 +1195,11 @@
   },
   "getWFStartPSControlAction" : {
     "modelref" : true,
-    "id" : "WFSTART"
+    "id" : "wfstart"
   },
   "getWFSubmitPSControlAction" : {
     "modelref" : true,
-    "id" : "WFSUBMIT"
+    "id" : "wfsubmit"
   },
   "noTabHeader" : false,
   "modelid" : "30e57e03ffaa6be25a9d764accc12b56",

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

@@ -19,35 +19,35 @@
   "getPSAppViewLogics" : [ {
     "logicTrigger" : "CUSTOM",
     "logicType" : "APPVIEWUIACTION",
-    "name" : "grid_uagridcolumn1_u1feafb4_click",
+    "name" : "grid_uagridcolumn1_u4c6267d_click",
     "getPSAppViewUIAction" : {
       "modelref" : true,
-      "id" : "表格界面_编辑操作"
+      "id" : "表格界面_删除操作"
     }
   }, {
     "logicTrigger" : "CUSTOM",
     "logicType" : "APPVIEWUIACTION",
-    "name" : "grid_uagridcolumn1_u4c6267d_click",
+    "name" : "grid_uagridcolumn1_u1feafb4_click",
     "getPSAppViewUIAction" : {
       "modelref" : true,
-      "id" : "表格界面_删除操作"
+      "id" : "表格界面_编辑操作"
     }
   } ],
   "getPSAppViewUIActions" : [ {
-    "name" : "表格界面_编辑操作",
+    "name" : "表格界面_删除操作",
     "getPSUIAction" : {
       "modelref" : true,
-      "id" : "Edit"
+      "id" : "Remove"
     },
-    "uIActionTarget" : "SINGLEKEY",
+    "uIActionTarget" : "MULTIKEY",
     "xDataControlName" : "grid"
   }, {
-    "name" : "表格界面_删除操作",
+    "name" : "表格界面_编辑操作",
     "getPSUIAction" : {
       "modelref" : true,
-      "id" : "Remove"
+      "id" : "Edit"
     },
-    "uIActionTarget" : "MULTIKEY",
+    "uIActionTarget" : "SINGLEKEY",
     "xDataControlName" : "grid"
   } ],
   "getPSControlLogics" : [ {
@@ -168,40 +168,6 @@
     "getPSDEUIActionGroup" : {
       "name" : "界面行为组",
       "getPSUIActionGroupDetails" : [ {
-        "detailType" : "DEUIACTION",
-        "name" : "u1feafb4",
-        "getPSUIAction" : {
-          "actionTarget" : "SINGLEKEY",
-          "getCapPSLanguageRes" : {
-            "lanResTag" : "TBB.TEXT.*.EDIT",
-            "mOSFilePath" : "pslanguageres/Auto253",
-            "rTMOSFilePath" : "pslanguageres/Auto253"
-          },
-          "caption" : "编辑",
-          "codeName" : "Edit",
-          "fullCodeName" : "Edit",
-          "mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/Edit",
-          "name" : "表格界面_编辑操作",
-          "getPSSysImage" : {
-            "glyph" : "xf044@FontAwesome",
-            "cssClass" : "fa fa-edit"
-          },
-          "predefinedType" : "GRIDVIEW_EDITACTION",
-          "rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/Edit",
-          "timeout" : 60000,
-          "getTooltipPSLanguageRes" : {
-            "lanResTag" : "TBB.TOOLTIP.*.EDIT",
-            "mOSFilePath" : "pslanguageres/Auto130",
-            "rTMOSFilePath" : "pslanguageres/Auto130"
-          },
-          "uIActionMode" : "SYS",
-          "uIActionTag" : "Edit",
-          "uIActionType" : "DEUIACTION"
-        },
-        "addSeparator" : true,
-        "showCaption" : true,
-        "showIcon" : false
-      }, {
         "detailType" : "DEUIACTION",
         "name" : "u4c6267d",
         "getPSUIAction" : {
@@ -235,6 +201,40 @@
         "addSeparator" : true,
         "showCaption" : false,
         "showIcon" : true
+      }, {
+        "detailType" : "DEUIACTION",
+        "name" : "u1feafb4",
+        "getPSUIAction" : {
+          "actionTarget" : "SINGLEKEY",
+          "getCapPSLanguageRes" : {
+            "lanResTag" : "TBB.TEXT.*.EDIT",
+            "mOSFilePath" : "pslanguageres/Auto253",
+            "rTMOSFilePath" : "pslanguageres/Auto253"
+          },
+          "caption" : "编辑",
+          "codeName" : "Edit",
+          "fullCodeName" : "Edit",
+          "mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/Edit",
+          "name" : "表格界面_编辑操作",
+          "getPSSysImage" : {
+            "glyph" : "xf044@FontAwesome",
+            "cssClass" : "fa fa-edit"
+          },
+          "predefinedType" : "GRIDVIEW_EDITACTION",
+          "rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/Edit",
+          "timeout" : 60000,
+          "getTooltipPSLanguageRes" : {
+            "lanResTag" : "TBB.TOOLTIP.*.EDIT",
+            "mOSFilePath" : "pslanguageres/Auto130",
+            "rTMOSFilePath" : "pslanguageres/Auto130"
+          },
+          "uIActionMode" : "SYS",
+          "uIActionTag" : "Edit",
+          "uIActionType" : "DEUIACTION"
+        },
+        "addSeparator" : true,
+        "showCaption" : true,
+        "showIcon" : false
       } ]
     },
     "rTMOSFilePath" : "psdegridcols/uagridcolumn1",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone/PSCALENDARS/Test.json

+{
+  "calendarStyle" : "MONTH",
+  "codeName" : "Test",
+  "controlType" : "CALENDAR",
+  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone/PSCALENDARS/Test.json",
+  "groupMode" : "NONE",
+  "legendPos" : "NONE",
+  "logicName" : "test",
+  "mOSFilePath" : "psmodules/common/psdataentities/PHONE/pssyscalendars/Test",
+  "getPSAppDataEntity" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone.json"
+  },
+  "rTMOSFilePath" : "pssysapps/Web/psappdeviews/studentCalendarView/psappviewctrls/calendar",
+  "enableGroup" : false,
+  "modelid" : "C10C79E5-8EFD-4A5E-B0C6-E5DC49DA3E89",
+  "modeltype" : "PSSYSCALENDAR"
+}
\ No newline at end of file

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

@@ -25,35 +25,35 @@
   "getPSAppViewLogics" : [ {
     "logicTrigger" : "CUSTOM",
     "logicType" : "APPVIEWUIACTION",
-    "name" : "db_sysportlet2_list_field_u1feafb4_click",
+    "name" : "db_sysportlet2_list_field_u4c6267d_click",
     "getPSAppViewUIAction" : {
       "modelref" : true,
-      "id" : "表格界面_编辑操作"
+      "id" : "表格界面_删除操作"
     }
   }, {
     "logicTrigger" : "CUSTOM",
     "logicType" : "APPVIEWUIACTION",
-    "name" : "db_sysportlet2_list_field_u4c6267d_click",
+    "name" : "db_sysportlet2_list_field_u1feafb4_click",
     "getPSAppViewUIAction" : {
       "modelref" : true,
-      "id" : "表格界面_删除操作"
+      "id" : "表格界面_编辑操作"
     }
   } ],
   "getPSAppViewUIActions" : [ {
-    "name" : "表格界面_编辑操作",
+    "name" : "表格界面_删除操作",
     "getPSUIAction" : {
       "modelref" : true,
-      "id" : "Edit"
+      "id" : "Remove"
     },
-    "uIActionTarget" : "SINGLEKEY",
+    "uIActionTarget" : "MULTIKEY",
     "xDataControlName" : "db_sysportlet2_list"
   }, {
-    "name" : "表格界面_删除操作",
+    "name" : "表格界面_编辑操作",
     "getPSUIAction" : {
       "modelref" : true,
-      "id" : "Remove"
+      "id" : "Edit"
     },
-    "uIActionTarget" : "MULTIKEY",
+    "uIActionTarget" : "SINGLEKEY",
     "xDataControlName" : "db_sysportlet2_list"
   } ],
   "getPSDEListDataItems" : [ {
@@ -104,40 +104,6 @@
     "getPSDEUIActionGroup" : {
       "name" : "界面行为组",
       "getPSUIActionGroupDetails" : [ {
-        "detailType" : "DEUIACTION",
-        "name" : "u1feafb4",
-        "getPSUIAction" : {
-          "actionTarget" : "SINGLEKEY",
-          "getCapPSLanguageRes" : {
-            "lanResTag" : "TBB.TEXT.*.EDIT",
-            "mOSFilePath" : "pslanguageres/Auto253",
-            "rTMOSFilePath" : "pslanguageres/Auto253"
-          },
-          "caption" : "编辑",
-          "codeName" : "Edit",
-          "fullCodeName" : "Edit",
-          "mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/Edit",
-          "name" : "表格界面_编辑操作",
-          "getPSSysImage" : {
-            "glyph" : "xf044@FontAwesome",
-            "cssClass" : "fa fa-edit"
-          },
-          "predefinedType" : "GRIDVIEW_EDITACTION",
-          "rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/Edit",
-          "timeout" : 60000,
-          "getTooltipPSLanguageRes" : {
-            "lanResTag" : "TBB.TOOLTIP.*.EDIT",
-            "mOSFilePath" : "pslanguageres/Auto130",
-            "rTMOSFilePath" : "pslanguageres/Auto130"
-          },
-          "uIActionMode" : "SYS",
-          "uIActionTag" : "Edit",
-          "uIActionType" : "DEUIACTION"
-        },
-        "addSeparator" : true,
-        "showCaption" : true,
-        "showIcon" : false
-      }, {
         "detailType" : "DEUIACTION",
         "name" : "u4c6267d",
         "getPSUIAction" : {
@@ -171,6 +137,40 @@
         "addSeparator" : true,
         "showCaption" : false,
         "showIcon" : true
+      }, {
+        "detailType" : "DEUIACTION",
+        "name" : "u1feafb4",
+        "getPSUIAction" : {
+          "actionTarget" : "SINGLEKEY",
+          "getCapPSLanguageRes" : {
+            "lanResTag" : "TBB.TEXT.*.EDIT",
+            "mOSFilePath" : "pslanguageres/Auto253",
+            "rTMOSFilePath" : "pslanguageres/Auto253"
+          },
+          "caption" : "编辑",
+          "codeName" : "Edit",
+          "fullCodeName" : "Edit",
+          "mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/Edit",
+          "name" : "表格界面_编辑操作",
+          "getPSSysImage" : {
+            "glyph" : "xf044@FontAwesome",
+            "cssClass" : "fa fa-edit"
+          },
+          "predefinedType" : "GRIDVIEW_EDITACTION",
+          "rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/Edit",
+          "timeout" : 60000,
+          "getTooltipPSLanguageRes" : {
+            "lanResTag" : "TBB.TOOLTIP.*.EDIT",
+            "mOSFilePath" : "pslanguageres/Auto130",
+            "rTMOSFilePath" : "pslanguageres/Auto130"
+          },
+          "uIActionMode" : "SYS",
+          "uIActionTag" : "Edit",
+          "uIActionType" : "DEUIACTION"
+        },
+        "addSeparator" : true,
+        "showCaption" : true,
+        "showIcon" : false
       } ]
     },
     "width" : 150,

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

@@ -290,6 +290,10 @@
     },
     "xDataControlName" : "form"
   } ],
+  "getPSAppWF" : {
+    "modelref" : true,
+    "id" : "testWf"
+  },
   "getPSControls" : [ {
     "codeName" : "BookEditViewEditorTesttoolbar",
     "controlType" : "TOOLBAR",
@@ -1192,7 +1196,11 @@
       }, {
         "actionName" : "WFSTART",
         "actionType" : "WFACTION",
-        "name" : "WFSTART",
+        "name" : "wfstart",
+        "getPSAppDEMethod" : {
+          "modelref" : true,
+          "id" : "WFStart"
+        },
         "getPSAppDataEntity" : {
           "modelref" : true,
           "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
@@ -1200,7 +1208,11 @@
       }, {
         "actionName" : "WFSUBMIT",
         "actionType" : "WFACTION",
-        "name" : "WFSUBMIT",
+        "name" : "wfsubmit",
+        "getPSAppDEMethod" : {
+          "modelref" : true,
+          "id" : "WFSubmit"
+        },
         "getPSAppDataEntity" : {
           "modelref" : true,
           "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
@@ -4968,11 +4980,11 @@
     },
     "getWFStartPSControlAction" : {
       "modelref" : true,
-      "id" : "WFSTART"
+      "id" : "wfstart"
     },
     "getWFSubmitPSControlAction" : {
       "modelref" : true,
-      "id" : "WFSUBMIT"
+      "id" : "wfsubmit"
     },
     "noTabHeader" : false,
     "name" : "form",

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

@@ -15,6 +15,10 @@
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPMODULES/common.json"
   },
+  "getPSAppWF" : {
+    "modelref" : true,
+    "id" : "testWf"
+  },
   "getPSControls" : [ {
     "codeName" : "Main",
     "controlType" : "FORM",
@@ -120,7 +124,11 @@
       }, {
         "actionName" : "WFSTART",
         "actionType" : "WFACTION",
-        "name" : "WFSTART",
+        "name" : "wfstart",
+        "getPSAppDEMethod" : {
+          "modelref" : true,
+          "id" : "WFStart"
+        },
         "getPSAppDataEntity" : {
           "modelref" : true,
           "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
@@ -128,7 +136,11 @@
       }, {
         "actionName" : "WFSUBMIT",
         "actionType" : "WFACTION",
-        "name" : "WFSUBMIT",
+        "name" : "wfsubmit",
+        "getPSAppDEMethod" : {
+          "modelref" : true,
+          "id" : "WFSubmit"
+        },
         "getPSAppDataEntity" : {
           "modelref" : true,
           "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
@@ -1301,11 +1313,11 @@
     },
     "getWFStartPSControlAction" : {
       "modelref" : true,
-      "id" : "WFSTART"
+      "id" : "wfstart"
     },
     "getWFSubmitPSControlAction" : {
       "modelref" : true,
-      "id" : "WFSUBMIT"
+      "id" : "wfsubmit"
     },
     "noTabHeader" : false,
     "name" : "form",

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

@@ -114,6 +114,10 @@
       "viewType" : "DEEDITVIEW"
     }
   } ],
+  "getPSAppWF" : {
+    "modelref" : true,
+    "id" : "testWf"
+  },
   "getPSControls" : [ {
     "codeName" : "Default",
     "controlType" : "SEARCHFORM",

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

@@ -114,6 +114,10 @@
       "viewType" : "DEEDITVIEW"
     }
   } ],
+  "getPSAppWF" : {
+    "modelref" : true,
+    "id" : "testWf"
+  },
   "getPSControls" : [ {
     "codeName" : "DefaultDataViewtoolbar",
     "controlType" : "TOOLBAR",

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

@@ -291,6 +291,10 @@
     },
     "xDataControlName" : "form"
   } ],
+  "getPSAppWF" : {
+    "modelref" : true,
+    "id" : "testWf"
+  },
   "getPSControls" : [ {
     "codeName" : "EditViewtoolbar",
     "controlType" : "TOOLBAR",
@@ -1193,7 +1197,11 @@
       }, {
         "actionName" : "WFSTART",
         "actionType" : "WFACTION",
-        "name" : "WFSTART",
+        "name" : "wfstart",
+        "getPSAppDEMethod" : {
+          "modelref" : true,
+          "id" : "WFStart"
+        },
         "getPSAppDataEntity" : {
           "modelref" : true,
           "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
@@ -1201,7 +1209,11 @@
       }, {
         "actionName" : "WFSUBMIT",
         "actionType" : "WFACTION",
-        "name" : "WFSUBMIT",
+        "name" : "wfsubmit",
+        "getPSAppDEMethod" : {
+          "modelref" : true,
+          "id" : "WFSubmit"
+        },
         "getPSAppDataEntity" : {
           "modelref" : true,
           "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
@@ -2388,11 +2400,11 @@
     },
     "getWFStartPSControlAction" : {
       "modelref" : true,
-      "id" : "WFSTART"
+      "id" : "wfstart"
     },
     "getWFSubmitPSControlAction" : {
       "modelref" : true,
-      "id" : "WFSUBMIT"
+      "id" : "wfsubmit"
     },
     "noTabHeader" : false,
     "name" : "form",

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

@@ -32,6 +32,10 @@
       "paramType" : "CTRL"
     } ]
   } ],
+  "getPSAppWF" : {
+    "modelref" : true,
+    "id" : "testWf"
+  },
   "getPSControls" : [ {
     "codeName" : "Default",
     "controlType" : "DRTAB",
@@ -196,7 +200,11 @@
       }, {
         "actionName" : "WFSTART",
         "actionType" : "WFACTION",
-        "name" : "WFSTART",
+        "name" : "wfstart",
+        "getPSAppDEMethod" : {
+          "modelref" : true,
+          "id" : "WFStart"
+        },
         "getPSAppDataEntity" : {
           "modelref" : true,
           "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
@@ -204,7 +212,11 @@
       }, {
         "actionName" : "WFSUBMIT",
         "actionType" : "WFACTION",
-        "name" : "WFSUBMIT",
+        "name" : "wfsubmit",
+        "getPSAppDEMethod" : {
+          "modelref" : true,
+          "id" : "WFSubmit"
+        },
         "getPSAppDataEntity" : {
           "modelref" : true,
           "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
@@ -1387,11 +1399,11 @@
     },
     "getWFStartPSControlAction" : {
       "modelref" : true,
-      "id" : "WFSTART"
+      "id" : "wfstart"
     },
     "getWFSubmitPSControlAction" : {
       "modelref" : true,
-      "id" : "WFSUBMIT"
+      "id" : "wfsubmit"
     },
     "noTabHeader" : false,
     "name" : "form",

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

@@ -355,6 +355,10 @@
     },
     "xDataControlName" : "grid"
   } ],
+  "getPSAppWF" : {
+    "modelref" : true,
+    "id" : "testWf"
+  },
   "getPSControls" : [ {
     "aggMode" : "NONE",
     "codeName" : "Main",

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

@@ -91,6 +91,10 @@
       "viewType" : "DEEDITVIEW"
     }
   } ],
+  "getPSAppWF" : {
+    "modelref" : true,
+    "id" : "testWf"
+  },
   "getPSControls" : [ {
     "codeName" : "Map",
     "controlType" : "MAP",

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

@@ -13,6 +13,10 @@
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPMODULES/common.json"
   },
+  "getPSAppWF" : {
+    "modelref" : true,
+    "id" : "testWf"
+  },
   "getPSControls" : [ {
     "codeName" : "Default",
     "controlType" : "DRTAB",
@@ -165,7 +169,11 @@
       }, {
         "actionName" : "WFSTART",
         "actionType" : "WFACTION",
-        "name" : "WFSTART",
+        "name" : "wfstart",
+        "getPSAppDEMethod" : {
+          "modelref" : true,
+          "id" : "WFStart"
+        },
         "getPSAppDataEntity" : {
           "modelref" : true,
           "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
@@ -173,7 +181,11 @@
       }, {
         "actionName" : "WFSUBMIT",
         "actionType" : "WFACTION",
-        "name" : "WFSUBMIT",
+        "name" : "wfsubmit",
+        "getPSAppDEMethod" : {
+          "modelref" : true,
+          "id" : "WFSubmit"
+        },
         "getPSAppDataEntity" : {
           "modelref" : true,
           "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
@@ -207,11 +219,11 @@
     },
     "getWFStartPSControlAction" : {
       "modelref" : true,
-      "id" : "WFSTART"
+      "id" : "wfstart"
     },
     "getWFSubmitPSControlAction" : {
       "modelref" : true,
-      "id" : "WFSUBMIT"
+      "id" : "wfsubmit"
     },
     "noTabHeader" : false,
     "name" : "form",

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

@@ -28,6 +28,10 @@
       "value" : 0
     } ]
   } ],
+  "getPSAppWF" : {
+    "modelref" : true,
+    "id" : "testWf"
+  },
   "getPSControls" : [ {
     "codeName" : "Main",
     "controlType" : "FORM",
@@ -134,7 +138,11 @@
       }, {
         "actionName" : "WFSTART",
         "actionType" : "WFACTION",
-        "name" : "WFSTART",
+        "name" : "wfstart",
+        "getPSAppDEMethod" : {
+          "modelref" : true,
+          "id" : "WFStart"
+        },
         "getPSAppDataEntity" : {
           "modelref" : true,
           "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
@@ -142,7 +150,11 @@
       }, {
         "actionName" : "WFSUBMIT",
         "actionType" : "WFACTION",
-        "name" : "WFSUBMIT",
+        "name" : "wfsubmit",
+        "getPSAppDEMethod" : {
+          "modelref" : true,
+          "id" : "WFSubmit"
+        },
         "getPSAppDataEntity" : {
           "modelref" : true,
           "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
@@ -1325,11 +1337,11 @@
     },
     "getWFStartPSControlAction" : {
       "modelref" : true,
-      "id" : "WFSTART"
+      "id" : "wfstart"
     },
     "getWFSubmitPSControlAction" : {
       "modelref" : true,
-      "id" : "WFSUBMIT"
+      "id" : "wfsubmit"
     },
     "noTabHeader" : false,
     "name" : "form",

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

@@ -19,6 +19,10 @@
     "mOSFilePath" : "pssysapps/Web/psappdeviews/bookTabExpView/psappviewengines/engine",
     "name" : "engine"
   } ],
+  "getPSAppWF" : {
+    "modelref" : true,
+    "id" : "testWf"
+  },
   "getPSControls" : [ {
     "codeName" : "TabExpViewtabexppanel",
     "controlType" : "TABEXPPANEL",
@@ -419,6 +423,10 @@
           },
           "xDataControlName" : "grid"
         } ],
+        "getPSAppWF" : {
+          "modelref" : true,
+          "id" : "testWf"
+        },
         "getPSControls" : [ {
           "aggMode" : "NONE",
           "codeName" : "Main",

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

@@ -48,6 +48,10 @@
       "editMode" : true
     }
   } ],
+  "getPSAppWF" : {
+    "modelref" : true,
+    "id" : "testWf"
+  },
   "getPSControls" : [ {
     "codeName" : "Usr0815395468DataViewExpViewdataviewexpbar",
     "controlType" : "DATAVIEWEXPBAR",

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

@@ -114,6 +114,10 @@
       "viewType" : "DEEDITVIEW"
     }
   } ],
+  "getPSAppWF" : {
+    "modelref" : true,
+    "id" : "testWf"
+  },
   "getPSControls" : [ {
     "codeName" : "Default",
     "controlType" : "SEARCHFORM",

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

@@ -114,6 +114,10 @@
       "viewType" : "DEEDITVIEW"
     }
   } ],
+  "getPSAppWF" : {
+    "modelref" : true,
+    "id" : "testWf"
+  },
   "getPSControls" : [ {
     "aggMode" : "NONE",
     "codeName" : "TestEditorGrid",

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

@@ -13,6 +13,10 @@
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPMODULES/common.json"
   },
+  "getPSAppWF" : {
+    "modelref" : true,
+    "id" : "testWf"
+  },
   "getPSDEViewCodeName" : "Usr2RedirectView",
   "getPSDEViewId" : "44ED3625-7939-495C-B1E2-CB1157505AA6",
   "getPSViewLayoutPanel" : {

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

@@ -354,6 +354,10 @@
     },
     "xDataControlName" : "grid"
   } ],
+  "getPSAppWF" : {
+    "modelref" : true,
+    "id" : "testWf"
+  },
   "getPSControls" : [ {
     "aggMode" : "NONE",
     "codeName" : "InfoGrid",
@@ -375,35 +379,35 @@
     "getPSAppViewLogics" : [ {
       "logicTrigger" : "CUSTOM",
       "logicType" : "APPVIEWUIACTION",
-      "name" : "grid_uagridcolumn1_u1feafb4_click",
+      "name" : "grid_uagridcolumn1_u4c6267d_click",
       "getPSAppViewUIAction" : {
         "modelref" : true,
-        "id" : "表格界面_编辑操作"
+        "id" : "表格界面_删除操作"
       }
     }, {
       "logicTrigger" : "CUSTOM",
       "logicType" : "APPVIEWUIACTION",
-      "name" : "grid_uagridcolumn1_u4c6267d_click",
+      "name" : "grid_uagridcolumn1_u1feafb4_click",
       "getPSAppViewUIAction" : {
         "modelref" : true,
-        "id" : "表格界面_删除操作"
+        "id" : "表格界面_编辑操作"
       }
     } ],
     "getPSAppViewUIActions" : [ {
-      "name" : "表格界面_编辑操作",
+      "name" : "表格界面_删除操作",
       "getPSUIAction" : {
         "modelref" : true,
-        "id" : "Edit"
+        "id" : "Remove"
       },
-      "uIActionTarget" : "SINGLEKEY",
+      "uIActionTarget" : "MULTIKEY",
       "xDataControlName" : "grid"
     }, {
-      "name" : "表格界面_删除操作",
+      "name" : "表格界面_编辑操作",
       "getPSUIAction" : {
         "modelref" : true,
-        "id" : "Remove"
+        "id" : "Edit"
       },
-      "uIActionTarget" : "MULTIKEY",
+      "uIActionTarget" : "SINGLEKEY",
       "xDataControlName" : "grid"
     } ],
     "getPSControlHandler" : {
@@ -611,40 +615,6 @@
       "getPSDEUIActionGroup" : {
         "name" : "界面行为组",
         "getPSUIActionGroupDetails" : [ {
-          "detailType" : "DEUIACTION",
-          "name" : "u1feafb4",
-          "getPSUIAction" : {
-            "actionTarget" : "SINGLEKEY",
-            "getCapPSLanguageRes" : {
-              "lanResTag" : "TBB.TEXT.*.EDIT",
-              "mOSFilePath" : "pslanguageres/Auto253",
-              "rTMOSFilePath" : "pslanguageres/Auto253"
-            },
-            "caption" : "编辑",
-            "codeName" : "Edit",
-            "fullCodeName" : "Edit",
-            "mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/Edit",
-            "name" : "表格界面_编辑操作",
-            "getPSSysImage" : {
-              "glyph" : "xf044@FontAwesome",
-              "cssClass" : "fa fa-edit"
-            },
-            "predefinedType" : "GRIDVIEW_EDITACTION",
-            "rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/Edit",
-            "timeout" : 60000,
-            "getTooltipPSLanguageRes" : {
-              "lanResTag" : "TBB.TOOLTIP.*.EDIT",
-              "mOSFilePath" : "pslanguageres/Auto130",
-              "rTMOSFilePath" : "pslanguageres/Auto130"
-            },
-            "uIActionMode" : "SYS",
-            "uIActionTag" : "Edit",
-            "uIActionType" : "DEUIACTION"
-          },
-          "addSeparator" : true,
-          "showCaption" : true,
-          "showIcon" : false
-        }, {
           "detailType" : "DEUIACTION",
           "name" : "u4c6267d",
           "getPSUIAction" : {
@@ -678,6 +648,40 @@
           "addSeparator" : true,
           "showCaption" : false,
           "showIcon" : true
+        }, {
+          "detailType" : "DEUIACTION",
+          "name" : "u1feafb4",
+          "getPSUIAction" : {
+            "actionTarget" : "SINGLEKEY",
+            "getCapPSLanguageRes" : {
+              "lanResTag" : "TBB.TEXT.*.EDIT",
+              "mOSFilePath" : "pslanguageres/Auto253",
+              "rTMOSFilePath" : "pslanguageres/Auto253"
+            },
+            "caption" : "编辑",
+            "codeName" : "Edit",
+            "fullCodeName" : "Edit",
+            "mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/Edit",
+            "name" : "表格界面_编辑操作",
+            "getPSSysImage" : {
+              "glyph" : "xf044@FontAwesome",
+              "cssClass" : "fa fa-edit"
+            },
+            "predefinedType" : "GRIDVIEW_EDITACTION",
+            "rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/Edit",
+            "timeout" : 60000,
+            "getTooltipPSLanguageRes" : {
+              "lanResTag" : "TBB.TOOLTIP.*.EDIT",
+              "mOSFilePath" : "pslanguageres/Auto130",
+              "rTMOSFilePath" : "pslanguageres/Auto130"
+            },
+            "uIActionMode" : "SYS",
+            "uIActionTag" : "Edit",
+            "uIActionType" : "DEUIACTION"
+          },
+          "addSeparator" : true,
+          "showCaption" : true,
+          "showIcon" : false
         } ]
       },
       "rTMOSFilePath" : "psdegridcols/uagridcolumn1",

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

@@ -15,6 +15,10 @@
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPMODULES/common.json"
   },
+  "getPSAppWF" : {
+    "modelref" : true,
+    "id" : "testWf"
+  },
   "getPSControls" : [ {
     "codeName" : "Main",
     "controlType" : "FORM",
@@ -120,7 +124,11 @@
       }, {
         "actionName" : "WFSTART",
         "actionType" : "WFACTION",
-        "name" : "WFSTART",
+        "name" : "wfstart",
+        "getPSAppDEMethod" : {
+          "modelref" : true,
+          "id" : "WFStart"
+        },
         "getPSAppDataEntity" : {
           "modelref" : true,
           "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
@@ -128,7 +136,11 @@
       }, {
         "actionName" : "WFSUBMIT",
         "actionType" : "WFACTION",
-        "name" : "WFSUBMIT",
+        "name" : "wfsubmit",
+        "getPSAppDEMethod" : {
+          "modelref" : true,
+          "id" : "WFSubmit"
+        },
         "getPSAppDataEntity" : {
           "modelref" : true,
           "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
@@ -1301,11 +1313,11 @@
     },
     "getWFStartPSControlAction" : {
       "modelref" : true,
-      "id" : "WFSTART"
+      "id" : "wfstart"
     },
     "getWFSubmitPSControlAction" : {
       "modelref" : true,
-      "id" : "WFSUBMIT"
+      "id" : "wfsubmit"
     },
     "noTabHeader" : false,
     "name" : "form",

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

@@ -13,6 +13,10 @@
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPMODULES/common.json"
   },
+  "getPSAppWF" : {
+    "modelref" : true,
+    "id" : "testWf"
+  },
   "getPSControls" : [ {
     "codeName" : "Default",
     "controlType" : "DRTAB",
@@ -165,7 +169,11 @@
       }, {
         "actionName" : "WFSTART",
         "actionType" : "WFACTION",
-        "name" : "WFSTART",
+        "name" : "wfstart",
+        "getPSAppDEMethod" : {
+          "modelref" : true,
+          "id" : "WFStart"
+        },
         "getPSAppDataEntity" : {
           "modelref" : true,
           "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
@@ -173,7 +181,11 @@
       }, {
         "actionName" : "WFSUBMIT",
         "actionType" : "WFACTION",
-        "name" : "WFSUBMIT",
+        "name" : "wfsubmit",
+        "getPSAppDEMethod" : {
+          "modelref" : true,
+          "id" : "WFSubmit"
+        },
         "getPSAppDataEntity" : {
           "modelref" : true,
           "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
@@ -1346,11 +1358,11 @@
     },
     "getWFStartPSControlAction" : {
       "modelref" : true,
-      "id" : "WFSTART"
+      "id" : "wfstart"
     },
     "getWFSubmitPSControlAction" : {
       "modelref" : true,
-      "id" : "WFSUBMIT"
+      "id" : "wfsubmit"
     },
     "noTabHeader" : false,
     "name" : "form",

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

@@ -39,15 +39,17 @@
     }
   } ],
   "getPSControls" : [ {
-    "codeName" : "Calendar",
+    "calendarStyle" : "MONTH",
+    "codeName" : "Test",
     "controlType" : "CALENDAR",
-    "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Student/PSCALENDARS/Calendar.json",
+    "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone/PSCALENDARS/Test.json",
     "groupMode" : "NONE",
     "legendPos" : "NONE",
-    "mOSFilePath" : "psmodules/common/psdataentities/STUDENT/pssyscalendars/Calendar",
+    "logicName" : "test",
+    "mOSFilePath" : "psmodules/common/psdataentities/PHONE/pssyscalendars/Test",
     "getPSAppDataEntity" : {
       "modelref" : true,
-      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Student.json"
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone.json"
     },
     "getPSControlHandler" : {
       "enableDEFieldPrivilege" : false,
@@ -61,7 +63,7 @@
     "rTMOSFilePath" : "pssysapps/Web/psappdeviews/studentCalendarView/psappviewctrls/calendar",
     "enableGroup" : false,
     "name" : "calendar",
-    "modelid" : "2c472a3ac1d816a3b2be7b257c7299e1_calendar",
+    "modelid" : "C10C79E5-8EFD-4A5E-B0C6-E5DC49DA3E89",
     "modeltype" : "PSSYSCALENDAR"
   } ],
   "getPSDEViewCodeName" : "CalendarView",