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

trainsys-core/src/main/resources/liquibase/h2_table.xml

@@ -169,7 +169,7 @@
     </changeSet>
 
     <!--输出实体[PHONE]数据结构 -->
-    <changeSet author="root" id="tab-phone-248-6">
+    <changeSet author="root" id="tab-phone-253-6">
         <createTable tableName="T_PHONE">
                 <column name="PHONEID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_PHONE"/>
@@ -198,7 +198,7 @@
     </changeSet>
 
     <!--输出实体[REGINFO]数据结构 -->
-    <changeSet author="root" id="tab-reginfo-131-8">
+    <changeSet author="root" id="tab-reginfo-139-8">
         <createTable tableName="T_REGINFO">
                 <column name="UPDATEDATE" remarks="" type="DATETIME">
                 </column>
@@ -268,7 +268,7 @@
     </changeSet>
 
     <!--输出实体[STUDENT]数据结构 -->
-    <changeSet author="root" id="tab-student-77-10">
+    <changeSet author="root" id="tab-student-79-10">
         <createTable tableName="T_STUDENT">
                 <column name="CREATEMAN" remarks="" type="VARCHAR(60)">
                 </column>
@@ -326,7 +326,7 @@
     </changeSet>
 
     <!--输出实体[REGINFO]外键关系 -->
-    <changeSet author="root" id="fk-reginfo-131-13">
+    <changeSet author="root" id="fk-reginfo-139-13">
        <addForeignKeyConstraint baseColumnNames="STUDENTID" baseTableName="T_REGINFO" constraintName="F328B6E61632896255" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="STUDENTID" referencedTableName="T_STUDENT" validate="true"/>
     </changeSet>
 

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

@@ -2523,6 +2523,14 @@
     "rTMOSFilePath" : "psmodeldata$psdataentities/PickupGridView",
     "realModelSubType" : "DEPICKUPGRIDVIEW",
     "realModelType" : "PSDEVIEWBASE"
