fangzhihao 发布系统代码 [TrainSys，模板发布]

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

@@ -25,7 +25,7 @@
     </changeSet>
 
     <!--输出实体[BXDMX]数据结构 -->
-    <changeSet author="root" id="tab-bxdmx-35-2">
+    <changeSet author="root" id="tab-bxdmx-36-2">
         <createTable tableName="T_BXDMX">
                 <column name="BXDMXID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_BXDMX"/>
@@ -169,7 +169,7 @@
     </changeSet>
 
     <!--输出实体[PHONE]数据结构 -->
-    <changeSet author="root" id="tab-phone-202-6">
+    <changeSet author="root" id="tab-phone-206-6">
         <createTable tableName="T_PHONE">
                 <column name="PHONEID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_PHONE"/>
@@ -298,7 +298,7 @@
 
 
     <!--输出实体[BXDMX]外键关系 -->
-    <changeSet author="root" id="fk-bxdmx-35-11">
+    <changeSet author="root" id="fk-bxdmx-36-11">
        <addForeignKeyConstraint baseColumnNames="BXDID" baseTableName="T_BXDMX" constraintName="F821DB7B87E31B879F" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="BXDID" referencedTableName="T_BXD" validate="true"/>
     </changeSet>
 

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

@@ -1404,10 +1404,12 @@
     "name" : "PhoneNumber",
     "getPSDELogicNodes" : [ {
       "codeName" : "Begin",
+      "leftPos" : 200,
       "logicNodeType" : "BEGIN",
       "mOSFilePath" : "psmodules/common/psdataentities/PHONE/psdelogics/PhoneNumber/psdelogicnodes/Begin",
       "name" : "开始",
       "rTMOSFilePath" : "psmodules/common/psdataentities/PHONE/psdelogics/PhoneNumber/psdelogicnodes/Begin",
+      "topPos" : 200,
       "parallelOutput" : true
     } ],
     "getPSDELogicParams" : [ {
@@ -1439,10 +1441,12 @@
     "name" : "xxx",
     "getPSDELogicNodes" : [ {
       "codeName" : "Begin",
+      "leftPos" : 200,
       "logicNodeType" : "BEGIN",
       "mOSFilePath" : "psmodules/common/psdataentities/PHONE/psdelogics/xxx/psdelogicnodes/Begin",
       "name" : "开始",
       "rTMOSFilePath" : "psmodules/common/psdataentities/PHONE/psdelogics/xxx/psdelogicnodes/Begin",
+      "topPos" : 200,
       "parallelOutput" : true
     } ],
     "getPSDELogicParams" : [ {

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

@@ -7,10 +7,12 @@
   "name" : "PhoneNumber",
   "getPSDELogicNodes" : [ {
     "codeName" : "Begin",
+    "leftPos" : 200,
     "logicNodeType" : "BEGIN",
     "mOSFilePath" : "psmodules/common/psdataentities/PHONE/psdelogics/PhoneNumber/psdelogicnodes/Begin",
     "name" : "开始",
     "rTMOSFilePath" : "psmodules/common/psdataentities/PHONE/psdelogics/PhoneNumber/psdelogicnodes/Begin",
+    "topPos" : 200,
     "parallelOutput" : true
   } ],
   "getPSDELogicParams" : [ {

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

@@ -7,10 +7,12 @@
   "name" : "xxx",
   "getPSDELogicNodes" : [ {
     "codeName" : "Begin",
+    "leftPos" : 200,
     "logicNodeType" : "BEGIN",
     "mOSFilePath" : "psmodules/common/psdataentities/PHONE/psdelogics/xxx/psdelogicnodes/Begin",
     "name" : "开始",
     "rTMOSFilePath" : "psmodules/common/psdataentities/PHONE/psdelogics/xxx/psdelogicnodes/Begin",
+    "topPos" : 200,
     "parallelOutput" : true
   } ],
   "getPSDELogicParams" : [ {

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

+{
+  "codeName" : "WFExpBar",
+  "counterType" : "CUSTOM",
+  "dynaModelFilePath" : "PSSYSAPPS/TemplatePublish/PSAPPCOUNTERS/WFExpBar.json",
+  "mOSFilePath" : "pssysapps/TemplatePublish/psappcounters/WFExpBar",
+  "name" : "流程导航栏计数器",
+  "getPSCounterId" : "WFEXPBAR",
+  "rTMOSFilePath" : "pssysapps/TemplatePublish/psappcounters/WFExpBar",
+  "timer" : 60000
+}
\ No newline at end of file

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

@@ -44,6 +44,7 @@
     "name" : "test",
     "getPSDEUILogicNodes" : [ {
       "codeName" : "Begin",
+      "leftPos" : 200,
       "logicNodeType" : "BEGIN",
       "mOSFilePath" : "psappdeuilogicnodes/Begin",
       "name" : "开始",
@@ -60,6 +61,7 @@
         }
       } ],
       "rTMOSFilePath" : "psappdeuilogicnodes/Begin",
+      "topPos" : 200,
       "parallelOutput" : true
     }, {
       "codeName" : "Deuiaction1",
@@ -79,10 +81,12 @@
         "modelref" : true,
         "id" : "Default"
       },
+      "leftPos" : 611,
       "logicNodeType" : "DEUIACTION",
       "mOSFilePath" : "psappdeuilogicnodes/Deuiaction1",
       "name" : "xxx",
       "rTMOSFilePath" : "psappdeuilogicnodes/Deuiaction1",
+      "topPos" : 249,
       "parallelOutput" : true
     } ],
     "getPSDEUILogicParams" : [ {

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

@@ -7,6 +7,26 @@
   "mOSFilePath" : "pssysapps/TemplatePublish/psappdeviews/phoneEditView",
   "memo" : "系统自动添加",
   "name" : "phoneEditView",
+  "getPSAppCounterRef" : {
+    "modelref" : true,
+    "id" : "57a03eae761cc02c765be88b39d08c17"
+  },
+  "getPSAppCounterRefs" : [ {
+    "mOSFilePath" : "pssyscounterrefs/57a03eae761cc02c765be88b39d08c17",
+    "getPSAppCounter" : {
+      "codeName" : "WFExpBar",
+      "counterType" : "CUSTOM",
+      "dynaModelFilePath" : "PSSYSAPPS/TemplatePublish/PSAPPCOUNTERS/WFExpBar.json",
+      "mOSFilePath" : "pssysapps/TemplatePublish/psappcounters/WFExpBar",
+      "name" : "流程导航栏计数器",
+      "getPSCounterId" : "WFEXPBAR",
+      "rTMOSFilePath" : "pssysapps/TemplatePublish/psappcounters/WFExpBar",
+      "timer" : 60000
+    },
+    "rTMOSFilePath" : "pssyscounterrefs/57a03eae761cc02c765be88b39d08c17",
+    "tag" : "57a03eae761cc02c765be88b39d08c17",
+    "id" : "57a03eae761cc02c765be88b39d08c17"
+  } ],
   "getPSAppDataEntity" : {
     "modelref" : true,
     "path" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/Phone.json"

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

@@ -40,6 +40,10 @@
     "rTMOSFilePath" : "pssysapps/TemplatePublish/psappcodelists/SysOperator",
     "enableCache" : true
   } ],
+  "getAllPSAppCounters" : [ {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/TemplatePublish/PSAPPCOUNTERS/WFExpBar.json"
+  } ],
   "getAllPSAppDEUIActions" : [ {
     "actionTarget" : "SINGLEKEY",
     "getCapPSLanguageRes" : {
@@ -728,21 +732,31 @@
     "codeName" : "Phone"
   } ],
   "getAllPSAppEditorStyleRefs" : [ {
+    "codeName" : "editorTest",
     "containerType" : "FORMITEM",
+    "editorType" : "TEXTBOX",
+    "mOSFilePath" : "pssysapps/TemplatePublish/psappeditorstylerefs/editorTest",
     "name" : "editorTest",
     "getPSSysPFPlugin" : {
       "pluginType" : "EDITOR_CUSTOMSTYLE",
       "pluginCode" : "editorTest"
     },
-    "pluginCode" : "editorTest"
+    "pluginCode" : "editorTest",
+    "rTMOSFilePath" : "pssysapps/TemplatePublish/psappeditorstylerefs/editorTest",
+    "styleCode" : "editorTest"
   }, {
+    "codeName" : "textStyle1",
     "containerType" : "FORMITEM",
+    "editorType" : "TEXTBOX",
+    "mOSFilePath" : "pssysapps/TemplatePublish/psappeditorstylerefs/textStyle1",
     "name" : "textStyle",
     "getPSSysPFPlugin" : {
       "pluginType" : "EDITOR_CUSTOMSTYLE",
       "pluginCode" : "editorPlugin"
     },
-    "pluginCode" : "editorPlugin"
+    "pluginCode" : "editorPlugin",
+    "rTMOSFilePath" : "pssysapps/TemplatePublish/psappeditorstylerefs/textStyle1",
+    "styleCode" : "textStyle1"
   } ],
   "getAllPSAppFuncs" : [ {
     "appFuncType" : "APPVIEW",
@@ -910,6 +924,7 @@
       "pluginCode" : "PubViewTest"
     },
     "pluginCode" : "PubViewTest",
+    "typeCode" : "PubTest",
     "viewType" : "DEDATAVIEW"
   }, {
     "name" : "viewStyle",
@@ -918,6 +933,7 @@
       "pluginCode" : "viewPlugin"
     },
     "pluginCode" : "viewPlugin",
+    "typeCode" : "viewStyle",
     "viewType" : "DEGRIDVIEW"
   }, {
     "name" : "viewStyle",
@@ -926,6 +942,7 @@
       "pluginCode" : "viewPlugin"
     },
     "pluginCode" : "viewPlugin",
+    "typeCode" : "viewStyle",
     "viewType" : "DEEDITVIEW"
   } ],
   "getAllPSAppViewMsgGroups" : [ {
@@ -3630,6 +3647,7 @@
         "name" : "test",
         "getPSDEUILogicNodes" : [ {
           "codeName" : "Begin",
+          "leftPos" : 200,
           "logicNodeType" : "BEGIN",
           "mOSFilePath" : "psappdeuilogicnodes/Begin",
           "name" : "开始",
@@ -3646,6 +3664,7 @@
             }
           } ],
           "rTMOSFilePath" : "psappdeuilogicnodes/Begin",
+          "topPos" : 200,
           "parallelOutput" : true
         }, {
           "codeName" : "Deuiaction1",
@@ -3665,10 +3684,12 @@
             "modelref" : true,
             "id" : "Default"
           },
+          "leftPos" : 611,
           "logicNodeType" : "DEUIACTION",
           "mOSFilePath" : "psappdeuilogicnodes/Deuiaction1",
           "name" : "xxx",
           "rTMOSFilePath" : "psappdeuilogicnodes/Deuiaction1",
+          "topPos" : 249,
           "parallelOutput" : true
         } ],
         "getPSDEUILogicParams" : [ {

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPCOUNTERS/WFExpBar.json

+{
+  "codeName" : "WFExpBar",
+  "counterType" : "CUSTOM",
+  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPCOUNTERS/WFExpBar.json",
+  "mOSFilePath" : "pssysapps/Web/psappcounters/WFExpBar",
+  "name" : "流程导航栏计数器",
+  "getPSCounterId" : "WFEXPBAR",
+  "rTMOSFilePath" : "pssysapps/Web/psappcounters/WFExpBar",
+  "timer" : 60000
+}
\ No newline at end of file

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

@@ -2821,10 +2821,12 @@
     "name" : "tes",
     "getPSDEUILogicNodes" : [ {
       "codeName" : "Begin",
+      "leftPos" : 200,
       "logicNodeType" : "BEGIN",
       "mOSFilePath" : "psappdeuilogicnodes/Begin",
       "name" : "开始",
       "rTMOSFilePath" : "psappdeuilogicnodes/Begin",
+      "topPos" : 200,
       "parallelOutput" : true
     } ],
     "getPSDEUILogicParams" : [ {

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

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

@@ -1368,6 +1368,7 @@
     "name" : "test",
     "getPSDEUILogicNodes" : [ {
       "codeName" : "Begin",
+      "leftPos" : 200,
       "logicNodeType" : "BEGIN",
       "mOSFilePath" : "psappdeuilogicnodes/Begin",
       "name" : "开始",
@@ -1384,6 +1385,7 @@
         }
       } ],
       "rTMOSFilePath" : "psappdeuilogicnodes/Begin",
+      "topPos" : 200,
       "parallelOutput" : true
     }, {
       "codeName" : "Deuiaction1",
@@ -1403,10 +1405,12 @@
         "modelref" : true,
         "id" : "Default"
       },
+      "leftPos" : 611,
       "logicNodeType" : "DEUIACTION",
       "mOSFilePath" : "psappdeuilogicnodes/Deuiaction1",
       "name" : "xxx",
       "rTMOSFilePath" : "psappdeuilogicnodes/Deuiaction1",
+      "topPos" : 249,
       "parallelOutput" : true
     } ],
     "getPSDEUILogicParams" : [ {

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

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

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

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

@@ -6,6 +6,26 @@
   "funcViewMode" : "EDITVIEW",
   "mOSFilePath" : "pssysapps/Web/psappdeviews/phoneEditView",
   "name" : "phoneEditView",
+  "getPSAppCounterRef" : {
+    "modelref" : true,
+    "id" : "57a03eae761cc02c765be88b39d08c17"
+  },
+  "getPSAppCounterRefs" : [ {
+    "mOSFilePath" : "pssyscounterrefs/57a03eae761cc02c765be88b39d08c17",
+    "getPSAppCounter" : {
+      "codeName" : "WFExpBar",
+      "counterType" : "CUSTOM",
+      "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPCOUNTERS/WFExpBar.json",
+      "mOSFilePath" : "pssysapps/Web/psappcounters/WFExpBar",
+      "name" : "流程导航栏计数器",
+      "getPSCounterId" : "WFEXPBAR",
+      "rTMOSFilePath" : "pssysapps/Web/psappcounters/WFExpBar",
+      "timer" : 60000
+    },
+    "rTMOSFilePath" : "pssyscounterrefs/57a03eae761cc02c765be88b39d08c17",
+    "tag" : "57a03eae761cc02c765be88b39d08c17",
+    "id" : "57a03eae761cc02c765be88b39d08c17"
+  } ],
   "getPSAppDataEntity" : {
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone.json"

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPPORTALVIEWS/AppPortalView.json

@@ -221,35 +221,35 @@
           "getPSAppViewLogics" : [ {
             "logicTrigger" : "CUSTOM",
             "logicType" : "APPVIEWUIACTION",
-            "name" : "db_sysportlet2_list_field_u4c6267d_click",
+            "name" : "db_sysportlet2_list_field_u1feafb4_click",
             "getPSAppViewUIAction" : {
               "modelref" : true,
-              "id" : "表格界面_删除操作"
+              "id" : "表格界面_编辑操作"
             }
           }, {
             "logicTrigger" : "CUSTOM",
             "logicType" : "APPVIEWUIACTION",
-            "name" : "db_sysportlet2_list_field_u1feafb4_click",
+            "name" : "db_sysportlet2_list_field_u4c6267d_click",
             "getPSAppViewUIAction" : {
               "modelref" : true,
-              "id" : "表格界面_编辑操作"
+              "id" : "表格界面_删除操作"
             }
           } ],
           "getPSAppViewUIActions" : [ {
-            "name" : "表格界面_删除操作",
+            "name" : "表格界面_编辑操作",
             "getPSUIAction" : {
               "modelref" : true,
-              "id" : "Remove"
+              "id" : "Edit"
             },
-            "uIActionTarget" : "MULTIKEY",
+            "uIActionTarget" : "SINGLEKEY",
             "xDataControlName" : "db_sysportlet2_list"
           }, {
-            "name" : "表格界面_编辑操作",
+            "name" : "表格界面_删除操作",
             "getPSUIAction" : {
               "modelref" : true,
-              "id" : "Edit"
+              "id" : "Remove"
             },
-            "uIActionTarget" : "SINGLEKEY",
+            "uIActionTarget" : "MULTIKEY",
             "xDataControlName" : "db_sysportlet2_list"
           } ],
           "getPSControlHandler" : {
@@ -374,40 +374,6 @@
             "getPSDEUIActionGroup" : {
               "name" : "界面行为组",
               "getPSUIActionGroupDetails" : [ {
-                "detailType" : "DEUIACTION",
-                "name" : "u4c6267d",
-                "getPSUIAction" : {
-                  "actionTarget" : "MULTIKEY",
-                  "getCapPSLanguageRes" : {
-                    "lanResTag" : "TBB.TEXT.*.REMOVE",
-                    "mOSFilePath" : "pslanguageres/Auto159",
-                    "rTMOSFilePath" : "pslanguageres/Auto159"
-                  },
-                  "caption" : "删除",
-                  "codeName" : "Remove",
-                  "fullCodeName" : "Remove",
-                  "mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/Remove",
-                  "name" : "表格界面_删除操作",
-                  "getPSSysImage" : {
-                    "glyph" : "xf00d@FontAwesome",
-                    "cssClass" : "fa fa-remove"
-                  },
-                  "predefinedType" : "GRIDVIEW_REMOVEACTION",
-                  "rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/Remove",
-                  "timeout" : 60000,
-                  "getTooltipPSLanguageRes" : {
-                    "lanResTag" : "TBB.TOOLTIP.*.REMOVE",
-                    "mOSFilePath" : "pslanguageres/Auto286",
-                    "rTMOSFilePath" : "pslanguageres/Auto286"
-                  },
-                  "uIActionMode" : "SYS",
-                  "uIActionTag" : "Remove",
-                  "uIActionType" : "DEUIACTION"
-                },
-                "addSeparator" : true,
-                "showCaption" : false,
-                "showIcon" : true
-              }, {
                 "detailType" : "DEUIACTION",
                 "name" : "u1feafb4",
                 "getPSUIAction" : {
@@ -441,6 +407,40 @@
                 "addSeparator" : true,
                 "showCaption" : true,
                 "showIcon" : false
+              }, {
+                "detailType" : "DEUIACTION",
+                "name" : "u4c6267d",
+                "getPSUIAction" : {
+                  "actionTarget" : "MULTIKEY",
+                  "getCapPSLanguageRes" : {
+                    "lanResTag" : "TBB.TEXT.*.REMOVE",
+                    "mOSFilePath" : "pslanguageres/Auto159",
+                    "rTMOSFilePath" : "pslanguageres/Auto159"
+                  },
+                  "caption" : "删除",
+                  "codeName" : "Remove",
+                  "fullCodeName" : "Remove",
+                  "mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/Remove",
+                  "name" : "表格界面_删除操作",
+                  "getPSSysImage" : {
+                    "glyph" : "xf00d@FontAwesome",
+                    "cssClass" : "fa fa-remove"
+                  },
+                  "predefinedType" : "GRIDVIEW_REMOVEACTION",
+                  "rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/Remove",
+                  "timeout" : 60000,
+                  "getTooltipPSLanguageRes" : {
+                    "lanResTag" : "TBB.TOOLTIP.*.REMOVE",
+                    "mOSFilePath" : "pslanguageres/Auto286",
+                    "rTMOSFilePath" : "pslanguageres/Auto286"
+                  },
+                  "uIActionMode" : "SYS",
+                  "uIActionTag" : "Remove",
+                  "uIActionType" : "DEUIACTION"
+                },
+                "addSeparator" : true,
+                "showCaption" : false,
+                "showIcon" : true
               } ]
             },
             "width" : 150,
@@ -2621,35 +2621,35 @@
       "getPSAppViewLogics" : [ {
         "logicTrigger" : "CUSTOM",
         "logicType" : "APPVIEWUIACTION",
-        "name" : "db_sysportlet4_u4c6267d_click",
+        "name" : "db_sysportlet4_u1feafb4_click",
         "getPSAppViewUIAction" : {
           "modelref" : true,
-          "id" : "表格界面_删除操作"
+          "id" : "表格界面_编辑操作"
         }
       }, {
         "logicTrigger" : "CUSTOM",
         "logicType" : "APPVIEWUIACTION",
-        "name" : "db_sysportlet4_u1feafb4_click",
+        "name" : "db_sysportlet4_u4c6267d_click",
         "getPSAppViewUIAction" : {
           "modelref" : true,
-          "id" : "表格界面_编辑操作"
+          "id" : "表格界面_删除操作"
         }
       } ],
       "getPSAppViewUIActions" : [ {
-        "name" : "表格界面_删除操作",
+        "name" : "表格界面_编辑操作",
         "getPSUIAction" : {
           "modelref" : true,
-          "id" : "Remove"
+          "id" : "Edit"
         },
-        "uIActionTarget" : "MULTIKEY",
+        "uIActionTarget" : "SINGLEKEY",
         "xDataControlName" : "db_sysportlet4"
       }, {
-        "name" : "表格界面_编辑操作",
+        "name" : "表格界面_删除操作",
         "getPSUIAction" : {
           "modelref" : true,
-          "id" : "Edit"
+          "id" : "Remove"
         },
-        "uIActionTarget" : "SINGLEKEY",
+        "uIActionTarget" : "MULTIKEY",
         "xDataControlName" : "db_sysportlet4"
       } ],
       "getPSControlHandler" : {
@@ -2667,40 +2667,6 @@
       "getPSUIActionGroup" : {
         "name" : "界面行为组",
         "getPSUIActionGroupDetails" : [ {
-          "detailType" : "DEUIACTION",
-          "name" : "u4c6267d",
-          "getPSUIAction" : {
-            "actionTarget" : "MULTIKEY",
-            "getCapPSLanguageRes" : {
-              "lanResTag" : "TBB.TEXT.*.REMOVE",
-              "mOSFilePath" : "pslanguageres/Auto159",
-              "rTMOSFilePath" : "pslanguageres/Auto159"
-            },
-            "caption" : "删除",
-            "codeName" : "Remove",
-            "fullCodeName" : "Remove",
-            "mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/Remove",
-            "name" : "表格界面_删除操作",
-            "getPSSysImage" : {
-              "glyph" : "xf00d@FontAwesome",
-              "cssClass" : "fa fa-remove"
-            },
-            "predefinedType" : "GRIDVIEW_REMOVEACTION",
-            "rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/Remove",
-            "timeout" : 60000,
-            "getTooltipPSLanguageRes" : {
-              "lanResTag" : "TBB.TOOLTIP.*.REMOVE",
-              "mOSFilePath" : "pslanguageres/Auto286",
-              "rTMOSFilePath" : "pslanguageres/Auto286"
-            },
-            "uIActionMode" : "SYS",
-            "uIActionTag" : "Remove",
-            "uIActionType" : "DEUIACTION"
-          },
-          "addSeparator" : true,
-          "showCaption" : false,
-          "showIcon" : true
-        }, {
           "detailType" : "DEUIACTION",
           "name" : "u1feafb4",
           "getPSUIAction" : {
@@ -2734,6 +2700,40 @@
           "addSeparator" : true,
           "showCaption" : true,
           "showIcon" : false
+        }, {
+          "detailType" : "DEUIACTION",
+          "name" : "u4c6267d",
+          "getPSUIAction" : {
+            "actionTarget" : "MULTIKEY",
+            "getCapPSLanguageRes" : {
+              "lanResTag" : "TBB.TEXT.*.REMOVE",
+              "mOSFilePath" : "pslanguageres/Auto159",
+              "rTMOSFilePath" : "pslanguageres/Auto159"
+            },
+            "caption" : "删除",
+            "codeName" : "Remove",
+            "fullCodeName" : "Remove",
+            "mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/Remove",
+            "name" : "表格界面_删除操作",
+            "getPSSysImage" : {
+              "glyph" : "xf00d@FontAwesome",
+              "cssClass" : "fa fa-remove"
+            },
+            "predefinedType" : "GRIDVIEW_REMOVEACTION",
+            "rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/Remove",
+            "timeout" : 60000,
+            "getTooltipPSLanguageRes" : {
+              "lanResTag" : "TBB.TOOLTIP.*.REMOVE",
+              "mOSFilePath" : "pslanguageres/Auto286",
+              "rTMOSFilePath" : "pslanguageres/Auto286"
+            },
+            "uIActionMode" : "SYS",
+            "uIActionTag" : "Remove",
+            "uIActionType" : "DEUIACTION"
+          },
+          "addSeparator" : true,
+          "showCaption" : false,
+          "showIcon" : true
         } ]
       },
       "portletType" : "ACTIONBAR",