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

config.xml

@@ -55,12 +55,6 @@
 	  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/PSAPPDATAENTITIES/Book/PSFORMS/Main_2.json

@@ -832,6 +832,11 @@
               "modelref" : true,
               "path" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/Reginfo.json"
             },
+            "getPSControlAttributes" : [ {
+              "attrName" : "spanMethod",
+              "attrValue" : "({\r\n    row,\r\n    column,\r\n    rowIndex,\r\n    columnIndex,\r\n  }) => {\r\n    const { property } = column;\r\n    const rowspankeys = ['reginfoname','age'];\r\n    const tableData = ctrl.state.rows;\r\n    // 合并行\r\n    if (rowspankeys.length > 0 && rowspankeys.includes(property)) {\r\n      // 只有第一列或有值时才和并\r\n      const allow = columnIndex === 0 || row[property];\r\n      // 第二行开始合并\r\n      if (\r\n        rowIndex > 0 &&\r\n        allow &&\r\n        row[property] === tableData[rowIndex - 1].data[property]\r\n      ) {\r\n        return {\r\n          rowspan: 0,\r\n          colspan: 0,\r\n        };\r\n      }\r\n      // 第一行计算出合并长度\r\n      let rowspan = 1;\r\n      for (let i = rowIndex + 1; i < tableData.length; i++) {\r\n        if (allow && tableData[i].data[property] === row[property]) {\r\n          rowspan += 1;\r\n        } else {\r\n          break;\r\n        }\r\n      }\r\n      return {\r\n        rowspan,\r\n        colspan: 1,\r\n      };\r\n    }\r\n}",
+              "name" : "logic"
+            } ],
             "getPSControlHandler" : {
               "getPSHandlerActions" : [ {
                 "actionName" : "Get",

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

@@ -73,6 +73,11 @@
     "modelref" : true,
     "path" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/Reginfo.json"
   },
+  "getPSControlAttributes" : [ {
+    "attrName" : "spanMethod",
+    "attrValue" : "({\r\n    row,\r\n    column,\r\n    rowIndex,\r\n    columnIndex,\r\n  }) => {\r\n    const { property } = column;\r\n    const rowspankeys = ['reginfoname','age'];\r\n    const tableData = ctrl.state.rows;\r\n    // 合并行\r\n    if (rowspankeys.length > 0 && rowspankeys.includes(property)) {\r\n      // 只有第一列或有值时才和并\r\n      const allow = columnIndex === 0 || row[property];\r\n      // 第二行开始合并\r\n      if (\r\n        rowIndex > 0 &&\r\n        allow &&\r\n        row[property] === tableData[rowIndex - 1].data[property]\r\n      ) {\r\n        return {\r\n          rowspan: 0,\r\n          colspan: 0,\r\n        };\r\n      }\r\n      // 第一行计算出合并长度\r\n      let rowspan = 1;\r\n      for (let i = rowIndex + 1; i < tableData.length; i++) {\r\n        if (allow && tableData[i].data[property] === row[property]) {\r\n          rowspan += 1;\r\n        } else {\r\n          break;\r\n        }\r\n      }\r\n      return {\r\n        rowspan,\r\n        colspan: 1,\r\n      };\r\n    }\r\n}",
+    "name" : "logic"
+  } ],
   "getPSControlLogics" : [ {
     "eventNames" : "onLoadSuccess",
     "logicTag" : "grid",

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

@@ -281,7 +281,7 @@
       }
     } ],
     "getPSAppViewRefs" : [ {
-      "name" : "EDITDATA",
+      "name" : "NEWDATA",
       "realOpenMode" : "POPUPMODAL",
       "realTitle" : "学生信息编辑视图",
       "getRefPSAppView" : {
@@ -290,7 +290,7 @@
         "viewType" : "DEEDITVIEW"
       }
     }, {
-      "name" : "OPENDATA",
+      "name" : "EDITDATA",
       "realOpenMode" : "POPUPMODAL",
       "realTitle" : "学生信息编辑视图",
       "getRefPSAppView" : {
@@ -299,7 +299,7 @@
         "viewType" : "DEEDITVIEW"
       }
     }, {
-      "name" : "NEWDATA",
+      "name" : "OPENDATA",
       "realOpenMode" : "POPUPMODAL",
       "realTitle" : "学生信息编辑视图",
       "getRefPSAppView" : {
@@ -491,6 +491,11 @@
         "modelref" : true,
         "path" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/Reginfo.json"
       },
+      "getPSControlAttributes" : [ {
+        "attrName" : "spanMethod",
+        "attrValue" : "({\r\n    row,\r\n    column,\r\n    rowIndex,\r\n    columnIndex,\r\n  }) => {\r\n    const { property } = column;\r\n    const rowspankeys = ['reginfoname','age'];\r\n    const tableData = ctrl.state.rows;\r\n    // 合并行\r\n    if (rowspankeys.length > 0 && rowspankeys.includes(property)) {\r\n      // 只有第一列或有值时才和并\r\n      const allow = columnIndex === 0 || row[property];\r\n      // 第二行开始合并\r\n      if (\r\n        rowIndex > 0 &&\r\n        allow &&\r\n        row[property] === tableData[rowIndex - 1].data[property]\r\n      ) {\r\n        return {\r\n          rowspan: 0,\r\n          colspan: 0,\r\n        };\r\n      }\r\n      // 第一行计算出合并长度\r\n      let rowspan = 1;\r\n      for (let i = rowIndex + 1; i < tableData.length; i++) {\r\n        if (allow && tableData[i].data[property] === row[property]) {\r\n          rowspan += 1;\r\n        } else {\r\n          break;\r\n        }\r\n      }\r\n      return {\r\n        rowspan,\r\n        colspan: 1,\r\n      };\r\n    }\r\n}",
+        "name" : "logic"
+      } ],
       "getPSControlHandler" : {
         "getPSHandlerActions" : [ {
           "actionName" : "Get",

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

@@ -157,6 +157,11 @@
         "modelref" : true,
         "path" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/Reginfo.json"
       },
+      "getPSControlAttributes" : [ {
+        "attrName" : "spanMethod",
+        "attrValue" : "({\r\n    row,\r\n    column,\r\n    rowIndex,\r\n    columnIndex,\r\n  }) => {\r\n    const { property } = column;\r\n    const rowspankeys = ['reginfoname','age'];\r\n    const tableData = ctrl.state.rows;\r\n    // 合并行\r\n    if (rowspankeys.length > 0 && rowspankeys.includes(property)) {\r\n      // 只有第一列或有值时才和并\r\n      const allow = columnIndex === 0 || row[property];\r\n      // 第二行开始合并\r\n      if (\r\n        rowIndex > 0 &&\r\n        allow &&\r\n        row[property] === tableData[rowIndex - 1].data[property]\r\n      ) {\r\n        return {\r\n          rowspan: 0,\r\n          colspan: 0,\r\n        };\r\n      }\r\n      // 第一行计算出合并长度\r\n      let rowspan = 1;\r\n      for (let i = rowIndex + 1; i < tableData.length; i++) {\r\n        if (allow && tableData[i].data[property] === row[property]) {\r\n          rowspan += 1;\r\n        } else {\r\n          break;\r\n        }\r\n      }\r\n      return {\r\n        rowspan,\r\n        colspan: 1,\r\n      };\r\n    }\r\n}",
+        "name" : "logic"
+      } ],
       "getPSControlHandler" : {
         "getPSHandlerActions" : [ {
           "actionName" : "Get",

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

@@ -531,6 +531,11 @@
         "modelref" : true,
         "path" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/Reginfo.json"
       },
+      "getPSControlAttributes" : [ {
+        "attrName" : "spanMethod",
+        "attrValue" : "({\r\n    row,\r\n    column,\r\n    rowIndex,\r\n    columnIndex,\r\n  }) => {\r\n    const { property } = column;\r\n    const rowspankeys = ['reginfoname','age'];\r\n    const tableData = ctrl.state.rows;\r\n    // 合并行\r\n    if (rowspankeys.length > 0 && rowspankeys.includes(property)) {\r\n      // 只有第一列或有值时才和并\r\n      const allow = columnIndex === 0 || row[property];\r\n      // 第二行开始合并\r\n      if (\r\n        rowIndex > 0 &&\r\n        allow &&\r\n        row[property] === tableData[rowIndex - 1].data[property]\r\n      ) {\r\n        return {\r\n          rowspan: 0,\r\n          colspan: 0,\r\n        };\r\n      }\r\n      // 第一行计算出合并长度\r\n      let rowspan = 1;\r\n      for (let i = rowIndex + 1; i < tableData.length; i++) {\r\n        if (allow && tableData[i].data[property] === row[property]) {\r\n          rowspan += 1;\r\n        } else {\r\n          break;\r\n        }\r\n      }\r\n      return {\r\n        rowspan,\r\n        colspan: 1,\r\n      };\r\n    }\r\n}",
+        "name" : "logic"
+      } ],
       "getPSControlHandler" : {
         "getPSHandlerActions" : [ {
           "actionName" : "Get",

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

@@ -1784,6 +1784,11 @@
                   "modelref" : true,
                   "path" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/Reginfo.json"
                 },
+                "getPSControlAttributes" : [ {
+                  "attrName" : "spanMethod",
+                  "attrValue" : "({\r\n    row,\r\n    column,\r\n    rowIndex,\r\n    columnIndex,\r\n  }) => {\r\n    const { property } = column;\r\n    const rowspankeys = ['reginfoname','age'];\r\n    const tableData = ctrl.state.rows;\r\n    // 合并行\r\n    if (rowspankeys.length > 0 && rowspankeys.includes(property)) {\r\n      // 只有第一列或有值时才和并\r\n      const allow = columnIndex === 0 || row[property];\r\n      // 第二行开始合并\r\n      if (\r\n        rowIndex > 0 &&\r\n        allow &&\r\n        row[property] === tableData[rowIndex - 1].data[property]\r\n      ) {\r\n        return {\r\n          rowspan: 0,\r\n          colspan: 0,\r\n        };\r\n      }\r\n      // 第一行计算出合并长度\r\n      let rowspan = 1;\r\n      for (let i = rowIndex + 1; i < tableData.length; i++) {\r\n        if (allow && tableData[i].data[property] === row[property]) {\r\n          rowspan += 1;\r\n        } else {\r\n          break;\r\n        }\r\n      }\r\n      return {\r\n        rowspan,\r\n        colspan: 1,\r\n      };\r\n    }\r\n}",
+                  "name" : "logic"
+                } ],
                 "getPSControlHandler" : {
                   "getPSHandlerActions" : [ {
                     "actionName" : "Get",

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

@@ -943,6 +943,11 @@
                 "modelref" : true,
                 "path" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/Reginfo.json"
               },
+              "getPSControlAttributes" : [ {
+                "attrName" : "spanMethod",
+                "attrValue" : "({\r\n    row,\r\n    column,\r\n    rowIndex,\r\n    columnIndex,\r\n  }) => {\r\n    const { property } = column;\r\n    const rowspankeys = ['reginfoname','age'];\r\n    const tableData = ctrl.state.rows;\r\n    // 合并行\r\n    if (rowspankeys.length > 0 && rowspankeys.includes(property)) {\r\n      // 只有第一列或有值时才和并\r\n      const allow = columnIndex === 0 || row[property];\r\n      // 第二行开始合并\r\n      if (\r\n        rowIndex > 0 &&\r\n        allow &&\r\n        row[property] === tableData[rowIndex - 1].data[property]\r\n      ) {\r\n        return {\r\n          rowspan: 0,\r\n          colspan: 0,\r\n        };\r\n      }\r\n      // 第一行计算出合并长度\r\n      let rowspan = 1;\r\n      for (let i = rowIndex + 1; i < tableData.length; i++) {\r\n        if (allow && tableData[i].data[property] === row[property]) {\r\n          rowspan += 1;\r\n        } else {\r\n          break;\r\n        }\r\n      }\r\n      return {\r\n        rowspan,\r\n        colspan: 1,\r\n      };\r\n    }\r\n}",
+                "name" : "logic"
+              } ],
               "getPSControlHandler" : {
                 "getPSHandlerActions" : [ {
                   "actionName" : "Get",

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

@@ -909,6 +909,11 @@
                     "modelref" : true,
                     "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
                   },
+                  "getPSControlAttributes" : [ {
+                    "attrName" : "spanMethod",
+                    "attrValue" : "({\r\n    row,\r\n    column,\r\n    rowIndex,\r\n    columnIndex,\r\n  }) => {\r\n    const { property } = column;\r\n    const rowspankeys = ['reginfoname','age'];\r\n    const tableData = ctrl.state.rows;\r\n    // 合并行\r\n    if (rowspankeys.length > 0 && rowspankeys.includes(property)) {\r\n      // 只有第一列或有值时才和并\r\n      const allow = columnIndex === 0 || row[property];\r\n      // 第二行开始合并\r\n      if (\r\n        rowIndex > 0 &&\r\n        allow &&\r\n        row[property] === tableData[rowIndex - 1].data[property]\r\n      ) {\r\n        return {\r\n          rowspan: 0,\r\n          colspan: 0,\r\n        };\r\n      }\r\n      // 第一行计算出合并长度\r\n      let rowspan = 1;\r\n      for (let i = rowIndex + 1; i < tableData.length; i++) {\r\n        if (allow && tableData[i].data[property] === row[property]) {\r\n          rowspan += 1;\r\n        } else {\r\n          break;\r\n        }\r\n      }\r\n      return {\r\n        rowspan,\r\n        colspan: 1,\r\n      };\r\n    }\r\n}",
+                    "name" : "logic"
+                  } ],
                   "getPSControlHandler" : {
                     "getPSHandlerActions" : [ {
                       "actionName" : "Get",
@@ -2077,6 +2082,11 @@
                     "modelref" : true,
                     "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
                   },
+                  "getPSControlAttributes" : [ {
+                    "attrName" : "spanMethod",
+                    "attrValue" : "({\r\n    row,\r\n    column,\r\n    rowIndex,\r\n    columnIndex,\r\n  }) => {\r\n    const { property } = column;\r\n    const rowspankeys = ['reginfoname','age'];\r\n    const tableData = ctrl.state.rows;\r\n    // 合并行\r\n    if (rowspankeys.length > 0 && rowspankeys.includes(property)) {\r\n      // 只有第一列或有值时才和并\r\n      const allow = columnIndex === 0 || row[property];\r\n      // 第二行开始合并\r\n      if (\r\n        rowIndex > 0 &&\r\n        allow &&\r\n        row[property] === tableData[rowIndex - 1].data[property]\r\n      ) {\r\n        return {\r\n          rowspan: 0,\r\n          colspan: 0,\r\n        };\r\n      }\r\n      // 第一行计算出合并长度\r\n      let rowspan = 1;\r\n      for (let i = rowIndex + 1; i < tableData.length; i++) {\r\n        if (allow && tableData[i].data[property] === row[property]) {\r\n          rowspan += 1;\r\n        } else {\r\n          break;\r\n        }\r\n      }\r\n      return {\r\n        rowspan,\r\n        colspan: 1,\r\n      };\r\n    }\r\n}",
+                    "name" : "logic"
+                  } ],
                   "getPSControlHandler" : {
                     "getPSHandlerActions" : [ {
                       "actionName" : "Get",

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

@@ -831,6 +831,11 @@
               "modelref" : true,
               "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
             },
+            "getPSControlAttributes" : [ {
+              "attrName" : "spanMethod",
+              "attrValue" : "({\r\n    row,\r\n    column,\r\n    rowIndex,\r\n    columnIndex,\r\n  }) => {\r\n    const { property } = column;\r\n    const rowspankeys = ['reginfoname','age'];\r\n    const tableData = ctrl.state.rows;\r\n    // 合并行\r\n    if (rowspankeys.length > 0 && rowspankeys.includes(property)) {\r\n      // 只有第一列或有值时才和并\r\n      const allow = columnIndex === 0 || row[property];\r\n      // 第二行开始合并\r\n      if (\r\n        rowIndex > 0 &&\r\n        allow &&\r\n        row[property] === tableData[rowIndex - 1].data[property]\r\n      ) {\r\n        return {\r\n          rowspan: 0,\r\n          colspan: 0,\r\n        };\r\n      }\r\n      // 第一行计算出合并长度\r\n      let rowspan = 1;\r\n      for (let i = rowIndex + 1; i < tableData.length; i++) {\r\n        if (allow && tableData[i].data[property] === row[property]) {\r\n          rowspan += 1;\r\n        } else {\r\n          break;\r\n        }\r\n      }\r\n      return {\r\n        rowspan,\r\n        colspan: 1,\r\n      };\r\n    }\r\n}",
+              "name" : "logic"
+            } ],
             "getPSControlHandler" : {
               "getPSHandlerActions" : [ {
                 "actionName" : "Get",

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

@@ -1131,6 +1131,11 @@
                 "modelref" : true,
                 "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
               },
+              "getPSControlAttributes" : [ {
+                "attrName" : "spanMethod",
+                "attrValue" : "({\r\n    row,\r\n    column,\r\n    rowIndex,\r\n    columnIndex,\r\n  }) => {\r\n    const { property } = column;\r\n    const rowspankeys = ['reginfoname','age'];\r\n    const tableData = ctrl.state.rows;\r\n    // 合并行\r\n    if (rowspankeys.length > 0 && rowspankeys.includes(property)) {\r\n      // 只有第一列或有值时才和并\r\n      const allow = columnIndex === 0 || row[property];\r\n      // 第二行开始合并\r\n      if (\r\n        rowIndex > 0 &&\r\n        allow &&\r\n        row[property] === tableData[rowIndex - 1].data[property]\r\n      ) {\r\n        return {\r\n          rowspan: 0,\r\n          colspan: 0,\r\n        };\r\n      }\r\n      // 第一行计算出合并长度\r\n      let rowspan = 1;\r\n      for (let i = rowIndex + 1; i < tableData.length; i++) {\r\n        if (allow && tableData[i].data[property] === row[property]) {\r\n          rowspan += 1;\r\n        } else {\r\n          break;\r\n        }\r\n      }\r\n      return {\r\n        rowspan,\r\n        colspan: 1,\r\n      };\r\n    }\r\n}",
+                "name" : "logic"
+              } ],
               "getPSControlHandler" : {
                 "getPSHandlerActions" : [ {
                   "actionName" : "Get",

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

@@ -73,6 +73,11 @@
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
   },
+  "getPSControlAttributes" : [ {
+    "attrName" : "spanMethod",
+    "attrValue" : "({\r\n    row,\r\n    column,\r\n    rowIndex,\r\n    columnIndex,\r\n  }) => {\r\n    const { property } = column;\r\n    const rowspankeys = ['reginfoname','age'];\r\n    const tableData = ctrl.state.rows;\r\n    // 合并行\r\n    if (rowspankeys.length > 0 && rowspankeys.includes(property)) {\r\n      // 只有第一列或有值时才和并\r\n      const allow = columnIndex === 0 || row[property];\r\n      // 第二行开始合并\r\n      if (\r\n        rowIndex > 0 &&\r\n        allow &&\r\n        row[property] === tableData[rowIndex - 1].data[property]\r\n      ) {\r\n        return {\r\n          rowspan: 0,\r\n          colspan: 0,\r\n        };\r\n      }\r\n      // 第一行计算出合并长度\r\n      let rowspan = 1;\r\n      for (let i = rowIndex + 1; i < tableData.length; i++) {\r\n        if (allow && tableData[i].data[property] === row[property]) {\r\n          rowspan += 1;\r\n        } else {\r\n          break;\r\n        }\r\n      }\r\n      return {\r\n        rowspan,\r\n        colspan: 1,\r\n      };\r\n    }\r\n}",
+    "name" : "logic"
+  } ],
   "getPSControlLogics" : [ {
     "eventNames" : "onLoadSuccess",
     "logicTag" : "grid",

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

@@ -281,7 +281,7 @@
       }
     } ],
     "getPSAppViewRefs" : [ {
-      "name" : "EDITDATA",
+      "name" : "NEWDATA",
       "realOpenMode" : "POPUPMODAL",
       "realTitle" : "学生信息编辑视图",
       "getRefPSAppView" : {
@@ -290,7 +290,7 @@
         "viewType" : "DEEDITVIEW"
       }
     }, {
-      "name" : "OPENDATA",
+      "name" : "EDITDATA",
       "realOpenMode" : "POPUPMODAL",
       "realTitle" : "学生信息编辑视图",
       "getRefPSAppView" : {
@@ -299,7 +299,7 @@
         "viewType" : "DEEDITVIEW"
       }
     }, {
-      "name" : "NEWDATA",
+      "name" : "OPENDATA",
       "realOpenMode" : "POPUPMODAL",
       "realTitle" : "学生信息编辑视图",
       "getRefPSAppView" : {
@@ -491,6 +491,11 @@
         "modelref" : true,
         "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
       },
+      "getPSControlAttributes" : [ {
+        "attrName" : "spanMethod",
+        "attrValue" : "({\r\n    row,\r\n    column,\r\n    rowIndex,\r\n    columnIndex,\r\n  }) => {\r\n    const { property } = column;\r\n    const rowspankeys = ['reginfoname','age'];\r\n    const tableData = ctrl.state.rows;\r\n    // 合并行\r\n    if (rowspankeys.length > 0 && rowspankeys.includes(property)) {\r\n      // 只有第一列或有值时才和并\r\n      const allow = columnIndex === 0 || row[property];\r\n      // 第二行开始合并\r\n      if (\r\n        rowIndex > 0 &&\r\n        allow &&\r\n        row[property] === tableData[rowIndex - 1].data[property]\r\n      ) {\r\n        return {\r\n          rowspan: 0,\r\n          colspan: 0,\r\n        };\r\n      }\r\n      // 第一行计算出合并长度\r\n      let rowspan = 1;\r\n      for (let i = rowIndex + 1; i < tableData.length; i++) {\r\n        if (allow && tableData[i].data[property] === row[property]) {\r\n          rowspan += 1;\r\n        } else {\r\n          break;\r\n        }\r\n      }\r\n      return {\r\n        rowspan,\r\n        colspan: 1,\r\n      };\r\n    }\r\n}",
+        "name" : "logic"
+      } ],
       "getPSControlHandler" : {
         "getPSHandlerActions" : [ {
           "actionName" : "Get",

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

@@ -156,6 +156,11 @@
         "modelref" : true,
         "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
       },
+      "getPSControlAttributes" : [ {
+        "attrName" : "spanMethod",
+        "attrValue" : "({\r\n    row,\r\n    column,\r\n    rowIndex,\r\n    columnIndex,\r\n  }) => {\r\n    const { property } = column;\r\n    const rowspankeys = ['reginfoname','age'];\r\n    const tableData = ctrl.state.rows;\r\n    // 合并行\r\n    if (rowspankeys.length > 0 && rowspankeys.includes(property)) {\r\n      // 只有第一列或有值时才和并\r\n      const allow = columnIndex === 0 || row[property];\r\n      // 第二行开始合并\r\n      if (\r\n        rowIndex > 0 &&\r\n        allow &&\r\n        row[property] === tableData[rowIndex - 1].data[property]\r\n      ) {\r\n        return {\r\n          rowspan: 0,\r\n          colspan: 0,\r\n        };\r\n      }\r\n      // 第一行计算出合并长度\r\n      let rowspan = 1;\r\n      for (let i = rowIndex + 1; i < tableData.length; i++) {\r\n        if (allow && tableData[i].data[property] === row[property]) {\r\n          rowspan += 1;\r\n        } else {\r\n          break;\r\n        }\r\n      }\r\n      return {\r\n        rowspan,\r\n        colspan: 1,\r\n      };\r\n    }\r\n}",
+        "name" : "logic"
+      } ],
       "getPSControlHandler" : {
         "getPSHandlerActions" : [ {
           "actionName" : "Get",

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

@@ -101,6 +101,11 @@
         "modelref" : true,
         "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
       },
+      "getPSControlAttributes" : [ {
+        "attrName" : "spanMethod",
+        "attrValue" : "({\r\n    row,\r\n    column,\r\n    rowIndex,\r\n    columnIndex,\r\n  }) => {\r\n    const { property } = column;\r\n    const rowspankeys = ['reginfoname','age'];\r\n    const tableData = ctrl.state.rows;\r\n    // 合并行\r\n    if (rowspankeys.length > 0 && rowspankeys.includes(property)) {\r\n      // 只有第一列或有值时才和并\r\n      const allow = columnIndex === 0 || row[property];\r\n      // 第二行开始合并\r\n      if (\r\n        rowIndex > 0 &&\r\n        allow &&\r\n        row[property] === tableData[rowIndex - 1].data[property]\r\n      ) {\r\n        return {\r\n          rowspan: 0,\r\n          colspan: 0,\r\n        };\r\n      }\r\n      // 第一行计算出合并长度\r\n      let rowspan = 1;\r\n      for (let i = rowIndex + 1; i < tableData.length; i++) {\r\n        if (allow && tableData[i].data[property] === row[property]) {\r\n          rowspan += 1;\r\n        } else {\r\n          break;\r\n        }\r\n      }\r\n      return {\r\n        rowspan,\r\n        colspan: 1,\r\n      };\r\n    }\r\n}",
+        "name" : "logic"
+      } ],
       "getPSControlHandler" : {
         "getPSHandlerActions" : [ {
           "actionName" : "Get",

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

@@ -530,6 +530,11 @@
         "modelref" : true,
         "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
       },
+      "getPSControlAttributes" : [ {
+        "attrName" : "spanMethod",
+        "attrValue" : "({\r\n    row,\r\n    column,\r\n    rowIndex,\r\n    columnIndex,\r\n  }) => {\r\n    const { property } = column;\r\n    const rowspankeys = ['reginfoname','age'];\r\n    const tableData = ctrl.state.rows;\r\n    // 合并行\r\n    if (rowspankeys.length > 0 && rowspankeys.includes(property)) {\r\n      // 只有第一列或有值时才和并\r\n      const allow = columnIndex === 0 || row[property];\r\n      // 第二行开始合并\r\n      if (\r\n        rowIndex > 0 &&\r\n        allow &&\r\n        row[property] === tableData[rowIndex - 1].data[property]\r\n      ) {\r\n        return {\r\n          rowspan: 0,\r\n          colspan: 0,\r\n        };\r\n      }\r\n      // 第一行计算出合并长度\r\n      let rowspan = 1;\r\n      for (let i = rowIndex + 1; i < tableData.length; i++) {\r\n        if (allow && tableData[i].data[property] === row[property]) {\r\n          rowspan += 1;\r\n        } else {\r\n          break;\r\n        }\r\n      }\r\n      return {\r\n        rowspan,\r\n        colspan: 1,\r\n      };\r\n    }\r\n}",
+        "name" : "logic"
+      } ],
       "getPSControlHandler" : {
         "getPSHandlerActions" : [ {
           "actionName" : "Get",

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

@@ -1249,6 +1249,11 @@
                   "modelref" : true,
                   "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
                 },
+                "getPSControlAttributes" : [ {
+                  "attrName" : "spanMethod",
+                  "attrValue" : "({\r\n    row,\r\n    column,\r\n    rowIndex,\r\n    columnIndex,\r\n  }) => {\r\n    const { property } = column;\r\n    const rowspankeys = ['reginfoname','age'];\r\n    const tableData = ctrl.state.rows;\r\n    // 合并行\r\n    if (rowspankeys.length > 0 && rowspankeys.includes(property)) {\r\n      // 只有第一列或有值时才和并\r\n      const allow = columnIndex === 0 || row[property];\r\n      // 第二行开始合并\r\n      if (\r\n        rowIndex > 0 &&\r\n        allow &&\r\n        row[property] === tableData[rowIndex - 1].data[property]\r\n      ) {\r\n        return {\r\n          rowspan: 0,\r\n          colspan: 0,\r\n        };\r\n      }\r\n      // 第一行计算出合并长度\r\n      let rowspan = 1;\r\n      for (let i = rowIndex + 1; i < tableData.length; i++) {\r\n        if (allow && tableData[i].data[property] === row[property]) {\r\n          rowspan += 1;\r\n        } else {\r\n          break;\r\n        }\r\n      }\r\n      return {\r\n        rowspan,\r\n        colspan: 1,\r\n      };\r\n    }\r\n}",
+                  "name" : "logic"
+                } ],
                 "getPSControlHandler" : {
                   "getPSHandlerActions" : [ {
                     "actionName" : "Get",

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

@@ -1580,6 +1580,11 @@
                       "modelref" : true,
                       "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
                     },
+                    "getPSControlAttributes" : [ {
+                      "attrName" : "spanMethod",
+                      "attrValue" : "({\r\n    row,\r\n    column,\r\n    rowIndex,\r\n    columnIndex,\r\n  }) => {\r\n    const { property } = column;\r\n    const rowspankeys = ['reginfoname','age'];\r\n    const tableData = ctrl.state.rows;\r\n    // 合并行\r\n    if (rowspankeys.length > 0 && rowspankeys.includes(property)) {\r\n      // 只有第一列或有值时才和并\r\n      const allow = columnIndex === 0 || row[property];\r\n      // 第二行开始合并\r\n      if (\r\n        rowIndex > 0 &&\r\n        allow &&\r\n        row[property] === tableData[rowIndex - 1].data[property]\r\n      ) {\r\n        return {\r\n          rowspan: 0,\r\n          colspan: 0,\r\n        };\r\n      }\r\n      // 第一行计算出合并长度\r\n      let rowspan = 1;\r\n      for (let i = rowIndex + 1; i < tableData.length; i++) {\r\n        if (allow && tableData[i].data[property] === row[property]) {\r\n          rowspan += 1;\r\n        } else {\r\n          break;\r\n        }\r\n      }\r\n      return {\r\n        rowspan,\r\n        colspan: 1,\r\n      };\r\n    }\r\n}",
+                      "name" : "logic"
+                    } ],
                     "getPSControlHandler" : {
                       "getPSHandlerActions" : [ {
                         "actionName" : "Get",
@@ -2748,6 +2753,11 @@
                       "modelref" : true,
                       "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
                     },
+                    "getPSControlAttributes" : [ {
+                      "attrName" : "spanMethod",
+                      "attrValue" : "({\r\n    row,\r\n    column,\r\n    rowIndex,\r\n    columnIndex,\r\n  }) => {\r\n    const { property } = column;\r\n    const rowspankeys = ['reginfoname','age'];\r\n    const tableData = ctrl.state.rows;\r\n    // 合并行\r\n    if (rowspankeys.length > 0 && rowspankeys.includes(property)) {\r\n      // 只有第一列或有值时才和并\r\n      const allow = columnIndex === 0 || row[property];\r\n      // 第二行开始合并\r\n      if (\r\n        rowIndex > 0 &&\r\n        allow &&\r\n        row[property] === tableData[rowIndex - 1].data[property]\r\n      ) {\r\n        return {\r\n          rowspan: 0,\r\n          colspan: 0,\r\n        };\r\n      }\r\n      // 第一行计算出合并长度\r\n      let rowspan = 1;\r\n      for (let i = rowIndex + 1; i < tableData.length; i++) {\r\n        if (allow && tableData[i].data[property] === row[property]) {\r\n          rowspan += 1;\r\n        } else {\r\n          break;\r\n        }\r\n      }\r\n      return {\r\n        rowspan,\r\n        colspan: 1,\r\n      };\r\n    }\r\n}",
+                      "name" : "logic"
+                    } ],
                     "getPSControlHandler" : {
                       "getPSHandlerActions" : [ {
                         "actionName" : "Get",

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

@@ -1783,6 +1783,11 @@
                   "modelref" : true,
                   "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
                 },
+                "getPSControlAttributes" : [ {
+                  "attrName" : "spanMethod",
+                  "attrValue" : "({\r\n    row,\r\n    column,\r\n    rowIndex,\r\n    columnIndex,\r\n  }) => {\r\n    const { property } = column;\r\n    const rowspankeys = ['reginfoname','age'];\r\n    const tableData = ctrl.state.rows;\r\n    // 合并行\r\n    if (rowspankeys.length > 0 && rowspankeys.includes(property)) {\r\n      // 只有第一列或有值时才和并\r\n      const allow = columnIndex === 0 || row[property];\r\n      // 第二行开始合并\r\n      if (\r\n        rowIndex > 0 &&\r\n        allow &&\r\n        row[property] === tableData[rowIndex - 1].data[property]\r\n      ) {\r\n        return {\r\n          rowspan: 0,\r\n          colspan: 0,\r\n        };\r\n      }\r\n      // 第一行计算出合并长度\r\n      let rowspan = 1;\r\n      for (let i = rowIndex + 1; i < tableData.length; i++) {\r\n        if (allow && tableData[i].data[property] === row[property]) {\r\n          rowspan += 1;\r\n        } else {\r\n          break;\r\n        }\r\n      }\r\n      return {\r\n        rowspan,\r\n        colspan: 1,\r\n      };\r\n    }\r\n}",
+                  "name" : "logic"
+                } ],
                 "getPSControlHandler" : {
                   "getPSHandlerActions" : [ {
                     "actionName" : "Get",

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

@@ -941,6 +941,11 @@
                 "modelref" : true,
                 "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
               },
+              "getPSControlAttributes" : [ {
+                "attrName" : "spanMethod",
+                "attrValue" : "({\r\n    row,\r\n    column,\r\n    rowIndex,\r\n    columnIndex,\r\n  }) => {\r\n    const { property } = column;\r\n    const rowspankeys = ['reginfoname','age'];\r\n    const tableData = ctrl.state.rows;\r\n    // 合并行\r\n    if (rowspankeys.length > 0 && rowspankeys.includes(property)) {\r\n      // 只有第一列或有值时才和并\r\n      const allow = columnIndex === 0 || row[property];\r\n      // 第二行开始合并\r\n      if (\r\n        rowIndex > 0 &&\r\n        allow &&\r\n        row[property] === tableData[rowIndex - 1].data[property]\r\n      ) {\r\n        return {\r\n          rowspan: 0,\r\n          colspan: 0,\r\n        };\r\n      }\r\n      // 第一行计算出合并长度\r\n      let rowspan = 1;\r\n      for (let i = rowIndex + 1; i < tableData.length; i++) {\r\n        if (allow && tableData[i].data[property] === row[property]) {\r\n          rowspan += 1;\r\n        } else {\r\n          break;\r\n        }\r\n      }\r\n      return {\r\n        rowspan,\r\n        colspan: 1,\r\n      };\r\n    }\r\n}",
+                "name" : "logic"
+              } ],
               "getPSControlHandler" : {
                 "getPSHandlerActions" : [ {
                   "actionName" : "Get",

trainsys-provider/pom.xml

@@ -33,7 +33,7 @@
 
     <profiles>
         <profile>
-            <id>trainsys</id>
+            <id>runtime</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 50000
+EXPOSE 8081
 
 ADD trainsys-provider.jar /trainsys-provider.jar

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

@@ -22,32 +22,7 @@ spec:
         image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
         imagePullPolicy: Always
         ports:
-        - 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"      
+        - containerPort: 8081
 
 ---
 apiVersion: v1
@@ -60,9 +35,9 @@ spec:
   type: NodePort
   ports:
   - name: http
-    port: 50000
-    targetPort: 50000
-    nodePort: 50000
+    port: 8081
+    targetPort: 8081
+    nodePort: 8081
     protocol: TCP
   selector:
     app: trainsys-provider

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

@@ -3,23 +3,9 @@ services:
   trainsys-provider:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
     ports:
-      - "50000:50000"
+      - "8081:8081"
     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: