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

64558d6d · ibizdev · 4f2d8d11 · 64558d6d · 64558d6d · 64558d6d
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSSYSAPP.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSSYSAPP.json
@@ -1427,16 +1427,16 @@
    "codeName" : "VMGroup2",
    "name" : "视图消息组2",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息",
+      "name" : "视图消息2",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
      }
    }, {
-      "name" : "视图消息2",
+      "name" : "视图消息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
      }
    } ]
  }, {

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr2GridExpView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr2GridExpView.json
@@ -12,6 +12,173 @@
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPMODULES/Test.json"
  },
+  "getPSAppViewNavParams" : [ {
+    "key" : "expmode",
+    "name" : "expmode",
+    "value" : "NO_ROUTE",
+    "rawValue" : true
+  } ],
+  "getPSDEViewCodeName" : "Usr2GridExpView",
+  "getPSDEViewId" : "5749B625-0D6D-4B73-9A61-74A02CE06397",
+  "getPSViewLayoutPanel" : {
+    "getAllPSPanelFields" : [ {
+      "id" : "view_pagecaption"
+    } ],
+    "codeName" : "Usr1008551598",
+    "controlType" : "VIEWLAYOUTPANEL",
+    "layoutMode" : "FLEX",
+    "logicName" : "Usr2GridExpViewDEGRIDEXPVIEW",
+    "memo" : "表格导航视图",
+    "name" : "layoutpanel",
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
+    },
+    "getPSControlParam" : { },
+    "getPSLayout" : {
+      "layout" : "FLEX"
+    },
+    "getRootPSPanelItems" : [ {
+      "caption" : "容器",
+      "itemStyle" : "DEFAULT",
+      "itemType" : "CONTAINER",
+      "name" : "page_container",
+      "getPSLayout" : {
+        "dir" : "column",
+        "layout" : "FLEX"
+      },
+      "getPSLayoutPos" : {
+        "grow" : -1,
+        "layout" : "FLEX"
+      },
+      "getPSPanelItems" : [ {
+        "caption" : "容器",
+        "itemStyle" : "DEFAULT",
+        "itemType" : "CONTAINER",
+        "name" : "container2",
+        "getPSLayout" : {
+          "childColLG" : -1,
+          "childColMD" : 24,
+          "childColSM" : -1,
+          "childColXS" : -1,
+          "columnCount" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "getPSLayoutPos" : {
+          "grow" : -1,
+          "heightMode" : "FULL",
+          "layout" : "FLEX"
+        },
+        "getPSPanelItems" : [ {
+          "caption" : "页面标题",
+          "itemStyle" : "DEFAULT",
+          "itemType" : "FIELD",
+          "name" : "view_pagecaption",
+          "getPSEditor" : {
+            "editorType" : "SPAN",
+            "name" : "view_pagecaption",
+            "predefinedType" : "VIEW_PAGECAPTION",
+            "renderMode" : "HEADING1",
+            "enableLinkView" : false
+          },
+          "getPSLayoutPos" : {
+            "colMD" : 24,
+            "heightMode" : "FULL",
+            "layout" : "TABLE_24COL",
+            "widthMode" : "FULL"
+          },
+          "hidden" : false,
+          "showCaption" : false
+        } ],
+        "predefinedType" : "CONTAINER"
+      }, {
+        "caption" : "栅格容器",
+        "itemStyle" : "DEFAULT",
+        "itemType" : "CONTAINER",
+        "name" : "container_grid1",
+        "getPSLayout" : {
+          "layout" : "SIMPLEFLEX"
+        },
+        "getPSLayoutPos" : {
+          "grow" : -1,
+          "layout" : "FLEX"
+        },
+        "getPSPanelItems" : [ {
+          "caption" : "面板容器",
+          "itemStyle" : "DEFAULT",
+          "itemType" : "CONTAINER",
+          "name" : "container1",
+          "getPSLayout" : {
+            "childColLG" : -1,
+            "childColMD" : 24,
+            "childColSM" : -1,
+            "childColXS" : -1,
+            "columnCount" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "getPSLayoutPos" : {
+            "grow" : 5,
+            "layout" : "SIMPLEFLEX"
+          },
+          "getPSPanelItems" : [ {
+            "caption" : "GRIDEXPBAR",
+            "itemStyle" : "DEFAULT",
+            "itemType" : "CTRLPOS",
+            "name" : "gridexpbar",
+            "getPSLayoutPos" : {
+              "colMD" : 24,
+              "heightMode" : "FULL",
+              "layout" : "TABLE_24COL"
+            },
+            "showCaption" : true
+          } ]
+        }, {
+          "caption" : "面板容器",
+          "itemStyle" : "DEFAULT",
+          "itemType" : "CONTAINER",
+          "name" : "container8",
+          "getPSLayout" : {
+            "childColLG" : -1,
+            "childColMD" : 24,
+            "childColSM" : -1,
+            "childColXS" : -1,
+            "columnCount" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "getPSLayoutPos" : {
+            "grow" : 7,
+            "layout" : "SIMPLEFLEX"
+          },
+          "getPSPanelItems" : [ {
+            "caption" : "导航区占位",
+            "itemStyle" : "DEFAULT",
+            "itemType" : "RAWITEM",
+            "name" : "nav_pos1",
+            "getPSLayoutPos" : {
+              "colMD" : 24,
+              "layout" : "TABLE_24COL"
+            },
+            "getPSRawItem" : {
+              "name" : "nav_pos1",
+              "getPSRawItemParams" : [ {
+                "key" : "EXPCACHE",
+                "value" : "CACHE"
+              } ],
+              "predefinedType" : "NAV_POS"
+            },
+            "showCaption" : true
+          } ]
+        } ],
+        "predefinedType" : "CONTAINER_GRID"
+      } ],
+      "predefinedType" : "CONTAINER"
+    } ],
+    "layoutBodyOnly" : false,
+    "layoutPanel" : true,
+    "useDefaultLayout" : false,
+    "viewProxyMode" : true,
+    "modelid" : "6123C427-BB21-4DE9-AE68-A53703B2331E",
+    "modeltype" : "PSSYSVIEWLAYOUTPANEL",
    "getPSAppViewEngines" : [ {
      "engineCat" : "VIEW",
      "engineType" : "GridExpView",
@@ -41,12 +208,6 @@
        "editMode" : true
      }
    } ],
-  "getPSAppViewNavParams" : [ {
-    "key" : "expmode",
-    "name" : "expmode",
-    "value" : "NO_ROUTE",
-    "rawValue" : true
-  } ],
    "getPSControls" : [ {
      "codeName" : "Usr2GridExpViewgridexpbar",
      "controlType" : "GRIDEXPBAR",
@@ -333,22 +494,7 @@
        "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
      },
      "getPSControlParam" : { }
-  } ],
-  "getPSDEViewCodeName" : "Usr2GridExpView",
-  "getPSDEViewId" : "5749B625-0D6D-4B73-9A61-74A02CE06397",
-  "getPSViewLayoutPanel" : {
-    "codeName" : "Layoutpanel",
-    "controlStyle" : "APPDEGRIDEXPVIEW",
-    "controlType" : "VIEWLAYOUTPANEL",
-    "name" : "layoutpanel",
-    "getPSAppDataEntity" : {
-      "modelref" : true,
-      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
-    },
-    "getPSControlParam" : { },
-    "layoutBodyOnly" : true,
-    "layoutPanel" : true,
-    "useDefaultLayout" : true
+    } ]
  },
  "sideBarLayout" : "LEFT",
  "title" : "测试实体实体表格导航视图(路由测试-非路由)",

