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

app_Web/swarm.yaml

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

config.xml

@@ -55,12 +55,6 @@
 	  git clone -b master $para2 trainsys/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd trainsys/
-      mvn clean package -Ptrainsys
-      mvn install -Ptrainsys
-      cd trainsys-provider
-      mvn -Ptrainsys docker:build
-      mvn -Ptrainsys docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/trainsys-provider-trainsys.yaml ebsx --with-registry-auth      
       </command>
     </hudson.tasks.Shell>
   </builders>

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

@@ -4790,18 +4790,95 @@
       "getPSDEUILogicLinks" : [ {
         "getDstPSDEUILogicNode" : {
           "modelref" : true,
-          "id" : "MSGBOX1"
+          "id" : "DEBUGPARAM2"
         },
-        "linkMode" : 1,
+        "linkMode" : 0,
         "name" : "连接名称",
         "getSrcPSDEUILogicNode" : {
           "modelref" : true,
           "id" : "Begin"
-        },
-        "defaultLink" : true
+        }
       } ],
       "topPos" : 200,
       "parallelOutput" : true
+    }, {
+      "codeName" : "DEUIACTION1",
+      "getDstPSAppDEUIAction" : {
+        "getPSAppDataEntity" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST.json"
+        },
+        "modelref" : true,
+        "id" : "drawer_edit@TEST"
+      },
+      "getDstPSAppDataEntity" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST.json"
+      },
+      "getDstPSDEUILogicParam" : {
+        "modelref" : true,
+        "id" : "actionResult"
+      },
+      "leftPos" : 630,
+      "logicNodeType" : "DEUIACTION",
+      "name" : "界面行为",
+      "getPSDEUILogicLinks" : [ {
+        "getDstPSDEUILogicNode" : {
+          "modelref" : true,
+          "id" : "PREPAREJSPARAM1"
+        },
+        "linkMode" : 0,
+        "name" : "连接名称",
+        "getSrcPSDEUILogicNode" : {
+          "modelref" : true,
+          "id" : "DEUIACTION1"
+        }
+      } ],
+      "topPos" : 540
+    }, {
+      "codeName" : "DEACTION1",
+      "getDstPSAppDEAction" : {
+        "modelref" : true,
+        "id" : "Update"
+      },
+      "getDstPSAppDataEntity" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST.json"
+      },
+      "getDstPSDEUILogicParam" : {
+        "modelref" : true,
+        "id" : "Default"
+      },
+      "leftPos" : 400,
+      "logicNodeType" : "DEACTION",
+      "name" : "实体行为",
+      "getPSDEUILogicLinks" : [ {
+        "getDstPSDEUILogicNode" : {
+          "modelref" : true,
+          "id" : "DEUIACTION1"
+        },
+        "linkMode" : 0,
+        "name" : "连接名称",
+        "getSrcPSDEUILogicNode" : {
+          "modelref" : true,
+          "id" : "DEACTION1"
+        }
+      } ],
+      "getRetPSDEUILogicParam" : {
+        "modelref" : true,
+        "id" : "actionResult"
+      },
+      "topPos" : 540
+    }, {
+      "codeName" : "DEBUGPARAM4",
+      "getDstPSDEUILogicParam" : {
+        "modelref" : true,
+        "id" : "srfactiveviewdata"
+      },
+      "leftPos" : 799,
+      "logicNodeType" : "DEBUGPARAM",
+      "name" : "调试逻辑参数",
+      "topPos" : 290
     }, {
       "codeName" : "PREPAREJSPARAM1",
       "leftPos" : 867,
@@ -4881,6 +4958,28 @@
         "srcValueType" : "SRCDLPARAM"
       } ],
       "topPos" : 540
