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

c2faec76 · ibizdev · f8b29365 · c2faec76 · c2faec76 · c2faec76
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Book.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Book.json
@@ -849,6 +849,9 @@
  "getAllPSDEDataRelations" : [ {
    "modelref" : true,
    "path" : "PSMODULES/common/PSDATAENTITIES/Book/PSDEDATARELATIONS/Default.json"
+  }, {
+    "modelref" : true,
+    "path" : "PSMODULES/common/PSDATAENTITIES/Book/PSDEDATARELATIONS/Usr03113675TabSearchView_DR.json"
  }, {
    "modelref" : true,
    "path" : "PSMODULES/common/PSDATAENTITIES/Book/PSDEDATARELATIONS/Usr03117794TabExpView_DR.json"
@@ -7373,6 +7376,12 @@
    "name" : "书实体编辑视图",
    "realModelSubType" : "DEEDITVIEW",
    "realModelType" : "PSDEVIEWBASE"
+  }, {
+    "codeName" : "Usr03113675TabSearchView",
+    "logicName" : "表格图表分页搜索测试",
+    "name" : "表格图表分页搜索测试",
+    "realModelSubType" : "DETABSEARCHVIEW",
+    "realModelType" : "PSDEVIEWBASE"
  }, {
    "codeName" : "BookMPickupView2_PickupGridView",
    "logicName" : "书实体多项数据选择视图（左右关系）_选择数据视图",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Book/PSDEDATARELATIONS/Usr03113675TabSearchView_DR.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Book/PSDEDATARELATIONS/Usr03113675TabSearchView_DR.json
+{
+  "codeName" : "Usr03113675TabSearchView_DR",
+  "dynaModelFilePath" : "PSMODULES/common/PSDATAENTITIES/Book/PSDEDATARELATIONS/Usr03113675TabSearchView_DR.json",
+  "formCaption" : "书",
+  "name" : "表格图表分页搜索测试_关系界面组"
+}
\ No newline at end of file
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json
@@ -5098,6 +5098,10 @@
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr01028976MPickupView2.json",
    "viewType" : "DEMPICKUPVIEW2"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr03113675TabSearchView.json",
+    "viewType" : "DETABSEARCHVIEW"
  }, {
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr2RedirectView.json",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr03113675TabSearchView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr03113675TabSearchView.json
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.hubsubapp.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.hubsubapp.json
@@ -2104,6 +2104,229 @@
    "uniqueTag" : "BXD2TabExpView__tabexppanel",
    "modelid" : "504e7ad929c98764f4356c3fed6cef62_tabexppanel",
    "modeltype" : "PSTABEXPPANEL"
+  }, {
+    "codeName" : "Usr03113675TabSearchViewtabexppanel",
+    "controlType" : "TABEXPPANEL",
+    "name" : "tabexppanel",
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
+    },
+    "getPSAppViewRefs" : [ {
+      "name" : "EXPITEM:test1",
+      "parentDataJO" : {
+        "srfparentdefname" : "PBOOKID",
+        "srfparentdename" : "BOOK",
+        "srfparentmode" : "DER1N_BOOK_BOOK_PBOOKID"
+      },
+      "realTitle" : "书表格视图",
+      "getRefPSAppView" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookGridView.json",
+        "viewType" : "DEGRIDVIEW"
+      }
+    }, {
+      "name" : "EXPITEM:test2",
+      "parentDataJO" : {
+        "srfparentdefname" : "PBOOKID",
+        "srfparentdename" : "BOOK",
+        "srfparentmode" : "DER1N_BOOK_BOOK_PBOOKID"
+      },
+      "realTitle" : "书实体测试(表格)",
+      "getRefPSAppView" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookGridView_Test.json",
+        "viewType" : "DEGRIDVIEW"
+      }
+    }, {
+      "name" : "EXPITEM:test3",
+      "parentDataJO" : {
+        "srfparentdefname" : "STUDENTID",
+        "srfparentdename" : "STUDENT",
+        "srfparentmode" : "DER1N_REGINFO_STUDENT_STUDENTID"
+      },
+      "realTitle" : "学员信息清单2",
+      "getRefPSAppView" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoStuInfoList.json",
+        "viewType" : "DEGRIDVIEW"
+      }
+    } ],
+    "getPSControlParam" : { },
+    "getPSControls" : [ {
+      "caption" : "书实体表格视图",
+      "codeName" : "Usr03113675TabSearchViewtest1",
+      "controlType" : "TABVIEWPANEL",
+      "getEmbeddedPSAppDEView" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookGridView.json",
+        "viewType" : "DEGRIDVIEW"
+      },
+      "name" : "test1",
+      "getNavPSDER" : {
+        "codeName" : "Book",
+        "dERType" : "DER1N",
+        "dynaModelFilePath" : "PSMODULES/common/PSDATAENTITIES/Book/PSDERS/DER1N_BOOK_BOOK_PBOOKID.json",
+        "fKeyName" : "F81B78DA4AF5A25A39",
+        "logicName" : "名称",
+        "getMajorPSDataEntity" : {
+          "modelref" : true,
+          "path" : "PSMODULES/common/PSDATAENTITIES/Book.json"
+        },
+        "masterOrder" : -1,
+        "masterRS" : 0,
+        "minorCodeName" : "books",
+        "getMinorPSDataEntity" : {
+          "modelref" : true,
+          "path" : "PSMODULES/common/PSDATAENTITIES/Book.json"
+        },
+        "minorServiceCodeName" : "books",
+        "name" : "DER1N_BOOK_BOOK_PBOOKID",
+        "orderValue" : 100,
+        "getPSPickupDEField" : {
+          "name" : "PBOOKID",
+          "codeName" : "Pbookid"
+        },
+        "pickupDEFName" : "PBOOKID",
+        "removeActionType" : -1,
+        "removeOrder" : 0,
+        "serviceCodeName" : "Book",
+        "enableFKey" : true
+      },
+      "getPSAppDataEntity" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
+      },
+      "getPSControlParam" : {
+        "navPSDERName" : "DER1N_BOOK_BOOK_PBOOKID",
+        "id" : "test1"
+      },
+      "parentDataJO" : {
+        "srfparentdefname" : "PBOOKID",
+        "srfparentdename" : "BOOK",
+        "srfparentmode" : "DER1N_BOOK_BOOK_PBOOKID"
+      },
+      "modelid" : "52c24347d21eee06d81e3dfc6af8ed9f_test1",
+      "modeltype" : "PSVIEWPANEL"
+    }, {
+      "caption" : "书实体测试(表格)",
+      "codeName" : "Usr03113675TabSearchViewtest2",
+      "controlType" : "TABVIEWPANEL",
+      "getEmbeddedPSAppDEView" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookGridView_Test.json",
+        "viewType" : "DEGRIDVIEW"
+      },
+      "name" : "test2",
+      "getNavPSDER" : {
+        "codeName" : "Book",
+        "dERType" : "DER1N",
+        "dynaModelFilePath" : "PSMODULES/common/PSDATAENTITIES/Book/PSDERS/DER1N_BOOK_BOOK_PBOOKID.json",
+        "fKeyName" : "F81B78DA4AF5A25A39",
+        "logicName" : "名称",
+        "getMajorPSDataEntity" : {
+          "modelref" : true,
+          "path" : "PSMODULES/common/PSDATAENTITIES/Book.json"
+        },
+        "masterOrder" : -1,
+        "masterRS" : 0,
+        "minorCodeName" : "books",
+        "getMinorPSDataEntity" : {
+          "modelref" : true,
+          "path" : "PSMODULES/common/PSDATAENTITIES/Book.json"
+        },
+        "minorServiceCodeName" : "books",
+        "name" : "DER1N_BOOK_BOOK_PBOOKID",
+        "orderValue" : 100,
+        "getPSPickupDEField" : {
+          "name" : "PBOOKID",
+          "codeName" : "Pbookid"
+        },
+        "pickupDEFName" : "PBOOKID",
+        "removeActionType" : -1,
+        "removeOrder" : 0,
+        "serviceCodeName" : "Book",
+        "enableFKey" : true
+      },
+      "getPSAppDataEntity" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
+      },
+      "getPSControlParam" : {
+        "navPSDERName" : "DER1N_BOOK_BOOK_PBOOKID",
+        "id" : "test2"
+      },
+      "parentDataJO" : {
+        "srfparentdefname" : "PBOOKID",
+        "srfparentdename" : "BOOK",
+        "srfparentmode" : "DER1N_BOOK_BOOK_PBOOKID"
+      },
+      "modelid" : "52c24347d21eee06d81e3dfc6af8ed9f_test2",
+      "modeltype" : "PSVIEWPANEL"
+    }, {
+      "caption" : "学员信息清单",
+      "codeName" : "Usr03113675TabSearchViewtest3",
+      "controlType" : "TABVIEWPANEL",
+      "getEmbeddedPSAppDEView" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoStuInfoList.json",
+        "viewType" : "DEGRIDVIEW"
+      },
+      "name" : "test3",
+      "getNavPSDER" : {
+        "codeName" : "StudentToReginfo",
+        "dERType" : "DER1N",
+        "dynaModelFilePath" : "PSMODULES/common/PSDATAENTITIES/Reginfo/PSDERS/DER1N_REGINFO_STUDENT_STUDENTID.json",
+        "fKeyName" : "F328B6E61632896255",
+        "getMajorPSDataEntity" : {
+          "modelref" : true,
+          "path" : "PSMODULES/common/PSDATAENTITIES/Student.json"
+        },
+        "masterOrder" : -1,
+        "masterRS" : 0,
+        "getMinorPSDataEntity" : {
+          "modelref" : true,
+          "path" : "PSMODULES/common/PSDATAENTITIES/Reginfo.json"
+        },
+        "name" : "DER1N_REGINFO_STUDENT_STUDENTID",
+        "orderValue" : 100,
+        "getPSPickupDEField" : {
+          "name" : "STUDENTID",
+          "codeName" : "StudentId"
+        },
+        "pickupDEFName" : "STUDENTID",
+        "removeActionType" : -1,
+        "removeOrder" : 0,
+        "serviceCodeName" : "StudentToReginfo",
+        "enableFKey" : true
+      },
+      "getPSAppDataEntity" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
+      },
+      "getPSControlParam" : {
+        "navPSDERName" : "DER1N_REGINFO_STUDENT_STUDENTID",
+        "id" : "test3"
+      },
+      "parentDataJO" : {
+        "srfparentdefname" : "STUDENTID",
+        "srfparentdename" : "STUDENT",
+        "srfparentmode" : "DER1N_REGINFO_STUDENT_STUDENTID"
+      },
+      "modelid" : "52c24347d21eee06d81e3dfc6af8ed9f_test3",
+      "modeltype" : "PSVIEWPANEL"
+    } ],
+    "getPSTabExpPages" : [ {
+      "name" : "test1"
+    }, {
+      "name" : "test2"
+    }, {
+      "name" : "test3"
+    } ],
+    "tabLayout" : "TOP",
+    "uniqueTag" : "bookUsr03113675TabSearchView__tabexppanel",
+    "modelid" : "52c24347d21eee06d81e3dfc6af8ed9f_tabexppanel",
+    "modeltype" : "PSTABEXPPANEL"
  }, {
    "codeName" : "Default",
    "controlType" : "DRBAR",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
@@ -2953,6 +2953,16 @@
      "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoREGINFOGridExpView2.json",
      "viewType" : "DEGRIDEXPVIEW"
    }
