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

ed3aa763 · ibizdev · f2461f98 · ed3aa763 · ed3aa763 · ed3aa763
--- 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
@@ -986,12 +986,46 @@
    "name" : "处理逻辑测试",
    "getPSDELogicNodes" : [ {
      "codeName" : "Begin",
-      "leftPos" : 200,
+      "leftPos" : 153,
      "logicNodeType" : "BEGIN",
      "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdelogics/logic1/psdelogicnodes/Begin",
      "name" : "开始",
+      "getPSDELogicLinks" : [ {
+        "getDstPSDELogicNode" : {
+          "modelref" : true,
+          "id" : "Prepareparam1"
+        },
+        "name" : "连接4111",
+        "getPSDELogicLinkGroupCond" : {
+          "groupOP" : "AND",
+          "logicType" : "GROUP",
+          "name" : "连接条件组",
+          "getPSDELogicLinkConds" : [ {
+            "dstFieldName" : "TESTID",
+            "getDstLogicParam" : {
+              "modelref" : true,
+              "id" : "Default"
+            },
+            "logicType" : "SINGLE",
+            "name" : "?"
+          } ]
+        },
+        "getSrcPSDELogicNode" : {
+          "modelref" : true,
+          "id" : "Begin"
+        }
+      } ],
      "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdelogics/logic1/psdelogicnodes/Begin",
-      "topPos" : 200,
+      "topPos" : 91,
+      "parallelOutput" : true
+    }, {
+      "codeName" : "Prepareparam1",
+      "leftPos" : 352,
+      "logicNodeType" : "PREPAREPARAM",
+      "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdelogics/logic1/psdelogicnodes/Prepareparam1",
+      "name" : "准备参数",
+      "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdelogics/logic1/psdelogicnodes/Prepareparam1",
+      "topPos" : 236,
      "parallelOutput" : true
    } ],
    "getPSDELogicParams" : [ {

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/TEST/PSDELOGICS/logic1.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/TEST/PSDELOGICS/logic1.json
@@ -7,12 +7,46 @@
  "name" : "处理逻辑测试",
  "getPSDELogicNodes" : [ {
    "codeName" : "Begin",
-    "leftPos" : 200,
+    "leftPos" : 153,
    "logicNodeType" : "BEGIN",
    "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdelogics/logic1/psdelogicnodes/Begin",
    "name" : "开始",
+    "getPSDELogicLinks" : [ {
+      "getDstPSDELogicNode" : {
+        "modelref" : true,
+        "id" : "Prepareparam1"
+      },
+      "name" : "连接4111",
+      "getPSDELogicLinkGroupCond" : {
+        "groupOP" : "AND",
+        "logicType" : "GROUP",
+        "name" : "连接条件组",
+        "getPSDELogicLinkConds" : [ {
+          "dstFieldName" : "TESTID",
+          "getDstLogicParam" : {
+            "modelref" : true,
+            "id" : "Default"
+          },
+          "logicType" : "SINGLE",
+          "name" : "?"
+        } ]
+      },
+      "getSrcPSDELogicNode" : {
+        "modelref" : true,
+        "id" : "Begin"
+      }
+    } ],
    "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdelogics/logic1/psdelogicnodes/Begin",
-    "topPos" : 200,
+    "topPos" : 91,
+    "parallelOutput" : true
+  }, {
+    "codeName" : "Prepareparam1",
+    "leftPos" : 352,
+    "logicNodeType" : "PREPAREPARAM",
+    "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdelogics/logic1/psdelogicnodes/Prepareparam1",
+    "name" : "准备参数",
+    "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdelogics/logic1/psdelogicnodes/Prepareparam1",
+    "topPos" : 236,
    "parallelOutput" : true
  } ],
  "getPSDELogicParams" : [ {

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSDATAVIEWS/Usr0815070416.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSDATAVIEWS/Usr0815070416.json
@@ -124,13 +124,13 @@
          "layout" : "TABLE_24COL"
        },
        "getPSRawItem" : {
-          "caption" : "测试h1",
+          "caption" : "测试h1-----",
          "contentType" : "RAW",
          "name" : "static_text2",
          "predefinedType" : "STATIC_TEXT",
          "renderMode" : "HEADING1"
        },
-        "rawContent" : "测试h1",
+        "rawContent" : "测试h1-----",
        "showCaption" : true
      }, {
        "caption" : "图片",
@@ -157,7 +157,7 @@
        },
        "showCaption" : true
      }, {
-        "caption" : "文本",
+        "caption" : "测试HTML",
        "contentType" : "HTML",
        "htmlContent" : "<p>&lt;div&gt;&lt;p&gt;测试html&lt;/p&gt;&lt;/div&gt;</p>",
        "itemStyle" : "DEFAULT",
@@ -174,6 +174,24 @@
          "predefinedType" : "STATIC_TEXT"
        },
        "showCaption" : true
+      }, {
+        "caption" : "文本",
+        "contentType" : "DIVIDER",
+        "itemStyle" : "DEFAULT",
+        "itemType" : "RAWITEM",
+        "name" : "static_text4",
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "getPSRawItem" : {
+          "contentType" : "DIVIDER",
+          "name" : "static_text4",
+          "predefinedType" : "STATIC_TEXT",
+          "rawContent" : "文本内容"
+        },
+        "rawContent" : "文本内容",
+        "showCaption" : true
      }, {
        "caption" : "date数据项",
        "itemStyle" : "DEFAULT",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSPANELS/Usr0815611479.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSPANELS/Usr0815611479.json
@@ -105,13 +105,13 @@
        "layout" : "TABLE_24COL"
      },
      "getPSRawItem" : {
-        "caption" : "测试h1",
+        "caption" : "测试h1-----",
        "contentType" : "RAW",
        "name" : "static_text2",
        "predefinedType" : "STATIC_TEXT",
        "renderMode" : "HEADING1"
      },
