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

5b72f84d · ibizdev · 2abe7c09 · 5b72f84d · 5b72f84d · 5b72f84d
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test.json
@@ -96,6 +96,9 @@
  }, {
    "modelref" : true,
    "path" : "PSMODULES/Test/PSDATAENTITIES/Song.json"
+  }, {
+    "modelref" : true,
+    "path" : "PSMODULES/Test/PSDATAENTITIES/SubTest.json"
  }, {
    "modelref" : true,
    "path" : "PSMODULES/Test/PSDATAENTITIES/SysTodo.json"

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/SubTest.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/SubTest.json
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/SubTest/PSDEACTIONS/CheckKey.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/SubTest/PSDEACTIONS/CheckKey.json
+{
+  "actionMode" : "CHECKKEY",
+  "actionType" : "BUILTIN",
+  "codeName" : "CheckKey",
+  "dynaModelFilePath" : "PSMODULES/Test/PSDATAENTITIES/SubTest/PSDEACTIONS/CheckKey.json",
+  "logicName" : "CheckKey",
+  "name" : "CheckKey",
+  "getPSDEActionInput" : {
+    "name" : "CheckKeyInput",
+    "getPSDEMethodDTO" : {
+      "modelref" : true,
+      "id" : "SubTestDTO"
+    },
+    "type" : "DTO"
+  },
+  "getPSDEActionReturn" : {
+    "name" : "CheckKeyResult",
+    "stdDataType" : 9,
+    "type" : "SIMPLE"
+  },
+  "builtinAction" : true
+}
\ No newline at end of file
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/SubTest/PSDEACTIONS/Create.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/SubTest/PSDEACTIONS/Create.json
+{
+  "actionMode" : "CREATE",
+  "actionType" : "BUILTIN",
+  "codeName" : "Create",
+  "dynaModelFilePath" : "PSMODULES/Test/PSDATAENTITIES/SubTest/PSDEACTIONS/Create.json",
+  "logicName" : "Create",
+  "name" : "Create",
+  "orderValue" : 1,
+  "getPSDEActionInput" : {
+    "name" : "CreateInput",
+    "getPSDEMethodDTO" : {
+      "modelref" : true,
+      "id" : "SubTestDTO"
+    },
+    "type" : "DTO",
+    "output" : true
+  },
+  "getPSDEActionReturn" : {
+    "name" : "CreateResult",
+    "type" : "VOID"
+  },
+  "builtinAction" : true
+}
\ No newline at end of file
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/SubTest/PSDEACTIONS/Get.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/SubTest/PSDEACTIONS/Get.json
+{
+  "actionMode" : "READ",
+  "actionType" : "BUILTIN",
+  "codeName" : "Get",
+  "dynaModelFilePath" : "PSMODULES/Test/PSDATAENTITIES/SubTest/PSDEACTIONS/Get.json",
+  "logicName" : "Get",
+  "name" : "Get",
+  "orderValue" : 31,
+  "getPSDEActionInput" : {
+    "getKeyPSDEField" : {
+      "name" : "SUBTESTID",
+      "codeName" : "SubTestId"
+    },
+    "name" : "GetInput",
+    "type" : "KEYFIELD"
+  },
+  "getPSDEActionReturn" : {
+    "name" : "GetResult",
+    "getPSDEMethodDTO" : {
+      "modelref" : true,
+      "id" : "SubTestDTO"
+    },
+    "type" : "DTO"
+  },
+  "builtinAction" : true
+}
\ No newline at end of file
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/SubTest/PSDEACTIONS/GetDraft.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/SubTest/PSDEACTIONS/GetDraft.json
+{
+  "actionMode" : "GETDRAFT",
+  "actionType" : "BUILTIN",
+  "codeName" : "GetDraft",
+  "dynaModelFilePath" : "PSMODULES/Test/PSDATAENTITIES/SubTest/PSDEACTIONS/GetDraft.json",
+  "logicName" : "GetDraft",
+  "name" : "GetDraft",
+  "orderValue" : 41,
+  "getPSDEActionInput" : {
+    "name" : "GetDraftInput",
+    "getPSDEMethodDTO" : {
+      "modelref" : true,
+      "id" : "SubTestDTO"
+    },
+    "type" : "DTO"
+  },
+  "getPSDEActionReturn" : {
+    "name" : "GetDraftResult",
+    "getPSDEMethodDTO" : {
+      "modelref" : true,
+      "id" : "SubTestDTO"
+    },
+    "type" : "DTO"
+  },
+  "builtinAction" : true
+}
\ No newline at end of file
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/SubTest/PSDEACTIONS/Remove.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/SubTest/PSDEACTIONS/Remove.json
+{
+  "actionMode" : "DELETE",
+  "actionType" : "BUILTIN",
+  "batchActionMode" : 1,
+  "codeName" : "Remove",
+  "dynaModelFilePath" : "PSMODULES/Test/PSDATAENTITIES/SubTest/PSDEACTIONS/Remove.json",
+  "logicName" : "Remove",
+  "name" : "Remove",
+  "orderValue" : 21,
+  "getPSDEActionInput" : {
+    "getKeyPSDEField" : {
+      "name" : "SUBTESTID",
+      "codeName" : "SubTestId"
+    },
+    "name" : "RemoveInput",
+    "type" : "KEYFIELDS"
+  },
+  "getPSDEActionReturn" : {
+    "name" : "RemoveResult",
+    "type" : "VOID"
+  },
+  "batchAction" : true,
+  "builtinAction" : true
+}
\ No newline at end of file
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/SubTest/PSDEACTIONS/Save.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/SubTest/PSDEACTIONS/Save.json
+{
+  "actionMode" : "UNKNOWN",
+  "actionType" : "BUILTIN",
+  "codeName" : "Save",
+  "dynaModelFilePath" : "PSMODULES/Test/PSDATAENTITIES/SubTest/PSDEACTIONS/Save.json",
+  "logicName" : "Save",
+  "name" : "Save",
+  "getPSDEActionInput" : {
+    "name" : "SaveInput",
+    "getPSDEMethodDTO" : {
+      "modelref" : true,
+      "id" : "SubTestDTO"
+    },
+    "type" : "DTO"
+  },
+  "getPSDEActionReturn" : {
+    "name" : "SaveResult",
+    "type" : "VOID"
+  },
+  "builtinAction" : true
+}
\ No newline at end of file
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/SubTest/PSDEACTIONS/Update.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/SubTest/PSDEACTIONS/Update.json
+{
+  "actionMode" : "UPDATE",
+  "actionType" : "BUILTIN",
+  "codeName" : "Update",
+  "dynaModelFilePath" : "PSMODULES/Test/PSDATAENTITIES/SubTest/PSDEACTIONS/Update.json",
+  "logicName" : "Update",
+  "name" : "Update",
+  "orderValue" : 11,
+  "getPSDEActionInput" : {
+    "name" : "UpdateInput",
+    "getPSDEMethodDTO" : {
+      "modelref" : true,
+      "id" : "SubTestDTO"
+    },
+    "type" : "DTO",
+    "output" : true
+  },
+  "getPSDEActionReturn" : {
+    "name" : "UpdateResult",
+    "type" : "VOID"
+  },
+  "builtinAction" : true
+}
\ No newline at end of file
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/SubTest/PSDEDATAQUERIES/Default/PSDEDQCODES/MYSQL5.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/SubTest/PSDEDATAQUERIES/Default/PSDEDQCODES/MYSQL5.json
+{
+  "dBType" : "MYSQL5",
+  "name" : "MySQL5",
+  "getPSDEDataQueryCodeExps" : [ {
+    "expression" : "t1.`CREATEDATE`",
+    "name" : "CREATEDATE"
+  }, {
+    "expression" : "t1.`CREATEMAN`",
+    "name" : "CREATEMAN"
+  }, {
+    "expression" : "t1.`SUBTESTID`",
+    "name" : "SUBTESTID"
+  }, {
+    "expression" : "t1.`SUBTESTNAME`",
+    "name" : "SUBTESTNAME"
+  }, {
+    "expression" : "t1.`UPDATEDATE`",
+    "name" : "UPDATEDATE"
+  }, {
+    "expression" : "t1.`UPDATEMAN`",
+    "name" : "UPDATEMAN"
+  } ],
+  "queryCode" : "SELECT\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`SUBTESTID`,\nt1.`SUBTESTNAME`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_SUBTEST` t1 \n",
+  "id" : "PSMODULES/Test/PSDATAENTITIES/SubTest/PSDEDATAQUERIES/Default/PSDEDQCODES/MYSQL5.json"
+}
\ No newline at end of file
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/SubTest/PSDEDATAQUERIES/View/PSDEDQCODES/MYSQL5.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/SubTest/PSDEDATAQUERIES/View/PSDEDQCODES/MYSQL5.json
+{
+  "dBType" : "MYSQL5",
+  "name" : "MySQL5",
+  "getPSDEDataQueryCodeExps" : [ {
+    "expression" : "t1.`CREATEDATE`",
+    "name" : "CREATEDATE"
+  }, {
+    "expression" : "t1.`CREATEMAN`",
+    "name" : "CREATEMAN"
+  }, {
+    "expression" : "t1.`SUBTESTID`",
+    "name" : "SUBTESTID"
+  }, {
+    "expression" : "t1.`SUBTESTNAME`",
+    "name" : "SUBTESTNAME"
+  }, {
+    "expression" : "t1.`UPDATEDATE`",
+    "name" : "UPDATEDATE"
+  }, {
+    "expression" : "t1.`UPDATEMAN`",
+    "name" : "UPDATEMAN"
+  } ],
+  "queryCode" : "SELECT\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`SUBTESTID`,\nt1.`SUBTESTNAME`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_SUBTEST` t1 \n",
+  "id" : "PSMODULES/Test/PSDATAENTITIES/SubTest/PSDEDATAQUERIES/View/PSDEDQCODES/MYSQL5.json"
+}
\ No newline at end of file
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/SubTest/PSDEDATARELATIONS/Default.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/SubTest/PSDEDATARELATIONS/Default.json
+{
+  "codeName" : "Default",
+  "dynaModelFilePath" : "PSMODULES/Test/PSDATAENTITIES/SubTest/PSDEDATARELATIONS/Default.json",
+  "getFormCapPSLanguageRes" : {
+    "defaultContent" : "子测试实体",
+    "lanResTag" : "DE.LNAME.SUBTEST",
+    "lanResType" : "DE.LNAME",
+    "name" : "实体逻辑名称（DE.LNAME.*）[SUBTEST]",
+    "refFlag" : true
+  },
+  "formCaption" : "子测试实体",
+  "name" : "子测试实体默认关系界面组"
+}
\ No newline at end of file
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/SubTest/PSDEDRGROUPS/DRGroup.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/SubTest/PSDEDRGROUPS/DRGroup.json
+{
+  "caption" : "详细信息",
+  "codeName" : "DRGroup",
+  "dynaModelFilePath" : "PSMODULES/Test/PSDATAENTITIES/SubTest/PSDEDRGROUPS/DRGroup.json",
+  "name" : "详细信息",
+  "hidden" : false
+}
\ No newline at end of file
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM/PSKANBANS/TestKanbanView_KanBan.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM/PSKANBANS/TestKanbanView_KanBan.json
@@ -48,7 +48,16 @@
      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM.json"
    }
  },
