fangzhihao 部署微服务接口 [TrainSys，默认服务接口]

config.xml

@@ -55,15 +55,14 @@
 	  git clone -b master $para2 trainsys/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd trainsys/
-      mkdir -p /var/lib/jenkins/appcache/A3064A91-F42D-4D7F-BC1C-4173A4F5772C
-      if [ -e app_Web/.dynamic ]
-      then
-          cd app_Web
-      else
-          cd app_Web/app
-      fi
-      sed -i "s#dstimage#registry.cn-shanghai.aliyuncs.com/ibizsys/ibizcloud-standardsys-app-webapp:2022.07.29.003#g" swarm.yaml
-      docker -H $para1 stack deploy --compose-file=swarm.yaml ebsx --with-registry-auth    
+      mvn clean package -Ptrainsys
+      mvn install -Ptrainsys
+      cd trainsys-provider
+      sed -i "s#dstimage#$para5#g" pom.xml 
+      sed -i "s#dstimage#$para5#g" src/main/docker/trainsys-provider-trainsys.yaml 
+      mvn -Ptrainsys docker:build
+      mvn -Ptrainsys docker:push
+      docker -H $para1 stack deploy --compose-file=src/main/docker/trainsys-provider-trainsys.yaml ebsx --with-registry-auth      
       </command>
     </hudson.tasks.Shell>
   </builders>

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

@@ -156,25 +156,6 @@
         </createTable>
     </changeSet>
 
-    <!--输出实体[RAWMATERIAL]数据结构 -->
-    <changeSet author="root" id="tab-rawmaterial-25-6">
-        <createTable tableName="T_RAWMATERIAL">
-                <column name="RAWMATERIALID" remarks="" type="VARCHAR(100)">
-                    <constraints primaryKey="true" primaryKeyName="PK_RAWMATERIAL"/>
-                </column>
-                <column name="CREATEDATE" remarks="" type="DATETIME">
-                </column>
-                <column name="RAWMATERIALNAME" remarks="" type="VARCHAR(200)">
-                </column>
-                <column name="CREATEMAN" remarks="" type="VARCHAR(60)">
-                </column>
-                <column name="UPDATEDATE" remarks="" type="DATETIME">
-                </column>
-                <column name="UPDATEMAN" remarks="" type="VARCHAR(60)">
-                </column>
-        </createTable>
-    </changeSet>
-
     <!--输出实体[REGINFO]数据结构 -->
     <changeSet author="root" id="tab-reginfo-36-7">
         <createTable tableName="T_REGINFO">

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

@@ -174,14 +174,6 @@
     },
     "builtinAction" : true
   } ],
-  "getAllPSDEDBConfigs" : [ {
-    "dBType" : "MYSQL5",
-    "name" : "MYSQL5",
-    "objNameCase" : "DEFAULT",
-    "standardTableName" : "`T_RAWMATERIAL`",
-    "tableName" : "T_RAWMATERIAL",
-    "valid" : true
-  } ],
   "getAllPSDEDBTables" : [ {
     "getAllPSDEFields" : [ {
       "name" : "RAWMATERIALID",

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

@@ -3,11 +3,53 @@
   "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/Reginfof.json"
+    }
+  },
   "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfof/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/Reginfof.json"
+    }
+  },
+  "getGetPSControlAction" : {
+    "actionName" : "Get",
+    "actionType" : "DEACTION",
+    "dataAccessAction" : "READ",
+    "name" : "load",
+    "getPSAppDEMethod" : {
+      "modelref" : true,
+      "id" : "Get"
+    },
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfof.json"
+    }
+  },
   "groupMode" : "NONE",
   "hookEventNames" : [ "ROWDBLCLICK", "SELECTIONCHANGE", "REMOVE", "LOAD", "BEFORELOAD" ],
   "logicName" : "主表格",
@@ -286,14 +328,28 @@
     }
   },
   "sortMode" : "REMOTE",
+  "getUpdatePSControlAction" : {
+    "actionName" : "Update",
+    "actionType" : "DEACTION",
+    "dataAccessAction" : "UPDATE",
+    "name" : "update",
+    "getPSAppDEMethod" : {
+      "modelref" : true,
+      "id" : "Update"
+    },
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfof.json"
+    }
+  },
   "hasWFDataItems" : false,
   "enableColFilter" : false,
   "enableCustomized" : true,
   "enableGroup" : false,
   "enablePagingBar" : true,
-  "enableRowEdit" : false,
+  "enableRowEdit" : true,
   "enableRowEditOrder" : false,
-  "enableRowNew" : false,
+  "enableRowNew" : true,
   "forceFit" : false,
   "hideHeader" : false,
   "noSort" : false,

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

@@ -32,6 +32,149 @@
     } ]
   } ],
   "getPSAppViewLogics" : [ {
+    "eventArg" : "tbitem3",
+    "eventNames" : "CLICK",
+    "logicTrigger" : "CTRLEVENT",
+    "logicType" : "APPVIEWUIACTION",
+    "name" : "toolbar_tbitem3_click",
+    "getPSAppViewUIAction" : {
+      "modelref" : true,
+      "id" : "toolbar_tbitem3"
+    },
+    "getPSViewCtrlName" : "toolbar"
+  }, {
+    "eventArg" : "tbitem4",
+    "eventNames" : "CLICK",
+    "logicTrigger" : "CTRLEVENT",
+    "logicType" : "APPVIEWUIACTION",
+    "name" : "toolbar_tbitem4_click",
+    "getPSAppViewUIAction" : {
+      "modelref" : true,
+      "id" : "toolbar_tbitem4"
+    },
+    "getPSViewCtrlName" : "toolbar"
+  }, {
+    "eventArg" : "tbitem5",
+    "eventNames" : "CLICK",
+    "logicTrigger" : "CTRLEVENT",
+    "logicType" : "APPVIEWUIACTION",
+    "name" : "toolbar_tbitem5_click",
+    "getPSAppViewUIAction" : {
+      "modelref" : true,
+      "id" : "toolbar_tbitem5"
+    },
+    "getPSViewCtrlName" : "toolbar"
+  }, {
+    "eventArg" : "tbitem6",
+    "eventNames" : "CLICK",
+    "logicTrigger" : "CTRLEVENT",
+    "logicType" : "APPVIEWUIACTION",
+    "name" : "toolbar_tbitem6_click",
+    "getPSAppViewUIAction" : {
+      "modelref" : true,
+      "id" : "toolbar_tbitem6"
+    },
+    "getPSViewCtrlName" : "toolbar"
+  }, {
+    "eventArg" : "tbitem24",
+    "eventNames" : "CLICK",
+    "logicTrigger" : "CTRLEVENT",
+    "logicType" : "APPVIEWUIACTION",
+    "name" : "toolbar_tbitem24_click",
+    "getPSAppViewUIAction" : {
+      "modelref" : true,
+      "id" : "toolbar_tbitem24"
+    },
+    "getPSViewCtrlName" : "toolbar"
+  }, {
+    "eventArg" : "tbitem25",
+    "eventNames" : "CLICK",
+    "logicTrigger" : "CTRLEVENT",
+    "logicType" : "APPVIEWUIACTION",
+    "name" : "toolbar_tbitem25_click",
+    "getPSAppViewUIAction" : {
+      "modelref" : true,
+      "id" : "toolbar_tbitem25"
+    },
+    "getPSViewCtrlName" : "toolbar"
+  }, {
+    "eventArg" : "tbitem8",
+    "eventNames" : "CLICK",
+    "logicTrigger" : "CTRLEVENT",
+    "logicType" : "APPVIEWUIACTION",
+    "name" : "toolbar_tbitem8_click",
+    "getPSAppViewUIAction" : {
+      "modelref" : true,
+      "id" : "toolbar_tbitem8"
+    },
+    "getPSViewCtrlName" : "toolbar"
+  }, {
+    "eventArg" : "tbitem13",
+    "eventNames" : "CLICK",
+    "logicTrigger" : "CTRLEVENT",
+    "logicType" : "APPVIEWUIACTION",
+    "name" : "toolbar_tbitem13_click",
+    "getPSAppViewUIAction" : {
+      "modelref" : true,
+      "id" : "toolbar_tbitem13"
+    },
+    "getPSViewCtrlName" : "toolbar"
+  }, {
+    "eventArg" : "tbitem11",
+    "eventNames" : "CLICK",
+    "logicTrigger" : "CTRLEVENT",
+    "logicType" : "APPVIEWUIACTION",
+    "name" : "toolbar_tbitem11_click",
+    "getPSAppViewUIAction" : {
+      "modelref" : true,
+      "id" : "toolbar_tbitem11"
+    },
+    "getPSViewCtrlName" : "toolbar"
+  }, {
+    "eventArg" : "tbitem21",
+    "eventNames" : "CLICK",
+    "logicTrigger" : "CTRLEVENT",
+    "logicType" : "APPVIEWUIACTION",
+    "name" : "toolbar_tbitem21_click",
+    "getPSAppViewUIAction" : {
+      "modelref" : true,
+      "id" : "toolbar_tbitem21"
+    },
+    "getPSViewCtrlName" : "toolbar"
+  }, {
+    "eventArg" : "tbitem23",
+    "eventNames" : "CLICK",
+    "logicTrigger" : "CTRLEVENT",
+    "logicType" : "APPVIEWUIACTION",
+    "name" : "toolbar_tbitem23_click",
+    "getPSAppViewUIAction" : {
+      "modelref" : true,
+      "id" : "toolbar_tbitem23"
+    },
+    "getPSViewCtrlName" : "toolbar"
+  }, {
+    "eventArg" : "tbitem19",
+    "eventNames" : "CLICK",
+    "logicTrigger" : "CTRLEVENT",
+    "logicType" : "APPVIEWUIACTION",
+    "name" : "toolbar_tbitem19_click",
+    "getPSAppViewUIAction" : {
+      "modelref" : true,
+      "id" : "toolbar_tbitem19"
+    },
+    "getPSViewCtrlName" : "toolbar"
+  }, {
+    "eventArg" : "tbitem18",
+    "eventNames" : "CLICK",
+    "logicTrigger" : "CTRLEVENT",
+    "logicType" : "APPVIEWUIACTION",
+    "name" : "toolbar_tbitem18_click",
+    "getPSAppViewUIAction" : {
+      "modelref" : true,
+      "id" : "toolbar_tbitem18"
+    },
+    "getPSViewCtrlName" : "toolbar"
+  }, {
     "logicTrigger" : "CUSTOM",
     "logicType" : "SYSUILOGIC",
     "name" : "newdata",
@@ -100,16 +243,155 @@
       "viewType" : "DEEDITVIEW"
     }
   } ],
+  "getPSAppViewUIActions" : [ {
+    "name" : "toolbar_tbitem3",
+    "getPSUIAction" : {
+      "modelref" : true,
+      "id" : "New"
+    },
+    "xDataControlName" : "grid"
+  }, {
+    "name" : "toolbar_tbitem4",
+    "getPSUIAction" : {
+      "modelref" : true,
+      "id" : "Edit"
+    },
+    "uIActionTarget" : "SINGLEKEY",
+    "xDataControlName" : "grid"
+  }, {
+    "name" : "toolbar_tbitem5",
+    "getPSUIAction" : {
+      "modelref" : true,
+      "id" : "View"
+    },
+    "uIActionTarget" : "SINGLEKEY",
+    "xDataControlName" : "grid"
+  }, {
+    "name" : "toolbar_tbitem6",
+    "getPSUIAction" : {
+      "modelref" : true,
+      "id" : "Copy"
+    },
+    "uIActionTarget" : "SINGLEKEY",
+    "xDataControlName" : "grid"
+  }, {
+    "name" : "toolbar_tbitem24",
+    "getPSUIAction" : {
+      "modelref" : true,
+      "id" : "ToggleRowEdit"
+    },
+    "xDataControlName" : "grid"
+  }, {
+    "name" : "toolbar_tbitem25",
+    "getPSUIAction" : {
+      "modelref" : true,
+      "id" : "NewRow"
+    },
+    "xDataControlName" : "grid"
+  }, {
+    "name" : "toolbar_tbitem8",
+    "getPSUIAction" : {
+      "modelref" : true,
+      "id" : "Remove"
+    },
+    "uIActionTarget" : "MULTIKEY",
+    "xDataControlName" : "grid"
+  }, {
+    "name" : "toolbar_tbitem13",
+    "getPSUIAction" : {
+      "modelref" : true,
+      "id" : "ExportExcel"
+    },
+    "xDataControlName" : "grid"
+  }, {
+    "name" : "toolbar_tbitem11",
+    "getPSUIAction" : {
+      "modelref" : true,
+      "id" : "Print"
+    },
+    "uIActionTarget" : "MULTIKEY",
+    "xDataControlName" : "grid"
+  }, {
+    "name" : "toolbar_tbitem21",
+    "getPSUIAction" : {
+      "modelref" : true,
+      "id" : "ExportModel"
+    },
+    "xDataControlName" : "grid"
+  }, {
+    "name" : "toolbar_tbitem23",
+    "getPSUIAction" : {
+      "modelref" : true,
+      "id" : "Import"
+    },
+    "xDataControlName" : "grid"
+  }, {
+    "name" : "toolbar_tbitem19",
+    "getPSUIAction" : {
+      "modelref" : true,
+      "id" : "ToggleFilter"
+    },
+    "xDataControlName" : "grid"
+  }, {
+    "name" : "toolbar_tbitem18",
+    "getPSUIAction" : {
+      "modelref" : true,
+      "id" : "Help"
+    },
+    "xDataControlName" : "grid"
+  } ],
   "getPSControls" : [ {
     "aggMode" : "NONE",
     "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/Reginfof.json"
+      }
+    },
     "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfof/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/Reginfof.json"
+      }
+    },
+    "getGetPSControlAction" : {
+      "actionName" : "Get",
+      "actionType" : "DEACTION",
+      "dataAccessAction" : "READ",
+      "name" : "load",
+      "getPSAppDEMethod" : {
+        "modelref" : true,
+        "id" : "Get"
+      },
+      "getPSAppDataEntity" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfof.json"
+      }
+    },
     "groupMode" : "NONE",
     "hookEventNames" : [ "ROWDBLCLICK", "SELECTIONCHANGE", "REMOVE", "LOAD", "BEFORELOAD" ],
     "logicName" : "主表格",
@@ -475,14 +757,28 @@
       }
     },
     "sortMode" : "REMOTE",
+    "getUpdatePSControlAction" : {
+      "actionName" : "Update",
+      "actionType" : "DEACTION",
+      "dataAccessAction" : "UPDATE",
+      "name" : "update",
+      "getPSAppDEMethod" : {
+        "modelref" : true,
+        "id" : "Update"
+      },
+      "getPSAppDataEntity" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfof.json"
+      }
+    },
     "hasWFDataItems" : false,
     "enableColFilter" : false,
     "enableCustomized" : true,
     "enableGroup" : false,
     "enablePagingBar" : true,
-    "enableRowEdit" : false,
+    "enableRowEdit" : true,
     "enableRowEditOrder" : false,
-    "enableRowNew" : false,
+    "enableRowNew" : true,
     "forceFit" : false,
     "hideHeader" : false,
     "noSort" : false,
