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

53849f0a · ibizdev · 7ce2e034 · 53849f0a · 53849f0a · 53849f0a
--- 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
@@ -30,6 +30,9 @@
  }, {
    "modelref" : true,
    "path" : "PSMODULES/Test/PSDATAENTITIES/TEST.json"
+  }, {
+    "modelref" : true,
+    "path" : "PSMODULES/Test/PSDATAENTITIES/TESTGRID.json"
  }, {
    "modelref" : true,
    "path" : "PSMODULES/Test/PSDATAENTITIES/WorkFlow.json"

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/TESTGRID.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/TESTGRID.json
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/TESTGRID/PSDEACTIONS/CheckKey.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/TESTGRID/PSDEACTIONS/CheckKey.json
+{
+  "actionMode" : "CHECKKEY",
+  "actionType" : "BUILTIN",
+  "codeName" : "CheckKey",
+  "dynaModelFilePath" : "PSMODULES/Test/PSDATAENTITIES/TESTGRID/PSDEACTIONS/CheckKey.json",
+  "logicName" : "CheckKey",
+  "name" : "CheckKey",
+  "getPSDEActionInput" : {
+    "name" : "CheckKeyInput",
+    "getPSDEMethodDTO" : {
+      "modelref" : true,
+      "id" : "TESTGRIDDTO"
+    },
+    "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/TESTGRID/PSDEACTIONS/Create.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/TESTGRID/PSDEACTIONS/Create.json
+{
+  "actionMode" : "CREATE",
+  "actionType" : "BUILTIN",
+  "codeName" : "Create",
+  "dynaModelFilePath" : "PSMODULES/Test/PSDATAENTITIES/TESTGRID/PSDEACTIONS/Create.json",
+  "logicName" : "Create",
+  "name" : "Create",
+  "orderValue" : 1,
+  "getPSDEActionInput" : {
+    "name" : "CreateInput",
+    "getPSDEMethodDTO" : {
+      "modelref" : true,
+      "id" : "TESTGRIDDTO"
+    },
+    "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/TESTGRID/PSDEACTIONS/Get.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/TESTGRID/PSDEACTIONS/Get.json
+{
+  "actionMode" : "READ",
+  "actionType" : "BUILTIN",
+  "codeName" : "Get",
+  "dynaModelFilePath" : "PSMODULES/Test/PSDATAENTITIES/TESTGRID/PSDEACTIONS/Get.json",
+  "logicName" : "Get",
+  "name" : "Get",
+  "orderValue" : 31,
+  "getPSDEActionInput" : {
+    "getKeyPSDEField" : {
+      "name" : "TESTGRIDID",
+      "codeName" : "TESTGRIDId"
+    },
+    "name" : "GetInput",
+    "type" : "KEYFIELD"
+  },
+  "getPSDEActionReturn" : {
+    "name" : "GetResult",
+    "getPSDEMethodDTO" : {
+      "modelref" : true,
+      "id" : "TESTGRIDDTO"
+    },
+    "type" : "DTO"
+  },
+  "builtinAction" : true
+}
\ No newline at end of file
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/TESTGRID/PSDEACTIONS/GetDraft.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/TESTGRID/PSDEACTIONS/GetDraft.json
+{
+  "actionMode" : "GETDRAFT",
+  "actionType" : "BUILTIN",
+  "codeName" : "GetDraft",
+  "dynaModelFilePath" : "PSMODULES/Test/PSDATAENTITIES/TESTGRID/PSDEACTIONS/GetDraft.json",
+  "logicName" : "GetDraft",
+  "name" : "GetDraft",
+  "orderValue" : 41,
+  "getPSDEActionInput" : {
+    "name" : "GetDraftInput",
+    "getPSDEMethodDTO" : {
+      "modelref" : true,
+      "id" : "TESTGRIDDTO"
+    },
+    "type" : "DTO"
+  },
+  "getPSDEActionReturn" : {
+    "name" : "GetDraftResult",
+    "getPSDEMethodDTO" : {
+      "modelref" : true,
+      "id" : "TESTGRIDDTO"
+    },
+    "type" : "DTO"
+  },
+  "builtinAction" : true
+}
\ No newline at end of file
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/TESTGRID/PSDEACTIONS/Remove.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/TESTGRID/PSDEACTIONS/Remove.json
+{
+  "actionMode" : "DELETE",
+  "actionType" : "BUILTIN",
+  "batchActionMode" : 1,
+  "codeName" : "Remove",
+  "dynaModelFilePath" : "PSMODULES/Test/PSDATAENTITIES/TESTGRID/PSDEACTIONS/Remove.json",
+  "logicName" : "Remove",
+  "name" : "Remove",
+  "orderValue" : 21,
+  "getPSDEActionInput" : {
+    "getKeyPSDEField" : {
+      "name" : "TESTGRIDID",
+      "codeName" : "TESTGRIDId"
+    },
+    "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/TESTGRID/PSDEACTIONS/Save.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/TESTGRID/PSDEACTIONS/Save.json
+{
+  "actionMode" : "UNKNOWN",
+  "actionType" : "BUILTIN",
+  "codeName" : "Save",
+  "dynaModelFilePath" : "PSMODULES/Test/PSDATAENTITIES/TESTGRID/PSDEACTIONS/Save.json",
+  "logicName" : "Save",
+  "name" : "Save",
+  "getPSDEActionInput" : {
+    "name" : "SaveInput",
+    "getPSDEMethodDTO" : {
+      "modelref" : true,
+      "id" : "TESTGRIDDTO"
+    },
+    "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/TESTGRID/PSDEACTIONS/Update.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/TESTGRID/PSDEACTIONS/Update.json
+{
+  "actionMode" : "UPDATE",
+  "actionType" : "BUILTIN",
+  "codeName" : "Update",
+  "dynaModelFilePath" : "PSMODULES/Test/PSDATAENTITIES/TESTGRID/PSDEACTIONS/Update.json",
+  "logicName" : "Update",
+  "name" : "Update",
+  "orderValue" : 11,
+  "getPSDEActionInput" : {
+    "name" : "UpdateInput",
+    "getPSDEMethodDTO" : {
+      "modelref" : true,
+      "id" : "TESTGRIDDTO"
+    },
+    "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/TESTGRID/PSDEDATAQUERIES/Default/PSDEDQCODES/MYSQL5.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/TESTGRID/PSDEDATAQUERIES/Default/PSDEDQCODES/MYSQL5.json
+{
+  "dBType" : "MYSQL5",
+  "name" : "MySQL5",
+  "getPSDEDataQueryCodeExps" : [ {
+    "expression" : "t1.`CREATEDATE`",
+    "name" : "CREATEDATE"
+  }, {
+    "expression" : "t1.`CREATEMAN`",
+    "name" : "CREATEMAN"
+  }, {
+    "expression" : "t1.`TESTGRIDID`",
+    "name" : "TESTGRIDID"
+  }, {
+    "expression" : "t1.`TESTGRIDNAME`",
+    "name" : "TESTGRIDNAME"
+  }, {
+    "expression" : "t1.`UPDATEDATE`",
+    "name" : "UPDATEDATE"
+  }, {
+    "expression" : "t1.`UPDATEMAN`",
+    "name" : "UPDATEMAN"
+  } ],
+  "queryCode" : "SELECT\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`TESTGRIDID`,\nt1.`TESTGRIDNAME`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_TESTGRID` t1 \n",
+  "id" : "PSMODULES/Test/PSDATAENTITIES/TESTGRID/PSDEDATAQUERIES/Default/PSDEDQCODES/MYSQL5.json"
+}
\ No newline at end of file
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/TESTGRID/PSDEDATAQUERIES/View/PSDEDQCODES/MYSQL5.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/TESTGRID/PSDEDATAQUERIES/View/PSDEDQCODES/MYSQL5.json
+{
+  "dBType" : "MYSQL5",
+  "name" : "MySQL5",
+  "getPSDEDataQueryCodeExps" : [ {
+    "expression" : "t1.`CREATEDATE`",
+    "name" : "CREATEDATE"
+  }, {
+    "expression" : "t1.`CREATEMAN`",
+    "name" : "CREATEMAN"
+  }, {
+    "expression" : "t1.`TESTGRIDID`",
+    "name" : "TESTGRIDID"
+  }, {
+    "expression" : "t1.`TESTGRIDNAME`",
+    "name" : "TESTGRIDNAME"
+  }, {
+    "expression" : "t1.`UPDATEDATE`",
+    "name" : "UPDATEDATE"
+  }, {
+    "expression" : "t1.`UPDATEMAN`",
+    "name" : "UPDATEMAN"
+  } ],
+  "queryCode" : "SELECT\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`TESTGRIDID`,\nt1.`TESTGRIDNAME`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_TESTGRID` t1 \n",
+  "id" : "PSMODULES/Test/PSDATAENTITIES/TESTGRID/PSDEDATAQUERIES/View/PSDEDQCODES/MYSQL5.json"
+}
\ No newline at end of file
--- 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
@@ -1279,16 +1279,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"
      }
    } ]
  }, {

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSFORMS/Main_4.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSFORMS/Main_4.json
@@ -126,6 +126,13 @@
      "name" : "FIELD11",
      "codeName" : "Field11"
    }
+  }, {
+    "id" : "field12",
+    "dataType" : 25,
+    "getPSAppDEField" : {
+      "name" : "FIELD12",
+      "codeName" : "Field12"
+    }
  }, {
    "id" : "bookid",
    "hidden" : true,
@@ -143,7 +150,7 @@
    "name" : "formpage1",
    "getPSDEFormDetails" : [ {
      "actionGroupExtractMode" : "ITEM",
-      "caption" : "测试编辑器参数增强",
+      "caption" : "数据选择",
      "codeName" : "grouppanel1",
      "detailStyle" : "DEFAULT",
      "detailType" : "GROUPPANEL",
@@ -176,7 +183,7 @@
        "allowEmpty" : true,
        "showCaption" : true
      }, {
-        "caption" : "地址栏选择",
+        "caption" : "地址选择objects",
        "codeName" : "field11",
        "dataType" : 25,
        "detailStyle" : "DEFAULT",
@@ -193,15 +200,18 @@
        },
        "getPSEditor" : {
          "editorParams" : {
-            "objectIdField" : "objectId",
-            "objectValueField" : "objectValue",
-            "valueSeparator" : ",",
-            "objectNameField" : "objectName",
+            "OBJECTNAMEFIELD" : "objectName",
+            "OBJECTVALUEFIELD" : "objectValue",
+            "OBJECTIDFIELD" : "objectId",
+            "VALUETYPE" : "OBJECTS",
            "PICKUPVIEW" : "TRUE",
-            "valueType" : "OBJECTS"
+            "VALUESEPARATOR" : ","
          },
          "editorType" : "ADDRESSPICKUP",
          "name" : "field11",
+          "objectIdField" : "objectId",
+          "objectNameField" : "objectName",
+          "objectValueField" : "objectValue",
          "getPSAppDEACMode" : {
            "modelref" : true,
            "id" : "Default"
@@ -212,12 +222,14 @@
          },
          "getPSAppDataEntity" : {
            "modelref" : true,
-            "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD.json"
+            "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
          },
          "getPSEditorItems" : [ {
            "name" : "field16"
          } ],
          "valueItemName" : "field16",
+          "valueSeparator" : ",",
+          "valueType" : "OBJECTS",
          "enableAC" : false,
          "enablePickupView" : true,
          "forceSelection" : true,
@@ -230,6 +242,53 @@
        "valueItemName" : "field16",
        "allowEmpty" : true,
        "showCaption" : true
+      }, {
+        "caption" : "地址选择simple",
+        "codeName" : "field12",
+        "dataType" : 25,
+        "detailStyle" : "DEFAULT",
+        "detailType" : "FORMITEM",
+        "enableCond" : 3,
+        "ignoreInput" : 0,
+        "labelPos" : "LEFT",
+        "labelWidth" : 130,
+        "name" : "field12",
+        "noPrivDisplayMode" : 1,
+        "getPSAppDEField" : {
+          "name" : "FIELD12",
+          "codeName" : "Field12"
+        },
+        "getPSEditor" : {
+          "editorParams" : {
+            "OBJECTNAMEFIELD" : "objectName",
+            "PICKUPVIEW" : "TRUE"
+          },
+          "editorType" : "ADDRESSPICKUP",
+          "name" : "field12",
+          "objectNameField" : "objectName",
+          "getPSAppDEACMode" : {
+            "modelref" : true,
+            "id" : "Default"
+          },
+          "getPSAppDEDataSet" : {
+            "modelref" : true,
+            "id" : "FetchDefault"
+          },
+          "getPSAppDataEntity" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
+          },
+          "enableAC" : false,
+          "enablePickupView" : true,
+          "forceSelection" : true,
+          "showTrigger" : true
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "allowEmpty" : true,
+        "showCaption" : true
      } ],
      "getPSLayout" : {
        "childColLG" : -1,

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr10EditView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr10EditView.json
@@ -243,6 +243,13 @@
        "name" : "FIELD11",
        "codeName" : "Field11"
      }
+    }, {
+      "id" : "field12",
+      "dataType" : 25,
+      "getPSAppDEField" : {
+        "name" : "FIELD12",
+        "codeName" : "Field12"
+      }
    }, {
      "id" : "bookid",
      "hidden" : true,
@@ -260,7 +267,7 @@
      "name" : "formpage1",
      "getPSDEFormDetails" : [ {
        "actionGroupExtractMode" : "ITEM",
-        "caption" : "测试编辑器参数增强",
+        "caption" : "数据选择",
        "codeName" : "grouppanel1",
        "detailStyle" : "DEFAULT",
        "detailType" : "GROUPPANEL",
@@ -293,7 +300,7 @@
          "allowEmpty" : true,
          "showCaption" : true
        }, {
-          "caption" : "地址栏选择",
+          "caption" : "地址选择objects",
          "codeName" : "field11",
          "dataType" : 25,
          "detailStyle" : "DEFAULT",
@@ -310,15 +317,18 @@
          },
          "getPSEditor" : {
            "editorParams" : {
-              "objectIdField" : "objectId",
-              "objectValueField" : "objectValue",
-              "valueSeparator" : ",",
-              "objectNameField" : "objectName",
+              "OBJECTNAMEFIELD" : "objectName",
+              "OBJECTVALUEFIELD" : "objectValue",
+              "OBJECTIDFIELD" : "objectId",
+              "VALUETYPE" : "OBJECTS",
              "PICKUPVIEW" : "TRUE",
-              "valueType" : "OBJECTS"
+              "VALUESEPARATOR" : ","
            },
            "editorType" : "ADDRESSPICKUP",
            "name" : "field11",
+            "objectIdField" : "objectId",
+            "objectNameField" : "objectName",
+            "objectValueField" : "objectValue",
            "getPSAppDEACMode" : {
              "modelref" : true,
              "id" : "Default"
@@ -329,12 +339,14 @@
            },
            "getPSAppDataEntity" : {
              "modelref" : true,
-              "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD.json"
+              "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
            },
            "getPSEditorItems" : [ {
              "name" : "field16"
            } ],
            "valueItemName" : "field16",
+            "valueSeparator" : ",",
+            "valueType" : "OBJECTS",
            "enableAC" : false,
            "enablePickupView" : true,
            "forceSelection" : true,
@@ -347,6 +359,53 @@
          "valueItemName" : "field16",
          "allowEmpty" : true,
          "showCaption" : true
+        }, {
+          "caption" : "地址选择simple",
+          "codeName" : "field12",
+          "dataType" : 25,
+          "detailStyle" : "DEFAULT",
+          "detailType" : "FORMITEM",
+          "enableCond" : 3,
+          "ignoreInput" : 0,
+          "labelPos" : "LEFT",
+          "labelWidth" : 130,
+          "name" : "field12",
+          "noPrivDisplayMode" : 1,
+          "getPSAppDEField" : {
+            "name" : "FIELD12",
+            "codeName" : "Field12"
+          },
+          "getPSEditor" : {
+            "editorParams" : {
+              "OBJECTNAMEFIELD" : "objectName",
+              "PICKUPVIEW" : "TRUE"
+            },
+            "editorType" : "ADDRESSPICKUP",
+            "name" : "field12",
+            "objectNameField" : "objectName",
+            "getPSAppDEACMode" : {
+              "modelref" : true,
+              "id" : "Default"
+            },
+            "getPSAppDEDataSet" : {
+              "modelref" : true,
+              "id" : "FetchDefault"
+            },
+            "getPSAppDataEntity" : {
+              "modelref" : true,
+              "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
+            },
+            "enableAC" : false,
+            "enablePickupView" : true,
+            "forceSelection" : true,
+            "showTrigger" : true
+          },
+          "getPSLayoutPos" : {
+            "colMD" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "allowEmpty" : true,
+          "showCaption" : true
        } ],
        "getPSLayout" : {
          "childColLG" : -1,

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/phoneUsr08214390EditView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/phoneUsr08214390EditView.json
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPINDEXVIEWS/AppIndex.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPINDEXVIEWS/AppIndex.json
@@ -2210,6 +2210,43 @@
        "layout" : "TABLE_24COL"
      },
      "tooltip" : "分割面板"
+    }, {
+      "accUserMode" : 0,
+      "caption" : "数据表格",
+      "itemType" : "MENUITEM",
+      "name" : "menuitem103",
+      "getPSAppMenuItems" : [ {
+        "accUserMode" : 0,
+        "caption" : "数据模型",
+        "itemType" : "MENUITEM",
+        "name" : "menuitem104",
+        "getPSLayout" : {
+          "childColLG" : -1,
+          "childColMD" : 24,
+          "childColSM" : -1,
+          "childColXS" : -1,
+          "columnCount" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "tooltip" : "数据模型"
+      } ],
+      "getPSLayout" : {
+        "childColLG" : -1,
+        "childColMD" : 24,
+        "childColSM" : -1,
+        "childColXS" : -1,
+        "columnCount" : 24,
+        "layout" : "TABLE_24COL"
+      },
+      "getPSLayoutPos" : {
+        "colMD" : 24,
+        "layout" : "TABLE_24COL"
+      },
+      "tooltip" : "数据表格"
    } ],
    "getPSControlHandler" : {
      "enableDEFieldPrivilege" : false,

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPMENUS/AppIndex.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPMENUS/AppIndex.json
@@ -972,6 +972,19 @@
      "tooltip" : "水平"
    } ],
    "tooltip" : "分割面板"
+  }, {
+    "accUserMode" : 0,
+    "caption" : "数据表格",
+    "itemType" : "MENUITEM",
+    "name" : "menuitem103",
+    "getPSAppMenuItems" : [ {
+      "accUserMode" : 0,
+      "caption" : "数据模型",
+      "itemType" : "MENUITEM",
+      "name" : "menuitem104",
+      "tooltip" : "数据模型"
+    } ],
+    "tooltip" : "数据表格"
  } ],
  "enableCustomize" : false,
  "name" : "appindex",

--- 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
@@ -3034,16 +3034,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"
      }
    } ]
  } ],
@@ -6792,6 +6792,43 @@
            "layout" : "TABLE_24COL"
          },
          "tooltip" : "分割面板"
+        }, {
+          "accUserMode" : 0,
+          "caption" : "数据表格",
+          "itemType" : "MENUITEM",
+          "name" : "menuitem103",
+          "getPSAppMenuItems" : [ {
+            "accUserMode" : 0,
+            "caption" : "数据模型",
+            "itemType" : "MENUITEM",
+            "name" : "menuitem104",
+            "getPSLayout" : {
+              "childColLG" : -1,
+              "childColMD" : 24,
+              "childColSM" : -1,
+              "childColXS" : -1,
+              "columnCount" : 24,
+              "layout" : "TABLE_24COL"
+            },
+            "getPSLayoutPos" : {
+              "colMD" : 24,
+              "layout" : "TABLE_24COL"
+            },
+            "tooltip" : "数据模型"
+          } ],
+          "getPSLayout" : {
+            "childColLG" : -1,
+            "childColMD" : 24,
+            "childColSM" : -1,
+            "childColXS" : -1,
+            "columnCount" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "getPSLayoutPos" : {
+            "colMD" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "tooltip" : "数据表格"
        } ],
        "getPSControlHandler" : {
          "enableDEFieldPrivilege" : 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
@@ -2049,6 +2049,55 @@
    "name" : "T_TEST",
    "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" : "TESTGRIDID",
+      "length" : 100,
+      "logicName" : "测试表格标识",
+      "name" : "TESTGRIDID",
+      "stdDataType" : 25,
+      "pKey" : true
+    }, {
+      "codeName" : "TESTGRIDNAME",
+      "length" : 200,
+      "logicName" : "测试表格名称",
+      "name" : "TESTGRIDNAME",
+      "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_TESTGRID",
+    "logicName" : "测试表格",
+    "name" : "T_TESTGRID",
+    "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
@@ -23,6 +23,12 @@
    "lanResType" : "DE.LNAME",
    "name" : "实体逻辑名称（DE.LNAME.*）[SYS_TODO]",
    "refFlag" : true
+  }, {
+    "defaultContent" : "测试表格",
+    "lanResTag" : "DE.LNAME.TESTGRID",
+    "lanResType" : "DE.LNAME",
+    "name" : "实体逻辑名称（DE.LNAME.*）[TESTGRID]",
+    "refFlag" : true
  }, {
    "defaultContent" : "报销明细日志标识",
    "lanResTag" : "DEF.LNAME.BXDMXLOGID",
@@ -59,6 +65,18 @@
    "lanResType" : "DEF.LNAME",
    "name" : "属性逻辑名称（DEF.LNAME.*）[SYS_EMP_EXNAME]",
    "refFlag" : true
+  }, {
+    "defaultContent" : "测试表格标识",
+    "lanResTag" : "DEF.LNAME.TESTGRIDID",
+    "lanResType" : "DEF.LNAME",
+    "name" : "属性逻辑名称（DEF.LNAME.*）[TESTGRIDID]",
+    "refFlag" : true
+  }, {
+    "defaultContent" : "测试表格名称",
+    "lanResTag" : "DEF.LNAME.TESTGRIDNAME",
+    "lanResType" : "DEF.LNAME",
+    "name" : "属性逻辑名称（DEF.LNAME.*）[TESTGRIDNAME]",
+    "refFlag" : true
  }, {
    "defaultContent" : "常规条件",
    "lanResTag" : "CONTROL.DEFORM.BXDMXLOG.DEFAULT.FORMPAGE.FORMPAGE1",
@@ -169,6 +187,31 @@
    "lanResType" : "CONTROL",
    "name" : "控件文本（CONTROL.*）[DEFORM.SYS_TODO.MAIN.GROUPPANEL.GROUP2]",
    "refFlag" : true
+  }, {
+    "defaultContent" : "常规条件",
+    "lanResTag" : "CONTROL.DEFORM.TESTGRID.DEFAULT.FORMPAGE.FORMPAGE1",
+    "lanResType" : "CONTROL",
+    "name" : "控件文本（CONTROL.*）[DEFORM.TESTGRID.DEFAULT.FORMPAGE.FORMPAGE1]"
+  }, {
+    "defaultContent" : "基本信息",
+    "lanResTag" : "CONTROL.DEFORM.TESTGRID.MAIN.FORMPAGE.FORMPAGE1",
+    "lanResType" : "CONTROL",
+    "name" : "控件文本（CONTROL.*）[DEFORM.TESTGRID.MAIN.FORMPAGE.FORMPAGE1]"
+  }, {
+    "defaultContent" : "其它",
+    "lanResTag" : "CONTROL.DEFORM.TESTGRID.MAIN.FORMPAGE.FORMPAGE2",
+    "lanResType" : "CONTROL",
+    "name" : "控件文本（CONTROL.*）[DEFORM.TESTGRID.MAIN.FORMPAGE.FORMPAGE2]"
+  }, {
+    "defaultContent" : "测试表格基本信息",
+    "lanResTag" : "CONTROL.DEFORM.TESTGRID.MAIN.GROUPPANEL.GROUP1",
+    "lanResType" : "CONTROL",
+    "name" : "控件文本（CONTROL.*）[DEFORM.TESTGRID.MAIN.GROUPPANEL.GROUP1]"
+  }, {
+    "defaultContent" : "操作信息",
+    "lanResTag" : "CONTROL.DEFORM.TESTGRID.MAIN.GROUPPANEL.GROUP2",
+    "lanResType" : "CONTROL",
+    "name" : "控件文本（CONTROL.*）[DEFORM.TESTGRID.MAIN.GROUPPANEL.GROUP2]"
  }, {
    "lanResTag" : "CONTROL.DEFSFITEM.BXDMXLOG.N_BXDMXLOGNAME_LIKE",
    "lanResType" : "CONTROL",
@@ -184,6 +227,11 @@
    "lanResType" : "CONTROL",
    "name" : "控件文本（CONTROL.*）[DEFSFITEM.SYS_EMP_EX.N_SYS_EMP_EXNAME_LIKE]",
    "refFlag" : true
+  }, {
+    "lanResTag" : "CONTROL.DEFSFITEM.TESTGRID.N_TESTGRIDNAME_LIKE",
+    "lanResType" : "CONTROL",
+    "name" : "控件文本（CONTROL.*）[DEFSFITEM.TESTGRID.N_TESTGRIDNAME_LIKE]",
+    "refFlag" : true
  }, {
    "defaultContent" : "报销明细日志编辑视图",
    "lanResTag" : "PAGE.TITLE.BXDMXLOG.EDITVIEW2",
@@ -327,6 +375,41 @@
    "lanResType" : "PAGE",
    "name" : "界面文本（PAGE.*）[TITLE.SYS_TODO.REDIRECTVIEW]",
    "refFlag" : true
+  }, {
+    "defaultContent" : "测试表格编辑视图",
+    "lanResTag" : "PAGE.TITLE.TESTGRID.EDITVIEW2",
+    "lanResType" : "PAGE",
+    "name" : "界面文本（PAGE.*）[TITLE.TESTGRID.EDITVIEW2]"
+  }, {
+    "defaultContent" : "测试表格编辑视图",
+    "lanResTag" : "PAGE.TITLE.TESTGRID.EDITVIEW",
+    "lanResType" : "PAGE",
+    "name" : "界面文本（PAGE.*）[TITLE.TESTGRID.EDITVIEW]"
+  }, {
+    "defaultContent" : "测试表格表格视图",
+    "lanResTag" : "PAGE.TITLE.TESTGRID.GRIDVIEW",
+    "lanResType" : "PAGE",
+    "name" : "界面文本（PAGE.*）[TITLE.TESTGRID.GRIDVIEW]"
+  }, {
+    "defaultContent" : "测试表格数据多项选择视图",
+    "lanResTag" : "PAGE.TITLE.TESTGRID.MPICKUPVIEW",
+    "lanResType" : "PAGE",
+    "name" : "界面文本（PAGE.*）[TITLE.TESTGRID.MPICKUPVIEW]"
+  }, {
+    "defaultContent" : "测试表格选择表格视图",
+    "lanResTag" : "PAGE.TITLE.TESTGRID.PICKUPGRIDVIEW",
+    "lanResType" : "PAGE",
+    "name" : "界面文本（PAGE.*）[TITLE.TESTGRID.PICKUPGRIDVIEW]"
+  }, {
+    "defaultContent" : "测试表格数据选择视图",
+    "lanResTag" : "PAGE.TITLE.TESTGRID.PICKUPVIEW",
+    "lanResType" : "PAGE",
+    "name" : "界面文本（PAGE.*）[TITLE.TESTGRID.PICKUPVIEW]"
+  }, {
+    "defaultContent" : "测试表格数据重定向视图",
+    "lanResTag" : "PAGE.TITLE.TESTGRID.REDIRECTVIEW",
+    "lanResType" : "PAGE",
+    "name" : "界面文本（PAGE.*）[TITLE.TESTGRID.REDIRECTVIEW]"
  }, {
    "defaultContent" : "城市数据重定向视图",
    "lanResTag" : "PAGE.TITLE.CITY.REDIRECTVIEW",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSSERVICEAPIS/TrainSys.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSSERVICEAPIS/TrainSys.json
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSTEM.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSTEM.json
@@ -524,6 +524,10 @@
    "modelref" : true,
    "path" : "PSMODULES/Test/PSDATAENTITIES/TEST.json",
    "name" : "TEST"
+  }, {
+    "modelref" : true,
+    "path" : "PSMODULES/Test/PSDATAENTITIES/TESTGRID.json",
+    "name" : "TESTGRID"
  }, {
    "modelref" : true,
    "path" : "PSMODULES/ModelRepository/PSDATAENTITIES/ViewLayoutModelRepository.json",
@@ -951,6 +955,9 @@
    }, {
      "modelref" : true,
      "path" : "PSMODULES/Test/PSDATAENTITIES/TEST.json"
+    }, {
+      "modelref" : true,
+      "path" : "PSMODULES/Test/PSDATAENTITIES/TESTGRID.json"
    }, {
      "modelref" : true,
      "path" : "PSMODULES/Test/PSDATAENTITIES/WorkFlow.json"