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

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

@@ -194,7 +194,7 @@
     </changeSet>
 
     <!--输出实体[REGINFO]数据结构 -->
-    <changeSet author="root" id="tab-reginfo-69-8">
+    <changeSet author="root" id="tab-reginfo-71-8">
         <createTable tableName="T_REGINFO">
                 <column name="UPDATEDATE" remarks="" type="DATETIME">
                 </column>
@@ -264,7 +264,7 @@
     </changeSet>
 
     <!--输出实体[STUDENT]数据结构 -->
-    <changeSet author="root" id="tab-student-34-10">
+    <changeSet author="root" id="tab-student-37-10">
         <createTable tableName="T_STUDENT">
                 <column name="CREATEMAN" remarks="" type="VARCHAR(60)">
                 </column>
@@ -303,7 +303,7 @@
     </changeSet>
 
     <!--输出实体[REGINFO]外键关系 -->
-    <changeSet author="root" id="fk-reginfo-69-12">
+    <changeSet author="root" id="fk-reginfo-71-12">
        <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/PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSFORMS/Main.json

@@ -152,6 +152,17 @@
   }, {
     "id" : "name",
     "dataType" : 25
+  }, {
+    "id" : "formitem",
+    "dataType" : 25
+  }, {
+    "id" : "studentid",
+    "hidden" : true,
+    "dataType" : 25,
+    "getPSAppDEField" : {
+      "name" : "STUDENTID",
+      "codeName" : "StudentId"
+    }
   }, {
     "id" : "age",
     "dataType" : 25
@@ -364,6 +375,71 @@
       },
       "allowEmpty" : false,
       "showCaption" : true
+    }, {
+      "caption" : "学生",
+      "codeName" : "formitem",
+      "dataType" : 25,
+      "detailStyle" : "DEFAULT",
+      "detailType" : "FORMITEM",
+      "enableCond" : 3,
+      "ignoreInput" : 0,
+      "labelPos" : "LEFT",
+      "labelWidth" : 130,
+      "name" : "formitem",
+      "noPrivDisplayMode" : 1,
+      "getPSEditor" : {
+        "editorParams" : {
+          "AC" : "TRUE",
+          "PICKUPVIEW" : "TRUE"
+        },
+        "editorType" : "PICKER",
+        "name" : "formitem",
+        "getPickupPSAppView" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/studentPickupView.json",
+          "viewType" : "DEPICKUPVIEW"
+        },
+        "valueItemName" : "studentid",
+        "enableAC" : true,
+        "enablePickupView" : true,
+        "forceSelection" : true,
+        "showTrigger" : true,
+        "singleSelect" : true
+      },
+      "getPSLayoutPos" : {
+        "colMD" : 24,
+        "layout" : "TABLE_24COL"
+      },
+      "valueItemName" : "studentid",
+      "allowEmpty" : true,
+      "showCaption" : true
+    }, {
+      "caption" : "学生标识",
+      "codeName" : "studentid",
+      "dataType" : 25,
+      "detailStyle" : "DEFAULT",
+      "detailType" : "FORMITEM",
+      "enableCond" : 3,
+      "ignoreInput" : 0,
+      "labelPos" : "LEFT",
+      "labelWidth" : 130,
+      "name" : "studentid",
+      "noPrivDisplayMode" : 1,
+      "getPSAppDEField" : {
+        "name" : "STUDENTID",
+        "codeName" : "StudentId"
+      },
+      "getPSEditor" : {
+        "editorType" : "HIDDEN",
+        "name" : "studentid"
+      },
+      "getPSLayoutPos" : {
+        "colMD" : 24,
+        "layout" : "TABLE_24COL"
+      },
+      "allowEmpty" : true,
+      "hidden" : true,
+      "showCaption" : true
     }, {
       "caption" : "年龄",
       "codeName" : "age",

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

@@ -3,62 +3,20 @@
   "codeName" : "Main",
   "columnEnableLink" : 2,
   "controlType" : "GRID",
-  "getCreatePSControlAction" : {
-    "actionName" : "Create",
-    "actionType" : "DEACTION",
-    "dataAccessAction" : "CREATE",
-    "name" : "create",
-    "getPSAppDEMethod" : {
-      "modelref" : true,
-      "id" : "Create"
-    },
-    "getPSAppDataEntity" : {
-      "modelref" : true,
-      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Student.json"
-    }
-  },
   "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Student/PSGRIDS/Main.json",
   "getFetchPSControlAction" : {
     "modelref" : true,
     "id" : "fetch"
   },
-  "getGetDraftPSControlAction" : {
-    "actionName" : "GetDraft",
-    "actionType" : "DEACTION",
-    "dataAccessAction" : "CREATE",
-    "name" : "loaddraft",
-    "getPSAppDEMethod" : {
-      "modelref" : true,
-      "id" : "GetDraft"
-    },
-    "getPSAppDataEntity" : {
-      "modelref" : true,
-      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Student.json"
-    }
-  },
-  "getGetPSControlAction" : {
-    "actionName" : "Get",
-    "actionType" : "DEACTION",
-    "dataAccessAction" : "READ",
-    "name" : "load",
-    "getPSAppDEMethod" : {
-      "modelref" : true,
-      "id" : "Get"
-    },
-    "getPSAppDataEntity" : {
-      "modelref" : true,
-      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Student.json"
-    }
-  },
   "groupMode" : "NONE",
-  "hookEventNames" : [ "ROWDBLCLICK", "SELECTIONCHANGE", "REMOVE", "LOAD", "BEFORELOAD" ],
+  "hookEventNames" : [ "ROWDBLCLICK", "SELECTIONCHANGE", "LOAD", "BEFORELOAD" ],
   "logicName" : "主表格",
   "getPSAppDataEntity" : {
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Student.json"
   },
   "getPSControlLogics" : [ {
-    "eventNames" : "ROWDBLCLICK;SELECTIONCHANGE;REMOVE;LOAD;BEFORELOAD",
+    "eventNames" : "ROWDBLCLICK;SELECTIONCHANGE;LOAD;BEFORELOAD",
     "logicTag" : "grid",
     "logicType" : "APPVIEWENGINE",
     "name" : "engine_grid",
@@ -88,16 +46,16 @@
   }, {
     "align" : "LEFT",
     "cLConvertMode" : "NONE",
-    "caption" : "姓名",
+    "caption" : "学生名称",
     "codeName" : "name",
     "columnType" : "DEFGRIDCOLUMN",
-    "dataItemName" : "name",
-    "excelCaption" : "姓名",
+    "dataItemName" : "studentname",
+    "excelCaption" : "学生名称",
     "name" : "name",
     "noPrivDisplayMode" : 1,
     "getPSAppDEField" : {
-      "name" : "NAME",
-      "codeName" : "Name"
+      "name" : "STUDENTNAME",
+      "codeName" : "StudentName"
     },
     "width" : 100,
     "widthUnit" : "PX",
@@ -163,10 +121,10 @@
     }
   }, {
     "dataType" : 25,
-    "name" : "name",
+    "name" : "studentname",
     "getPSAppDEField" : {
-      "name" : "NAME",
-      "codeName" : "Name"
+      "name" : "STUDENTNAME",
+      "codeName" : "StudentName"
     }
   }, {
     "dataType" : 9,
@@ -260,28 +218,14 @@
     }
   },
   "sortMode" : "REMOTE",
