tony001 发布系统代码 [TrainSys，Mob]

app_Mob/.npmrc

+registry=https://registry.npmjs.org/

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

@@ -13,22 +13,22 @@
       "groupOP" : "AND",
       "name" : "连接条件",
       "getPSWFLinkConds" : [ {
+        "condType" : "GROUP",
+        "groupOP" : "OR",
+        "name" : "逻辑分组",
+        "notMode" : false
+      }, {
         "condType" : "GROUP",
         "groupOP" : "AND",
         "name" : "逻辑分组",
         "getPSWFLinkConds" : [ {
-          "condOP" : "GT",
+          "condOP" : "ISNULL",
           "condType" : "SINGLE",
-          "fieldName" : "UPDATEMAN",
+          "fieldName" : "dddd",
           "name" : "逻辑项",
-          "paramType" : "CURTIME"
+          "paramType" : "ENTITYFIELD"
         } ],
         "notMode" : false
-      }, {
-        "condType" : "GROUP",
-        "groupOP" : "OR",
-        "name" : "逻辑分组",
-        "notMode" : false
       } ],
       "notMode" : false
     },
@@ -37,19 +37,6 @@
       "id" : "INTERACTIVE_01"
     },
     "wFLinkType" : "ROUTE"
-  }, {
-    "getFromPSWFProcess" : {
-      "modelref" : true,
-      "id" : "INTERACTIVE_03"
-    },
-    "logicName" : "交互连接",
-    "name" : "IAACTION2",
-    "nextCondition" : "ANY",
-    "getToPSWFProcess" : {
-      "modelref" : true,
-      "id" : "INTERACTIVE_04"
-    },
-    "wFLinkType" : "IAACTION"
   }, {
     "getFromPSWFProcess" : {
       "modelref" : true,
@@ -108,6 +95,19 @@
       "id" : "START_01"
     },
     "wFLinkType" : "IAACTION"
+  }, {
+    "getFromPSWFProcess" : {
+      "modelref" : true,
+      "id" : "INTERACTIVE_03"
+    },
+    "logicName" : "交互连接",
+    "name" : "IAACTION2",
+    "nextCondition" : "ANY",
+    "getToPSWFProcess" : {
+      "modelref" : true,
+      "id" : "INTERACTIVE_04"
+    },
+    "wFLinkType" : "IAACTION"
   }, {
     "getFromPSWFProcess" : {
       "modelref" : true,
@@ -164,38 +164,6 @@
     "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,
@@ -235,6 +203,18 @@
     "asynchronousProcess" : false,
     "enableTimeout" : false,
     "sendInform" : false
+  }, {
+    "codeName" : "TIMEREVENT_01",
+    "height" : 80,
+    "leftPos" : 150,
+    "logicName" : "中间定时器捕获事件",
+    "name" : "中间定时器捕获事件",
+    "timeout" : -1,
+    "topPos" : 380,
+    "wFProcessType" : "TIMEREVENT",
+    "width" : 100,
+    "asynchronousProcess" : false,
+    "enableTimeout" : false
   }, {
     "codeName" : "INTERACTIVE_01",
     "formCodeName" : "ApprovalForm",
@@ -276,6 +256,19 @@
     "asynchronousProcess" : false,
     "enableTimeout" : false,
     "sendInform" : false
+  }, {
+    "codeName" : "END_01",
+    "height" : 30,
+    "leftPos" : 740,
+    "logicName" : "结束事件",
+    "name" : "结束事件",
+    "timeout" : -1,
+    "topPos" : 420,
+    "wFProcessType" : "END",
+    "width" : 30,
+    "asynchronousProcess" : false,
+    "enableTimeout" : false,
+    "terminalProcess" : true
   }, {
     "codeName" : "INTERACTIVE_05",
     "height" : 80,
@@ -297,18 +290,25 @@
     "enableTimeout" : false,
     "sendInform" : false
   }, {
-    "codeName" : "END_01",
-    "height" : 30,
-    "leftPos" : 740,
-    "logicName" : "结束事件",
-    "name" : "结束事件",
+    "codeName" : "INTERACTIVE_03",
+    "height" : 80,
+    "leftPos" : 300,
+    "logicName" : "用户任务",
+    "msgType" : 0,
+    "multiInstMode" : "NONE",
+    "name" : "用户任务",
+    "getPSWFLinks" : [ {
+      "modelref" : true,
+      "id" : "IAACTION2"
+    } ],
     "timeout" : -1,
-    "topPos" : 420,
-    "wFProcessType" : "END",
-    "width" : 30,
+    "topPos" : 410,
+    "wFProcessType" : "INTERACTIVE",
+    "wFStepValue" : "用户任务",
+    "width" : 100,
     "asynchronousProcess" : false,
     "enableTimeout" : false,
-    "terminalProcess" : true
+    "sendInform" : false
   }, {
     "codeName" : "EMBED_01",
     "height" : 80,

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

@@ -46,76 +46,76 @@
             <flowable:form process-form="startForm" process-mobform="startForm"  wfversion="1"/>
           </extensionElements>
      </startEvent>
-    <userTask flowable:category="${businessKey}"   flowable:candidateUsers="${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="tid--ab22480a12bdcbd7d86193b3d8ac3d05" name="中间定时器捕获事件">
-         <documentation>${majortext}</documentation>
-    </userTask>
-    <userTask flowable:category="${businessKey}"   flowable:candidateUsers="${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="tid-用户任务-c5410c36c8b14bb6e18a7faef92c2be7" name="用户任务">
-         <documentation>${majortext}</documentation>
-    </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>
+    <userTask flowable:category="${businessKey}"   flowable:candidateUsers="${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="tid--ab22480a12bdcbd7d86193b3d8ac3d05" name="中间定时器捕获事件">
+         <documentation>${majortext}</documentation>
+    </userTask>
     <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>
+     <endEvent id="sid-53de4cc0be78ed2c689be324acd60ae7" name="结束事件">
+     </endEvent>
     <userTask flowable:category="${businessKey}"   flowable:candidateUsers="${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="tid-用户任务-111cb74e98b02ab1e9500a737674a5d6" name="用户任务">
          <documentation>${majortext}</documentation>
     </userTask>
-     <endEvent id="sid-53de4cc0be78ed2c689be324acd60ae7" name="结束事件">
-     </endEvent>
+    <userTask flowable:category="${businessKey}"   flowable:candidateUsers="${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="tid-用户任务-c5410c36c8b14bb6e18a7faef92c2be7" name="用户任务">
+         <documentation>${majortext}</documentation>
+    </userTask>
     <subProcess flowable:category="${businessKey}"   flowable:candidateUsers="${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="sid-d4312aaf86c0637aa219f15625a1a4c9" name="子流程"  flowable:formKey="EMBED">
          <documentation>${majortext}</documentation>
     </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 id="rid-96abe06a3ca2e1f374e14c4efcd078b6" sourceRef="sid-f2f162e01f7fe7d08374a565e1edb2af" targetRef="tid-20-0ec5b557aa979a307af5aa9680485404" name="">
+        <conditionExpression  xsi:type="tFormalExpression" ><![CDATA[${(()&&((wfCoreService.test(activedata.dddd, 'ISNULL', null))))} ]]></conditionExpression>
      </sequenceFlow>
-      <sequenceFlow id="lid-IAACTION2-e3373ca5c42107ce2b0fe50c0807bd01" sourceRef="tid-用户任务-c5410c36c8b14bb6e18a7faef92c2be7" targetRef="tid-用户任务-90b05343d16e11b07c6828e5963925ea" name="交互连接">
-        <conditionExpression  xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-IAACTION2-e3373ca5c42107ce2b0fe50c0807bd01"}]]></conditionExpression>
+      <sequenceFlow id="lid-IAACTION1-cd1865baa426b3611a36a6bce92e2491" sourceRef="tid-用户任务-bc2ba09f6a5735bd9d83a9b102873cbc" targetRef="tid-用户任务-c5410c36c8b14bb6e18a7faef92c2be7" name="交互连接">
+        <conditionExpression  xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-IAACTION1-cd1865baa426b3611a36a6bce92e2491"}]]></conditionExpression>
          <extensionElements>
              <flowable:form nextCondition="ANY"  />
          </extensionElements>
      </sequenceFlow>
-      <sequenceFlow id="lid-IAACTION1-3080f4ac8692358d21cd4b6525683622" sourceRef="tid-用户任务-bc2ba09f6a5735bd9d83a9b102873cbc" targetRef="tid-用户任务-c5410c36c8b14bb6e18a7faef92c2be7" name="交互连接">
-        <conditionExpression  xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-IAACTION1-3080f4ac8692358d21cd4b6525683622"}]]></conditionExpression>
+      <sequenceFlow id="lid-IAACTION3-595de3ec148bac11339f03d359c97570" sourceRef="tid-用户任务-bc2ba09f6a5735bd9d83a9b102873cbc" targetRef="tid-用户任务-111cb74e98b02ab1e9500a737674a5d6" name="交互连接">
+        <conditionExpression  xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-IAACTION3-595de3ec148bac11339f03d359c97570"}]]></conditionExpression>
          <extensionElements>
              <flowable:form nextCondition="ANY"  />
          </extensionElements>
      </sequenceFlow>
-      <sequenceFlow id="lid-IAACTION3-563392da942fe045613f2fe8aa1146cb" sourceRef="tid-用户任务-bc2ba09f6a5735bd9d83a9b102873cbc" targetRef="tid-用户任务-111cb74e98b02ab1e9500a737674a5d6" name="交互连接">
-        <conditionExpression  xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-IAACTION3-563392da942fe045613f2fe8aa1146cb"}]]></conditionExpression>
+      <sequenceFlow id="lid-IAACTION-8ab90885179c56021bf4cb9d5d839ba9" sourceRef="tid-20-0ec5b557aa979a307af5aa9680485404" targetRef="sid-53de4cc0be78ed2c689be324acd60ae7" name="审批">
+        <conditionExpression  xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-IAACTION-8ab90885179c56021bf4cb9d5d839ba9"}]]></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-IAACTION-97b8ddcf4203493760745fb4a28904a0" sourceRef="tid-20-0ec5b557aa979a307af5aa9680485404" targetRef="sid-53de4cc0be78ed2c689be324acd60ae7" name="审批">
-        <conditionExpression  xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-IAACTION-97b8ddcf4203493760745fb4a28904a0"}]]></conditionExpression>
+      <sequenceFlow id="lid-IAACTION4-8a9affbd96e353f4e281f5490befafa1" sourceRef="tid-用户任务-111cb74e98b02ab1e9500a737674a5d6" targetRef="sid-f2f162e01f7fe7d08374a565e1edb2af" name="交互连接">
+        <conditionExpression  xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-IAACTION4-8a9affbd96e353f4e281f5490befafa1"}]]></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-IAACTION4-58b8496043a72fca2fbff2633dab23fa" sourceRef="tid-用户任务-111cb74e98b02ab1e9500a737674a5d6" targetRef="sid-f2f162e01f7fe7d08374a565e1edb2af" name="交互连接">
-        <conditionExpression  xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-IAACTION4-58b8496043a72fca2fbff2633dab23fa"}]]></conditionExpression>
+      <sequenceFlow id="lid-IAACTION2-e549c88d892416cf030d2dfa327c466a" sourceRef="tid-用户任务-c5410c36c8b14bb6e18a7faef92c2be7" targetRef="tid-用户任务-90b05343d16e11b07c6828e5963925ea" name="交互连接">
+        <conditionExpression  xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-IAACTION2-e549c88d892416cf030d2dfa327c466a"}]]></conditionExpression>
          <extensionElements>
              <flowable:form nextCondition="ANY"  />
          </extensionElements>
      </sequenceFlow>
-      <sequenceFlow id="lid-WFRETURN-14335bd06acdcd10c13a9c3f822dfab1" sourceRef="sid-d4312aaf86c0637aa219f15625a1a4c9" targetRef="sid-53de4cc0be78ed2c689be324acd60ae7" name="嵌套流程返回">
+      <sequenceFlow id="lid-WFRETURN-c57de7810c01a58c6234f71df84db9b3" sourceRef="sid-d4312aaf86c0637aa219f15625a1a4c9" targetRef="sid-53de4cc0be78ed2c689be324acd60ae7" name="嵌套流程返回">
          <extensionElements>
              <flowable:form nextCondition="ANY"  />
          </extensionElements>
      </sequenceFlow>
-      <sequenceFlow id="lid-WFRETURN1-abf8d175027bd5f6374e4f8914f3e2a5" sourceRef="sid-d4312aaf86c0637aa219f15625a1a4c9" targetRef="tid-用户任务-90b05343d16e11b07c6828e5963925ea" name="嵌套流程返回">
+      <sequenceFlow id="lid-WFRETURN1-bd9466e3ee36bd0bfc552c9874a437ea" sourceRef="sid-d4312aaf86c0637aa219f15625a1a4c9" targetRef="tid-用户任务-90b05343d16e11b07c6828e5963925ea" name="嵌套流程返回">
          <extensionElements>
              <flowable:form nextCondition="ANY"  />
          </extensionElements>
      </sequenceFlow>
-      <sequenceFlow id="lid-WFRETURN2-bfff12bf7b1f0e7e07d4ea62b5549d8d" sourceRef="sid-d4312aaf86c0637aa219f15625a1a4c9" targetRef="tid-20-0ec5b557aa979a307af5aa9680485404" name="嵌套流程返回">
+      <sequenceFlow id="lid-WFRETURN2-f5525b73a792cebaabcfe48757ffafa2" sourceRef="sid-d4312aaf86c0637aa219f15625a1a4c9" targetRef="tid-20-0ec5b557aa979a307af5aa9680485404" name="嵌套流程返回">
          <extensionElements>
              <flowable:form nextCondition="ANY"  />
          </extensionElements>
@@ -126,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-ab22480a12bdcbd7d86193b3d8ac3d05" bpmnElement="sid-ab22480a12bdcbd7d86193b3d8ac3d05">
-                     <omgdi:Bounds x="150" y="380" 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>
                  <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-ab22480a12bdcbd7d86193b3d8ac3d05" bpmnElement="sid-ab22480a12bdcbd7d86193b3d8ac3d05">
+                     <omgdi:Bounds x="150" y="380" width="100" height="80" />
+                 </bpmndi:BPMNShape>
                  <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-53de4cc0be78ed2c689be324acd60ae7" bpmnElement="sid-53de4cc0be78ed2c689be324acd60ae7">
+                     <omgdi:Bounds x="740" y="420" width="30" height="30" />
+                 </bpmndi:BPMNShape>
                  <bpmndi:BPMNShape id="BPMNShape-111cb74e98b02ab1e9500a737674a5d6" bpmnElement="tid-用户任务-111cb74e98b02ab1e9500a737674a5d6">
                      <omgdi:Bounds x="280" y="20" 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-c5410c36c8b14bb6e18a7faef92c2be7" bpmnElement="tid-用户任务-c5410c36c8b14bb6e18a7faef92c2be7">
+                     <omgdi:Bounds x="300" y="410" 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>
-               <bpmndi:BPMNEdge id="BPMNEdge-rid-defbc7ba54a6530d515f098656fb5cab" bpmnElement="rid-defbc7ba54a6530d515f098656fb5cab">
+               <bpmndi:BPMNEdge id="BPMNEdge-rid-96abe06a3ca2e1f374e14c4efcd078b6" bpmnElement="rid-96abe06a3ca2e1f374e14c4efcd078b6">
                    <omgdi:waypoint x="0" y="0" />
                    <omgdi:waypoint x="0" y="0" />
                </bpmndi:BPMNEdge>
-               <bpmndi:BPMNEdge id="BPMNEdge-lid-IAACTION2-e3373ca5c42107ce2b0fe50c0807bd01" bpmnElement="lid-IAACTION2-e3373ca5c42107ce2b0fe50c0807bd01">
+               <bpmndi:BPMNEdge id="BPMNEdge-lid-IAACTION1-cd1865baa426b3611a36a6bce92e2491" bpmnElement="lid-IAACTION1-cd1865baa426b3611a36a6bce92e2491">
                    <omgdi:waypoint x="0" y="0" />
                    <omgdi:waypoint x="0" y="0" />
                </bpmndi:BPMNEdge>
-               <bpmndi:BPMNEdge id="BPMNEdge-lid-IAACTION1-3080f4ac8692358d21cd4b6525683622" bpmnElement="lid-IAACTION1-3080f4ac8692358d21cd4b6525683622">
+               <bpmndi:BPMNEdge id="BPMNEdge-lid-IAACTION3-595de3ec148bac11339f03d359c97570" bpmnElement="lid-IAACTION3-595de3ec148bac11339f03d359c97570">
                    <omgdi:waypoint x="0" y="0" />
                    <omgdi:waypoint x="0" y="0" />
                </bpmndi:BPMNEdge>
-               <bpmndi:BPMNEdge id="BPMNEdge-lid-IAACTION3-563392da942fe045613f2fe8aa1146cb" bpmnElement="lid-IAACTION3-563392da942fe045613f2fe8aa1146cb">
+               <bpmndi:BPMNEdge id="BPMNEdge-lid-IAACTION-8ab90885179c56021bf4cb9d5d839ba9" bpmnElement="lid-IAACTION-8ab90885179c56021bf4cb9d5d839ba9">
                    <omgdi:waypoint x="0" y="0" />
                    <omgdi:waypoint x="0" y="0" />
                </bpmndi:BPMNEdge>
-               <bpmndi:BPMNEdge id="BPMNEdge-lid-IAACTION-97b8ddcf4203493760745fb4a28904a0" bpmnElement="lid-IAACTION-97b8ddcf4203493760745fb4a28904a0">
+               <bpmndi:BPMNEdge id="BPMNEdge-lid-IAACTION4-8a9affbd96e353f4e281f5490befafa1" bpmnElement="lid-IAACTION4-8a9affbd96e353f4e281f5490befafa1">
                    <omgdi:waypoint x="0" y="0" />
                    <omgdi:waypoint x="0" y="0" />
                </bpmndi:BPMNEdge>
-               <bpmndi:BPMNEdge id="BPMNEdge-lid-IAACTION4-58b8496043a72fca2fbff2633dab23fa" bpmnElement="lid-IAACTION4-58b8496043a72fca2fbff2633dab23fa">
+               <bpmndi:BPMNEdge id="BPMNEdge-lid-IAACTION2-e549c88d892416cf030d2dfa327c466a" bpmnElement="lid-IAACTION2-e549c88d892416cf030d2dfa327c466a">
                    <omgdi:waypoint x="0" y="0" />
                    <omgdi:waypoint x="0" y="0" />
                </bpmndi:BPMNEdge>
-               <bpmndi:BPMNEdge id="BPMNEdge-lid-WFRETURN-14335bd06acdcd10c13a9c3f822dfab1" bpmnElement="lid-WFRETURN-14335bd06acdcd10c13a9c3f822dfab1">
+               <bpmndi:BPMNEdge id="BPMNEdge-lid-WFRETURN-c57de7810c01a58c6234f71df84db9b3" bpmnElement="lid-WFRETURN-c57de7810c01a58c6234f71df84db9b3">
                    <omgdi:waypoint x="0" y="0" />
                    <omgdi:waypoint x="0" y="0" />
                </bpmndi:BPMNEdge>
-               <bpmndi:BPMNEdge id="BPMNEdge-lid-WFRETURN1-abf8d175027bd5f6374e4f8914f3e2a5" bpmnElement="lid-WFRETURN1-abf8d175027bd5f6374e4f8914f3e2a5">
+               <bpmndi:BPMNEdge id="BPMNEdge-lid-WFRETURN1-bd9466e3ee36bd0bfc552c9874a437ea" bpmnElement="lid-WFRETURN1-bd9466e3ee36bd0bfc552c9874a437ea">
                    <omgdi:waypoint x="0" y="0" />
                    <omgdi:waypoint x="0" y="0" />
                </bpmndi:BPMNEdge>
-               <bpmndi:BPMNEdge id="BPMNEdge-lid-WFRETURN2-bfff12bf7b1f0e7e07d4ea62b5549d8d" bpmnElement="lid-WFRETURN2-bfff12bf7b1f0e7e07d4ea62b5549d8d">
+               <bpmndi:BPMNEdge id="BPMNEdge-lid-WFRETURN2-f5525b73a792cebaabcfe48757ffafa2" bpmnElement="lid-WFRETURN2-f5525b73a792cebaabcfe48757ffafa2">
                    <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,7 +484,7 @@
   "title" : "已办移动端编辑视图",
   "viewStyle" : "DEFAULT",
   "viewType" : "DEMOBEDITVIEW",
-  "wFCodeName" : "WorkFlowWf",
+  "wFTag" : "WorkFlowWf",
   "xDataControlName" : "form",
   "enableDP" : true,
   "enablePullDownRefresh" : false,

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -12466,22 +12466,22 @@
     "codeName" : "VMGroup3",
     "name" : "视图消息类型测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-警告信息",
+      "name" : "消息类型-常规信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg5"
+        "id" : "ViewMsg4"
       }
     }, {
-      "name" : "消息类型-错误信息",
+      "name" : "消息类型-警告信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg6"
+        "id" : "ViewMsg5"
       }
     }, {
-      "name" : "消息类型-常规信息",
+      "name" : "消息类型-错误信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg4"
+        "id" : "ViewMsg6"
       }
     } ]
   }, {
@@ -12498,6 +12498,18 @@
     "codeName" : "VMGroup4",
     "name" : "视图消息位置测试",
     "getPSAppViewMsgGroupDetails" : [ {
+      "name" : "消息位置-视图内容区",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg9"
+      }
+    }, {
+      "name" : "消息位置-视图下方",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg8"
+      }
+    }, {
       "name" : "消息位置-弹出",
       "getPSAppViewMsg" : {
         "modelref" : true,
@@ -12509,6 +12521,23 @@
         "modelref" : true,
         "id" : "ViewMsg7"
       }
+    } ]
+  }, {
+    "codeName" : "VMGroup8",
+    "name" : "【静态测试】",
+    "getPSAppViewMsgGroupDetails" : [ {
+      "name" : "关闭模式-无删除-上方-常规",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg11"
+      }
+    }, {
+      "name" : "消息类型-常规信息",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg4"
+      },
+      "position" : "POPUP"
     }, {
       "name" : "消息位置-视图内容区",
       "getPSAppViewMsg" : {
@@ -12516,16 +12545,12 @@
         "id" : "ViewMsg9"
       }
     }, {
-      "name" : "消息位置-视图下方",
+      "name" : "关闭模式-默认删除-上方-错误",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg12"
       }
-    } ]
     }, {
-    "codeName" : "VMGroup8",
-    "name" : "【静态测试】",
-    "getPSAppViewMsgGroupDetails" : [ {
       "name" : "关闭模式-本次删除-上方-警告",
       "getPSAppViewMsg" : {
         "modelref" : true,
@@ -12551,31 +12576,6 @@
         "id" : "ViewMsg5"
       },
       "position" : "POPUP"
-    }, {
-      "name" : "关闭模式-无删除-上方-常规",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg11"
-      }
-    }, {
-      "name" : "消息类型-常规信息",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg4"
-      },
-      "position" : "POPUP"
-    }, {
-      "name" : "关闭模式-默认删除-上方-错误",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg12"
-      }
-    }, {
-      "name" : "消息位置-视图内容区",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg9"
-      }
     } ]
   }, {
     "codeName" : "VMGroup5",