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

9e665112 · ibizdev · 9d955a0e · 9e665112 · 9e665112 · 9e665112
--- 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
@@ -52,29 +52,22 @@
  }, {
    "align" : "LEFT",
    "cLConvertMode" : "FRONT",
-    "getCapPSLanguageRes" : {
-      "defaultContent" : "更新人",
-      "lanResTag" : "DEF.LNAME.UPDATEMAN",
-      "lanResType" : "DEF.LNAME",
-      "name" : "属性逻辑名称（DEF.LNAME.*）[UPDATEMAN]",
-      "refFlag" : true
-    },
-    "caption" : "更新人",
-    "codeName" : "updateman",
+    "caption" : "条件类型",
+    "codeName" : "condtype",
    "columnType" : "DEFGRIDCOLUMN",
-    "dataItemName" : "updateman",
-    "excelCaption" : "更新人",
-    "name" : "updateman",
+    "dataItemName" : "condtype",
+    "excelCaption" : "条件类型",
+    "name" : "condtype",
    "noPrivDisplayMode" : 1,
    "getPSAppCodeList" : {
      "modelref" : true,
-      "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SysOperator.json"
+      "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/CondType.json"
    },
    "getPSAppDEField" : {
-      "name" : "UPDATEMAN",
-      "codeName" : "UpdateMan"
+      "name" : "CONDTYPE",
+      "codeName" : "CondType"
    },
-    "width" : 150,
+    "width" : 100,
    "widthUnit" : "PX",
    "enableSort" : true
  }, {
@@ -105,16 +98,40 @@
  }, {
    "align" : "LEFT",
    "cLConvertMode" : "NONE",
-    "caption" : "测试实体标识",
-    "codeName" : "testid",
+    "caption" : "父节点",
+    "codeName" : "psubtest2id",
    "columnType" : "DEFGRIDCOLUMN",
-    "dataItemName" : "testid",
-    "excelCaption" : "测试实体标识",
-    "name" : "testid",
+    "dataItemName" : "psubtest2id",
+    "excelCaption" : "父节点",
+    "name" : "psubtest2id",
    "noPrivDisplayMode" : 1,
    "getPSAppDEField" : {
-      "name" : "TESTID",
-      "codeName" : "TESTId"
+      "name" : "PSUBTEST2ID",
+      "codeName" : "Psubtest2id"
+    },
+    "width" : 100,
+    "widthUnit" : "PX",
+    "enableSort" : true
+  }, {
+    "align" : "LEFT",
+    "cLConvertMode" : "NONE",
+    "getCapPSLanguageRes" : {
+      "defaultContent" : "子测试实体标识",
+      "lanResTag" : "DEF.LNAME.SUBTEST2ID",
+      "lanResType" : "DEF.LNAME",
+      "name" : "属性逻辑名称（DEF.LNAME.*）[SUBTEST2ID]",
+      "refFlag" : true
+    },
+    "caption" : "父实体",
+    "codeName" : "subtest2id",
+    "columnType" : "DEFGRIDCOLUMN",
+    "dataItemName" : "subtest2id",
+    "excelCaption" : "父实体",
+    "name" : "subtest2id",
+    "noPrivDisplayMode" : 1,
+    "getPSAppDEField" : {
+      "name" : "SUBTEST2ID",
+      "codeName" : "SubTest2Id"
    },
    "width" : 100,
    "widthUnit" : "PX",
@@ -129,10 +146,10 @@
    }
  }, {
    "dataType" : 25,
-    "name" : "updateman",
+    "name" : "condtype",
    "getPSAppDEField" : {
-      "name" : "UPDATEMAN",
-      "codeName" : "UpdateMan"
+      "name" : "CONDTYPE",
+      "codeName" : "CondType"
    }
  }, {
    "format" : "YYYY-MM-DD HH:mm:ss",
@@ -144,10 +161,17 @@
    }
  }, {
    "dataType" : 25,
-    "name" : "testid",
+    "name" : "psubtest2id",
    "getPSAppDEField" : {
-      "name" : "TESTID",
-      "codeName" : "TESTId"
+      "name" : "PSUBTEST2ID",
+      "codeName" : "Psubtest2id"
+    }
+  }, {
+    "dataType" : 25,
+    "name" : "subtest2id",
+    "getPSAppDEField" : {
+      "name" : "SUBTEST2ID",
+      "codeName" : "SubTest2Id"
    }
  }, {
    "dataType" : 25,
@@ -173,17 +197,10 @@
    }
  }, {
    "dataType" : 25,
-    "name" : "condtype",
-    "getPSAppDEField" : {
-      "name" : "CONDTYPE",
-      "codeName" : "CondType"
-    }
-  }, {
-    "dataType" : 25,
-    "name" : "psubtest2id",
+    "name" : "testid",
    "getPSAppDEField" : {
-      "name" : "PSUBTEST2ID",
-      "codeName" : "Psubtest2id"
+      "name" : "TESTID",
+      "codeName" : "TESTId"
    }
  }, {
    "dataType" : 25,

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/SubTest2CondGroupEditView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/SubTest2CondGroupEditView.json
@@ -13,6 +13,7 @@
  "funcViewMode" : "EDITVIEW",
  "funcViewParam" : "GROUP",
  "name" : "SubTest2CondGroupEditView",
+  "openMode" : "POPUPMODAL",
  "getPSAppDataEntity" : {
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/SubTest2.json"

--- 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
@@ -183,6 +183,7 @@
    }
  }, {
    "name" : "NEWDATA:GROUP",
+    "realOpenMode" : "POPUPMODAL",
    "realTitle" : "条件组编辑视图",
    "getRefPSAppView" : {
      "modelref" : true,
@@ -191,6 +192,7 @@
    }
  }, {
    "name" : "NEWDATA:SINGLE",
+    "realOpenMode" : "POPUPMODAL",
    "realTitle" : "单个条件编辑视图",
    "getRefPSAppView" : {
      "modelref" : true,
@@ -199,6 +201,7 @@
    }
  }, {
    "name" : "EDITDATA:GROUP",
+    "realOpenMode" : "POPUPMODAL",
    "realTitle" : "条件组编辑视图",
    "getRefPSAppView" : {
      "modelref" : true,
@@ -207,6 +210,7 @@
    }
  }, {
    "name" : "EDITDATA:SINGLE",
+    "realOpenMode" : "POPUPMODAL",
    "realTitle" : "单个条件编辑视图",
    "getRefPSAppView" : {
      "modelref" : true,
@@ -355,29 +359,22 @@
    }, {
      "align" : "LEFT",
      "cLConvertMode" : "FRONT",
-      "getCapPSLanguageRes" : {
-        "defaultContent" : "更新人",
-        "lanResTag" : "DEF.LNAME.UPDATEMAN",
-        "lanResType" : "DEF.LNAME",
-        "name" : "属性逻辑名称（DEF.LNAME.*）[UPDATEMAN]",
-        "refFlag" : true
-      },
-      "caption" : "更新人",
-      "codeName" : "updateman",
+      "caption" : "条件类型",
+      "codeName" : "condtype",
      "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "updateman",
-      "excelCaption" : "更新人",
-      "name" : "updateman",
+      "dataItemName" : "condtype",
+      "excelCaption" : "条件类型",
+      "name" : "condtype",
      "noPrivDisplayMode" : 1,
      "getPSAppCodeList" : {
        "modelref" : true,
-        "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SysOperator.json"
+        "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/CondType.json"
      },
      "getPSAppDEField" : {
-        "name" : "UPDATEMAN",
-        "codeName" : "UpdateMan"
+        "name" : "CONDTYPE",
+        "codeName" : "CondType"
      },
-      "width" : 150,
+      "width" : 100,
      "widthUnit" : "PX",
      "enableSort" : true
    }, {
@@ -408,16 +405,40 @@
    }, {
      "align" : "LEFT",
      "cLConvertMode" : "NONE",
-      "caption" : "测试实体标识",
-      "codeName" : "testid",
+      "caption" : "父节点",
+      "codeName" : "psubtest2id",
      "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "testid",
-      "excelCaption" : "测试实体标识",
-      "name" : "testid",
+      "dataItemName" : "psubtest2id",
+      "excelCaption" : "父节点",
+      "name" : "psubtest2id",
      "noPrivDisplayMode" : 1,
      "getPSAppDEField" : {
-        "name" : "TESTID",
-        "codeName" : "TESTId"
+        "name" : "PSUBTEST2ID",
+        "codeName" : "Psubtest2id"
+      },
+      "width" : 100,
+      "widthUnit" : "PX",
+      "enableSort" : true
+    }, {
+      "align" : "LEFT",
+      "cLConvertMode" : "NONE",
+      "getCapPSLanguageRes" : {
+        "defaultContent" : "子测试实体标识",
+        "lanResTag" : "DEF.LNAME.SUBTEST2ID",
+        "lanResType" : "DEF.LNAME",
+        "name" : "属性逻辑名称（DEF.LNAME.*）[SUBTEST2ID]",
+        "refFlag" : true
+      },
+      "caption" : "父实体",
+      "codeName" : "subtest2id",
+      "columnType" : "DEFGRIDCOLUMN",
+      "dataItemName" : "subtest2id",
+      "excelCaption" : "父实体",
+      "name" : "subtest2id",
+      "noPrivDisplayMode" : 1,
+      "getPSAppDEField" : {
+        "name" : "SUBTEST2ID",
+        "codeName" : "SubTest2Id"
      },
      "width" : 100,
      "widthUnit" : "PX",
@@ -432,10 +453,10 @@
      }
    }, {
      "dataType" : 25,
-      "name" : "updateman",
+      "name" : "condtype",
      "getPSAppDEField" : {
-        "name" : "UPDATEMAN",
-        "codeName" : "UpdateMan"
+        "name" : "CONDTYPE",
+        "codeName" : "CondType"
      }
    }, {
      "format" : "YYYY-MM-DD HH:mm:ss",
@@ -447,10 +468,17 @@
      }
    }, {
      "dataType" : 25,
-      "name" : "testid",
+      "name" : "psubtest2id",
      "getPSAppDEField" : {
-        "name" : "TESTID",
-        "codeName" : "TESTId"
+        "name" : "PSUBTEST2ID",
+        "codeName" : "Psubtest2id"
+      }
+    }, {
+      "dataType" : 25,
+      "name" : "subtest2id",
+      "getPSAppDEField" : {
+        "name" : "SUBTEST2ID",
+        "codeName" : "SubTest2Id"
      }
    }, {
      "dataType" : 25,
@@ -476,17 +504,10 @@
      }
    }, {
      "dataType" : 25,
-      "name" : "condtype",
-      "getPSAppDEField" : {
-        "name" : "CONDTYPE",
-        "codeName" : "CondType"
-      }
-    }, {
-      "dataType" : 25,
-      "name" : "psubtest2id",
+      "name" : "testid",
      "getPSAppDEField" : {
-        "name" : "PSUBTEST2ID",
-        "codeName" : "Psubtest2id"
+        "name" : "TESTID",
+        "codeName" : "TESTId"
      }
    }, {
      "dataType" : 25,

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/SubTest2RedirectView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/SubTest2RedirectView.json
@@ -76,6 +76,7 @@
    }
  }, {
    "name" : "SUBTEST2:EDITVIEW:GROUP",
+    "realOpenMode" : "POPUPMODAL",
    "realTitle" : "条件组编辑视图",
    "getRefPSAppView" : {
      "modelref" : true,
@@ -84,6 +85,7 @@
    }
  }, {
    "name" : "SUBTEST2:EDITVIEW:SINGLE",
+    "realOpenMode" : "POPUPMODAL",
    "realTitle" : "单个条件编辑视图",
    "getRefPSAppView" : {
      "modelref" : true,
@@ -108,6 +110,7 @@
    }
  }, {
    "name" : "EDITVIEW:GROUP",
+    "realOpenMode" : "POPUPMODAL",
    "realTitle" : "条件组编辑视图",
    "getRefPSAppView" : {
      "modelref" : true,
@@ -116,6 +119,7 @@
    }
  }, {
    "name" : "EDITVIEW:SINGLE",
+    "realOpenMode" : "POPUPMODAL",
    "realTitle" : "单个条件编辑视图",
    "getRefPSAppView" : {
      "modelref" : true,

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/SubTest2SingleCondEditView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/SubTest2SingleCondEditView.json
@@ -13,6 +13,7 @@
  "funcViewMode" : "EDITVIEW",
  "funcViewParam" : "SINGLE",
  "name" : "SubTest2SingleCondEditView",
+  "openMode" : "POPUPMODAL",
  "getPSAppDataEntity" : {
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/SubTest2.json"