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

84f5c378 · ibizdev · 128a08c7 · 84f5c378 · 84f5c378 · 84f5c378
--- 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
@@ -4498,6 +4498,28 @@
    "uIActionTag" : "testscriptt",
    "uIActionType" : "DEUIACTION",
    "id" : "testscriptt@Book"
+  }, {
+    "actionTarget" : "SINGLEDATA",
+    "caption" : "界面逻辑",
+    "codeName" : "toolbar_Usr4GridViewtoolbar_deuiaction1_click",
+    "frontProcessType" : "OTHER",
+    "fullCodeName" : "Book_toolbar_Usr4GridViewtoolbar_deuiaction1_click",
+    "name" : "界面逻辑",
+    "getPSAppDEUILogic" : {
+      "modelref" : true,
+      "id" : "test"
+    },
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
+    },
+    "timeout" : 60000,
+    "uIActionMode" : "FRONT",
+    "uIActionTag" : "toolbar_Usr4GridViewtoolbar_deuiaction1_click",
+    "uIActionType" : "DEUIACTION",
+    "uILogicAttachMode" : "REPLACE",
+    "uILogicType" : "DELOGIC",
+    "id" : "toolbar_Usr4GridViewtoolbar_deuiaction1_click@Book"
  } ],
  "getAllPSAppDEUILogics" : [ {
    "codeName" : "test",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr4GridView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr4GridView.json
@@ -78,7 +78,7 @@
    }
  } ],
  "getPSAppViewRefs" : [ {
-    "name" : "NEWDATA",
+    "name" : "EDITDATA",
    "realTitle" : "书编辑视图",
    "getRefPSAppView" : {
      "modelref" : true,
@@ -86,7 +86,7 @@
      "viewType" : "DEEDITVIEW"
    }
  }, {
-    "name" : "EDITDATA",
+    "name" : "NEWDATA",
    "realTitle" : "书编辑视图",
    "getRefPSAppView" : {
      "modelref" : true,
@@ -216,6 +216,169 @@
    "name" : "searchform",
    "modelid" : "5e4b87cb5540f41fffa44b8cc73b3404",
    "modeltype" : "PSDEFORM_SEARCHFORM"
+  }, {
+    "codeName" : "Usr4GridViewtoolbar",
+    "controlType" : "TOOLBAR",
+    "logicName" : "测试界面逻辑",
+    "name" : "toolbar",
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
+    },
+    "getPSControlParam" : {
+      "id" : "TOOLBAR"
+    },
+    "getPSDEToolbarItems" : [ {
+      "caption" : "界面逻辑",
+      "groupExtractMode" : "ITEM",
+      "itemType" : "DEUIACTION",
+      "name" : "deuiaction1",
+      "noPrivDisplayMode" : 2,
+      "getPSAppViewUIAction" : {
+        "modelref" : true,
+        "id" : "toolbar_deuiaction1"
+      },
+      "getPSSysImage" : {
+        "glyph" : "xf1b2@FontAwesome",
+        "cssClass" : "fa fa-cube"
+      },
+      "getPSUIAction" : {
+        "actionTarget" : "SINGLEDATA",
+        "caption" : "界面逻辑",
+        "codeName" : "toolbar_Usr4GridViewtoolbar_deuiaction1_click",
+        "frontProcessType" : "OTHER",
+        "fullCodeName" : "Book_toolbar_Usr4GridViewtoolbar_deuiaction1_click",
+        "name" : "界面逻辑",
+        "getPSAppDEUILogic" : {
+          "modelref" : true,
+          "id" : "test"
+        },
+        "getPSAppDataEntity" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
+        },
+        "timeout" : 60000,
+        "uIActionMode" : "FRONT",
+        "uIActionTag" : "toolbar_Usr4GridViewtoolbar_deuiaction1_click",
+        "uIActionType" : "DEUIACTION",
+        "uILogicAttachMode" : "REPLACE",
+        "uILogicType" : "DELOGIC",
+        "id" : "toolbar_Usr4GridViewtoolbar_deuiaction1_click@Book"
+      },
+      "tooltip" : "界面逻辑",
+      "uIActionTarget" : "SINGLEDATA",
+      "showCaption" : true,
+      "showIcon" : true
+    }, {
+      "caption" : "打开多数据表单",
+      "groupExtractMode" : "ITEM",
+      "itemType" : "DEUIACTION",
+      "name" : "deuiaction2_opendsjbd",
+      "noPrivDisplayMode" : 2,
+      "getPSAppViewUIAction" : {
+        "modelref" : true,
+        "id" : "toolbar_deuiaction2_opendsjbd"
+      },
+      "getPSUIAction" : {
+        "actionTarget" : "SINGLEKEY",
+        "caption" : "打开多数据表单",
+        "codeName" : "opendsjbd",
+        "getFrontPSAppView" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr5EditView.json",
+          "viewType" : "DEEDITVIEW"
+        },
+        "frontProcessType" : "TOP",
+        "fullCodeName" : "Book_opendsjbd",
+        "name" : "打开多数据表单",
+        "getPSAppDataEntity" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
+        },
+        "timeout" : 60000,
+        "uIActionMode" : "FRONT",
+        "uIActionTag" : "opendsjbd",
+        "uIActionType" : "DEUIACTION",
+        "id" : "opendsjbd@Book"
+      },
+      "tooltip" : "打开多数据表单",
+      "uIActionTarget" : "SINGLEKEY",
+      "showCaption" : true,
+      "showIcon" : true
+    }, {
+      "caption" : "测试多项",
+      "groupExtractMode" : "ITEM",
+      "itemType" : "DEUIACTION",
+      "name" : "deuiaction2_testmuti",
+      "noPrivDisplayMode" : 2,
+      "getPSAppViewUIAction" : {
+        "modelref" : true,
+        "id" : "toolbar_deuiaction2_testmuti"
+      },
+      "getPSUIAction" : {
+        "actionTarget" : "MULTIDATA",
+        "caption" : "测试多项",
+        "codeName" : "testMuti",
+        "fullCodeName" : "Book_testMuti",
+        "name" : "测试多项",
+        "getPSAppDEMethod" : {
+          "modelref" : true,
+          "id" : "Get"
+        },
+        "getPSAppDataEntity" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
+        },
+        "timeout" : 60000,
+        "uIActionMode" : "BACKEND",
+        "uIActionTag" : "testMuti",
+        "uIActionType" : "DEUIACTION",
+        "enableConfirm" : true,
+        "id" : "testMuti@Book"
+      },
+      "tooltip" : "测试多项",
+      "uIActionTarget" : "MULTIDATA",
+      "showCaption" : true,
+      "showIcon" : true
+    }, {
+      "caption" : "测试多项主键",
+      "groupExtractMode" : "ITEM",
+      "itemType" : "DEUIACTION",
+      "name" : "deuiaction2_testmutikey",
+      "noPrivDisplayMode" : 2,
+      "getPSAppViewUIAction" : {
+        "modelref" : true,
+        "id" : "toolbar_deuiaction2_testmutikey"
+      },
+      "getPSUIAction" : {
+        "actionTarget" : "MULTIKEY",
+        "caption" : "测试多项主键",
+        "codeName" : "testMutiKey",
+        "fullCodeName" : "Book_testMutiKey",
+        "name" : "测试多项主键",
+        "getPSAppDEMethod" : {
+          "modelref" : true,
+          "id" : "Get"
+        },
+        "getPSAppDataEntity" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
+        },
+        "timeout" : 60000,
+        "uIActionMode" : "BACKEND",
+        "uIActionTag" : "testMutiKey",
+        "uIActionType" : "DEUIACTION",
+        "enableConfirm" : true,
+        "id" : "testMutiKey@Book"
+      },
+      "tooltip" : "测试多项主键",
+      "uIActionTarget" : "MULTIKEY",
+      "showCaption" : true,
+      "showIcon" : true
+    } ],
+    "xDataControlName" : "grid",
+    "modelid" : "8C17E262-295C-4E39-A0C7-106B5A1F38A1",
+    "modeltype" : "PSDETOOLBAR"
  }, {
    "aggMode" : "NONE",
    "codeName" : "Dsjbjbg",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr5EditView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr5EditView.json
@@ -1432,7 +1432,6 @@
    "layoutPanel" : true,
    "useDefaultLayout" : true
  },
