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

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/PSMODULES/Test/PSDATAENTITIES/TEST.json

@@ -2766,6 +2766,102 @@
     },
     "enableBackend" : false,
     "enableFront" : true
+  }, {
+    "codeName" : "singleData",
+    "defaultParamName" : "Default",
+    "dynaModelFilePath" : "PSMODULES/Test/PSDATAENTITIES/TEST/PSDELOGICS/singleData.json",
+    "logicName" : "单项数据来源",
+    "name" : "单项数据来源",
+    "getPSDELogicNodes" : [ {
+      "codeName" : "Begin",
+      "leftPos" : 200,
+      "logicNodeType" : "BEGIN",
+      "name" : "开始",
+      "getPSDELogicLinks" : [ {
+        "getDstPSDELogicNode" : {
+          "modelref" : true,
+          "id" : "PREPAREPARAM1"
+        },
+        "name" : "连接名称",
+        "getSrcPSDELogicNode" : {
+          "modelref" : true,
+          "id" : "Begin"
+        }
+      } ],
+      "topPos" : 200,
+      "parallelOutput" : true
+    }, {
+      "codeName" : "PREPAREPARAM1",
+      "leftPos" : 348,
+      "logicNodeType" : "PREPAREPARAM",
+      "name" : "准备参数",
+      "getPSDELogicLinks" : [ {
+        "getDstPSDELogicNode" : {
+          "modelref" : true,
+          "id" : "END1"
+        },
+        "name" : "连接名称",
+        "getSrcPSDELogicNode" : {
+          "modelref" : true,
+          "id" : "PREPAREPARAM1"
+        }
+      } ],
+      "getPSDELogicNodeParams" : [ {
+        "dstFieldName" : "param1",
+        "getDstPSDELogicParam" : {
+          "modelref" : true,
+          "id" : "result"
+        },
+        "name" : "直接值[aaaa] ==> result[param1]",
+        "paramAction" : "SETPARAMVALUE",
+        "srcValue" : "aaaa",
+        "srcValueType" : "SRCVALUE"
+      }, {
+        "dstFieldName" : "param2",
+        "getDstPSDELogicParam" : {
+          "modelref" : true,
+          "id" : "result"
+        },
+        "name" : "直接值[bbbbb] ==> result[param2]",
+        "paramAction" : "SETPARAMVALUE",
+        "srcValue" : "bbbbb",
+        "srcValueType" : "SRCVALUE"
+      } ],
+      "topPos" : 216
+    }, {
+      "codeName" : "END1",
+      "leftPos" : 630,
+      "logicNodeType" : "END",
+      "name" : "结束",
+      "getReturnParam" : {
+        "modelref" : true,
+        "id" : "result"
+      },
+      "returnType" : "LOGICPARAM",
+      "topPos" : 230
+    } ],
+    "getPSDELogicParams" : [ {
+      "codeName" : "Default",
+      "logicName" : "传入变量",
+      "name" : "传入变量",
+      "getParamPSDataEntity" : {
+        "modelref" : true,
+        "path" : "PSMODULES/Test/PSDATAENTITIES/TEST.json"
+      },
+      "default" : true,
+      "entityParam" : true
+    }, {
+      "codeName" : "result",
+      "logicName" : "返回值",
+      "name" : "返回值",
+      "entityParam" : true
+    } ],
+    "getStartPSDELogicNode" : {
+      "modelref" : true,
+      "id" : "Begin"
+    },
+    "enableBackend" : false,
+    "enableFront" : true
   } ],
   "getAllPSDEMethodDTOs" : [ {
     "name" : "TESTDTO",
@@ -3452,6 +3548,12 @@
     "name" : "实体面板视图布局面板",
     "realModelSubType" : "DEPANELVIEW",
     "realModelType" : "PSDEVIEWBASE"
+  }, {
+    "codeName" : "PanelDataContainerTest",
+    "logicName" : "数据容器测试",
+    "name" : "数据容器测试",
+    "realModelSubType" : "DECUSTOMVIEW",
+    "realModelType" : "PSDEVIEWBASE"
   }, {
     "codeName" : "TestMobEditView",
     "logicName" : "测试移动端编辑视图",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/TEST/PSDELOGICS/singleData.json

+{
+  "codeName" : "singleData",
+  "defaultParamName" : "Default",
+  "dynaModelFilePath" : "PSMODULES/Test/PSDATAENTITIES/TEST/PSDELOGICS/singleData.json",
+  "logicName" : "单项数据来源",
+  "name" : "单项数据来源",
+  "getPSDELogicNodes" : [ {
+    "codeName" : "Begin",
+    "leftPos" : 200,
+    "logicNodeType" : "BEGIN",
+    "name" : "开始",
+    "getPSDELogicLinks" : [ {
+      "getDstPSDELogicNode" : {
+        "modelref" : true,
+        "id" : "PREPAREPARAM1"
+      },
+      "name" : "连接名称",
+      "getSrcPSDELogicNode" : {
+        "modelref" : true,
+        "id" : "Begin"
+      }
+    } ],
+    "topPos" : 200,
+    "parallelOutput" : true
+  }, {
+    "codeName" : "PREPAREPARAM1",
+    "leftPos" : 348,
+    "logicNodeType" : "PREPAREPARAM",
+    "name" : "准备参数",
+    "getPSDELogicLinks" : [ {
+      "getDstPSDELogicNode" : {
+        "modelref" : true,
+        "id" : "END1"
+      },
+      "name" : "连接名称",
+      "getSrcPSDELogicNode" : {
+        "modelref" : true,
+        "id" : "PREPAREPARAM1"
+      }
+    } ],
+    "getPSDELogicNodeParams" : [ {
+      "dstFieldName" : "param1",
+      "getDstPSDELogicParam" : {
+        "modelref" : true,
+        "id" : "result"
+      },
+      "name" : "直接值[aaaa] ==> result[param1]",
+      "paramAction" : "SETPARAMVALUE",
+      "srcValue" : "aaaa",
+      "srcValueType" : "SRCVALUE"
+    }, {
+      "dstFieldName" : "param2",
+      "getDstPSDELogicParam" : {
+        "modelref" : true,
+        "id" : "result"
+      },
+      "name" : "直接值[bbbbb] ==> result[param2]",
+      "paramAction" : "SETPARAMVALUE",
+      "srcValue" : "bbbbb",
+      "srcValueType" : "SRCVALUE"
+    } ],
+    "topPos" : 216
+  }, {
+    "codeName" : "END1",
+    "leftPos" : 630,
+    "logicNodeType" : "END",
+    "name" : "结束",
+    "getReturnParam" : {
+      "modelref" : true,
+      "id" : "result"
+    },
+    "returnType" : "LOGICPARAM",
+    "topPos" : 230
+  } ],
+  "getPSDELogicParams" : [ {
+    "codeName" : "Default",
+    "logicName" : "传入变量",
+    "name" : "传入变量",
+    "getParamPSDataEntity" : {
+      "modelref" : true,
+      "path" : "PSMODULES/Test/PSDATAENTITIES/TEST.json"
+    },
+    "default" : true,
+    "entityParam" : true
+  }, {
+    "codeName" : "result",
+    "logicName" : "返回值",
+    "name" : "返回值",
+    "entityParam" : true
+  } ],
+  "getStartPSDELogicNode" : {
+    "modelref" : true,
+    "id" : "Begin"
+  },
+  "enableBackend" : false,
+  "enableFront" : true
+}
\ No newline at end of file

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

@@ -1617,6 +1617,105 @@
     },
     "enableBackend" : false,
     "enableFront" : true
+  }, {
+    "codeName" : "singleData",
+    "defaultParamName" : "Default",
+    "logicName" : "单项数据来源",
+    "name" : "单项数据来源",
+    "getPSDELogicNodes" : [ {
+      "codeName" : "Begin",
+      "leftPos" : 200,
+      "logicNodeType" : "BEGIN",
+      "name" : "开始",
+      "getPSDELogicLinks" : [ {
+        "getDstPSDELogicNode" : {
+          "modelref" : true,
+          "id" : "PREPAREPARAM1"
+        },
+        "name" : "连接名称",
+        "getSrcPSDELogicNode" : {
+          "modelref" : true,
+          "id" : "Begin"
+        }
+      } ],
+      "topPos" : 200,
+      "parallelOutput" : true
+    }, {
+      "codeName" : "PREPAREPARAM1",
+      "leftPos" : 348,
+      "logicNodeType" : "PREPAREPARAM",
+      "name" : "准备参数",
+      "getPSDELogicLinks" : [ {
+        "getDstPSDELogicNode" : {
+          "modelref" : true,
+          "id" : "END1"
+        },
+        "name" : "连接名称",
+        "getSrcPSDELogicNode" : {
+          "modelref" : true,
+          "id" : "PREPAREPARAM1"
+        }
+      } ],
+      "getPSDELogicNodeParams" : [ {
+        "dstFieldName" : "param1",
+        "getDstPSDELogicParam" : {
+          "modelref" : true,
+          "id" : "result"
+        },
+        "name" : "直接值[aaaa] ==> result[param1]",
+        "paramAction" : "SETPARAMVALUE",
+        "srcValue" : "aaaa",
+        "srcValueType" : "SRCVALUE"
+      }, {
+        "dstFieldName" : "param2",
+        "getDstPSDELogicParam" : {
+          "modelref" : true,
+          "id" : "result"
+        },
+        "name" : "直接值[bbbbb] ==> result[param2]",
+        "paramAction" : "SETPARAMVALUE",
+        "srcValue" : "bbbbb",
+        "srcValueType" : "SRCVALUE"
+      } ],
+      "topPos" : 216
+    }, {
+      "codeName" : "END1",
+      "leftPos" : 630,
+      "logicNodeType" : "END",
+      "name" : "结束",
+      "getReturnParam" : {
+        "modelref" : true,
+        "id" : "result"
+      },
+      "returnType" : "LOGICPARAM",
+      "topPos" : 230
+    } ],
+    "getPSDELogicParams" : [ {
+      "codeName" : "Default",
+      "logicName" : "传入变量",
+      "name" : "传入变量",
+      "getParamPSAppDataEntity" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST.json"
+      },
+      "getParamPSDataEntity" : {
+        "modelref" : true,
+        "path" : "PSMODULES/Test/PSDATAENTITIES/TEST.json"
+      },
+      "default" : true,
+      "entityParam" : true
+    }, {
+      "codeName" : "result",
+      "logicName" : "返回值",
+      "name" : "返回值",
+      "entityParam" : true
+    } ],
+    "getStartPSDELogicNode" : {
+      "modelref" : true,
+      "id" : "Begin"
+    },
+    "enableBackend" : false,
+    "enableFront" : true
   } ],
   "getAllPSAppDEMethodDTOs" : [ {
     "codeName" : "TESTDTO",

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

@@ -17077,6 +17077,105 @@
         },
         "enableBackend" : false,
         "enableFront" : true
+      }, {
+        "codeName" : "singleData",
+        "defaultParamName" : "Default",
+        "logicName" : "单项数据来源",
+        "name" : "单项数据来源",
+        "getPSDELogicNodes" : [ {
+          "codeName" : "Begin",
+          "leftPos" : 200,
+          "logicNodeType" : "BEGIN",
+          "name" : "开始",
+          "getPSDELogicLinks" : [ {
+            "getDstPSDELogicNode" : {
+              "modelref" : true,
+              "id" : "PREPAREPARAM1"
+            },
+            "name" : "连接名称",
+            "getSrcPSDELogicNode" : {
+              "modelref" : true,
+              "id" : "Begin"
+            }
+          } ],
+          "topPos" : 200,
+          "parallelOutput" : true
+        }, {
+          "codeName" : "PREPAREPARAM1",
+          "leftPos" : 348,
+          "logicNodeType" : "PREPAREPARAM",
+          "name" : "准备参数",
+          "getPSDELogicLinks" : [ {
+            "getDstPSDELogicNode" : {
+              "modelref" : true,
+              "id" : "END1"
+            },
+            "name" : "连接名称",
+            "getSrcPSDELogicNode" : {
+              "modelref" : true,
+              "id" : "PREPAREPARAM1"
+            }
+          } ],
+          "getPSDELogicNodeParams" : [ {
+            "dstFieldName" : "param1",
+            "getDstPSDELogicParam" : {
+              "modelref" : true,
+              "id" : "result"
+            },
+            "name" : "直接值[aaaa] ==> result[param1]",
+            "paramAction" : "SETPARAMVALUE",
+            "srcValue" : "aaaa",
+            "srcValueType" : "SRCVALUE"
+          }, {
+            "dstFieldName" : "param2",
+            "getDstPSDELogicParam" : {
+              "modelref" : true,
+              "id" : "result"
+            },
+            "name" : "直接值[bbbbb] ==> result[param2]",
+            "paramAction" : "SETPARAMVALUE",
+            "srcValue" : "bbbbb",
+            "srcValueType" : "SRCVALUE"
+          } ],
+          "topPos" : 216
+        }, {
+          "codeName" : "END1",
+          "leftPos" : 630,
+          "logicNodeType" : "END",
+          "name" : "结束",
+          "getReturnParam" : {
+            "modelref" : true,
+            "id" : "result"
+          },
+          "returnType" : "LOGICPARAM",
+          "topPos" : 230
+        } ],
+        "getPSDELogicParams" : [ {
+          "codeName" : "Default",
+          "logicName" : "传入变量",
+          "name" : "传入变量",
+          "getParamPSAppDataEntity" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST.json"
+          },
+          "getParamPSDataEntity" : {
+            "modelref" : true,
+            "path" : "PSMODULES/Test/PSDATAENTITIES/TEST.json"
+          },
+          "default" : true,
+          "entityParam" : true
+        }, {
+          "codeName" : "result",
+          "logicName" : "返回值",
+          "name" : "返回值",
+          "entityParam" : true
+        } ],
+        "getStartPSDELogicNode" : {
+          "modelref" : true,
+          "id" : "Begin"
+        },
+        "enableBackend" : false,
+        "enableFront" : true
       } ],
       "getAllPSAppDEMethodDTOs" : [ {
         "codeName" : "TESTDTO",

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

@@ -1617,6 +1617,105 @@
     },
     "enableBackend" : false,
     "enableFront" : true
+  }, {
+    "codeName" : "singleData",
+    "defaultParamName" : "Default",
+    "logicName" : "单项数据来源",
+    "name" : "单项数据来源",
+    "getPSDELogicNodes" : [ {
+      "codeName" : "Begin",
+      "leftPos" : 200,
+      "logicNodeType" : "BEGIN",
+      "name" : "开始",
+      "getPSDELogicLinks" : [ {
+        "getDstPSDELogicNode" : {
+          "modelref" : true,
+          "id" : "PREPAREPARAM1"
+        },
+        "name" : "连接名称",
+        "getSrcPSDELogicNode" : {
+          "modelref" : true,
+          "id" : "Begin"
+        }
+      } ],
+      "topPos" : 200,
+      "parallelOutput" : true
+    }, {
+      "codeName" : "PREPAREPARAM1",
+      "leftPos" : 348,
+      "logicNodeType" : "PREPAREPARAM",
+      "name" : "准备参数",
+      "getPSDELogicLinks" : [ {
+        "getDstPSDELogicNode" : {
+          "modelref" : true,
+          "id" : "END1"
+        },
+        "name" : "连接名称",
+        "getSrcPSDELogicNode" : {
+          "modelref" : true,
+          "id" : "PREPAREPARAM1"
+        }
+      } ],
+      "getPSDELogicNodeParams" : [ {
+        "dstFieldName" : "param1",
+        "getDstPSDELogicParam" : {
+          "modelref" : true,
+          "id" : "result"
+        },
+        "name" : "直接值[aaaa] ==> result[param1]",
+        "paramAction" : "SETPARAMVALUE",
+        "srcValue" : "aaaa",
+        "srcValueType" : "SRCVALUE"
+      }, {
+        "dstFieldName" : "param2",
+        "getDstPSDELogicParam" : {
+          "modelref" : true,
+          "id" : "result"
+        },
+        "name" : "直接值[bbbbb] ==> result[param2]",
+        "paramAction" : "SETPARAMVALUE",
+        "srcValue" : "bbbbb",
+        "srcValueType" : "SRCVALUE"
+      } ],
+      "topPos" : 216
+    }, {
+      "codeName" : "END1",
+      "leftPos" : 630,
+      "logicNodeType" : "END",
+      "name" : "结束",
+      "getReturnParam" : {
+        "modelref" : true,
+        "id" : "result"
+      },
+      "returnType" : "LOGICPARAM",
+      "topPos" : 230
+    } ],
+    "getPSDELogicParams" : [ {
+      "codeName" : "Default",
+      "logicName" : "传入变量",
+      "name" : "传入变量",
+      "getParamPSAppDataEntity" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/TEST.json"
+      },
+      "getParamPSDataEntity" : {
+        "modelref" : true,
+        "path" : "PSMODULES/Test/PSDATAENTITIES/TEST.json"
+      },
+      "default" : true,
+      "entityParam" : true
+    }, {
+      "codeName" : "result",
+      "logicName" : "返回值",
+      "name" : "返回值",
+      "entityParam" : true
+    } ],
+    "getStartPSDELogicNode" : {
+      "modelref" : true,
+      "id" : "Begin"
+    },
+    "enableBackend" : false,
+    "enableFront" : true
   } ],
   "getAllPSAppDEMethodDTOs" : [ {
     "codeName" : "TESTDTO",

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

@@ -1617,6 +1617,105 @@
     },
     "enableBackend" : false,
     "enableFront" : true
+  }, {
+    "codeName" : "singleData",
+    "defaultParamName" : "Default",
+    "logicName" : "单项数据来源",
+    "name" : "单项数据来源",
+    "getPSDELogicNodes" : [ {
+      "codeName" : "Begin",
+      "leftPos" : 200,
+      "logicNodeType" : "BEGIN",
+      "name" : "开始",
+      "getPSDELogicLinks" : [ {
+        "getDstPSDELogicNode" : {
+          "modelref" : true,
+          "id" : "PREPAREPARAM1"
+        },
+        "name" : "连接名称",
+        "getSrcPSDELogicNode" : {
+          "modelref" : true,
+          "id" : "Begin"
+        }
+      } ],
+      "topPos" : 200,
+      "parallelOutput" : true
+    }, {
+      "codeName" : "PREPAREPARAM1",
+      "leftPos" : 348,
+      "logicNodeType" : "PREPAREPARAM",
+      "name" : "准备参数",
+      "getPSDELogicLinks" : [ {
+        "getDstPSDELogicNode" : {
+          "modelref" : true,
+          "id" : "END1"
+        },
+        "name" : "连接名称",
+        "getSrcPSDELogicNode" : {
+          "modelref" : true,
+          "id" : "PREPAREPARAM1"
+        }
+      } ],
+      "getPSDELogicNodeParams" : [ {
+        "dstFieldName" : "param1",
+        "getDstPSDELogicParam" : {
+          "modelref" : true,
+          "id" : "result"
+        },
+        "name" : "直接值[aaaa] ==> result[param1]",
+        "paramAction" : "SETPARAMVALUE",
+        "srcValue" : "aaaa",
+        "srcValueType" : "SRCVALUE"
+      }, {
+        "dstFieldName" : "param2",
+        "getDstPSDELogicParam" : {
+          "modelref" : true,
+          "id" : "result"
+        },
+        "name" : "直接值[bbbbb] ==> result[param2]",
+        "paramAction" : "SETPARAMVALUE",
+        "srcValue" : "bbbbb",
+        "srcValueType" : "SRCVALUE"
+      } ],
+      "topPos" : 216
+    }, {
+      "codeName" : "END1",
+      "leftPos" : 630,
+      "logicNodeType" : "END",
+      "name" : "结束",
+      "getReturnParam" : {
+        "modelref" : true,
+        "id" : "result"
+      },
+      "returnType" : "LOGICPARAM",
+      "topPos" : 230
+    } ],
+    "getPSDELogicParams" : [ {
+      "codeName" : "Default",
+      "logicName" : "传入变量",
+      "name" : "传入变量",
+      "getParamPSAppDataEntity" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
+      },
+      "getParamPSDataEntity" : {
+        "modelref" : true,
+        "path" : "PSMODULES/Test/PSDATAENTITIES/TEST.json"
+      },
+      "default" : true,
+      "entityParam" : true
+    }, {
+      "codeName" : "result",
+      "logicName" : "返回值",
+      "name" : "返回值",
+      "entityParam" : true
+    } ],
+    "getStartPSDELogicNode" : {
+      "modelref" : true,
+      "id" : "Begin"
+    },
+    "enableBackend" : false,
+    "enableFront" : true
   } ],
   "getAllPSAppDEMethodDTOs" : [ {
     "codeName" : "TESTDTO",
@@ -3091,6 +3190,10 @@
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTLogicGridView.json",
     "viewType" : "DEGRIDVIEW"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTPanelDataContainerTest.json",
+    "viewType" : "DECUSTOMVIEW"
   }, {
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTGridExpView.json",

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

+{
+  "accUserMode" : 2,
+  "caption" : "数据容器测试",
+  "codeName" : "TESTPanelDataContainerTest",
+  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTPanelDataContainerTest.json",
+  "name" : "TESTPanelDataContainerTest",
+  "getPSAppDataEntity" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
+  },
+  "getPSAppModule" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPMODULES/Test.json"
+  },
+  "getPSDEViewCodeName" : "PanelDataContainerTest",
+  "getPSDEViewId" : "EE0C3FB2-571B-45D9-BA91-B4144FBC9D7C",
+  "getPSViewLayoutPanel" : {
+    "codeName" : "Usr0804167887",
+    "controlType" : "VIEWLAYOUTPANEL",
+    "layoutMode" : "FLEX",
+    "logicName" : "数据容器测试布局面板",
+    "name" : "layoutpanel",
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
+    },
+    "getPSControlParam" : { },
+    "getPSLayout" : {
+      "layout" : "FLEX"
+    },
+    "getRootPSPanelItems" : [ {
+      "caption" : "单项数据容器(实体行为)",
+      "dataRegionType" : "SINGLEDATA",
+      "dataSourceType" : "DEACTION",
+      "itemStyle" : "DEFAULT",
+      "itemType" : "CONTAINER",
+      "name" : "container_singledata",
+      "getPSAppDEMethod" : {
+        "modelref" : true,
+        "id" : "GetDraft"
+      },
+      "getPSAppDataEntity" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
+      },
+      "getPSLayout" : {
+        "layout" : "FLEX"
+      },
+      "getPSLayoutPos" : {
+        "grow" : -1,
+        "layout" : "FLEX"
+      },
+      "predefinedType" : "CONTAINER_SINGLEDATA"
+    }, {
+      "caption" : "单项数据容器（数据集）",
+      "dataRegionType" : "SINGLEDATA",
+      "dataSourceType" : "DEDATASET",
+      "itemStyle" : "DEFAULT",
+      "itemType" : "CONTAINER",
+      "name" : "container_singledata1",
+      "getPSAppDEMethod" : {
+        "modelref" : true,
+        "id" : "FetchDefault"
+      },
+      "getPSAppDataEntity" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
+      },
+      "getPSLayout" : {
+        "layout" : "FLEX"
+      },
+      "getPSLayoutPos" : {
+        "grow" : -1,
+        "layout" : "FLEX"
+      },
+      "predefinedType" : "CONTAINER_SINGLEDATA"
+    }, {
+      "caption" : "单项数据容器（实体逻辑）",
+      "dataRegionType" : "SINGLEDATA",
+      "dataSourceType" : "DELOGIC",
+      "itemStyle" : "DEFAULT",
+      "itemType" : "CONTAINER",
+      "name" : "container_singledata2",
+      "getPSAppDELogic" : {
+        "modelref" : true,
+        "id" : "singleData"
+      },
+      "getPSAppDataEntity" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
+      },
+      "getPSLayout" : {
+        "layout" : "FLEX"
+      },
+      "getPSLayoutPos" : {
+        "grow" : -1,
+        "layout" : "FLEX"
+      },
+      "predefinedType" : "CONTAINER_SINGLEDATA"
+    }, {
+      "caption" : "单项数据容器(应用全局变量)",
+      "dataName" : "context",
+      "dataRegionType" : "SINGLEDATA",
+      "dataSourceType" : "APPGLOBALPARAM",
+      "itemStyle" : "DEFAULT",
+      "itemType" : "CONTAINER",
+      "name" : "container_singledata3",
+      "getPSLayout" : {
+        "layout" : "FLEX"
+      },
+      "getPSLayoutPos" : {
+        "grow" : -1,
+        "layout" : "FLEX"
+      },
+      "predefinedType" : "CONTAINER_SINGLEDATA"
+    }, {
+      "caption" : "单项数据容器（顶级视图）",
+      "dataName" : "srfactiveviewdata",
+      "dataRegionType" : "SINGLEDATA",
+      "dataSourceType" : "TOPVIEWSESSIONPARAM",
+      "itemStyle" : "DEFAULT",
+      "itemType" : "CONTAINER",
+      "name" : "container_singledata4",
+      "getPSLayout" : {
+        "layout" : "FLEX"
+      },
+      "getPSLayoutPos" : {
+        "grow" : -1,
+        "layout" : "FLEX"
+      },
+      "predefinedType" : "CONTAINER_SINGLEDATA"
+    }, {
+      "caption" : "单项数据容器（当前视图）",
+      "dataName" : "srfactiveviewdata",
+      "dataRegionType" : "SINGLEDATA",
+      "dataSourceType" : "VIEWSESSIONPARAM",
+      "itemStyle" : "DEFAULT",
+      "itemType" : "CONTAINER",
+      "name" : "container_singledata5",
+      "getPSLayout" : {
+        "layout" : "FLEX"
+      },
+      "getPSLayoutPos" : {
+        "grow" : -1,
+        "layout" : "FLEX"
+      },
+      "predefinedType" : "CONTAINER_SINGLEDATA"
+    } ],
+    "layoutBodyOnly" : false,
+    "layoutPanel" : true,
+    "useDefaultLayout" : false,
+    "viewProxyMode" : true,
+    "modelid" : "F3DC3B52-1675-499D-845E-2D1AFFFF653A",
+    "modeltype" : "PSSYSVIEWLAYOUTPANEL",
+    "getPSControls" : [ {
+      "caption" : "数据容器测试",
+      "codeName" : "PanelDataContainerTestcaptionbar",
+      "controlType" : "CAPTIONBAR",
+      "name" : "captionbar",
+      "getPSAppDataEntity" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
+      },
+      "getPSControlParam" : { }
+    } ]
+  },
+  "title" : "数据容器测试",
+  "viewStyle" : "DEFAULT",
+  "viewType" : "DECUSTOMVIEW",
+  "enableDP" : true,
+  "modelid" : "29EBE388-79D7-4B3E-BFA1-0400567899B5",
+  "modeltype" : "PSAPPDEVIEW"
+}
\ No newline at end of file

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