-  "groupMode" : "NONE",
+  "groupLayout" : "ROW",
+  "groupMode" : "AUTO",
+  "getGroupPSAppDEField" : {
+    "name" : "TYPE",
+    "codeName" : "TYPE"
+  },
+  "getGroupPSCodeList" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/WorkItemType.json"
+  },
  "getItemPSLayoutPanel" : {
    "codeName" : "Usr1212707386",
    "controlType" : "PANEL",
@@ -88,8 +97,8 @@
  "logicName" : "看板视图测试_看板",
  "minorSortDir" : "ASC",
  "getMinorSortPSAppDEField" : {
-    "name" : "TYPE",
-    "codeName" : "TYPE"
+    "name" : "UPDATEDATE",
+    "codeName" : "UpdateDate"
  },
  "getPSAppDataEntity" : {
    "modelref" : true,
@@ -172,7 +181,7 @@
  "enableCardEditGroup" : false,
  "enableCardEditOrder" : false,
  "enableCardNew" : false,
-  "enableGroup" : false,
+  "enableGroup" : true,
  "enablePagingBar" : false,
  "noSort" : false,
  "singleSelect" : false,

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/WORKITEMTestKanbanView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/WORKITEMTestKanbanView.json
@@ -259,7 +259,16 @@
        "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM.json"
      }
    },
