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

config.xml

@@ -55,6 +55,12 @@
 	  git clone -b master $para2 trainsys/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd trainsys/
+      mvn clean package -Ptrainsys
+      mvn install -Ptrainsys
+      cd trainsys-provider
+      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/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSSYSAPP.json

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

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

@@ -1999,34 +1999,34 @@
             "getPSAppViewLogics" : [ {
               "logicTrigger" : "CUSTOM",
               "logicType" : "APPVIEWUIACTION",
-              "name" : "grid_uagridcolumn1_u479f517_click",
+              "name" : "grid_uagridcolumn1_ua98d563_click",
               "getPSAppViewUIAction" : {
                 "modelref" : true,
-                "id" : "表格界面_编辑操作"
+                "id" : "表格界面_行编辑开关操作"
               }
             }, {
               "logicTrigger" : "CUSTOM",
               "logicType" : "APPVIEWUIACTION",
-              "name" : "grid_uagridcolumn1_ua98d563_click",
+              "name" : "grid_uagridcolumn1_u479f517_click",
               "getPSAppViewUIAction" : {
                 "modelref" : true,
-                "id" : "表格界面_行编辑开关操作"
+                "id" : "表格界面_编辑操作"
               }
             } ],
             "getPSAppViewUIActions" : [ {
-              "name" : "表格界面_编辑操作",
+              "name" : "表格界面_行编辑开关操作",
               "getPSUIAction" : {
                 "modelref" : true,
-                "id" : "Edit"
+                "id" : "ToggleRowEdit"
               },
-              "uIActionTarget" : "SINGLEKEY",
               "xDataControlName" : "grid"
             }, {
-              "name" : "表格界面_行编辑开关操作",
+              "name" : "表格界面_编辑操作",
               "getPSUIAction" : {
                 "modelref" : true,
-                "id" : "ToggleRowEdit"
+                "id" : "Edit"
               },
+              "uIActionTarget" : "SINGLEKEY",
               "xDataControlName" : "grid"
             } ],
             "getPSControlHandler" : {
@@ -2258,6 +2258,30 @@
                 "mOSFilePath" : "pssysapps/Web/psappdataentities/Reginfo/psappdeuagroups/A046596b6afb50f9e5b",
                 "name" : "操作列",
                 "getPSUIActionGroupDetails" : [ {
+                  "detailType" : "DEUIACTION",
+                  "name" : "ua98d563",
+                  "getPSUIAction" : {
+                    "caption" : "行编辑",
+                    "codeName" : "ToggleRowEdit",
+                    "fullCodeName" : "ToggleRowEdit",
+                    "mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
+                    "name" : "表格界面_行编辑开关操作",
+                    "getPSSysImage" : {
+                      "glyph" : "xf0ce@FontAwesome",
+                      "cssClass" : "fa fa-table"
+                    },
+                    "predefinedType" : "GRIDVIEW_ROWEDITACTION",
+                    "rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
+                    "timeout" : 60000,
+                    "uIActionMode" : "SYS",
+                    "uIActionTag" : "ToggleRowEdit",
+                    "uIActionType" : "DEUIACTION",
+                    "enableToggleMode" : true
+                  },
+                  "addSeparator" : true,
+                  "showCaption" : true,
+                  "showIcon" : false
+                }, {
                   "detailType" : "DEUIACTION",
                   "name" : "u479f517",
                   "getPSUIAction" : {
@@ -2299,30 +2323,6 @@
                   "addSeparator" : true,
                   "showCaption" : true,
                   "showIcon" : true
-                }, {
-                  "detailType" : "DEUIACTION",
-                  "name" : "ua98d563",
-                  "getPSUIAction" : {
-                    "caption" : "行编辑",
-                    "codeName" : "ToggleRowEdit",
-                    "fullCodeName" : "ToggleRowEdit",
-                    "mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
-                    "name" : "表格界面_行编辑开关操作",
-                    "getPSSysImage" : {
-                      "glyph" : "xf0ce@FontAwesome",
-                      "cssClass" : "fa fa-table"
-                    },
-                    "predefinedType" : "GRIDVIEW_ROWEDITACTION",
-                    "rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
-                    "timeout" : 60000,
-                    "uIActionMode" : "SYS",
-                    "uIActionTag" : "ToggleRowEdit",
-                    "uIActionType" : "DEUIACTION",
-                    "enableToggleMode" : true
-                  },
-                  "addSeparator" : true,
-                  "showCaption" : true,
-                  "showIcon" : false
                 } ],
                 "rTMOSFilePath" : "pssysapps/Web/psappdataentities/Reginfo/psappdeuagroups/A046596b6afb50f9e5b",
                 "uniqueTag" : "Reginfo__A046596b6afb50f9e5b"

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

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

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

 {
   "codeName" : "Chart",
   "controlType" : "CHART",
-  "coordinateSystem" : "PARALLEL",
+  "coordinateSystem" : "XY",
   "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSCHARTS/Chart.json",
   "getFetchPSControlAction" : {
     "modelref" : true,
@@ -17,10 +17,10 @@
   "getPSChartCoordinateSystems" : [ {
     "eChartsType" : "cartesian2d",
     "index" : 0,
-    "name" : "[bar_0]直角坐标系[0]",
+    "name" : "[line_0]直角坐标系[0]",
     "getPSChartGrid" : {
       "index" : 0,
-      "name" : "[bar_0]直角坐标系[0]",
+      "name" : "[line_0]直角坐标系[0]",
       "getPSChartCoordinateSystem" : {
         "modelref" : true,
         "id" : "0"
@@ -54,28 +54,18 @@
   } ],
   "getPSChartDataSets" : [ {
     "index" : 0,
-    "name" : "bar_0-DEFAULT",
+    "name" : "line_0-DEFAULT",
     "getPSChartDataSetFields" : [ {
       "index" : 0,
-      "name" : "deptId",
+      "name" : "ss",
       "groupField" : true,
       "id" : "0"
-    }, {
-      "index" : 1,
-      "name" : "test",
-      "groupField" : true,
-      "id" : "1"
-    }, {
-      "index" : 2,
-      "name" : "age",
-      "groupField" : true,
-      "id" : "2"
     } ],
     "id" : "0"
   } ],
   "getPSChartGrids" : [ {
     "index" : 0,
-    "name" : "[bar_0]直角坐标系[0]",
+    "name" : "[line_0]直角坐标系[0]",
     "getPSChartCoordinateSystem" : {
       "modelref" : true,
       "id" : "0"
@@ -92,7 +82,6 @@
     "id" : "0"
   } ],
   "getPSChartXAxises" : [ {
-    "caption" : "deptId",
     "eChartsPos" : "xAxis",
     "eChartsType" : "category",
     "index" : 0,
@@ -102,7 +91,6 @@
     "id" : "0"
   } ],
   "getPSChartYAxises" : [ {
-    "caption" : "age",
     "eChartsPos" : "yAxis",
     "eChartsType" : "value",
     "index" : 0,
@@ -127,12 +115,10 @@
     "id" : "0"
   },
   "getPSDEChartSerieses" : [ {
-    "caption" : "柱状图",
-    "catalogField" : "deptId",
-    "eChartsType" : "bar",
-    "idField" : "age",
+    "catalogField" : "ss",
+    "eChartsType" : "line",
     "index" : 0,
-    "name" : "bar_0",
+    "name" : "line_0",
     "getPSChartCoordinateSystem" : {
       "modelref" : true,
       "id" : "0"
@@ -143,8 +129,6 @@
     },
     "getPSChartSeriesEncode" : {
       "index" : 0,
-      "itemId" : "age",
-      "itemName" : "test",
       "name" : "坐标系编码",
       "getPSChartXAxis" : {
         "modelref" : true,
@@ -155,20 +139,17 @@
         "id" : "0"
       },
       "type" : "XY",
-      "x" : [ "deptId" ],
-      "y" : [ "age" ],
+      "x" : [ "ss" ],
       "id" : "0"
     },
-    "seriesField" : "test",
     "seriesLayoutBy" : "column",
-    "seriesType" : "bar",
-    "valueField" : "age",
+    "seriesType" : "line",
     "enableChartDataSet" : true,
     "stack" : false
   } ],
   "getPSDEChartTitle" : {
     "index" : 0,
-    "subTitle" : "test2",
+    "subTitle" : "test22aabs2a",
     "title" : "test",
     "showTitle" : true,
     "id" : "0"

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

@@ -69,6 +69,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" : {
@@ -100,23 +117,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/Reginfo/PSGRIDS/Main.json

@@ -24,34 +24,34 @@
   "getPSAppViewLogics" : [ {
     "logicTrigger" : "CUSTOM",
     "logicType" : "APPVIEWUIACTION",
-    "name" : "grid_uagridcolumn1_u479f517_click",
+    "name" : "grid_uagridcolumn1_ua98d563_click",
     "getPSAppViewUIAction" : {
       "modelref" : true,
-      "id" : "表格界面_编辑操作"
+      "id" : "表格界面_行编辑开关操作"
     }
   }, {
     "logicTrigger" : "CUSTOM",
     "logicType" : "APPVIEWUIACTION",
-    "name" : "grid_uagridcolumn1_ua98d563_click",
+    "name" : "grid_uagridcolumn1_u479f517_click",
     "getPSAppViewUIAction" : {
       "modelref" : true,
-      "id" : "表格界面_行编辑开关操作"
+      "id" : "表格界面_编辑操作"
     }
   } ],
   "getPSAppViewUIActions" : [ {
-    "name" : "表格界面_编辑操作",
+    "name" : "表格界面_行编辑开关操作",
     "getPSUIAction" : {
       "modelref" : true,
-      "id" : "Edit"
+      "id" : "ToggleRowEdit"
     },
-    "uIActionTarget" : "SINGLEKEY",
     "xDataControlName" : "grid"
   }, {
-    "name" : "表格界面_行编辑开关操作",
+    "name" : "表格界面_编辑操作",
     "getPSUIAction" : {
       "modelref" : true,
-      "id" : "ToggleRowEdit"
+      "id" : "Edit"
     },
+    "uIActionTarget" : "SINGLEKEY",
     "xDataControlName" : "grid"
   } ],
   "getPSControlLogics" : [ {
@@ -196,6 +196,30 @@
       "mOSFilePath" : "pssysapps/Web/psappdataentities/Reginfo/psappdeuagroups/A046596b6afb50f9e5b",
       "name" : "操作列",
       "getPSUIActionGroupDetails" : [ {
+        "detailType" : "DEUIACTION",
+        "name" : "ua98d563",
+        "getPSUIAction" : {
+          "caption" : "行编辑",
+          "codeName" : "ToggleRowEdit",
+          "fullCodeName" : "ToggleRowEdit",
+          "mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
+          "name" : "表格界面_行编辑开关操作",
+          "getPSSysImage" : {
+            "glyph" : "xf0ce@FontAwesome",
+            "cssClass" : "fa fa-table"
+          },
+          "predefinedType" : "GRIDVIEW_ROWEDITACTION",
+          "rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
+          "timeout" : 60000,
+          "uIActionMode" : "SYS",
+          "uIActionTag" : "ToggleRowEdit",
+          "uIActionType" : "DEUIACTION",
+          "enableToggleMode" : true
+        },
+        "addSeparator" : true,
+        "showCaption" : true,
+        "showIcon" : false
+      }, {
         "detailType" : "DEUIACTION",
         "name" : "u479f517",
         "getPSUIAction" : {
@@ -237,30 +261,6 @@
         "addSeparator" : true,
         "showCaption" : true,
         "showIcon" : true
-      }, {
-        "detailType" : "DEUIACTION",
-        "name" : "ua98d563",
-        "getPSUIAction" : {
-          "caption" : "行编辑",
-          "codeName" : "ToggleRowEdit",
-          "fullCodeName" : "ToggleRowEdit",
-          "mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
-          "name" : "表格界面_行编辑开关操作",
-          "getPSSysImage" : {
-            "glyph" : "xf0ce@FontAwesome",
-            "cssClass" : "fa fa-table"
-          },
-          "predefinedType" : "GRIDVIEW_ROWEDITACTION",
-          "rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
-          "timeout" : 60000,
-          "uIActionMode" : "SYS",
-          "uIActionTag" : "ToggleRowEdit",
-          "uIActionType" : "DEUIACTION",
-          "enableToggleMode" : true
-        },
-        "addSeparator" : true,
-        "showCaption" : true,
-        "showIcon" : false
       } ],
       "rTMOSFilePath" : "pssysapps/Web/psappdataentities/Reginfo/psappdeuagroups/A046596b6afb50f9e5b",
       "uniqueTag" : "Reginfo__A046596b6afb50f9e5b"

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

@@ -614,34 +614,34 @@
           "getPSAppViewLogics" : [ {
             "logicTrigger" : "CUSTOM",
             "logicType" : "APPVIEWUIACTION",
-            "name" : "grid_uagridcolumn1_u479f517_click",
+            "name" : "grid_uagridcolumn1_ua98d563_click",
             "getPSAppViewUIAction" : {
               "modelref" : true,
-              "id" : "表格界面_编辑操作"
+              "id" : "表格界面_行编辑开关操作"
             }
           }, {
             "logicTrigger" : "CUSTOM",
             "logicType" : "APPVIEWUIACTION",
-            "name" : "grid_uagridcolumn1_ua98d563_click",
+            "name" : "grid_uagridcolumn1_u479f517_click",
             "getPSAppViewUIAction" : {
               "modelref" : true,
-              "id" : "表格界面_行编辑开关操作"
+              "id" : "表格界面_编辑操作"
             }
           } ],
           "getPSAppViewUIActions" : [ {
-            "name" : "表格界面_编辑操作",
+            "name" : "表格界面_行编辑开关操作",
             "getPSUIAction" : {
               "modelref" : true,
-              "id" : "Edit"
+              "id" : "ToggleRowEdit"
             },
-            "uIActionTarget" : "SINGLEKEY",
             "xDataControlName" : "grid"
           }, {
-            "name" : "表格界面_行编辑开关操作",
+            "name" : "表格界面_编辑操作",
             "getPSUIAction" : {
               "modelref" : true,
-              "id" : "ToggleRowEdit"
+              "id" : "Edit"
             },
+            "uIActionTarget" : "SINGLEKEY",
             "xDataControlName" : "grid"
           } ],
           "getPSControlHandler" : {
@@ -873,6 +873,30 @@
               "mOSFilePath" : "pssysapps/Web/psappdataentities/Reginfo/psappdeuagroups/A046596b6afb50f9e5b",
               "name" : "操作列",
               "getPSUIActionGroupDetails" : [ {
+                "detailType" : "DEUIACTION",
+                "name" : "ua98d563",
+                "getPSUIAction" : {
+                  "caption" : "行编辑",
+                  "codeName" : "ToggleRowEdit",
+                  "fullCodeName" : "ToggleRowEdit",
+                  "mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
+                  "name" : "表格界面_行编辑开关操作",
+                  "getPSSysImage" : {
+                    "glyph" : "xf0ce@FontAwesome",
+                    "cssClass" : "fa fa-table"
+                  },
+                  "predefinedType" : "GRIDVIEW_ROWEDITACTION",
+                  "rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
+                  "timeout" : 60000,
+                  "uIActionMode" : "SYS",
+                  "uIActionTag" : "ToggleRowEdit",
+                  "uIActionType" : "DEUIACTION",
+                  "enableToggleMode" : true
+                },
+                "addSeparator" : true,
+                "showCaption" : true,
+                "showIcon" : false
+              }, {
                 "detailType" : "DEUIACTION",
                 "name" : "u479f517",
                 "getPSUIAction" : {
@@ -914,30 +938,6 @@
                 "addSeparator" : true,
                 "showCaption" : true,
                 "showIcon" : true
-              }, {
-                "detailType" : "DEUIACTION",
-                "name" : "ua98d563",
-                "getPSUIAction" : {
-                  "caption" : "行编辑",
-                  "codeName" : "ToggleRowEdit",
-                  "fullCodeName" : "ToggleRowEdit",
-                  "mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
-                  "name" : "表格界面_行编辑开关操作",
-                  "getPSSysImage" : {
-                    "glyph" : "xf0ce@FontAwesome",
-                    "cssClass" : "fa fa-table"
-                  },
-                  "predefinedType" : "GRIDVIEW_ROWEDITACTION",
-                  "rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
-                  "timeout" : 60000,
-                  "uIActionMode" : "SYS",
-                  "uIActionTag" : "ToggleRowEdit",
-                  "uIActionType" : "DEUIACTION",
-                  "enableToggleMode" : true
-                },
-                "addSeparator" : true,
-                "showCaption" : true,
-                "showIcon" : false
               } ],
               "rTMOSFilePath" : "pssysapps/Web/psappdataentities/Reginfo/psappdeuagroups/A046596b6afb50f9e5b",
               "uniqueTag" : "Reginfo__A046596b6afb50f9e5b"

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

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

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

@@ -206,7 +206,7 @@
   }, {
     "codeName" : "Chart",
     "controlType" : "CHART",
-    "coordinateSystem" : "PARALLEL",
+    "coordinateSystem" : "XY",
     "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSCHARTS/Chart.json",
     "getFetchPSControlAction" : {
       "modelref" : true,
@@ -222,10 +222,10 @@
     "getPSChartCoordinateSystems" : [ {
       "eChartsType" : "cartesian2d",
       "index" : 0,
-      "name" : "[bar_0]直角坐标系[0]",
+      "name" : "[line_0]直角坐标系[0]",
       "getPSChartGrid" : {
         "index" : 0,
-        "name" : "[bar_0]直角坐标系[0]",
+        "name" : "[line_0]直角坐标系[0]",
         "getPSChartCoordinateSystem" : {
           "modelref" : true,
           "id" : "0"
@@ -259,28 +259,18 @@
     } ],
     "getPSChartDataSets" : [ {
       "index" : 0,
-      "name" : "bar_0-DEFAULT",
+      "name" : "line_0-DEFAULT",
       "getPSChartDataSetFields" : [ {
         "index" : 0,
-        "name" : "deptId",
+        "name" : "ss",
         "groupField" : true,
         "id" : "0"
-      }, {
-        "index" : 1,
-        "name" : "test",
-        "groupField" : true,
-        "id" : "1"
-      }, {
-        "index" : 2,
-        "name" : "age",
-        "groupField" : true,
-        "id" : "2"
       } ],
       "id" : "0"
     } ],
     "getPSChartGrids" : [ {
       "index" : 0,
-      "name" : "[bar_0]直角坐标系[0]",
+      "name" : "[line_0]直角坐标系[0]",
       "getPSChartCoordinateSystem" : {
         "modelref" : true,
         "id" : "0"
@@ -297,7 +287,6 @@
       "id" : "0"
     } ],
     "getPSChartXAxises" : [ {
-      "caption" : "deptId",
       "eChartsPos" : "xAxis",
       "eChartsType" : "category",
       "index" : 0,
@@ -307,7 +296,6 @@
       "id" : "0"
     } ],
     "getPSChartYAxises" : [ {
-      "caption" : "age",
       "eChartsPos" : "yAxis",
       "eChartsType" : "value",
       "index" : 0,
@@ -406,12 +394,10 @@
       "id" : "0"
     },
     "getPSDEChartSerieses" : [ {
-      "caption" : "柱状图",
-      "catalogField" : "deptId",
-      "eChartsType" : "bar",
-      "idField" : "age",
+      "catalogField" : "ss",
+      "eChartsType" : "line",
       "index" : 0,
-      "name" : "bar_0",
+      "name" : "line_0",
       "getPSChartCoordinateSystem" : {
         "modelref" : true,
         "id" : "0"
@@ -422,8 +408,6 @@
       },
       "getPSChartSeriesEncode" : {
         "index" : 0,
-        "itemId" : "age",
-        "itemName" : "test",
         "name" : "坐标系编码",
         "getPSChartXAxis" : {
           "modelref" : true,
@@ -434,20 +418,17 @@
           "id" : "0"
         },
         "type" : "XY",
-        "x" : [ "deptId" ],
-        "y" : [ "age" ],
+        "x" : [ "ss" ],
         "id" : "0"
       },
-      "seriesField" : "test",
       "seriesLayoutBy" : "column",
-      "seriesType" : "bar",
-      "valueField" : "age",
+      "seriesType" : "line",
       "enableChartDataSet" : true,
       "stack" : false
     } ],
     "getPSDEChartTitle" : {
       "index" : 0,
-      "subTitle" : "test2",
+      "subTitle" : "test22aabs2a",
       "title" : "test",
       "showTitle" : true,
       "id" : "0"

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

@@ -1253,6 +1253,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" : {
@@ -1284,23 +1301,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/ReginfoGridView.json

@@ -394,34 +394,34 @@
     "getPSAppViewLogics" : [ {
       "logicTrigger" : "CUSTOM",
       "logicType" : "APPVIEWUIACTION",
-      "name" : "grid_uagridcolumn1_u479f517_click",
+      "name" : "grid_uagridcolumn1_ua98d563_click",
       "getPSAppViewUIAction" : {
         "modelref" : true,
-        "id" : "表格界面_编辑操作"
+        "id" : "表格界面_行编辑开关操作"
       }
     }, {
       "logicTrigger" : "CUSTOM",
       "logicType" : "APPVIEWUIACTION",
-      "name" : "grid_uagridcolumn1_ua98d563_click",
+      "name" : "grid_uagridcolumn1_u479f517_click",
       "getPSAppViewUIAction" : {
         "modelref" : true,
-        "id" : "表格界面_行编辑开关操作"
+        "id" : "表格界面_编辑操作"
       }
     } ],
     "getPSAppViewUIActions" : [ {
-      "name" : "表格界面_编辑操作",
+      "name" : "表格界面_行编辑开关操作",
       "getPSUIAction" : {
         "modelref" : true,
-        "id" : "Edit"
+        "id" : "ToggleRowEdit"
       },
-      "uIActionTarget" : "SINGLEKEY",
       "xDataControlName" : "grid"
     }, {
-      "name" : "表格界面_行编辑开关操作",
+      "name" : "表格界面_编辑操作",
       "getPSUIAction" : {
         "modelref" : true,
-        "id" : "ToggleRowEdit"
+        "id" : "Edit"
       },
+      "uIActionTarget" : "SINGLEKEY",
       "xDataControlName" : "grid"
     } ],
     "getPSControlHandler" : {
@@ -653,6 +653,30 @@
         "mOSFilePath" : "pssysapps/Web/psappdataentities/Reginfo/psappdeuagroups/A046596b6afb50f9e5b",
         "name" : "操作列",
         "getPSUIActionGroupDetails" : [ {
+          "detailType" : "DEUIACTION",
+          "name" : "ua98d563",
+          "getPSUIAction" : {
+            "caption" : "行编辑",
+            "codeName" : "ToggleRowEdit",
+            "fullCodeName" : "ToggleRowEdit",
+            "mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
+            "name" : "表格界面_行编辑开关操作",
+            "getPSSysImage" : {
+              "glyph" : "xf0ce@FontAwesome",
+              "cssClass" : "fa fa-table"
+            },
+            "predefinedType" : "GRIDVIEW_ROWEDITACTION",
+            "rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
+            "timeout" : 60000,
+            "uIActionMode" : "SYS",
+            "uIActionTag" : "ToggleRowEdit",
+            "uIActionType" : "DEUIACTION",
+            "enableToggleMode" : true
+          },
+          "addSeparator" : true,
+          "showCaption" : true,
+          "showIcon" : false
+        }, {
           "detailType" : "DEUIACTION",
           "name" : "u479f517",
           "getPSUIAction" : {
@@ -694,30 +718,6 @@
           "addSeparator" : true,
           "showCaption" : true,
           "showIcon" : true
-        }, {
-          "detailType" : "DEUIACTION",
-          "name" : "ua98d563",
-          "getPSUIAction" : {
-            "caption" : "行编辑",
-            "codeName" : "ToggleRowEdit",
-            "fullCodeName" : "ToggleRowEdit",
-            "mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
-            "name" : "表格界面_行编辑开关操作",
-            "getPSSysImage" : {
-              "glyph" : "xf0ce@FontAwesome",
-              "cssClass" : "fa fa-table"
-            },
-            "predefinedType" : "GRIDVIEW_ROWEDITACTION",
-            "rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
-            "timeout" : 60000,
-            "uIActionMode" : "SYS",
-            "uIActionTag" : "ToggleRowEdit",
-            "uIActionType" : "DEUIACTION",
-            "enableToggleMode" : true
-          },
-          "addSeparator" : true,
-          "showCaption" : true,
-          "showIcon" : false
         } ],
         "rTMOSFilePath" : "pssysapps/Web/psappdataentities/Reginfo/psappdeuagroups/A046596b6afb50f9e5b",
         "uniqueTag" : "Reginfo__A046596b6afb50f9e5b"

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

@@ -1205,34 +1205,34 @@
       "getPSAppViewLogics" : [ {
         "logicTrigger" : "CUSTOM",
         "logicType" : "APPVIEWUIACTION",
-        "name" : "gridexpbar_grid_uagridcolumn1_u479f517_click",
+        "name" : "gridexpbar_grid_uagridcolumn1_ua98d563_click",
         "getPSAppViewUIAction" : {
           "modelref" : true,
-          "id" : "表格界面_编辑操作"
+          "id" : "表格界面_行编辑开关操作"
         }
       }, {
         "logicTrigger" : "CUSTOM",
         "logicType" : "APPVIEWUIACTION",
-        "name" : "gridexpbar_grid_uagridcolumn1_ua98d563_click",
+        "name" : "gridexpbar_grid_uagridcolumn1_u479f517_click",
         "getPSAppViewUIAction" : {
           "modelref" : true,
-          "id" : "表格界面_行编辑开关操作"
+          "id" : "表格界面_编辑操作"
         }
       } ],
       "getPSAppViewUIActions" : [ {
-        "name" : "表格界面_编辑操作",
+        "name" : "表格界面_行编辑开关操作",
         "getPSUIAction" : {
           "modelref" : true,
-          "id" : "Edit"
+          "id" : "ToggleRowEdit"
         },
-        "uIActionTarget" : "SINGLEKEY",
         "xDataControlName" : "gridexpbar_grid"
       }, {
-        "name" : "表格界面_行编辑开关操作",
+        "name" : "表格界面_编辑操作",
         "getPSUIAction" : {
           "modelref" : true,
-          "id" : "ToggleRowEdit"
+          "id" : "Edit"
         },
+        "uIActionTarget" : "SINGLEKEY",
         "xDataControlName" : "gridexpbar_grid"
       } ],
       "getPSControlHandler" : {
@@ -1465,6 +1465,30 @@
           "mOSFilePath" : "pssysapps/Web/psappdataentities/Reginfo/psappdeuagroups/A046596b6afb50f9e5b",
           "name" : "操作列",
           "getPSUIActionGroupDetails" : [ {
+            "detailType" : "DEUIACTION",
+            "name" : "ua98d563",
+            "getPSUIAction" : {
+              "caption" : "行编辑",
+              "codeName" : "ToggleRowEdit",
+              "fullCodeName" : "ToggleRowEdit",
+              "mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
+              "name" : "表格界面_行编辑开关操作",
+              "getPSSysImage" : {
+                "glyph" : "xf0ce@FontAwesome",
+                "cssClass" : "fa fa-table"
+              },
+              "predefinedType" : "GRIDVIEW_ROWEDITACTION",
+              "rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
+              "timeout" : 60000,
+              "uIActionMode" : "SYS",
+              "uIActionTag" : "ToggleRowEdit",
+              "uIActionType" : "DEUIACTION",
+              "enableToggleMode" : true
+            },
+            "addSeparator" : true,
+            "showCaption" : true,
+            "showIcon" : false
+          }, {
             "detailType" : "DEUIACTION",
             "name" : "u479f517",
             "getPSUIAction" : {
@@ -1506,30 +1530,6 @@
             "addSeparator" : true,
             "showCaption" : true,
             "showIcon" : true
-          }, {
-            "detailType" : "DEUIACTION",
-            "name" : "ua98d563",
-            "getPSUIAction" : {
-              "caption" : "行编辑",
-              "codeName" : "ToggleRowEdit",
-              "fullCodeName" : "ToggleRowEdit",
-              "mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
-              "name" : "表格界面_行编辑开关操作",
-              "getPSSysImage" : {
-                "glyph" : "xf0ce@FontAwesome",
-                "cssClass" : "fa fa-table"
-              },
-              "predefinedType" : "GRIDVIEW_ROWEDITACTION",
-              "rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
-              "timeout" : 60000,
-              "uIActionMode" : "SYS",
-              "uIActionTag" : "ToggleRowEdit",
-              "uIActionType" : "DEUIACTION",
-              "enableToggleMode" : true
-            },
-            "addSeparator" : true,
-            "showCaption" : true,
-            "showIcon" : false
           } ],
           "rTMOSFilePath" : "pssysapps/Web/psappdataentities/Reginfo/psappdeuagroups/A046596b6afb50f9e5b",
           "uniqueTag" : "Reginfo__A046596b6afb50f9e5b"

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

@@ -113,34 +113,34 @@
       "getPSAppViewLogics" : [ {
         "logicTrigger" : "CUSTOM",
         "logicType" : "APPVIEWUIACTION",
-        "name" : "gridexpbar_grid_uagridcolumn1_u479f517_click",
+        "name" : "gridexpbar_grid_uagridcolumn1_ua98d563_click",
         "getPSAppViewUIAction" : {
           "modelref" : true,
-          "id" : "表格界面_编辑操作"
+          "id" : "表格界面_行编辑开关操作"
         }
       }, {
         "logicTrigger" : "CUSTOM",
         "logicType" : "APPVIEWUIACTION",
-        "name" : "gridexpbar_grid_uagridcolumn1_ua98d563_click",
+        "name" : "gridexpbar_grid_uagridcolumn1_u479f517_click",
         "getPSAppViewUIAction" : {
           "modelref" : true,
-          "id" : "表格界面_行编辑开关操作"
+          "id" : "表格界面_编辑操作"
         }
       } ],
       "getPSAppViewUIActions" : [ {
-        "name" : "表格界面_编辑操作",
+        "name" : "表格界面_行编辑开关操作",
         "getPSUIAction" : {
           "modelref" : true,
-          "id" : "Edit"
+          "id" : "ToggleRowEdit"
         },
-        "uIActionTarget" : "SINGLEKEY",
         "xDataControlName" : "gridexpbar_grid"
       }, {
-        "name" : "表格界面_行编辑开关操作",
+        "name" : "表格界面_编辑操作",
         "getPSUIAction" : {
           "modelref" : true,
-          "id" : "ToggleRowEdit"
+          "id" : "Edit"
         },
+        "uIActionTarget" : "SINGLEKEY",
         "xDataControlName" : "gridexpbar_grid"
       } ],
       "getPSControlHandler" : {
@@ -373,6 +373,30 @@
           "mOSFilePath" : "pssysapps/Web/psappdataentities/Reginfo/psappdeuagroups/A046596b6afb50f9e5b",
           "name" : "操作列",
           "getPSUIActionGroupDetails" : [ {
+            "detailType" : "DEUIACTION",
+            "name" : "ua98d563",
+            "getPSUIAction" : {
+              "caption" : "行编辑",
+              "codeName" : "ToggleRowEdit",
+              "fullCodeName" : "ToggleRowEdit",
+              "mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
+              "name" : "表格界面_行编辑开关操作",
+              "getPSSysImage" : {
+                "glyph" : "xf0ce@FontAwesome",
+                "cssClass" : "fa fa-table"
+              },
+              "predefinedType" : "GRIDVIEW_ROWEDITACTION",
+              "rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
+              "timeout" : 60000,
+              "uIActionMode" : "SYS",
+              "uIActionTag" : "ToggleRowEdit",
+              "uIActionType" : "DEUIACTION",
+              "enableToggleMode" : true
+            },
+            "addSeparator" : true,
+            "showCaption" : true,
+            "showIcon" : false
+          }, {
             "detailType" : "DEUIACTION",
             "name" : "u479f517",
             "getPSUIAction" : {
@@ -414,30 +438,6 @@
             "addSeparator" : true,
             "showCaption" : true,
             "showIcon" : true
-          }, {
-            "detailType" : "DEUIACTION",
-            "name" : "ua98d563",
-            "getPSUIAction" : {
-              "caption" : "行编辑",
-              "codeName" : "ToggleRowEdit",
-              "fullCodeName" : "ToggleRowEdit",
-              "mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
-              "name" : "表格界面_行编辑开关操作",
-              "getPSSysImage" : {
-                "glyph" : "xf0ce@FontAwesome",
-                "cssClass" : "fa fa-table"
-              },
-              "predefinedType" : "GRIDVIEW_ROWEDITACTION",
-              "rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
-              "timeout" : 60000,
-              "uIActionMode" : "SYS",
-              "uIActionTag" : "ToggleRowEdit",
-              "uIActionType" : "DEUIACTION",
-              "enableToggleMode" : true
-            },
-            "addSeparator" : true,
-            "showCaption" : true,
-            "showIcon" : false
           } ],
           "rTMOSFilePath" : "pssysapps/Web/psappdataentities/Reginfo/psappdeuagroups/A046596b6afb50f9e5b",
           "uniqueTag" : "Reginfo__A046596b6afb50f9e5b"

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

@@ -445,34 +445,34 @@
     "getPSAppViewLogics" : [ {
       "logicTrigger" : "CUSTOM",
       "logicType" : "APPVIEWUIACTION",
-      "name" : "grid_uagridcolumn1_u479f517_click",
+      "name" : "grid_uagridcolumn1_ua98d563_click",
       "getPSAppViewUIAction" : {
         "modelref" : true,
-        "id" : "表格界面_编辑操作"
+        "id" : "表格界面_行编辑开关操作"
       }
     }, {
       "logicTrigger" : "CUSTOM",
       "logicType" : "APPVIEWUIACTION",
-      "name" : "grid_uagridcolumn1_ua98d563_click",
+      "name" : "grid_uagridcolumn1_u479f517_click",
       "getPSAppViewUIAction" : {
         "modelref" : true,
-        "id" : "表格界面_行编辑开关操作"
+        "id" : "表格界面_编辑操作"
       }
     } ],
     "getPSAppViewUIActions" : [ {
-      "name" : "表格界面_编辑操作",
+      "name" : "表格界面_行编辑开关操作",
       "getPSUIAction" : {
         "modelref" : true,
-        "id" : "Edit"
+        "id" : "ToggleRowEdit"
       },
-      "uIActionTarget" : "SINGLEKEY",
       "xDataControlName" : "grid"
     }, {
-      "name" : "表格界面_行编辑开关操作",
+      "name" : "表格界面_编辑操作",
       "getPSUIAction" : {
         "modelref" : true,
-        "id" : "ToggleRowEdit"
+        "id" : "Edit"
       },
+      "uIActionTarget" : "SINGLEKEY",
       "xDataControlName" : "grid"
     } ],
     "getPSControlHandler" : {
@@ -704,6 +704,30 @@
         "mOSFilePath" : "pssysapps/Web/psappdataentities/Reginfo/psappdeuagroups/A046596b6afb50f9e5b",
         "name" : "操作列",
         "getPSUIActionGroupDetails" : [ {
+          "detailType" : "DEUIACTION",
+          "name" : "ua98d563",
+          "getPSUIAction" : {
+            "caption" : "行编辑",
+            "codeName" : "ToggleRowEdit",
+            "fullCodeName" : "ToggleRowEdit",
+            "mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
+            "name" : "表格界面_行编辑开关操作",
+            "getPSSysImage" : {
+              "glyph" : "xf0ce@FontAwesome",
+              "cssClass" : "fa fa-table"
+            },
+            "predefinedType" : "GRIDVIEW_ROWEDITACTION",
+            "rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
+            "timeout" : 60000,
+            "uIActionMode" : "SYS",
+            "uIActionTag" : "ToggleRowEdit",
+            "uIActionType" : "DEUIACTION",
+            "enableToggleMode" : true
+          },
+          "addSeparator" : true,
+          "showCaption" : true,
+          "showIcon" : false
+        }, {
           "detailType" : "DEUIACTION",
           "name" : "u479f517",
           "getPSUIAction" : {
@@ -745,30 +769,6 @@
           "addSeparator" : true,
           "showCaption" : true,
           "showIcon" : true
-        }, {
-          "detailType" : "DEUIACTION",
-          "name" : "ua98d563",
-          "getPSUIAction" : {
-            "caption" : "行编辑",
-            "codeName" : "ToggleRowEdit",
-            "fullCodeName" : "ToggleRowEdit",
-            "mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
-            "name" : "表格界面_行编辑开关操作",
-            "getPSSysImage" : {
-              "glyph" : "xf0ce@FontAwesome",
-              "cssClass" : "fa fa-table"
-            },
-            "predefinedType" : "GRIDVIEW_ROWEDITACTION",
-            "rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
-            "timeout" : 60000,
-            "uIActionMode" : "SYS",
-            "uIActionTag" : "ToggleRowEdit",
-            "uIActionType" : "DEUIACTION",
-            "enableToggleMode" : true
-          },
-          "addSeparator" : true,
-          "showCaption" : true,
-          "showIcon" : false
         } ],
         "rTMOSFilePath" : "pssysapps/Web/psappdataentities/Reginfo/psappdeuagroups/A046596b6afb50f9e5b",
         "uniqueTag" : "Reginfo__A046596b6afb50f9e5b"

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

@@ -3335,34 +3335,34 @@
               "getPSAppViewLogics" : [ {
                 "logicTrigger" : "CUSTOM",
                 "logicType" : "APPVIEWUIACTION",
-                "name" : "grid_uagridcolumn1_u479f517_click",
+                "name" : "grid_uagridcolumn1_ua98d563_click",
                 "getPSAppViewUIAction" : {
                   "modelref" : true,
-                  "id" : "表格界面_编辑操作"
+                  "id" : "表格界面_行编辑开关操作"
                 }
               }, {
                 "logicTrigger" : "CUSTOM",
                 "logicType" : "APPVIEWUIACTION",
-                "name" : "grid_uagridcolumn1_ua98d563_click",
+                "name" : "grid_uagridcolumn1_u479f517_click",
                 "getPSAppViewUIAction" : {
                   "modelref" : true,
-                  "id" : "表格界面_行编辑开关操作"
+                  "id" : "表格界面_编辑操作"
                 }
               } ],
               "getPSAppViewUIActions" : [ {
-                "name" : "表格界面_编辑操作",
+                "name" : "表格界面_行编辑开关操作",
                 "getPSUIAction" : {
                   "modelref" : true,
-                  "id" : "Edit"
+                  "id" : "ToggleRowEdit"
                 },
-                "uIActionTarget" : "SINGLEKEY",
                 "xDataControlName" : "grid"
               }, {
-                "name" : "表格界面_行编辑开关操作",
+                "name" : "表格界面_编辑操作",
                 "getPSUIAction" : {
                   "modelref" : true,
-                  "id" : "ToggleRowEdit"
+                  "id" : "Edit"
                 },
+                "uIActionTarget" : "SINGLEKEY",
                 "xDataControlName" : "grid"
               } ],
               "getPSControlHandler" : {
@@ -3594,6 +3594,30 @@
                   "mOSFilePath" : "pssysapps/Web/psappdataentities/Reginfo/psappdeuagroups/A046596b6afb50f9e5b",
                   "name" : "操作列",
                   "getPSUIActionGroupDetails" : [ {
+                    "detailType" : "DEUIACTION",
+                    "name" : "ua98d563",
+                    "getPSUIAction" : {
+                      "caption" : "行编辑",
+                      "codeName" : "ToggleRowEdit",
+                      "fullCodeName" : "ToggleRowEdit",
+                      "mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
+                      "name" : "表格界面_行编辑开关操作",
+                      "getPSSysImage" : {
+                        "glyph" : "xf0ce@FontAwesome",
+                        "cssClass" : "fa fa-table"
+                      },
+                      "predefinedType" : "GRIDVIEW_ROWEDITACTION",
+                      "rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
+                      "timeout" : 60000,
+                      "uIActionMode" : "SYS",
+                      "uIActionTag" : "ToggleRowEdit",
+                      "uIActionType" : "DEUIACTION",
+                      "enableToggleMode" : true
+                    },
+                    "addSeparator" : true,
+                    "showCaption" : true,
+                    "showIcon" : false
+                  }, {
                     "detailType" : "DEUIACTION",
                     "name" : "u479f517",
                     "getPSUIAction" : {
@@ -3635,30 +3659,6 @@
                     "addSeparator" : true,
                     "showCaption" : true,
                     "showIcon" : true
-                  }, {
-                    "detailType" : "DEUIACTION",
-                    "name" : "ua98d563",
-                    "getPSUIAction" : {
-                      "caption" : "行编辑",
-                      "codeName" : "ToggleRowEdit",
-                      "fullCodeName" : "ToggleRowEdit",
-                      "mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
-                      "name" : "表格界面_行编辑开关操作",
-                      "getPSSysImage" : {
-                        "glyph" : "xf0ce@FontAwesome",
-                        "cssClass" : "fa fa-table"
-                      },
-                      "predefinedType" : "GRIDVIEW_ROWEDITACTION",
-                      "rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
-                      "timeout" : 60000,
-                      "uIActionMode" : "SYS",
-                      "uIActionTag" : "ToggleRowEdit",
-                      "uIActionType" : "DEUIACTION",
-                      "enableToggleMode" : true
-                    },
-                    "addSeparator" : true,
-                    "showCaption" : true,
-                    "showIcon" : false
                   } ],
                   "rTMOSFilePath" : "pssysapps/Web/psappdataentities/Reginfo/psappdeuagroups/A046596b6afb50f9e5b",
                   "uniqueTag" : "Reginfo__A046596b6afb50f9e5b"

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

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

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

@@ -1799,34 +1799,34 @@
             "getPSAppViewLogics" : [ {
               "logicTrigger" : "CUSTOM",
               "logicType" : "APPVIEWUIACTION",
-              "name" : "grid_uagridcolumn1_u479f517_click",
+              "name" : "grid_uagridcolumn1_ua98d563_click",
               "getPSAppViewUIAction" : {
                 "modelref" : true,
-                "id" : "表格界面_编辑操作"
+                "id" : "表格界面_行编辑开关操作"
               }
             }, {
               "logicTrigger" : "CUSTOM",
               "logicType" : "APPVIEWUIACTION",
-              "name" : "grid_uagridcolumn1_ua98d563_click",
+              "name" : "grid_uagridcolumn1_u479f517_click",
               "getPSAppViewUIAction" : {
                 "modelref" : true,
-                "id" : "表格界面_行编辑开关操作"
+                "id" : "表格界面_编辑操作"
               }
             } ],
             "getPSAppViewUIActions" : [ {
-              "name" : "表格界面_编辑操作",
+              "name" : "表格界面_行编辑开关操作",
               "getPSUIAction" : {
                 "modelref" : true,
-                "id" : "Edit"
+                "id" : "ToggleRowEdit"
               },
-              "uIActionTarget" : "SINGLEKEY",
               "xDataControlName" : "grid"
             }, {
-              "name" : "表格界面_行编辑开关操作",
+              "name" : "表格界面_编辑操作",
               "getPSUIAction" : {
                 "modelref" : true,
-                "id" : "ToggleRowEdit"
+                "id" : "Edit"
               },
+              "uIActionTarget" : "SINGLEKEY",
               "xDataControlName" : "grid"
             } ],
             "getPSControlHandler" : {
@@ -2058,6 +2058,30 @@
                 "mOSFilePath" : "pssysapps/Web/psappdataentities/Reginfo/psappdeuagroups/A046596b6afb50f9e5b",
                 "name" : "操作列",
                 "getPSUIActionGroupDetails" : [ {
+                  "detailType" : "DEUIACTION",
+                  "name" : "ua98d563",
+                  "getPSUIAction" : {
+                    "caption" : "行编辑",
+                    "codeName" : "ToggleRowEdit",
+                    "fullCodeName" : "ToggleRowEdit",
+                    "mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
+                    "name" : "表格界面_行编辑开关操作",
+                    "getPSSysImage" : {
+                      "glyph" : "xf0ce@FontAwesome",
+                      "cssClass" : "fa fa-table"
+                    },
+                    "predefinedType" : "GRIDVIEW_ROWEDITACTION",
+                    "rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
+                    "timeout" : 60000,
+                    "uIActionMode" : "SYS",
+                    "uIActionTag" : "ToggleRowEdit",
+                    "uIActionType" : "DEUIACTION",
+                    "enableToggleMode" : true
+                  },
+                  "addSeparator" : true,
+                  "showCaption" : true,
+                  "showIcon" : false
+                }, {
                   "detailType" : "DEUIACTION",
                   "name" : "u479f517",
                   "getPSUIAction" : {
@@ -2099,30 +2123,6 @@
                   "addSeparator" : true,
                   "showCaption" : true,
                   "showIcon" : true
-                }, {
-                  "detailType" : "DEUIACTION",
-                  "name" : "ua98d563",
-                  "getPSUIAction" : {
-                    "caption" : "行编辑",
-                    "codeName" : "ToggleRowEdit",
-                    "fullCodeName" : "ToggleRowEdit",
-                    "mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
-                    "name" : "表格界面_行编辑开关操作",
-                    "getPSSysImage" : {
-                      "glyph" : "xf0ce@FontAwesome",
-                      "cssClass" : "fa fa-table"
-                    },
-                    "predefinedType" : "GRIDVIEW_ROWEDITACTION",
-                    "rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
-                    "timeout" : 60000,
-                    "uIActionMode" : "SYS",
-                    "uIActionTag" : "ToggleRowEdit",
-                    "uIActionType" : "DEUIACTION",
-                    "enableToggleMode" : true
-                  },
-                  "addSeparator" : true,
-                  "showCaption" : true,
-                  "showIcon" : false
                 } ],
                 "rTMOSFilePath" : "pssysapps/Web/psappdataentities/Reginfo/psappdeuagroups/A046596b6afb50f9e5b",
                 "uniqueTag" : "Reginfo__A046596b6afb50f9e5b"

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

@@ -5,6 +5,30 @@
     "mOSFilePath" : "pssysapps/Web/psappdataentities/Reginfo/psappdeuagroups/A046596b6afb50f9e5b",
     "name" : "操作列",
     "getPSUIActionGroupDetails" : [ {
+      "detailType" : "DEUIACTION",
+      "name" : "ua98d563",
+      "getPSUIAction" : {
+        "caption" : "行编辑",
+        "codeName" : "ToggleRowEdit",
+        "fullCodeName" : "ToggleRowEdit",
+        "mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
+        "name" : "表格界面_行编辑开关操作",
+        "getPSSysImage" : {
+          "glyph" : "xf0ce@FontAwesome",
+          "cssClass" : "fa fa-table"
+        },
+        "predefinedType" : "GRIDVIEW_ROWEDITACTION",
+        "rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
+        "timeout" : 60000,
+        "uIActionMode" : "SYS",
+        "uIActionTag" : "ToggleRowEdit",
+        "uIActionType" : "DEUIACTION",
+        "enableToggleMode" : true
+      },
+      "addSeparator" : true,
+      "showCaption" : true,
+      "showIcon" : false
+    }, {
       "detailType" : "DEUIACTION",
       "name" : "u479f517",
       "getPSUIAction" : {
@@ -46,30 +70,6 @@
       "addSeparator" : true,
       "showCaption" : true,
       "showIcon" : true
-    }, {
-      "detailType" : "DEUIACTION",
-      "name" : "ua98d563",
-      "getPSUIAction" : {
-        "caption" : "行编辑",
-        "codeName" : "ToggleRowEdit",
-        "fullCodeName" : "ToggleRowEdit",
-        "mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
-        "name" : "表格界面_行编辑开关操作",
-        "getPSSysImage" : {
-          "glyph" : "xf0ce@FontAwesome",
-          "cssClass" : "fa fa-table"
-        },
-        "predefinedType" : "GRIDVIEW_ROWEDITACTION",
-        "rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
-        "timeout" : 60000,
-        "uIActionMode" : "SYS",
-        "uIActionTag" : "ToggleRowEdit",
-        "uIActionType" : "DEUIACTION",
-        "enableToggleMode" : true
-      },
-      "addSeparator" : true,
-      "showCaption" : true,
-      "showIcon" : false
     } ],
     "rTMOSFilePath" : "pssysapps/Web/psappdataentities/Reginfo/psappdeuagroups/A046596b6afb50f9e5b",
     "uniqueTag" : "Reginfo__A046596b6afb50f9e5b"

trainsys-provider/pom.xml

@@ -33,7 +33,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: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
     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: