tony001 部署微服务应用 [TrainSys，网页端]

app_Web/swarm.yaml

@@ -3,7 +3,7 @@ services:
   trainsys-app-web:
     image: dstimage
     ports:
-      - "80:80"
+      - "50100:80"
     networks:
       - agent_network
     environment:

config.xml

@@ -55,6 +55,15 @@
 	  git clone -b master $para2 trainsys/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd trainsys/
+      mkdir -p /var/lib/jenkins/appcache/A3064A91-F42D-4D7F-BC1C-4173A4F5772C
+      if [ -e app_Web/.dynamic ]
+      then
+          cd app_Web
+      else
+          cd app_Web/app
+      fi
+      sed -i "s#dstimage#registry.cn-shanghai.aliyuncs.com/ibizsys/ibizcloud-standardsys-app-webapp:2022.09.01.001#g" swarm.yaml
+      docker -H $para1 stack deploy --compose-file=swarm.yaml ebsx --with-registry-auth    
       </command>
     </hudson.tasks.Shell>
   </builders>

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSWORKFLOWS/WorkFlowWf/PSWFVERSIONS/WorkFlowWfv1.json

@@ -8,64 +8,93 @@
       "id" : "START_01"
     },
     "name" : "route",
+    "getPSWFLinkGroupCond" : {
+      "condType" : "GROUP",
+      "groupOP" : "AND",
+      "name" : "连接条件",
+      "getPSWFLinkConds" : [ {
+        "condType" : "GROUP",
+        "groupOP" : "AND",
+        "name" : "逻辑分组",
+        "getPSWFLinkConds" : [ {
+          "condOP" : "GT",
+          "condType" : "SINGLE",
+          "fieldName" : "UPDATEMAN",
+          "name" : "逻辑项",
+          "paramType" : "CURTIME"
+        } ],
+        "notMode" : false
+      }, {
+        "condType" : "GROUP",
+        "groupOP" : "OR",
+        "name" : "逻辑分组",
+        "notMode" : false
+      } ],
+      "notMode" : false
+    },
     "getToPSWFProcess" : {
       "modelref" : true,
       "id" : "INTERACTIVE_01"
     },
     "wFLinkType" : "ROUTE"
   }, {
-    "formCodeName" : "WorkFlowEditView_Form",
     "getFromPSWFProcess" : {
       "modelref" : true,
-      "id" : "INTERACTIVE_01"
+      "id" : "INTERACTIVE_03"
     },
-    "logicName" : "审批",
-    "mobFormCodeName" : "WorkFlowEditView_Form",
-    "mobViewCodeName" : "MobWFDynaActionView",
-    "name" : "IAACTION",
+    "logicName" : "交互连接",
+    "name" : "IAACTION2",
     "nextCondition" : "ANY",
     "getToPSWFProcess" : {
       "modelref" : true,
-      "id" : "END_01"
+      "id" : "INTERACTIVE_04"
     },
-    "viewCodeName" : "WFDynaActionView",
     "wFLinkType" : "IAACTION"
   }, {
     "getFromPSWFProcess" : {
       "modelref" : true,
-      "id" : "EMBED_01"
+      "id" : "INTERACTIVE_02"
     },
-    "logicName" : "嵌套流程返回",
-    "name" : "WFRETURN",
+    "logicName" : "交互连接",
+    "name" : "IAACTION1",
+    "nextCondition" : "ANY",
     "getToPSWFProcess" : {
       "modelref" : true,
-      "id" : "END_01"
+      "id" : "INTERACTIVE_03"
     },
-    "wFLinkType" : "WFRETURN"
+    "wFLinkType" : "IAACTION"
   }, {
     "getFromPSWFProcess" : {
       "modelref" : true,
-      "id" : "EMBED_01"
+      "id" : "INTERACTIVE_02"
     },
-    "logicName" : "嵌套流程返回",
-    "name" : "WFRETURN1",
+    "logicName" : "交互连接",
+    "name" : "IAACTION3",
+    "nextCondition" : "ANY",
     "getToPSWFProcess" : {
       "modelref" : true,
-      "id" : "INTERACTIVE_04"
+      "id" : "INTERACTIVE_05"
     },
-    "wFLinkType" : "WFRETURN"
+    "wFLinkType" : "IAACTION"
   }, {
+    "formCodeName" : "WorkFlowEditView_Form",
+    "formName" : "工作流编辑_表单",
     "getFromPSWFProcess" : {
       "modelref" : true,
-      "id" : "EMBED_01"
+      "id" : "INTERACTIVE_01"
     },
-    "logicName" : "嵌套流程返回",
-    "name" : "WFRETURN2",
+    "logicName" : "审批",
+    "mobFormCodeName" : "WorkFlowEditView_Form",
+    "mobFormName" : "工作流编辑_表单",
+    "mobViewCodeName" : "MobWFDynaActionView",
+    "name" : "IAACTION",
+    "nextCondition" : "ANY",
     "getToPSWFProcess" : {
       "modelref" : true,
-      "id" : "INTERACTIVE_01"
+      "id" : "END_01"
     },
-    "wFLinkType" : "WFRETURN"
+    "viewCodeName" : "WFDynaActionView",
+    "wFLinkType" : "IAACTION"
   }, {
     "getFromPSWFProcess" : {
       "modelref" : true,
@@ -82,42 +111,39 @@
   }, {
     "getFromPSWFProcess" : {
       "modelref" : true,
-      "id" : "INTERACTIVE_02"
+      "id" : "EMBED_01"
     },
-    "logicName" : "交互连接",
-    "name" : "IAACTION1",
-    "nextCondition" : "ANY",
+    "logicName" : "嵌套流程返回",
+    "name" : "WFRETURN",
     "getToPSWFProcess" : {
       "modelref" : true,
-      "id" : "INTERACTIVE_03"
+      "id" : "END_01"
     },
-    "wFLinkType" : "IAACTION"
+    "wFLinkType" : "WFRETURN"
   }, {
     "getFromPSWFProcess" : {
       "modelref" : true,
-      "id" : "INTERACTIVE_02"
+      "id" : "EMBED_01"
     },
-    "logicName" : "交互连接",
-    "name" : "IAACTION3",
-    "nextCondition" : "ANY",
+    "logicName" : "嵌套流程返回",
+    "name" : "WFRETURN1",
     "getToPSWFProcess" : {
       "modelref" : true,
-      "id" : "INTERACTIVE_05"
+      "id" : "INTERACTIVE_04"
     },
-    "wFLinkType" : "IAACTION"
+    "wFLinkType" : "WFRETURN"
   }, {
     "getFromPSWFProcess" : {
       "modelref" : true,
-      "id" : "INTERACTIVE_03"
+      "id" : "EMBED_01"
     },
-    "logicName" : "交互连接",
-    "name" : "IAACTION2",
-    "nextCondition" : "ANY",
+    "logicName" : "嵌套流程返回",
+    "name" : "WFRETURN2",
     "getToPSWFProcess" : {
       "modelref" : true,
-      "id" : "INTERACTIVE_04"
+      "id" : "INTERACTIVE_01"
     },
-    "wFLinkType" : "IAACTION"
+    "wFLinkType" : "WFRETURN"
   } ],
   "getPSWFProcesses" : [ {
     "codeName" : "START_01",
@@ -138,13 +164,86 @@
     "asynchronousProcess" : false,
     "enableTimeout" : false,
     "startProcess" : true
+  }, {
+    "codeName" : "TIMEREVENT_01",
+    "height" : 80,
+    "leftPos" : 150,
+    "logicName" : "中间定时器捕获事件",
+    "name" : "中间定时器捕获事件",
+    "timeout" : -1,
+    "topPos" : 380,
+    "wFProcessType" : "TIMEREVENT",
+    "width" : 100,
+    "asynchronousProcess" : false,
+    "enableTimeout" : false
+  }, {
+    "codeName" : "INTERACTIVE_03",
+    "height" : 80,
+    "leftPos" : 300,
+    "logicName" : "用户任务",
+    "msgType" : 0,
+    "multiInstMode" : "NONE",
+    "name" : "用户任务",
+    "getPSWFLinks" : [ {
+      "modelref" : true,
+      "id" : "IAACTION2"
+    } ],
+    "timeout" : -1,
+    "topPos" : 410,
+    "wFProcessType" : "INTERACTIVE",
+    "wFStepValue" : "用户任务",
+    "width" : 100,
+    "asynchronousProcess" : false,
+    "enableTimeout" : false,
+    "sendInform" : false
+  }, {
+    "codeName" : "INTERACTIVE_02",
+    "height" : 80,
+    "leftPos" : 260,
+    "logicName" : "用户任务",
+    "msgType" : 0,
+    "multiInstMode" : "NONE",
+    "name" : "用户任务",
+    "getPSWFLinks" : [ {
+      "modelref" : true,
+      "id" : "IAACTION1"
+    }, {
+      "modelref" : true,
+      "id" : "IAACTION3"
+    } ],
+    "timeout" : -1,
+    "topPos" : 210,
+    "wFProcessType" : "INTERACTIVE",
+    "wFStepValue" : "用户任务",
+    "width" : 100,
+    "asynchronousProcess" : false,
+    "enableTimeout" : false,
+    "sendInform" : false
+  }, {
+    "codeName" : "INTERACTIVE_04",
+    "height" : 80,
+    "leftPos" : 260,
+    "logicName" : "用户任务",
+    "msgType" : 0,
+    "multiInstMode" : "NONE",
+    "name" : "用户任务",
+    "timeout" : -1,
+    "topPos" : 610,
+    "wFProcessType" : "INTERACTIVE",
+    "wFStepValue" : "用户任务",
+    "width" : 100,
+    "asynchronousProcess" : false,
+    "enableTimeout" : false,
+    "sendInform" : false
   }, {
     "codeName" : "INTERACTIVE_01",
     "formCodeName" : "ApprovalForm",
+    "formName" : "审批查看",
     "height" : 80,
     "leftPos" : 910,
     "logicName" : "审核",
     "mobFormCodeName" : "ApprovalForm",
+    "mobFormName" : "审批查看",
     "mobUtil3FormCodeName" : "WorkFlowEditView_Form",
     "mobUtil3FormName" : "工作流编辑_表单",
     "msgType" : 0,
@@ -177,29 +276,6 @@
     "asynchronousProcess" : false,
     "enableTimeout" : false,
     "sendInform" : false
-  }, {
-    "codeName" : "EMBED_01",
-    "height" : 80,
-    "leftPos" : 580,
-    "logicName" : "子流程",
-    "name" : "子流程",
-    "getPSWFLinks" : [ {
-      "modelref" : true,
-      "id" : "WFRETURN"
-    }, {
-      "modelref" : true,
-      "id" : "WFRETURN1"
-    }, {
-      "modelref" : true,
-      "id" : "WFRETURN2"
-    } ],
-    "timeout" : -1,
-    "topPos" : 580,
-    "wFProcessType" : "EMBED",
-    "wFStepValue" : "子流程",
-    "width" : 100,
-    "asynchronousProcess" : false,
-    "enableTimeout" : false
   }, {
     "codeName" : "INTERACTIVE_05",
     "height" : 80,
@@ -220,22 +296,6 @@
     "asynchronousProcess" : false,
     "enableTimeout" : false,
     "sendInform" : false
-  }, {
-    "codeName" : "INTERACTIVE_04",
-    "height" : 80,
-    "leftPos" : 260,
-    "logicName" : "用户任务",
-    "msgType" : 0,
-    "multiInstMode" : "NONE",
-    "name" : "用户任务",
-    "timeout" : -1,
-    "topPos" : 610,
-    "wFProcessType" : "INTERACTIVE",
-    "wFStepValue" : "用户任务",
-    "width" : 100,
-    "asynchronousProcess" : false,
-    "enableTimeout" : false,
-    "sendInform" : false
   }, {
     "codeName" : "END_01",
     "height" : 30,
@@ -250,57 +310,25 @@
     "enableTimeout" : false,
     "terminalProcess" : true
   }, {
-    "codeName" : "INTERACTIVE_02",
+    "codeName" : "EMBED_01",
     "height" : 80,
-    "leftPos" : 260,
-    "logicName" : "用户任务",
-    "msgType" : 0,
-    "multiInstMode" : "NONE",
-    "name" : "用户任务",
+    "leftPos" : 580,
+    "logicName" : "子流程",
+    "name" : "子流程",
     "getPSWFLinks" : [ {
       "modelref" : true,
-      "id" : "IAACTION1"
+      "id" : "WFRETURN"
     }, {
       "modelref" : true,
-      "id" : "IAACTION3"
-    } ],
-    "timeout" : -1,
-    "topPos" : 210,
-    "wFProcessType" : "INTERACTIVE",
-    "wFStepValue" : "用户任务",
-    "width" : 100,
-    "asynchronousProcess" : false,
-    "enableTimeout" : false,
-    "sendInform" : false
-  }, {
-    "codeName" : "INTERACTIVE_03",
-    "height" : 80,
-    "leftPos" : 300,
-    "logicName" : "用户任务",
-    "msgType" : 0,
-    "multiInstMode" : "NONE",
-    "name" : "用户任务",
-    "getPSWFLinks" : [ {
+      "id" : "WFRETURN1"
+    }, {
       "modelref" : true,
-      "id" : "IAACTION2"
+      "id" : "WFRETURN2"
     } ],
     "timeout" : -1,
-    "topPos" : 410,
-    "wFProcessType" : "INTERACTIVE",
-    "wFStepValue" : "用户任务",
-    "width" : 100,
-    "asynchronousProcess" : false,
-    "enableTimeout" : false,
-    "sendInform" : false
-  }, {
-    "codeName" : "TIMEREVENT_01",
-    "height" : 80,
-    "leftPos" : 150,
-    "logicName" : "中间定时器捕获事件",
-    "name" : "中间定时器捕获事件",
-    "timeout" : -1,
-    "topPos" : 380,
-    "wFProcessType" : "TIMEREVENT",
+    "topPos" : 580,
+    "wFProcessType" : "EMBED",
+    "wFStepValue" : "子流程",
     "width" : 100,
     "asynchronousProcess" : false,
     "enableTimeout" : false

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSWORKFLOWS/WorkFlowWf/PSWFVERSIONS/WorkFlowWfv1.json.bpmn

@@ -46,75 +46,76 @@
             <flowable:form process-form="startForm" process-mobform="startForm"  wfversion="1"/>
           </extensionElements>
      </startEvent>
-    <userTask flowable:category="${businessKey}"   flowable:candidateUsers="${wfCoreService.getGroupUsers('WfTest',execution)},${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="tid-20-0ec5b557aa979a307af5aa9680485404" name="审核">
+    <userTask flowable:category="${businessKey}"   flowable:candidateUsers="${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="tid--ab22480a12bdcbd7d86193b3d8ac3d05" name="中间定时器捕获事件">
          <documentation>${majortext}</documentation>
-         <extensionElements>
-         <flowable:form procfunc="reassign" process-form="ApprovalForm" process-mobform="ApprovalForm" process-util3form="WorkFlowEditView_Form" process-util3formname="工作流编辑_表单" process-mobutil3form="WorkFlowEditView_Form" process-mobutil3formname="工作流编辑_表单"  />
-         </extensionElements>
     </userTask>
-    <subProcess flowable:category="${businessKey}"   flowable:candidateUsers="${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="sid-d4312aaf86c0637aa219f15625a1a4c9" name="子流程"  flowable:formKey="EMBED">
+    <userTask flowable:category="${businessKey}"   flowable:candidateUsers="${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="tid-用户任务-c5410c36c8b14bb6e18a7faef92c2be7" name="用户任务">
          <documentation>${majortext}</documentation>
-    </subProcess>
-    <userTask flowable:category="${businessKey}"   flowable:candidateUsers="${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="tid-用户任务-111cb74e98b02ab1e9500a737674a5d6" name="用户任务">
+    </userTask>
+    <userTask flowable:category="${businessKey}"   flowable:candidateUsers="${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="tid-用户任务-bc2ba09f6a5735bd9d83a9b102873cbc" name="用户任务">
          <documentation>${majortext}</documentation>
     </userTask>
     <userTask flowable:category="${businessKey}"   flowable:candidateUsers="${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="tid-用户任务-90b05343d16e11b07c6828e5963925ea" name="用户任务">
          <documentation>${majortext}</documentation>
     </userTask>
-     <endEvent id="sid-53de4cc0be78ed2c689be324acd60ae7" name="结束事件">
-     </endEvent>
-    <userTask flowable:category="${businessKey}"   flowable:candidateUsers="${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="tid-用户任务-bc2ba09f6a5735bd9d83a9b102873cbc" name="用户任务">
+    <userTask flowable:category="${businessKey}"   flowable:candidateUsers="${wfCoreService.getGroupUsers('WfTest',execution)},${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="tid-20-0ec5b557aa979a307af5aa9680485404" name="审核">
          <documentation>${majortext}</documentation>
+         <extensionElements>
+         <flowable:form procfunc="reassign" process-form="ApprovalForm" process-mobform="ApprovalForm" process-util3form="WorkFlowEditView_Form" process-util3formname="工作流编辑_表单" process-mobutil3form="WorkFlowEditView_Form" process-mobutil3formname="工作流编辑_表单"  />
+         </extensionElements>
     </userTask>
-    <userTask flowable:category="${businessKey}"   flowable:candidateUsers="${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="tid-用户任务-c5410c36c8b14bb6e18a7faef92c2be7" name="用户任务">
+    <userTask flowable:category="${businessKey}"   flowable:candidateUsers="${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="tid-用户任务-111cb74e98b02ab1e9500a737674a5d6" name="用户任务">
          <documentation>${majortext}</documentation>
     </userTask>
-    <userTask flowable:category="${businessKey}"   flowable:candidateUsers="${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="tid--ab22480a12bdcbd7d86193b3d8ac3d05" name="中间定时器捕获事件">
+     <endEvent id="sid-53de4cc0be78ed2c689be324acd60ae7" name="结束事件">
+     </endEvent>
+    <subProcess flowable:category="${businessKey}"   flowable:candidateUsers="${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="sid-d4312aaf86c0637aa219f15625a1a4c9" name="子流程"  flowable:formKey="EMBED">
          <documentation>${majortext}</documentation>
-    </userTask>
-      <sequenceFlow id="rid-cc89215936f59de79fc3b5761d50ce7a" sourceRef="sid-f2f162e01f7fe7d08374a565e1edb2af" targetRef="tid-20-0ec5b557aa979a307af5aa9680485404" name="">
+    </subProcess>
+      <sequenceFlow id="rid-defbc7ba54a6530d515f098656fb5cab" sourceRef="sid-f2f162e01f7fe7d08374a565e1edb2af" targetRef="tid-20-0ec5b557aa979a307af5aa9680485404" name="">
+        <conditionExpression  xsi:type="tFormalExpression" ><![CDATA[${(((wfCoreService.test(activedata.updateman, 'GT', wfCoreService.getnow())))&&())} ]]></conditionExpression>
      </sequenceFlow>
-      <sequenceFlow id="lid-IAACTION-e18050f24c6ae2ab06e0c1d003413f42" sourceRef="tid-20-0ec5b557aa979a307af5aa9680485404" targetRef="sid-53de4cc0be78ed2c689be324acd60ae7" name="审批">
-        <conditionExpression  xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-IAACTION-e18050f24c6ae2ab06e0c1d003413f42"}]]></conditionExpression>
+      <sequenceFlow id="lid-IAACTION2-e3373ca5c42107ce2b0fe50c0807bd01" sourceRef="tid-用户任务-c5410c36c8b14bb6e18a7faef92c2be7" targetRef="tid-用户任务-90b05343d16e11b07c6828e5963925ea" name="交互连接">
+        <conditionExpression  xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-IAACTION2-e3373ca5c42107ce2b0fe50c0807bd01"}]]></conditionExpression>
          <extensionElements>
-             <flowable:form sequenceFlowForm="WorkFlowEditView_Form" sequenceFlowMobForm="WorkFlowEditView_Form" sequenceFlowView="WFDynaActionView" sequenceFlowMobView="MobWFDynaActionView" nextCondition="ANY"  />
+             <flowable:form nextCondition="ANY"  />
          </extensionElements>
      </sequenceFlow>
-      <sequenceFlow id="lid-WFRETURN-ee20ca437bac9795a58c0ec2d14fb1ef" sourceRef="sid-d4312aaf86c0637aa219f15625a1a4c9" targetRef="sid-53de4cc0be78ed2c689be324acd60ae7" name="嵌套流程返回">
+      <sequenceFlow id="lid-IAACTION1-3080f4ac8692358d21cd4b6525683622" sourceRef="tid-用户任务-bc2ba09f6a5735bd9d83a9b102873cbc" targetRef="tid-用户任务-c5410c36c8b14bb6e18a7faef92c2be7" name="交互连接">
+        <conditionExpression  xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-IAACTION1-3080f4ac8692358d21cd4b6525683622"}]]></conditionExpression>
          <extensionElements>
              <flowable:form nextCondition="ANY"  />
          </extensionElements>
      </sequenceFlow>
-      <sequenceFlow id="lid-WFRETURN1-fa12787d9e4c760c4247914ebb580dcd" sourceRef="sid-d4312aaf86c0637aa219f15625a1a4c9" targetRef="tid-用户任务-90b05343d16e11b07c6828e5963925ea" name="嵌套流程返回">
+      <sequenceFlow id="lid-IAACTION3-563392da942fe045613f2fe8aa1146cb" sourceRef="tid-用户任务-bc2ba09f6a5735bd9d83a9b102873cbc" targetRef="tid-用户任务-111cb74e98b02ab1e9500a737674a5d6" name="交互连接">
+        <conditionExpression  xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-IAACTION3-563392da942fe045613f2fe8aa1146cb"}]]></conditionExpression>
          <extensionElements>
              <flowable:form nextCondition="ANY"  />
          </extensionElements>
      </sequenceFlow>
-      <sequenceFlow id="lid-WFRETURN2-e618d33eddb9034f11a8745084b3740d" sourceRef="sid-d4312aaf86c0637aa219f15625a1a4c9" targetRef="tid-20-0ec5b557aa979a307af5aa9680485404" name="嵌套流程返回">
+      <sequenceFlow id="lid-IAACTION-97b8ddcf4203493760745fb4a28904a0" sourceRef="tid-20-0ec5b557aa979a307af5aa9680485404" targetRef="sid-53de4cc0be78ed2c689be324acd60ae7" name="审批">
+        <conditionExpression  xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-IAACTION-97b8ddcf4203493760745fb4a28904a0"}]]></conditionExpression>
          <extensionElements>
-             <flowable:form nextCondition="ANY"  />
+             <flowable:form sequenceFlowForm="WorkFlowEditView_Form" sequenceFlowMobForm="WorkFlowEditView_Form" sequenceFlowView="WFDynaActionView" sequenceFlowMobView="MobWFDynaActionView" nextCondition="ANY"  />
          </extensionElements>
      </sequenceFlow>
-      <sequenceFlow id="lid-IAACTION4-c651fe38efaf13c6ab8e801fe722a539" sourceRef="tid-用户任务-111cb74e98b02ab1e9500a737674a5d6" targetRef="sid-f2f162e01f7fe7d08374a565e1edb2af" name="交互连接">
-        <conditionExpression  xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-IAACTION4-c651fe38efaf13c6ab8e801fe722a539"}]]></conditionExpression>
+      <sequenceFlow id="lid-IAACTION4-58b8496043a72fca2fbff2633dab23fa" sourceRef="tid-用户任务-111cb74e98b02ab1e9500a737674a5d6" targetRef="sid-f2f162e01f7fe7d08374a565e1edb2af" name="交互连接">
+        <conditionExpression  xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-IAACTION4-58b8496043a72fca2fbff2633dab23fa"}]]></conditionExpression>
          <extensionElements>
              <flowable:form nextCondition="ANY"  />
          </extensionElements>
      </sequenceFlow>
-      <sequenceFlow id="lid-IAACTION1-ecb40818437ef2ca9b2f4b7015639674" sourceRef="tid-用户任务-bc2ba09f6a5735bd9d83a9b102873cbc" targetRef="tid-用户任务-c5410c36c8b14bb6e18a7faef92c2be7" name="交互连接">
-        <conditionExpression  xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-IAACTION1-ecb40818437ef2ca9b2f4b7015639674"}]]></conditionExpression>
+      <sequenceFlow id="lid-WFRETURN-14335bd06acdcd10c13a9c3f822dfab1" sourceRef="sid-d4312aaf86c0637aa219f15625a1a4c9" targetRef="sid-53de4cc0be78ed2c689be324acd60ae7" name="嵌套流程返回">
          <extensionElements>
              <flowable:form nextCondition="ANY"  />
          </extensionElements>
      </sequenceFlow>
-      <sequenceFlow id="lid-IAACTION3-d0e18b65439485590150ac9eeb3fb8dc" sourceRef="tid-用户任务-bc2ba09f6a5735bd9d83a9b102873cbc" targetRef="tid-用户任务-111cb74e98b02ab1e9500a737674a5d6" name="交互连接">
-        <conditionExpression  xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-IAACTION3-d0e18b65439485590150ac9eeb3fb8dc"}]]></conditionExpression>
+      <sequenceFlow id="lid-WFRETURN1-abf8d175027bd5f6374e4f8914f3e2a5" sourceRef="sid-d4312aaf86c0637aa219f15625a1a4c9" targetRef="tid-用户任务-90b05343d16e11b07c6828e5963925ea" name="嵌套流程返回">
          <extensionElements>
              <flowable:form nextCondition="ANY"  />
          </extensionElements>
      </sequenceFlow>
-      <sequenceFlow id="lid-IAACTION2-250ae687177ad56d505645c658a2d9eb" sourceRef="tid-用户任务-c5410c36c8b14bb6e18a7faef92c2be7" targetRef="tid-用户任务-90b05343d16e11b07c6828e5963925ea" name="交互连接">
-        <conditionExpression  xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-IAACTION2-250ae687177ad56d505645c658a2d9eb"}]]></conditionExpression>
+      <sequenceFlow id="lid-WFRETURN2-bfff12bf7b1f0e7e07d4ea62b5549d8d" sourceRef="sid-d4312aaf86c0637aa219f15625a1a4c9" targetRef="tid-20-0ec5b557aa979a307af5aa9680485404" name="嵌套流程返回">
          <extensionElements>
              <flowable:form nextCondition="ANY"  />
          </extensionElements>
@@ -125,63 +126,63 @@
                  <bpmndi:BPMNShape id="BPMNShape-f2f162e01f7fe7d08374a565e1edb2af" bpmnElement="sid-f2f162e01f7fe7d08374a565e1edb2af">
                      <omgdi:Bounds x="740" y="70" width="30" height="30" />
                  </bpmndi:BPMNShape>
-                 <bpmndi:BPMNShape id="BPMNShape-0ec5b557aa979a307af5aa9680485404" bpmnElement="tid-20-0ec5b557aa979a307af5aa9680485404">
-                     <omgdi:Bounds x="910" y="210" width="100" height="80" />
+                 <bpmndi:BPMNShape id="BPMNShape-ab22480a12bdcbd7d86193b3d8ac3d05" bpmnElement="sid-ab22480a12bdcbd7d86193b3d8ac3d05">
+                     <omgdi:Bounds x="150" y="380" width="100" height="80" />
                  </bpmndi:BPMNShape>
-                 <bpmndi:BPMNShape id="BPMNShape-d4312aaf86c0637aa219f15625a1a4c9" bpmnElement="sid-d4312aaf86c0637aa219f15625a1a4c9">
-                     <omgdi:Bounds x="580" y="580" width="100" height="80" />
+                 <bpmndi:BPMNShape id="BPMNShape-c5410c36c8b14bb6e18a7faef92c2be7" bpmnElement="tid-用户任务-c5410c36c8b14bb6e18a7faef92c2be7">
+                     <omgdi:Bounds x="300" y="410" width="100" height="80" />
                  </bpmndi:BPMNShape>
-                 <bpmndi:BPMNShape id="BPMNShape-111cb74e98b02ab1e9500a737674a5d6" bpmnElement="tid-用户任务-111cb74e98b02ab1e9500a737674a5d6">
-                     <omgdi:Bounds x="280" y="20" width="100" height="80" />
+                 <bpmndi:BPMNShape id="BPMNShape-bc2ba09f6a5735bd9d83a9b102873cbc" bpmnElement="tid-用户任务-bc2ba09f6a5735bd9d83a9b102873cbc">
+                     <omgdi:Bounds x="260" y="210" width="100" height="80" />
                  </bpmndi:BPMNShape>
                  <bpmndi:BPMNShape id="BPMNShape-90b05343d16e11b07c6828e5963925ea" bpmnElement="tid-用户任务-90b05343d16e11b07c6828e5963925ea">
                      <omgdi:Bounds x="260" y="610" width="100" height="80" />
                  </bpmndi:BPMNShape>
-                 <bpmndi:BPMNShape id="BPMNShape-53de4cc0be78ed2c689be324acd60ae7" bpmnElement="sid-53de4cc0be78ed2c689be324acd60ae7">
-                     <omgdi:Bounds x="740" y="420" width="30" height="30" />
+                 <bpmndi:BPMNShape id="BPMNShape-0ec5b557aa979a307af5aa9680485404" bpmnElement="tid-20-0ec5b557aa979a307af5aa9680485404">
+                     <omgdi:Bounds x="910" y="210" width="100" height="80" />
                  </bpmndi:BPMNShape>
-                 <bpmndi:BPMNShape id="BPMNShape-bc2ba09f6a5735bd9d83a9b102873cbc" bpmnElement="tid-用户任务-bc2ba09f6a5735bd9d83a9b102873cbc">
-                     <omgdi:Bounds x="260" y="210" width="100" height="80" />
+                 <bpmndi:BPMNShape id="BPMNShape-111cb74e98b02ab1e9500a737674a5d6" bpmnElement="tid-用户任务-111cb74e98b02ab1e9500a737674a5d6">
+                     <omgdi:Bounds x="280" y="20" width="100" height="80" />
                  </bpmndi:BPMNShape>
-                 <bpmndi:BPMNShape id="BPMNShape-c5410c36c8b14bb6e18a7faef92c2be7" bpmnElement="tid-用户任务-c5410c36c8b14bb6e18a7faef92c2be7">
-                     <omgdi:Bounds x="300" y="410" width="100" height="80" />
+                 <bpmndi:BPMNShape id="BPMNShape-53de4cc0be78ed2c689be324acd60ae7" bpmnElement="sid-53de4cc0be78ed2c689be324acd60ae7">
+                     <omgdi:Bounds x="740" y="420" width="30" height="30" />
                  </bpmndi:BPMNShape>
-                 <bpmndi:BPMNShape id="BPMNShape-ab22480a12bdcbd7d86193b3d8ac3d05" bpmnElement="sid-ab22480a12bdcbd7d86193b3d8ac3d05">
-                     <omgdi:Bounds x="150" y="380" width="100" height="80" />
+                 <bpmndi:BPMNShape id="BPMNShape-d4312aaf86c0637aa219f15625a1a4c9" bpmnElement="sid-d4312aaf86c0637aa219f15625a1a4c9">
+                     <omgdi:Bounds x="580" y="580" width="100" height="80" />
                  </bpmndi:BPMNShape>
-               <bpmndi:BPMNEdge id="BPMNEdge-rid-cc89215936f59de79fc3b5761d50ce7a" bpmnElement="rid-cc89215936f59de79fc3b5761d50ce7a">
+               <bpmndi:BPMNEdge id="BPMNEdge-rid-defbc7ba54a6530d515f098656fb5cab" bpmnElement="rid-defbc7ba54a6530d515f098656fb5cab">
                    <omgdi:waypoint x="0" y="0" />
                    <omgdi:waypoint x="0" y="0" />
                </bpmndi:BPMNEdge>
-               <bpmndi:BPMNEdge id="BPMNEdge-lid-IAACTION-e18050f24c6ae2ab06e0c1d003413f42" bpmnElement="lid-IAACTION-e18050f24c6ae2ab06e0c1d003413f42">
+               <bpmndi:BPMNEdge id="BPMNEdge-lid-IAACTION2-e3373ca5c42107ce2b0fe50c0807bd01" bpmnElement="lid-IAACTION2-e3373ca5c42107ce2b0fe50c0807bd01">
                    <omgdi:waypoint x="0" y="0" />
                    <omgdi:waypoint x="0" y="0" />
                </bpmndi:BPMNEdge>
-               <bpmndi:BPMNEdge id="BPMNEdge-lid-WFRETURN-ee20ca437bac9795a58c0ec2d14fb1ef" bpmnElement="lid-WFRETURN-ee20ca437bac9795a58c0ec2d14fb1ef">
+               <bpmndi:BPMNEdge id="BPMNEdge-lid-IAACTION1-3080f4ac8692358d21cd4b6525683622" bpmnElement="lid-IAACTION1-3080f4ac8692358d21cd4b6525683622">
                    <omgdi:waypoint x="0" y="0" />
                    <omgdi:waypoint x="0" y="0" />
                </bpmndi:BPMNEdge>
-               <bpmndi:BPMNEdge id="BPMNEdge-lid-WFRETURN1-fa12787d9e4c760c4247914ebb580dcd" bpmnElement="lid-WFRETURN1-fa12787d9e4c760c4247914ebb580dcd">
+               <bpmndi:BPMNEdge id="BPMNEdge-lid-IAACTION3-563392da942fe045613f2fe8aa1146cb" bpmnElement="lid-IAACTION3-563392da942fe045613f2fe8aa1146cb">
                    <omgdi:waypoint x="0" y="0" />
                    <omgdi:waypoint x="0" y="0" />
                </bpmndi:BPMNEdge>
-               <bpmndi:BPMNEdge id="BPMNEdge-lid-WFRETURN2-e618d33eddb9034f11a8745084b3740d" bpmnElement="lid-WFRETURN2-e618d33eddb9034f11a8745084b3740d">
+               <bpmndi:BPMNEdge id="BPMNEdge-lid-IAACTION-97b8ddcf4203493760745fb4a28904a0" bpmnElement="lid-IAACTION-97b8ddcf4203493760745fb4a28904a0">
                    <omgdi:waypoint x="0" y="0" />
                    <omgdi:waypoint x="0" y="0" />
                </bpmndi:BPMNEdge>
-               <bpmndi:BPMNEdge id="BPMNEdge-lid-IAACTION4-c651fe38efaf13c6ab8e801fe722a539" bpmnElement="lid-IAACTION4-c651fe38efaf13c6ab8e801fe722a539">
+               <bpmndi:BPMNEdge id="BPMNEdge-lid-IAACTION4-58b8496043a72fca2fbff2633dab23fa" bpmnElement="lid-IAACTION4-58b8496043a72fca2fbff2633dab23fa">
                    <omgdi:waypoint x="0" y="0" />
                    <omgdi:waypoint x="0" y="0" />
                </bpmndi:BPMNEdge>
-               <bpmndi:BPMNEdge id="BPMNEdge-lid-IAACTION1-ecb40818437ef2ca9b2f4b7015639674" bpmnElement="lid-IAACTION1-ecb40818437ef2ca9b2f4b7015639674">
+               <bpmndi:BPMNEdge id="BPMNEdge-lid-WFRETURN-14335bd06acdcd10c13a9c3f822dfab1" bpmnElement="lid-WFRETURN-14335bd06acdcd10c13a9c3f822dfab1">
                    <omgdi:waypoint x="0" y="0" />
                    <omgdi:waypoint x="0" y="0" />
                </bpmndi:BPMNEdge>
-               <bpmndi:BPMNEdge id="BPMNEdge-lid-IAACTION3-d0e18b65439485590150ac9eeb3fb8dc" bpmnElement="lid-IAACTION3-d0e18b65439485590150ac9eeb3fb8dc">
+               <bpmndi:BPMNEdge id="BPMNEdge-lid-WFRETURN1-abf8d175027bd5f6374e4f8914f3e2a5" bpmnElement="lid-WFRETURN1-abf8d175027bd5f6374e4f8914f3e2a5">
                    <omgdi:waypoint x="0" y="0" />
                    <omgdi:waypoint x="0" y="0" />
                </bpmndi:BPMNEdge>
-               <bpmndi:BPMNEdge id="BPMNEdge-lid-IAACTION2-250ae687177ad56d505645c658a2d9eb" bpmnElement="lid-IAACTION2-250ae687177ad56d505645c658a2d9eb">
+               <bpmndi:BPMNEdge id="BPMNEdge-lid-WFRETURN2-bfff12bf7b1f0e7e07d4ea62b5549d8d" bpmnElement="lid-WFRETURN2-bfff12bf7b1f0e7e07d4ea62b5549d8d">
                    <omgdi:waypoint x="0" y="0" />
                    <omgdi:waypoint x="0" y="0" />
                </bpmndi:BPMNEdge>

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDEVIEWS/WorkFlowDoneMobEditView.json

@@ -484,6 +484,7 @@
   "title" : "已办移动端编辑视图",
   "viewStyle" : "DEFAULT",
   "viewType" : "DEMOBEDITVIEW",
+  "wFCodeName" : "WorkFlowWf",
   "xDataControlName" : "form",
   "enableDP" : true,
   "enablePullDownRefresh" : false,

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDEVIEWS/WorkFlowMobRedirectView.json

@@ -103,6 +103,7 @@
   "title" : "工作流移动端数据重定向视图",
   "viewStyle" : "DEFAULT",
   "viewType" : "DEMOBREDIRECTVIEW",
+  "wFCodeName" : "WorkFlowWf",
   "enableCustomGetDataAction" : false,
   "enableDP" : true,
   "enableWorkflow" : true,

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDEVIEWS/WorkFlowMobWFDynaActionView.json

@@ -1536,6 +1536,7 @@
   "title" : " 实体移动端工作流动态操作视图",
   "viewStyle" : "DEFAULT",
   "viewType" : "DEMOBWFDYNAACTIONVIEW",
+  "wFCodeName" : "WorkFlowWf",
   "xDataControlName" : "form",
   "enableDP" : true,
   "enablePullDownRefresh" : false,

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDEVIEWS/WorkFlowMobWFDynaEditView.json

@@ -1337,6 +1337,7 @@
   "title" : "实体移动端工作流动态编辑视图",
   "viewStyle" : "DEFAULT",
   "viewType" : "DEMOBWFDYNAEDITVIEW",
+  "wFCodeName" : "WorkFlowWf",
   "xDataControlName" : "form",
   "enableDP" : true,
   "enablePullDownRefresh" : false,

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDEVIEWS/WorkFlowMobWFDynaEditView3.json

@@ -1367,6 +1367,7 @@
   "title" : " 实体移动端工作流动态编辑视图（分页关系）",
   "viewStyle" : "DEFAULT",
   "viewType" : "DEMOBWFDYNAEDITVIEW3",
+  "wFCodeName" : "WorkFlowWf",
   "xDataControlName" : "form",
   "enableDP" : true,
   "enablePullDownRefresh" : false,

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDEVIEWS/WorkFlowMobWFDynaStartView.json

@@ -1317,6 +1317,7 @@
   "title" : " 实体移动端工作流动态启动视图",
   "viewStyle" : "DEFAULT",
   "viewType" : "DEMOBWFDYNASTARTVIEW",
+  "wFCodeName" : "WorkFlowWf",
   "xDataControlName" : "form",
   "enableDP" : true,
   "enablePullDownRefresh" : false,

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDEVIEWS/WorkFlowWFMobEditView.json

@@ -944,6 +944,7 @@
   "title" : "移动端工作流编辑",
   "viewStyle" : "DEFAULT",
   "viewType" : "DEMOBEDITVIEW",
+  "wFCodeName" : "WorkFlowWf",
   "xDataControlName" : "form",
   "enableDP" : true,
   "enablePullDownRefresh" : false,

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

@@ -5247,6 +5247,7 @@
       "title" : "移动端工作流编辑",
       "viewStyle" : "DEFAULT",
       "viewType" : "DEMOBEDITVIEW",
+      "wFCodeName" : "WorkFlowWf",
       "xDataControlName" : "form",
       "enableDP" : true,
       "enablePullDownRefresh" : false,

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

@@ -1517,16 +1517,16 @@
     "codeName" : "VMGroup2",
     "name" : "视图消息组2",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息",
+      "name" : "视图消息2",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
       }
     }, {
-      "name" : "视图消息2",
+      "name" : "视图消息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
       }
     } ]
   }, {

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

@@ -1506,6 +1506,7 @@
   "title" : "已办编辑视图",
   "viewStyle" : "DEFAULT",
   "viewType" : "DEEDITVIEW",
+  "wFCodeName" : "WorkFlowWf",
   "xDataControlName" : "form",
   "enableDP" : true,
   "showDataInfoBar" : true,

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

@@ -1513,6 +1513,7 @@
   },
   "viewStyle" : "DEFAULT",
   "viewType" : "DEEDITVIEW",
