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

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

@@ -1360,16 +1360,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"
       }
     } ]
   }, {

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

@@ -32,7 +32,7 @@
     "id" : "fetch",
     "getADPSAppDELogic" : {
       "modelref" : true,
-      "id" : "logic1"
+      "id" : "singleData"
     },
     "actionType" : "DEDATASET",
     "name" : "fetch",
@@ -62,6 +62,7 @@
     }
   },
   "groupMode" : "NONE",
+  "height" : 100.0,
   "hookEventNames" : [ "ONBEFORELOAD", "点击" ],
   "getItemPSLayoutPanel" : {
     "getAllPSPanelFields" : [ {
@@ -178,7 +179,7 @@
       } ],
       "predefinedType" : "CONTAINER_GRID"
     } ],
-    "name" : "simplelist_itempanel",
+    "name" : "list_itempanel",
     "modelid" : "01B1D530-723C-4CB4-A877-5F5E3CFC11AF",
     "modeltype" : "PSSYSVIEWPANEL"
   },
@@ -207,7 +208,7 @@
     "eventArg2" : "22",
     "eventNames" : "onBeforeLoad",
     "itemName" : "TESTNAME",
-    "logicTag" : "simplelist",
+    "logicTag" : "list",
     "logicType" : "APPDEUIACTION",
     "name" : "test",
     "getPSAppDEUIAction" : {
@@ -223,7 +224,7 @@
     }
   }, {
     "eventNames" : "点击",
-    "logicTag" : "simplelist",
+    "logicTag" : "list",
     "logicType" : "APPDEUILOGIC",
     "name" : "member1",
     "getPSAppDEUILogic" : {
@@ -236,7 +237,7 @@
     }
   }, {
     "eventNames" : "点击",
-    "logicTag" : "simplelist",
+    "logicTag" : "list",
     "logicType" : "APPDEUILOGIC",
     "name" : "member2",
     "getPSAppDEUILogic" : {
@@ -248,47 +249,51 @@
       "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
     }
   }, {
-    "logicTag" : "simplelist",
+    "logicTag" : "list",
     "logicType" : "PFPLUGIN",
     "name" : "member3",
     "timer" : 333,
     "triggerType" : "TIMER"
   }, {
-    "logicTag" : "simplelist",
+    "logicTag" : "list",
     "logicType" : "SCRIPT",
     "name" : "member5",
     "scriptCode" : "eeeee",
     "triggerType" : "CUSTOM"
   } ],
   "getPSControls" : [ {
-    "codeName" : "MobMPickupViewsimplelist_quicktoolbar",
+    "codeName" : "ListViewlist_quicktoolbar",
     "controlType" : "TOOLBAR",
     "logicName" : "当前页聚合_工具栏",
-    "name" : "simplelist_quicktoolbar",
+    "name" : "list_quicktoolbar",
     "getPSAppDataEntity" : {
       "modelref" : true,
       "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
     },
     "getPSControlParam" : {
-      "id" : "simplelist_quicktoolbar"
+      "id" : "list_quicktoolbar"
     },
     "modelid" : "B52C7ACD-F8AA-414C-9636-43AC0D555EE8",
     "modeltype" : "PSDETOOLBAR"
   }, {
-    "codeName" : "MobMPickupViewsimplelist_batchtoolbar",
+    "codeName" : "ListViewlist_batchtoolbar",
     "controlType" : "TOOLBAR",
     "logicName" : "逻辑测试编辑视图_工具栏",
-    "name" : "simplelist_batchtoolbar",
+    "name" : "list_batchtoolbar",
     "getPSAppDataEntity" : {
       "modelref" : true,
       "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
     },
     "getPSControlParam" : {
-      "id" : "simplelist_batchtoolbar"
+      "id" : "list_batchtoolbar"
     },
     "modelid" : "7E30D365-A33A-4D4F-A61F-66C2DA6CC551",
     "modeltype" : "PSDETOOLBAR"
   } ],
+  "getPSDEDataExport" : {
+    "modelref" : true,
+    "id" : "DataExport"
+  },
   "getPSDEListDataItems" : [ {
     "dataType" : 25,
     "name" : "testid"
@@ -316,6 +321,9 @@
     "value" : "11",
     "rawValue" : true
   } ],
+  "getPSSysCss" : {
+    "cssName" : "test3"
+  },
   "pagingSize" : 50,
   "getRemovePSControlAction" : {
     "modelref" : true,
@@ -349,11 +357,13 @@
       "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
     }
   },
+  "width" : 300.0,
   "hasWFDataItems" : false,
   "enableGroup" : false,
-  "enableRowEdit" : false,
-  "enableRowEditGroup" : false,
-  "enableRowEditOrder" : false,
+  "enableItemPrivilege" : true,
+  "enableRowEdit" : true,
+  "enableRowEditGroup" : true,
+  "enableRowEditOrder" : true,
   "enableRowNew" : false,
   "noSort" : false,
   "showHeader" : false,

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

@@ -15,6 +15,10 @@
   "getPSDEViewCodeName" : "PanelDataContainerTest",
   "getPSDEViewId" : "EE0C3FB2-571B-45D9-BA91-B4144FBC9D7C",
   "getPSViewLayoutPanel" : {
+    "getAllPSPanelFields" : [ {
+      "id" : "field_text_dynamic",
+      "viewFieldName" : "song_name"
+    } ],
     "codeName" : "Usr0804167887",
     "controlType" : "VIEWLAYOUTPANEL",
     "layoutMode" : "FLEX",
@@ -145,6 +149,118 @@
         "layout" : "FLEX"
       },
       "predefinedType" : "CONTAINER_SINGLEDATA"
+    }, {
+      "caption" : "多项数据容器",
+      "dataRegionType" : "MULTIDATA",
+      "dataSourceType" : "DEDATASET",
+      "itemStyle" : "DEFAULT",
+      "itemType" : "CONTAINER",
+      "name" : "container_multidata",
+      "getPSAppDEMethod" : {
+        "modelref" : true,
+        "id" : "FetchDefault"
+      },
+      "getPSAppDataEntity" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Song.json"
+      },
+      "getPSLayout" : {
+        "layout" : "FLEX"
+      },
+      "getPSLayoutPos" : {
+        "grow" : -1,
+        "layout" : "FLEX"
+      },
+      "getPSPanelItems" : [ {
+        "caption" : "栅格容器",
+        "itemStyle" : "DEFAULT",
+        "itemType" : "CONTAINER",
+        "name" : "container_grid",
+        "getPSLayout" : {
+          "layout" : "SIMPLEFLEX"
+        },
+        "getPSLayoutPos" : {
+          "grow" : -1,
+          "layout" : "FLEX"
+        },
+        "getPSPanelItems" : [ {
+          "caption" : "面板容器",
+          "itemStyle" : "DEFAULT",
+          "itemType" : "CONTAINER",
+          "name" : "container",
+          "getPSLayout" : {
+            "childColLG" : -1,
+            "childColMD" : 24,
+            "childColSM" : -1,
+            "childColXS" : -1,
+            "columnCount" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "getPSLayoutPos" : {
+            "grow" : 3,
+            "layout" : "SIMPLEFLEX"
+          },
+          "getPSPanelItems" : [ {
+            "caption" : "标签",
+            "contentType" : "RAW",
+            "itemStyle" : "DEFAULT",
+            "itemType" : "RAWITEM",
+            "name" : "static_label",
+            "getPSLayoutPos" : {
+              "colMD" : 24,
+              "layout" : "TABLE_24COL"
+            },
+            "getPSRawItem" : {
+              "caption" : "歌曲名称",
+              "contentType" : "RAW",
+              "name" : "static_label",
+              "predefinedType" : "STATIC_LABEL",
+              "renderMode" : "PARAGRAPH"
+            },
+            "rawContent" : "歌曲名称",
+            "showCaption" : true
+          } ]
+        }, {
+          "caption" : "面板容器",
+          "itemStyle" : "DEFAULT",
+          "itemType" : "CONTAINER",
+          "name" : "container1",
+          "getPSLayout" : {
+            "childColLG" : -1,
+            "childColMD" : 24,
+            "childColSM" : -1,
+            "childColXS" : -1,
+            "columnCount" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "getPSLayoutPos" : {
+            "grow" : 9,
+            "layout" : "SIMPLEFLEX"
+          },
+          "getPSPanelItems" : [ {
+            "caption" : "文本(动态)",
+            "itemStyle" : "DEFAULT",
+            "itemType" : "FIELD",
+            "name" : "field_text_dynamic",
+            "getPSEditor" : {
+              "editorType" : "SPAN",
+              "name" : "field_text_dynamic",
+              "predefinedType" : "FIELD_TEXT_DYNAMIC",
+              "renderMode" : "TEXT_DYNAMIC",
+              "enableLinkView" : false
+            },
+            "getPSLayoutPos" : {
+              "colMD" : 24,
+              "layout" : "TABLE_24COL"
+            },
+            "viewFieldName" : "song_name",
+            "hidden" : false,
+            "showCaption" : false
+          } ]
+        } ],
+        "predefinedType" : "CONTAINER_GRID"
+      } ],
+      "predefinedType" : "CONTAINER_MULTIDATA"
     } ],
     "layoutBodyOnly" : false,
     "layoutPanel" : true,

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

@@ -4,7 +4,7 @@
   "caption" : "测试首页",
   "codeName" : "AppTestIndexView",
   "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPINDEXVIEWS/AppTestIndexView.json",
-  "mainMenuAlign" : "TOP",
+  "mainMenuAlign" : "LEFT",
   "name" : "AppTestIndexView",
   "getPSAppModule" : {
     "modelref" : true,

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

@@ -3396,16 +3396,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"
       }
     } ]
   }, {