+    }, {
+      "codeName" : "DEBUGPARAM3",
+      "getDstPSDEUILogicParam" : {
+        "modelref" : true,
+        "id" : "RouteViewCaption"
+      },
+      "leftPos" : 605,
+      "logicNodeType" : "DEBUGPARAM",
+      "name" : "调试逻辑参数",
+      "getPSDEUILogicLinks" : [ {
+        "getDstPSDEUILogicNode" : {
+          "modelref" : true,
+          "id" : "DEBUGPARAM4"
+        },
+        "linkMode" : 0,
+        "name" : "连接名称",
+        "getSrcPSDEUILogicNode" : {
+          "modelref" : true,
+          "id" : "DEBUGPARAM3"
+        }
+      } ],
+      "topPos" : 290
     }, {
       "codeName" : "DEBUGPARAM1",
       "getDstPSDEUILogicParam" : {
@@ -4904,122 +5003,105 @@
       } ],
       "topPos" : 540
     }, {
-      "codeName" : "DEUIACTION1",
-      "getDstPSAppDEUIAction" : {
-        "getPSAppDataEntity" : {
-          "modelref" : true,
-          "path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST.json"
-        },
-        "modelref" : true,
-        "id" : "drawer_edit@TEST"
-      },
-      "getDstPSAppDataEntity" : {
-        "modelref" : true,
-        "path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST.json"
-      },
-      "getDstPSDEUILogicParam" : {
-        "modelref" : true,
-        "id" : "actionResult"
-      },
-      "leftPos" : 630,
-      "logicNodeType" : "DEUIACTION",
-      "name" : "界面行为",
+      "buttonsType" : "OKCANCEL",
+      "codeName" : "MSGBOX1",
+      "leftPos" : 160,
+      "logicNodeType" : "MSGBOX",
+      "message" : "警告警告！！！是否确认该操作",
+      "msgBoxType" : "WARNING",
+      "name" : "消息弹窗",
       "getPSDEUILogicLinks" : [ {
         "getDstPSDEUILogicNode" : {
           "modelref" : true,
-          "id" : "PREPAREJSPARAM1"
+          "id" : "DEBUGPARAM1"
         },
         "linkMode" : 0,
         "name" : "连接名称",
         "getSrcPSDEUILogicNode" : {
           "modelref" : true,
-          "id" : "DEUIACTION1"
+          "id" : "MSGBOX1"
         }
       } ],
-      "topPos" : 540
+      "title" : "标题警告",
+      "topPos" : 400
     }, {
-      "codeName" : "DEACTION1",
-      "getDstPSAppDEAction" : {
-        "modelref" : true,
-        "id" : "Update"
-      },
-      "getDstPSAppDataEntity" : {
-        "modelref" : true,
-        "path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST.json"
-      },
+      "codeName" : "DEBUGPARAM2",
       "getDstPSDEUILogicParam" : {
         "modelref" : true,
-        "id" : "Default"
+        "id" : "filter"
       },
       "leftPos" : 400,
-      "logicNodeType" : "DEACTION",
-      "name" : "实体行为",
+      "logicNodeType" : "DEBUGPARAM",
+      "name" : "调试逻辑参数",
       "getPSDEUILogicLinks" : [ {
         "getDstPSDEUILogicNode" : {
           "modelref" : true,
-          "id" : "DEUIACTION1"
+          "id" : "MSGBOX1"
         },
         "linkMode" : 0,
         "name" : "连接名称",
         "getSrcPSDEUILogicNode" : {
           "modelref" : true,
-          "id" : "DEACTION1"
+          "id" : "DEBUGPARAM2"
         }
-      } ],
-      "getRetPSDEUILogicParam" : {
-        "modelref" : true,
-        "id" : "actionResult"
-      },
-      "topPos" : 540
-    }, {
-      "buttonsType" : "OKCANCEL",
-      "codeName" : "MSGBOX1",
-      "leftPos" : 160,
-      "logicNodeType" : "MSGBOX",
-      "message" : "警告警告！！！是否确认该操作",
-      "msgBoxType" : "WARNING",
-      "name" : "消息弹窗",
-      "getPSDEUILogicLinks" : [ {
+      }, {
         "getDstPSDEUILogicNode" : {
           "modelref" : true,
-          "id" : "DEBUGPARAM1"
+          "id" : "DEBUGPARAM3"
         },
         "linkMode" : 0,
         "name" : "连接名称",
         "getSrcPSDEUILogicNode" : {
           "modelref" : true,
-          "id" : "MSGBOX1"
+          "id" : "DEBUGPARAM2"
         }
       } ],
-      "title" : "标题警告",
-      "topPos" : 400
+      "topPos" : 290,
+      "parallelOutput" : true
     } ],
     "getPSDEUILogicParams" : [ {
-      "codeName" : "layoutPanel",
-      "logicName" : "面板成员集合",
-      "name" : "面板成员集合",
-      "ctrlParam" : true
+      "codeName" : "filter",
+      "logicName" : "过滤器",
+      "name" : "过滤器",
+      "filterParam" : true
     }, {
-      "codeName" : "last",
-      "logicName" : "上一次返回",
-      "name" : "上一次返回",
-      "lastReturnParam" : true
+      "codeName" : "RouteViewCaption",
+      "logicName" : "路由视图标题",
+      "name" : "路由视图标题",
+      "paramFieldName" : "caption",
+      "routeViewSessionParam" : true
+    }, {
+      "codeName" : "actionResult",
+      "logicName" : "实体行为返回值",
+      "name" : "实体行为返回值",
+      "entityParam" : true
     }, {
       "codeName" : "Default",
       "logicName" : "传入变量",
       "name" : "传入变量",
       "default" : true,
       "entityParam" : true
+    }, {
+      "codeName" : "last",
+      "logicName" : "上一次返回",
+      "name" : "上一次返回",
+      "lastReturnParam" : true
     }, {
       "codeName" : "actionParams",
       "logicName" : "操作参数",
       "name" : "操作参数",
       "entityParam" : true
     }, {
-      "codeName" : "actionResult",
-      "logicName" : "实体行为返回值",
-      "name" : "实体行为返回值",
-      "entityParam" : true
+      "codeName" : "srfactiveviewdata",
+      "logicName" : "会话变量",
+      "name" : "会话变量",
+      "paramFieldName" : "srfactiveviewdata",
+      "viewSessionParam" : true
+    }, {
+      "codeName" : "layoutPanel",
+      "logicName" : "面板成员集合",
+      "name" : "面板成员集合",
+      "ctrlParam" : true
     } ],
     "getStartPSDEUILogicNode" : {
       "modelref" : true,

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

@@ -4800,18 +4800,95 @@
       "getPSDEUILogicLinks" : [ {
         "getDstPSDEUILogicNode" : {
           "modelref" : true,
-          "id" : "MSGBOX1"
+          "id" : "DEBUGPARAM2"
         },
-        "linkMode" : 1,
+        "linkMode" : 0,
         "name" : "连接名称",
         "getSrcPSDEUILogicNode" : {
           "modelref" : true,
           "id" : "Begin"
-        },
-        "defaultLink" : true
+        }
       } ],
       "topPos" : 200,
       "parallelOutput" : true