+  "wFCodeName" : "WorkFlowWf",
   "xDataControlName" : "form",
   "enableDP" : true,
   "showDataInfoBar" : true,

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

@@ -1197,6 +1197,7 @@
   },
   "viewStyle" : "DEFAULT",
   "viewType" : "DEGRIDVIEW",
+  "wFCodeName" : "WorkFlowWf",
   "xDataControlName" : "grid",
   "enableDP" : true,
   "enableExport" : true,

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

@@ -1535,6 +1535,7 @@
   "title" : " 实体移动端工作流动态操作视图",
   "viewStyle" : "DEFAULT",
   "viewType" : "DEMOBWFDYNAACTIONVIEW",
+  "wFCodeName" : "WorkFlowWf",
   "xDataControlName" : "form",
   "enableDP" : true,
   "enablePullDownRefresh" : false,

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

@@ -1366,6 +1366,7 @@
   "title" : " 实体移动端工作流动态编辑视图（分页关系）",
   "viewStyle" : "DEFAULT",
   "viewType" : "DEMOBWFDYNAEDITVIEW3",
+  "wFCodeName" : "WorkFlowWf",
   "xDataControlName" : "form",
   "enableDP" : true,
   "enablePullDownRefresh" : false,

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

@@ -171,6 +171,7 @@
   },
   "viewStyle" : "DEFAULT",
   "viewType" : "DEREDIRECTVIEW",