@@ -590,6 +590,28 @@
           "layout" : "TABLE_24COL"
         },
         "tooltip" : "测试表格导航"
+      }, {
+        "accUserMode" : 2,
+        "caption" : "数据容器测试",
+        "itemType" : "MENUITEM",
+        "name" : "menuitem37",
+        "getPSAppFunc" : {
+          "modelref" : true,
+          "id" : "UsrAppFunc0804536999"
+        },
+        "getPSLayout" : {
+          "childColLG" : -1,
+          "childColMD" : 24,
+          "childColSM" : -1,
+          "childColXS" : -1,
+          "columnCount" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "tooltip" : "数据容器测试"
       } ],
       "getPSLayout" : {
         "childColLG" : -1,

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

@@ -266,6 +266,16 @@
         "id" : "UsrAppFunc0719249269"
       },
       "tooltip" : "测试表格导航"
+    }, {
+      "accUserMode" : 2,
+      "caption" : "数据容器测试",
+      "itemType" : "MENUITEM",
+      "name" : "menuitem37",
+      "getPSAppFunc" : {
+        "modelref" : true,
+        "id" : "UsrAppFunc0804536999"
+      },
+      "tooltip" : "数据容器测试"
     } ],
     "tooltip" : "面板"
   }, {

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

@@ -2300,6 +2300,16 @@
       "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookBookEditViewEditorTest.json",
       "viewType" : "DEEDITVIEW"
     }