@@ -581,15 +877,626 @@
   }, {
     "codeName" : "StuInfoListtoolbar",
     "controlType" : "TOOLBAR",
+    "hookEventNames" : [ "CLICK" ],
+    "logicName" : "工具栏模板（默认表格界面）",
     "name" : "toolbar",
     "getPSAppDataEntity" : {
       "modelref" : true,
       "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfof.json"
     },
+    "getPSControlLogics" : [ {
+      "eventArg" : "tbitem3",
+      "eventNames" : "CLICK",
+      "logicTag" : "toolbar",
+      "logicType" : "APPVIEWLOGIC",
+      "name" : "toolbar_tbitem3_click",
+      "getPSAppViewLogic" : {
+        "modelref" : true,
+        "id" : "toolbar_tbitem3_click"
+      }
+    }, {
+      "eventArg" : "tbitem4",
+      "eventNames" : "CLICK",
+      "logicTag" : "toolbar",
+      "logicType" : "APPVIEWLOGIC",
+      "name" : "toolbar_tbitem4_click",
+      "getPSAppViewLogic" : {
+        "modelref" : true,
+        "id" : "toolbar_tbitem4_click"
+      }
+    }, {
+      "eventArg" : "tbitem5",
+      "eventNames" : "CLICK",
+      "logicTag" : "toolbar",
+      "logicType" : "APPVIEWLOGIC",
+      "name" : "toolbar_tbitem5_click",
+      "getPSAppViewLogic" : {
+        "modelref" : true,
+        "id" : "toolbar_tbitem5_click"
+      }
+    }, {
+      "eventArg" : "tbitem6",
+      "eventNames" : "CLICK",
+      "logicTag" : "toolbar",
+      "logicType" : "APPVIEWLOGIC",
+      "name" : "toolbar_tbitem6_click",
+      "getPSAppViewLogic" : {
+        "modelref" : true,
+        "id" : "toolbar_tbitem6_click"
+      }
+    }, {
+      "eventArg" : "tbitem24",
+      "eventNames" : "CLICK",
+      "logicTag" : "toolbar",
+      "logicType" : "APPVIEWLOGIC",
+      "name" : "toolbar_tbitem24_click",
+      "getPSAppViewLogic" : {
+        "modelref" : true,
+        "id" : "toolbar_tbitem24_click"
+      }
+    }, {
+      "eventArg" : "tbitem25",
+      "eventNames" : "CLICK",
+      "logicTag" : "toolbar",
+      "logicType" : "APPVIEWLOGIC",
+      "name" : "toolbar_tbitem25_click",
+      "getPSAppViewLogic" : {
+        "modelref" : true,
+        "id" : "toolbar_tbitem25_click"
+      }
+    }, {
+      "eventArg" : "tbitem8",
+      "eventNames" : "CLICK",
+      "logicTag" : "toolbar",
+      "logicType" : "APPVIEWLOGIC",
+      "name" : "toolbar_tbitem8_click",
+      "getPSAppViewLogic" : {
+        "modelref" : true,
+        "id" : "toolbar_tbitem8_click"
+      }
+    }, {
+      "eventArg" : "tbitem13",
+      "eventNames" : "CLICK",
+      "logicTag" : "toolbar",
+      "logicType" : "APPVIEWLOGIC",
+      "name" : "toolbar_tbitem13_click",
+      "getPSAppViewLogic" : {
+        "modelref" : true,
+        "id" : "toolbar_tbitem13_click"
+      }
+    }, {
+      "eventArg" : "tbitem11",
+      "eventNames" : "CLICK",
+      "logicTag" : "toolbar",
+      "logicType" : "APPVIEWLOGIC",
+      "name" : "toolbar_tbitem11_click",
+      "getPSAppViewLogic" : {
+        "modelref" : true,
+        "id" : "toolbar_tbitem11_click"
+      }
+    }, {
+      "eventArg" : "tbitem21",
+      "eventNames" : "CLICK",
+      "logicTag" : "toolbar",
+      "logicType" : "APPVIEWLOGIC",
+      "name" : "toolbar_tbitem21_click",
+      "getPSAppViewLogic" : {
+        "modelref" : true,
+        "id" : "toolbar_tbitem21_click"
+      }
+    }, {
+      "eventArg" : "tbitem23",
+      "eventNames" : "CLICK",
+      "logicTag" : "toolbar",
+      "logicType" : "APPVIEWLOGIC",
+      "name" : "toolbar_tbitem23_click",
+      "getPSAppViewLogic" : {
+        "modelref" : true,
+        "id" : "toolbar_tbitem23_click"
+      }
+    }, {
+      "eventArg" : "tbitem19",
+      "eventNames" : "CLICK",
+      "logicTag" : "toolbar",
+      "logicType" : "APPVIEWLOGIC",
+      "name" : "toolbar_tbitem19_click",
+      "getPSAppViewLogic" : {
+        "modelref" : true,
+        "id" : "toolbar_tbitem19_click"
+      }
+    }, {
+      "eventArg" : "tbitem18",
+      "eventNames" : "CLICK",
+      "logicTag" : "toolbar",
+      "logicType" : "APPVIEWLOGIC",
+      "name" : "toolbar_tbitem18_click",
+      "getPSAppViewLogic" : {
+        "modelref" : true,
+        "id" : "toolbar_tbitem18_click"
+      }
+    } ],
     "getPSControlParam" : {
       "id" : "TOOLBAR"
     },
-    "modelid" : "b74ad521922bd452887df03b93c355c7_toolbar",
+    "getPSDEToolbarItems" : [ {
+      "getCapPSLanguageRes" : {
+        "lanResTag" : "TBB.TEXT.*.NEW"
+      },
+      "caption" : "新建",
+      "groupExtractMode" : "ITEM",
+      "itemType" : "DEUIACTION",
+      "name" : "tbitem3",
+      "noPrivDisplayMode" : 2,
+      "getPSAppViewUIAction" : {
+        "modelref" : true,
+        "id" : "toolbar_tbitem3"
+      },
+      "getPSSysImage" : {
+        "glyph" : "xf0f6@FontAwesome",
+        "cssClass" : "fa fa-file-text-o"
+      },
+      "getPSUIAction" : {
+        "getCapPSLanguageRes" : {
+          "lanResTag" : "TBB.TEXT.*.NEW"
+        },
+        "caption" : "新建",
+        "codeName" : "New",
+        "fullCodeName" : "New",
+        "name" : "表格界面_新建操作",
+        "getPSSysImage" : {
+          "glyph" : "xf0f6@FontAwesome",
+          "cssClass" : "fa fa-file-text-o"
+        },
+        "predefinedType" : "GRIDVIEW_NEWACTION",
+        "timeout" : 60000,
+        "getTooltipPSLanguageRes" : {
+          "lanResTag" : "TBB.TOOLTIP.*.NEW"
+        },
+        "uIActionMode" : "SYS",
+        "uIActionTag" : "New",
+        "uIActionType" : "DEUIACTION"
+      },
+      "tooltip" : "新建",
+      "getTooltipPSLanguageRes" : {
+        "lanResTag" : "TBB.TOOLTIP.*.NEW"
+      },
+      "showCaption" : true,
+      "showIcon" : true
+    }, {
+      "getCapPSLanguageRes" : {
+        "lanResTag" : "TBB.TEXT.*.EDIT"
+      },
+      "caption" : "编辑",
+      "groupExtractMode" : "ITEM",
+      "itemType" : "DEUIACTION",
+      "name" : "tbitem4",
+      "noPrivDisplayMode" : 2,
+      "getPSAppViewUIAction" : {
+        "modelref" : true,
+        "id" : "toolbar_tbitem4"
+      },
+      "getPSSysImage" : {
+        "glyph" : "xf044@FontAwesome",
+        "cssClass" : "fa fa-edit"
+      },
+      "getPSUIAction" : {
+        "actionTarget" : "SINGLEKEY",
+        "getCapPSLanguageRes" : {
+          "lanResTag" : "TBB.TEXT.*.EDIT"
+        },
+        "caption" : "编辑",
+        "codeName" : "Edit",
+        "fullCodeName" : "Edit",
+        "name" : "表格界面_编辑操作",
+        "getPSSysImage" : {
+          "glyph" : "xf044@FontAwesome",
+          "cssClass" : "fa fa-edit"
+        },
+        "predefinedType" : "GRIDVIEW_EDITACTION",
+        "timeout" : 60000,
+        "getTooltipPSLanguageRes" : {
+          "lanResTag" : "TBB.TOOLTIP.*.EDIT"
+        },
+        "uIActionMode" : "SYS",
+        "uIActionTag" : "Edit",
+        "uIActionType" : "DEUIACTION"
+      },
+      "tooltip" : "编辑",
+      "getTooltipPSLanguageRes" : {
+        "lanResTag" : "TBB.TOOLTIP.*.EDIT"
+      },
+      "showCaption" : true,
+      "showIcon" : true
+    }, {
+      "getCapPSLanguageRes" : {
+        "lanResTag" : "TBB.TEXT.*.COPY"
+      },
+      "caption" : "拷贝",
+      "groupExtractMode" : "ITEM",
+      "itemType" : "DEUIACTION",
+      "name" : "tbitem6",
+      "noPrivDisplayMode" : 2,
+      "getPSAppViewUIAction" : {
+        "modelref" : true,
+        "id" : "toolbar_tbitem6"
+      },
+      "getPSSysImage" : {
+        "glyph" : "xf0c5@FontAwesome",
+        "cssClass" : "fa fa-copy"
+      },
+      "getPSUIAction" : {
+        "actionTarget" : "SINGLEKEY",
+        "getCapPSLanguageRes" : {
+          "lanResTag" : "TBB.TEXT.*.COPY"
+        },
+        "caption" : "拷贝",
+        "codeName" : "Copy",
+        "fullCodeName" : "Copy",
+        "name" : "表格界面_拷贝操作",
+        "getPSSysImage" : {
+          "glyph" : "xf0c5@FontAwesome",
+          "cssClass" : "fa fa-copy"
+        },
+        "predefinedType" : "GRIDVIEW_COPYACTION",
+        "timeout" : 60000,
+        "getTooltipPSLanguageRes" : {
+          "lanResTag" : "TBB.TOOLTIP.*.COPY"
+        },
+        "uIActionMode" : "SYS",
+        "uIActionTag" : "Copy",
+        "uIActionType" : "DEUIACTION"
+      },
+      "tooltip" : "拷贝",
+      "getTooltipPSLanguageRes" : {
+        "lanResTag" : "TBB.TOOLTIP.*.COPY"
+      },
+      "showCaption" : true,
+      "showIcon" : true
+    }, {
+      "itemType" : "SEPERATOR",
+      "name" : "tbitem7",
+      "spanMode" : false
+    }, {
+      "caption" : "行编辑",
+      "groupExtractMode" : "ITEM",
+      "itemType" : "DEUIACTION",
+      "name" : "tbitem24",
+      "noPrivDisplayMode" : 2,
+      "getPSAppViewUIAction" : {
+        "modelref" : true,
+        "id" : "toolbar_tbitem24"
+      },
+      "getPSSysImage" : {
+        "glyph" : "xf0ce@FontAwesome",
+        "cssClass" : "fa fa-table"
+      },
+      "getPSUIAction" : {
+        "caption" : "行编辑",
+        "codeName" : "ToggleRowEdit",
+        "fullCodeName" : "ToggleRowEdit",
+        "name" : "表格界面_行编辑开关操作",
+        "getPSSysImage" : {
+          "glyph" : "xf0ce@FontAwesome",
+          "cssClass" : "fa fa-table"
+        },
+        "predefinedType" : "GRIDVIEW_ROWEDITACTION",
+        "timeout" : 60000,
+        "uIActionMode" : "SYS",
+        "uIActionTag" : "ToggleRowEdit",
+        "uIActionType" : "DEUIACTION",
+        "enableToggleMode" : true
+      },
+      "tooltip" : "行编辑",
+      "enableToggleMode" : true,
+      "showCaption" : true,
+      "showIcon" : true
+    }, {
+      "caption" : "新建行",
+      "groupExtractMode" : "ITEM",
+      "itemType" : "DEUIACTION",
+      "name" : "tbitem25",
+      "noPrivDisplayMode" : 2,
+      "getPSAppViewUIAction" : {
+        "modelref" : true,
+        "id" : "toolbar_tbitem25"
+      },
+      "getPSSysImage" : {
+        "glyph" : "xf067@FontAwesome",
+        "cssClass" : "fa fa-plus"
+      },
+      "getPSUIAction" : {
+        "caption" : "新建行",
+        "codeName" : "NewRow",
+        "fullCodeName" : "NewRow",
+        "name" : "表格界面_新建行",
+        "getPSSysImage" : {
+          "glyph" : "xf067@FontAwesome",
+          "cssClass" : "fa fa-plus"
+        },
+        "predefinedType" : "GRIDVIEW_NEWROWACTION",
+        "timeout" : 60000,
+        "uIActionMode" : "SYS",
+        "uIActionTag" : "NewRow",
+        "uIActionType" : "DEUIACTION"
+      },
+      "tooltip" : "新建行",
+      "showCaption" : false,
+      "showIcon" : true
+    }, {
+      "itemType" : "SEPERATOR",
+      "name" : "tbitem26",
+      "spanMode" : false
+    }, {
+      "getCapPSLanguageRes" : {
+        "lanResTag" : "TBB.TEXT.*.REMOVE"
+      },
+      "caption" : "删除",
+      "groupExtractMode" : "ITEM",
+      "itemType" : "DEUIACTION",
+      "name" : "tbitem8",
+      "noPrivDisplayMode" : 2,
+      "getPSAppViewUIAction" : {
+        "modelref" : true,
+        "id" : "toolbar_tbitem8"
+      },
+      "getPSSysImage" : {
+        "glyph" : "xf00d@FontAwesome",
+        "cssClass" : "fa fa-remove"
+      },
+      "getPSUIAction" : {
+        "actionTarget" : "MULTIKEY",
+        "getCapPSLanguageRes" : {
+          "lanResTag" : "TBB.TEXT.*.REMOVE"
+        },
+        "caption" : "删除",
+        "codeName" : "Remove",
+        "fullCodeName" : "Remove",
+        "name" : "表格界面_删除操作",
+        "getPSSysImage" : {
+          "glyph" : "xf00d@FontAwesome",
+          "cssClass" : "fa fa-remove"
+        },
+        "predefinedType" : "GRIDVIEW_REMOVEACTION",
+        "timeout" : 60000,
+        "getTooltipPSLanguageRes" : {
+          "lanResTag" : "TBB.TOOLTIP.*.REMOVE"
+        },
+        "uIActionMode" : "SYS",
+        "uIActionTag" : "Remove",
+        "uIActionType" : "DEUIACTION"
+      },
+      "tooltip" : "删除",
+      "getTooltipPSLanguageRes" : {
+        "lanResTag" : "TBB.TOOLTIP.*.REMOVE"
+      },
+      "showCaption" : true,
+      "showIcon" : true
+    }, {
+      "itemType" : "SEPERATOR",
+      "name" : "tbitem9",
+      "spanMode" : false
+    }, {
+      "getCapPSLanguageRes" : {
+        "lanResTag" : "TBB.TEXT.*.EXPORT"
+      },
+      "caption" : "导出",
+      "groupExtractMode" : "ITEM",
+      "itemType" : "DEUIACTION",
+      "name" : "tbitem13",
+      "noPrivDisplayMode" : 2,
+      "getPSAppViewUIAction" : {
+        "modelref" : true,
+        "id" : "toolbar_tbitem13"
+      },
+      "getPSSysImage" : {
+        "glyph" : "xf1c3@FontAwesome",
+        "cssClass" : "fa fa-file-excel-o"
+      },
+      "getPSUIAction" : {
+        "getCapPSLanguageRes" : {
+          "lanResTag" : "TBB.TEXT.*.EXPORT"
+        },
+        "caption" : "导出",
+        "codeName" : "ExportExcel",
+        "fullCodeName" : "ExportExcel",
+        "name" : "表格界面_导出操作（Excel）",
+        "getPSSysImage" : {
+          "glyph" : "xf1c3@FontAwesome",
+          "cssClass" : "fa fa-file-excel-o"
+        },
+        "predefinedType" : "GRIDVIEW_EXPORTACTION",
+        "timeout" : 60000,
+        "getTooltipPSLanguageRes" : {
+          "lanResTag" : "TBB.TOOLTIP.*.EXPORT"
+        },
+        "uIActionMode" : "SYS",
+        "uIActionTag" : "ExportExcel",
+        "uIActionType" : "DEUIACTION"
+      },
+      "tooltip" : "导出",
+      "getTooltipPSLanguageRes" : {
+        "lanResTag" : "TBB.TOOLTIP.*.EXPORT"
+      },
+      "showCaption" : true,
+      "showIcon" : true
+    }, {
+      "itemType" : "SEPERATOR",
+      "name" : "tbitem10",
+      "spanMode" : false
+    }, {
+      "caption" : "其它",
+      "itemType" : "ITEMS",
+      "name" : "tbitem16",
+      "getPSDEToolbarItems" : [ {
+        "getCapPSLanguageRes" : {
+          "lanResTag" : "MENUITEM.CAPTION.*.EXPORTSRF"
+        },
+        "caption" : "导出数据模型",
+        "groupExtractMode" : "ITEM",
+        "itemType" : "DEUIACTION",
+        "name" : "tbitem21",
+        "noPrivDisplayMode" : 2,
+        "getPSAppViewUIAction" : {
+          "modelref" : true,
+          "id" : "toolbar_tbitem21"
+        },
+        "getPSSysImage" : {
+          "glyph" : "xf019@FontAwesome",
+          "cssClass" : "fa fa-download"
+        },
+        "getPSUIAction" : {
+          "getCapPSLanguageRes" : {
+            "lanResTag" : "MENUITEM.CAPTION.*.EXPORTSRF"
+          },
+          "caption" : "导出数据模型",
+          "codeName" : "ExportModel",
+          "fullCodeName" : "ExportModel",
+          "name" : "表格界面_导出数据模型",
+          "getPSSysImage" : {
+            "glyph" : "xf019@FontAwesome",
+            "cssClass" : "fa fa-download"
+          },
+          "predefinedType" : "GRIDVIEW_EXPORTXMLACTION",
+          "timeout" : 60000,
+          "uIActionMode" : "SYS",
+          "uIActionTag" : "ExportModel",
+          "uIActionType" : "DEUIACTION"
+        },
+        "tooltip" : "导出数据模型",
+        "showCaption" : true,
+        "showIcon" : true
+      }, {
+        "caption" : "数据导入",
+        "groupExtractMode" : "ITEM",
+        "itemType" : "DEUIACTION",
+        "name" : "tbitem23",
+        "noPrivDisplayMode" : 2,
+        "getPSAppViewUIAction" : {
+          "modelref" : true,
+          "id" : "toolbar_tbitem23"
+        },
+        "getPSSysImage" : {
+          "glyph" : "xf093@FontAwesome",
+          "cssClass" : "fa fa-upload"
+        },
+        "getPSUIAction" : {
+          "caption" : "数据导入",
+          "codeName" : "Import",
+          "fullCodeName" : "Import",
+          "name" : "表格界面_数据导入栏",
+          "getPSSysImage" : {
+            "glyph" : "xf093@FontAwesome",
+            "cssClass" : "fa fa-upload"
+          },
+          "predefinedType" : "GRIDVIEW_IMPORTBAR",
+          "timeout" : 60000,
+          "uIActionMode" : "SYS",
+          "uIActionTag" : "Import",
+          "uIActionType" : "DEUIACTION"
+        },
+        "tooltip" : "数据导入",
+        "showCaption" : true,
+        "showIcon" : true
+      } ],
+      "tooltip" : "其它",
+      "showCaption" : true,
+      "showIcon" : true
+    }, {
+      "itemType" : "SEPERATOR",
+      "name" : "tbitem17",
+      "spanMode" : false
+    }, {
+      "getCapPSLanguageRes" : {
+        "lanResTag" : "TBB.TEXT.*.FILTER"
+      },
+      "caption" : "过滤",
+      "groupExtractMode" : "ITEM",
+      "itemType" : "DEUIACTION",
+      "name" : "tbitem19",
+      "noPrivDisplayMode" : 2,
+      "getPSAppViewUIAction" : {
+        "modelref" : true,
+        "id" : "toolbar_tbitem19"
+      },
+      "getPSSysImage" : {
+        "glyph" : "xf0b0@FontAwesome",
+        "cssClass" : "fa fa-filter"
+      },
+      "getPSUIAction" : {
+        "getCapPSLanguageRes" : {
+          "lanResTag" : "TBB.TEXT.*.FILTER"
+        },
+        "caption" : "过滤",
+        "codeName" : "ToggleFilter",
+        "fullCodeName" : "ToggleFilter",
+        "name" : "表格界面_搜索栏",
+        "getPSSysImage" : {
+          "glyph" : "xf0b0@FontAwesome",
+          "cssClass" : "fa fa-filter"
+        },
+        "predefinedType" : "GRIDVIEW_SEARCHBAR",
+        "timeout" : 60000,
+        "getTooltipPSLanguageRes" : {
+          "lanResTag" : "TBB.TOOLTIP.*.FILTER"
+        },
+        "uIActionMode" : "SYS",
+        "uIActionTag" : "ToggleFilter",
+        "uIActionType" : "DEUIACTION",
+        "enableToggleMode" : true
+      },
+      "tooltip" : "过滤",
+      "getTooltipPSLanguageRes" : {
+        "lanResTag" : "TBB.TOOLTIP.*.FILTER"
+      },
+      "enableToggleMode" : true,
+      "showCaption" : true,
+      "showIcon" : true
+    }, {
+      "getCapPSLanguageRes" : {
+        "lanResTag" : "TBB.TEXT.*.HELP"
+      },
+      "caption" : "帮助",
+      "groupExtractMode" : "ITEM",
+      "itemType" : "DEUIACTION",
+      "name" : "tbitem18",
+      "noPrivDisplayMode" : 2,
+      "getPSAppViewUIAction" : {
+        "modelref" : true,
+        "id" : "toolbar_tbitem18"
+      },
+      "getPSSysImage" : {
+        "glyph" : "xf128@FontAwesome",
+        "cssClass" : "fa fa-question"
+      },
+      "getPSUIAction" : {
+        "getCapPSLanguageRes" : {
+          "lanResTag" : "TBB.TEXT.*.HELP"
+        },
+        "caption" : "帮助",
+        "codeName" : "Help",
+        "fullCodeName" : "Help",
+        "name" : "表格界面_帮助操作",
+        "getPSSysImage" : {
+          "glyph" : "xf128@FontAwesome",
+          "cssClass" : "fa fa-question"
+        },
+        "predefinedType" : "GRIDVIEW_HELPACTION",
+        "timeout" : 60000,
+        "getTooltipPSLanguageRes" : {
+          "lanResTag" : "TBB.TOOLTIP.*.HELP"
+        },
+        "uIActionMode" : "SYS",
+        "uIActionTag" : "Help",
+        "uIActionType" : "DEUIACTION"
+      },
+      "tooltip" : "帮助",
+      "getTooltipPSLanguageRes" : {
+        "lanResTag" : "TBB.TOOLTIP.*.HELP"
+      },
+      "showCaption" : true,
+      "showIcon" : true
+    } ],
+    "modelid" : "b912ff540f5614f63914a38067d84728",
     "modeltype" : "PSDETOOLBAR"
   } ],
   "getPSDEViewCodeName" : "StuInfoList",