-      "rawContent" : "测试h1",
+      "rawContent" : "测试h1-----",
      "showCaption" : true
    }, {
      "caption" : "图片",
@@ -138,7 +138,7 @@
      },
      "showCaption" : true
    }, {
-      "caption" : "文本",
+      "caption" : "测试HTML",
      "contentType" : "HTML",
      "htmlContent" : "<p>&lt;div&gt;&lt;p&gt;测试html&lt;/p&gt;&lt;/div&gt;</p>",
      "itemStyle" : "DEFAULT",
@@ -155,6 +155,24 @@
        "predefinedType" : "STATIC_TEXT"
      },
      "showCaption" : true
+    }, {
+      "caption" : "文本",
+      "contentType" : "DIVIDER",
+      "itemStyle" : "DEFAULT",
+      "itemType" : "RAWITEM",
+      "name" : "static_text4",
+      "getPSLayoutPos" : {
+        "colMD" : 24,
+        "layout" : "TABLE_24COL"
+      },
+      "getPSRawItem" : {
+        "contentType" : "DIVIDER",
+        "name" : "static_text4",
+        "predefinedType" : "STATIC_TEXT",
+        "rawContent" : "文本内容"
+      },
+      "rawContent" : "文本内容",
+      "showCaption" : true
    }, {
      "caption" : "date数据项",
      "itemStyle" : "DEFAULT",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSCHARTS/Chart.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSCHARTS/Chart.json
@@ -84,6 +84,7 @@
    "position" : "bottom",
    "type" : "category",
    "getUserParam" : {
+      "EC.axisTick" : "{\"show\":1,\"length\":3}",
      "EC.interval" : "10"
    },
    "id" : "0"

--- 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
@@ -636,12 +636,46 @@
    "name" : "处理逻辑测试",
    "getPSDELogicNodes" : [ {
      "codeName" : "Begin",
-      "leftPos" : 200,
+      "leftPos" : 153,
      "logicNodeType" : "BEGIN",
      "mOSFilePath" : "pssysapps/Web/psappdataentities/TEST/psappdelogics/logic1/psappdelogicnodes/Begin",
      "name" : "开始",
+      "getPSDELogicLinks" : [ {
+        "getDstPSDELogicNode" : {
+          "modelref" : true,
+          "id" : "Prepareparam1"
+        },
+        "name" : "连接4111",
+        "getPSDELogicLinkGroupCond" : {
+          "groupOP" : "AND",
+          "logicType" : "GROUP",
+          "name" : "连接条件组",
+          "getPSDELogicLinkConds" : [ {
+            "dstFieldName" : "TESTID",
+            "getDstLogicParam" : {
+              "modelref" : true,
+              "id" : "Default"
+            },
+            "logicType" : "SINGLE",
+            "name" : "?"
+          } ]
+        },
+        "getSrcPSDELogicNode" : {
+          "modelref" : true,
+          "id" : "Begin"
+        }
+      } ],
      "rTMOSFilePath" : "pssysapps/Web/psappdataentities/TEST/psappdelogics/logic1/psappdelogicnodes/Begin",
-      "topPos" : 200,
+      "topPos" : 91,
+      "parallelOutput" : true
+    }, {
+      "codeName" : "Prepareparam1",
+      "leftPos" : 352,
+      "logicNodeType" : "PREPAREPARAM",
+      "mOSFilePath" : "pssysapps/Web/psappdataentities/TEST/psappdelogics/logic1/psappdelogicnodes/Prepareparam1",
+      "name" : "准备参数",
+      "rTMOSFilePath" : "pssysapps/Web/psappdataentities/TEST/psappdelogics/logic1/psappdelogicnodes/Prepareparam1",
+      "topPos" : 236,
      "parallelOutput" : true
    } ],
    "getPSDELogicParams" : [ {

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoChartView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoChartView.json
@@ -289,6 +289,7 @@
      "position" : "bottom",
      "type" : "category",
      "getUserParam" : {
+        "EC.axisTick" : "{\"show\":1,\"length\":3}",
        "EC.interval" : "10"
      },
      "id" : "0"

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookDataView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookDataView.json
@@ -397,13 +397,13 @@
            "layout" : "TABLE_24COL"
          },
          "getPSRawItem" : {
-            "caption" : "测试h1",
+            "caption" : "测试h1-----",
            "contentType" : "RAW",
            "name" : "static_text2",
            "predefinedType" : "STATIC_TEXT",
            "renderMode" : "HEADING1"
          },
-          "rawContent" : "测试h1",
+          "rawContent" : "测试h1-----",
          "showCaption" : true
        }, {
          "caption" : "图片",
@@ -430,7 +430,7 @@
          },
          "showCaption" : true
        }, {
-          "caption" : "文本",
+          "caption" : "测试HTML",
          "contentType" : "HTML",
          "htmlContent" : "<p>&lt;div&gt;&lt;p&gt;测试html&lt;/p&gt;&lt;/div&gt;</p>",
          "itemStyle" : "DEFAULT",
@@ -447,6 +447,24 @@
            "predefinedType" : "STATIC_TEXT"
          },
          "showCaption" : true