+    }, {
+      "codeName" : "DEUIACTION1",
+      "getDstPSAppDEUIAction" : {
+        "getPSAppDataEntity" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/TEST.json"
+        },
+        "modelref" : true,
+        "id" : "drawer_edit@TEST"
+      },
+      "getDstPSAppDataEntity" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/TEST.json"
+      },
+      "getDstPSDEUILogicParam" : {
+        "modelref" : true,
+        "id" : "actionResult"
+      },
+      "leftPos" : 630,
+      "logicNodeType" : "DEUIACTION",
+      "name" : "界面行为",
+      "getPSDEUILogicLinks" : [ {
+        "getDstPSDEUILogicNode" : {
+          "modelref" : true,
+          "id" : "PREPAREJSPARAM1"
+        },
+        "linkMode" : 0,
+        "name" : "连接名称",
+        "getSrcPSDEUILogicNode" : {
+          "modelref" : true,
+          "id" : "DEUIACTION1"
+        }
+      } ],
+      "topPos" : 540
+    }, {
+      "codeName" : "DEACTION1",
+      "getDstPSAppDEAction" : {
+        "modelref" : true,
+        "id" : "Update"
+      },
+      "getDstPSAppDataEntity" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/TEST.json"
+      },
+      "getDstPSDEUILogicParam" : {
+        "modelref" : true,
+        "id" : "Default"
+      },
+      "leftPos" : 400,
+      "logicNodeType" : "DEACTION",
+      "name" : "实体行为",
+      "getPSDEUILogicLinks" : [ {
+        "getDstPSDEUILogicNode" : {
+          "modelref" : true,
+          "id" : "DEUIACTION1"
+        },
+        "linkMode" : 0,
+        "name" : "连接名称",
+        "getSrcPSDEUILogicNode" : {
+          "modelref" : true,
+          "id" : "DEACTION1"
+        }
+      } ],
+      "getRetPSDEUILogicParam" : {
+        "modelref" : true,
+        "id" : "actionResult"
+      },
+      "topPos" : 540
+    }, {
+      "codeName" : "DEBUGPARAM4",
+      "getDstPSDEUILogicParam" : {
+        "modelref" : true,
+        "id" : "srfactiveviewdata"
+      },
+      "leftPos" : 799,
+      "logicNodeType" : "DEBUGPARAM",
+      "name" : "调试逻辑参数",
+      "topPos" : 290
     }, {
       "codeName" : "PREPAREJSPARAM1",
       "leftPos" : 867,
@@ -4891,6 +4968,28 @@
         "srcValueType" : "SRCDLPARAM"
       } ],
       "topPos" : 540