+  }, {
+    "codeName" : "ChartView",
+    "logicName" : "学员登记信息实体图表视图",
+    "mOSFilePath" : "psmodeldata$psdataentities/ChartView",
+    "name" : "学员登记信息实体图表视图",
+    "rTMOSFilePath" : "psmodeldata$psdataentities/ChartView",
+    "realModelSubType" : "DECHARTVIEW",
+    "realModelType" : "PSDEVIEWBASE"
   }, {
     "codeName" : "EditView2",
     "logicName" : "学员登记信息实体编辑视图（左右关系）",

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

@@ -2186,6 +2186,14 @@
     "rTMOSFilePath" : "psmodeldata$psdataentities/Usr1020894544GridView",
     "realModelSubType" : "DEGRIDVIEW",
     "realModelType" : "PSDEVIEWBASE"
+  }, {
+    "codeName" : "CalendarView",
+    "logicName" : "学生实体日历视图",
+    "mOSFilePath" : "psmodeldata$psdataentities/CalendarView",
+    "name" : "学生实体日历视图",
+    "rTMOSFilePath" : "psmodeldata$psdataentities/CalendarView",
+    "realModelSubType" : "DECALENDARVIEW",
+    "realModelType" : "PSDEVIEWBASE"
   }, {
     "codeName" : "EditView2",
     "logicName" : "学生实体编辑视图（左右关系）",

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

@@ -982,16 +982,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,40 +168,6 @@
     "getPSDEUIActionGroup" : {
       "name" : "界面行为组",
       "getPSUIActionGroupDetails" : [ {
-        "detailType" : "DEUIACTION",
-        "name" : "u4c6267d",
-        "getPSUIAction" : {
-          "actionTarget" : "MULTIKEY",
-          "getCapPSLanguageRes" : {
-            "lanResTag" : "TBB.TEXT.*.REMOVE",
-            "mOSFilePath" : "pslanguageres/Auto159",
-            "rTMOSFilePath" : "pslanguageres/Auto159"
-          },
-          "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" : {
-            "lanResTag" : "TBB.TOOLTIP.*.REMOVE",
-            "mOSFilePath" : "pslanguageres/Auto286",
-            "rTMOSFilePath" : "pslanguageres/Auto286"
-          },
-          "uIActionMode" : "SYS",
-          "uIActionTag" : "Remove",
-          "uIActionType" : "DEUIACTION"
-        },
-        "addSeparator" : true,
-        "showCaption" : false,
-        "showIcon" : true
-      }, {
         "detailType" : "DEUIACTION",
         "name" : "u1feafb4",
         "getPSUIAction" : {
@@ -235,6 +201,40 @@
         "addSeparator" : true,
         "showCaption" : true,
         "showIcon" : false
+      }, {
+        "detailType" : "DEUIACTION",
+        "name" : "u4c6267d",
+        "getPSUIAction" : {
+          "actionTarget" : "MULTIKEY",
+          "getCapPSLanguageRes" : {
+            "lanResTag" : "TBB.TEXT.*.REMOVE",
+            "mOSFilePath" : "pslanguageres/Auto159",
+            "rTMOSFilePath" : "pslanguageres/Auto159"
+          },
+          "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" : {
+            "lanResTag" : "TBB.TOOLTIP.*.REMOVE",
+            "mOSFilePath" : "pslanguageres/Auto286",
+            "rTMOSFilePath" : "pslanguageres/Auto286"
+          },
+          "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.json

@@ -1596,6 +1596,10 @@
     "id" : "openOpt@Reginfo"
   } ],
   "getAllPSAppViews" : [ {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoChartView.json",
+    "viewType" : "DECHARTVIEW"
+  }, {
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoEditView.json",
     "viewType" : "DEEDITVIEW"

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

+{
+  "codeName" : "Chart",
+  "controlType" : "CHART",
+  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSCHARTS/Chart.json",
+  "getFetchPSControlAction" : {
+    "modelref" : true,
+    "id" : "fetch"
+  },
+  "hookEventNames" : [ "LOAD", "BEFORELOAD" ],
+  "mOSFilePath" : "psmodules/common/psdataentities/REGINFO/psdecharts/Chart",
+  "getPSAppDataEntity" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
+  },
+  "getPSControlLogics" : [ {
+    "eventNames" : "LOAD;BEFORELOAD",
+    "logicTag" : "chart",
+    "logicType" : "APPVIEWENGINE",
+    "name" : "engine_chart",
+    "getPSAppViewEngine" : {
+      "modelref" : true,
+      "id" : "engine"
+    }
+  } ],
+  "rTMOSFilePath" : "pssysapps/Web/psappdeviews/ReginfoChartView/psappviewctrls/chart",
+  "readOnly" : true,
+  "modelid" : "1972cef25b5d99057535bbed6daa9491_chart",
+  "modeltype" : "PSDECHART"
+}
\ No newline at end of file

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

@@ -37,6 +37,23 @@
     }
   } ],
   "getPSDEFormItemVRs" : [ {
+    "checkMode" : 3,
+    "name" : "表单项值规则",
+    "getPSDEFormItemName" : "Name",
+    "getPSSysValueRule" : {
+      "codeName" : "ValueRule14",
+      "dynaModelFilePath" : "PSSYSVALUERULES/ValueRule14.json",
+      "mOSFilePath" : "pssysvaluerules/ValueRule14",
+      "name" : "由26个英文字母组成的字符串",
+      "rTMOSFilePath" : "pssysvaluerules/ValueRule14",
+      "regExCode" : "[A-Za-z]+",
+      "ruleInfo" : "内容必须为26个英文字母组成的字符串",
+      "ruleType" : "REG",
+      "enableBackend" : true,
+      "enableFront" : true
+    },
+    "valueRuleType" : "SYSVALUERULE"
+  }, {
     "checkMode" : 3,
     "name" : "表单项值规则",
     "getPSDEFValueRule" : {
@@ -68,23 +85,6 @@
     },
     "getPSDEFormItemName" : "StuNo",
     "valueRuleType" : "DEFVALUERULE"
-  }, {
-    "checkMode" : 3,
-    "name" : "表单项值规则",
-    "getPSDEFormItemName" : "Name",
-    "getPSSysValueRule" : {
-      "codeName" : "ValueRule14",
-      "dynaModelFilePath" : "PSSYSVALUERULES/ValueRule14.json",
-      "mOSFilePath" : "pssysvaluerules/ValueRule14",
-      "name" : "由26个英文字母组成的字符串",
-      "rTMOSFilePath" : "pssysvaluerules/ValueRule14",
-      "regExCode" : "[A-Za-z]+",
-      "ruleInfo" : "内容必须为26个英文字母组成的字符串",
-      "ruleType" : "REG",
-      "enableBackend" : true,
-      "enableFront" : true
-    },
-    "valueRuleType" : "SYSVALUERULE"
   } ],
   "getPSDEFormItems" : [ {
     "id" : "srfupdatedate",

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

@@ -1448,6 +1448,10 @@
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/studentPickupView.json",
     "viewType" : "DEPICKUPVIEW"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/studentCalendarView.json",
+    "viewType" : "DECALENDARVIEW"
   }, {
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/studentEditView.json",

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

+{
+  "codeName" : "Calendar",
+  "controlType" : "CALENDAR",
+  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Student/PSCALENDARS/Calendar.json",
+  "groupMode" : "NONE",
+  "legendPos" : "NONE",
+  "mOSFilePath" : "psmodules/common/psdataentities/STUDENT/pssyscalendars/Calendar",
+  "getPSAppDataEntity" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Student.json"
+  },
+  "rTMOSFilePath" : "pssysapps/Web/psappdeviews/studentCalendarView/psappviewctrls/calendar",
+  "enableGroup" : false,
+  "modelid" : "2c472a3ac1d816a3b2be7b257c7299e1_calendar",
+  "modeltype" : "PSSYSCALENDAR"
+}
\ No newline at end of file

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,40 +104,6 @@
     "getPSDEUIActionGroup" : {
       "name" : "界面行为组",
       "getPSUIActionGroupDetails" : [ {
-        "detailType" : "DEUIACTION",
-        "name" : "u4c6267d",
-        "getPSUIAction" : {
-          "actionTarget" : "MULTIKEY",
-          "getCapPSLanguageRes" : {
-            "lanResTag" : "TBB.TEXT.*.REMOVE",
-            "mOSFilePath" : "pslanguageres/Auto159",
-            "rTMOSFilePath" : "pslanguageres/Auto159"
-          },
-          "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" : {
-            "lanResTag" : "TBB.TOOLTIP.*.REMOVE",
-            "mOSFilePath" : "pslanguageres/Auto286",
-            "rTMOSFilePath" : "pslanguageres/Auto286"
-          },
-          "uIActionMode" : "SYS",
-          "uIActionTag" : "Remove",
-          "uIActionType" : "DEUIACTION"
-        },
-        "addSeparator" : true,
-        "showCaption" : false,
-        "showIcon" : true
-      }, {
         "detailType" : "DEUIACTION",
         "name" : "u1feafb4",
         "getPSUIAction" : {
@@ -171,6 +137,40 @@
         "addSeparator" : true,
         "showCaption" : true,
         "showIcon" : false
+      }, {
+        "detailType" : "DEUIACTION",
+        "name" : "u4c6267d",
+        "getPSUIAction" : {
+          "actionTarget" : "MULTIKEY",
+          "getCapPSLanguageRes" : {
+            "lanResTag" : "TBB.TEXT.*.REMOVE",
+            "mOSFilePath" : "pslanguageres/Auto159",
+            "rTMOSFilePath" : "pslanguageres/Auto159"
+          },
+          "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" : {
+            "lanResTag" : "TBB.TOOLTIP.*.REMOVE",
+            "mOSFilePath" : "pslanguageres/Auto286",
+            "rTMOSFilePath" : "pslanguageres/Auto286"
+          },
+          "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/ReginfoEditView.json

@@ -1109,6 +1109,23 @@
       "id" : "FORM"
     },
     "getPSDEFormItemVRs" : [ {
+      "checkMode" : 3,
+      "name" : "表单项值规则",
+      "getPSDEFormItemName" : "Name",
+      "getPSSysValueRule" : {
+        "codeName" : "ValueRule14",
+        "dynaModelFilePath" : "PSSYSVALUERULES/ValueRule14.json",
+        "mOSFilePath" : "pssysvaluerules/ValueRule14",
+        "name" : "由26个英文字母组成的字符串",
+        "rTMOSFilePath" : "pssysvaluerules/ValueRule14",
+        "regExCode" : "[A-Za-z]+",
+        "ruleInfo" : "内容必须为26个英文字母组成的字符串",
+        "ruleType" : "REG",
+        "enableBackend" : true,
+        "enableFront" : true
+      },
+      "valueRuleType" : "SYSVALUERULE"
+    }, {
       "checkMode" : 3,
       "name" : "表单项值规则",
       "getPSDEFValueRule" : {
@@ -1140,23 +1157,6 @@
       },
       "getPSDEFormItemName" : "StuNo",
       "valueRuleType" : "DEFVALUERULE"
-    }, {
-      "checkMode" : 3,
-      "name" : "表单项值规则",
-      "getPSDEFormItemName" : "Name",
-      "getPSSysValueRule" : {
-        "codeName" : "ValueRule14",
-        "dynaModelFilePath" : "PSSYSVALUERULES/ValueRule14.json",
-        "mOSFilePath" : "pssysvaluerules/ValueRule14",
-        "name" : "由26个英文字母组成的字符串",
-        "rTMOSFilePath" : "pssysvaluerules/ValueRule14",
-        "regExCode" : "[A-Za-z]+",
-        "ruleInfo" : "内容必须为26个英文字母组成的字符串",
-        "ruleType" : "REG",
-        "enableBackend" : true,
-        "enableFront" : true
-      },
-      "valueRuleType" : "SYSVALUERULE"
     } ],
     "getPSDEFormItems" : [ {
       "id" : "srfupdatedate",

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

@@ -375,35 +375,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" : {
@@ -611,40 +611,6 @@
       "getPSDEUIActionGroup" : {
         "name" : "界面行为组",
         "getPSUIActionGroupDetails" : [ {
-          "detailType" : "DEUIACTION",
-          "name" : "u4c6267d",
-          "getPSUIAction" : {
-            "actionTarget" : "MULTIKEY",
-            "getCapPSLanguageRes" : {
-              "lanResTag" : "TBB.TEXT.*.REMOVE",
-              "mOSFilePath" : "pslanguageres/Auto159",
-              "rTMOSFilePath" : "pslanguageres/Auto159"
-            },
-            "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" : {
-              "lanResTag" : "TBB.TOOLTIP.*.REMOVE",
-              "mOSFilePath" : "pslanguageres/Auto286",
-              "rTMOSFilePath" : "pslanguageres/Auto286"
-            },
-            "uIActionMode" : "SYS",
-            "uIActionTag" : "Remove",
-            "uIActionType" : "DEUIACTION"
-          },
-          "addSeparator" : true,
-          "showCaption" : false,
-          "showIcon" : true
-        }, {
           "detailType" : "DEUIACTION",
           "name" : "u1feafb4",
           "getPSUIAction" : {
@@ -678,6 +644,40 @@
           "addSeparator" : true,
           "showCaption" : true,
           "showIcon" : false
+        }, {
+          "detailType" : "DEUIACTION",
+          "name" : "u4c6267d",
+          "getPSUIAction" : {
+            "actionTarget" : "MULTIKEY",
+            "getCapPSLanguageRes" : {
+              "lanResTag" : "TBB.TEXT.*.REMOVE",
+              "mOSFilePath" : "pslanguageres/Auto159",
+              "rTMOSFilePath" : "pslanguageres/Auto159"
+            },
+            "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" : {
+              "lanResTag" : "TBB.TOOLTIP.*.REMOVE",
+              "mOSFilePath" : "pslanguageres/Auto286",
+              "rTMOSFilePath" : "pslanguageres/Auto286"
+            },
+            "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/PSAPPDEVIEWS/studentCalendarView.json

+{
+  "accUserMode" : 2,
+  "caption" : "学生",
+  "codeName" : "studentCalendarView",
+  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDEVIEWS/studentCalendarView.json",
+  "mDCtrlActiveMode" : 2,
+  "mOSFilePath" : "pssysapps/Web/psappdeviews/studentCalendarView",
+  "name" : "studentCalendarView",
+  "getPSAppDataEntity" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Student.json"
+  },
+  "getPSAppModule" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPMODULES/common.json"
+  },
+  "getPSAppViewLogics" : [ {
+    "logicTrigger" : "CUSTOM",
+    "logicType" : "SYSUILOGIC",
+    "name" : "newdata",
+    "getPSAppUILogic" : {
+      "actionAfterWizard" : "DEFAULT",
+      "logicType" : "PREDEFINED",
+      "name" : "新建数据",
+      "viewLogicType" : "APP_NEWDATA",
+      "batchAddOnly" : false,
+      "enableBatchAdd" : false,
+      "enableWizardAdd" : false
+    }
+  }, {
+    "logicTrigger" : "CUSTOM",
+    "logicType" : "SYSUILOGIC",
+    "name" : "opendata",
+    "getPSAppUILogic" : {
+      "logicType" : "PREDEFINED",
+      "name" : "打开数据",
+      "viewLogicType" : "APP_OPENDATA",
+      "editMode" : true
+    }
+  } ],
+  "getPSControls" : [ {
+    "codeName" : "Calendar",
+    "controlType" : "CALENDAR",
+    "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Student/PSCALENDARS/Calendar.json",
+    "groupMode" : "NONE",
+    "legendPos" : "NONE",
+    "mOSFilePath" : "psmodules/common/psdataentities/STUDENT/pssyscalendars/Calendar",
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Student.json"
+    },
+    "getPSControlHandler" : {
+      "enableDEFieldPrivilege" : false,
+      "id" : "calendar"
+    },
+    "getPSControlParam" : {
+      "autoLoad" : true,
+      "showBusyIndicator" : true,
+      "id" : "CALENDAR"
+    },
+    "rTMOSFilePath" : "pssysapps/Web/psappdeviews/studentCalendarView/psappviewctrls/calendar",
+    "enableGroup" : false,
+    "name" : "calendar",
+    "modelid" : "2c472a3ac1d816a3b2be7b257c7299e1_calendar",
+    "modeltype" : "PSSYSCALENDAR"
+  } ],
+  "getPSDEViewCodeName" : "CalendarView",
+  "getPSDEViewId" : "5DDAA64E-AD93-4245-9FE3-E092BF5A897C",
+  "getPSViewLayoutPanel" : {
+    "codeName" : "Layoutpanel",
+    "controlStyle" : "APPDECALENDARVIEW",
+    "controlType" : "VIEWLAYOUTPANEL",
+    "mOSFilePath" : "psmodules/common/psdataentities/STUDENT/pssysviewlayoutpanels/Layoutpanel",
+    "name" : "layoutpanel",
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Student.json"
+    },
+    "getPSControlParam" : { },
+    "rTMOSFilePath" : "pssysapps/Web/psappdeviews/studentCalendarView/psappviewctrls/layoutpanel",
+    "layoutBodyOnly" : true,
+    "layoutPanel" : true,
+    "useDefaultLayout" : true
+  },
+  "rTMOSFilePath" : "pssysapps/Web/psappdeviews/studentCalendarView",
+  "refFlag" : false,
+  "title" : "学生日历视图",
+  "viewStyle" : "DEFAULT",
+  "viewType" : "DECALENDARVIEW",
+  "xDataControlName" : "calendar",
+  "enableDP" : true,
+  "enableFilter" : false,
+  "modelid" : "2c472a3ac1d816a3b2be7b257c7299e1",
+  "modeltype" : "PSAPPDEVIEW"
+}
\ No newline at end of file

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

@@ -714,6 +714,28 @@
         "layout" : "TABLE_24COL"
       },
       "tooltip" : "分页导航"
+    }, {
+      "accUserMode" : 2,
+      "caption" : "学生信息图表视图",
+      "itemType" : "MENUITEM",
+      "name" : "menuitem33",
+      "getPSAppFunc" : {
+        "modelref" : true,
+        "id" : "AppFunc35"
+      },
+      "getPSLayout" : {
+        "childColLG" : -1,
+        "childColMD" : 24,
+        "childColSM" : -1,
+        "childColXS" : -1,
+        "columnCount" : 24,
+        "layout" : "TABLE_24COL"
+      },
+      "getPSLayoutPos" : {
+        "colMD" : 24,
+        "layout" : "TABLE_24COL"
+      },
+      "tooltip" : "学生信息图表视图"
     } ],
     "getPSControlHandler" : {
       "enableDEFieldPrivilege" : false,

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

@@ -317,6 +317,16 @@
       "id" : "AppFunc34"
     },
     "tooltip" : "分页导航"
+  }, {
+    "accUserMode" : 2,
+    "caption" : "学生信息图表视图",
+    "itemType" : "MENUITEM",
+    "name" : "menuitem33",
+    "getPSAppFunc" : {
+      "modelref" : true,
+      "id" : "AppFunc35"
+    },
+    "tooltip" : "学生信息图表视图"
   } ],
   "rTMOSFilePath" : "pssysapps/Web/psappmenus/AppIndex",
   "enableCustomize" : false,

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

@@ -221,35 +221,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"
           } ],
           "getPSControlHandler" : {
@@ -374,40 +374,6 @@
             "getPSDEUIActionGroup" : {
               "name" : "界面行为组",
               "getPSUIActionGroupDetails" : [ {
-                "detailType" : "DEUIACTION",
-                "name" : "u4c6267d",
-                "getPSUIAction" : {
-                  "actionTarget" : "MULTIKEY",
-                  "getCapPSLanguageRes" : {
-                    "lanResTag" : "TBB.TEXT.*.REMOVE",
-                    "mOSFilePath" : "pslanguageres/Auto159",
-                    "rTMOSFilePath" : "pslanguageres/Auto159"
-                  },
-                  "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" : {
-                    "lanResTag" : "TBB.TOOLTIP.*.REMOVE",
-                    "mOSFilePath" : "pslanguageres/Auto286",
-                    "rTMOSFilePath" : "pslanguageres/Auto286"
-                  },
-                  "uIActionMode" : "SYS",
-                  "uIActionTag" : "Remove",
-                  "uIActionType" : "DEUIACTION"
-                },
-                "addSeparator" : true,
-                "showCaption" : false,
-                "showIcon" : true
-              }, {
                 "detailType" : "DEUIACTION",
                 "name" : "u1feafb4",
                 "getPSUIAction" : {
@@ -441,6 +407,40 @@
                 "addSeparator" : true,
                 "showCaption" : true,
                 "showIcon" : false
+              }, {
+                "detailType" : "DEUIACTION",
+                "name" : "u4c6267d",
+                "getPSUIAction" : {
+                  "actionTarget" : "MULTIKEY",
+                  "getCapPSLanguageRes" : {
+                    "lanResTag" : "TBB.TEXT.*.REMOVE",
+                    "mOSFilePath" : "pslanguageres/Auto159",
+                    "rTMOSFilePath" : "pslanguageres/Auto159"
+                  },
+                  "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" : {
+                    "lanResTag" : "TBB.TOOLTIP.*.REMOVE",
+                    "mOSFilePath" : "pslanguageres/Auto286",
+                    "rTMOSFilePath" : "pslanguageres/Auto286"
+                  },
+                  "uIActionMode" : "SYS",
+                  "uIActionTag" : "Remove",
+                  "uIActionType" : "DEUIACTION"
+                },
+                "addSeparator" : true,
+                "showCaption" : false,
+                "showIcon" : true
               } ]
             },
             "width" : 150,
@@ -3718,35 +3718,35 @@
       "getPSAppViewLogics" : [ {
         "logicTrigger" : "CUSTOM",
         "logicType" : "APPVIEWUIACTION",
-        "name" : "db_sysportlet4_u4c6267d_click",
+        "name" : "db_sysportlet4_u1feafb4_click",
         "getPSAppViewUIAction" : {
           "modelref" : true,
-          "id" : "表格界面_删除操作"
+          "id" : "表格界面_编辑操作"
         }
       }, {
         "logicTrigger" : "CUSTOM",
         "logicType" : "APPVIEWUIACTION",
-        "name" : "db_sysportlet4_u1feafb4_click",
+        "name" : "db_sysportlet4_u4c6267d_click",
         "getPSAppViewUIAction" : {
           "modelref" : true,
-          "id" : "表格界面_编辑操作"
+          "id" : "表格界面_删除操作"
         }
       } ],
       "getPSAppViewUIActions" : [ {
-        "name" : "表格界面_删除操作",
+        "name" : "表格界面_编辑操作",
         "getPSUIAction" : {
           "modelref" : true,
-          "id" : "Remove"
+          "id" : "Edit"
         },
-        "uIActionTarget" : "MULTIKEY",
+        "uIActionTarget" : "SINGLEKEY",
         "xDataControlName" : "db_sysportlet4"
       }, {
-        "name" : "表格界面_编辑操作",
+        "name" : "表格界面_删除操作",
         "getPSUIAction" : {
           "modelref" : true,
-          "id" : "Edit"
+          "id" : "Remove"
         },
-        "uIActionTarget" : "SINGLEKEY",
+        "uIActionTarget" : "MULTIKEY",
         "xDataControlName" : "db_sysportlet4"
       } ],
       "getPSControlHandler" : {
@@ -3764,40 +3764,6 @@
       "getPSUIActionGroup" : {
         "name" : "界面行为组",
         "getPSUIActionGroupDetails" : [ {
-          "detailType" : "DEUIACTION",
-          "name" : "u4c6267d",
-          "getPSUIAction" : {
-            "actionTarget" : "MULTIKEY",
-            "getCapPSLanguageRes" : {
-              "lanResTag" : "TBB.TEXT.*.REMOVE",
-              "mOSFilePath" : "pslanguageres/Auto159",
-              "rTMOSFilePath" : "pslanguageres/Auto159"
-            },
-            "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" : {
-              "lanResTag" : "TBB.TOOLTIP.*.REMOVE",
-              "mOSFilePath" : "pslanguageres/Auto286",
-              "rTMOSFilePath" : "pslanguageres/Auto286"
-            },
-            "uIActionMode" : "SYS",
-            "uIActionTag" : "Remove",
-            "uIActionType" : "DEUIACTION"
-          },
-          "addSeparator" : true,
-          "showCaption" : false,
-          "showIcon" : true
-        }, {
           "detailType" : "DEUIACTION",
           "name" : "u1feafb4",
           "getPSUIAction" : {
@@ -3831,6 +3797,40 @@
           "addSeparator" : true,
           "showCaption" : true,
           "showIcon" : false
+        }, {
+          "detailType" : "DEUIACTION",
+          "name" : "u4c6267d",
+          "getPSUIAction" : {
+            "actionTarget" : "MULTIKEY",
+            "getCapPSLanguageRes" : {
+              "lanResTag" : "TBB.TEXT.*.REMOVE",
+              "mOSFilePath" : "pslanguageres/Auto159",
+              "rTMOSFilePath" : "pslanguageres/Auto159"
+            },
+            "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" : {
+              "lanResTag" : "TBB.TOOLTIP.*.REMOVE",
+              "mOSFilePath" : "pslanguageres/Auto286",
+              "rTMOSFilePath" : "pslanguageres/Auto286"
+            },
+            "uIActionMode" : "SYS",
+            "uIActionTag" : "Remove",
+            "uIActionType" : "DEUIACTION"
+          },
+          "addSeparator" : true,
+          "showCaption" : false,
+          "showIcon" : true
         } ]
       },
       "portletType" : "ACTIONBAR",