+  "wFCodeName" : "WorkFlowWf",
   "enableCustomGetDataAction" : false,
   "enableDP" : true,
   "enableWorkflow" : true,

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

@@ -1506,6 +1506,7 @@
   "title" : "已建编辑视图",
   "viewStyle" : "DEFAULT",
   "viewType" : "DEEDITVIEW",
+  "wFCodeName" : "WorkFlowWf",
   "xDataControlName" : "form",
   "enableDP" : true,
   "showDataInfoBar" : true,

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

@@ -1533,6 +1533,7 @@
   "title" : "工作流动态操作视图",
   "viewStyle" : "DEFAULT",
   "viewType" : "DEWFDYNAACTIONVIEW",
+  "wFCodeName" : "WorkFlowWf",
   "xDataControlName" : "form",
   "enableDP" : true,
   "enableWF" : true,

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

@@ -1588,6 +1588,7 @@
   "title" : "工作流动态编辑视图",
   "viewStyle" : "DEFAULT",
   "viewType" : "DEWFDYNAEDITVIEW",
+  "wFCodeName" : "WorkFlowWf",
   "xDataControlName" : "form",
   "enableDP" : true,
   "enableWF" : true,

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

@@ -1611,6 +1611,7 @@
   "title" : "工作流动态编辑视图分页关系",
   "viewStyle" : "DEFAULT",
   "viewType" : "DEWFDYNAEDITVIEW3",
