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

86d6a326 · ibizdev · f7c1ec0d · 86d6a326 · 86d6a326 · 86d6a326
--- 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
@@ -888,6 +888,7 @@
    "enableFront" : true
  }, {
    "codeName" : "Default2",
+    "groupMode" : 2,
    "logicName" : "数据查询",
    "name" : "DEFAULT2",
    "getPSDEDataQueries" : [ {
@@ -910,8 +911,13 @@
      },
      "type" : "PAGE"
    },
+    "getPSDERAggData" : {
+      "modelref" : true,
+      "path" : "PSMODULES/common/PSDATAENTITIES/Bxdex/PSDERS/DERAGGDATA_BXD_EX_BOOK.json"
+    },
    "enableBackend" : true,
-    "enableFront" : true
+    "enableFront" : true,
+    "enableGroup" : true
  }, {
    "codeName" : "Simple",
    "logicName" : "数据集2",
@@ -8476,6 +8482,24 @@
    "removeActionType" : -1,
    "removeOrder" : 0,
    "serviceCodeName" : "Book6"
+  }, {
+    "dERType" : "DERAGGDATA",
+    "dynaModelFilePath" : "PSMODULES/common/PSDATAENTITIES/Bxdex/PSDERS/DERAGGDATA_BXD_EX_BOOK.json",
+    "logicName" : "聚合",
+    "getMajorPSDataEntity" : {
+      "modelref" : true,
+      "path" : "PSMODULES/common/PSDATAENTITIES/Book.json"
+    },
+    "getMinorPSDataEntity" : {
+      "modelref" : true,
+      "path" : "PSMODULES/common/PSDATAENTITIES/Bxdex.json"
+    },
+    "name" : "DERAGGDATA_BXD_EX_BOOK",
+    "orderValue" : 100,
+    "getSourcePSDEDataSet" : {
+      "modelref" : true,
+      "id" : "Default"
+    }
  } ],
  "getMinorPSDERs" : [ {
    "codeName" : "Book",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Bxdex.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Bxdex.json
@@ -1992,6 +1992,24 @@
    "removeActionType" : -1,
    "removeOrder" : 0,
    "serviceCodeName" : "Book6"
+  }, {
+    "dERType" : "DERAGGDATA",
+    "dynaModelFilePath" : "PSMODULES/common/PSDATAENTITIES/Bxdex/PSDERS/DERAGGDATA_BXD_EX_BOOK.json",
+    "logicName" : "聚合",
+    "getMajorPSDataEntity" : {
+      "modelref" : true,
+      "path" : "PSMODULES/common/PSDATAENTITIES/Book.json"
+    },
+    "getMinorPSDataEntity" : {
+      "modelref" : true,
+      "path" : "PSMODULES/common/PSDATAENTITIES/Bxdex.json"
+    },
+    "name" : "DERAGGDATA_BXD_EX_BOOK",
+    "orderValue" : 100,
+    "getSourcePSDEDataSet" : {
+      "modelref" : true,
+      "id" : "Default"
+    }
  } ],
  "name" : "BXD_EX",
  "getPSSubSysServiceAPI" : {

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Bxdex/PSDERS/DERAGGDATA_BXD_EX_BOOK.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Bxdex/PSDERS/DERAGGDATA_BXD_EX_BOOK.json
+{
+  "dERType" : "DERAGGDATA",
+  "dynaModelFilePath" : "PSMODULES/common/PSDATAENTITIES/Bxdex/PSDERS/DERAGGDATA_BXD_EX_BOOK.json",
+  "logicName" : "聚合",
+  "getMajorPSDataEntity" : {
+    "modelref" : true,
+    "path" : "PSMODULES/common/PSDATAENTITIES/Book.json"
+  },
+  "getMinorPSDataEntity" : {
+    "modelref" : true,
+    "path" : "PSMODULES/common/PSDATAENTITIES/Bxdex.json"
+  },
+  "name" : "DERAGGDATA_BXD_EX_BOOK",
+  "orderValue" : 100,
+  "getSourcePSDEDataSet" : {
+    "modelref" : true,
+    "id" : "Default"
+  }
+}
\ No newline at end of file
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSSYSAPP.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSSYSAPP.json
@@ -1482,16 +1482,16 @@
    "codeName" : "VMGroup2",
    "name" : "视图消息组2",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息",
+      "name" : "视图消息2",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
      }
    }, {
-      "name" : "视图消息2",
+      "name" : "视图消息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
      }
    } ],
    "uniqueTag" : "VMGroup2"

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json
@@ -4629,7 +4629,7 @@
    "id" : "KO_T1@TEST"
  }, {
    "actionLevel" : 200,
-    "actionTarget" : "MULTIKEY",
+    "actionTarget" : "SINGLEDATA",
    "caption" : "看板测试界面行为2",
    "codeName" : "KO_T2",
    "frontProcessType" : "EDITFORM",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSDATAVIEWS/KanbanDataview.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSDATAVIEWS/KanbanDataview.json
@@ -489,7 +489,7 @@
        "name" : "u396eb9a",
        "getPSUIAction" : {
          "actionLevel" : 200,
-          "actionTarget" : "MULTIKEY",
+          "actionTarget" : "SINGLEDATA",
          "caption" : "看板测试界面行为2",
          "codeName" : "KO_T2",
          "frontProcessType" : "EDITFORM",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSKANBANS/KanbanDataview.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSKANBANS/KanbanDataview.json
@@ -489,7 +489,7 @@
        "name" : "u396eb9a",
        "getPSUIAction" : {
          "actionLevel" : 200,
-          "actionTarget" : "MULTIKEY",
+          "actionTarget" : "SINGLEDATA",
          "caption" : "看板测试界面行为2",
          "codeName" : "KO_T2",
          "frontProcessType" : "EDITFORM",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/BXDMXUsr10257483CustomView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/BXDMXUsr10257483CustomView.json
@@ -1812,7 +1812,7 @@
            "name" : "u396eb9a",
            "getPSUIAction" : {
              "actionLevel" : 200,
-              "actionTarget" : "MULTIKEY",
+              "actionTarget" : "SINGLEDATA",
              "caption" : "看板测试界面行为2",
              "codeName" : "KO_T2",
              "frontProcessType" : "EDITFORM",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTKanbanView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTKanbanView.json
@@ -977,7 +977,7 @@
          "name" : "u396eb9a",
          "getPSUIAction" : {
            "actionLevel" : 200,
-            "actionTarget" : "MULTIKEY",
+            "actionTarget" : "SINGLEDATA",
            "caption" : "看板测试界面行为2",
            "codeName" : "KO_T2",
            "frontProcessType" : "EDITFORM",

--- 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
@@ -1044,7 +1044,7 @@
      "name" : "u396eb9a",
      "getPSUIAction" : {
        "actionLevel" : 200,
-        "actionTarget" : "MULTIKEY",
+        "actionTarget" : "SINGLEDATA",
        "caption" : "看板测试界面行为2",
        "codeName" : "KO_T2",
        "frontProcessType" : "EDITFORM",

--- 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
@@ -13373,16 +13373,16 @@
    "codeName" : "VMGroup2",
    "name" : "视图消息组2",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息",
+      "name" : "视图消息2",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
      }
    }, {
-      "name" : "视图消息2",
+      "name" : "视图消息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
      }
    } ],
    "uniqueTag" : "VMGroup2"
@@ -13414,10 +13414,10 @@
    "codeName" : "VMGroup3",
    "name" : "视图消息类型测试",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-错误信息",
+      "name" : "消息类型-常规信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg6"
+        "id" : "ViewMsg4"
      }
    }, {
      "name" : "消息类型-警告信息",
@@ -13426,10 +13426,10 @@
        "id" : "ViewMsg5"
      }
    }, {
-      "name" : "消息类型-常规信息",
+      "name" : "消息类型-错误信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg4"
+        "id" : "ViewMsg6"
      }
    } ],
    "uniqueTag" : "VMGroup3"