-    "groupMode" : "NONE",
+    "groupLayout" : "ROW",
+    "groupMode" : "AUTO",
+    "getGroupPSAppDEField" : {
+      "name" : "TYPE",
+      "codeName" : "TYPE"
+    },
+    "getGroupPSCodeList" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/WorkItemType.json"
+    },
    "getItemPSLayoutPanel" : {
      "codeName" : "Usr1212707386",
      "controlType" : "PANEL",
@@ -299,8 +308,8 @@
    "logicName" : "看板视图测试_看板",
    "minorSortDir" : "ASC",
    "getMinorSortPSAppDEField" : {
-      "name" : "TYPE",
-      "codeName" : "TYPE"
+      "name" : "UPDATEDATE",
+      "codeName" : "UpdateDate"
    },
    "getPSAppDataEntity" : {
      "modelref" : true,
@@ -470,7 +479,7 @@
    "enableCardEditGroup" : false,
    "enableCardEditOrder" : false,
    "enableCardNew" : false,
-    "enableGroup" : false,
+    "enableGroup" : true,
    "enablePagingBar" : false,
    "noSort" : false,
    "singleSelect" : 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
@@ -12002,34 +12002,53 @@
    "codeName" : "VMGroup4",
    "name" : "视图消息位置测试",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息位置-弹出",
+      "name" : "消息位置-视图上方",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg10"
+        "id" : "ViewMsg7"
      }
    }, {
-      "name" : "消息位置-视图内容区",
+      "name" : "消息位置-视图下方",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg9"
+        "id" : "ViewMsg8"
      }
    }, {
-      "name" : "消息位置-视图上方",
+      "name" : "消息位置-弹出",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg7"
+        "id" : "ViewMsg10"
      }
    }, {
-      "name" : "消息位置-视图下方",
+      "name" : "消息位置-视图内容区",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg9"
      }
    } ]
  }, {
    "codeName" : "VMGroup8",
    "name" : "【静态测试】",
    "getPSAppViewMsgGroupDetails" : [ {
+      "name" : "消息位置-视图内容区",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg9"
+      }
+    }, {
+      "name" : "关闭模式-默认删除-上方-错误",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg12"
+      }
+    }, {
+      "name" : "消息类型-警告信息",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg5"
+      },
+      "position" : "POPUP"
+    }, {
      "name" : "关闭模式-本次删除-上方-警告",
      "getPSAppViewMsg" : {
        "modelref" : true,
@@ -12048,12 +12067,6 @@
        "modelref" : true,
        "id" : "ViewMsg8"
      }
-    }, {
-      "name" : "关闭模式-无删除-上方-常规",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg11"
-      }
    }, {
      "name" : "消息类型-常规信息",
      "getPSAppViewMsg" : {
@@ -12062,61 +12075,48 @@
      },
      "position" : "POPUP"
    }, {
-      "name" : "消息类型-警告信息",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg5"
-      },
-      "position" : "POPUP"
-    }, {
-      "name" : "消息位置-视图内容区",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg9"
-      }
-    }, {
-      "name" : "关闭模式-默认删除-上方-错误",
+      "name" : "关闭模式-无删除-上方-常规",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg12"
+        "id" : "ViewMsg11"
      }
    } ]
  }, {
    "codeName" : "VMGroup5",
    "name" : "视图消息关闭模式",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-无删除",
+      "name" : "关闭模式-本次删除",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg11"
+        "id" : "ViewMsg13"
      }
    }, {
-      "name" : "关闭模式-默认删除",
+      "name" : "关闭模式-无删除",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg12"
+        "id" : "ViewMsg11"
      }
    }, {
-      "name" : "关闭模式-本次删除",
+      "name" : "关闭模式-默认删除",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg13"
+        "id" : "ViewMsg12"
      }
    } ]
  }, {
    "codeName" : "VMGroup6",
    "name" : "视图消息动态模式测试",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "动态模式-实体数据集",
+      "name" : "动态模式-静态内容",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg14"
+        "id" : "ViewMsg15"
      }
    }, {
-      "name" : "动态模式-静态内容",
+      "name" : "动态模式-实体数据集",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg15"
+        "id" : "ViewMsg14"
      }
    } ]
  } ],