@@ -617,7 +1524,7 @@
   "enableFilter" : true,
   "enableImport" : true,
   "enableQuickSearch" : true,
-  "enableRowEdit" : false,
+  "enableRowEdit" : true,
   "enableSearch" : true,
   "rowEditDefault" : false,
   "modelid" : "b74ad521922bd452887df03b93c355c7",

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

@@ -7544,6 +7544,149 @@
         } ]
       } ],
       "getPSAppViewLogics" : [ {
+        "eventArg" : "tbitem3",
+        "eventNames" : "CLICK",
+        "logicTrigger" : "CTRLEVENT",
+        "logicType" : "APPVIEWUIACTION",
+        "name" : "toolbar_tbitem3_click",
+        "getPSAppViewUIAction" : {
+          "modelref" : true,
+          "id" : "toolbar_tbitem3"
+        },
+        "getPSViewCtrlName" : "toolbar"
+      }, {
+        "eventArg" : "tbitem4",
+        "eventNames" : "CLICK",
+        "logicTrigger" : "CTRLEVENT",
+        "logicType" : "APPVIEWUIACTION",
+        "name" : "toolbar_tbitem4_click",
+        "getPSAppViewUIAction" : {
+          "modelref" : true,
+          "id" : "toolbar_tbitem4"
+        },
+        "getPSViewCtrlName" : "toolbar"
+      }, {
+        "eventArg" : "tbitem5",
+        "eventNames" : "CLICK",
+        "logicTrigger" : "CTRLEVENT",
+        "logicType" : "APPVIEWUIACTION",
+        "name" : "toolbar_tbitem5_click",
+        "getPSAppViewUIAction" : {
+          "modelref" : true,
+          "id" : "toolbar_tbitem5"
+        },
+        "getPSViewCtrlName" : "toolbar"
+      }, {
+        "eventArg" : "tbitem6",
+        "eventNames" : "CLICK",
+        "logicTrigger" : "CTRLEVENT",
+        "logicType" : "APPVIEWUIACTION",
+        "name" : "toolbar_tbitem6_click",
+        "getPSAppViewUIAction" : {
+          "modelref" : true,
+          "id" : "toolbar_tbitem6"
+        },
+        "getPSViewCtrlName" : "toolbar"
+      }, {
+        "eventArg" : "tbitem24",
+        "eventNames" : "CLICK",
+        "logicTrigger" : "CTRLEVENT",
+        "logicType" : "APPVIEWUIACTION",
+        "name" : "toolbar_tbitem24_click",
+        "getPSAppViewUIAction" : {
+          "modelref" : true,
+          "id" : "toolbar_tbitem24"
+        },
+        "getPSViewCtrlName" : "toolbar"
+      }, {
+        "eventArg" : "tbitem25",
+        "eventNames" : "CLICK",
+        "logicTrigger" : "CTRLEVENT",
+        "logicType" : "APPVIEWUIACTION",
+        "name" : "toolbar_tbitem25_click",
+        "getPSAppViewUIAction" : {
+          "modelref" : true,
+          "id" : "toolbar_tbitem25"
+        },
+        "getPSViewCtrlName" : "toolbar"
+      }, {
+        "eventArg" : "tbitem8",
+        "eventNames" : "CLICK",
+        "logicTrigger" : "CTRLEVENT",
+        "logicType" : "APPVIEWUIACTION",
+        "name" : "toolbar_tbitem8_click",
+        "getPSAppViewUIAction" : {
+          "modelref" : true,
+          "id" : "toolbar_tbitem8"
+        },
+        "getPSViewCtrlName" : "toolbar"
+      }, {
+        "eventArg" : "tbitem13",
+        "eventNames" : "CLICK",
+        "logicTrigger" : "CTRLEVENT",
+        "logicType" : "APPVIEWUIACTION",
+        "name" : "toolbar_tbitem13_click",
+        "getPSAppViewUIAction" : {
+          "modelref" : true,
+          "id" : "toolbar_tbitem13"
+        },
+        "getPSViewCtrlName" : "toolbar"
+      }, {
+        "eventArg" : "tbitem11",
+        "eventNames" : "CLICK",
+        "logicTrigger" : "CTRLEVENT",
+        "logicType" : "APPVIEWUIACTION",
+        "name" : "toolbar_tbitem11_click",
+        "getPSAppViewUIAction" : {
+          "modelref" : true,
+          "id" : "toolbar_tbitem11"
+        },
+        "getPSViewCtrlName" : "toolbar"
+      }, {
+        "eventArg" : "tbitem21",
+        "eventNames" : "CLICK",
+        "logicTrigger" : "CTRLEVENT",
+        "logicType" : "APPVIEWUIACTION",
+        "name" : "toolbar_tbitem21_click",
+        "getPSAppViewUIAction" : {
+          "modelref" : true,
+          "id" : "toolbar_tbitem21"
+        },
+        "getPSViewCtrlName" : "toolbar"
+      }, {
+        "eventArg" : "tbitem23",
+        "eventNames" : "CLICK",
+        "logicTrigger" : "CTRLEVENT",
+        "logicType" : "APPVIEWUIACTION",
+        "name" : "toolbar_tbitem23_click",
+        "getPSAppViewUIAction" : {
+          "modelref" : true,
+          "id" : "toolbar_tbitem23"
+        },
+        "getPSViewCtrlName" : "toolbar"
+      }, {
+        "eventArg" : "tbitem19",
+        "eventNames" : "CLICK",
+        "logicTrigger" : "CTRLEVENT",
+        "logicType" : "APPVIEWUIACTION",
+        "name" : "toolbar_tbitem19_click",
+        "getPSAppViewUIAction" : {
+          "modelref" : true,
+          "id" : "toolbar_tbitem19"
+        },
+        "getPSViewCtrlName" : "toolbar"
+      }, {
+        "eventArg" : "tbitem18",
+        "eventNames" : "CLICK",
+        "logicTrigger" : "CTRLEVENT",
+        "logicType" : "APPVIEWUIACTION",
+        "name" : "toolbar_tbitem18_click",
+        "getPSAppViewUIAction" : {
+          "modelref" : true,
+          "id" : "toolbar_tbitem18"
+        },
+        "getPSViewCtrlName" : "toolbar"
+      }, {
         "logicTrigger" : "CUSTOM",
         "logicType" : "SYSUILOGIC",
         "name" : "newdata",
@@ -7612,18 +7755,157 @@
           "viewType" : "DEEDITVIEW"
         }
       } ],