+  }, {
+    "appFuncType" : "APPVIEW",
+    "codeName" : "UsrAppFunc0311926346",
+    "name" : "表格图表分页搜索测试",
+    "openMode" : "INDEXVIEWTAB",
+    "getPSAppView" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr03113675TabSearchView.json",
+      "viewType" : "DETABSEARCHVIEW"
+    }
  }, {
    "appFuncType" : "APPVIEW",
    "codeName" : "UsrAppFunc0130455748",
@@ -13378,16 +13388,16 @@
    "codeName" : "VMGroup3",
    "name" : "视图消息类型测试",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-常规信息",
+      "name" : "消息类型-错误信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg4"
+        "id" : "ViewMsg6"
      }
    }, {
-      "name" : "消息类型-错误信息",
+      "name" : "消息类型-常规信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg6"
+        "id" : "ViewMsg4"
      }
    }, {
      "name" : "消息类型-警告信息",
@@ -13412,10 +13422,10 @@
    "codeName" : "VMGroup4",
    "name" : "视图消息位置测试",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息位置-视图下方",
+      "name" : "消息位置-视图上方",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg7"
      }
    }, {
      "name" : "消息位置-视图内容区",
@@ -13424,10 +13434,10 @@
        "id" : "ViewMsg9"
      }
    }, {
-      "name" : "消息位置-视图上方",
+      "name" : "消息位置-视图下方",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg7"
+        "id" : "ViewMsg8"
      }
    }, {
      "name" : "消息位置-弹出",
@@ -13446,6 +13456,13 @@
        "modelref" : true,
        "id" : "ViewMsg11"
      }