-  "getUpdatePSControlAction" : {
-    "actionName" : "Update",
-    "actionType" : "DEACTION",
-    "dataAccessAction" : "UPDATE",
-    "name" : "update",
-    "getPSAppDEMethod" : {
-      "modelref" : true,
-      "id" : "Update"
-    },
-    "getPSAppDataEntity" : {
-      "modelref" : true,
-      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Student.json"
-    }
-  },
   "hasWFDataItems" : false,
   "enableColFilter" : false,
   "enableCustomized" : true,
   "enableGroup" : false,
   "enablePagingBar" : true,
-  "enableRowEdit" : true,
+  "enableRowEdit" : false,
   "enableRowEditOrder" : false,
-  "enableRowNew" : true,
+  "enableRowNew" : false,
   "forceFit" : false,
   "hideHeader" : false,
   "noSort" : false,

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

@@ -1138,6 +1138,17 @@
     }, {
       "id" : "name",
       "dataType" : 25
+    }, {
+      "id" : "formitem",
+      "dataType" : 25
+    }, {
+      "id" : "studentid",
+      "hidden" : true,
+      "dataType" : 25,
+      "getPSAppDEField" : {
+        "name" : "STUDENTID",
+        "codeName" : "StudentId"
+      }
     }, {
       "id" : "age",
       "dataType" : 25
@@ -1350,6 +1361,71 @@
         },
         "allowEmpty" : false,
         "showCaption" : true
+      }, {
+        "caption" : "学生",
+        "codeName" : "formitem",
+        "dataType" : 25,
+        "detailStyle" : "DEFAULT",
+        "detailType" : "FORMITEM",
+        "enableCond" : 3,
+        "ignoreInput" : 0,
+        "labelPos" : "LEFT",
+        "labelWidth" : 130,
+        "name" : "formitem",
+        "noPrivDisplayMode" : 1,
+        "getPSEditor" : {
+          "editorParams" : {
+            "AC" : "TRUE",
+            "PICKUPVIEW" : "TRUE"
+          },
+          "editorType" : "PICKER",
+          "name" : "formitem",
+          "getPickupPSAppView" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/studentPickupView.json",
+            "viewType" : "DEPICKUPVIEW"
+          },
+          "valueItemName" : "studentid",
+          "enableAC" : true,
+          "enablePickupView" : true,
+          "forceSelection" : true,
+          "showTrigger" : true,
+          "singleSelect" : true
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "valueItemName" : "studentid",
+        "allowEmpty" : true,
+        "showCaption" : true
+      }, {
+        "caption" : "学生标识",
+        "codeName" : "studentid",
+        "dataType" : 25,
+        "detailStyle" : "DEFAULT",
+        "detailType" : "FORMITEM",
+        "enableCond" : 3,
+        "ignoreInput" : 0,
+        "labelPos" : "LEFT",
+        "labelWidth" : 130,
+        "name" : "studentid",
+        "noPrivDisplayMode" : 1,
+        "getPSAppDEField" : {
+          "name" : "STUDENTID",
+          "codeName" : "StudentId"
+        },
+        "getPSEditor" : {
+          "editorType" : "HIDDEN",
+          "name" : "studentid"
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "allowEmpty" : true,
+        "hidden" : true,
+        "showCaption" : true
       }, {
         "caption" : "年龄",
         "codeName" : "age",

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

@@ -517,16 +517,16 @@
     }, {
       "align" : "LEFT",
       "cLConvertMode" : "NONE",
-      "caption" : "姓名",
+      "caption" : "学生名称",
       "codeName" : "name",
       "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "name",
-      "excelCaption" : "姓名",
+      "dataItemName" : "studentname",
+      "excelCaption" : "学生名称",
       "name" : "name",
       "noPrivDisplayMode" : 1,
       "getPSAppDEField" : {
-        "name" : "NAME",
-        "codeName" : "Name"
+        "name" : "STUDENTNAME",
+        "codeName" : "StudentName"
       },
       "width" : 100,
       "widthUnit" : "PX",
@@ -592,10 +592,10 @@
       }
     }, {
       "dataType" : 25,
-      "name" : "name",
+      "name" : "studentname",
       "getPSAppDEField" : {
-        "name" : "NAME",
-        "codeName" : "Name"
+        "name" : "STUDENTNAME",
+        "codeName" : "StudentName"
       }
     }, {
       "dataType" : 9,

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

@@ -976,6 +976,12 @@
     "controlType" : "APPMENU"
   } ],
   "getAllPSAppViews" : [ {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/studentPickupView.json",
+    "viewType" : "DEPICKUPVIEW",
+    "resource" : "Student",
+    "view" : "PickupView"
+  }, {
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookBookEditViewEditorTest.json",
     "viewType" : "DEEDITVIEW",
@@ -1188,6 +1194,12 @@
     "viewType" : "DEGRIDVIEW",
     "resource" : "BXDMX",
     "view" : "GridView"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/studentPickupGridView.json",
+    "viewType" : "DEPICKUPGRIDVIEW",
+    "resource" : "Student",
+    "view" : "PickupGridView"
   }, {
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoGridView.json",
@@ -11080,16 +11092,16 @@
         }, {
           "align" : "LEFT",
           "cLConvertMode" : "NONE",
-          "caption" : "姓名",
+          "caption" : "学生名称",
           "codeName" : "name",
           "columnType" : "DEFGRIDCOLUMN",
-          "dataItemName" : "name",
-          "excelCaption" : "姓名",
+          "dataItemName" : "studentname",
+          "excelCaption" : "学生名称",
           "name" : "name",
           "noPrivDisplayMode" : 1,
           "getPSAppDEField" : {
-            "name" : "NAME",
-            "codeName" : "Name"
+            "name" : "STUDENTNAME",
+            "codeName" : "StudentName"
           },
           "width" : 100,
           "widthUnit" : "PX",
@@ -11155,10 +11167,10 @@
           }
         }, {
           "dataType" : 25,
-          "name" : "name",
+          "name" : "studentname",
           "getPSAppDEField" : {
-            "name" : "NAME",
-            "codeName" : "Name"
+            "name" : "STUDENTNAME",
+            "codeName" : "StudentName"
           }
         }, {
           "dataType" : 9,