+      "getPSAppViewUIActions" : [ {
+        "name" : "toolbar_tbitem3",
+        "getPSUIAction" : {
+          "modelref" : true,
+          "id" : "New"
+        },
+        "xDataControlName" : "grid"
+      }, {
+        "name" : "toolbar_tbitem4",
+        "getPSUIAction" : {
+          "modelref" : true,
+          "id" : "Edit"
+        },
+        "uIActionTarget" : "SINGLEKEY",
+        "xDataControlName" : "grid"
+      }, {
+        "name" : "toolbar_tbitem5",
+        "getPSUIAction" : {
+          "modelref" : true,
+          "id" : "View"
+        },
+        "uIActionTarget" : "SINGLEKEY",
+        "xDataControlName" : "grid"
+      }, {
+        "name" : "toolbar_tbitem6",
+        "getPSUIAction" : {
+          "modelref" : true,
+          "id" : "Copy"
+        },
+        "uIActionTarget" : "SINGLEKEY",
+        "xDataControlName" : "grid"
+      }, {
+        "name" : "toolbar_tbitem24",
+        "getPSUIAction" : {
+          "modelref" : true,
+          "id" : "ToggleRowEdit"
+        },
+        "xDataControlName" : "grid"
+      }, {
+        "name" : "toolbar_tbitem25",
+        "getPSUIAction" : {
+          "modelref" : true,
+          "id" : "NewRow"
+        },
+        "xDataControlName" : "grid"
+      }, {
+        "name" : "toolbar_tbitem8",
+        "getPSUIAction" : {
+          "modelref" : true,
+          "id" : "Remove"
+        },
+        "uIActionTarget" : "MULTIKEY",
+        "xDataControlName" : "grid"
+      }, {
+        "name" : "toolbar_tbitem13",
+        "getPSUIAction" : {
+          "modelref" : true,
+          "id" : "ExportExcel"
+        },
+        "xDataControlName" : "grid"
+      }, {
+        "name" : "toolbar_tbitem11",
+        "getPSUIAction" : {
+          "modelref" : true,
+          "id" : "Print"
+        },
+        "uIActionTarget" : "MULTIKEY",
+        "xDataControlName" : "grid"
+      }, {
+        "name" : "toolbar_tbitem21",
+        "getPSUIAction" : {
+          "modelref" : true,
+          "id" : "ExportModel"
+        },
+        "xDataControlName" : "grid"
+      }, {
+        "name" : "toolbar_tbitem23",
+        "getPSUIAction" : {
+          "modelref" : true,
+          "id" : "Import"
+        },
+        "xDataControlName" : "grid"
+      }, {
+        "name" : "toolbar_tbitem19",
+        "getPSUIAction" : {
+          "modelref" : true,
+          "id" : "ToggleFilter"
+        },
+        "xDataControlName" : "grid"
+      }, {
+        "name" : "toolbar_tbitem18",
+        "getPSUIAction" : {
+          "modelref" : true,
+          "id" : "Help"
+        },
+        "xDataControlName" : "grid"
+      } ],
       "getPSControls" : [ {
         "aggMode" : "NONE",
         "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/Reginfof.json"
+          }
+        },
         "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfof/PSGRIDS/Main.json",
         "getFetchPSControlAction" : {
           "modelref" : true,
           "id" : "fetch"
         },
-        "groupMode" : "NONE",
-        "hookEventNames" : [ "ROWDBLCLICK", "SELECTIONCHANGE", "REMOVE", "LOAD", "BEFORELOAD" ],
+        "getGetDraftPSControlAction" : {
+          "actionName" : "GetDraft",
+          "actionType" : "DEACTION",
+          "dataAccessAction" : "CREATE",
+          "name" : "loaddraft",
+          "getPSAppDEMethod" : {
+            "modelref" : true,
+            "id" : "GetDraft"
+          },
+          "getPSAppDataEntity" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfof.json"
+          }
+        },
+        "getGetPSControlAction" : {
+          "actionName" : "Get",
+          "actionType" : "DEACTION",
+          "dataAccessAction" : "READ",
+          "name" : "load",
+          "getPSAppDEMethod" : {
+            "modelref" : true,
+            "id" : "Get"
+          },
+          "getPSAppDataEntity" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfof.json"
+          }
+        },
+        "groupMode" : "NONE",
+        "hookEventNames" : [ "ROWDBLCLICK", "SELECTIONCHANGE", "REMOVE", "LOAD", "BEFORELOAD" ],
         "logicName" : "主表格",
         "getPSAppDataEntity" : {
           "modelref" : true,
@@ -7987,14 +8269,28 @@
           }
         },
         "sortMode" : "REMOTE",
