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

be7bd535 · ibizdev · 75c1d79f · be7bd535 · be7bd535 · be7bd535
--- 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
@@ -1500,16 +1500,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"
      }
    } ]
  }, {

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/SubTest2/PSGRIDS/Main.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/SubTest2/PSGRIDS/Main.json
@@ -115,23 +115,16 @@
  }, {
    "align" : "LEFT",
    "cLConvertMode" : "NONE",
-    "getCapPSLanguageRes" : {
-      "defaultContent" : "子测试实体标识",
-      "lanResTag" : "DEF.LNAME.SUBTEST2ID",
-      "lanResType" : "DEF.LNAME",
-      "name" : "属性逻辑名称（DEF.LNAME.*）[SUBTEST2ID]",
-      "refFlag" : true
-    },
-    "caption" : "父实体",
-    "codeName" : "subtest2id",
+    "caption" : "父节点",
+    "codeName" : "testid",
    "columnType" : "DEFGRIDCOLUMN",
-    "dataItemName" : "subtest2id",
-    "excelCaption" : "父实体",
-    "name" : "subtest2id",
+    "dataItemName" : "testid",
+    "excelCaption" : "父节点",
+    "name" : "testid",
    "noPrivDisplayMode" : 1,
    "getPSAppDEField" : {
-      "name" : "SUBTEST2ID",
-      "codeName" : "SubTest2Id"
+      "name" : "TESTID",
+      "codeName" : "TESTId"
    },
    "width" : 100,
    "widthUnit" : "PX",
@@ -168,10 +161,10 @@
    }
  }, {
    "dataType" : 25,
-    "name" : "subtest2id",
+    "name" : "testid",
    "getPSAppDEField" : {
-      "name" : "SUBTEST2ID",
-      "codeName" : "SubTest2Id"
+      "name" : "TESTID",
+      "codeName" : "TESTId"
    }
  }, {
    "dataType" : 25,
@@ -195,13 +188,6 @@
      "name" : "CONDTYPE",
      "codeName" : "CondType"
    }
-  }, {
-    "dataType" : 25,
-    "name" : "testid",
-    "getPSAppDEField" : {
-      "name" : "TESTID",
-      "codeName" : "TESTId"
-    }
  }, {
    "dataType" : 25,
    "name" : "srfmajortext",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/SubTest2GridView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/SubTest2GridView.json
@@ -422,23 +422,16 @@
    }, {
      "align" : "LEFT",
      "cLConvertMode" : "NONE",
-      "getCapPSLanguageRes" : {
-        "defaultContent" : "子测试实体标识",
-        "lanResTag" : "DEF.LNAME.SUBTEST2ID",
-        "lanResType" : "DEF.LNAME",
-        "name" : "属性逻辑名称（DEF.LNAME.*）[SUBTEST2ID]",
-        "refFlag" : true
-      },
-      "caption" : "父实体",
-      "codeName" : "subtest2id",
+      "caption" : "父节点",
+      "codeName" : "testid",
      "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "subtest2id",
-      "excelCaption" : "父实体",
-      "name" : "subtest2id",
+      "dataItemName" : "testid",
+      "excelCaption" : "父节点",
+      "name" : "testid",
      "noPrivDisplayMode" : 1,
      "getPSAppDEField" : {
-        "name" : "SUBTEST2ID",
-        "codeName" : "SubTest2Id"
+        "name" : "TESTID",
+        "codeName" : "TESTId"
      },
      "width" : 100,
      "widthUnit" : "PX",
@@ -475,10 +468,10 @@
      }
    }, {
      "dataType" : 25,
-      "name" : "subtest2id",
+      "name" : "testid",
      "getPSAppDEField" : {
-        "name" : "SUBTEST2ID",
-        "codeName" : "SubTest2Id"
+        "name" : "TESTID",
+        "codeName" : "TESTId"
      }
    }, {
      "dataType" : 25,
@@ -502,13 +495,6 @@
        "name" : "CONDTYPE",
        "codeName" : "CondType"
      }
-    }, {
-      "dataType" : 25,
-      "name" : "testid",
-      "getPSAppDEField" : {
-        "name" : "TESTID",
-        "codeName" : "TESTId"
-      }
    }, {
      "dataType" : 25,
      "name" : "srfmajortext",

--- 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
@@ -12131,16 +12131,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"
      }
    } ]
  }, {
@@ -12201,47 +12201,39 @@
    "codeName" : "VMGroup4",
    "name" : "视图消息位置测试",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息位置-视图上方",
+      "name" : "消息位置-视图内容区",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg7"
+        "id" : "ViewMsg9"
      }
    }, {
-      "name" : "消息位置-弹出",
+      "name" : "消息位置-视图下方",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg10"
+        "id" : "ViewMsg8"
      }
    }, {
-      "name" : "消息位置-视图下方",
+      "name" : "消息位置-弹出",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg10"
      }
    }, {
-      "name" : "消息位置-视图内容区",
+      "name" : "消息位置-视图上方",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg9"
+        "id" : "ViewMsg7"
      }
    } ]
  }, {
    "codeName" : "VMGroup8",
    "name" : "【静态测试】",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-警告信息",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg5"
-      },
-      "position" : "POPUP"
-    }, {
-      "name" : "消息类型-错误信息",
+      "name" : "关闭模式-无删除-上方-常规",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg6"
-      },
-      "position" : "POPUP"
+        "id" : "ViewMsg11"
+      }
    }, {
      "name" : "消息类型-常规信息",
      "getPSAppViewMsg" : {
@@ -12249,12 +12241,6 @@
        "id" : "ViewMsg4"
      },
      "position" : "POPUP"
-    }, {
-      "name" : "关闭模式-无删除-上方-常规",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg11"
-      }
    }, {
      "name" : "关闭模式-默认删除-上方-错误",
      "getPSAppViewMsg" : {
@@ -12267,6 +12253,12 @@
        "modelref" : true,
        "id" : "ViewMsg9"
      }
+    }, {
+      "name" : "关闭模式-本次删除-上方-警告",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg13"
+      }
    }, {
      "name" : "消息位置-视图下方",
      "getPSAppViewMsg" : {
@@ -12274,11 +12266,19 @@
        "id" : "ViewMsg8"
      }
    }, {
-      "name" : "关闭模式-本次删除-上方-警告",
+      "name" : "消息类型-错误信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg13"
-      }
+        "id" : "ViewMsg6"
+      },
+      "position" : "POPUP"
+    }, {
+      "name" : "消息类型-警告信息",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg5"
+      },
+      "position" : "POPUP"
    } ]
  }, {
    "codeName" : "VMGroup5",
@@ -12290,32 +12290,32 @@
        "id" : "ViewMsg12"
      }
    }, {
-      "name" : "关闭模式-无删除",
+      "name" : "关闭模式-本次删除",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg11"
+        "id" : "ViewMsg13"
      }
    }, {
-      "name" : "关闭模式-本次删除",
+      "name" : "关闭模式-无删除",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg13"
+        "id" : "ViewMsg11"
      }
    } ]
  }, {
    "codeName" : "VMGroup6",
    "name" : "视图消息动态模式测试",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "动态模式-静态内容",
+      "name" : "动态模式-实体数据集",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg15"
+        "id" : "ViewMsg14"
      }
    }, {
-      "name" : "动态模式-实体数据集",
+      "name" : "动态模式-静态内容",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg14"
+        "id" : "ViewMsg15"
      }
    } ]
  } ],