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

513c7f07 · ibizdev · 352963b8 · 513c7f07 · 513c7f07 · 513c7f07
--- 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
@@ -1519,16 +1519,16 @@
    "codeName" : "VMGroup2",
    "name" : "视图消息组2",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息2",
+      "name" : "视图消息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
      }
    }, {
-      "name" : "视图消息",
+      "name" : "视图消息2",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
      }
    } ],
    "uniqueTag" : "VMGroup2"

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTTabSearchGridView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTTabSearchGridView.json
@@ -73,6 +73,14 @@
    }
  } ],
  "getPSAppViewRefs" : [ {
+    "name" : "EDITDATA",
+    "realTitle" : "测试实体数据重定向视图",
+    "getRefPSAppView" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTRedirectView.json",
+      "viewType" : "DEREDIRECTVIEW"
+    }
+  }, {
    "name" : "NEWDATA",
    "realOpenMode" : "INDEXVIEWTAB_POPUPMODAL",
    "realTitle" : "简单编辑",
@@ -81,20 +89,12 @@
      "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTSimpleEditView.json",
      "viewType" : "DEEDITVIEW"
    }
-  }, {
-    "name" : "EDITDATA",
-    "realTitle" : "测试实体数据重定向视图",
-    "getRefPSAppView" : {
-      "modelref" : true,
-      "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTRedirectView.json",
-      "viewType" : "DEREDIRECTVIEW"
-    }
  } ],
  "getPSControls" : [ {
-    "codeName" : "TabSearchGridViewtoolbar",
+    "codeName" : "TabSearchGridViewtabtoolbar",
    "controlType" : "TOOLBAR",
    "logicName" : "分页搜索表格_工具栏",
-    "name" : "toolbar",
+    "name" : "tabtoolbar",
    "getPSAppDataEntity" : {
      "modelref" : true,
      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
@@ -103,7 +103,7 @@
      "ctrlParams" : {
        "TELEPORTTAG" : "#a0001"
      },
-      "id" : "TOOLBAR"
+      "id" : "TABTOOLBAR"
    },
    "getPSDEToolbarItems" : [ {
      "getCapPSLanguageRes" : {
@@ -116,7 +116,7 @@
      "noPrivDisplayMode" : 2,
      "getPSAppViewUIAction" : {
        "modelref" : true,
-        "id" : "toolbar_deuiaction1"
+        "id" : "tabtoolbar_deuiaction1"
      },
      "getPSSysImage" : {
        "glyph" : "xf044@FontAwesome",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTTabSearchListView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTTabSearchListView.json
@@ -94,10 +94,10 @@
    }
  } ],
  "getPSControls" : [ {
-    "codeName" : "TabSearchListViewtoolbar",
+    "codeName" : "TabSearchListViewtabtoolbar",
    "controlType" : "TOOLBAR",
    "logicName" : "分页搜索列表_工具栏",
-    "name" : "toolbar",
+    "name" : "tabtoolbar",
    "getPSAppDataEntity" : {
      "modelref" : true,
      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
@@ -106,7 +106,7 @@
      "ctrlParams" : {
        "TELEPORTTAG" : "#a0001"
      },
-      "id" : "TOOLBAR"
+      "id" : "TABTOOLBAR"
    },
    "getPSDEToolbarItems" : [ {
      "getCapPSLanguageRes" : {
@@ -119,7 +119,7 @@
      "noPrivDisplayMode" : 2,
      "getPSAppViewUIAction" : {
        "modelref" : true,
-        "id" : "toolbar_deuiaction1"
+        "id" : "tabtoolbar_deuiaction1"
      },
      "getPSSysImage" : {
        "glyph" : "xf0f6@FontAwesome",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr03185471TabSearchView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr03185471TabSearchView.json
@@ -772,6 +772,14 @@
            }
          } ],
          "getPSAppViewRefs" : [ {
+            "name" : "EDITDATA",
+            "realTitle" : "测试实体数据重定向视图",
+            "getRefPSAppView" : {
+              "modelref" : true,
+              "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTRedirectView.json",
+              "viewType" : "DEREDIRECTVIEW"
+            }
+          }, {
            "name" : "NEWDATA",
            "realOpenMode" : "INDEXVIEWTAB_POPUPMODAL",
            "realTitle" : "简单编辑",
@@ -780,20 +788,12 @@
              "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTSimpleEditView.json",
              "viewType" : "DEEDITVIEW"
            }
-          }, {
-            "name" : "EDITDATA",
-            "realTitle" : "测试实体数据重定向视图",
-            "getRefPSAppView" : {
-              "modelref" : true,
-              "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTRedirectView.json",
-              "viewType" : "DEREDIRECTVIEW"
-            }
          } ],
          "getPSControls" : [ {
-            "codeName" : "TabSearchGridViewtoolbar",
+            "codeName" : "TabSearchGridViewtabtoolbar",
            "controlType" : "TOOLBAR",
            "logicName" : "分页搜索表格_工具栏",
-            "name" : "toolbar",
+            "name" : "tabtoolbar",
            "getPSAppDataEntity" : {
              "modelref" : true,
              "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
@@ -802,7 +802,7 @@
              "ctrlParams" : {
                "TELEPORTTAG" : "#a0001"
              },
-              "id" : "TOOLBAR"
+              "id" : "TABTOOLBAR"
            },
            "getPSDEToolbarItems" : [ {
              "getCapPSLanguageRes" : {
@@ -815,7 +815,7 @@
              "noPrivDisplayMode" : 2,
              "getPSAppViewUIAction" : {
                "modelref" : true,
-                "id" : "toolbar_deuiaction1"
+                "id" : "tabtoolbar_deuiaction1"
              },
              "getPSSysImage" : {
                "glyph" : "xf044@FontAwesome",

--- 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
@@ -16808,16 +16808,16 @@
    "codeName" : "VMGroup2",
    "name" : "视图消息组2",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息2",
+      "name" : "视图消息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
      }
    }, {
-      "name" : "视图消息",
+      "name" : "视图消息2",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
      }
    } ],
    "uniqueTag" : "VMGroup2"
@@ -16849,10 +16849,10 @@
    "codeName" : "VMGroup3",
    "name" : "视图消息类型测试",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-常规信息",
+      "name" : "消息类型-错误信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg4"
+        "id" : "ViewMsg6"
      }
    }, {
      "name" : "消息类型-警告信息",
@@ -16861,10 +16861,10 @@
        "id" : "ViewMsg5"
      }
    }, {
-      "name" : "消息类型-错误信息",
+      "name" : "消息类型-常规信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg6"
+        "id" : "ViewMsg4"
      }
    } ],
    "uniqueTag" : "VMGroup3"
@@ -16889,22 +16889,22 @@
        "id" : "ViewMsg8"
      }
    }, {
-      "name" : "消息位置-视图内容区",
+      "name" : "消息位置-弹出",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg9"
+        "id" : "ViewMsg10"
      }
    }, {
-      "name" : "消息位置-视图上方",
+      "name" : "消息位置-视图内容区",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg7"
+        "id" : "ViewMsg9"
      }
    }, {
-      "name" : "消息位置-弹出",
+      "name" : "消息位置-视图上方",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg10"
+        "id" : "ViewMsg7"
      }
    } ],
    "uniqueTag" : "VMGroup4"
@@ -16912,17 +16912,10 @@
    "codeName" : "VMGroup8",
    "name" : "【静态测试】",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-常规信息",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg4"
-      },
-      "position" : "POPUP"
-    }, {
-      "name" : "关闭模式-无删除-上方-常规",
+      "name" : "关闭模式-默认删除-上方-错误",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg11"
+        "id" : "ViewMsg12"
      }
    }, {
      "name" : "消息位置-视图内容区",
@@ -16931,11 +16924,18 @@
        "id" : "ViewMsg9"
      }
    }, {
-      "name" : "关闭模式-默认删除-上方-错误",
+      "name" : "关闭模式-本次删除-上方-警告",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg12"
+        "id" : "ViewMsg13"
      }
+    }, {
+      "name" : "消息类型-错误信息",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg6"
+      },
+      "position" : "POPUP"
    }, {
      "name" : "消息位置-视图下方",
      "getPSAppViewMsg" : {
@@ -16943,23 +16943,23 @@
        "id" : "ViewMsg8"
      }
    }, {
-      "name" : "关闭模式-本次删除-上方-警告",
+      "name" : "关闭模式-无删除-上方-常规",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg13"
+        "id" : "ViewMsg11"
      }
    }, {
-      "name" : "消息类型-警告信息",
+      "name" : "消息类型-常规信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg5"
+        "id" : "ViewMsg4"
      },
      "position" : "POPUP"
    }, {
-      "name" : "消息类型-错误信息",
+      "name" : "消息类型-警告信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg6"
+        "id" : "ViewMsg5"
      },
      "position" : "POPUP"
    } ],
@@ -16968,10 +16968,10 @@
    "codeName" : "VMGroup5",
    "name" : "视图消息关闭模式",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-默认删除",
+      "name" : "关闭模式-本次删除",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg12"
+        "id" : "ViewMsg13"
      }
    }, {
      "name" : "关闭模式-无删除",
@@ -16980,10 +16980,10 @@
        "id" : "ViewMsg11"
      }
    }, {
-      "name" : "关闭模式-本次删除",
+      "name" : "关闭模式-默认删除",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg13"
+        "id" : "ViewMsg12"
      }
    } ],
    "uniqueTag" : "VMGroup5"
@@ -16991,16 +16991,16 @@
    "codeName" : "VMGroup6",
    "name" : "视图消息动态模式测试",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "动态模式-静态内容",
+      "name" : "动态模式-实体数据集",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg15"
+        "id" : "ViewMsg14"
      }
    }, {
-      "name" : "动态模式-实体数据集",
+      "name" : "动态模式-静态内容",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg14"
+        "id" : "ViewMsg15"
      }
    } ],
    "uniqueTag" : "VMGroup6"