+        "getUpdatePSControlAction" : {
+          "actionName" : "Update",
+          "actionType" : "DEACTION",
+          "dataAccessAction" : "UPDATE",
+          "name" : "update",
+          "getPSAppDEMethod" : {
+            "modelref" : true,
+            "id" : "Update"
+          },
+          "getPSAppDataEntity" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfof.json"
+          }
+        },
         "hasWFDataItems" : false,
         "enableColFilter" : false,
         "enableCustomized" : true,
         "enableGroup" : false,
         "enablePagingBar" : true,
-        "enableRowEdit" : false,
+        "enableRowEdit" : true,
         "enableRowEditOrder" : false,
-        "enableRowNew" : false,
+        "enableRowNew" : true,
         "forceFit" : false,
         "hideHeader" : false,
         "noSort" : false,
@@ -8093,43 +8389,654 @@
       }, {
         "codeName" : "StuInfoListtoolbar",
         "controlType" : "TOOLBAR",
+        "hookEventNames" : [ "CLICK" ],
+        "logicName" : "工具栏模板（默认表格界面）",
         "name" : "toolbar",
         "getPSAppDataEntity" : {
           "modelref" : true,
           "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfof.json"
         },
+        "getPSControlLogics" : [ {
+          "eventArg" : "tbitem3",
+          "eventNames" : "CLICK",
+          "logicTag" : "toolbar",
+          "logicType" : "APPVIEWLOGIC",
+          "name" : "toolbar_tbitem3_click",
+          "getPSAppViewLogic" : {
+            "modelref" : true,
+            "id" : "toolbar_tbitem3_click"
+          }
+        }, {
+          "eventArg" : "tbitem4",
+          "eventNames" : "CLICK",
+          "logicTag" : "toolbar",
+          "logicType" : "APPVIEWLOGIC",
+          "name" : "toolbar_tbitem4_click",
+          "getPSAppViewLogic" : {
+            "modelref" : true,
+            "id" : "toolbar_tbitem4_click"
+          }
+        }, {
+          "eventArg" : "tbitem5",
+          "eventNames" : "CLICK",
+          "logicTag" : "toolbar",
+          "logicType" : "APPVIEWLOGIC",
+          "name" : "toolbar_tbitem5_click",
+          "getPSAppViewLogic" : {
+            "modelref" : true,
+            "id" : "toolbar_tbitem5_click"
+          }
+        }, {
+          "eventArg" : "tbitem6",
+          "eventNames" : "CLICK",
+          "logicTag" : "toolbar",
+          "logicType" : "APPVIEWLOGIC",
+          "name" : "toolbar_tbitem6_click",
+          "getPSAppViewLogic" : {
+            "modelref" : true,
+            "id" : "toolbar_tbitem6_click"
+          }
+        }, {
+          "eventArg" : "tbitem24",
+          "eventNames" : "CLICK",
+          "logicTag" : "toolbar",
+          "logicType" : "APPVIEWLOGIC",
+          "name" : "toolbar_tbitem24_click",
+          "getPSAppViewLogic" : {
+            "modelref" : true,
+            "id" : "toolbar_tbitem24_click"
+          }
+        }, {
+          "eventArg" : "tbitem25",
+          "eventNames" : "CLICK",
+          "logicTag" : "toolbar",
+          "logicType" : "APPVIEWLOGIC",
+          "name" : "toolbar_tbitem25_click",
+          "getPSAppViewLogic" : {
+            "modelref" : true,
+            "id" : "toolbar_tbitem25_click"
+          }
+        }, {
+          "eventArg" : "tbitem8",
+          "eventNames" : "CLICK",
+          "logicTag" : "toolbar",
+          "logicType" : "APPVIEWLOGIC",
+          "name" : "toolbar_tbitem8_click",
+          "getPSAppViewLogic" : {
+            "modelref" : true,
+            "id" : "toolbar_tbitem8_click"
+          }
+        }, {
+          "eventArg" : "tbitem13",
+          "eventNames" : "CLICK",
+          "logicTag" : "toolbar",
+          "logicType" : "APPVIEWLOGIC",
+          "name" : "toolbar_tbitem13_click",
+          "getPSAppViewLogic" : {
+            "modelref" : true,
+            "id" : "toolbar_tbitem13_click"
+          }
+        }, {
+          "eventArg" : "tbitem11",
+          "eventNames" : "CLICK",
+          "logicTag" : "toolbar",
+          "logicType" : "APPVIEWLOGIC",
+          "name" : "toolbar_tbitem11_click",
+          "getPSAppViewLogic" : {
+            "modelref" : true,
+            "id" : "toolbar_tbitem11_click"
+          }
+        }, {
+          "eventArg" : "tbitem21",
+          "eventNames" : "CLICK",
+          "logicTag" : "toolbar",
+          "logicType" : "APPVIEWLOGIC",
+          "name" : "toolbar_tbitem21_click",
+          "getPSAppViewLogic" : {
+            "modelref" : true,
+            "id" : "toolbar_tbitem21_click"
+          }
+        }, {
+          "eventArg" : "tbitem23",
+          "eventNames" : "CLICK",
+          "logicTag" : "toolbar",
+          "logicType" : "APPVIEWLOGIC",
+          "name" : "toolbar_tbitem23_click",
+          "getPSAppViewLogic" : {
+            "modelref" : true,
+            "id" : "toolbar_tbitem23_click"
+          }
+        }, {
+          "eventArg" : "tbitem19",
+          "eventNames" : "CLICK",
+          "logicTag" : "toolbar",
+          "logicType" : "APPVIEWLOGIC",
+          "name" : "toolbar_tbitem19_click",
+          "getPSAppViewLogic" : {
+            "modelref" : true,
+            "id" : "toolbar_tbitem19_click"
+          }
+        }, {
+          "eventArg" : "tbitem18",
+          "eventNames" : "CLICK",
+          "logicTag" : "toolbar",
+          "logicType" : "APPVIEWLOGIC",
+          "name" : "toolbar_tbitem18_click",
+          "getPSAppViewLogic" : {
+            "modelref" : true,
+            "id" : "toolbar_tbitem18_click"
+          }
+        } ],
         "getPSControlParam" : {
           "id" : "TOOLBAR"
         },
-        "modelid" : "b74ad521922bd452887df03b93c355c7_toolbar",
-        "modeltype" : "PSDETOOLBAR"
-      } ],
-      "getPSDEViewCodeName" : "StuInfoList",
-      "getPSDEViewId" : "383860AF-2511-4D27-BDC0-224543703E08",
-      "getPSViewLayoutPanel" : {
-        "codeName" : "Layoutpanel",
-        "controlStyle" : "APPDEGRIDVIEW",
-        "controlType" : "VIEWLAYOUTPANEL",
-        "name" : "layoutpanel",
-        "getPSAppDataEntity" : {
-          "modelref" : true,
-          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfof.json"
-        },
-        "getPSControlParam" : { },
-        "layoutBodyOnly" : true,
-        "layoutPanel" : true,
-        "useDefaultLayout" : true
-      },
-      "title" : "学员信息清单",
-      "viewStyle" : "DEFAULT",
-      "viewType" : "DEGRIDVIEW",
-      "xDataControlName" : "grid",
-      "enableDP" : true,
-      "enableExport" : true,
-      "enableFilter" : true,
-      "enableImport" : true,
-      "enableQuickSearch" : true,
-      "enableRowEdit" : false,
+        "getPSDEToolbarItems" : [ {
+          "getCapPSLanguageRes" : {
+            "lanResTag" : "TBB.TEXT.*.NEW"
+          },
+          "caption" : "新建",
+          "groupExtractMode" : "ITEM",
+          "itemType" : "DEUIACTION",
+          "name" : "tbitem3",
+          "noPrivDisplayMode" : 2,
+          "getPSAppViewUIAction" : {
+            "modelref" : true,
+            "id" : "toolbar_tbitem3"
+          },
+          "getPSSysImage" : {
+            "glyph" : "xf0f6@FontAwesome",
+            "cssClass" : "fa fa-file-text-o"
+          },
+          "getPSUIAction" : {
+            "getCapPSLanguageRes" : {
+              "lanResTag" : "TBB.TEXT.*.NEW"
+            },
+            "caption" : "新建",
+            "codeName" : "New",
+            "fullCodeName" : "New",
+            "name" : "表格界面_新建操作",
+            "getPSSysImage" : {
+              "glyph" : "xf0f6@FontAwesome",
+              "cssClass" : "fa fa-file-text-o"
+            },
+            "predefinedType" : "GRIDVIEW_NEWACTION",
+            "timeout" : 60000,
+            "getTooltipPSLanguageRes" : {
+              "lanResTag" : "TBB.TOOLTIP.*.NEW"
+            },
+            "uIActionMode" : "SYS",
+            "uIActionTag" : "New",
+            "uIActionType" : "DEUIACTION"
+          },
+          "tooltip" : "新建",
+          "getTooltipPSLanguageRes" : {
+            "lanResTag" : "TBB.TOOLTIP.*.NEW"
+          },
+          "showCaption" : true,
+          "showIcon" : true
+        }, {
+          "getCapPSLanguageRes" : {
+            "lanResTag" : "TBB.TEXT.*.EDIT"
+          },
+          "caption" : "编辑",
+          "groupExtractMode" : "ITEM",
+          "itemType" : "DEUIACTION",
+          "name" : "tbitem4",
+          "noPrivDisplayMode" : 2,
+          "getPSAppViewUIAction" : {
+            "modelref" : true,
+            "id" : "toolbar_tbitem4"
+          },
+          "getPSSysImage" : {
+            "glyph" : "xf044@FontAwesome",
+            "cssClass" : "fa fa-edit"
+          },
+          "getPSUIAction" : {
+            "actionTarget" : "SINGLEKEY",
+            "getCapPSLanguageRes" : {
+              "lanResTag" : "TBB.TEXT.*.EDIT"
+            },
+            "caption" : "编辑",
+            "codeName" : "Edit",
+            "fullCodeName" : "Edit",
+            "name" : "表格界面_编辑操作",
+            "getPSSysImage" : {
+              "glyph" : "xf044@FontAwesome",
+              "cssClass" : "fa fa-edit"
+            },
+            "predefinedType" : "GRIDVIEW_EDITACTION",
+            "timeout" : 60000,
+            "getTooltipPSLanguageRes" : {
+              "lanResTag" : "TBB.TOOLTIP.*.EDIT"
+            },
+            "uIActionMode" : "SYS",
+            "uIActionTag" : "Edit",
+            "uIActionType" : "DEUIACTION"
+          },
+          "tooltip" : "编辑",
+          "getTooltipPSLanguageRes" : {
+            "lanResTag" : "TBB.TOOLTIP.*.EDIT"
+          },
+          "showCaption" : true,
+          "showIcon" : true
+        }, {
+          "getCapPSLanguageRes" : {
+            "lanResTag" : "TBB.TEXT.*.COPY"
+          },
+          "caption" : "拷贝",
+          "groupExtractMode" : "ITEM",
+          "itemType" : "DEUIACTION",
+          "name" : "tbitem6",
+          "noPrivDisplayMode" : 2,
+          "getPSAppViewUIAction" : {
+            "modelref" : true,
+            "id" : "toolbar_tbitem6"
+          },
+          "getPSSysImage" : {
+            "glyph" : "xf0c5@FontAwesome",
+            "cssClass" : "fa fa-copy"
+          },
+          "getPSUIAction" : {
+            "actionTarget" : "SINGLEKEY",
+            "getCapPSLanguageRes" : {
+              "lanResTag" : "TBB.TEXT.*.COPY"
+            },
+            "caption" : "拷贝",
+            "codeName" : "Copy",
+            "fullCodeName" : "Copy",
+            "name" : "表格界面_拷贝操作",
+            "getPSSysImage" : {
+              "glyph" : "xf0c5@FontAwesome",
+              "cssClass" : "fa fa-copy"
+            },
+            "predefinedType" : "GRIDVIEW_COPYACTION",
+            "timeout" : 60000,
+            "getTooltipPSLanguageRes" : {
+              "lanResTag" : "TBB.TOOLTIP.*.COPY"
+            },
+            "uIActionMode" : "SYS",
+            "uIActionTag" : "Copy",
+            "uIActionType" : "DEUIACTION"
+          },
+          "tooltip" : "拷贝",
+          "getTooltipPSLanguageRes" : {
+            "lanResTag" : "TBB.TOOLTIP.*.COPY"
+          },
+          "showCaption" : true,
+          "showIcon" : true
+        }, {
+          "itemType" : "SEPERATOR",
+          "name" : "tbitem7",
+          "spanMode" : false
+        }, {
+          "caption" : "行编辑",
+          "groupExtractMode" : "ITEM",
+          "itemType" : "DEUIACTION",
+          "name" : "tbitem24",
+          "noPrivDisplayMode" : 2,
+          "getPSAppViewUIAction" : {
+            "modelref" : true,
+            "id" : "toolbar_tbitem24"
+          },
+          "getPSSysImage" : {
+            "glyph" : "xf0ce@FontAwesome",
+            "cssClass" : "fa fa-table"
+          },
+          "getPSUIAction" : {
+            "caption" : "行编辑",
+            "codeName" : "ToggleRowEdit",
+            "fullCodeName" : "ToggleRowEdit",
+            "name" : "表格界面_行编辑开关操作",
+            "getPSSysImage" : {
+              "glyph" : "xf0ce@FontAwesome",
+              "cssClass" : "fa fa-table"
+            },
+            "predefinedType" : "GRIDVIEW_ROWEDITACTION",
+            "timeout" : 60000,
+            "uIActionMode" : "SYS",
+            "uIActionTag" : "ToggleRowEdit",
+            "uIActionType" : "DEUIACTION",
+            "enableToggleMode" : true
+          },
+          "tooltip" : "行编辑",
+          "enableToggleMode" : true,
+          "showCaption" : true,
+          "showIcon" : true
+        }, {
+          "caption" : "新建行",
+          "groupExtractMode" : "ITEM",
+          "itemType" : "DEUIACTION",
+          "name" : "tbitem25",
+          "noPrivDisplayMode" : 2,
+          "getPSAppViewUIAction" : {
+            "modelref" : true,
+            "id" : "toolbar_tbitem25"
+          },
+          "getPSSysImage" : {
+            "glyph" : "xf067@FontAwesome",
+            "cssClass" : "fa fa-plus"
+          },
+          "getPSUIAction" : {
+            "caption" : "新建行",
+            "codeName" : "NewRow",
+            "fullCodeName" : "NewRow",
+            "name" : "表格界面_新建行",
+            "getPSSysImage" : {
+              "glyph" : "xf067@FontAwesome",
+              "cssClass" : "fa fa-plus"
+            },
+            "predefinedType" : "GRIDVIEW_NEWROWACTION",
+            "timeout" : 60000,
+            "uIActionMode" : "SYS",
+            "uIActionTag" : "NewRow",
+            "uIActionType" : "DEUIACTION"
+          },
+          "tooltip" : "新建行",
+          "showCaption" : false,
+          "showIcon" : true
+        }, {
+          "itemType" : "SEPERATOR",
+          "name" : "tbitem26",
+          "spanMode" : false
+        }, {
+          "getCapPSLanguageRes" : {
+            "lanResTag" : "TBB.TEXT.*.REMOVE"
+          },
+          "caption" : "删除",
+          "groupExtractMode" : "ITEM",
+          "itemType" : "DEUIACTION",
+          "name" : "tbitem8",
+          "noPrivDisplayMode" : 2,
+          "getPSAppViewUIAction" : {
+            "modelref" : true,
+            "id" : "toolbar_tbitem8"
+          },
+          "getPSSysImage" : {
+            "glyph" : "xf00d@FontAwesome",
+            "cssClass" : "fa fa-remove"
+          },
+          "getPSUIAction" : {
+            "actionTarget" : "MULTIKEY",
+            "getCapPSLanguageRes" : {
+              "lanResTag" : "TBB.TEXT.*.REMOVE"
+            },
+            "caption" : "删除",
+            "codeName" : "Remove",
+            "fullCodeName" : "Remove",
+            "name" : "表格界面_删除操作",
+            "getPSSysImage" : {
+              "glyph" : "xf00d@FontAwesome",
+              "cssClass" : "fa fa-remove"
+            },
+            "predefinedType" : "GRIDVIEW_REMOVEACTION",
+            "timeout" : 60000,
+            "getTooltipPSLanguageRes" : {
+              "lanResTag" : "TBB.TOOLTIP.*.REMOVE"
+            },
+            "uIActionMode" : "SYS",
+            "uIActionTag" : "Remove",
+            "uIActionType" : "DEUIACTION"
+          },
+          "tooltip" : "删除",
+          "getTooltipPSLanguageRes" : {
+            "lanResTag" : "TBB.TOOLTIP.*.REMOVE"
+          },
+          "showCaption" : true,
+          "showIcon" : true
+        }, {
+          "itemType" : "SEPERATOR",
+          "name" : "tbitem9",
+          "spanMode" : false
+        }, {
+          "getCapPSLanguageRes" : {
+            "lanResTag" : "TBB.TEXT.*.EXPORT"
+          },
+          "caption" : "导出",
+          "groupExtractMode" : "ITEM",
+          "itemType" : "DEUIACTION",
+          "name" : "tbitem13",
+          "noPrivDisplayMode" : 2,
+          "getPSAppViewUIAction" : {
+            "modelref" : true,
+            "id" : "toolbar_tbitem13"
+          },
+          "getPSSysImage" : {
+            "glyph" : "xf1c3@FontAwesome",
+            "cssClass" : "fa fa-file-excel-o"
+          },
+          "getPSUIAction" : {
+            "getCapPSLanguageRes" : {
+              "lanResTag" : "TBB.TEXT.*.EXPORT"
+            },
+            "caption" : "导出",
+            "codeName" : "ExportExcel",
+            "fullCodeName" : "ExportExcel",
+            "name" : "表格界面_导出操作（Excel）",
+            "getPSSysImage" : {
+              "glyph" : "xf1c3@FontAwesome",
+              "cssClass" : "fa fa-file-excel-o"
+            },
+            "predefinedType" : "GRIDVIEW_EXPORTACTION",
+            "timeout" : 60000,
+            "getTooltipPSLanguageRes" : {
+              "lanResTag" : "TBB.TOOLTIP.*.EXPORT"
+            },
+            "uIActionMode" : "SYS",
+            "uIActionTag" : "ExportExcel",
+            "uIActionType" : "DEUIACTION"
+          },
+          "tooltip" : "导出",
+          "getTooltipPSLanguageRes" : {
+            "lanResTag" : "TBB.TOOLTIP.*.EXPORT"
+          },
+          "showCaption" : true,
+          "showIcon" : true
+        }, {
+          "itemType" : "SEPERATOR",
+          "name" : "tbitem10",
+          "spanMode" : false
+        }, {
+          "caption" : "其它",
+          "itemType" : "ITEMS",
+          "name" : "tbitem16",
+          "getPSDEToolbarItems" : [ {
+            "getCapPSLanguageRes" : {
+              "lanResTag" : "MENUITEM.CAPTION.*.EXPORTSRF"
+            },
+            "caption" : "导出数据模型",
+            "groupExtractMode" : "ITEM",
+            "itemType" : "DEUIACTION",
+            "name" : "tbitem21",
+            "noPrivDisplayMode" : 2,
+            "getPSAppViewUIAction" : {
+              "modelref" : true,
+              "id" : "toolbar_tbitem21"
+            },
+            "getPSSysImage" : {
+              "glyph" : "xf019@FontAwesome",
+              "cssClass" : "fa fa-download"
+            },
+            "getPSUIAction" : {
+              "getCapPSLanguageRes" : {
+                "lanResTag" : "MENUITEM.CAPTION.*.EXPORTSRF"
+              },
+              "caption" : "导出数据模型",
+              "codeName" : "ExportModel",
+              "fullCodeName" : "ExportModel",
+              "name" : "表格界面_导出数据模型",
+              "getPSSysImage" : {
+                "glyph" : "xf019@FontAwesome",
+                "cssClass" : "fa fa-download"
+              },
+              "predefinedType" : "GRIDVIEW_EXPORTXMLACTION",
+              "timeout" : 60000,
+              "uIActionMode" : "SYS",
+              "uIActionTag" : "ExportModel",
+              "uIActionType" : "DEUIACTION"
+            },
+            "tooltip" : "导出数据模型",
+            "showCaption" : true,
+            "showIcon" : true
+          }, {
+            "caption" : "数据导入",
+            "groupExtractMode" : "ITEM",
+            "itemType" : "DEUIACTION",
+            "name" : "tbitem23",
+            "noPrivDisplayMode" : 2,
+            "getPSAppViewUIAction" : {
+              "modelref" : true,
+              "id" : "toolbar_tbitem23"
+            },
+            "getPSSysImage" : {
+              "glyph" : "xf093@FontAwesome",
+              "cssClass" : "fa fa-upload"
+            },
+            "getPSUIAction" : {
+              "caption" : "数据导入",
+              "codeName" : "Import",
+              "fullCodeName" : "Import",
+              "name" : "表格界面_数据导入栏",
+              "getPSSysImage" : {
+                "glyph" : "xf093@FontAwesome",
+                "cssClass" : "fa fa-upload"
+              },
+              "predefinedType" : "GRIDVIEW_IMPORTBAR",
+              "timeout" : 60000,
+              "uIActionMode" : "SYS",
+              "uIActionTag" : "Import",
+              "uIActionType" : "DEUIACTION"
+            },
+            "tooltip" : "数据导入",
+            "showCaption" : true,
+            "showIcon" : true
+          } ],
+          "tooltip" : "其它",
+          "showCaption" : true,
+          "showIcon" : true
+        }, {
+          "itemType" : "SEPERATOR",
+          "name" : "tbitem17",
+          "spanMode" : false
+        }, {
+          "getCapPSLanguageRes" : {
+            "lanResTag" : "TBB.TEXT.*.FILTER"
+          },
+          "caption" : "过滤",
+          "groupExtractMode" : "ITEM",
+          "itemType" : "DEUIACTION",
+          "name" : "tbitem19",
+          "noPrivDisplayMode" : 2,
+          "getPSAppViewUIAction" : {
+            "modelref" : true,
+            "id" : "toolbar_tbitem19"
+          },
+          "getPSSysImage" : {
+            "glyph" : "xf0b0@FontAwesome",
+            "cssClass" : "fa fa-filter"
+          },
+          "getPSUIAction" : {
+            "getCapPSLanguageRes" : {
+              "lanResTag" : "TBB.TEXT.*.FILTER"
+            },
+            "caption" : "过滤",
+            "codeName" : "ToggleFilter",
+            "fullCodeName" : "ToggleFilter",
+            "name" : "表格界面_搜索栏",
+            "getPSSysImage" : {
+              "glyph" : "xf0b0@FontAwesome",
+              "cssClass" : "fa fa-filter"
+            },
+            "predefinedType" : "GRIDVIEW_SEARCHBAR",
+            "timeout" : 60000,
+            "getTooltipPSLanguageRes" : {
+              "lanResTag" : "TBB.TOOLTIP.*.FILTER"
+            },
+            "uIActionMode" : "SYS",
+            "uIActionTag" : "ToggleFilter",
+            "uIActionType" : "DEUIACTION",
+            "enableToggleMode" : true
+          },
+          "tooltip" : "过滤",
+          "getTooltipPSLanguageRes" : {
+            "lanResTag" : "TBB.TOOLTIP.*.FILTER"
+          },
+          "enableToggleMode" : true,
+          "showCaption" : true,
+          "showIcon" : true
+        }, {
+          "getCapPSLanguageRes" : {
+            "lanResTag" : "TBB.TEXT.*.HELP"
+          },
+          "caption" : "帮助",
+          "groupExtractMode" : "ITEM",
+          "itemType" : "DEUIACTION",
+          "name" : "tbitem18",
+          "noPrivDisplayMode" : 2,
+          "getPSAppViewUIAction" : {
+            "modelref" : true,
+            "id" : "toolbar_tbitem18"
+          },
+          "getPSSysImage" : {
+            "glyph" : "xf128@FontAwesome",
+            "cssClass" : "fa fa-question"
+          },
+          "getPSUIAction" : {
+            "getCapPSLanguageRes" : {
+              "lanResTag" : "TBB.TEXT.*.HELP"
+            },
+            "caption" : "帮助",
+            "codeName" : "Help",
+            "fullCodeName" : "Help",
+            "name" : "表格界面_帮助操作",
+            "getPSSysImage" : {
+              "glyph" : "xf128@FontAwesome",
+              "cssClass" : "fa fa-question"
+            },
+            "predefinedType" : "GRIDVIEW_HELPACTION",
+            "timeout" : 60000,
+            "getTooltipPSLanguageRes" : {
+              "lanResTag" : "TBB.TOOLTIP.*.HELP"
+            },
+            "uIActionMode" : "SYS",
+            "uIActionTag" : "Help",
+            "uIActionType" : "DEUIACTION"
+          },
+          "tooltip" : "帮助",
+          "getTooltipPSLanguageRes" : {
+            "lanResTag" : "TBB.TOOLTIP.*.HELP"
+          },
+          "showCaption" : true,
+          "showIcon" : true
+        } ],
+        "modelid" : "b912ff540f5614f63914a38067d84728",
+        "modeltype" : "PSDETOOLBAR"
+      } ],
+      "getPSDEViewCodeName" : "StuInfoList",
+      "getPSDEViewId" : "383860AF-2511-4D27-BDC0-224543703E08",
+      "getPSViewLayoutPanel" : {
+        "codeName" : "Layoutpanel",
+        "controlStyle" : "APPDEGRIDVIEW",
+        "controlType" : "VIEWLAYOUTPANEL",
+        "name" : "layoutpanel",
+        "getPSAppDataEntity" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfof.json"
+        },
+        "getPSControlParam" : { },
+        "layoutBodyOnly" : true,
+        "layoutPanel" : true,
+        "useDefaultLayout" : true
+      },
+      "title" : "学员信息清单",
+      "viewStyle" : "DEFAULT",
+      "viewType" : "DEGRIDVIEW",
+      "xDataControlName" : "grid",
+      "enableDP" : true,
+      "enableExport" : true,
+      "enableFilter" : true,
+      "enableImport" : true,
+      "enableQuickSearch" : true,
+      "enableRowEdit" : true,
       "enableSearch" : true,
       "rowEditDefault" : false,
       "modelid" : "b74ad521922bd452887df03b93c355c7",