@@ -13448,28 +13448,28 @@
    "codeName" : "VMGroup4",
    "name" : "视图消息位置测试",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息位置-视图上方",
+      "name" : "消息位置-视图下方",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg7"
+        "id" : "ViewMsg8"
      }
    }, {
-      "name" : "消息位置-视图下方",
+      "name" : "消息位置-视图内容区",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg9"
      }
    }, {
-      "name" : "消息位置-弹出",
+      "name" : "消息位置-视图上方",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg10"
+        "id" : "ViewMsg7"
      }
    }, {
-      "name" : "消息位置-视图内容区",
+      "name" : "消息位置-弹出",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg9"
+        "id" : "ViewMsg10"
      }
    } ],
    "uniqueTag" : "VMGroup4"
@@ -13477,38 +13477,30 @@
    "codeName" : "VMGroup8",
    "name" : "【静态测试】",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-警告信息",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg5"
-      },
-      "position" : "POPUP"
-    }, {
-      "name" : "关闭模式-本次删除-上方-警告",
+      "name" : "关闭模式-无删除-上方-常规",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg13"
+        "id" : "ViewMsg11"
      }
    }, {
-      "name" : "消息类型-错误信息",
+      "name" : "消息类型-常规信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg6"
+        "id" : "ViewMsg4"
      },
      "position" : "POPUP"
    }, {
-      "name" : "关闭模式-无删除-上方-常规",
+      "name" : "消息位置-视图内容区",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg11"
+        "id" : "ViewMsg9"
      }
    }, {
-      "name" : "消息类型-常规信息",
+      "name" : "关闭模式-默认删除-上方-错误",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg4"
-      },
-      "position" : "POPUP"
+        "id" : "ViewMsg12"
+      }
    }, {
      "name" : "消息位置-视图下方",
      "getPSAppViewMsg" : {
@@ -13516,33 +13508,41 @@
        "id" : "ViewMsg8"
      }
    }, {
-      "name" : "关闭模式-默认删除-上方-错误",
+      "name" : "关闭模式-本次删除-上方-警告",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg12"
+        "id" : "ViewMsg13"
      }
    }, {
-      "name" : "消息位置-视图内容区",
+      "name" : "消息类型-警告信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg9"
-      }
+        "id" : "ViewMsg5"
+      },
+      "position" : "POPUP"
+    }, {
+      "name" : "消息类型-错误信息",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg6"
+      },
+      "position" : "POPUP"
    } ],
    "uniqueTag" : "VMGroup8"
  }, {
    "codeName" : "VMGroup5",
    "name" : "视图消息关闭模式",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-无删除",
+      "name" : "关闭模式-默认删除",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg11"
+        "id" : "ViewMsg12"
      }
    }, {
-      "name" : "关闭模式-默认删除",
+      "name" : "关闭模式-无删除",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg12"
+        "id" : "ViewMsg11"
      }
    }, {
      "name" : "关闭模式-本次删除",
@@ -40747,7 +40747,7 @@
                "name" : "u396eb9a",
                "getPSUIAction" : {
                  "actionLevel" : 200,
-                  "actionTarget" : "MULTIKEY",
+                  "actionTarget" : "SINGLEDATA",
                  "caption" : "看板测试界面行为2",
                  "codeName" : "KO_T2",
                  "frontProcessType" : "EDITFORM",
@@ -60847,7 +60847,7 @@
        "id" : "KO_T1@TEST"
      }, {
        "actionLevel" : 200,
-        "actionTarget" : "MULTIKEY",
+        "actionTarget" : "SINGLEDATA",
        "caption" : "看板测试界面行为2",
        "codeName" : "KO_T2",
        "frontProcessType" : "EDITFORM",