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

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

@@ -834,7 +834,7 @@
             },
             "getPSControlAttributes" : [ {
               "attrName" : "spanMethod",
-              "attrValue" : "({\r\n    row,\r\n    column,\r\n    rowIndex,\r\n    columnIndex,\r\n  }) => {\r\n    console.log('测试合并');\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}",
+              "attrValue" : "({\r\n    row,\r\n    column,\r\n    rowIndex,\r\n    columnIndex,\r\n  }) => {\r\n    console.log('测试合并');\r\n    const { property } = column;\r\n    const rowspankeys = ['department','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" : {

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

@@ -75,7 +75,7 @@
   },
   "getPSControlAttributes" : [ {
     "attrName" : "spanMethod",
-    "attrValue" : "({\r\n    row,\r\n    column,\r\n    rowIndex,\r\n    columnIndex,\r\n  }) => {\r\n    console.log('测试合并');\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}",
+    "attrValue" : "({\r\n    row,\r\n    column,\r\n    rowIndex,\r\n    columnIndex,\r\n  }) => {\r\n    console.log('测试合并');\r\n    const { property } = column;\r\n    const rowspankeys = ['department','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" : [ {

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" : "NEWDATA",
+      "name" : "EDITDATA",
       "realOpenMode" : "POPUPMODAL",
       "realTitle" : "学生信息编辑视图",
       "getRefPSAppView" : {
@@ -493,7 +493,7 @@
       },
       "getPSControlAttributes" : [ {
         "attrName" : "spanMethod",
-        "attrValue" : "({\r\n    row,\r\n    column,\r\n    rowIndex,\r\n    columnIndex,\r\n  }) => {\r\n    console.log('测试合并');\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}",
+        "attrValue" : "({\r\n    row,\r\n    column,\r\n    rowIndex,\r\n    columnIndex,\r\n  }) => {\r\n    console.log('测试合并');\r\n    const { property } = column;\r\n    const rowspankeys = ['department','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" : {

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

@@ -159,7 +159,7 @@
       },
       "getPSControlAttributes" : [ {
         "attrName" : "spanMethod",
-        "attrValue" : "({\r\n    row,\r\n    column,\r\n    rowIndex,\r\n    columnIndex,\r\n  }) => {\r\n    console.log('测试合并');\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}",
+        "attrValue" : "({\r\n    row,\r\n    column,\r\n    rowIndex,\r\n    columnIndex,\r\n  }) => {\r\n    console.log('测试合并');\r\n    const { property } = column;\r\n    const rowspankeys = ['department','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" : {

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

@@ -533,7 +533,7 @@
       },
       "getPSControlAttributes" : [ {
         "attrName" : "spanMethod",
-        "attrValue" : "({\r\n    row,\r\n    column,\r\n    rowIndex,\r\n    columnIndex,\r\n  }) => {\r\n    console.log('测试合并');\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}",
+        "attrValue" : "({\r\n    row,\r\n    column,\r\n    rowIndex,\r\n    columnIndex,\r\n  }) => {\r\n    console.log('测试合并');\r\n    const { property } = column;\r\n    const rowspankeys = ['department','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" : {

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

@@ -1786,7 +1786,7 @@
                 },
                 "getPSControlAttributes" : [ {
                   "attrName" : "spanMethod",
-                  "attrValue" : "({\r\n    row,\r\n    column,\r\n    rowIndex,\r\n    columnIndex,\r\n  }) => {\r\n    console.log('测试合并');\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}",
+                  "attrValue" : "({\r\n    row,\r\n    column,\r\n    rowIndex,\r\n    columnIndex,\r\n  }) => {\r\n    console.log('测试合并');\r\n    const { property } = column;\r\n    const rowspankeys = ['department','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" : {

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

@@ -945,7 +945,7 @@
               },
               "getPSControlAttributes" : [ {
                 "attrName" : "spanMethod",
-                "attrValue" : "({\r\n    row,\r\n    column,\r\n    rowIndex,\r\n    columnIndex,\r\n  }) => {\r\n    console.log('测试合并');\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}",
+                "attrValue" : "({\r\n    row,\r\n    column,\r\n    rowIndex,\r\n    columnIndex,\r\n  }) => {\r\n    console.log('测试合并');\r\n    const { property } = column;\r\n    const rowspankeys = ['department','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" : {

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

@@ -911,7 +911,7 @@
                   },
                   "getPSControlAttributes" : [ {
                     "attrName" : "spanMethod",
-                    "attrValue" : "({\r\n    row,\r\n    column,\r\n    rowIndex,\r\n    columnIndex,\r\n  }) => {\r\n    console.log('测试合并');\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}",
+                    "attrValue" : "({\r\n    row,\r\n    column,\r\n    rowIndex,\r\n    columnIndex,\r\n  }) => {\r\n    console.log('测试合并');\r\n    const { property } = column;\r\n    const rowspankeys = ['department','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" : {
@@ -2084,7 +2084,7 @@
                   },
                   "getPSControlAttributes" : [ {
                     "attrName" : "spanMethod",
-                    "attrValue" : "({\r\n    row,\r\n    column,\r\n    rowIndex,\r\n    columnIndex,\r\n  }) => {\r\n    console.log('测试合并');\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}",
+                    "attrValue" : "({\r\n    row,\r\n    column,\r\n    rowIndex,\r\n    columnIndex,\r\n  }) => {\r\n    console.log('测试合并');\r\n    const { property } = column;\r\n    const rowspankeys = ['department','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" : {

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

@@ -833,7 +833,7 @@
             },
             "getPSControlAttributes" : [ {
               "attrName" : "spanMethod",
-              "attrValue" : "({\r\n    row,\r\n    column,\r\n    rowIndex,\r\n    columnIndex,\r\n  }) => {\r\n    console.log('测试合并');\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}",
+              "attrValue" : "({\r\n    row,\r\n    column,\r\n    rowIndex,\r\n    columnIndex,\r\n  }) => {\r\n    console.log('测试合并');\r\n    const { property } = column;\r\n    const rowspankeys = ['department','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" : {

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

@@ -1133,7 +1133,7 @@
               },
               "getPSControlAttributes" : [ {
                 "attrName" : "spanMethod",
-                "attrValue" : "({\r\n    row,\r\n    column,\r\n    rowIndex,\r\n    columnIndex,\r\n  }) => {\r\n    console.log('测试合并');\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}",
+                "attrValue" : "({\r\n    row,\r\n    column,\r\n    rowIndex,\r\n    columnIndex,\r\n  }) => {\r\n    console.log('测试合并');\r\n    const { property } = column;\r\n    const rowspankeys = ['department','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" : {

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

@@ -75,7 +75,7 @@
   },
   "getPSControlAttributes" : [ {
     "attrName" : "spanMethod",
-    "attrValue" : "({\r\n    row,\r\n    column,\r\n    rowIndex,\r\n    columnIndex,\r\n  }) => {\r\n    console.log('测试合并');\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}",
+    "attrValue" : "({\r\n    row,\r\n    column,\r\n    rowIndex,\r\n    columnIndex,\r\n  }) => {\r\n    console.log('测试合并');\r\n    const { property } = column;\r\n    const rowspankeys = ['department','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" : [ {

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" : "NEWDATA",
+      "name" : "EDITDATA",
       "realOpenMode" : "POPUPMODAL",
       "realTitle" : "学生信息编辑视图",
       "getRefPSAppView" : {
@@ -493,7 +493,7 @@
       },
       "getPSControlAttributes" : [ {
         "attrName" : "spanMethod",
-        "attrValue" : "({\r\n    row,\r\n    column,\r\n    rowIndex,\r\n    columnIndex,\r\n  }) => {\r\n    console.log('测试合并');\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}",
+        "attrValue" : "({\r\n    row,\r\n    column,\r\n    rowIndex,\r\n    columnIndex,\r\n  }) => {\r\n    console.log('测试合并');\r\n    const { property } = column;\r\n    const rowspankeys = ['department','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" : {

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

@@ -158,7 +158,7 @@
       },
       "getPSControlAttributes" : [ {
         "attrName" : "spanMethod",
-        "attrValue" : "({\r\n    row,\r\n    column,\r\n    rowIndex,\r\n    columnIndex,\r\n  }) => {\r\n    console.log('测试合并');\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}",
+        "attrValue" : "({\r\n    row,\r\n    column,\r\n    rowIndex,\r\n    columnIndex,\r\n  }) => {\r\n    console.log('测试合并');\r\n    const { property } = column;\r\n    const rowspankeys = ['department','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" : {

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

@@ -103,7 +103,7 @@
       },
       "getPSControlAttributes" : [ {
         "attrName" : "spanMethod",
-        "attrValue" : "({\r\n    row,\r\n    column,\r\n    rowIndex,\r\n    columnIndex,\r\n  }) => {\r\n    console.log('测试合并');\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}",
+        "attrValue" : "({\r\n    row,\r\n    column,\r\n    rowIndex,\r\n    columnIndex,\r\n  }) => {\r\n    console.log('测试合并');\r\n    const { property } = column;\r\n    const rowspankeys = ['department','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" : {

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

@@ -532,7 +532,7 @@
       },
       "getPSControlAttributes" : [ {
         "attrName" : "spanMethod",
-        "attrValue" : "({\r\n    row,\r\n    column,\r\n    rowIndex,\r\n    columnIndex,\r\n  }) => {\r\n    console.log('测试合并');\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}",
+        "attrValue" : "({\r\n    row,\r\n    column,\r\n    rowIndex,\r\n    columnIndex,\r\n  }) => {\r\n    console.log('测试合并');\r\n    const { property } = column;\r\n    const rowspankeys = ['department','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" : {

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

@@ -1251,7 +1251,7 @@
                 },
                 "getPSControlAttributes" : [ {
                   "attrName" : "spanMethod",
-                  "attrValue" : "({\r\n    row,\r\n    column,\r\n    rowIndex,\r\n    columnIndex,\r\n  }) => {\r\n    console.log('测试合并');\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}",
+                  "attrValue" : "({\r\n    row,\r\n    column,\r\n    rowIndex,\r\n    columnIndex,\r\n  }) => {\r\n    console.log('测试合并');\r\n    const { property } = column;\r\n    const rowspankeys = ['department','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" : {

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

@@ -1582,7 +1582,7 @@
                     },
                     "getPSControlAttributes" : [ {
                       "attrName" : "spanMethod",
-                      "attrValue" : "({\r\n    row,\r\n    column,\r\n    rowIndex,\r\n    columnIndex,\r\n  }) => {\r\n    console.log('测试合并');\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}",
+                      "attrValue" : "({\r\n    row,\r\n    column,\r\n    rowIndex,\r\n    columnIndex,\r\n  }) => {\r\n    console.log('测试合并');\r\n    const { property } = column;\r\n    const rowspankeys = ['department','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" : {
@@ -2755,7 +2755,7 @@
                     },
                     "getPSControlAttributes" : [ {
                       "attrName" : "spanMethod",
-                      "attrValue" : "({\r\n    row,\r\n    column,\r\n    rowIndex,\r\n    columnIndex,\r\n  }) => {\r\n    console.log('测试合并');\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}",
+                      "attrValue" : "({\r\n    row,\r\n    column,\r\n    rowIndex,\r\n    columnIndex,\r\n  }) => {\r\n    console.log('测试合并');\r\n    const { property } = column;\r\n    const rowspankeys = ['department','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" : {

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

@@ -1785,7 +1785,7 @@
                 },
                 "getPSControlAttributes" : [ {
                   "attrName" : "spanMethod",
-                  "attrValue" : "({\r\n    row,\r\n    column,\r\n    rowIndex,\r\n    columnIndex,\r\n  }) => {\r\n    console.log('测试合并');\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}",
+                  "attrValue" : "({\r\n    row,\r\n    column,\r\n    rowIndex,\r\n    columnIndex,\r\n  }) => {\r\n    console.log('测试合并');\r\n    const { property } = column;\r\n    const rowspankeys = ['department','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" : {

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

@@ -943,7 +943,7 @@
               },
               "getPSControlAttributes" : [ {
                 "attrName" : "spanMethod",
-                "attrValue" : "({\r\n    row,\r\n    column,\r\n    rowIndex,\r\n    columnIndex,\r\n  }) => {\r\n    console.log('测试合并');\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}",
+                "attrValue" : "({\r\n    row,\r\n    column,\r\n    rowIndex,\r\n    columnIndex,\r\n  }) => {\r\n    console.log('测试合并');\r\n    const { property } = column;\r\n    const rowspankeys = ['department','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" : {