trainsys-provider/pom.xml

@@ -34,7 +34,7 @@
 
     <profiles>
         <profile>
-            <id>runtime</id>
+            <id>trainsys</id>
             <build>
                 <resources>
                     <resource>

trainsys-provider/src/main/docker/Dockerfile

@@ -10,6 +10,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Duser.timezone=$TZ -Djava.security.egd=file:/dev/./urandom -jar /trainsys-provider.jar
 
-EXPOSE 8081
+EXPOSE 50000
 
 ADD trainsys-provider.jar /trainsys-provider.jar

trainsys-provider/src/main/docker/trainsys-provider-trainsys-k8s.yaml

@@ -22,7 +22,32 @@ spec:
         image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
         imagePullPolicy: Always
         ports:
-        - containerPort: 8081
+        - containerPort: 50000
+        env:
+        - name: SPRING_CLOUD_NACOS_DISCOVERY_IP
+          value: "172.16.240.140"      
+        - name: SERVER_PORT
+          value: "50000"
+        - name: SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR
+          value: "172.16.240.140:8848"
+        - name: SPRING_REDIS_HOST
+          value: "127.0.0.1"
+        - name: SPRING_REDIS_PORT
+          value: "6379"
+        - name: SPRING_REDIS_DATABASE
+          value: "0"
+        - name: SPRING_DATASOURCE_USERNAME
+          value: "a_LAB01_d23cc850e"
+        - name: SPRING_DATASOURCE_PASSWORD
+          value: "f9Df4556"
+        - name: SPRING_DATASOURCE_URL
+          value: "jdbc:mysql://172.16.186.185:3306/a_LAB01_d23cc850e?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&serverTimezone=Asia/Shanghai&allowMultiQueries=true&serverTimezone=GMT%2B8"
+        - name: SPRING_DATASOURCE_DRIVER-CLASS-NAME
+          value: "com.mysql.jdbc.Driver"
+        - name: SPRING_DATASOURCE_DEFAULTSCHEMA
+          value: "a_LAB01_d23cc850e"
+        - name: NACOS
+          value: "172.16.240.140:8848"      
 
 ---
 apiVersion: v1
@@ -35,9 +60,9 @@ spec:
   type: NodePort
   ports:
   - name: http
-    port: 8081
-    targetPort: 8081
-    nodePort: 8081
+    port: 50000
+    targetPort: 50000
+    nodePort: 50000
     protocol: TCP
   selector:
     app: trainsys-provider

trainsys-provider/src/main/docker/trainsys-provider-trainsys.yaml

@@ -3,9 +3,23 @@ services:
   trainsys-provider:
     image: dstimage
     ports:
-      - "8081:8081"
+      - "50000:50000"
     networks:
       - agent_network
+    environment:
+      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.140
+      - SERVER_PORT=50000
+      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.140:8848
+      - SPRING_CLOUD_NACOS_CONFIG_SERVER-ADDR=172.16.240.140:8848
+      - SPRING_REDIS_HOST=127.0.0.1
+      - SPRING_REDIS_PORT=6379
+      - SPRING_REDIS_DATABASE=0
+      - SPRING_DATASOURCE_USERNAME=a_LAB01_d23cc850e
+      - SPRING_DATASOURCE_PASSWORD=f9Df4556
+      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_d23cc850e?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&serverTimezone=Asia/Shanghai&allowMultiQueries=true&serverTimezone=GMT%2B8
+      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
+      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_d23cc850e
+      - NACOS=172.16.240.140:8848
     deploy:
       resources:
            limits: