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

e0df2a11 · ibizdev · 5586f6ce · e0df2a11 · e0df2a11 · e0df2a11
--- 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" : "视图消息",
+      "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/PSSEARCHBARS/filterSearchBar.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSSEARCHBARS/filterSearchBar.json
@@ -319,7 +319,7 @@
    "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[]}]}}",
    "itemType" : "GROUP",
    "name" : "public1",
-    "userTag" : "public",
+    "userTag" : "PUBLIC",
    "width" : 0.0,
    "addSeparator" : false
  }, {
@@ -327,7 +327,7 @@
    "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[]}]}}",
    "itemType" : "GROUP",
    "name" : "public2",
-    "userTag" : "public",
+    "userTag" : "PUBLIC",
    "width" : 0.0,
    "addSeparator" : false,
    "defaultGroup" : true
@@ -336,14 +336,14 @@
    "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[]}]}}",
    "itemType" : "GROUP",
    "name" : "public3",
-    "userTag" : "public",
+    "userTag" : "PUBLIC",
    "width" : 0.0,
    "addSeparator" : false
  }, {
    "caption" : "本周新建",
    "itemType" : "GROUP",
    "name" : "public4",
-    "userTag" : "public",
+    "userTag" : "PUBLIC",
    "width" : 0.0,
    "addSeparator" : false
  } ],

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTCRMTabSearchView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTCRMTabSearchView.json
@@ -612,7 +612,7 @@
        "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[]}]}}",
        "itemType" : "GROUP",
        "name" : "public1",
-        "userTag" : "public",
+        "userTag" : "PUBLIC",
        "width" : 0.0,
        "addSeparator" : false
      }, {
@@ -620,7 +620,7 @@
        "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[]}]}}",
        "itemType" : "GROUP",
        "name" : "public2",
-        "userTag" : "public",
+        "userTag" : "PUBLIC",
        "width" : 0.0,
        "addSeparator" : false,
        "defaultGroup" : true
@@ -629,14 +629,14 @@
        "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[]}]}}",
        "itemType" : "GROUP",
        "name" : "public3",
-        "userTag" : "public",
+        "userTag" : "PUBLIC",
        "width" : 0.0,
        "addSeparator" : false
      }, {
        "caption" : "本周新建",
        "itemType" : "GROUP",
        "name" : "public4",
-        "userTag" : "public",
+        "userTag" : "PUBLIC",
        "width" : 0.0,
        "addSeparator" : false
      } ],

--- 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
@@ -16820,16 +16820,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"
@@ -16861,16 +16861,16 @@
    "codeName" : "VMGroup3",
    "name" : "视图消息类型测试",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-警告信息",
+      "name" : "消息类型-错误信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg5"
+        "id" : "ViewMsg6"
      }
    }, {
-      "name" : "消息类型-错误信息",
+      "name" : "消息类型-警告信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg6"
+        "id" : "ViewMsg5"
      }
    }, {
      "name" : "消息类型-常规信息",
@@ -16900,12 +16900,6 @@
        "modelref" : true,
        "id" : "ViewMsg10"
      }
-    }, {
-      "name" : "消息位置-视图内容区",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg9"
-      }
    }, {
      "name" : "消息位置-视图上方",
      "getPSAppViewMsg" : {
@@ -16918,36 +16912,43 @@
        "modelref" : true,
        "id" : "ViewMsg8"
      }
+    }, {
+      "name" : "消息位置-视图内容区",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg9"
+      }
    } ],
    "uniqueTag" : "VMGroup4"
  }, {
    "codeName" : "VMGroup8",
    "name" : "【静态测试】",
    "getPSAppViewMsgGroupDetails" : [ {
+      "name" : "消息位置-视图下方",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg8"
+      }
+    }, {
      "name" : "关闭模式-本次删除-上方-警告",
      "getPSAppViewMsg" : {
        "modelref" : true,
        "id" : "ViewMsg13"
      }
    }, {
-      "name" : "消息类型-错误信息",
+      "name" : "消息类型-警告信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg6"
+        "id" : "ViewMsg5"
      },
      "position" : "POPUP"
    }, {
-      "name" : "消息位置-视图下方",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg8"
-      }
-    }, {
-      "name" : "关闭模式-无删除-上方-常规",
+      "name" : "消息类型-错误信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg11"
-      }
+        "id" : "ViewMsg6"
+      },
+      "position" : "POPUP"
    }, {
      "name" : "消息类型-常规信息",
      "getPSAppViewMsg" : {
@@ -16956,12 +16957,11 @@
      },
      "position" : "POPUP"
    }, {
-      "name" : "消息类型-警告信息",
+      "name" : "关闭模式-无删除-上方-常规",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg5"
-      },
-      "position" : "POPUP"
+        "id" : "ViewMsg11"
+      }
    }, {
      "name" : "消息位置-视图内容区",
      "getPSAppViewMsg" : {
@@ -16980,16 +16980,16 @@
    "codeName" : "VMGroup5",
    "name" : "视图消息关闭模式",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-无删除",
+      "name" : "关闭模式-默认删除",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg11"
+        "id" : "ViewMsg12"
      }
    }, {
-      "name" : "关闭模式-默认删除",
+      "name" : "关闭模式-无删除",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg12"
+        "id" : "ViewMsg11"
      }
    }, {
      "name" : "关闭模式-本次删除",
@@ -53186,7 +53186,7 @@
            "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[]}]}}",
            "itemType" : "GROUP",
            "name" : "public1",
-            "userTag" : "public",
+            "userTag" : "PUBLIC",
            "width" : 0.0,
            "addSeparator" : false
          }, {
@@ -53194,7 +53194,7 @@
            "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[]}]}}",
            "itemType" : "GROUP",
            "name" : "public2",
-            "userTag" : "public",
+            "userTag" : "PUBLIC",
            "width" : 0.0,
            "addSeparator" : false,
            "defaultGroup" : true
@@ -53203,14 +53203,14 @@
            "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[]}]}}",
            "itemType" : "GROUP",
            "name" : "public3",
-            "userTag" : "public",
+            "userTag" : "PUBLIC",
            "width" : 0.0,
            "addSeparator" : false
          }, {
            "caption" : "本周新建",
            "itemType" : "GROUP",
            "name" : "public4",
-            "userTag" : "public",
+            "userTag" : "PUBLIC",
            "width" : 0.0,
            "addSeparator" : false
          } ],