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

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Reginfo.json

@@ -2886,6 +2886,12 @@
     "name" : "学员登记信息实体表格导航视图(模态)",
     "realModelSubType" : "DEGRIDEXPVIEW",
     "realModelType" : "PSDEVIEWBASE"
+  }, {
+    "codeName" : "ChartExpView",
+    "logicName" : "学员登记信息实体图表导航视图",
+    "name" : "学员登记信息实体图表导航视图",
+    "realModelSubType" : "DECHARTEXPVIEW",
+    "realModelType" : "PSDEVIEWBASE"
   }, {
     "codeName" : "Usr0301632891RedirectView",
     "logicName" : "实体数据重定向视图test2",
@@ -3022,6 +3028,12 @@
     "name" : "学员登记信息实体表格视图",
     "realModelSubType" : "DEGRIDVIEW",
     "realModelType" : "PSDEVIEWBASE"
+  }, {
+    "codeName" : "Usr2ChartExpView",
+    "logicName" : "学员登记信息实体图表导航视图(2)",
+    "name" : "学员登记信息实体图表导航视图(2)",
+    "realModelSubType" : "DECHARTEXPVIEW",
+    "realModelType" : "PSDEVIEWBASE"
   }, {
     "codeName" : "MPickupView",
     "logicName" : "学员登记信息实体数据多项选择视图",

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

@@ -1432,16 +1432,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/Reginfo.json

@@ -1957,6 +1957,10 @@
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoREGINFOGridExpView2.json",
     "viewType" : "DEGRIDEXPVIEW"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoUsr2ChartExpView.json",
+    "viewType" : "DECHARTEXPVIEW"
   }, {
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoUsr0301727282ChartView.json",
@@ -1965,6 +1969,10 @@
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoOptionView.json",
     "viewType" : "DEOPTVIEW"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoChartExpView.json",
+    "viewType" : "DECHARTEXPVIEW"
   }, {
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoUsr0301474927ChartView.json",

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

@@ -2295,6 +2295,69 @@
           "layout" : "TABLE_24COL"
         },
         "tooltip" : "缓存模式"
+      }, {
+        "accUserMode" : 0,
+        "caption" : "图表导航",
+        "itemType" : "MENUITEM",
+        "name" : "menuitem140",
+        "getPSAppMenuItems" : [ {
+          "accUserMode" : 2,
+          "caption" : "柱状图导航",
+          "itemType" : "MENUITEM",
+          "name" : "menuitem141",
+          "getPSAppFunc" : {
+            "modelref" : true,
+            "id" : "AppFunc103"
+          },
+          "getPSLayout" : {
+            "childColLG" : -1,
+            "childColMD" : 24,
+            "childColSM" : -1,
+            "childColXS" : -1,
+            "columnCount" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "getPSLayoutPos" : {
+            "colMD" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "tooltip" : "柱状图导航"
+        }, {
+          "accUserMode" : 2,
+          "caption" : "折线图导航",
+          "itemType" : "MENUITEM",
+          "name" : "menuitem142",
+          "getPSAppFunc" : {
+            "modelref" : true,
+            "id" : "AppFunc104"
+          },
+          "getPSLayout" : {
+            "childColLG" : -1,
+            "childColMD" : 24,
+            "childColSM" : -1,
+            "childColXS" : -1,
+            "columnCount" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "getPSLayoutPos" : {
+            "colMD" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "tooltip" : "折线图导航"
+        } ],
+        "getPSLayout" : {
+          "childColLG" : -1,
+          "childColMD" : 24,
+          "childColSM" : -1,
+          "childColXS" : -1,
+          "columnCount" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "tooltip" : "图表导航"
       } ],
       "getPSLayout" : {
         "childColLG" : -1,

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

@@ -1023,6 +1023,33 @@
         "tooltip" : "布局不缓存"
       } ],
       "tooltip" : "缓存模式"
+    }, {
+      "accUserMode" : 0,
+      "caption" : "图表导航",
+      "itemType" : "MENUITEM",
+      "name" : "menuitem140",
+      "getPSAppMenuItems" : [ {
+        "accUserMode" : 2,
+        "caption" : "柱状图导航",
+        "itemType" : "MENUITEM",
+        "name" : "menuitem141",
+        "getPSAppFunc" : {
+          "modelref" : true,
+          "id" : "AppFunc103"
+        },
+        "tooltip" : "柱状图导航"
+      }, {
+        "accUserMode" : 2,
+        "caption" : "折线图导航",
+        "itemType" : "MENUITEM",
+        "name" : "menuitem142",
+        "getPSAppFunc" : {
+          "modelref" : true,
+          "id" : "AppFunc104"
+        },
+        "tooltip" : "折线图导航"
+      } ],
+      "tooltip" : "图表导航"
     } ],
     "tooltip" : "导航视图"
   }, {

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

@@ -3344,6 +3344,16 @@
       "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTEditView_drawer.json",
       "viewType" : "DEEDITVIEW"
     }
+  }, {
+    "appFuncType" : "APPVIEW",
+    "codeName" : "AppFunc104",
+    "name" : "折线图导航",
+    "openMode" : "INDEXVIEWTAB",
+    "getPSAppView" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoUsr2ChartExpView.json",
+      "viewType" : "DECHARTEXPVIEW"
+    }
   }, {
     "appFuncType" : "APPVIEW",
     "codeName" : "AppFunc5",
@@ -3384,6 +3394,16 @@
       "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ViewLayoutModelRepositoryDEGridViewLayout.json",
       "viewType" : "DEGRIDVIEW"
     }
+  }, {
+    "appFuncType" : "APPVIEW",
+    "codeName" : "AppFunc103",
+    "name" : "柱状图导航",
+    "openMode" : "INDEXVIEWTAB",
+    "getPSAppView" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoChartExpView.json",
+      "viewType" : "DECHARTEXPVIEW"
+    }
   }, {
     "appFuncType" : "APPVIEW",
     "codeName" : "AppFunc65",
@@ -9705,16 +9725,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"
       }
     } ]
   }, {
@@ -9743,10 +9763,10 @@
     "codeName" : "VMGroup3",
     "name" : "视图消息类型测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-常规信息",
+      "name" : "消息类型-警告信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg4"
+        "id" : "ViewMsg5"
       }
     }, {
       "name" : "消息类型-错误信息",
@@ -9755,10 +9775,10 @@
         "id" : "ViewMsg6"
       }
     }, {
-      "name" : "消息类型-警告信息",
+      "name" : "消息类型-常规信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg5"
+        "id" : "ViewMsg4"
       }
     } ]
   }, {
@@ -9775,46 +9795,39 @@
     "codeName" : "VMGroup4",
     "name" : "视图消息位置测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息位置-视图下方",
+      "name" : "消息位置-视图上方",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg7"
       }
     }, {
-      "name" : "消息位置-视图内容区",
+      "name" : "消息位置-视图下方",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg9"
+        "id" : "ViewMsg8"
       }
     }, {
-      "name" : "消息位置-视图上方",
+      "name" : "消息位置-弹出",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg7"
+        "id" : "ViewMsg10"
       }
     }, {
-      "name" : "消息位置-弹出",
+      "name" : "消息位置-视图内容区",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg10"
+        "id" : "ViewMsg9"
       }
     } ]
   }, {
     "codeName" : "VMGroup8",
     "name" : "【静态测试】",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-无删除-上方-常规",
+      "name" : "消息位置-视图内容区",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg11"
+        "id" : "ViewMsg9"
       }
-    }, {
-      "name" : "消息类型-常规信息",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg4"
-      },
-      "position" : "POPUP"
     }, {
       "name" : "关闭模式-默认删除-上方-错误",
       "getPSAppViewMsg" : {
@@ -9822,17 +9835,12 @@
         "id" : "ViewMsg12"
       }
     }, {
-      "name" : "消息位置-视图内容区",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg9"
-      }
-    }, {
-      "name" : "消息位置-视图下方",
+      "name" : "消息类型-警告信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg8"
-      }
+        "id" : "ViewMsg5"
+      },
+      "position" : "POPUP"
     }, {
       "name" : "关闭模式-本次删除-上方-警告",
       "getPSAppViewMsg" : {
@@ -9840,28 +9848,40 @@
         "id" : "ViewMsg13"
       }
     }, {
-      "name" : "消息类型-警告信息",
+      "name" : "消息类型-错误信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg5"
+        "id" : "ViewMsg6"
       },
       "position" : "POPUP"
     }, {
-      "name" : "消息类型-错误信息",
+      "name" : "消息类型-常规信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg6"
+        "id" : "ViewMsg4"
       },
       "position" : "POPUP"
+    }, {
+      "name" : "关闭模式-无删除-上方-常规",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg11"
+      }
+    }, {
+      "name" : "消息位置-视图下方",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg8"
+      }
     } ]
   }, {
     "codeName" : "VMGroup5",
     "name" : "视图消息关闭模式",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-默认删除",
+      "name" : "关闭模式-本次删除",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg12"
+        "id" : "ViewMsg13"
       }
     }, {
       "name" : "关闭模式-无删除",
@@ -9870,10 +9890,10 @@
         "id" : "ViewMsg11"
       }
     }, {
-      "name" : "关闭模式-本次删除",
+      "name" : "关闭模式-默认删除",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg13"
+        "id" : "ViewMsg12"
       }
     } ]
   }, {
@@ -11379,6 +11399,12 @@
     "viewType" : "DEEDITVIEW",
     "resource" : "Bxdex",
     "view" : "Usr2EditView"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoUsr2ChartExpView.json",
+    "viewType" : "DECHARTEXPVIEW",
+    "resource" : "Reginfo",
+    "view" : "Usr2ChartExpView"
   }, {
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr14EditView_7532.json",
@@ -11473,6 +11499,12 @@
     "path" : "PSSYSAPPS/Web/PSAPPINDEXVIEWS/AppIndexViewtest.json",
     "viewType" : "APPINDEXVIEW",
     "view" : "AppIndexViewtest"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoChartExpView.json",
+    "viewType" : "DECHARTEXPVIEW",
+    "resource" : "Reginfo",
+    "view" : "ChartExpView"
   }, {
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/RawMaterialGridView.json",
@@ -14574,6 +14606,69 @@
               "layout" : "TABLE_24COL"
             },
             "tooltip" : "缓存模式"
+          }, {
+            "accUserMode" : 0,
+            "caption" : "图表导航",
+            "itemType" : "MENUITEM",
+            "name" : "menuitem140",
+            "getPSAppMenuItems" : [ {
+              "accUserMode" : 2,
+              "caption" : "柱状图导航",
+              "itemType" : "MENUITEM",
+              "name" : "menuitem141",
+              "getPSAppFunc" : {
+                "modelref" : true,
+                "id" : "AppFunc103"
+              },
+              "getPSLayout" : {
+                "childColLG" : -1,
+                "childColMD" : 24,
+                "childColSM" : -1,
+                "childColXS" : -1,
+                "columnCount" : 24,
+                "layout" : "TABLE_24COL"
+              },
+              "getPSLayoutPos" : {
+                "colMD" : 24,
+                "layout" : "TABLE_24COL"
+              },
+              "tooltip" : "柱状图导航"
+            }, {
+              "accUserMode" : 2,
+              "caption" : "折线图导航",
+              "itemType" : "MENUITEM",
+              "name" : "menuitem142",
+              "getPSAppFunc" : {
+                "modelref" : true,
+                "id" : "AppFunc104"
+              },
+              "getPSLayout" : {
+                "childColLG" : -1,
+                "childColMD" : 24,
+                "childColSM" : -1,
+                "childColXS" : -1,
+                "columnCount" : 24,
+                "layout" : "TABLE_24COL"
+              },
+              "getPSLayoutPos" : {
+                "colMD" : 24,
+                "layout" : "TABLE_24COL"
+              },
+              "tooltip" : "折线图导航"
+            } ],
+            "getPSLayout" : {
+              "childColLG" : -1,
+              "childColMD" : 24,
+              "childColSM" : -1,
+              "childColXS" : -1,
+              "columnCount" : 24,
+              "layout" : "TABLE_24COL"
+            },
+            "getPSLayoutPos" : {
+              "colMD" : 24,
+              "layout" : "TABLE_24COL"
+            },
+            "tooltip" : "图表导航"
           } ],
           "getPSLayout" : {
             "childColLG" : -1,