+  }, {
+    "appFuncType" : "APPVIEW",
+    "codeName" : "UsrAppFunc0804536999",
+    "name" : "数据容器测试",
+    "openMode" : "INDEXVIEWTAB",
+    "getPSAppView" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTPanelDataContainerTest.json",
+      "viewType" : "DECUSTOMVIEW"
+    }
   }, {
     "appFuncType" : "APPVIEW",
     "codeName" : "AppFunc79",
@@ -3147,6 +3157,12 @@
     "viewType" : "DEEDITVIEW3",
     "resource" : "Book",
     "view" : "EditView3"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTPanelDataContainerTest.json",
+    "viewType" : "DECUSTOMVIEW",
+    "resource" : "TEST",
+    "view" : "PanelDataContainerTest"
   }, {
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ViewLayoutModelRepositoryDEEditViewLayout.json",
@@ -26436,6 +26452,105 @@
         },
         "enableBackend" : false,
         "enableFront" : true
+      }, {
+        "codeName" : "singleData",
+        "defaultParamName" : "Default",
+        "logicName" : "单项数据来源",
+        "name" : "单项数据来源",
+        "getPSDELogicNodes" : [ {
+          "codeName" : "Begin",
+          "leftPos" : 200,
+          "logicNodeType" : "BEGIN",
+          "name" : "开始",
+          "getPSDELogicLinks" : [ {
+            "getDstPSDELogicNode" : {
+              "modelref" : true,
+              "id" : "PREPAREPARAM1"
+            },
+            "name" : "连接名称",
+            "getSrcPSDELogicNode" : {
+              "modelref" : true,
+              "id" : "Begin"
+            }
+          } ],
+          "topPos" : 200,
+          "parallelOutput" : true
+        }, {
+          "codeName" : "PREPAREPARAM1",
+          "leftPos" : 348,
+          "logicNodeType" : "PREPAREPARAM",
+          "name" : "准备参数",
+          "getPSDELogicLinks" : [ {
+            "getDstPSDELogicNode" : {
+              "modelref" : true,
+              "id" : "END1"
+            },
+            "name" : "连接名称",
+            "getSrcPSDELogicNode" : {
+              "modelref" : true,
+              "id" : "PREPAREPARAM1"
+            }
+          } ],
+          "getPSDELogicNodeParams" : [ {
+            "dstFieldName" : "param1",
+            "getDstPSDELogicParam" : {
+              "modelref" : true,
+              "id" : "result"
+            },
+            "name" : "直接值[aaaa] ==> result[param1]",
+            "paramAction" : "SETPARAMVALUE",
+            "srcValue" : "aaaa",
+            "srcValueType" : "SRCVALUE"
+          }, {
+            "dstFieldName" : "param2",
+            "getDstPSDELogicParam" : {
+              "modelref" : true,
+              "id" : "result"
+            },
+            "name" : "直接值[bbbbb] ==> result[param2]",
+            "paramAction" : "SETPARAMVALUE",
+            "srcValue" : "bbbbb",
+            "srcValueType" : "SRCVALUE"
+          } ],
+          "topPos" : 216
+        }, {
+          "codeName" : "END1",
+          "leftPos" : 630,
+          "logicNodeType" : "END",
+          "name" : "结束",
+          "getReturnParam" : {
+            "modelref" : true,
+            "id" : "result"
+          },
+          "returnType" : "LOGICPARAM",
+          "topPos" : 230
+        } ],
+        "getPSDELogicParams" : [ {
+          "codeName" : "Default",
+          "logicName" : "传入变量",
+          "name" : "传入变量",
+          "getParamPSAppDataEntity" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
+          },
+          "getParamPSDataEntity" : {
+            "modelref" : true,
+            "path" : "PSMODULES/Test/PSDATAENTITIES/TEST.json"
+          },
+          "default" : true,
+          "entityParam" : true
+        }, {
+          "codeName" : "result",
+          "logicName" : "返回值",
+          "name" : "返回值",
+          "entityParam" : true
+        } ],
+        "getStartPSDELogicNode" : {
+          "modelref" : true,
+          "id" : "Begin"
+        },
+        "enableBackend" : false,
+        "enableFront" : true
       } ],
       "getAllPSAppDEMethodDTOs" : [ {
         "codeName" : "TESTDTO",
@@ -27910,6 +28025,10 @@
         "modelref" : true,
         "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTLogicGridView.json",
         "viewType" : "DEGRIDVIEW"
+      }, {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTPanelDataContainerTest.json",
+        "viewType" : "DECUSTOMVIEW"
       }, {
         "modelref" : true,
         "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTGridExpView.json",

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: