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

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSCHARTS/Chart.json

@@ -18,10 +18,10 @@
   "getPSChartCoordinateSystems" : [ {
     "eChartsType" : "cartesian2d",
     "index" : 0,
-    "name" : "[line_0]直角坐标系[0]",
+    "name" : "[line_0_0]直角坐标系[0]",
     "getPSChartGrid" : {
       "index" : 0,
-      "name" : "[line_0]直角坐标系[0]",
+      "name" : "[line_0_0]直角坐标系[0]",
       "getPSChartCoordinateSystem" : {
         "modelref" : true,
         "id" : "0"
@@ -55,7 +55,7 @@
   } ],
   "getPSChartDataSets" : [ {
     "index" : 0,
-    "name" : "line_0-DATAQUERY2",
+    "name" : "line_0_0-DATAQUERY2",
     "getPSChartDataSetFields" : [ {
       "index" : 0,
       "name" : "NAME",
@@ -71,7 +71,7 @@
   } ],
   "getPSChartGrids" : [ {
     "index" : 0,
-    "name" : "[line_0]直角坐标系[0]",
+    "name" : "[line_0_0]直角坐标系[0]",
     "getPSChartCoordinateSystem" : {
       "modelref" : true,
       "id" : "0"
@@ -125,7 +125,7 @@
     "catalogField" : "NAME",
     "eChartsType" : "line",
     "index" : 0,
-    "name" : "line_0",
+    "name" : "line_0_0",
     "getPSChartCoordinateSystem" : {
       "modelref" : true,
       "id" : "0"

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

@@ -168,6 +168,48 @@
         "rTMOSFilePath" : "psdeformdetail_formitems/testname",
         "allowEmpty" : true,
         "showCaption" : true
+      }, {
+        "codeName" : "rawitem2",
+        "contentType" : "HTML",
+        "detailStyle" : "DEFAULT",
+        "detailType" : "RAWITEM",
+        "htmlContent" : "<p>&lt;h3&gt;aaaaaaaaaaaaaaa&lt;/h3&gt;</p>",
+        "mOSFilePath" : "psdeformdetail_rawitems/rawitem2",
+        "name" : "rawitem2",
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "getPSRawItem" : {
+          "content" : "<p>&lt;h3&gt;aaaaaaaaaaaaaaa&lt;/h3&gt;</p>",
+          "contentType" : "HTML",
+          "name" : "rawitem2"
+        },
+        "rTMOSFilePath" : "psdeformdetail_rawitems/rawitem2",
+        "rawItemHeight" : -1.0,
+        "rawItemWidth" : -1.0,
+        "showCaption" : true
+      }, {
+        "codeName" : "rawitem1",
+        "contentType" : "RAW",
+        "detailStyle" : "DEFAULT",
+        "detailType" : "RAWITEM",
+        "mOSFilePath" : "psdeformdetail_rawitems/rawitem1",
+        "name" : "rawitem1",
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "getPSRawItem" : {
+          "caption" : "test直接内容拉",
+          "contentType" : "RAW",
+          "name" : "rawitem1"
+        },
+        "rTMOSFilePath" : "psdeformdetail_rawitems/rawitem1",
+        "rawContent" : "test直接内容拉",
+        "rawItemHeight" : -1.0,
+        "rawItemWidth" : -1.0,
+        "showCaption" : true
       } ],
       "getPSLayout" : {
         "childColLG" : -1,

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

@@ -223,10 +223,10 @@
     "getPSChartCoordinateSystems" : [ {
       "eChartsType" : "cartesian2d",
       "index" : 0,
-      "name" : "[line_0]直角坐标系[0]",
+      "name" : "[line_0_0]直角坐标系[0]",
       "getPSChartGrid" : {
         "index" : 0,
-        "name" : "[line_0]直角坐标系[0]",
+        "name" : "[line_0_0]直角坐标系[0]",
         "getPSChartCoordinateSystem" : {
           "modelref" : true,
           "id" : "0"
@@ -260,7 +260,7 @@
     } ],
     "getPSChartDataSets" : [ {
       "index" : 0,
-      "name" : "line_0-DATAQUERY2",
+      "name" : "line_0_0-DATAQUERY2",
       "getPSChartDataSetFields" : [ {
         "index" : 0,
         "name" : "NAME",
@@ -276,7 +276,7 @@
     } ],
     "getPSChartGrids" : [ {
       "index" : 0,
-      "name" : "[line_0]直角坐标系[0]",
+      "name" : "[line_0_0]直角坐标系[0]",
       "getPSChartCoordinateSystem" : {
         "modelref" : true,
         "id" : "0"
@@ -404,7 +404,7 @@
       "catalogField" : "NAME",
       "eChartsType" : "line",
       "index" : 0,
-      "name" : "line_0",
+      "name" : "line_0_0",
       "getPSChartCoordinateSystem" : {
         "modelref" : true,
         "id" : "0"

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

@@ -344,6 +344,48 @@
           "rTMOSFilePath" : "psdeformdetail_formitems/testname",
           "allowEmpty" : true,
           "showCaption" : true
+        }, {
+          "codeName" : "rawitem2",
+          "contentType" : "HTML",
+          "detailStyle" : "DEFAULT",
+          "detailType" : "RAWITEM",
+          "htmlContent" : "<p>&lt;h3&gt;aaaaaaaaaaaaaaa&lt;/h3&gt;</p>",
+          "mOSFilePath" : "psdeformdetail_rawitems/rawitem2",
+          "name" : "rawitem2",
+          "getPSLayoutPos" : {
+            "colMD" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "getPSRawItem" : {
+            "content" : "<p>&lt;h3&gt;aaaaaaaaaaaaaaa&lt;/h3&gt;</p>",
+            "contentType" : "HTML",
+            "name" : "rawitem2"
+          },
+          "rTMOSFilePath" : "psdeformdetail_rawitems/rawitem2",
+          "rawItemHeight" : -1.0,
+          "rawItemWidth" : -1.0,
+          "showCaption" : true
+        }, {
+          "codeName" : "rawitem1",
+          "contentType" : "RAW",
+          "detailStyle" : "DEFAULT",
+          "detailType" : "RAWITEM",
+          "mOSFilePath" : "psdeformdetail_rawitems/rawitem1",
+          "name" : "rawitem1",
+          "getPSLayoutPos" : {
+            "colMD" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "getPSRawItem" : {
+            "caption" : "test直接内容拉",
+            "contentType" : "RAW",
+            "name" : "rawitem1"
+          },
+          "rTMOSFilePath" : "psdeformdetail_rawitems/rawitem1",
+          "rawContent" : "test直接内容拉",
+          "rawItemHeight" : -1.0,
+          "rawItemWidth" : -1.0,
+          "showCaption" : true
         } ],
         "getPSLayout" : {
           "childColLG" : -1,

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

@@ -345,6 +345,48 @@
           "rTMOSFilePath" : "psdeformdetail_formitems/testname",
           "allowEmpty" : true,
           "showCaption" : true
+        }, {
+          "codeName" : "rawitem2",
+          "contentType" : "HTML",
+          "detailStyle" : "DEFAULT",
+          "detailType" : "RAWITEM",
+          "htmlContent" : "<p>&lt;h3&gt;aaaaaaaaaaaaaaa&lt;/h3&gt;</p>",
+          "mOSFilePath" : "psdeformdetail_rawitems/rawitem2",
+          "name" : "rawitem2",
+          "getPSLayoutPos" : {
+            "colMD" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "getPSRawItem" : {
+            "content" : "<p>&lt;h3&gt;aaaaaaaaaaaaaaa&lt;/h3&gt;</p>",
+            "contentType" : "HTML",
+            "name" : "rawitem2"
+          },
+          "rTMOSFilePath" : "psdeformdetail_rawitems/rawitem2",
+          "rawItemHeight" : -1.0,
+          "rawItemWidth" : -1.0,
+          "showCaption" : true
+        }, {
+          "codeName" : "rawitem1",
+          "contentType" : "RAW",
+          "detailStyle" : "DEFAULT",
+          "detailType" : "RAWITEM",
+          "mOSFilePath" : "psdeformdetail_rawitems/rawitem1",
+          "name" : "rawitem1",
+          "getPSLayoutPos" : {
+            "colMD" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "getPSRawItem" : {
+            "caption" : "test直接内容拉",
+            "contentType" : "RAW",
+            "name" : "rawitem1"
+          },
+          "rTMOSFilePath" : "psdeformdetail_rawitems/rawitem1",
+          "rawContent" : "test直接内容拉",
+          "rawItemHeight" : -1.0,
+          "rawItemWidth" : -1.0,
+          "showCaption" : true
         } ],
         "getPSLayout" : {
           "childColLG" : -1,

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

@@ -345,6 +345,48 @@
           "rTMOSFilePath" : "psdeformdetail_formitems/testname",
           "allowEmpty" : true,
           "showCaption" : true
+        }, {
+          "codeName" : "rawitem2",
+          "contentType" : "HTML",
+          "detailStyle" : "DEFAULT",
+          "detailType" : "RAWITEM",
+          "htmlContent" : "<p>&lt;h3&gt;aaaaaaaaaaaaaaa&lt;/h3&gt;</p>",
+          "mOSFilePath" : "psdeformdetail_rawitems/rawitem2",
+          "name" : "rawitem2",
+          "getPSLayoutPos" : {
+            "colMD" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "getPSRawItem" : {
+            "content" : "<p>&lt;h3&gt;aaaaaaaaaaaaaaa&lt;/h3&gt;</p>",
+            "contentType" : "HTML",
+            "name" : "rawitem2"
+          },
+          "rTMOSFilePath" : "psdeformdetail_rawitems/rawitem2",
+          "rawItemHeight" : -1.0,
+          "rawItemWidth" : -1.0,
+          "showCaption" : true
+        }, {
+          "codeName" : "rawitem1",
+          "contentType" : "RAW",
+          "detailStyle" : "DEFAULT",
+          "detailType" : "RAWITEM",
+          "mOSFilePath" : "psdeformdetail_rawitems/rawitem1",
+          "name" : "rawitem1",
+          "getPSLayoutPos" : {
+            "colMD" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "getPSRawItem" : {
+            "caption" : "test直接内容拉",
+            "contentType" : "RAW",
+            "name" : "rawitem1"
+          },
+          "rTMOSFilePath" : "psdeformdetail_rawitems/rawitem1",
+          "rawContent" : "test直接内容拉",
+          "rawItemHeight" : -1.0,
+          "rawItemWidth" : -1.0,
+          "showCaption" : true
         } ],
         "getPSLayout" : {
           "childColLG" : -1,