+    }, {
+      "codeName" : "DEBUGPARAM3",
+      "getDstPSDEUILogicParam" : {
+        "modelref" : true,
+        "id" : "RouteViewCaption"
+      },
+      "leftPos" : 605,
+      "logicNodeType" : "DEBUGPARAM",
+      "name" : "调试逻辑参数",
+      "getPSDEUILogicLinks" : [ {
+        "getDstPSDEUILogicNode" : {
+          "modelref" : true,
+          "id" : "DEBUGPARAM4"
+        },
+        "linkMode" : 0,
+        "name" : "连接名称",
+        "getSrcPSDEUILogicNode" : {
+          "modelref" : true,
+          "id" : "DEBUGPARAM3"
+        }
+      } ],
+      "topPos" : 290
     }, {
       "codeName" : "DEBUGPARAM1",
       "getDstPSDEUILogicParam" : {
@@ -4914,122 +5013,105 @@
       } ],
       "topPos" : 540
     }, {
-      "codeName" : "DEUIACTION1",
-      "getDstPSAppDEUIAction" : {
-        "getPSAppDataEntity" : {
-          "modelref" : true,
-          "path" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/TEST.json"
-        },
-        "modelref" : true,
-        "id" : "drawer_edit@TEST"
-      },
-      "getDstPSAppDataEntity" : {
-        "modelref" : true,
-        "path" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/TEST.json"
-      },
-      "getDstPSDEUILogicParam" : {
-        "modelref" : true,
-        "id" : "actionResult"
-      },
-      "leftPos" : 630,
-      "logicNodeType" : "DEUIACTION",
-      "name" : "界面行为",
+      "buttonsType" : "OKCANCEL",
+      "codeName" : "MSGBOX1",
+      "leftPos" : 160,
+      "logicNodeType" : "MSGBOX",
+      "message" : "警告警告！！！是否确认该操作",
+      "msgBoxType" : "WARNING",
+      "name" : "消息弹窗",
       "getPSDEUILogicLinks" : [ {
         "getDstPSDEUILogicNode" : {
           "modelref" : true,
-          "id" : "PREPAREJSPARAM1"
+          "id" : "DEBUGPARAM1"
         },
         "linkMode" : 0,
         "name" : "连接名称",
         "getSrcPSDEUILogicNode" : {
           "modelref" : true,
-          "id" : "DEUIACTION1"
+          "id" : "MSGBOX1"
         }
       } ],
-      "topPos" : 540
+      "title" : "标题警告",
+      "topPos" : 400
     }, {
-      "codeName" : "DEACTION1",
-      "getDstPSAppDEAction" : {
-        "modelref" : true,
-        "id" : "Update"
-      },
-      "getDstPSAppDataEntity" : {
-        "modelref" : true,
-        "path" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/TEST.json"
-      },
+      "codeName" : "DEBUGPARAM2",
       "getDstPSDEUILogicParam" : {
         "modelref" : true,
-        "id" : "Default"
+        "id" : "filter"
       },
       "leftPos" : 400,
-      "logicNodeType" : "DEACTION",
-      "name" : "实体行为",
+      "logicNodeType" : "DEBUGPARAM",
+      "name" : "调试逻辑参数",
       "getPSDEUILogicLinks" : [ {
         "getDstPSDEUILogicNode" : {
           "modelref" : true,
-          "id" : "DEUIACTION1"
+          "id" : "MSGBOX1"
         },
         "linkMode" : 0,
         "name" : "连接名称",
         "getSrcPSDEUILogicNode" : {
           "modelref" : true,
-          "id" : "DEACTION1"
+          "id" : "DEBUGPARAM2"
         }
-      } ],
-      "getRetPSDEUILogicParam" : {
-        "modelref" : true,
-        "id" : "actionResult"
-      },
-      "topPos" : 540
-    }, {
-      "buttonsType" : "OKCANCEL",
-      "codeName" : "MSGBOX1",
-      "leftPos" : 160,
-      "logicNodeType" : "MSGBOX",
-      "message" : "警告警告！！！是否确认该操作",
-      "msgBoxType" : "WARNING",
-      "name" : "消息弹窗",
-      "getPSDEUILogicLinks" : [ {
+      }, {
         "getDstPSDEUILogicNode" : {
           "modelref" : true,
-          "id" : "DEBUGPARAM1"
+          "id" : "DEBUGPARAM3"
         },
         "linkMode" : 0,
         "name" : "连接名称",
         "getSrcPSDEUILogicNode" : {
           "modelref" : true,
-          "id" : "MSGBOX1"
+          "id" : "DEBUGPARAM2"
         }
       } ],
-      "title" : "标题警告",
-      "topPos" : 400
+      "topPos" : 290,
+      "parallelOutput" : true
     } ],
     "getPSDEUILogicParams" : [ {
-      "codeName" : "layoutPanel",
-      "logicName" : "面板成员集合",
-      "name" : "面板成员集合",
-      "ctrlParam" : true
+      "codeName" : "filter",
+      "logicName" : "过滤器",
+      "name" : "过滤器",
+      "filterParam" : true
     }, {
-      "codeName" : "last",
-      "logicName" : "上一次返回",
-      "name" : "上一次返回",
-      "lastReturnParam" : true
+      "codeName" : "RouteViewCaption",
+      "logicName" : "路由视图标题",
+      "name" : "路由视图标题",
+      "paramFieldName" : "caption",
+      "routeViewSessionParam" : true
+    }, {
+      "codeName" : "actionResult",
+      "logicName" : "实体行为返回值",
+      "name" : "实体行为返回值",
+      "entityParam" : true
     }, {
       "codeName" : "Default",
       "logicName" : "传入变量",
       "name" : "传入变量",
       "default" : true,
       "entityParam" : true
+    }, {
+      "codeName" : "last",
+      "logicName" : "上一次返回",
+      "name" : "上一次返回",
+      "lastReturnParam" : true
     }, {
       "codeName" : "actionParams",
       "logicName" : "操作参数",
       "name" : "操作参数",
       "entityParam" : true
     }, {
-      "codeName" : "actionResult",
-      "logicName" : "实体行为返回值",
-      "name" : "实体行为返回值",
-      "entityParam" : true
+      "codeName" : "srfactiveviewdata",
+      "logicName" : "会话变量",
+      "name" : "会话变量",
+      "paramFieldName" : "srfactiveviewdata",
+      "viewSessionParam" : true
+    }, {
+      "codeName" : "layoutPanel",
+      "logicName" : "面板成员集合",
+      "name" : "面板成员集合",
+      "ctrlParam" : true
     } ],
     "getStartPSDEUILogicNode" : {
       "modelref" : true,

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

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

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

@@ -5918,18 +5918,95 @@
       "getPSDEUILogicLinks" : [ {
         "getDstPSDEUILogicNode" : {
           "modelref" : true,
-          "id" : "MSGBOX1"
+          "id" : "DEBUGPARAM2"
         },
-        "linkMode" : 1,
+        "linkMode" : 0,
         "name" : "连接名称",
         "getSrcPSDEUILogicNode" : {
           "modelref" : true,
           "id" : "Begin"
-        },
-        "defaultLink" : true
+        }
       } ],
       "topPos" : 200,
       "parallelOutput" : true
