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

1c0d6065 · ibizdev · 2c874228 · 1c0d6065 · 1c0d6065 · 1c0d6065
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/BXD2.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/BXD2.json
@@ -521,6 +521,12 @@
    "path" : "PSMODULES/Test/PSDATAENTITIES/BXD2/PSDEDRGROUPS/DRGroup.json"
  } ],
  "getAllPSDEDRItems" : [ {
+    "modelref" : true,
+    "path" : "PSMODULES/Test/PSDATAENTITIES/BXD2/PSDEDRITEMS/UsrDRItem0130176189.json"
+  }, {
+    "modelref" : true,
+    "path" : "PSMODULES/Test/PSDATAENTITIES/BXD2/PSDEDRITEMS/UsrDRItem0130844332.json"
+  }, {
    "modelref" : true,
    "path" : "PSMODULES/Test/PSDATAENTITIES/BXD2/PSDEDRITEMS/UsrDRItem0908479795.json"
  } ],
@@ -667,6 +673,9 @@
    "viewLevel" : 0
  } ],
  "getAllPSDEDataRelations" : [ {
+    "modelref" : true,
+    "path" : "PSMODULES/Test/PSDATAENTITIES/BXD2/PSDEDATARELATIONS/DataRelation.json"
+  }, {
    "modelref" : true,
    "path" : "PSMODULES/Test/PSDATAENTITIES/BXD2/PSDEDATARELATIONS/Default.json"
  } ],
@@ -1772,8 +1781,8 @@
    "realModelType" : "PSDEVIEWBASE"
  }, {
    "codeName" : "GridExpView_Test",
-    "logicName" : "报销单导航",
-    "name" : "报销单导航",
+    "logicName" : "报销单2导航",
+    "name" : "报销单2导航",
    "realModelSubType" : "DEGRIDEXPVIEW",
    "realModelType" : "PSDEVIEWBASE"
  }, {
@@ -1801,6 +1810,12 @@
    "name" : "GridView_Test",
    "realModelSubType" : "DEGRIDVIEW",
    "realModelType" : "PSDEVIEWBASE"
+  }, {
+    "codeName" : "TabExpView_Test",
+    "logicName" : "报销单2分页导航",
+    "name" : "报销单2分页导航",
+    "realModelSubType" : "DETABEXPVIEW",
+    "realModelType" : "PSDEVIEWBASE"
  }, {
    "codeName" : "ChartView",
    "logicName" : "ChartView",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/BXD2/PSDEDATARELATIONS/DataRelation.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/BXD2/PSDEDATARELATIONS/DataRelation.json
+{
+  "codeName" : "DataRelation",
+  "dynaModelFilePath" : "PSMODULES/Test/PSDATAENTITIES/BXD2/PSDEDATARELATIONS/DataRelation.json",
+  "getFormCapPSLanguageRes" : {
+    "defaultContent" : "报销单2",
+    "lanResTag" : "DE.LNAME.BXD2",
+    "lanResType" : "DE.LNAME",
+    "name" : "实体逻辑名称（DE.LNAME.*）[BXD2]",
+    "refFlag" : true
+  },
+  "formCaption" : "报销单2",
+  "name" : "关系界面组2",
+  "getPSDEDRDetails" : [ {
+    "caption" : "报销单2表格导航",
+    "detailType" : "DRITEM",
+    "name" : "item1",
+    "orderValue" : 100,
+    "getPSDEDRItem" : {
+      "modelref" : true,
+      "path" : "PSMODULES/Test/PSDATAENTITIES/BXD2/PSDEDRITEMS/UsrDRItem0130176189.json"
+    }
+  }, {
+    "caption" : "报销单2表格",
+    "detailType" : "DRITEM",
+    "name" : "item2",
+    "orderValue" : 110,
+    "getPSDEDRItem" : {
+      "modelref" : true,
+      "path" : "PSMODULES/Test/PSDATAENTITIES/BXD2/PSDEDRITEMS/UsrDRItem0130844332.json"
+    }
+  } ]
+}
\ No newline at end of file
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/BXD2/PSDEDRITEMS/UsrDRItem0130176189.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/BXD2/PSDEDRITEMS/UsrDRItem0130176189.json
+{
+  "codeName" : "UsrDRItem0130176189",
+  "dynaModelFilePath" : "PSMODULES/Test/PSDATAENTITIES/BXD2/PSDEDRITEMS/UsrDRItem0130176189.json",
+  "itemType" : "CUSTOM",
+  "name" : "报销单2表格导航",
+  "parentDataJO" : {
+    "srfparentdename" : "BXD2",
+    "SRFPARENTTYPE" : "CUSTOM"
+  }
+}
\ No newline at end of file
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/BXD2/PSDEDRITEMS/UsrDRItem0130844332.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/BXD2/PSDEDRITEMS/UsrDRItem0130844332.json
+{
+  "codeName" : "UsrDRItem0130844332",
+  "dynaModelFilePath" : "PSMODULES/Test/PSDATAENTITIES/BXD2/PSDEDRITEMS/UsrDRItem0130844332.json",
+  "itemType" : "CUSTOM",
+  "name" : "报销单2表格",
+  "parentDataJO" : {
+    "srfparentdename" : "BXD2",
+    "SRFPARENTTYPE" : "CUSTOM"
+  }
+}
\ No newline at end of file
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD2.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD2.json
@@ -2308,6 +2308,10 @@
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/BXD2ChartView.json",
    "viewType" : "DECHARTVIEW"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/BXD2TabExpView_Test.json",
+    "viewType" : "DETABEXPVIEW"
  }, {
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/BXD2RedirectView_Test.json",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/BXD2GridExpView_Test.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/BXD2GridExpView_Test.json
@@ -603,7 +603,7 @@
    "useDefaultLayout" : true
  },
  "sideBarLayout" : "LEFT",