+  "wFCodeName" : "WorkFlowWf",
   "xDataControlName" : "form",
   "enableDP" : true,
   "enableWF" : true,

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

@@ -1315,6 +1315,7 @@
   "title" : "工作流启动视图",
   "viewStyle" : "DEFAULT",
   "viewType" : "DEWFDYNASTARTVIEW",
+  "wFCodeName" : "WorkFlowWf",
   "xDataControlName" : "form",
   "enableDP" : true,
   "enableWF" : true,

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

@@ -973,6 +973,7 @@
   "title" : "工作流编辑",
   "viewStyle" : "DEFAULT",
   "viewType" : "DEEDITVIEW",
+  "wFCodeName" : "WorkFlowWf",
   "xDataControlName" : "form",
   "enableDP" : true,
   "showDataInfoBar" : true,

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

@@ -12448,16 +12448,16 @@
     "codeName" : "VMGroup2",
     "name" : "视图消息组2",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息",
+      "name" : "视图消息2",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
       }
     }, {
-      "name" : "视图消息2",
+      "name" : "视图消息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
       }
     } ]
   }, {
@@ -12518,63 +12518,57 @@
     "codeName" : "VMGroup4",
     "name" : "视图消息位置测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息位置-视图上方",
+      "name" : "消息位置-弹出",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg7"
+        "id" : "ViewMsg10"
       }
     }, {
-      "name" : "消息位置-视图下方",
+      "name" : "消息位置-视图上方",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg7"
       }
     }, {
-      "name" : "消息位置-弹出",
+      "name" : "消息位置-视图内容区",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg10"
+        "id" : "ViewMsg9"
       }
     }, {
-      "name" : "消息位置-视图内容区",
+      "name" : "消息位置-视图下方",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg9"
+        "id" : "ViewMsg8"
       }
     } ]
   }, {
     "codeName" : "VMGroup8",
     "name" : "【静态测试】",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息位置-视图内容区",
+      "name" : "关闭模式-本次删除-上方-警告",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg9"
+        "id" : "ViewMsg13"
       }
     }, {
-      "name" : "关闭模式-默认删除-上方-错误",
+      "name" : "消息位置-视图下方",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg12"
+        "id" : "ViewMsg8"
       }
     }, {
-      "name" : "消息类型-警告信息",
+      "name" : "消息类型-错误信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg5"
+        "id" : "ViewMsg6"
       },
       "position" : "POPUP"
     }, {
-      "name" : "关闭模式-本次删除-上方-警告",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg13"
-      }
-    }, {
-      "name" : "消息类型-错误信息",
+      "name" : "消息类型-警告信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg6"
+        "id" : "ViewMsg5"
       },
       "position" : "POPUP"
     }, {
@@ -12591,48 +12585,54 @@
       },
       "position" : "POPUP"
     }, {
-      "name" : "消息位置-视图下方",
+      "name" : "关闭模式-默认删除-上方-错误",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg12"
+      }
+    }, {
+      "name" : "消息位置-视图内容区",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg9"
       }
     } ]
   }, {
     "codeName" : "VMGroup5",
     "name" : "视图消息关闭模式",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-本次删除",
+      "name" : "关闭模式-默认删除",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg13"
+        "id" : "ViewMsg12"
       }
     }, {
-      "name" : "关闭模式-无删除",
+      "name" : "关闭模式-本次删除",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg11"
+        "id" : "ViewMsg13"
       }
     }, {
-      "name" : "关闭模式-默认删除",
+      "name" : "关闭模式-无删除",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg12"
+        "id" : "ViewMsg11"
       }
     } ]
   }, {
     "codeName" : "VMGroup6",
     "name" : "视图消息动态模式测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "动态模式-静态内容",
+      "name" : "动态模式-实体数据集",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg15"
+        "id" : "ViewMsg14"
       }
     }, {
-      "name" : "动态模式-实体数据集",
+      "name" : "动态模式-静态内容",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg14"
+        "id" : "ViewMsg15"
       }
     } ]
   } ],