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

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/X6DesingTest.json

@@ -1050,7 +1050,7 @@
     "codeName" : "X6DesignEditView",
     "logicName" : "X6DesignEditView",
     "name" : "X6DesignEditView",
-    "realModelSubType" : "DEEDITVIEW",
+    "realModelSubType" : "DECUSTOMVIEW",
     "realModelType" : "PSDEVIEWBASE"
   }, {
     "codeName" : "GridView",

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

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

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

@@ -1109,7 +1109,7 @@
   "getAllPSAppViews" : [ {
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/X6DesingTestX6DesignEditView.json",
-    "viewType" : "DEEDITVIEW"
+    "viewType" : "DECUSTOMVIEW"
   }, {
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/X6DesingTestEditView.json",

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

@@ -64,14 +64,14 @@
         "getRefPSAppView" : {
           "modelref" : true,
           "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/X6DesingTestX6DesignEditView.json",
-          "viewType" : "DEEDITVIEW"
+          "viewType" : "DECUSTOMVIEW"
         }
       },
       "getPSAppUILogicRefViews" : [ {
         "getRefPSAppView" : {
           "modelref" : true,
           "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/X6DesingTestX6DesignEditView.json",
-          "viewType" : "DEEDITVIEW"
+          "viewType" : "DECUSTOMVIEW"
         }
       } ],
       "viewLogicType" : "APP_OPENDATA",
@@ -99,7 +99,7 @@
     "getRefPSAppView" : {
       "modelref" : true,
       "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/X6DesingTestX6DesignEditView.json",
-      "viewType" : "DEEDITVIEW"
+      "viewType" : "DECUSTOMVIEW"
     }
   }, {
     "name" : "OPENDATA",
@@ -107,7 +107,7 @@
     "getRefPSAppView" : {
       "modelref" : true,
       "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/X6DesingTestX6DesignEditView.json",
-      "viewType" : "DEEDITVIEW"
+      "viewType" : "DECUSTOMVIEW"
     }
   } ],
   "getPSControls" : [ {

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

@@ -19,23 +19,7 @@
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPMODULES/Ungroup.json"
   },
-  "getPSAppViewEngines" : [ {
-    "engineCat" : "VIEW",
-    "engineType" : "EditView",
-    "name" : "engine"
-  } ],
   "getPSControls" : [ {
-    "codeName" : "X6DesignEditViewdatainfobar",
-    "controlType" : "DATAINFOBAR",
-    "name" : "datainfobar",
-    "getPSAppDataEntity" : {
-      "modelref" : true,
-      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/X6DesingTest.json"
-    },
-    "getPSControlParam" : {
-      "id" : "datainfobar"
-    }
-  }, {
     "getCapPSLanguageRes" : {
       "defaultContent" : "X6设计组件测试",
       "lanResTag" : "DE.LNAME.X6DESINGTEST",
@@ -56,26 +40,109 @@
   "getPSDEViewCodeName" : "X6DesignEditView",
   "getPSDEViewId" : "06FDF6F1-C580-4095-B6DC-112632872CBB",
   "getPSViewLayoutPanel" : {
-    "codeName" : "Layoutpanel",
-    "controlStyle" : "APPDEEDITVIEW",
+    "getAllPSPanelFields" : [ {
+      "id" : "x6_panel_item_stencil_name"
+    } ],
+    "codeName" : "Usr1111458474",
     "controlType" : "VIEWLAYOUTPANEL",
+    "layoutMode" : "Flex",
+    "logicName" : "X6DesignTest",
     "name" : "layoutpanel",
     "getPSAppDataEntity" : {
       "modelref" : true,
       "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/X6DesingTest.json"
     },
     "getPSControlParam" : { },
-    "layoutBodyOnly" : true,
+    "getPSLayout" : {
+      "layout" : "FLEX"
+    },
+    "getRootPSPanelItems" : [ {
+      "caption" : "容器",
+      "itemStyle" : "DEFAULT",
+      "itemType" : "CONTAINER",
+      "name" : "container",
+      "getPSLayout" : {
+        "dir" : "row",
+        "layout" : "FLEX"
+      },
+      "getPSLayoutPos" : {
+        "grow" : -1,
+        "heightMode" : "FULL",
+        "layout" : "FLEX"
+      },
+      "getPSPanelItems" : [ {
+        "caption" : "容器",
+        "itemStyle" : "DEFAULT",
+        "itemType" : "CONTAINER",
+        "name" : "container1",
+        "getPSLayout" : {
+          "layout" : "FLEX"
+        },
+        "getPSLayoutPos" : {
+          "grow" : -1,
+          "layout" : "FLEX",
+          "shrink" : 0
+        },
+        "getPSPanelItems" : [ {
+          "caption" : "文本(动态)",
+          "itemStyle" : "DEFAULT",
+          "itemType" : "FIELD",
+          "name" : "x6_panel_item_stencil_name",
+          "getPSEditor" : {
+            "editorType" : "SPAN",
+            "name" : "x6_panel_item_stencil_name",
+            "predefinedType" : "X6_PANEL_ITEM_STENCIL",
+            "renderMode" : "TEXT_DYNAMIC",
+            "enableLinkView" : false
+          },
+          "getPSLayoutPos" : {
+            "grow" : -1,
+            "layout" : "FLEX"
+          },
+          "hidden" : false,
+          "showCaption" : false
+        } ]
+      }, {
+        "caption" : "容器",
+        "itemStyle" : "DEFAULT",
+        "itemType" : "CONTAINER",
+        "name" : "container2",
+        "getPSLayout" : {
+          "layout" : "FLEX"
+        },
+        "getPSLayoutPos" : {
+          "grow" : 1,
+          "layout" : "FLEX"
+        },
+        "getPSPanelItems" : [ {
+          "caption" : "X6设计器",
+          "contentType" : "USER",
+          "itemStyle" : "DEFAULT",
+          "itemType" : "RAWITEM",
+          "name" : "x6_panel_item_name",
+          "getPSLayoutPos" : {
+            "grow" : -1,
+            "layout" : "FLEX"
+          },
+          "getPSRawItem" : {
+            "contentType" : "USER",
+            "name" : "x6_panel_item_name",
+            "predefinedType" : "X6_PANEL_ITEM"
+          },
+          "showCaption" : true
+        } ]
+      } ]
+    } ],
+    "layoutBodyOnly" : false,
     "layoutPanel" : true,
-    "useDefaultLayout" : true
+    "useDefaultLayout" : false,
+    "modelid" : "E1DBC502-3710-4DF0-9EA2-A5724A09BD1A",
+    "modeltype" : "PSSYSVIEWLAYOUTPANEL"
   },
   "title" : "X6DesignEditView",
   "viewStyle" : "DEFAULT",
-  "viewType" : "DEEDITVIEW",
-  "xDataControlName" : "form",
-  "xDataPSControl" : "视图[Ungroup.X6DesingTestX6DesignEditView]无法获取部件[form]",
+  "viewType" : "DECUSTOMVIEW",
   "enableDP" : true,
-  "showDataInfoBar" : true,
   "modelid" : "1aa4d234b5b6a39d26afd2e93b693594",
   "modeltype" : "PSAPPDEVIEW"
 }
\ No newline at end of file

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

@@ -11877,16 +11877,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"
       }
     } ]
   }, {
@@ -11915,10 +11915,10 @@
     "codeName" : "VMGroup3",
     "name" : "视图消息类型测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-常规信息",
+      "name" : "消息类型-警告信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg4"
+        "id" : "ViewMsg5"
       }
     }, {
       "name" : "消息类型-错误信息",
@@ -11927,10 +11927,10 @@
         "id" : "ViewMsg6"
       }
     }, {
-      "name" : "消息类型-警告信息",
+      "name" : "消息类型-常规信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg5"
+        "id" : "ViewMsg4"
       }
     } ]
   }, {
@@ -11947,22 +11947,16 @@
     "codeName" : "VMGroup4",
     "name" : "视图消息位置测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息位置-视图上方",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg7"
-      }
-    }, {
       "name" : "消息位置-弹出",
       "getPSAppViewMsg" : {
         "modelref" : true,
         "id" : "ViewMsg10"
       }
     }, {
-      "name" : "消息位置-视图下方",
+      "name" : "消息位置-视图上方",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg7"
       }
     }, {
       "name" : "消息位置-视图内容区",
@@ -11970,17 +11964,28 @@
         "modelref" : true,
         "id" : "ViewMsg9"
       }
+    }, {
+      "name" : "消息位置-视图下方",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg8"
+      }
     } ]
   }, {
     "codeName" : "VMGroup8",
     "name" : "【静态测试】",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-警告信息",
+      "name" : "关闭模式-本次删除-上方-警告",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg5"
-      },
-      "position" : "POPUP"
+        "id" : "ViewMsg13"
+      }
+    }, {
+      "name" : "消息位置-视图下方",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg8"
+      }
     }, {
       "name" : "消息类型-错误信息",
       "getPSAppViewMsg" : {
@@ -11989,11 +11994,12 @@
       },
       "position" : "POPUP"
     }, {
-      "name" : "关闭模式-无删除-上方-常规",
+      "name" : "消息类型-警告信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg11"
-      }
+        "id" : "ViewMsg5"
+      },
+      "position" : "POPUP"
     }, {
       "name" : "消息类型-常规信息",
       "getPSAppViewMsg" : {
@@ -12002,10 +12008,10 @@
       },
       "position" : "POPUP"
     }, {
-      "name" : "关闭模式-默认删除-上方-错误",
+      "name" : "关闭模式-无删除-上方-常规",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg12"
+        "id" : "ViewMsg11"
       }
     }, {
       "name" : "消息位置-视图内容区",
@@ -12014,16 +12020,10 @@
         "id" : "ViewMsg9"
       }
     }, {
-      "name" : "消息位置-视图下方",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg8"
-      }
-    }, {
-      "name" : "关闭模式-本次删除-上方-警告",
+      "name" : "关闭模式-默认删除-上方-错误",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg13"
+        "id" : "ViewMsg12"
       }
     } ]
   }, {
@@ -12036,32 +12036,32 @@
         "id" : "ViewMsg12"
       }
     }, {
-      "name" : "关闭模式-无删除",
+      "name" : "关闭模式-本次删除",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg11"
+        "id" : "ViewMsg13"
       }
     }, {
-      "name" : "关闭模式-本次删除",
+      "name" : "关闭模式-无删除",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg13"
+        "id" : "ViewMsg11"
       }
     } ]
   }, {
     "codeName" : "VMGroup6",
     "name" : "视图消息动态模式测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "动态模式-静态内容",
+      "name" : "动态模式-实体数据集",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg15"
+        "id" : "ViewMsg14"
       }
     }, {
-      "name" : "动态模式-实体数据集",
+      "name" : "动态模式-静态内容",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg14"
+        "id" : "ViewMsg15"
       }
     } ]
   } ],
@@ -12459,7 +12459,7 @@
   }, {
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/X6DesingTestX6DesignEditView.json",
-    "viewType" : "DEEDITVIEW",
+    "viewType" : "DECUSTOMVIEW",
     "resource" : "X6DesingTest",
     "view" : "X6DesignEditView"
   }, {