+        }, {
+          "caption" : "文本",
+          "contentType" : "DIVIDER",
+          "itemStyle" : "DEFAULT",
+          "itemType" : "RAWITEM",
+          "name" : "static_text4",
+          "getPSLayoutPos" : {
+            "colMD" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "getPSRawItem" : {
+            "contentType" : "DIVIDER",
+            "name" : "static_text4",
+            "predefinedType" : "STATIC_TEXT",
+            "rawContent" : "文本内容"
+          },
+          "rawContent" : "文本内容",
+          "showCaption" : true
        }, {
          "caption" : "date数据项",
          "itemStyle" : "DEFAULT",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookDefaultDataView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookDefaultDataView.json
@@ -361,13 +361,13 @@
            "layout" : "TABLE_24COL"
          },
          "getPSRawItem" : {
-            "caption" : "测试h1",
+            "caption" : "测试h1-----",
            "contentType" : "RAW",
            "name" : "static_text2",
            "predefinedType" : "STATIC_TEXT",
            "renderMode" : "HEADING1"
          },
-          "rawContent" : "测试h1",
+          "rawContent" : "测试h1-----",
          "showCaption" : true
        }, {
          "caption" : "图片",
@@ -394,7 +394,7 @@
          },
          "showCaption" : true
        }, {
-          "caption" : "文本",
+          "caption" : "测试HTML",
          "contentType" : "HTML",
          "htmlContent" : "<p>&lt;div&gt;&lt;p&gt;测试html&lt;/p&gt;&lt;/div&gt;</p>",
          "itemStyle" : "DEFAULT",
@@ -411,6 +411,24 @@
            "predefinedType" : "STATIC_TEXT"
          },
          "showCaption" : true
+        }, {
+          "caption" : "文本",
+          "contentType" : "DIVIDER",
+          "itemStyle" : "DEFAULT",
+          "itemType" : "RAWITEM",
+          "name" : "static_text4",
+          "getPSLayoutPos" : {
+            "colMD" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "getPSRawItem" : {
+            "contentType" : "DIVIDER",
+            "name" : "static_text4",
+            "predefinedType" : "STATIC_TEXT",
+            "rawContent" : "文本内容"
+          },
+          "rawContent" : "文本内容",
+          "showCaption" : true
        }, {
          "caption" : "date数据项",
          "itemStyle" : "DEFAULT",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr2DataView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr2DataView.json
@@ -397,13 +397,13 @@
            "layout" : "TABLE_24COL"
          },
          "getPSRawItem" : {
-            "caption" : "测试h1",
+            "caption" : "测试h1-----",
            "contentType" : "RAW",
            "name" : "static_text2",
            "predefinedType" : "STATIC_TEXT",
            "renderMode" : "HEADING1"
          },
-          "rawContent" : "测试h1",
+          "rawContent" : "测试h1-----",
          "showCaption" : true
        }, {
          "caption" : "图片",
@@ -430,7 +430,7 @@
          },
          "showCaption" : true
        }, {
-          "caption" : "文本",
+          "caption" : "测试HTML",
          "contentType" : "HTML",
          "htmlContent" : "<p>&lt;div&gt;&lt;p&gt;测试html&lt;/p&gt;&lt;/div&gt;</p>",
          "itemStyle" : "DEFAULT",
@@ -447,6 +447,24 @@
            "predefinedType" : "STATIC_TEXT"
          },
          "showCaption" : true
+        }, {
+          "caption" : "文本",
+          "contentType" : "DIVIDER",
+          "itemStyle" : "DEFAULT",
+          "itemType" : "RAWITEM",
+          "name" : "static_text4",
+          "getPSLayoutPos" : {
+            "colMD" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "getPSRawItem" : {
+            "contentType" : "DIVIDER",
+            "name" : "static_text4",
+            "predefinedType" : "STATIC_TEXT",
+            "rawContent" : "文本内容"
+          },
+          "rawContent" : "文本内容",
+          "showCaption" : true
        }, {
          "caption" : "date数据项",
          "itemStyle" : "DEFAULT",