+    }, {
+      "codeName" : "DEUIACTION1",
+      "getDstPSAppDEUIAction" : {
+        "getPSAppDataEntity" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
+        },
+        "modelref" : true,
+        "id" : "drawer_edit@TEST"
+      },
+      "getDstPSAppDataEntity" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
+      },
+      "getDstPSDEUILogicParam" : {
+        "modelref" : true,
+        "id" : "actionResult"
+      },
+      "leftPos" : 630,
+      "logicNodeType" : "DEUIACTION",
+      "name" : "界面行为",
+      "getPSDEUILogicLinks" : [ {
+        "getDstPSDEUILogicNode" : {
+          "modelref" : true,
+          "id" : "PREPAREJSPARAM1"
+        },
+        "linkMode" : 0,
+        "name" : "连接名称",
+        "getSrcPSDEUILogicNode" : {
+          "modelref" : true,
+          "id" : "DEUIACTION1"
+        }
+      } ],
+      "topPos" : 540
+    }, {
+      "codeName" : "DEACTION1",
+      "getDstPSAppDEAction" : {
+        "modelref" : true,
+        "id" : "Update"
+      },
+      "getDstPSAppDataEntity" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
+      },
+      "getDstPSDEUILogicParam" : {
+        "modelref" : true,
+        "id" : "Default"
+      },
+      "leftPos" : 400,
+      "logicNodeType" : "DEACTION",
+      "name" : "实体行为",
+      "getPSDEUILogicLinks" : [ {
+        "getDstPSDEUILogicNode" : {
+          "modelref" : true,
+          "id" : "DEUIACTION1"
+        },
+        "linkMode" : 0,
+        "name" : "连接名称",
+        "getSrcPSDEUILogicNode" : {
+          "modelref" : true,
+          "id" : "DEACTION1"
+        }
+      } ],
+      "getRetPSDEUILogicParam" : {
+        "modelref" : true,
+        "id" : "actionResult"
+      },
+      "topPos" : 540
+    }, {
+      "codeName" : "DEBUGPARAM4",
+      "getDstPSDEUILogicParam" : {
+        "modelref" : true,
+        "id" : "srfactiveviewdata"
+      },
+      "leftPos" : 799,
+      "logicNodeType" : "DEBUGPARAM",
+      "name" : "调试逻辑参数",
+      "topPos" : 290
     }, {
       "codeName" : "PREPAREJSPARAM1",
       "leftPos" : 867,
@@ -6009,6 +6086,28 @@
         "srcValueType" : "SRCDLPARAM"
       } ],
       "topPos" : 540
+    }, {
+      "codeName" : "DEBUGPARAM3",
+      "getDstPSDEUILogicParam" : {
+        "modelref" : true,
+        "id" : "RouteViewCaption"
+      },
+      "leftPos" : 605,
+      "logicNodeType" : "DEBUGPARAM",
+      "name" : "调试逻辑参数",
+      "getPSDEUILogicLinks" : [ {
+        "getDstPSDEUILogicNode" : {
+          "modelref" : true,
+          "id" : "DEBUGPARAM4"
+        },
+        "linkMode" : 0,
+        "name" : "连接名称",
+        "getSrcPSDEUILogicNode" : {
+          "modelref" : true,
+          "id" : "DEBUGPARAM3"
+        }
+      } ],
+      "topPos" : 290
     }, {
       "codeName" : "DEBUGPARAM1",
       "getDstPSDEUILogicParam" : {
@@ -6032,122 +6131,105 @@
       } ],
       "topPos" : 540
     }, {
-      "codeName" : "DEUIACTION1",
-      "getDstPSAppDEUIAction" : {
-        "getPSAppDataEntity" : {
-          "modelref" : true,
-          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
-        },
-        "modelref" : true,
-        "id" : "drawer_edit@TEST"
-      },
-      "getDstPSAppDataEntity" : {
-        "modelref" : true,
-        "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
-      },
-      "getDstPSDEUILogicParam" : {
-        "modelref" : true,
-        "id" : "actionResult"
-      },
-      "leftPos" : 630,
-      "logicNodeType" : "DEUIACTION",
-      "name" : "界面行为",
+      "buttonsType" : "OKCANCEL",
+      "codeName" : "MSGBOX1",
+      "leftPos" : 160,
+      "logicNodeType" : "MSGBOX",
+      "message" : "警告警告！！！是否确认该操作",
+      "msgBoxType" : "WARNING",
+      "name" : "消息弹窗",
       "getPSDEUILogicLinks" : [ {
         "getDstPSDEUILogicNode" : {
           "modelref" : true,
-          "id" : "PREPAREJSPARAM1"
+          "id" : "DEBUGPARAM1"
         },
         "linkMode" : 0,
         "name" : "连接名称",
         "getSrcPSDEUILogicNode" : {
           "modelref" : true,
-          "id" : "DEUIACTION1"
+          "id" : "MSGBOX1"
         }
       } ],
-      "topPos" : 540
+      "title" : "标题警告",
+      "topPos" : 400
     }, {
-      "codeName" : "DEACTION1",
-      "getDstPSAppDEAction" : {
-        "modelref" : true,
-        "id" : "Update"
-      },
-      "getDstPSAppDataEntity" : {
-        "modelref" : true,
-        "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
-      },
+      "codeName" : "DEBUGPARAM2",
       "getDstPSDEUILogicParam" : {
         "modelref" : true,
-        "id" : "Default"
+        "id" : "filter"
       },
       "leftPos" : 400,
-      "logicNodeType" : "DEACTION",
-      "name" : "实体行为",
+      "logicNodeType" : "DEBUGPARAM",
+      "name" : "调试逻辑参数",
       "getPSDEUILogicLinks" : [ {
         "getDstPSDEUILogicNode" : {
           "modelref" : true,
-          "id" : "DEUIACTION1"
+          "id" : "MSGBOX1"
         },
         "linkMode" : 0,
         "name" : "连接名称",
         "getSrcPSDEUILogicNode" : {
           "modelref" : true,
-          "id" : "DEACTION1"
+          "id" : "DEBUGPARAM2"
         }
-      } ],
-      "getRetPSDEUILogicParam" : {
-        "modelref" : true,
-        "id" : "actionResult"
-      },
-      "topPos" : 540
-    }, {
-      "buttonsType" : "OKCANCEL",
-      "codeName" : "MSGBOX1",
-      "leftPos" : 160,
-      "logicNodeType" : "MSGBOX",
-      "message" : "警告警告！！！是否确认该操作",
-      "msgBoxType" : "WARNING",
-      "name" : "消息弹窗",
-      "getPSDEUILogicLinks" : [ {
+      }, {
         "getDstPSDEUILogicNode" : {
           "modelref" : true,
-          "id" : "DEBUGPARAM1"
+          "id" : "DEBUGPARAM3"
         },
         "linkMode" : 0,
         "name" : "连接名称",
         "getSrcPSDEUILogicNode" : {
           "modelref" : true,
-          "id" : "MSGBOX1"
+          "id" : "DEBUGPARAM2"
         }
       } ],
-      "title" : "标题警告",
-      "topPos" : 400
+      "topPos" : 290,
+      "parallelOutput" : true
     } ],
     "getPSDEUILogicParams" : [ {
-      "codeName" : "layoutPanel",
-      "logicName" : "面板成员集合",
-      "name" : "面板成员集合",
-      "ctrlParam" : true
+      "codeName" : "filter",
+      "logicName" : "过滤器",
+      "name" : "过滤器",
+      "filterParam" : true
     }, {
-      "codeName" : "last",
-      "logicName" : "上一次返回",
-      "name" : "上一次返回",
-      "lastReturnParam" : true
+      "codeName" : "RouteViewCaption",
+      "logicName" : "路由视图标题",
+      "name" : "路由视图标题",
+      "paramFieldName" : "caption",
+      "routeViewSessionParam" : true
+    }, {
+      "codeName" : "actionResult",
+      "logicName" : "实体行为返回值",
+      "name" : "实体行为返回值",
+      "entityParam" : true
     }, {
       "codeName" : "Default",
       "logicName" : "传入变量",
       "name" : "传入变量",
       "default" : true,
       "entityParam" : true
+    }, {
+      "codeName" : "last",
+      "logicName" : "上一次返回",
+      "name" : "上一次返回",
+      "lastReturnParam" : true
     }, {
       "codeName" : "actionParams",
       "logicName" : "操作参数",
       "name" : "操作参数",
       "entityParam" : true
     }, {
-      "codeName" : "actionResult",
-      "logicName" : "实体行为返回值",
-      "name" : "实体行为返回值",
-      "entityParam" : true
+      "codeName" : "srfactiveviewdata",
+      "logicName" : "会话变量",
+      "name" : "会话变量",
+      "paramFieldName" : "srfactiveviewdata",
+      "viewSessionParam" : true
+    }, {
+      "codeName" : "layoutPanel",
+      "logicName" : "面板成员集合",
+      "name" : "面板成员集合",
+      "ctrlParam" : true
     } ],
     "getStartPSDEUILogicNode" : {
       "modelref" : true,

trainsys-provider/pom.xml

@@ -33,7 +33,7 @@
 
     <profiles>
         <profile>
-            <id>trainsys</id>
+            <id>runtime</id>
             <build>
                 <resources>
                     <resource>

trainsys-provider/src/main/docker/Dockerfile

@@ -10,6 +10,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Duser.timezone=$TZ -Djava.security.egd=file:/dev/./urandom -jar /trainsys-provider.jar
 
-EXPOSE 50000
+EXPOSE 8081
 
 ADD trainsys-provider.jar /trainsys-provider.jar

trainsys-provider/src/main/docker/trainsys-provider-trainsys-k8s.yaml

@@ -22,32 +22,7 @@ spec:
         image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
         imagePullPolicy: Always
         ports:
-        - containerPort: 50000
-        env:
-        - name: SPRING_CLOUD_NACOS_DISCOVERY_IP
-          value: "172.16.240.140"      
-        - name: SERVER_PORT
-          value: "50000"
-        - name: SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR
-          value: "172.16.240.140:8848"
-        - name: SPRING_REDIS_HOST
-          value: "127.0.0.1"
-        - name: SPRING_REDIS_PORT
-          value: "6379"
-        - name: SPRING_REDIS_DATABASE
-          value: "0"
-        - name: SPRING_DATASOURCE_USERNAME
-          value: "a_LAB01_d23cc850e"
-        - name: SPRING_DATASOURCE_PASSWORD
-          value: "f9Df4556"
-        - name: SPRING_DATASOURCE_URL
-          value: "jdbc:mysql://172.16.186.185:3306/a_LAB01_d23cc850e?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&serverTimezone=Asia/Shanghai&allowMultiQueries=true&serverTimezone=GMT%2B8"
-        - name: SPRING_DATASOURCE_DRIVER-CLASS-NAME
-          value: "com.mysql.jdbc.Driver"
-        - name: SPRING_DATASOURCE_DEFAULTSCHEMA
-          value: "a_LAB01_d23cc850e"
-        - name: NACOS
-          value: "172.16.240.140:8848"      
+        - containerPort: 8081
 
 ---
 apiVersion: v1
@@ -60,9 +35,9 @@ spec:
   type: NodePort
   ports:
   - name: http
-    port: 50000
-    targetPort: 50000
-    nodePort: 50000
+    port: 8081
+    targetPort: 8081
+    nodePort: 8081
     protocol: TCP
   selector:
     app: trainsys-provider

trainsys-provider/src/main/docker/trainsys-provider-trainsys.yaml

@@ -3,23 +3,9 @@ services:
   trainsys-provider:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
     ports:
-      - "50000:50000"
+      - "8081:8081"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.140
-      - SERVER_PORT=50000
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.140:8848
-      - SPRING_CLOUD_NACOS_CONFIG_SERVER-ADDR=172.16.240.140:8848
-      - SPRING_REDIS_HOST=127.0.0.1
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_LAB01_d23cc850e
-      - SPRING_DATASOURCE_PASSWORD=f9Df4556
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_d23cc850e?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&serverTimezone=Asia/Shanghai&allowMultiQueries=true&serverTimezone=GMT%2B8
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_d23cc850e
-      - NACOS=172.16.240.140:8848
     deploy:
       resources:
            limits: