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

a7622322 · ibizdev · 79cdbf05 · a7622322 · a7622322 · a7622322
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSCODELISTS/FileType.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSCODELISTS/FileType.json
@@ -6,6 +6,15 @@
  "dynaModelFilePath" : "PSMODULES/Test/PSCODELISTS/FileType.json",
  "emptyText" : "未定义",
  "name" : "文件类型",
+  "getPSCodeItems" : [ {
+    "codeName" : "Folder",
+    "text" : "文件夹",
+    "value" : "FOLDER"
+  }, {
+    "codeName" : "File",
+    "text" : "文件",
+    "value" : "FILE"
+  } ],
  "getPSSystemModule" : {
    "modelref" : true,
    "path" : "PSMODULES/Test.json"

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/BXD2/PSDEDATAFLOWS/tesst.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/BXD2/PSDEDATAFLOWS/tesst.json
@@ -2,5 +2,12 @@
  "codeName" : "tesst",
  "dynaModelFilePath" : "PSMODULES/Test/PSDATAENTITIES/BXD2/PSDEDATAFLOWS/tesst.json",
  "logicName" : "test",
-  "name" : "test"
+  "name" : "test",
+  "getPSDEDataFlowNodes" : [ {
+    "codeName" : "DFAGGREGATEPROCESS1",
+    "leftPos" : 110,
+    "name" : "聚合处理(AGGREGATE)",
+    "nodeType" : "DFAGGREGATEPROCESS",
+    "topPos" : 240
+  } ]
 }
\ No newline at end of file
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/TEST.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/TEST.json
@@ -4336,6 +4336,12 @@
    "name" : "测试实体实体列表视图",
    "realModelSubType" : "DELISTVIEW",
    "realModelType" : "PSDEVIEWBASE"
+  }, {
+    "codeName" : "PanelLayoutTest",
+    "logicName" : "布局面板测试",
+    "name" : "布局面板测试",
+    "realModelSubType" : "DECUSTOMVIEW",
+    "realModelType" : "PSDEVIEWBASE"
  }, {
    "codeName" : "TestControlEditView",
    "logicName" : "测试实体测试动态控制编辑视图",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPCODELISTS/FileType.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPCODELISTS/FileType.json
@@ -6,5 +6,14 @@
  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPCODELISTS/FileType.json",
  "emptyText" : "未定义",
  "name" : "文件类型",
+  "getPSCodeItems" : [ {
+    "codeName" : "Folder",
+    "text" : "文件夹",
+    "value" : "FOLDER"
+  }, {
+    "codeName" : "File",
+    "text" : "文件",
+    "value" : "FILE"
+  } ],
  "enableCache" : true
 }
\ No newline at end of file
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json
@@ -5739,6 +5739,10 @@
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTLogicEditView.json",
    "viewType" : "DEEDITVIEW"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTPanelLayoutTest.json",
+    "viewType" : "DECUSTOMVIEW"
  }, {
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr19EditView_8467.json",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTPanelLayoutTest.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTPanelLayoutTest.json
+{
+  "accUserMode" : 2,
+  "caption" : "布局面板测试",
+  "codeName" : "TESTPanelLayoutTest",
+  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTPanelLayoutTest.json",
+  "name" : "TESTPanelLayoutTest",
+  "getPSAppDataEntity" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
+  },
+  "getPSAppModule" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPMODULES/Test.json"
+  },
+  "getPSDEViewCodeName" : "PanelLayoutTest",
+  "getPSDEViewId" : "15B8B886-E115-41F4-97B2-3FD4F5F5B863",
+  "getPSViewLayoutPanel" : {
+    "codeName" : "Usr1205588682",
+    "controlType" : "VIEWLAYOUTPANEL",
+    "layoutMode" : "FLEX",
+    "logicName" : "布局面板测试布局面板",
+    "name" : "layoutpanel",
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
+    },
+    "getPSControlParam" : { },
+    "getPSLayout" : {
+      "layout" : "FLEX"
+    },
+    "getRootPSPanelItems" : [ {
+      "caption" : "分页部件",
+      "itemStyle" : "DEFAULT",
+      "itemType" : "TABPANEL",
+      "name" : "tabpanel",
+      "getPSLayoutPos" : {
+        "grow" : -1,
+        "layout" : "FLEX"
+      },
+      "getPSPanelTabPages" : [ {
+        "caption" : "面板容器",
+        "itemStyle" : "DEFAULT",
+        "itemType" : "TABPAGE",
+        "name" : "tabpage",
+        "getPSLayout" : {
+          "layout" : "FLEX"
+        },
+        "getPSLayoutPos" : {
+          "grow" : -1,
+          "layout" : "FLEX"
+        },
+        "getPSPanelItems" : [ {
+          "caption" : "分组标题",
+          "itemStyle" : "DEFAULT",
+          "itemType" : "CONTAINER",
+          "name" : "container_group",
+          "getPSLayout" : {
+            "layout" : "FLEX"
+          },
+          "getPSLayoutPos" : {
+            "grow" : -1,
+            "layout" : "FLEX"
+          },
+          "getPSPanelItems" : [ {
+            "caption" : "文本",
+            "contentType" : "RAW",
+            "itemStyle" : "DEFAULT",
+            "itemType" : "RAWITEM",
+            "name" : "static_text",
+            "getPSLayoutPos" : {
+              "grow" : -1,
+              "layout" : "FLEX"
+            },
+            "getPSRawItem" : {
+              "caption" : "文本内容",
+              "contentType" : "RAW",
+              "name" : "static_text",
+              "predefinedType" : "STATIC_TEXT",
+              "renderMode" : "TEXT"
+            },
+            "rawContent" : "文本内容",
+            "showCaption" : true
+          } ],
+          "predefinedType" : "CONTAINER_GROUP",
+          "showCaption" : true
+        } ],
+        "showCaption" : true
+      }, {
+        "caption" : "分页2",
+        "itemStyle" : "DEFAULT",
+        "itemType" : "TABPAGE",
+        "name" : "tabpage1",
+        "getPSLayout" : {
+          "layout" : "FLEX"
+        },
+        "getPSLayoutPos" : {
+          "grow" : -1,
+          "layout" : "FLEX"
+        },
+        "showCaption" : true
+      } ]
+    } ],
+    "layoutBodyOnly" : false,
+    "layoutPanel" : true,
+    "useDefaultLayout" : false,
+    "viewProxyMode" : true,
+    "modelid" : "AD5E0785-423B-4C84-8C82-0533816302E4",
+    "modeltype" : "PSSYSVIEWLAYOUTPANEL",
+    "getPSControls" : [ {
+      "caption" : "布局面板测试",
+      "codeName" : "PanelLayoutTestcaptionbar",
+      "controlType" : "CAPTIONBAR",
+      "name" : "captionbar",
+      "getPSAppDataEntity" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
+      },
+      "getPSControlParam" : { }
+    } ]
+  },
+  "title" : "布局面板测试",
+  "viewStyle" : "DEFAULT",
+  "viewType" : "DECUSTOMVIEW",
+  "enableDP" : true,
+  "modelid" : "658d26a3b5f2453838a34d082c4d4950",
+  "modeltype" : "PSAPPDEVIEW"
+}
\ No newline at end of file
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPINDEXVIEWS/AppTestIndexView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPINDEXVIEWS/AppTestIndexView.json
@@ -749,6 +749,28 @@
          "layout" : "TABLE_24COL"
        },
        "tooltip" : "导航栏自动加载测试"
+      }, {
+        "accUserMode" : 2,
+        "caption" : "布局面板测试",
+        "itemType" : "MENUITEM",
+        "name" : "menuitem65",
+        "getPSAppFunc" : {
+          "modelref" : true,
+          "id" : "UsrAppFunc1205702964"
+        },
+        "getPSLayout" : {
+          "childColLG" : -1,
+          "childColMD" : 24,
+          "childColSM" : -1,
+          "childColXS" : -1,
+          "columnCount" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "tooltip" : "布局面板测试"
      } ],
      "getPSLayout" : {
        "childColLG" : -1,

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPMENUS/AppTestIndexView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPMENUS/AppTestIndexView.json
@@ -338,6 +338,16 @@
        "id" : "UsrAppFunc0919664061"
      },
      "tooltip" : "导航栏自动加载测试"
+    }, {
+      "accUserMode" : 2,
+      "caption" : "布局面板测试",
+      "itemType" : "MENUITEM",
+      "name" : "menuitem65",
+      "getPSAppFunc" : {
+        "modelref" : true,
+        "id" : "UsrAppFunc1205702964"
+      },
+      "tooltip" : "布局面板测试"
    } ],
    "tooltip" : "面板"
  }, {

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
@@ -384,6 +384,15 @@
    "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPCODELISTS/FileType.json",
    "emptyText" : "未定义",
    "name" : "文件类型",
+    "getPSCodeItems" : [ {
+      "codeName" : "Folder",
+      "text" : "文件夹",
+      "value" : "FOLDER"
+    }, {
+      "codeName" : "File",
+      "text" : "文件",
+      "value" : "FILE"
+    } ],
    "enableCache" : true
  }, {
    "codeListTag" : "Test__MapDataType",
@@ -2242,6 +2251,16 @@
      "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoREGINFOGridExpView2.json",
      "viewType" : "DEGRIDEXPVIEW"
    }
+  }, {
+    "appFuncType" : "APPVIEW",
+    "codeName" : "UsrAppFunc1205702964",
+    "name" : "布局面板测试",
+    "openMode" : "INDEXVIEWTAB",
+    "getPSAppView" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTPanelLayoutTest.json",
+      "viewType" : "DECUSTOMVIEW"
+    }
  }, {
    "appFuncType" : "APPVIEW",
    "codeName" : "AppFunc29",
@@ -11468,16 +11487,16 @@
    "codeName" : "VMGroup3",
    "name" : "视图消息类型测试",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-错误信息",
+      "name" : "消息类型-警告信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg6"
+        "id" : "ViewMsg5"
      }
    }, {
-      "name" : "消息类型-警告信息",
+      "name" : "消息类型-错误信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg5"
+        "id" : "ViewMsg6"
      }
    }, {
      "name" : "消息类型-常规信息",
@@ -11533,6 +11552,13 @@
        "modelref" : true,
        "id" : "ViewMsg8"
      }
+    }, {
+      "name" : "消息类型-常规信息",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg4"
+      },
+      "position" : "POPUP"
    }, {
      "name" : "关闭模式-无删除-上方-常规",
      "getPSAppViewMsg" : {
@@ -11540,12 +11566,11 @@
        "id" : "ViewMsg11"
      }
    }, {
-      "name" : "消息类型-常规信息",
+      "name" : "消息位置-视图内容区",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg4"
-      },
-      "position" : "POPUP"
+        "id" : "ViewMsg9"
+      }
    }, {
      "name" : "关闭模式-默认删除-上方-错误",
      "getPSAppViewMsg" : {
@@ -11559,12 +11584,6 @@
        "id" : "ViewMsg5"
      },
      "position" : "POPUP"
-    }, {
-      "name" : "消息位置-视图内容区",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg9"
-      }
    }, {
      "name" : "关闭模式-本次删除-上方-警告",
      "getPSAppViewMsg" : {
@@ -12722,6 +12741,12 @@
    "viewType" : "DEGRIDVIEW",
    "resource" : "Bxdex",
    "view" : "Usr2GridView"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTPanelLayoutTest.json",
+    "viewType" : "DECUSTOMVIEW",
+    "resource" : "TEST",
+    "view" : "PanelLayoutTest"
  }, {
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ViewLayoutModelRepositoryDEOptionViewLayout.json",
@@ -56421,6 +56446,10 @@
        "modelref" : true,
        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTLogicEditView.json",
        "viewType" : "DEEDITVIEW"
+      }, {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTPanelLayoutTest.json",
+        "viewType" : "DECUSTOMVIEW"
      }, {
        "modelref" : true,
        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr19EditView_8467.json",