-  "refFlag" : false,
  "title" : "书编辑视图",
  "viewStyle" : "DEFAULT",
  "viewType" : "DEEDITVIEW",

--- 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
@@ -13493,6 +13493,12 @@
    "codeName" : "VMGroup4",
    "name" : "视图消息位置测试",
    "getPSAppViewMsgGroupDetails" : [ {
+      "name" : "消息位置-视图内容区",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg9"
+      }
+    }, {
      "name" : "消息位置-视图上方",
      "getPSAppViewMsg" : {
        "modelref" : true,
@@ -13510,17 +13516,24 @@
        "modelref" : true,
        "id" : "ViewMsg10"
      }
-    }, {
-      "name" : "消息位置-视图内容区",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg9"
-      }
    } ]
  }, {
    "codeName" : "VMGroup8",
    "name" : "【静态测试】",
    "getPSAppViewMsgGroupDetails" : [ {
+      "name" : "关闭模式-无删除-上方-常规",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg11"
+      }
+    }, {
+      "name" : "消息类型-常规信息",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg4"
+      },
+      "position" : "POPUP"
+    }, {
      "name" : "消息类型-警告信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
@@ -13528,16 +13541,16 @@
      },
      "position" : "POPUP"
    }, {
-      "name" : "消息位置-视图内容区",
+      "name" : "关闭模式-默认删除-上方-错误",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg9"
+        "id" : "ViewMsg12"
      }
    }, {
-      "name" : "关闭模式-默认删除-上方-错误",
+      "name" : "消息位置-视图内容区",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg12"
+        "id" : "ViewMsg9"
      }
    }, {
      "name" : "关闭模式-本次删除-上方-警告",
@@ -13558,40 +13571,27 @@
        "modelref" : true,
        "id" : "ViewMsg8"
      }
-    }, {
-      "name" : "消息类型-常规信息",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg4"
-      },
-      "position" : "POPUP"
-    }, {
-      "name" : "关闭模式-无删除-上方-常规",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg11"
-      }
    } ]
  }, {
    "codeName" : "VMGroup5",
    "name" : "视图消息关闭模式",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-本次删除",
+      "name" : "关闭模式-默认删除",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg13"
+        "id" : "ViewMsg12"
      }
    }, {
-      "name" : "关闭模式-无删除",
+      "name" : "关闭模式-本次删除",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg11"
+        "id" : "ViewMsg13"
      }
    }, {
-      "name" : "关闭模式-默认删除",
+      "name" : "关闭模式-无删除",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg12"
+        "id" : "ViewMsg11"
      }
    } ]
  }, {
@@ -54673,6 +54673,28 @@
        "uIActionTag" : "testscriptt",
        "uIActionType" : "DEUIACTION",
        "id" : "testscriptt@Book"
+      }, {
+        "actionTarget" : "SINGLEDATA",
+        "caption" : "界面逻辑",
+        "codeName" : "toolbar_Usr4GridViewtoolbar_deuiaction1_click",
+        "frontProcessType" : "OTHER",
+        "fullCodeName" : "Book_toolbar_Usr4GridViewtoolbar_deuiaction1_click",
+        "name" : "界面逻辑",
+        "getPSAppDEUILogic" : {
+          "modelref" : true,
+          "id" : "test"
+        },
+        "getPSAppDataEntity" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
+        },
+        "timeout" : 60000,
+        "uIActionMode" : "FRONT",
+        "uIActionTag" : "toolbar_Usr4GridViewtoolbar_deuiaction1_click",
+        "uIActionType" : "DEUIACTION",
+        "uILogicAttachMode" : "REPLACE",
+        "uILogicType" : "DELOGIC",
+        "id" : "toolbar_Usr4GridViewtoolbar_deuiaction1_click@Book"
      } ],
      "getAllPSAppDEUILogics" : [ {
        "codeName" : "test",