+    }, {
+      "name" : "消息类型-警告信息",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg5"
+      },
+      "position" : "POPUP"
    }, {
      "name" : "消息类型-常规信息",
      "getPSAppViewMsg" : {
@@ -13465,12 +13482,6 @@
        "modelref" : true,
        "id" : "ViewMsg9"
      }
-    }, {
-      "name" : "消息位置-视图下方",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg8"
-      }
    }, {
      "name" : "关闭模式-本次删除-上方-警告",
      "getPSAppViewMsg" : {
@@ -13478,12 +13489,11 @@
        "id" : "ViewMsg13"
      }
    }, {
-      "name" : "消息类型-警告信息",
+      "name" : "消息位置-视图下方",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg5"
-      },
-      "position" : "POPUP"
+        "id" : "ViewMsg8"
+      }
    }, {
      "name" : "消息类型-错误信息",
      "getPSAppViewMsg" : {
@@ -13503,16 +13513,16 @@
        "id" : "ViewMsg12"
      }
    }, {
-      "name" : "关闭模式-无删除",
+      "name" : "关闭模式-本次删除",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg11"
+        "id" : "ViewMsg13"
      }
    }, {
-      "name" : "关闭模式-本次删除",
+      "name" : "关闭模式-无删除",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg13"
+        "id" : "ViewMsg11"
      }
    } ],
    "uniqueTag" : "VMGroup5"
@@ -14714,6 +14724,12 @@
    "viewType" : "DEMPICKUPVIEW2",
    "resource" : "Book",
    "view" : "Usr01028976MPickupView2"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr03113675TabSearchView.json",
+    "viewType" : "DETABSEARCHVIEW",
+    "resource" : "Book",
+    "view" : "Usr03113675TabSearchView"
  }, {
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/FILETestTreeGridExView.json",
@@ -54591,6 +54607,10 @@
        "modelref" : true,
        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr01028976MPickupView2.json",
        "viewType" : "DEMPICKUPVIEW2"
+      }, {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr03113675TabSearchView.json",
+        "viewType" : "DETABSEARCHVIEW"
      }, {
        "modelref" : true,
        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr2RedirectView.json",