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

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

@@ -1133,16 +1133,16 @@
     "mOSFilePath" : "pssysapps/TemplatePublish/psappviewmsggroups/VMGroup2",
     "name" : "视图消息组2",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息",
+      "name" : "视图消息2",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
       }
     }, {
-      "name" : "视图消息2",
+      "name" : "视图消息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
       }
     } ],
     "rTMOSFilePath" : "pssysapps/TemplatePublish/psappviewmsggroups/VMGroup2"

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSGRIDS/InfoGrid.json

@@ -19,35 +19,35 @@
   "getPSAppViewLogics" : [ {
     "logicTrigger" : "CUSTOM",
     "logicType" : "APPVIEWUIACTION",
-    "name" : "grid_uagridcolumn1_u4c6267d_click",
+    "name" : "grid_uagridcolumn1_u1feafb4_click",
     "getPSAppViewUIAction" : {
       "modelref" : true,
-      "id" : "表格界面_删除操作"
+      "id" : "表格界面_编辑操作"
     }
   }, {
     "logicTrigger" : "CUSTOM",
     "logicType" : "APPVIEWUIACTION",
-    "name" : "grid_uagridcolumn1_u1feafb4_click",
+    "name" : "grid_uagridcolumn1_u4c6267d_click",
     "getPSAppViewUIAction" : {
       "modelref" : true,
-      "id" : "表格界面_编辑操作"
+      "id" : "表格界面_删除操作"
     }
   } ],
   "getPSAppViewUIActions" : [ {
-    "name" : "表格界面_删除操作",
+    "name" : "表格界面_编辑操作",
     "getPSUIAction" : {
       "modelref" : true,
-      "id" : "Remove"
+      "id" : "Edit"
     },
-    "uIActionTarget" : "MULTIKEY",
+    "uIActionTarget" : "SINGLEKEY",
     "xDataControlName" : "grid"
   }, {
-    "name" : "表格界面_编辑操作",
+    "name" : "表格界面_删除操作",
     "getPSUIAction" : {
       "modelref" : true,
-      "id" : "Edit"
+      "id" : "Remove"
     },
-    "uIActionTarget" : "SINGLEKEY",
+    "uIActionTarget" : "MULTIKEY",
     "xDataControlName" : "grid"
   } ],
   "getPSControlLogics" : [ {
@@ -168,48 +168,6 @@
     "getPSDEUIActionGroup" : {
       "name" : "界面行为组",
       "getPSUIActionGroupDetails" : [ {
-        "detailType" : "DEUIACTION",
-        "name" : "u4c6267d",
-        "getPSUIAction" : {
-          "actionTarget" : "MULTIKEY",
-          "getCapPSLanguageRes" : {
-            "defaultContent" : "删除",
-            "lanResTag" : "TBB.TEXT.*.REMOVE",
-            "lanResType" : "TBB.TEXT",
-            "mOSFilePath" : "pslanguageres/Auto159",
-            "name" : "工具栏按钮文本[*.REMOVE]",
-            "rTMOSFilePath" : "pslanguageres/Auto159",
-            "refFlag" : true
-          },
-          "caption" : "删除",
-          "codeName" : "Remove",
-          "fullCodeName" : "Remove",
-          "mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/Remove",
-          "name" : "表格界面_删除操作",
-          "getPSSysImage" : {
-            "glyph" : "xf00d@FontAwesome",
-            "cssClass" : "fa fa-remove"
-          },
-          "predefinedType" : "GRIDVIEW_REMOVEACTION",
-          "rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/Remove",
-          "timeout" : 60000,
-          "getTooltipPSLanguageRes" : {
-            "defaultContent" : "删除",
-            "lanResTag" : "TBB.TOOLTIP.*.REMOVE",
-            "lanResType" : "TBB.TOOLTIP",
-            "mOSFilePath" : "pslanguageres/Auto286",
-            "name" : "工具栏按钮提示[*.REMOVE]",
-            "rTMOSFilePath" : "pslanguageres/Auto286",
-            "refFlag" : true
-          },
-          "uIActionMode" : "SYS",
-          "uIActionTag" : "Remove",
-          "uIActionType" : "DEUIACTION"
-        },
-        "addSeparator" : true,
-        "showCaption" : false,
-        "showIcon" : true
-      }, {
         "detailType" : "DEUIACTION",
         "name" : "u1feafb4",
         "getPSUIAction" : {
@@ -251,6 +209,48 @@
         "addSeparator" : true,
         "showCaption" : true,
         "showIcon" : false
+      }, {
+        "detailType" : "DEUIACTION",
+        "name" : "u4c6267d",
+        "getPSUIAction" : {
+          "actionTarget" : "MULTIKEY",
+          "getCapPSLanguageRes" : {
+            "defaultContent" : "删除",
+            "lanResTag" : "TBB.TEXT.*.REMOVE",
+            "lanResType" : "TBB.TEXT",
+            "mOSFilePath" : "pslanguageres/Auto159",
+            "name" : "工具栏按钮文本[*.REMOVE]",
+            "rTMOSFilePath" : "pslanguageres/Auto159",
+            "refFlag" : true
+          },
+          "caption" : "删除",
+          "codeName" : "Remove",
+          "fullCodeName" : "Remove",
+          "mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/Remove",
+          "name" : "表格界面_删除操作",
+          "getPSSysImage" : {
+            "glyph" : "xf00d@FontAwesome",
+            "cssClass" : "fa fa-remove"
+          },
+          "predefinedType" : "GRIDVIEW_REMOVEACTION",
+          "rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/Remove",
+          "timeout" : 60000,
+          "getTooltipPSLanguageRes" : {
+            "defaultContent" : "删除",
+            "lanResTag" : "TBB.TOOLTIP.*.REMOVE",
+            "lanResType" : "TBB.TOOLTIP",
+            "mOSFilePath" : "pslanguageres/Auto286",
+            "name" : "工具栏按钮提示[*.REMOVE]",
+            "rTMOSFilePath" : "pslanguageres/Auto286",
+            "refFlag" : true
+          },
+          "uIActionMode" : "SYS",
+          "uIActionTag" : "Remove",
+          "uIActionType" : "DEUIACTION"
+        },
+        "addSeparator" : true,
+        "showCaption" : false,
+        "showIcon" : true
       } ]
     },
     "rTMOSFilePath" : "psdegridcols/uagridcolumn1",

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

@@ -102,6 +102,7 @@
   } ],
   "getPSChartXAxises" : [ {
     "caption" : "姓名",
+    "dataShowMode" : 1,
     "eChartsPos" : "xAxis",
     "eChartsType" : "value",
     "index" : 0,
@@ -112,6 +113,7 @@
   } ],
   "getPSChartYAxises" : [ {
     "caption" : "年龄",
+    "dataShowMode" : 2,
     "eChartsPos" : "yAxis",
     "eChartsType" : "category",
     "index" : 0,

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Student/PSLISTS/StudentList.json

@@ -25,35 +25,35 @@
   "getPSAppViewLogics" : [ {
     "logicTrigger" : "CUSTOM",
     "logicType" : "APPVIEWUIACTION",
-    "name" : "db_sysportlet2_list_field_u4c6267d_click",
+    "name" : "db_sysportlet2_list_field_u1feafb4_click",
     "getPSAppViewUIAction" : {
       "modelref" : true,
-      "id" : "表格界面_删除操作"
+      "id" : "表格界面_编辑操作"
     }
   }, {
     "logicTrigger" : "CUSTOM",
     "logicType" : "APPVIEWUIACTION",
-    "name" : "db_sysportlet2_list_field_u1feafb4_click",
+    "name" : "db_sysportlet2_list_field_u4c6267d_click",
     "getPSAppViewUIAction" : {
       "modelref" : true,
-      "id" : "表格界面_编辑操作"
+      "id" : "表格界面_删除操作"
     }
   } ],
   "getPSAppViewUIActions" : [ {
-    "name" : "表格界面_删除操作",
+    "name" : "表格界面_编辑操作",
     "getPSUIAction" : {
       "modelref" : true,
-      "id" : "Remove"
+      "id" : "Edit"
     },
-    "uIActionTarget" : "MULTIKEY",
+    "uIActionTarget" : "SINGLEKEY",
     "xDataControlName" : "db_sysportlet2_list"
   }, {
-    "name" : "表格界面_编辑操作",
+    "name" : "表格界面_删除操作",
     "getPSUIAction" : {
       "modelref" : true,
-      "id" : "Edit"
+      "id" : "Remove"
     },
-    "uIActionTarget" : "SINGLEKEY",
+    "uIActionTarget" : "MULTIKEY",
     "xDataControlName" : "db_sysportlet2_list"
   } ],
   "getPSDEListDataItems" : [ {
@@ -104,48 +104,6 @@
     "getPSDEUIActionGroup" : {
       "name" : "界面行为组",
       "getPSUIActionGroupDetails" : [ {
-        "detailType" : "DEUIACTION",
-        "name" : "u4c6267d",
-        "getPSUIAction" : {
-          "actionTarget" : "MULTIKEY",
-          "getCapPSLanguageRes" : {
-            "defaultContent" : "删除",
-            "lanResTag" : "TBB.TEXT.*.REMOVE",
-            "lanResType" : "TBB.TEXT",
-            "mOSFilePath" : "pslanguageres/Auto159",
-            "name" : "工具栏按钮文本[*.REMOVE]",
-            "rTMOSFilePath" : "pslanguageres/Auto159",
-            "refFlag" : true
-          },
-          "caption" : "删除",
-          "codeName" : "Remove",
-          "fullCodeName" : "Remove",
-          "mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/Remove",
-          "name" : "表格界面_删除操作",
-          "getPSSysImage" : {
-            "glyph" : "xf00d@FontAwesome",
-            "cssClass" : "fa fa-remove"
-          },
-          "predefinedType" : "GRIDVIEW_REMOVEACTION",
-          "rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/Remove",
-          "timeout" : 60000,
-          "getTooltipPSLanguageRes" : {
-            "defaultContent" : "删除",
-            "lanResTag" : "TBB.TOOLTIP.*.REMOVE",
-            "lanResType" : "TBB.TOOLTIP",
-            "mOSFilePath" : "pslanguageres/Auto286",
-            "name" : "工具栏按钮提示[*.REMOVE]",
-            "rTMOSFilePath" : "pslanguageres/Auto286",
-            "refFlag" : true
-          },
-          "uIActionMode" : "SYS",
-          "uIActionTag" : "Remove",
-          "uIActionType" : "DEUIACTION"
-        },
-        "addSeparator" : true,
-        "showCaption" : false,
-        "showIcon" : true
-      }, {
         "detailType" : "DEUIACTION",
         "name" : "u1feafb4",
         "getPSUIAction" : {
@@ -187,6 +145,48 @@
         "addSeparator" : true,
         "showCaption" : true,
         "showIcon" : false
+      }, {
+        "detailType" : "DEUIACTION",
+        "name" : "u4c6267d",
+        "getPSUIAction" : {
+          "actionTarget" : "MULTIKEY",
+          "getCapPSLanguageRes" : {
+            "defaultContent" : "删除",
+            "lanResTag" : "TBB.TEXT.*.REMOVE",
+            "lanResType" : "TBB.TEXT",
+            "mOSFilePath" : "pslanguageres/Auto159",
+            "name" : "工具栏按钮文本[*.REMOVE]",
+            "rTMOSFilePath" : "pslanguageres/Auto159",
+            "refFlag" : true
+          },
+          "caption" : "删除",
+          "codeName" : "Remove",
+          "fullCodeName" : "Remove",
+          "mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/Remove",
+          "name" : "表格界面_删除操作",
+          "getPSSysImage" : {
+            "glyph" : "xf00d@FontAwesome",
+            "cssClass" : "fa fa-remove"
+          },
+          "predefinedType" : "GRIDVIEW_REMOVEACTION",
+          "rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/Remove",
+          "timeout" : 60000,
+          "getTooltipPSLanguageRes" : {
+            "defaultContent" : "删除",
+            "lanResTag" : "TBB.TOOLTIP.*.REMOVE",
+            "lanResType" : "TBB.TOOLTIP",
+            "mOSFilePath" : "pslanguageres/Auto286",
+            "name" : "工具栏按钮提示[*.REMOVE]",
+            "rTMOSFilePath" : "pslanguageres/Auto286",
+            "refFlag" : true
+          },
+          "uIActionMode" : "SYS",
+          "uIActionTag" : "Remove",
+          "uIActionType" : "DEUIACTION"
+        },
+        "addSeparator" : true,
+        "showCaption" : false,
+        "showIcon" : true
       } ]
     },
     "width" : 150,

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

@@ -307,6 +307,7 @@
     } ],
     "getPSChartXAxises" : [ {
       "caption" : "姓名",
+      "dataShowMode" : 1,
       "eChartsPos" : "xAxis",
       "eChartsType" : "value",
       "index" : 0,
@@ -317,6 +318,7 @@
     } ],
     "getPSChartYAxises" : [ {
       "caption" : "年龄",
+      "dataShowMode" : 2,
       "eChartsPos" : "yAxis",
       "eChartsType" : "category",
       "index" : 0,

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

@@ -379,35 +379,35 @@
     "getPSAppViewLogics" : [ {
       "logicTrigger" : "CUSTOM",
       "logicType" : "APPVIEWUIACTION",
-      "name" : "grid_uagridcolumn1_u4c6267d_click",
+      "name" : "grid_uagridcolumn1_u1feafb4_click",
       "getPSAppViewUIAction" : {
         "modelref" : true,
-        "id" : "表格界面_删除操作"
+        "id" : "表格界面_编辑操作"
       }
     }, {
       "logicTrigger" : "CUSTOM",
       "logicType" : "APPVIEWUIACTION",
-      "name" : "grid_uagridcolumn1_u1feafb4_click",
+      "name" : "grid_uagridcolumn1_u4c6267d_click",
       "getPSAppViewUIAction" : {
         "modelref" : true,
-        "id" : "表格界面_编辑操作"
+        "id" : "表格界面_删除操作"
       }
     } ],
     "getPSAppViewUIActions" : [ {
-      "name" : "表格界面_删除操作",
+      "name" : "表格界面_编辑操作",
       "getPSUIAction" : {
         "modelref" : true,
-        "id" : "Remove"
+        "id" : "Edit"
       },
-      "uIActionTarget" : "MULTIKEY",
+      "uIActionTarget" : "SINGLEKEY",
       "xDataControlName" : "grid"
     }, {
-      "name" : "表格界面_编辑操作",
+      "name" : "表格界面_删除操作",
       "getPSUIAction" : {
         "modelref" : true,
-        "id" : "Edit"
+        "id" : "Remove"
       },
-      "uIActionTarget" : "SINGLEKEY",
+      "uIActionTarget" : "MULTIKEY",
       "xDataControlName" : "grid"
     } ],
     "getPSControlHandler" : {
@@ -615,48 +615,6 @@
       "getPSDEUIActionGroup" : {
         "name" : "界面行为组",
         "getPSUIActionGroupDetails" : [ {
-          "detailType" : "DEUIACTION",
-          "name" : "u4c6267d",
-          "getPSUIAction" : {
-            "actionTarget" : "MULTIKEY",
-            "getCapPSLanguageRes" : {
-              "defaultContent" : "删除",
-              "lanResTag" : "TBB.TEXT.*.REMOVE",
-              "lanResType" : "TBB.TEXT",
-              "mOSFilePath" : "pslanguageres/Auto159",
-              "name" : "工具栏按钮文本[*.REMOVE]",
-              "rTMOSFilePath" : "pslanguageres/Auto159",
-              "refFlag" : true
-            },
-            "caption" : "删除",
-            "codeName" : "Remove",
-            "fullCodeName" : "Remove",
-            "mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/Remove",
-            "name" : "表格界面_删除操作",
-            "getPSSysImage" : {
-              "glyph" : "xf00d@FontAwesome",
-              "cssClass" : "fa fa-remove"
-            },
-            "predefinedType" : "GRIDVIEW_REMOVEACTION",
-            "rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/Remove",
-            "timeout" : 60000,
-            "getTooltipPSLanguageRes" : {
-              "defaultContent" : "删除",
-              "lanResTag" : "TBB.TOOLTIP.*.REMOVE",
-              "lanResType" : "TBB.TOOLTIP",
-              "mOSFilePath" : "pslanguageres/Auto286",
-              "name" : "工具栏按钮提示[*.REMOVE]",
-              "rTMOSFilePath" : "pslanguageres/Auto286",
-              "refFlag" : true
-            },
-            "uIActionMode" : "SYS",
-            "uIActionTag" : "Remove",
-            "uIActionType" : "DEUIACTION"
-          },
-          "addSeparator" : true,
-          "showCaption" : false,
-          "showIcon" : true
-        }, {
           "detailType" : "DEUIACTION",
           "name" : "u1feafb4",
           "getPSUIAction" : {
@@ -698,6 +656,48 @@
           "addSeparator" : true,
           "showCaption" : true,
           "showIcon" : false
+        }, {
+          "detailType" : "DEUIACTION",
+          "name" : "u4c6267d",
+          "getPSUIAction" : {
+            "actionTarget" : "MULTIKEY",
+            "getCapPSLanguageRes" : {
+              "defaultContent" : "删除",
+              "lanResTag" : "TBB.TEXT.*.REMOVE",
+              "lanResType" : "TBB.TEXT",
+              "mOSFilePath" : "pslanguageres/Auto159",
+              "name" : "工具栏按钮文本[*.REMOVE]",
+              "rTMOSFilePath" : "pslanguageres/Auto159",
+              "refFlag" : true
+            },
+            "caption" : "删除",
+            "codeName" : "Remove",
+            "fullCodeName" : "Remove",
+            "mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/Remove",
+            "name" : "表格界面_删除操作",
+            "getPSSysImage" : {
+              "glyph" : "xf00d@FontAwesome",
+              "cssClass" : "fa fa-remove"
+            },
+            "predefinedType" : "GRIDVIEW_REMOVEACTION",
+            "rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/Remove",
+            "timeout" : 60000,
+            "getTooltipPSLanguageRes" : {
+              "defaultContent" : "删除",
+              "lanResTag" : "TBB.TOOLTIP.*.REMOVE",
+              "lanResType" : "TBB.TOOLTIP",
+              "mOSFilePath" : "pslanguageres/Auto286",
+              "name" : "工具栏按钮提示[*.REMOVE]",
+              "rTMOSFilePath" : "pslanguageres/Auto286",
+              "refFlag" : true
+            },
+            "uIActionMode" : "SYS",
+            "uIActionTag" : "Remove",
+            "uIActionType" : "DEUIACTION"
+          },
+          "addSeparator" : true,
+          "showCaption" : false,
+          "showIcon" : true
         } ]
       },
       "rTMOSFilePath" : "psdegridcols/uagridcolumn1",