-  "title" : "报销单导航",
+  "title" : "报销单2导航",
  "viewStyle" : "DEFAULT",
  "viewType" : "DEGRIDEXPVIEW",
  "enableDP" : true,

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/BXD2TabExpView_Test.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/BXD2TabExpView_Test.json
+{
+  "accUserMode" : 2,
+  "getCapPSLanguageRes" : {
+    "defaultContent" : "报销单2",
+    "lanResTag" : "DE.LNAME.BXD2",
+    "lanResType" : "DE.LNAME",
+    "name" : "实体逻辑名称（DE.LNAME.*）[BXD2]",
+    "refFlag" : true
+  },
+  "caption" : "报销单2分页导航",
+  "codeName" : "BXD2TabExpView_Test",
+  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDEVIEWS/BXD2TabExpView_Test.json",
+  "name" : "BXD2TabExpView_Test",
+  "getPSAppDataEntity" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD2.json"
+  },
+  "getPSAppModule" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPMODULES/Test.json"
+  },
+  "getPSAppViewEngines" : [ {
+    "engineCat" : "VIEW",
+    "engineType" : "TabExpView",
+    "name" : "engine"
+  } ],
+  "getPSControls" : [ {
+    "codeName" : "DataRelation",
+    "controlType" : "DRTAB",
+    "getEditItemCapPSLanguageRes" : {
+      "defaultContent" : "报销单2",
+      "lanResTag" : "DE.LNAME.BXD2",
+      "lanResType" : "DE.LNAME",
+      "name" : "实体逻辑名称（DE.LNAME.*）[BXD2]",
+      "refFlag" : true
+    },
+    "editItemCaption" : "报销单2",
+    "name" : "tabexppanel",
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD2.json"
+    },
+    "getPSControlHandler" : {
+      "enableDEFieldPrivilege" : false,
+      "id" : "tabexppanel"
+    },
+    "getPSControlParam" : {
+      "autoLoad" : true,
+      "showBusyIndicator" : true,
+      "id" : "TABEXPPANEL"
+    },
+    "getPSDEDRTabPages" : [ {
+      "caption" : "报销单2表格导航",
+      "name" : "item1",
+      "getPSAppView" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/BXD2GridExpView_Test.json",
+        "viewType" : "DEGRIDEXPVIEW"
+      }
+    }, {
+      "caption" : "报销单2表格",
+      "name" : "item2",
+      "getPSAppView" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/BXD2GridView_Test.json",
+        "viewType" : "DEGRIDVIEW"
+      }
+    } ],
+    "uniqueTag" : "BXD2TabExpView_Test__tabexppanel",
+    "modelid" : "006A79A1-D892-4C8E-A1AD-E4C97586EB19",
+    "modeltype" : "PSDEDRTAB"
+  }, {
+    "getCapPSLanguageRes" : {
+      "defaultContent" : "报销单2",
+      "lanResTag" : "DE.LNAME.BXD2",
+      "lanResType" : "DE.LNAME",
+      "name" : "实体逻辑名称（DE.LNAME.*）[BXD2]",
+      "refFlag" : true
+    },
+    "caption" : "报销单2分页导航",
+    "codeName" : "TabExpView_Testcaptionbar",
+    "controlType" : "CAPTIONBAR",
+    "name" : "captionbar",
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD2.json"
+    },
+    "getPSControlParam" : { }
+  } ],
+  "getPSDEViewCodeName" : "TabExpView_Test",
+  "getPSDEViewId" : "6FD5580A-914A-4F4E-87DD-47958308C757",
+  "getPSViewLayoutPanel" : {
+    "codeName" : "Layoutpanel",
+    "controlStyle" : "APPDETABEXPVIEW",
+    "controlType" : "VIEWLAYOUTPANEL",
+    "name" : "layoutpanel",
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD2.json"
+    },
+    "getPSControlParam" : { },
+    "layoutBodyOnly" : true,
+    "layoutPanel" : true,
+    "useDefaultLayout" : true
+  },
+  "tabLayout" : "TOP",
+  "title" : "报销单2分页导航",
+  "viewStyle" : "DEFAULT",
+  "viewType" : "DETABEXPVIEW",
+  "enableDP" : true,
+  "enableQuickSearch" : false,
+  "enableSearch" : false,
+  "expandSearchForm" : false,
+  "loadDefault" : true,
+  "showDataInfoBar" : true,
+  "modelid" : "a1d093b660db646236de97bb3aa46e03",
+  "modeltype" : "PSAPPDEVIEW"
+}
\ No newline at end of file
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPINDEXVIEWS/HomeTest.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPINDEXVIEWS/HomeTest.json
@@ -58,6 +58,28 @@
        "layout" : "TABLE_24COL"
      },
      "tooltip" : "报销单2导航_测试"