@@ -43590,7 +43590,16 @@
            "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM.json"
          }
        },
-        "groupMode" : "NONE",
+        "groupLayout" : "ROW",
+        "groupMode" : "AUTO",
+        "getGroupPSAppDEField" : {
+          "name" : "TYPE",
+          "codeName" : "TYPE"
+        },
+        "getGroupPSCodeList" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/WorkItemType.json"
+        },
        "getItemPSLayoutPanel" : {
          "codeName" : "Usr1212707386",
          "controlType" : "PANEL",
@@ -43630,8 +43639,8 @@
        "logicName" : "看板视图测试_看板",
        "minorSortDir" : "ASC",
        "getMinorSortPSAppDEField" : {
-          "name" : "TYPE",
-          "codeName" : "TYPE"
+          "name" : "UPDATEDATE",
+          "codeName" : "UpdateDate"
        },
        "getPSAppDataEntity" : {
          "modelref" : true,
@@ -43801,7 +43810,7 @@
        "enableCardEditGroup" : false,
        "enableCardEditOrder" : false,
        "enableCardNew" : false,
-        "enableGroup" : false,
+        "enableGroup" : true,
        "enablePagingBar" : false,
        "noSort" : false,
        "singleSelect" : false,
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSDBSCHEMES/DEFAULT.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSDBSCHEMES/DEFAULT.json
@@ -2706,6 +2706,55 @@
    "name" : "T_STUDENT",
    "autoExtendModel" : true,
    "existingModel" : false
+  }, {
+    "getAllPSSysDBColumns" : [ {
+      "codeName" : "CREATEDATE",
+      "length" : 8,
+      "logicName" : "建立时间",
+      "name" : "CREATEDATE",
+      "stdDataType" : 5,
+      "nullable" : true
+    }, {
+      "codeName" : "CREATEMAN",
+      "length" : 60,
+      "logicName" : "建立人",
+      "name" : "CREATEMAN",
+      "stdDataType" : 25,
+      "nullable" : true
+    }, {
+      "codeName" : "SUBTESTID",
+      "length" : 100,
+      "logicName" : "子测试实体标识",
+      "name" : "SUBTESTID",
+      "stdDataType" : 25,
+      "pKey" : true
+    }, {
+      "codeName" : "SUBTESTNAME",
+      "length" : 200,
+      "logicName" : "子测试实体名称",
+      "name" : "SUBTESTNAME",
+      "stdDataType" : 25,
+      "nullable" : true
+    }, {
+      "codeName" : "UPDATEDATE",
+      "length" : 8,
+      "logicName" : "更新时间",
+      "name" : "UPDATEDATE",
+      "stdDataType" : 5,
+      "nullable" : true
+    }, {
+      "codeName" : "UPDATEMAN",
+      "length" : 60,
+      "logicName" : "更新人",
+      "name" : "UPDATEMAN",
+      "stdDataType" : 25,
+      "nullable" : true
+    } ],
+    "codeName" : "T_SUBTEST",
+    "logicName" : "子测试实体",
+    "name" : "T_SUBTEST",
+    "autoExtendModel" : true,
+    "existingModel" : false
  }, {
    "getAllPSSysDBColumns" : [ {
      "codeName" : "CREATEDATE",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSI18NS/DEFAULT.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSI18NS/DEFAULT.json
@@ -87,6 +87,12 @@
    "lanResType" : "DE.LNAME",
    "name" : "实体逻辑名称（DE.LNAME.*）[SONG]",
    "refFlag" : true
+  }, {
+    "defaultContent" : "子测试实体",
+    "lanResTag" : "DE.LNAME.SUBTEST",
+    "lanResType" : "DE.LNAME",
+    "name" : "实体逻辑名称（DE.LNAME.*）[SUBTEST]",
+    "refFlag" : true
  }, {
    "defaultContent" : "SYS_EMP_EX",
    "lanResTag" : "DE.LNAME.SYS_EMP_EX",
@@ -272,6 +278,18 @@
    "lanResType" : "DEF.LNAME",
    "name" : "属性逻辑名称（DEF.LNAME.*）[SONGNAME]",
    "refFlag" : true
+  }, {
+    "defaultContent" : "子测试实体标识",
+    "lanResTag" : "DEF.LNAME.SUBTESTID",
+    "lanResType" : "DEF.LNAME",
+    "name" : "属性逻辑名称（DEF.LNAME.*）[SUBTESTID]",
+    "refFlag" : true
+  }, {
+    "defaultContent" : "子测试实体名称",
+    "lanResTag" : "DEF.LNAME.SUBTESTNAME",
+    "lanResType" : "DEF.LNAME",
+    "name" : "属性逻辑名称（DEF.LNAME.*）[SUBTESTNAME]",
+    "refFlag" : true
  }, {
    "defaultContent" : "SYS_EMP_EX标识",
    "lanResTag" : "DEF.LNAME.SYS_EMP_EXID",
@@ -904,6 +922,31 @@
    "lanResType" : "CONTROL",
    "name" : "控件文本（CONTROL.*）[DEFORM.SONG.MAIN.GROUPPANEL.GROUP2]",
    "refFlag" : true
+  }, {
+    "defaultContent" : "常规条件",
+    "lanResTag" : "CONTROL.DEFORM.SUBTEST.DEFAULT.FORMPAGE.FORMPAGE1",
+    "lanResType" : "CONTROL",
+    "name" : "控件文本（CONTROL.*）[DEFORM.SUBTEST.DEFAULT.FORMPAGE.FORMPAGE1]"
+  }, {
+    "defaultContent" : "基本信息",
+    "lanResTag" : "CONTROL.DEFORM.SUBTEST.MAIN.FORMPAGE.FORMPAGE1",
+    "lanResType" : "CONTROL",
+    "name" : "控件文本（CONTROL.*）[DEFORM.SUBTEST.MAIN.FORMPAGE.FORMPAGE1]"
+  }, {
+    "defaultContent" : "其它",
+    "lanResTag" : "CONTROL.DEFORM.SUBTEST.MAIN.FORMPAGE.FORMPAGE2",
+    "lanResType" : "CONTROL",
+    "name" : "控件文本（CONTROL.*）[DEFORM.SUBTEST.MAIN.FORMPAGE.FORMPAGE2]"
+  }, {
+    "defaultContent" : "子测试实体基本信息",
+    "lanResTag" : "CONTROL.DEFORM.SUBTEST.MAIN.GROUPPANEL.GROUP1",
+    "lanResType" : "CONTROL",
+    "name" : "控件文本（CONTROL.*）[DEFORM.SUBTEST.MAIN.GROUPPANEL.GROUP1]"
+  }, {
+    "defaultContent" : "操作信息",
+    "lanResTag" : "CONTROL.DEFORM.SUBTEST.MAIN.GROUPPANEL.GROUP2",
+    "lanResType" : "CONTROL",
+    "name" : "控件文本（CONTROL.*）[DEFORM.SUBTEST.MAIN.GROUPPANEL.GROUP2]"
  }, {
    "defaultContent" : "常规条件",
    "lanResTag" : "CONTROL.DEFORM.SYS_EMP_EX.DEFAULT.FORMPAGE.FORMPAGE1",
@@ -1165,6 +1208,11 @@
    "lanResType" : "CONTROL",
    "name" : "控件文本（CONTROL.*）[DEFSFITEM.SONG.N_SONGNAME_LIKE]",
    "refFlag" : true
+  }, {
+    "lanResTag" : "CONTROL.DEFSFITEM.SUBTEST.N_SUBTESTNAME_LIKE",
+    "lanResType" : "CONTROL",
+    "name" : "控件文本（CONTROL.*）[DEFSFITEM.SUBTEST.N_SUBTESTNAME_LIKE]",
+    "refFlag" : true
  }, {
    "lanResTag" : "CONTROL.DEFSFITEM.SYS_EMP_EX.N_SYS_EMP_EXNAME_LIKE",
    "lanResType" : "CONTROL",
@@ -1707,6 +1755,41 @@
    "lanResType" : "PAGE",
    "name" : "界面文本（PAGE.*）[TITLE.SONG.REDIRECTVIEW]",
    "refFlag" : true
+  }, {
+    "defaultContent" : "子测试实体编辑视图",
+    "lanResTag" : "PAGE.TITLE.SUBTEST.EDITVIEW2",
+    "lanResType" : "PAGE",
+    "name" : "界面文本（PAGE.*）[TITLE.SUBTEST.EDITVIEW2]"
+  }, {
+    "defaultContent" : "子测试实体编辑视图",
+    "lanResTag" : "PAGE.TITLE.SUBTEST.EDITVIEW",
+    "lanResType" : "PAGE",
+    "name" : "界面文本（PAGE.*）[TITLE.SUBTEST.EDITVIEW]"
+  }, {
+    "defaultContent" : "子测试实体表格视图",
+    "lanResTag" : "PAGE.TITLE.SUBTEST.GRIDVIEW",
+    "lanResType" : "PAGE",
+    "name" : "界面文本（PAGE.*）[TITLE.SUBTEST.GRIDVIEW]"
+  }, {
+    "defaultContent" : "子测试实体数据多项选择视图",
+    "lanResTag" : "PAGE.TITLE.SUBTEST.MPICKUPVIEW",
+    "lanResType" : "PAGE",
+    "name" : "界面文本（PAGE.*）[TITLE.SUBTEST.MPICKUPVIEW]"
+  }, {
+    "defaultContent" : "子测试实体选择表格视图",
+    "lanResTag" : "PAGE.TITLE.SUBTEST.PICKUPGRIDVIEW",
+    "lanResType" : "PAGE",
+    "name" : "界面文本（PAGE.*）[TITLE.SUBTEST.PICKUPGRIDVIEW]"
+  }, {
+    "defaultContent" : "子测试实体数据选择视图",
+    "lanResTag" : "PAGE.TITLE.SUBTEST.PICKUPVIEW",
+    "lanResType" : "PAGE",
+    "name" : "界面文本（PAGE.*）[TITLE.SUBTEST.PICKUPVIEW]"
+  }, {
+    "defaultContent" : "子测试实体数据重定向视图",
+    "lanResTag" : "PAGE.TITLE.SUBTEST.REDIRECTVIEW",
+    "lanResType" : "PAGE",
+    "name" : "界面文本（PAGE.*）[TITLE.SUBTEST.REDIRECTVIEW]"
  }, {
    "defaultContent" : "SYS_EMP_EX编辑视图",
    "lanResTag" : "PAGE.TITLE.SYS_EMP_EX.EDITVIEW2",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSTEM.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSTEM.json
@@ -591,6 +591,10 @@
    "modelref" : true,
    "path" : "PSMODULES/common/PSDATAENTITIES/Student.json",
    "name" : "STUDENT"
+  }, {
+    "modelref" : true,
+    "path" : "PSMODULES/Test/PSDATAENTITIES/SubTest.json",
+    "name" : "SUBTEST"
  }, {
    "modelref" : true,
    "path" : "PSMODULES/common/PSDATAENTITIES/SysEmployee.json",
@@ -1338,6 +1342,9 @@
    }, {
      "modelref" : true,
      "path" : "PSMODULES/Test/PSDATAENTITIES/Song.json"
+    }, {
+      "modelref" : true,
+      "path" : "PSMODULES/Test/PSDATAENTITIES/SubTest.json"
    }, {
      "modelref" : true,
      "path" : "PSMODULES/Test/PSDATAENTITIES/SysTodo.json"