--- 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
@@ -9619,16 +9619,16 @@
    "codeName" : "VMGroup2",
    "name" : "视图消息组2",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息",
+      "name" : "视图消息2",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
      }
    }, {
-      "name" : "视图消息2",
+      "name" : "视图消息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
      }
    } ]
  }, {
@@ -9646,12 +9646,6 @@
    "codeName" : "VMGroup3",
    "name" : "视图消息类型测试",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-常规信息",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg4"
-      }
-    }, {
      "name" : "消息类型-警告信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
@@ -9663,6 +9657,12 @@
        "modelref" : true,
        "id" : "ViewMsg6"
      }
+    }, {
+      "name" : "消息类型-常规信息",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg4"
+      }
    } ]
  }, {
    "codeName" : "VMGroup7",
@@ -9678,16 +9678,22 @@
    "codeName" : "VMGroup4",
    "name" : "视图消息位置测试",
    "getPSAppViewMsgGroupDetails" : [ {
+      "name" : "消息位置-视图上方",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg7"
+      }
+    }, {
      "name" : "消息位置-弹出",
      "getPSAppViewMsg" : {
        "modelref" : true,
        "id" : "ViewMsg10"
      }
    }, {
-      "name" : "消息位置-视图上方",
+      "name" : "消息位置-视图下方",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg7"
+        "id" : "ViewMsg8"
      }
    }, {
      "name" : "消息位置-视图内容区",
@@ -9695,23 +9701,22 @@
        "modelref" : true,
        "id" : "ViewMsg9"
      }
+    } ]
  }, {
+    "codeName" : "VMGroup8",
+    "name" : "【静态测试】",
+    "getPSAppViewMsgGroupDetails" : [ {
      "name" : "消息位置-视图下方",
      "getPSAppViewMsg" : {
        "modelref" : true,
        "id" : "ViewMsg8"
      }
-    } ]
    }, {
-    "codeName" : "VMGroup8",
-    "name" : "【静态测试】",
-    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-错误信息",
+      "name" : "关闭模式-本次删除-上方-警告",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg6"
-      },
-      "position" : "POPUP"
+        "id" : "ViewMsg13"
+      }
    }, {
      "name" : "消息类型-警告信息",
      "getPSAppViewMsg" : {
@@ -9719,6 +9724,13 @@
        "id" : "ViewMsg5"
      },
      "position" : "POPUP"
+    }, {
+      "name" : "消息类型-错误信息",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg6"
+      },
+      "position" : "POPUP"
    }, {
      "name" : "关闭模式-无删除-上方-常规",
      "getPSAppViewMsg" : {
@@ -9744,18 +9756,6 @@
        "modelref" : true,
        "id" : "ViewMsg12"
      }
-    }, {
-      "name" : "关闭模式-本次删除-上方-警告",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg13"
-      }
-    }, {
-      "name" : "消息位置-视图下方",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg8"
-      }
    } ]
  }, {
    "codeName" : "VMGroup5",
@@ -9767,32 +9767,32 @@
        "id" : "ViewMsg12"
      }
    }, {
-      "name" : "关闭模式-本次删除",
+      "name" : "关闭模式-无删除",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg13"
+        "id" : "ViewMsg11"
      }
    }, {
-      "name" : "关闭模式-无删除",
+      "name" : "关闭模式-本次删除",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg11"
+        "id" : "ViewMsg13"
      }
    } ]
  }, {
    "codeName" : "VMGroup6",
    "name" : "视图消息动态模式测试",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "动态模式-实体数据集",
+      "name" : "动态模式-静态内容",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg14"
+        "id" : "ViewMsg15"
      }
    }, {
-      "name" : "动态模式-静态内容",
+      "name" : "动态模式-实体数据集",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg15"
+        "id" : "ViewMsg14"
      }
    } ]
  } ],