+    }, {
+      "accUserMode" : 2,
+      "caption" : "报销单2分页导航",
+      "itemType" : "MENUITEM",
+      "name" : "menuitem3",
+      "getPSAppFunc" : {
+        "modelref" : true,
+        "id" : "UsrAppFunc0130357750"
+      },
+      "getPSLayout" : {
+        "childColLG" : -1,
+        "childColMD" : 24,
+        "childColSM" : -1,
+        "childColXS" : -1,
+        "columnCount" : 24,
+        "layout" : "TABLE_24COL"
+      },
+      "getPSLayoutPos" : {
+        "colMD" : 24,
+        "layout" : "TABLE_24COL"
+      },
+      "tooltip" : "报销单2分页导航"
    } ],
    "getPSControlHandler" : {
      "enableDEFieldPrivilege" : false,

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPMENUS/Usr1225486891Menu.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPMENUS/Usr1225486891Menu.json
@@ -23,6 +23,16 @@
      "id" : "UsrAppFunc0130899950"
    },
    "tooltip" : "报销单2导航_测试"
+  }, {
+    "accUserMode" : 2,
+    "caption" : "报销单2分页导航",
+    "itemType" : "MENUITEM",
+    "name" : "menuitem3",
+    "getPSAppFunc" : {
+      "modelref" : true,
+      "id" : "UsrAppFunc0130357750"
+    },
+    "tooltip" : "报销单2分页导航"
  } ],
  "name" : "hometest",
  "modelid" : "45A63949-C119-4884-B878-3949959DE49A",

--- 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
@@ -2686,6 +2686,51 @@
    "uniqueTag" : "TESTUsr5TabExpView__tabexppanel",
    "modelid" : "9c5e8c4ceea2b4c329564dfefe2fc45a_tabexppanel",
    "modeltype" : "PSTABEXPPANEL"
+  }, {
+    "codeName" : "DataRelation",
+    "controlType" : "DRTAB",
+    "getEditItemCapPSLanguageRes" : {
+      "defaultContent" : "报销单2",
+      "lanResTag" : "DE.LNAME.BXD2",
+      "lanResType" : "DE.LNAME",
+      "name" : "实体逻辑名称（DE.LNAME.*）[BXD2]",
+      "refFlag" : true
+    },
+    "editItemCaption" : "报销单2",
+    "name" : "tabexppanel",
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD2.json"
+    },
+    "getPSControlHandler" : {
+      "enableDEFieldPrivilege" : false,
+      "id" : "tabexppanel"
+    },
+    "getPSControlParam" : {
+      "autoLoad" : true,
+      "showBusyIndicator" : true,
+      "id" : "TABEXPPANEL"
+    },
+    "getPSDEDRTabPages" : [ {
+      "caption" : "报销单2表格导航",
+      "name" : "item1",
+      "getPSAppView" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/BXD2GridExpView_Test.json",
+        "viewType" : "DEGRIDEXPVIEW"
+      }
+    }, {
+      "caption" : "报销单2表格",
+      "name" : "item2",
+      "getPSAppView" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/BXD2GridView_Test.json",
+        "viewType" : "DEGRIDVIEW"
+      }
+    } ],
+    "uniqueTag" : "BXD2TabExpView_Test__tabexppanel",
+    "modelid" : "006A79A1-D892-4C8E-A1AD-E4C97586EB19",
+    "modeltype" : "PSDEDRTAB"
  }, {
    "codeName" : "Default",
    "controlType" : "DRTAB",

--- 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
@@ -4213,6 +4213,16 @@
      "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTEditView.json",
      "viewType" : "DEEDITVIEW"
    }
+  }, {
+    "appFuncType" : "APPVIEW",
+    "codeName" : "UsrAppFunc0130357750",
+    "name" : "报销单2分页导航",
+    "openMode" : "INDEXVIEWTAB",
+    "getPSAppView" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/BXD2TabExpView_Test.json",
+      "viewType" : "DETABEXPVIEW"
+    }
  }, {
    "appFuncType" : "CUSTOM",
    "codeName" : "UsrAppFunc0926797345",
@@ -13511,6 +13521,18 @@
    "codeName" : "VMGroup8",
    "name" : "【静态测试】",
    "getPSAppViewMsgGroupDetails" : [ {
+      "name" : "关闭模式-默认删除-上方-错误",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg12"
+      }
+    }, {
+      "name" : "消息位置-视图内容区",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg9"
+      }
+    }, {
      "name" : "消息类型-警告信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
@@ -13549,39 +13571,27 @@
        "modelref" : true,
        "id" : "ViewMsg8"
      }
-    }, {
-      "name" : "关闭模式-默认删除-上方-错误",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg12"
-      }
-    }, {
-      "name" : "消息位置-视图内容区",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg9"
-      }
    } ]
  }, {
    "codeName" : "VMGroup5",
    "name" : "视图消息关闭模式",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-无删除",
+      "name" : "关闭模式-本次删除",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg11"
+        "id" : "ViewMsg13"
      }
    }, {
-      "name" : "关闭模式-默认删除",
+      "name" : "关闭模式-无删除",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg12"
+        "id" : "ViewMsg11"
      }
    }, {
-      "name" : "关闭模式-本次删除",
+      "name" : "关闭模式-默认删除",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg13"
+        "id" : "ViewMsg12"
      }
    } ]
  }, {
@@ -15593,6 +15603,12 @@
    "viewType" : "DEEDITVIEW",
    "resource" : "Bxdex",
    "view" : "Usr2EditView"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/BXD2TabExpView_Test.json",
+    "viewType" : "DETABEXPVIEW",
+    "resource" : "BXD2",
+    "view" : "TabExpView_Test"
  }, {
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoUsr2ChartExpView.json",
@@ -66191,6 +66207,10 @@
        "modelref" : true,
        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/BXD2ChartView.json",
        "viewType" : "DECHARTVIEW"
+      }, {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/BXD2TabExpView_Test.json",
+        "viewType" : "DETABEXPVIEW"
      }, {
        "modelref" : true,
        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/BXD2RedirectView_Test.json",