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

config.xml

@@ -55,12 +55,6 @@
 	  git clone -b master $para2 trainsys/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd trainsys/
-      mvn clean package -Ptrainsys
-      mvn install -Ptrainsys
-      cd trainsys-provider
-      mvn -Ptrainsys docker:build
-      mvn -Ptrainsys docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/trainsys-provider-trainsys.yaml ebsx --with-registry-auth      
       </command>
     </hudson.tasks.Shell>
   </builders>

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/BOOKCHILD2.json

@@ -184,6 +184,9 @@
   } ],
   "getAllPSDEDBTables" : [ {
     "getAllPSDEFields" : [ {
+      "name" : "TYPE",
+      "codeName" : "TYPE"
+    }, {
       "name" : "BOOKCHILD2ID",
       "codeName" : "BOOKCHILD2Id"
     }, {
@@ -201,6 +204,9 @@
     }, {
       "name" : "UPDATEDATE",
       "codeName" : "UpdateDate"
+    }, {
+      "name" : "BOOKID",
+      "codeName" : "BookId"
     } ],
     "codeName" : "Table",
     "name" : "T_BOOKCHILD2",
@@ -306,6 +312,87 @@
     "enableFront" : true
   } ],
   "getAllPSDEFields" : [ {
+    "getAllPSDEFDTColumns" : [ {
+      "columnName" : "TYPE",
+      "dBType" : "MYSQL5",
+      "name" : "TYPE",
+      "queryCodeExp" : "t1.`TYPE`",
+      "standardColumnName" : "`TYPE`"
+    } ],
+    "getAllPSDEFUIModes" : [ {
+      "codeName" : "Default",
+      "name" : "[TYPE][类型]",
+      "getPSDEFFormItem" : {
+        "codeName" : "Default",
+        "editorType" : "TEXTBOX",
+        "name" : "[TYPE][类型]",
+        "stringLength" : 100,
+        "uIMode" : "DEFAULT"
+      },
+      "type" : "DEFAULT"
+    }, {
+      "codeName" : "MobileDefault",
+      "name" : "[TYPE][类型]移动端默认",
+      "getPSDEFFormItem" : {
+        "codeName" : "MobileDefault",
+        "editorType" : "MOBTEXT",
+        "name" : "[TYPE][类型]移动端默认",
+        "stringLength" : 100,
+        "uIMode" : "MOBILEDEFAULT",
+        "mobileMode" : true
+      },
+      "type" : "MOBILEDEFAULT",
+      "mobileMode" : true
+    } ],
+    "getAllPSDEFValueRules" : [ {
+      "codeName" : "Default",
+      "name" : "默认规则",
+      "getPSDEFVRGroupCondition" : {
+        "condOp" : "AND",
+        "condType" : "GROUP",
+        "name" : "默认组",
+        "getPSDEFVRConditions" : [ {
+          "condType" : "STRINGLENGTH",
+          "dEFName" : "TYPE",
+          "maxValue" : 100,
+          "name" : "默认字符串长度",
+          "ruleInfo" : "内容长度必须小于等于[100]",
+          "includeMaxValue" : true,
+          "includeMinValue" : false,
+          "keyCond" : true
+        } ],
+        "ruleInfo" : "内容长度必须小于等于[100]"
+      },
+      "ruleInfo" : "内容长度必须小于等于[100]",
+      "checkDefault" : true,
+      "defaultMode" : true,
+      "enableBackend" : true,
+      "enableFront" : true
+    } ],
+    "codeName" : "TYPE",
+    "dEFType" : 1,
+    "dataType" : "TEXT",
+    "importOrder" : 1000,
+    "length" : 100,
+    "logicName" : "类型",
+    "name" : "TYPE",
+    "getPSCodeList" : {
+      "modelref" : true,
+      "path" : "PSMODULES/ModelRepository/PSCODELISTS/CodeList44.json"
+    },
+    "getPSDEDBTable" : {
+      "modelref" : true,
+      "id" : "Table"
+    },
+    "getPSSysDBColumn" : {
+      "modelref" : true,
+      "id" : "TYPE"
+    },
+    "serviceCodeName" : "TYPE",
+    "stdDataType" : 25,
+    "stringLength" : 100,
+    "valueFormat" : "%1$s"
+  }, {
     "getAllPSDEFDTColumns" : [ {
       "columnName" : "BOOKCHILD2ID",
       "dBType" : "MYSQL5",
@@ -916,10 +1003,133 @@
     "valueFormat" : "%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS",
     "allowEmpty" : false,
     "systemReserver" : true
+  }, {
+    "getAllPSDEFDTColumns" : [ {
+      "columnName" : "BOOKID",
+      "dBType" : "MYSQL5",
+      "name" : "BOOKID",
+      "queryCodeExp" : "t1.`BOOKID`",
+      "standardColumnName" : "`BOOKID`"
+    } ],
+    "getAllPSDEFSearchModes" : [ {
+      "codeName" : "N_BOOKID_EQ",
+      "name" : "N_BOOKID_EQ",
+      "stdDataType" : 25,
+      "valueOP" : "EQ"
+    } ],
+    "getAllPSDEFUIModes" : [ {
+      "codeName" : "MobileDefault",
+      "name" : "[BOOKID][书标识]移动端默认",
+      "getPSDEFFormItem" : {
+        "codeName" : "MobileDefault",
+        "editorType" : "HIDDEN",
+        "name" : "[BOOKID][书标识]移动端默认",
+        "getRefPSDataEntity" : {
+          "modelref" : true,
+          "path" : "PSMODULES/common/PSDATAENTITIES/Book.json"
+        },
+        "stringLength" : 100,
+        "uIMode" : "MOBILEDEFAULT",
+        "mobileMode" : true
+      },
+      "type" : "MOBILEDEFAULT",
+      "mobileMode" : true
+    }, {
+      "codeName" : "Default",
+      "name" : "[BOOKID][书标识]",
+      "getPSDEFFormItem" : {
+        "codeName" : "Default",
+        "editorType" : "HIDDEN",
+        "name" : "[BOOKID][书标识]",
+        "getRefPSDataEntity" : {
+          "modelref" : true,
+          "path" : "PSMODULES/common/PSDATAENTITIES/Book.json"
+        },
+        "stringLength" : 100,
+        "uIMode" : "DEFAULT"
+      },
+      "type" : "DEFAULT"
+    } ],
+    "getAllPSDEFValueRules" : [ {
+      "codeName" : "Default",
+      "name" : "默认规则",
+      "getPSDEFVRGroupCondition" : {
+        "condOp" : "AND",
+        "condType" : "GROUP",
+        "name" : "默认组",
+        "getPSDEFVRConditions" : [ {
+          "condType" : "STRINGLENGTH",
+          "dEFName" : "BOOKID",
+          "maxValue" : 100,
+          "name" : "默认字符串长度",
+          "ruleInfo" : "内容长度必须小于等于[100]",
+          "includeMaxValue" : true,
+          "includeMinValue" : false,
+          "keyCond" : true
+        } ],
+        "ruleInfo" : "内容长度必须小于等于[100]"
+      },
+      "ruleInfo" : "内容长度必须小于等于[100]",
+      "checkDefault" : true,
+      "defaultMode" : true,
+      "enableBackend" : true,
+      "enableFront" : true
+    } ],
+    "codeName" : "BookId",
+    "dEFType" : 1,
+    "dataType" : "PICKUP",
+    "importOrder" : 1000,
+    "length" : 100,
+    "logicName" : "书标识",
+    "name" : "BOOKID",
+    "getPSDEDBTable" : {
+      "modelref" : true,
+      "id" : "Table"
+    },
+    "getPSDER" : {
+      "modelref" : true,
+      "path" : "PSMODULES/Test/PSDATAENTITIES/BOOKCHILD2/PSDERS/DER1N_BOOKCHILD2_BOOK_BOOKID.json"
+    },
+    "getPSSysDBColumn" : {
+      "modelref" : true,
+      "id" : "BOOKID"
+    },
+    "getRealPSDEField" : {
+      "name" : "BOOKID",
+      "codeName" : "BookId"
+    },
+    "getRealPSDataEntity" : {
+      "modelref" : true,
+      "path" : "PSMODULES/common/PSDATAENTITIES/Book.json"
+    },
+    "getRelatedPSDEField" : {
+      "name" : "BOOKID",
+      "codeName" : "BookId"
+    },
+    "getRelatedPSDataEntity" : {
+      "modelref" : true,
+      "path" : "PSMODULES/common/PSDATAENTITIES/Book.json"
+    },
+    "serviceCodeName" : "BookId",
+    "stdDataType" : 25,
+    "stringLength" : 100,
+    "valueFormat" : "%1$s",
+    "linkDEField" : true
   } ],
   "getAllPSDEMethodDTOs" : [ {
     "name" : "BOOKCHILD2DTO",
     "getPSDEMethodDTOFields" : [ {
+      "logicName" : "类型",
+      "name" : "TYPE",
+      "getPSDEField" : {
+        "name" : "TYPE",
+        "codeName" : "TYPE"
+      },
+      "sourceType" : "DEFIELD",
+      "stdDataType" : 25,
+      "stringLength" : 100,
+      "type" : "SIMPLE"
+    }, {
       "logicName" : "图书子2标识",
       "name" : "BOOKCHILD2Id",
       "getPSDEField" : {
@@ -942,6 +1152,17 @@
       "stdDataType" : 25,
       "stringLength" : 200,
       "type" : "SIMPLE"
+    }, {
+      "logicName" : "书标识",
+      "name" : "BookId",
+      "getPSDEField" : {
+        "name" : "BOOKID",
+        "codeName" : "BookId"
+      },
+      "sourceType" : "DEFIELD",
+      "stdDataType" : 25,
+      "stringLength" : 100,
+      "type" : "SIMPLE"
     }, {
       "jsonFormat" : "yyyy-MM-dd HH:mm:ss",
       "logicName" : "建立时间",
@@ -1028,6 +1249,20 @@
       "sourceType" : "DEFSEARCHMODE",
       "stdDataType" : 25,
       "type" : "SIMPLE"
+    }, {
+      "logicName" : "书标识",
+      "name" : "N_BOOKID_EQ",
+      "getPSDEFSearchMode" : {
+        "modelref" : true,
+        "id" : "N_BOOKID_EQ"
+      },
+      "getPSDEField" : {
+        "name" : "BOOKID",
+        "codeName" : "BookId"
+      },
+      "sourceType" : "DEFSEARCHMODE",
+      "stdDataType" : 25,
+      "type" : "SIMPLE"
     } ],
     "sourceType" : "DE",
     "type" : "DEFILTER",
@@ -1146,6 +1381,34 @@
     "name" : "BOOKCHILD2NAME",
     "codeName" : "BOOKCHILD2Name"
   },
+  "getMinorPSDERs" : [ {
+    "codeName" : "Book",
+    "dERType" : "DER1N",
+    "dynaModelFilePath" : "PSMODULES/Test/PSDATAENTITIES/BOOKCHILD2/PSDERS/DER1N_BOOKCHILD2_BOOK_BOOKID.json",
+    "fKeyName" : "F2C85F2E6C26B56512",
+    "logicName" : "名称",
+    "getMajorPSDataEntity" : {
+      "modelref" : true,
+      "path" : "PSMODULES/common/PSDATAENTITIES/Book.json"
+    },
+    "masterOrder" : -1,
+    "masterRS" : 0,
+    "minorCodeName" : "BOOKCHILD2s",
+    "getMinorPSDataEntity" : {
+      "modelref" : true,
+      "path" : "PSMODULES/Test/PSDATAENTITIES/BOOKCHILD2.json"
+    },
+    "name" : "DER1N_BOOKCHILD2_BOOK_BOOKID",
+    "orderValue" : 100,
+    "getPSPickupDEField" : {
+      "name" : "BOOKID",
+      "codeName" : "BookId"
+    },
+    "pickupDEFName" : "BOOKID",
+    "removeActionType" : -1,
+    "removeOrder" : 0,
+    "enableFKey" : true
+  } ],
   "name" : "BOOKCHILD2",
   "getPSSysDBScheme" : {
     "modelref" : true,

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/BOOKCHILD2/PSDEDATAQUERIES/Default/PSDEDQCODES/MYSQL5.json

@@ -7,12 +7,18 @@
   }, {
     "expression" : "t1.`BOOKCHILD2NAME`",
     "name" : "BOOKCHILD2NAME"
+  }, {
+    "expression" : "t1.`BOOKID`",
+    "name" : "BOOKID"
   }, {
     "expression" : "t1.`CREATEDATE`",
     "name" : "CREATEDATE"
   }, {
     "expression" : "t1.`CREATEMAN`",
     "name" : "CREATEMAN"
+  }, {
+    "expression" : "t1.`TYPE`",
+    "name" : "TYPE"
   }, {
     "expression" : "t1.`UPDATEDATE`",
     "name" : "UPDATEDATE"
@@ -20,6 +26,6 @@
     "expression" : "t1.`UPDATEMAN`",
     "name" : "UPDATEMAN"
   } ],
-  "queryCode" : "SELECT\nt1.`BOOKCHILD2ID`,\nt1.`BOOKCHILD2NAME`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_BOOKCHILD2` t1 \n",
+  "queryCode" : "SELECT\nt1.`BOOKCHILD2ID`,\nt1.`BOOKCHILD2NAME`,\nt1.`BOOKID`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`TYPE`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_BOOKCHILD2` t1 \n",
   "id" : "PSMODULES/Test/PSDATAENTITIES/BOOKCHILD2/PSDEDATAQUERIES/Default/PSDEDQCODES/MYSQL5.json"
 }
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/BOOKCHILD2/PSDEDATAQUERIES/View/PSDEDQCODES/MYSQL5.json

@@ -7,12 +7,18 @@
   }, {
     "expression" : "t1.`BOOKCHILD2NAME`",
     "name" : "BOOKCHILD2NAME"
+  }, {
+    "expression" : "t1.`BOOKID`",
+    "name" : "BOOKID"
   }, {
     "expression" : "t1.`CREATEDATE`",
     "name" : "CREATEDATE"
   }, {
     "expression" : "t1.`CREATEMAN`",
     "name" : "CREATEMAN"
+  }, {
+    "expression" : "t1.`TYPE`",
+    "name" : "TYPE"
   }, {
     "expression" : "t1.`UPDATEDATE`",
     "name" : "UPDATEDATE"
@@ -20,6 +26,6 @@
     "expression" : "t1.`UPDATEMAN`",
     "name" : "UPDATEMAN"
   } ],
-  "queryCode" : "SELECT\nt1.`BOOKCHILD2ID`,\nt1.`BOOKCHILD2NAME`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_BOOKCHILD2` t1 \n",
+  "queryCode" : "SELECT\nt1.`BOOKCHILD2ID`,\nt1.`BOOKCHILD2NAME`,\nt1.`BOOKID`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`TYPE`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_BOOKCHILD2` t1 \n",
   "id" : "PSMODULES/Test/PSDATAENTITIES/BOOKCHILD2/PSDEDATAQUERIES/View/PSDEDQCODES/MYSQL5.json"
 }
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/BOOKCHILD2/PSDERS/DER1N_BOOKCHILD2_BOOK_BOOKID.json

+{
+  "codeName" : "Book",
+  "dERType" : "DER1N",
+  "dynaModelFilePath" : "PSMODULES/Test/PSDATAENTITIES/BOOKCHILD2/PSDERS/DER1N_BOOKCHILD2_BOOK_BOOKID.json",
+  "fKeyName" : "F2C85F2E6C26B56512",
+  "logicName" : "名称",
+  "getMajorPSDataEntity" : {
+    "modelref" : true,
+    "path" : "PSMODULES/common/PSDATAENTITIES/Book.json"
+  },
+  "masterOrder" : -1,
+  "masterRS" : 0,
+  "minorCodeName" : "BOOKCHILD2s",
+  "getMinorPSDataEntity" : {
+    "modelref" : true,
+    "path" : "PSMODULES/Test/PSDATAENTITIES/BOOKCHILD2.json"
+  },
+  "name" : "DER1N_BOOKCHILD2_BOOK_BOOKID",
+  "orderValue" : 100,
+  "getPSPickupDEField" : {
+    "name" : "BOOKID",
+    "codeName" : "BookId"
+  },
+  "pickupDEFName" : "BOOKID",
+  "removeActionType" : -1,
+  "removeOrder" : 0,
+  "enableFKey" : true
+}
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/BOOKCHILD3.json

@@ -184,6 +184,9 @@
   } ],
   "getAllPSDEDBTables" : [ {
     "getAllPSDEFields" : [ {
+      "name" : "TYPE",
+      "codeName" : "TYPE"
+    }, {
       "name" : "BOOKCHILD3ID",
       "codeName" : "BOOKCHILD3Id"
     }, {
@@ -201,6 +204,9 @@
     }, {
       "name" : "UPDATEMAN",
       "codeName" : "UpdateMan"
+    }, {
+      "name" : "BOOKID",
+      "codeName" : "BookId"
     } ],
     "codeName" : "Table",
     "name" : "T_BOOKCHILD3",
@@ -306,6 +312,87 @@
     "enableFront" : true
   } ],
   "getAllPSDEFields" : [ {
+    "getAllPSDEFDTColumns" : [ {
+      "columnName" : "TYPE",
+      "dBType" : "MYSQL5",
+      "name" : "TYPE",
+      "queryCodeExp" : "t1.`TYPE`",
+      "standardColumnName" : "`TYPE`"
+    } ],
+    "getAllPSDEFUIModes" : [ {
+      "codeName" : "MobileDefault",
+      "name" : "[TYPE][类型]移动端默认",
+      "getPSDEFFormItem" : {
+        "codeName" : "MobileDefault",
+        "editorType" : "MOBTEXT",
+        "name" : "[TYPE][类型]移动端默认",
+        "stringLength" : 100,
+        "uIMode" : "MOBILEDEFAULT",
+        "mobileMode" : true
+      },
+      "type" : "MOBILEDEFAULT",
+      "mobileMode" : true
+    }, {
+      "codeName" : "Default",
+      "name" : "[TYPE][类型]",
+      "getPSDEFFormItem" : {
+        "codeName" : "Default",
+        "editorType" : "TEXTBOX",
+        "name" : "[TYPE][类型]",
+        "stringLength" : 100,
+        "uIMode" : "DEFAULT"
+      },
+      "type" : "DEFAULT"
+    } ],
+    "getAllPSDEFValueRules" : [ {
+      "codeName" : "Default",
+      "name" : "默认规则",
+      "getPSDEFVRGroupCondition" : {
+        "condOp" : "AND",
+        "condType" : "GROUP",
+        "name" : "默认组",
+        "getPSDEFVRConditions" : [ {
+          "condType" : "STRINGLENGTH",
+          "dEFName" : "TYPE",
+          "maxValue" : 100,
+          "name" : "默认字符串长度",
+          "ruleInfo" : "内容长度必须小于等于[100]",
+          "includeMaxValue" : true,
+          "includeMinValue" : false,
+          "keyCond" : true
+        } ],
+        "ruleInfo" : "内容长度必须小于等于[100]"
+      },
+      "ruleInfo" : "内容长度必须小于等于[100]",
+      "checkDefault" : true,
+      "defaultMode" : true,
+      "enableBackend" : true,
+      "enableFront" : true
+    } ],
+    "codeName" : "TYPE",
+    "dEFType" : 1,
+    "dataType" : "TEXT",
+    "importOrder" : 1000,
+    "length" : 100,
+    "logicName" : "类型",
+    "name" : "TYPE",
+    "getPSCodeList" : {
+      "modelref" : true,
+      "path" : "PSMODULES/ModelRepository/PSCODELISTS/CodeList44.json"
+    },
+    "getPSDEDBTable" : {
+      "modelref" : true,
+      "id" : "Table"
+    },
+    "getPSSysDBColumn" : {
+      "modelref" : true,
+      "id" : "TYPE"
+    },
+    "serviceCodeName" : "TYPE",
+    "stdDataType" : 25,
+    "stringLength" : 100,
+    "valueFormat" : "%1$s"
+  }, {
     "getAllPSDEFDTColumns" : [ {
       "columnName" : "BOOKCHILD3ID",
       "dBType" : "MYSQL5",
@@ -916,10 +1003,133 @@
     "valueFormat" : "%1$s",
     "allowEmpty" : false,
     "systemReserver" : true
+  }, {
+    "getAllPSDEFDTColumns" : [ {
+      "columnName" : "BOOKID",
+      "dBType" : "MYSQL5",
+      "name" : "BOOKID",
+      "queryCodeExp" : "t1.`BOOKID`",
+      "standardColumnName" : "`BOOKID`"
+    } ],
+    "getAllPSDEFSearchModes" : [ {
+      "codeName" : "N_BOOKID_EQ",
+      "name" : "N_BOOKID_EQ",
+      "stdDataType" : 25,
+      "valueOP" : "EQ"
+    } ],
+    "getAllPSDEFUIModes" : [ {
+      "codeName" : "Default",
+      "name" : "[BOOKID][书标识]",
+      "getPSDEFFormItem" : {
+        "codeName" : "Default",
+        "editorType" : "HIDDEN",
+        "name" : "[BOOKID][书标识]",
+        "getRefPSDataEntity" : {
+          "modelref" : true,
+          "path" : "PSMODULES/common/PSDATAENTITIES/Book.json"
+        },
+        "stringLength" : 100,
+        "uIMode" : "DEFAULT"
+      },
+      "type" : "DEFAULT"
+    }, {
+      "codeName" : "MobileDefault",
+      "name" : "[BOOKID][书标识]移动端默认",
+      "getPSDEFFormItem" : {
+        "codeName" : "MobileDefault",
+        "editorType" : "HIDDEN",
+        "name" : "[BOOKID][书标识]移动端默认",
+        "getRefPSDataEntity" : {
+          "modelref" : true,
+          "path" : "PSMODULES/common/PSDATAENTITIES/Book.json"
+        },
+        "stringLength" : 100,
+        "uIMode" : "MOBILEDEFAULT",
+        "mobileMode" : true
+      },
+      "type" : "MOBILEDEFAULT",
+      "mobileMode" : true
+    } ],
+    "getAllPSDEFValueRules" : [ {
+      "codeName" : "Default",
+      "name" : "默认规则",
+      "getPSDEFVRGroupCondition" : {
+        "condOp" : "AND",
+        "condType" : "GROUP",
+        "name" : "默认组",
+        "getPSDEFVRConditions" : [ {
+          "condType" : "STRINGLENGTH",
+          "dEFName" : "BOOKID",
+          "maxValue" : 100,
+          "name" : "默认字符串长度",
+          "ruleInfo" : "内容长度必须小于等于[100]",
+          "includeMaxValue" : true,
+          "includeMinValue" : false,
+          "keyCond" : true
+        } ],
+        "ruleInfo" : "内容长度必须小于等于[100]"
+      },
+      "ruleInfo" : "内容长度必须小于等于[100]",
+      "checkDefault" : true,
+      "defaultMode" : true,
+      "enableBackend" : true,
+      "enableFront" : true
+    } ],
+    "codeName" : "BookId",
+    "dEFType" : 1,
+    "dataType" : "PICKUP",
+    "importOrder" : 1000,
+    "length" : 100,
+    "logicName" : "书标识",
+    "name" : "BOOKID",
+    "getPSDEDBTable" : {
+      "modelref" : true,
+      "id" : "Table"
+    },
+    "getPSDER" : {
+      "modelref" : true,
+      "path" : "PSMODULES/Test/PSDATAENTITIES/BOOKCHILD3/PSDERS/DER1N_BOOKCHILD3_BOOK_BOOKID.json"
+    },
+    "getPSSysDBColumn" : {
+      "modelref" : true,
+      "id" : "BOOKID"
+    },
+    "getRealPSDEField" : {
+      "name" : "BOOKID",
+      "codeName" : "BookId"
+    },
+    "getRealPSDataEntity" : {
+      "modelref" : true,
+      "path" : "PSMODULES/common/PSDATAENTITIES/Book.json"
+    },
+    "getRelatedPSDEField" : {
+      "name" : "BOOKID",
+      "codeName" : "BookId"
+    },
+    "getRelatedPSDataEntity" : {
+      "modelref" : true,
+      "path" : "PSMODULES/common/PSDATAENTITIES/Book.json"
+    },
+    "serviceCodeName" : "BookId",
+    "stdDataType" : 25,
+    "stringLength" : 100,
+    "valueFormat" : "%1$s",
+    "linkDEField" : true
   } ],
   "getAllPSDEMethodDTOs" : [ {
     "name" : "BOOKCHILD3DTO",
     "getPSDEMethodDTOFields" : [ {
+      "logicName" : "类型",
+      "name" : "TYPE",
+      "getPSDEField" : {
+        "name" : "TYPE",
+        "codeName" : "TYPE"
+      },
+      "sourceType" : "DEFIELD",
+      "stdDataType" : 25,
+      "stringLength" : 100,
+      "type" : "SIMPLE"
+    }, {
       "logicName" : "图书子3标识",
       "name" : "BOOKCHILD3Id",
       "getPSDEField" : {
@@ -942,6 +1152,17 @@
       "stdDataType" : 25,
       "stringLength" : 200,
       "type" : "SIMPLE"
+    }, {
+      "logicName" : "书标识",
+      "name" : "BookId",
+      "getPSDEField" : {
+        "name" : "BOOKID",
+        "codeName" : "BookId"
+      },
+      "sourceType" : "DEFIELD",
+      "stdDataType" : 25,
+      "stringLength" : 100,
+      "type" : "SIMPLE"
     }, {
       "jsonFormat" : "yyyy-MM-dd HH:mm:ss",
       "logicName" : "建立时间",
@@ -1028,6 +1249,20 @@
       "sourceType" : "DEFSEARCHMODE",
       "stdDataType" : 25,
       "type" : "SIMPLE"
+    }, {
+      "logicName" : "书标识",
+      "name" : "N_BOOKID_EQ",
+      "getPSDEFSearchMode" : {
+        "modelref" : true,
+        "id" : "N_BOOKID_EQ"
+      },
+      "getPSDEField" : {
+        "name" : "BOOKID",
+        "codeName" : "BookId"
+      },
+      "sourceType" : "DEFSEARCHMODE",
+      "stdDataType" : 25,
+      "type" : "SIMPLE"
     } ],
     "sourceType" : "DE",
     "type" : "DEFILTER",
@@ -1146,6 +1381,34 @@
     "name" : "BOOKCHILD3NAME",
     "codeName" : "BOOKCHILD3Name"
   },
+  "getMinorPSDERs" : [ {
+    "codeName" : "Book",
+    "dERType" : "DER1N",
+    "dynaModelFilePath" : "PSMODULES/Test/PSDATAENTITIES/BOOKCHILD3/PSDERS/DER1N_BOOKCHILD3_BOOK_BOOKID.json",
+    "fKeyName" : "F8B53D24CCB0E6DEC9",
+    "logicName" : "名称",
+    "getMajorPSDataEntity" : {
+      "modelref" : true,
+      "path" : "PSMODULES/common/PSDATAENTITIES/Book.json"
+    },
+    "masterOrder" : -1,
+    "masterRS" : 0,
+    "minorCodeName" : "BOOKCHILD3s",
+    "getMinorPSDataEntity" : {
+      "modelref" : true,
+      "path" : "PSMODULES/Test/PSDATAENTITIES/BOOKCHILD3.json"
+    },
+    "name" : "DER1N_BOOKCHILD3_BOOK_BOOKID",
+    "orderValue" : 100,
+    "getPSPickupDEField" : {
+      "name" : "BOOKID",
+      "codeName" : "BookId"
+    },
+    "pickupDEFName" : "BOOKID",
+    "removeActionType" : -1,
+    "removeOrder" : 0,
+    "enableFKey" : true
+  } ],
   "name" : "BOOKCHILD3",
   "getPSSysDBScheme" : {
     "modelref" : true,

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/BOOKCHILD3/PSDEDATAQUERIES/Default/PSDEDQCODES/MYSQL5.json

@@ -7,12 +7,18 @@
   }, {
     "expression" : "t1.`BOOKCHILD3NAME`",
     "name" : "BOOKCHILD3NAME"
+  }, {
+    "expression" : "t1.`BOOKID`",
+    "name" : "BOOKID"
   }, {
     "expression" : "t1.`CREATEDATE`",
     "name" : "CREATEDATE"
   }, {
     "expression" : "t1.`CREATEMAN`",
     "name" : "CREATEMAN"
+  }, {
+    "expression" : "t1.`TYPE`",
+    "name" : "TYPE"
   }, {
     "expression" : "t1.`UPDATEDATE`",
     "name" : "UPDATEDATE"
@@ -20,6 +26,6 @@
     "expression" : "t1.`UPDATEMAN`",
     "name" : "UPDATEMAN"
   } ],
-  "queryCode" : "SELECT\nt1.`BOOKCHILD3ID`,\nt1.`BOOKCHILD3NAME`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_BOOKCHILD3` t1 \n",
+  "queryCode" : "SELECT\nt1.`BOOKCHILD3ID`,\nt1.`BOOKCHILD3NAME`,\nt1.`BOOKID`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`TYPE`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_BOOKCHILD3` t1 \n",
   "id" : "PSMODULES/Test/PSDATAENTITIES/BOOKCHILD3/PSDEDATAQUERIES/Default/PSDEDQCODES/MYSQL5.json"
 }
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/BOOKCHILD3/PSDEDATAQUERIES/View/PSDEDQCODES/MYSQL5.json

@@ -7,12 +7,18 @@
   }, {
     "expression" : "t1.`BOOKCHILD3NAME`",
     "name" : "BOOKCHILD3NAME"
+  }, {
+    "expression" : "t1.`BOOKID`",
+    "name" : "BOOKID"
   }, {
     "expression" : "t1.`CREATEDATE`",
     "name" : "CREATEDATE"
   }, {
     "expression" : "t1.`CREATEMAN`",
     "name" : "CREATEMAN"
+  }, {
+    "expression" : "t1.`TYPE`",
+    "name" : "TYPE"
   }, {
     "expression" : "t1.`UPDATEDATE`",
     "name" : "UPDATEDATE"
@@ -20,6 +26,6 @@
     "expression" : "t1.`UPDATEMAN`",
     "name" : "UPDATEMAN"
   } ],
-  "queryCode" : "SELECT\nt1.`BOOKCHILD3ID`,\nt1.`BOOKCHILD3NAME`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_BOOKCHILD3` t1 \n",
+  "queryCode" : "SELECT\nt1.`BOOKCHILD3ID`,\nt1.`BOOKCHILD3NAME`,\nt1.`BOOKID`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`TYPE`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_BOOKCHILD3` t1 \n",
   "id" : "PSMODULES/Test/PSDATAENTITIES/BOOKCHILD3/PSDEDATAQUERIES/View/PSDEDQCODES/MYSQL5.json"
 }
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/BOOKCHILD3/PSDERS/DER1N_BOOKCHILD3_BOOK_BOOKID.json

+{
+  "codeName" : "Book",
+  "dERType" : "DER1N",
+  "dynaModelFilePath" : "PSMODULES/Test/PSDATAENTITIES/BOOKCHILD3/PSDERS/DER1N_BOOKCHILD3_BOOK_BOOKID.json",
+  "fKeyName" : "F8B53D24CCB0E6DEC9",
+  "logicName" : "名称",
+  "getMajorPSDataEntity" : {
+    "modelref" : true,
+    "path" : "PSMODULES/common/PSDATAENTITIES/Book.json"
+  },
+  "masterOrder" : -1,
+  "masterRS" : 0,
+  "minorCodeName" : "BOOKCHILD3s",
+  "getMinorPSDataEntity" : {
+    "modelref" : true,
+    "path" : "PSMODULES/Test/PSDATAENTITIES/BOOKCHILD3.json"
+  },
+  "name" : "DER1N_BOOKCHILD3_BOOK_BOOKID",
+  "orderValue" : 100,
+  "getPSPickupDEField" : {
+    "name" : "BOOKID",
+    "codeName" : "BookId"
+  },
+  "pickupDEFName" : "BOOKID",
+  "removeActionType" : -1,
+  "removeOrder" : 0,
+  "enableFKey" : true
+}
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/BOOKCHILD4.json

@@ -184,6 +184,9 @@
   } ],
   "getAllPSDEDBTables" : [ {
     "getAllPSDEFields" : [ {
+      "name" : "TYPE",
+      "codeName" : "TYPE"
+    }, {
       "name" : "BOOKCHILD4ID",
       "codeName" : "BOOKCHILD4Id"
     }, {
@@ -201,6 +204,9 @@
     }, {
       "name" : "CREATEMAN",
       "codeName" : "CreateMan"
+    }, {
+      "name" : "BOOKID",
+      "codeName" : "BookId"
     } ],
     "codeName" : "Table",
     "name" : "T_BOOKCHILD4",
@@ -306,6 +312,87 @@
     "enableFront" : true
   } ],
   "getAllPSDEFields" : [ {
+    "getAllPSDEFDTColumns" : [ {
+      "columnName" : "TYPE",
+      "dBType" : "MYSQL5",
+      "name" : "TYPE",
+      "queryCodeExp" : "t1.`TYPE`",
+      "standardColumnName" : "`TYPE`"
+    } ],
+    "getAllPSDEFUIModes" : [ {
+      "codeName" : "Default",
+      "name" : "[TYPE][类型]",
+      "getPSDEFFormItem" : {
+        "codeName" : "Default",
+        "editorType" : "TEXTBOX",
+        "name" : "[TYPE][类型]",
+        "stringLength" : 100,
+        "uIMode" : "DEFAULT"
+      },
+      "type" : "DEFAULT"
+    }, {
+      "codeName" : "MobileDefault",
+      "name" : "[TYPE][类型]移动端默认",
+      "getPSDEFFormItem" : {
+        "codeName" : "MobileDefault",
+        "editorType" : "MOBTEXT",
+        "name" : "[TYPE][类型]移动端默认",
+        "stringLength" : 100,
+        "uIMode" : "MOBILEDEFAULT",
+        "mobileMode" : true
+      },
+      "type" : "MOBILEDEFAULT",
+      "mobileMode" : true
+    } ],
+    "getAllPSDEFValueRules" : [ {
+      "codeName" : "Default",
+      "name" : "默认规则",
+      "getPSDEFVRGroupCondition" : {
+        "condOp" : "AND",
+        "condType" : "GROUP",
+        "name" : "默认组",
+        "getPSDEFVRConditions" : [ {
+          "condType" : "STRINGLENGTH",
+          "dEFName" : "TYPE",
+          "maxValue" : 100,
+          "name" : "默认字符串长度",
+          "ruleInfo" : "内容长度必须小于等于[100]",
+          "includeMaxValue" : true,
+          "includeMinValue" : false,
+          "keyCond" : true
+        } ],
+        "ruleInfo" : "内容长度必须小于等于[100]"
+      },
+      "ruleInfo" : "内容长度必须小于等于[100]",
+      "checkDefault" : true,
+      "defaultMode" : true,
+      "enableBackend" : true,
+      "enableFront" : true
+    } ],
+    "codeName" : "TYPE",
+    "dEFType" : 1,
+    "dataType" : "TEXT",
+    "importOrder" : 1000,
+    "length" : 100,
+    "logicName" : "类型",
+    "name" : "TYPE",
+    "getPSCodeList" : {
+      "modelref" : true,
+      "path" : "PSMODULES/ModelRepository/PSCODELISTS/CodeList44.json"
+    },
+    "getPSDEDBTable" : {
+      "modelref" : true,
+      "id" : "Table"
+    },
+    "getPSSysDBColumn" : {
+      "modelref" : true,
+      "id" : "TYPE"
+    },
+    "serviceCodeName" : "TYPE",
+    "stdDataType" : 25,
+    "stringLength" : 100,
+    "valueFormat" : "%1$s"
+  }, {
     "getAllPSDEFDTColumns" : [ {
       "columnName" : "BOOKCHILD4ID",
       "dBType" : "MYSQL5",
@@ -916,10 +1003,133 @@
     "valueFormat" : "%1$s",
     "allowEmpty" : false,
     "systemReserver" : true
+  }, {
+    "getAllPSDEFDTColumns" : [ {
+      "columnName" : "BOOKID",
+      "dBType" : "MYSQL5",
+      "name" : "BOOKID",
+      "queryCodeExp" : "t1.`BOOKID`",
+      "standardColumnName" : "`BOOKID`"
+    } ],
+    "getAllPSDEFSearchModes" : [ {
+      "codeName" : "N_BOOKID_EQ",
+      "name" : "N_BOOKID_EQ",
+      "stdDataType" : 25,
+      "valueOP" : "EQ"
+    } ],
+    "getAllPSDEFUIModes" : [ {
+      "codeName" : "Default",
+      "name" : "[BOOKID][书标识]",
+      "getPSDEFFormItem" : {
+        "codeName" : "Default",
+        "editorType" : "HIDDEN",
+        "name" : "[BOOKID][书标识]",
+        "getRefPSDataEntity" : {
+          "modelref" : true,
+          "path" : "PSMODULES/common/PSDATAENTITIES/Book.json"
+        },
+        "stringLength" : 100,
+        "uIMode" : "DEFAULT"
+      },
+      "type" : "DEFAULT"
+    }, {
+      "codeName" : "MobileDefault",
+      "name" : "[BOOKID][书标识]移动端默认",
+      "getPSDEFFormItem" : {
+        "codeName" : "MobileDefault",
+        "editorType" : "HIDDEN",
+        "name" : "[BOOKID][书标识]移动端默认",
+        "getRefPSDataEntity" : {
+          "modelref" : true,
+          "path" : "PSMODULES/common/PSDATAENTITIES/Book.json"
+        },
+        "stringLength" : 100,
+        "uIMode" : "MOBILEDEFAULT",
+        "mobileMode" : true
+      },
+      "type" : "MOBILEDEFAULT",
+      "mobileMode" : true
+    } ],
+    "getAllPSDEFValueRules" : [ {
+      "codeName" : "Default",
+      "name" : "默认规则",
+      "getPSDEFVRGroupCondition" : {
+        "condOp" : "AND",
+        "condType" : "GROUP",
+        "name" : "默认组",
+        "getPSDEFVRConditions" : [ {
+          "condType" : "STRINGLENGTH",
+          "dEFName" : "BOOKID",
+          "maxValue" : 100,
+          "name" : "默认字符串长度",
+          "ruleInfo" : "内容长度必须小于等于[100]",
+          "includeMaxValue" : true,
+          "includeMinValue" : false,
+          "keyCond" : true
+        } ],
+        "ruleInfo" : "内容长度必须小于等于[100]"
+      },
+      "ruleInfo" : "内容长度必须小于等于[100]",
+      "checkDefault" : true,
+      "defaultMode" : true,
+      "enableBackend" : true,
+      "enableFront" : true
+    } ],
+    "codeName" : "BookId",
+    "dEFType" : 1,
+    "dataType" : "PICKUP",
+    "importOrder" : 1000,
+    "length" : 100,
+    "logicName" : "书标识",
+    "name" : "BOOKID",
+    "getPSDEDBTable" : {
+      "modelref" : true,
+      "id" : "Table"
+    },
+    "getPSDER" : {
+      "modelref" : true,
+      "path" : "PSMODULES/Test/PSDATAENTITIES/BOOKCHILD4/PSDERS/DER1N_BOOKCHILD4_BOOK_BOOKID.json"
+    },
+    "getPSSysDBColumn" : {
+      "modelref" : true,
+      "id" : "BOOKID"
+    },
+    "getRealPSDEField" : {
+      "name" : "BOOKID",
+      "codeName" : "BookId"
+    },
+    "getRealPSDataEntity" : {
+      "modelref" : true,
+      "path" : "PSMODULES/common/PSDATAENTITIES/Book.json"
+    },
+    "getRelatedPSDEField" : {
+      "name" : "BOOKID",
+      "codeName" : "BookId"
+    },
+    "getRelatedPSDataEntity" : {
+      "modelref" : true,
+      "path" : "PSMODULES/common/PSDATAENTITIES/Book.json"
+    },
+    "serviceCodeName" : "BookId",
+    "stdDataType" : 25,
+    "stringLength" : 100,
+    "valueFormat" : "%1$s",
+    "linkDEField" : true
   } ],
   "getAllPSDEMethodDTOs" : [ {
     "name" : "BOOKCHILD4DTO",
     "getPSDEMethodDTOFields" : [ {
+      "logicName" : "类型",
+      "name" : "TYPE",
+      "getPSDEField" : {
+        "name" : "TYPE",
+        "codeName" : "TYPE"
+      },
+      "sourceType" : "DEFIELD",
+      "stdDataType" : 25,
+      "stringLength" : 100,
+      "type" : "SIMPLE"
+    }, {
       "logicName" : "图书子4标识",
       "name" : "BOOKCHILD4Id",
       "getPSDEField" : {
@@ -942,6 +1152,17 @@
       "stdDataType" : 25,
       "stringLength" : 200,
       "type" : "SIMPLE"
+    }, {
+      "logicName" : "书标识",
+      "name" : "BookId",
+      "getPSDEField" : {
+        "name" : "BOOKID",
+        "codeName" : "BookId"
+      },
+      "sourceType" : "DEFIELD",
+      "stdDataType" : 25,
+      "stringLength" : 100,
+      "type" : "SIMPLE"
     }, {
       "jsonFormat" : "yyyy-MM-dd HH:mm:ss",
       "logicName" : "建立时间",
@@ -1028,6 +1249,20 @@
       "sourceType" : "DEFSEARCHMODE",
       "stdDataType" : 25,
       "type" : "SIMPLE"
+    }, {
+      "logicName" : "书标识",
+      "name" : "N_BOOKID_EQ",
+      "getPSDEFSearchMode" : {
+        "modelref" : true,
+        "id" : "N_BOOKID_EQ"
+      },
+      "getPSDEField" : {
+        "name" : "BOOKID",
+        "codeName" : "BookId"
+      },
+      "sourceType" : "DEFSEARCHMODE",
+      "stdDataType" : 25,
+      "type" : "SIMPLE"
     } ],
     "sourceType" : "DE",
     "type" : "DEFILTER",
@@ -1146,6 +1381,34 @@
     "name" : "BOOKCHILD4NAME",
     "codeName" : "BOOKCHILD4Name"
   },
+  "getMinorPSDERs" : [ {
+    "codeName" : "Book",
+    "dERType" : "DER1N",
+    "dynaModelFilePath" : "PSMODULES/Test/PSDATAENTITIES/BOOKCHILD4/PSDERS/DER1N_BOOKCHILD4_BOOK_BOOKID.json",
+    "fKeyName" : "F6A37F53FFC9C84A42",
+    "logicName" : "名称",
+    "getMajorPSDataEntity" : {
+      "modelref" : true,
+      "path" : "PSMODULES/common/PSDATAENTITIES/Book.json"
+    },
+    "masterOrder" : -1,
+    "masterRS" : 0,
+    "minorCodeName" : "BOOKCHILD4s",
+    "getMinorPSDataEntity" : {
+      "modelref" : true,
+      "path" : "PSMODULES/Test/PSDATAENTITIES/BOOKCHILD4.json"
+    },
+    "name" : "DER1N_BOOKCHILD4_BOOK_BOOKID",
+    "orderValue" : 100,
+    "getPSPickupDEField" : {
+      "name" : "BOOKID",
+      "codeName" : "BookId"
+    },
+    "pickupDEFName" : "BOOKID",
+    "removeActionType" : -1,
+    "removeOrder" : 0,
+    "enableFKey" : true
+  } ],
   "name" : "BOOKCHILD4",
   "getPSSysDBScheme" : {
     "modelref" : true,

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/BOOKCHILD4/PSDEDATAQUERIES/Default/PSDEDQCODES/MYSQL5.json

@@ -7,12 +7,18 @@
   }, {
     "expression" : "t1.`BOOKCHILD4NAME`",
     "name" : "BOOKCHILD4NAME"
+  }, {
+    "expression" : "t1.`BOOKID`",
+    "name" : "BOOKID"
   }, {
     "expression" : "t1.`CREATEDATE`",
     "name" : "CREATEDATE"
   }, {
     "expression" : "t1.`CREATEMAN`",
     "name" : "CREATEMAN"
+  }, {
+    "expression" : "t1.`TYPE`",
+    "name" : "TYPE"
   }, {
     "expression" : "t1.`UPDATEDATE`",
     "name" : "UPDATEDATE"
@@ -20,6 +26,6 @@
     "expression" : "t1.`UPDATEMAN`",
     "name" : "UPDATEMAN"
   } ],
-  "queryCode" : "SELECT\nt1.`BOOKCHILD4ID`,\nt1.`BOOKCHILD4NAME`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_BOOKCHILD4` t1 \n",
+  "queryCode" : "SELECT\nt1.`BOOKCHILD4ID`,\nt1.`BOOKCHILD4NAME`,\nt1.`BOOKID`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`TYPE`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_BOOKCHILD4` t1 \n",
   "id" : "PSMODULES/Test/PSDATAENTITIES/BOOKCHILD4/PSDEDATAQUERIES/Default/PSDEDQCODES/MYSQL5.json"
 }
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/BOOKCHILD4/PSDEDATAQUERIES/View/PSDEDQCODES/MYSQL5.json

@@ -7,12 +7,18 @@
   }, {
     "expression" : "t1.`BOOKCHILD4NAME`",
     "name" : "BOOKCHILD4NAME"
+  }, {
+    "expression" : "t1.`BOOKID`",
+    "name" : "BOOKID"
   }, {
     "expression" : "t1.`CREATEDATE`",
     "name" : "CREATEDATE"
   }, {
     "expression" : "t1.`CREATEMAN`",
     "name" : "CREATEMAN"
+  }, {
+    "expression" : "t1.`TYPE`",
+    "name" : "TYPE"
   }, {
     "expression" : "t1.`UPDATEDATE`",
     "name" : "UPDATEDATE"
@@ -20,6 +26,6 @@
     "expression" : "t1.`UPDATEMAN`",
     "name" : "UPDATEMAN"
   } ],
-  "queryCode" : "SELECT\nt1.`BOOKCHILD4ID`,\nt1.`BOOKCHILD4NAME`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_BOOKCHILD4` t1 \n",
+  "queryCode" : "SELECT\nt1.`BOOKCHILD4ID`,\nt1.`BOOKCHILD4NAME`,\nt1.`BOOKID`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`TYPE`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_BOOKCHILD4` t1 \n",
   "id" : "PSMODULES/Test/PSDATAENTITIES/BOOKCHILD4/PSDEDATAQUERIES/View/PSDEDQCODES/MYSQL5.json"
 }
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/BOOKCHILD4/PSDERS/DER1N_BOOKCHILD4_BOOK_BOOKID.json

+{
+  "codeName" : "Book",
+  "dERType" : "DER1N",
+  "dynaModelFilePath" : "PSMODULES/Test/PSDATAENTITIES/BOOKCHILD4/PSDERS/DER1N_BOOKCHILD4_BOOK_BOOKID.json",
+  "fKeyName" : "F6A37F53FFC9C84A42",
+  "logicName" : "名称",
+  "getMajorPSDataEntity" : {
+    "modelref" : true,
+    "path" : "PSMODULES/common/PSDATAENTITIES/Book.json"
+  },
+  "masterOrder" : -1,
+  "masterRS" : 0,
+  "minorCodeName" : "BOOKCHILD4s",
+  "getMinorPSDataEntity" : {
+    "modelref" : true,
+    "path" : "PSMODULES/Test/PSDATAENTITIES/BOOKCHILD4.json"
+  },
+  "name" : "DER1N_BOOKCHILD4_BOOK_BOOKID",
+  "orderValue" : 100,
+  "getPSPickupDEField" : {
+    "name" : "BOOKID",
+    "codeName" : "BookId"
+  },
+  "pickupDEFName" : "BOOKID",
+  "removeActionType" : -1,
+  "removeOrder" : 0,
+  "enableFKey" : true
+}
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/BOOKCHILD5.json

@@ -184,6 +184,9 @@
   } ],
   "getAllPSDEDBTables" : [ {
     "getAllPSDEFields" : [ {
+      "name" : "TYPE",
+      "codeName" : "TYPE"
+    }, {
       "name" : "BOOKCHILD5NAME",
       "codeName" : "BOOKCHILD5Name"
     }, {
@@ -201,6 +204,9 @@
     }, {
       "name" : "UPDATEDATE",
       "codeName" : "UpdateDate"
+    }, {
+      "name" : "BOOKID",
+      "codeName" : "BookId"
     } ],
     "codeName" : "Table",
     "name" : "T_BOOKCHILD5",
@@ -306,6 +312,87 @@
     "enableFront" : true
   } ],
   "getAllPSDEFields" : [ {
+    "getAllPSDEFDTColumns" : [ {
+      "columnName" : "TYPE",
+      "dBType" : "MYSQL5",
+      "name" : "TYPE",
+      "queryCodeExp" : "t1.`TYPE`",
+      "standardColumnName" : "`TYPE`"
+    } ],
+    "getAllPSDEFUIModes" : [ {
+      "codeName" : "Default",
+      "name" : "[TYPE][类型]",
+      "getPSDEFFormItem" : {
+        "codeName" : "Default",
+        "editorType" : "TEXTBOX",
+        "name" : "[TYPE][类型]",
+        "stringLength" : 100,
+        "uIMode" : "DEFAULT"
+      },
+      "type" : "DEFAULT"
+    }, {
+      "codeName" : "MobileDefault",
+      "name" : "[TYPE][类型]移动端默认",
+      "getPSDEFFormItem" : {
+        "codeName" : "MobileDefault",
+        "editorType" : "MOBTEXT",
+        "name" : "[TYPE][类型]移动端默认",
+        "stringLength" : 100,
+        "uIMode" : "MOBILEDEFAULT",
+        "mobileMode" : true
+      },
+      "type" : "MOBILEDEFAULT",
+      "mobileMode" : true
+    } ],
+    "getAllPSDEFValueRules" : [ {
+      "codeName" : "Default",
+      "name" : "默认规则",
+      "getPSDEFVRGroupCondition" : {
+        "condOp" : "AND",
+        "condType" : "GROUP",
+        "name" : "默认组",
+        "getPSDEFVRConditions" : [ {
+          "condType" : "STRINGLENGTH",
+          "dEFName" : "TYPE",
+          "maxValue" : 100,
+          "name" : "默认字符串长度",
+          "ruleInfo" : "内容长度必须小于等于[100]",
+          "includeMaxValue" : true,
+          "includeMinValue" : false,
+          "keyCond" : true
+        } ],
+        "ruleInfo" : "内容长度必须小于等于[100]"
+      },
+      "ruleInfo" : "内容长度必须小于等于[100]",
+      "checkDefault" : true,
+      "defaultMode" : true,
+      "enableBackend" : true,
+      "enableFront" : true
+    } ],
+    "codeName" : "TYPE",
+    "dEFType" : 1,
+    "dataType" : "TEXT",
+    "importOrder" : 1000,
+    "length" : 100,
+    "logicName" : "类型",
+    "name" : "TYPE",
+    "getPSCodeList" : {
+      "modelref" : true,
+      "path" : "PSMODULES/ModelRepository/PSCODELISTS/CodeList44.json"
+    },
+    "getPSDEDBTable" : {
+      "modelref" : true,
+      "id" : "Table"
+    },
+    "getPSSysDBColumn" : {
+      "modelref" : true,
+      "id" : "TYPE"
+    },
+    "serviceCodeName" : "TYPE",
+    "stdDataType" : 25,
+    "stringLength" : 100,
+    "valueFormat" : "%1$s"
+  }, {
     "getAllPSDEFDTColumns" : [ {
       "columnName" : "BOOKCHILD5NAME",
       "dBType" : "MYSQL5",
@@ -916,10 +1003,133 @@
     "valueFormat" : "%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS",
     "allowEmpty" : false,
     "systemReserver" : true
+  }, {
+    "getAllPSDEFDTColumns" : [ {
+      "columnName" : "BOOKID",
+      "dBType" : "MYSQL5",
+      "name" : "BOOKID",
+      "queryCodeExp" : "t1.`BOOKID`",
+      "standardColumnName" : "`BOOKID`"
+    } ],
+    "getAllPSDEFSearchModes" : [ {
+      "codeName" : "N_BOOKID_EQ",
+      "name" : "N_BOOKID_EQ",
+      "stdDataType" : 25,
+      "valueOP" : "EQ"
+    } ],
+    "getAllPSDEFUIModes" : [ {
+      "codeName" : "Default",
+      "name" : "[BOOKID][书标识]",
+      "getPSDEFFormItem" : {
+        "codeName" : "Default",
+        "editorType" : "HIDDEN",
+        "name" : "[BOOKID][书标识]",
+        "getRefPSDataEntity" : {
+          "modelref" : true,
+          "path" : "PSMODULES/common/PSDATAENTITIES/Book.json"
+        },
+        "stringLength" : 100,
+        "uIMode" : "DEFAULT"
+      },
+      "type" : "DEFAULT"
+    }, {
+      "codeName" : "MobileDefault",
+      "name" : "[BOOKID][书标识]移动端默认",
+      "getPSDEFFormItem" : {
+        "codeName" : "MobileDefault",
+        "editorType" : "HIDDEN",
+        "name" : "[BOOKID][书标识]移动端默认",
+        "getRefPSDataEntity" : {
+          "modelref" : true,
+          "path" : "PSMODULES/common/PSDATAENTITIES/Book.json"
+        },
+        "stringLength" : 100,
+        "uIMode" : "MOBILEDEFAULT",
+        "mobileMode" : true
+      },
+      "type" : "MOBILEDEFAULT",
+      "mobileMode" : true
+    } ],
+    "getAllPSDEFValueRules" : [ {
+      "codeName" : "Default",
+      "name" : "默认规则",
+      "getPSDEFVRGroupCondition" : {
+        "condOp" : "AND",
+        "condType" : "GROUP",
+        "name" : "默认组",
+        "getPSDEFVRConditions" : [ {
+          "condType" : "STRINGLENGTH",
+          "dEFName" : "BOOKID",
+          "maxValue" : 100,
+          "name" : "默认字符串长度",
+          "ruleInfo" : "内容长度必须小于等于[100]",
+          "includeMaxValue" : true,
+          "includeMinValue" : false,
+          "keyCond" : true
+        } ],
+        "ruleInfo" : "内容长度必须小于等于[100]"
+      },
+      "ruleInfo" : "内容长度必须小于等于[100]",
+      "checkDefault" : true,
+      "defaultMode" : true,
+      "enableBackend" : true,
+      "enableFront" : true
+    } ],
+    "codeName" : "BookId",
+    "dEFType" : 1,
+    "dataType" : "PICKUP",
+    "importOrder" : 1000,
+    "length" : 100,
+    "logicName" : "书标识",
+    "name" : "BOOKID",
+    "getPSDEDBTable" : {
+      "modelref" : true,
+      "id" : "Table"
+    },
+    "getPSDER" : {
+      "modelref" : true,
+      "path" : "PSMODULES/Test/PSDATAENTITIES/BOOKCHILD5/PSDERS/DER1N_BOOKCHILD5_BOOK_BOOKID.json"
+    },
+    "getPSSysDBColumn" : {
+      "modelref" : true,
+      "id" : "BOOKID"
+    },
+    "getRealPSDEField" : {
+      "name" : "BOOKID",
+      "codeName" : "BookId"
+    },
+    "getRealPSDataEntity" : {
+      "modelref" : true,
+      "path" : "PSMODULES/common/PSDATAENTITIES/Book.json"
+    },
+    "getRelatedPSDEField" : {
+      "name" : "BOOKID",
+      "codeName" : "BookId"
+    },
+    "getRelatedPSDataEntity" : {
+      "modelref" : true,
+      "path" : "PSMODULES/common/PSDATAENTITIES/Book.json"
+    },
+    "serviceCodeName" : "BookId",
+    "stdDataType" : 25,
+    "stringLength" : 100,
+    "valueFormat" : "%1$s",
+    "linkDEField" : true
   } ],
   "getAllPSDEMethodDTOs" : [ {
     "name" : "BOOKCHILD5DTO",
     "getPSDEMethodDTOFields" : [ {
+      "logicName" : "类型",
+      "name" : "TYPE",
+      "getPSDEField" : {
+        "name" : "TYPE",
+        "codeName" : "TYPE"
+      },
+      "sourceType" : "DEFIELD",
+      "stdDataType" : 25,
+      "stringLength" : 100,
+      "type" : "SIMPLE"
+    }, {
       "logicName" : "图书子5标识",
       "name" : "BOOKCHILD5Id",
       "getPSDEField" : {
@@ -942,6 +1152,17 @@
       "stdDataType" : 25,
       "stringLength" : 200,
       "type" : "SIMPLE"
+    }, {
+      "logicName" : "书标识",
+      "name" : "BookId",
+      "getPSDEField" : {
+        "name" : "BOOKID",
+        "codeName" : "BookId"
+      },
+      "sourceType" : "DEFIELD",
+      "stdDataType" : 25,
+      "stringLength" : 100,
+      "type" : "SIMPLE"
     }, {
       "jsonFormat" : "yyyy-MM-dd HH:mm:ss",
       "logicName" : "建立时间",
@@ -1028,6 +1249,20 @@
       "sourceType" : "DEFSEARCHMODE",
       "stdDataType" : 25,
       "type" : "SIMPLE"
+    }, {
+      "logicName" : "书标识",
+      "name" : "N_BOOKID_EQ",
+      "getPSDEFSearchMode" : {
+        "modelref" : true,
+        "id" : "N_BOOKID_EQ"
+      },
+      "getPSDEField" : {
+        "name" : "BOOKID",
+        "codeName" : "BookId"
+      },
+      "sourceType" : "DEFSEARCHMODE",
+      "stdDataType" : 25,
+      "type" : "SIMPLE"
     } ],
     "sourceType" : "DE",
     "type" : "DEFILTER",
@@ -1146,6 +1381,34 @@
     "name" : "BOOKCHILD5NAME",
     "codeName" : "BOOKCHILD5Name"
   },
+  "getMinorPSDERs" : [ {
+    "codeName" : "Book",
+    "dERType" : "DER1N",
+    "dynaModelFilePath" : "PSMODULES/Test/PSDATAENTITIES/BOOKCHILD5/PSDERS/DER1N_BOOKCHILD5_BOOK_BOOKID.json",
+    "fKeyName" : "F03199448777C01379",
+    "logicName" : "名称",
+    "getMajorPSDataEntity" : {
+      "modelref" : true,
+      "path" : "PSMODULES/common/PSDATAENTITIES/Book.json"
+    },
+    "masterOrder" : -1,
+    "masterRS" : 0,
+    "minorCodeName" : "BOOKCHILD5s",
+    "getMinorPSDataEntity" : {
+      "modelref" : true,
+      "path" : "PSMODULES/Test/PSDATAENTITIES/BOOKCHILD5.json"
+    },
+    "name" : "DER1N_BOOKCHILD5_BOOK_BOOKID",
+    "orderValue" : 100,
+    "getPSPickupDEField" : {
+      "name" : "BOOKID",
+      "codeName" : "BookId"
+    },
+    "pickupDEFName" : "BOOKID",
+    "removeActionType" : -1,
+    "removeOrder" : 0,
+    "enableFKey" : true
+  } ],
   "name" : "BOOKCHILD5",
   "getPSSysDBScheme" : {
     "modelref" : true,

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/BOOKCHILD5/PSDEDATAQUERIES/Default/PSDEDQCODES/MYSQL5.json

@@ -7,12 +7,18 @@
   }, {
     "expression" : "t1.`BOOKCHILD5NAME`",
     "name" : "BOOKCHILD5NAME"
+  }, {
+    "expression" : "t1.`BOOKID`",
+    "name" : "BOOKID"
   }, {
     "expression" : "t1.`CREATEDATE`",
     "name" : "CREATEDATE"
   }, {
     "expression" : "t1.`CREATEMAN`",
     "name" : "CREATEMAN"
+  }, {
+    "expression" : "t1.`TYPE`",
+    "name" : "TYPE"
   }, {
     "expression" : "t1.`UPDATEDATE`",
     "name" : "UPDATEDATE"
@@ -20,6 +26,6 @@
     "expression" : "t1.`UPDATEMAN`",
     "name" : "UPDATEMAN"
   } ],
-  "queryCode" : "SELECT\nt1.`BOOKCHILD5ID`,\nt1.`BOOKCHILD5NAME`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_BOOKCHILD5` t1 \n",
+  "queryCode" : "SELECT\nt1.`BOOKCHILD5ID`,\nt1.`BOOKCHILD5NAME`,\nt1.`BOOKID`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`TYPE`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_BOOKCHILD5` t1 \n",
   "id" : "PSMODULES/Test/PSDATAENTITIES/BOOKCHILD5/PSDEDATAQUERIES/Default/PSDEDQCODES/MYSQL5.json"
 }
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/BOOKCHILD5/PSDEDATAQUERIES/View/PSDEDQCODES/MYSQL5.json

@@ -7,12 +7,18 @@
   }, {
     "expression" : "t1.`BOOKCHILD5NAME`",
     "name" : "BOOKCHILD5NAME"
+  }, {
+    "expression" : "t1.`BOOKID`",
+    "name" : "BOOKID"
   }, {
     "expression" : "t1.`CREATEDATE`",
     "name" : "CREATEDATE"
   }, {
     "expression" : "t1.`CREATEMAN`",
     "name" : "CREATEMAN"
+  }, {
+    "expression" : "t1.`TYPE`",
+    "name" : "TYPE"
   }, {
     "expression" : "t1.`UPDATEDATE`",
     "name" : "UPDATEDATE"
@@ -20,6 +26,6 @@
     "expression" : "t1.`UPDATEMAN`",
     "name" : "UPDATEMAN"
   } ],
-  "queryCode" : "SELECT\nt1.`BOOKCHILD5ID`,\nt1.`BOOKCHILD5NAME`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_BOOKCHILD5` t1 \n",
+  "queryCode" : "SELECT\nt1.`BOOKCHILD5ID`,\nt1.`BOOKCHILD5NAME`,\nt1.`BOOKID`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`TYPE`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_BOOKCHILD5` t1 \n",
   "id" : "PSMODULES/Test/PSDATAENTITIES/BOOKCHILD5/PSDEDATAQUERIES/View/PSDEDQCODES/MYSQL5.json"
 }
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/BOOKCHILD5/PSDERS/DER1N_BOOKCHILD5_BOOK_BOOKID.json

+{
+  "codeName" : "Book",
+  "dERType" : "DER1N",
+  "dynaModelFilePath" : "PSMODULES/Test/PSDATAENTITIES/BOOKCHILD5/PSDERS/DER1N_BOOKCHILD5_BOOK_BOOKID.json",
+  "fKeyName" : "F03199448777C01379",
+  "logicName" : "名称",
+  "getMajorPSDataEntity" : {
+    "modelref" : true,
+    "path" : "PSMODULES/common/PSDATAENTITIES/Book.json"
+  },
+  "masterOrder" : -1,
+  "masterRS" : 0,
+  "minorCodeName" : "BOOKCHILD5s",
+  "getMinorPSDataEntity" : {
+    "modelref" : true,
+    "path" : "PSMODULES/Test/PSDATAENTITIES/BOOKCHILD5.json"
+  },
+  "name" : "DER1N_BOOKCHILD5_BOOK_BOOKID",
+  "orderValue" : 100,
+  "getPSPickupDEField" : {
+    "name" : "BOOKID",
+    "codeName" : "BookId"
+  },
+  "pickupDEFName" : "BOOKID",
+  "removeActionType" : -1,
+  "removeOrder" : 0,
+  "enableFKey" : true
+}
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/BookChild1.json

@@ -184,6 +184,9 @@
   } ],
   "getAllPSDEDBTables" : [ {
     "getAllPSDEFields" : [ {
+      "name" : "TYPE",
+      "codeName" : "TYPE"
+    }, {
       "name" : "BOOKCHILD1NAME",
       "codeName" : "BookChild1Name"
     }, {
@@ -309,6 +312,87 @@
     "enableFront" : true
   } ],
   "getAllPSDEFields" : [ {
+    "getAllPSDEFDTColumns" : [ {
+      "columnName" : "TYPE",
+      "dBType" : "MYSQL5",
+      "name" : "TYPE",
+      "queryCodeExp" : "t1.`TYPE`",
+      "standardColumnName" : "`TYPE`"
+    } ],
+    "getAllPSDEFUIModes" : [ {
+      "codeName" : "MobileDefault",
+      "name" : "[TYPE][类型]移动端默认",
+      "getPSDEFFormItem" : {
+        "codeName" : "MobileDefault",
+        "editorType" : "MOBTEXT",
+        "name" : "[TYPE][类型]移动端默认",
+        "stringLength" : 100,
+        "uIMode" : "MOBILEDEFAULT",
+        "mobileMode" : true
+      },
+      "type" : "MOBILEDEFAULT",
+      "mobileMode" : true
+    }, {
+      "codeName" : "Default",
+      "name" : "[TYPE][类型]",
+      "getPSDEFFormItem" : {
+        "codeName" : "Default",
+        "editorType" : "TEXTBOX",
+        "name" : "[TYPE][类型]",
+        "stringLength" : 100,
+        "uIMode" : "DEFAULT"
+      },
+      "type" : "DEFAULT"
+    } ],
+    "getAllPSDEFValueRules" : [ {
+      "codeName" : "Default",
+      "name" : "默认规则",
+      "getPSDEFVRGroupCondition" : {
+        "condOp" : "AND",
+        "condType" : "GROUP",
+        "name" : "默认组",
+        "getPSDEFVRConditions" : [ {
+          "condType" : "STRINGLENGTH",
+          "dEFName" : "TYPE",
+          "maxValue" : 100,
+          "name" : "默认字符串长度",
+          "ruleInfo" : "内容长度必须小于等于[100]",
+          "includeMaxValue" : true,
+          "includeMinValue" : false,
+          "keyCond" : true
+        } ],
+        "ruleInfo" : "内容长度必须小于等于[100]"
+      },
+      "ruleInfo" : "内容长度必须小于等于[100]",
+      "checkDefault" : true,
+      "defaultMode" : true,
+      "enableBackend" : true,
+      "enableFront" : true
+    } ],
+    "codeName" : "TYPE",
+    "dEFType" : 1,
+    "dataType" : "TEXT",
+    "importOrder" : 1000,
+    "length" : 100,
+    "logicName" : "类型",
+    "name" : "TYPE",
+    "getPSCodeList" : {
+      "modelref" : true,
+      "path" : "PSMODULES/ModelRepository/PSCODELISTS/CodeList44.json"
+    },
+    "getPSDEDBTable" : {
+      "modelref" : true,
+      "id" : "Table"
+    },
+    "getPSSysDBColumn" : {
+      "modelref" : true,
+      "id" : "TYPE"
+    },
+    "serviceCodeName" : "TYPE",
+    "stdDataType" : 25,
+    "stringLength" : 100,
+    "valueFormat" : "%1$s"
+  }, {
     "getAllPSDEFDTColumns" : [ {
       "columnName" : "BOOKCHILD1NAME",
       "dBType" : "MYSQL5",
@@ -909,6 +993,17 @@
   "getAllPSDEMethodDTOs" : [ {
     "name" : "BookChild1DTO",
     "getPSDEMethodDTOFields" : [ {
+      "logicName" : "类型",
+      "name" : "TYPE",
+      "getPSDEField" : {
+        "name" : "TYPE",
+        "codeName" : "TYPE"
+      },
+      "sourceType" : "DEFIELD",
+      "stdDataType" : 25,
+      "stringLength" : 100,
+      "type" : "SIMPLE"
+    }, {
       "logicName" : "图书子1标识",
       "name" : "BookChild1Id",
       "getPSDEField" : {

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/BookChild1/PSDEDATAQUERIES/Default/PSDEDQCODES/MYSQL5.json

@@ -16,6 +16,9 @@
   }, {
     "expression" : "t1.`CREATEMAN`",
     "name" : "CREATEMAN"
+  }, {
+    "expression" : "t1.`TYPE`",
+    "name" : "TYPE"
   }, {
     "expression" : "t1.`UPDATEDATE`",
     "name" : "UPDATEDATE"
@@ -23,6 +26,6 @@
     "expression" : "t1.`UPDATEMAN`",
     "name" : "UPDATEMAN"
   } ],
-  "queryCode" : "SELECT\nt1.`BOOKCHILD1ID`,\nt1.`BOOKCHILD1NAME`,\nt1.`BOOKID`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_BOOKCHILD1` t1 \n",
+  "queryCode" : "SELECT\nt1.`BOOKCHILD1ID`,\nt1.`BOOKCHILD1NAME`,\nt1.`BOOKID`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`TYPE`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_BOOKCHILD1` t1 \n",
   "id" : "PSMODULES/Test/PSDATAENTITIES/BookChild1/PSDEDATAQUERIES/Default/PSDEDQCODES/MYSQL5.json"
 }
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/BookChild1/PSDEDATAQUERIES/View/PSDEDQCODES/MYSQL5.json

@@ -16,6 +16,9 @@
   }, {
     "expression" : "t1.`CREATEMAN`",
     "name" : "CREATEMAN"
+  }, {
+    "expression" : "t1.`TYPE`",
+    "name" : "TYPE"
   }, {
     "expression" : "t1.`UPDATEDATE`",
     "name" : "UPDATEDATE"
@@ -23,6 +26,6 @@
     "expression" : "t1.`UPDATEMAN`",
     "name" : "UPDATEMAN"
   } ],
-  "queryCode" : "SELECT\nt1.`BOOKCHILD1ID`,\nt1.`BOOKCHILD1NAME`,\nt1.`BOOKID`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_BOOKCHILD1` t1 \n",
+  "queryCode" : "SELECT\nt1.`BOOKCHILD1ID`,\nt1.`BOOKCHILD1NAME`,\nt1.`BOOKID`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`TYPE`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_BOOKCHILD1` t1 \n",
   "id" : "PSMODULES/Test/PSDATAENTITIES/BookChild1/PSDEDATAQUERIES/View/PSDEDQCODES/MYSQL5.json"
 }
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Book.json

@@ -7043,13 +7043,6 @@
     "name" : "测试编辑器参数增强",
     "realModelSubType" : "EDITFORM",
     "realModelType" : "PSDEFORM"
-  }, {
-    "codeName" : "RepeatChildren",
-    "logicName" : "重复器子表单",
-    "modelTag2" : "0",
-    "name" : "重复器子表单",
-    "realModelSubType" : "EDITFORM",
-    "realModelType" : "PSDEFORM"
   }, {
     "codeName" : "dsjbjcs_2",
     "logicName" : "多数据部件测试(列表)",
@@ -7153,6 +7146,114 @@
     "removeActionType" : -1,
     "removeOrder" : 0,
     "enableFKey" : true
+  }, {
+    "codeName" : "Book",
+    "dERType" : "DER1N",
+    "dynaModelFilePath" : "PSMODULES/Test/PSDATAENTITIES/BOOKCHILD2/PSDERS/DER1N_BOOKCHILD2_BOOK_BOOKID.json",
+    "fKeyName" : "F2C85F2E6C26B56512",
+    "logicName" : "名称",
+    "getMajorPSDataEntity" : {
+      "modelref" : true,
+      "path" : "PSMODULES/common/PSDATAENTITIES/Book.json"
+    },
+    "masterOrder" : -1,
+    "masterRS" : 0,
+    "minorCodeName" : "BOOKCHILD2s",
+    "getMinorPSDataEntity" : {
+      "modelref" : true,
+      "path" : "PSMODULES/Test/PSDATAENTITIES/BOOKCHILD2.json"
+    },
+    "name" : "DER1N_BOOKCHILD2_BOOK_BOOKID",
+    "orderValue" : 100,
+    "getPSPickupDEField" : {
+      "name" : "BOOKID",
+      "codeName" : "BookId"
+    },
+    "pickupDEFName" : "BOOKID",
+    "removeActionType" : -1,
+    "removeOrder" : 0,
+    "enableFKey" : true
+  }, {
+    "codeName" : "Book",
+    "dERType" : "DER1N",
+    "dynaModelFilePath" : "PSMODULES/Test/PSDATAENTITIES/BOOKCHILD3/PSDERS/DER1N_BOOKCHILD3_BOOK_BOOKID.json",
+    "fKeyName" : "F8B53D24CCB0E6DEC9",
+    "logicName" : "名称",
+    "getMajorPSDataEntity" : {
+      "modelref" : true,
+      "path" : "PSMODULES/common/PSDATAENTITIES/Book.json"
+    },
+    "masterOrder" : -1,
+    "masterRS" : 0,
+    "minorCodeName" : "BOOKCHILD3s",
+    "getMinorPSDataEntity" : {
+      "modelref" : true,
+      "path" : "PSMODULES/Test/PSDATAENTITIES/BOOKCHILD3.json"
+    },
+    "name" : "DER1N_BOOKCHILD3_BOOK_BOOKID",
+    "orderValue" : 100,
+    "getPSPickupDEField" : {
+      "name" : "BOOKID",
+      "codeName" : "BookId"
+    },
+    "pickupDEFName" : "BOOKID",
+    "removeActionType" : -1,
+    "removeOrder" : 0,
+    "enableFKey" : true
+  }, {
+    "codeName" : "Book",
+    "dERType" : "DER1N",
+    "dynaModelFilePath" : "PSMODULES/Test/PSDATAENTITIES/BOOKCHILD4/PSDERS/DER1N_BOOKCHILD4_BOOK_BOOKID.json",
+    "fKeyName" : "F6A37F53FFC9C84A42",
+    "logicName" : "名称",
+    "getMajorPSDataEntity" : {
+      "modelref" : true,
+      "path" : "PSMODULES/common/PSDATAENTITIES/Book.json"
+    },
+    "masterOrder" : -1,
+    "masterRS" : 0,
+    "minorCodeName" : "BOOKCHILD4s",
+    "getMinorPSDataEntity" : {
+      "modelref" : true,
+      "path" : "PSMODULES/Test/PSDATAENTITIES/BOOKCHILD4.json"
+    },
+    "name" : "DER1N_BOOKCHILD4_BOOK_BOOKID",
+    "orderValue" : 100,
+    "getPSPickupDEField" : {
+      "name" : "BOOKID",
+      "codeName" : "BookId"
+    },
+    "pickupDEFName" : "BOOKID",
+    "removeActionType" : -1,
+    "removeOrder" : 0,
+    "enableFKey" : true
+  }, {
+    "codeName" : "Book",
+    "dERType" : "DER1N",
+    "dynaModelFilePath" : "PSMODULES/Test/PSDATAENTITIES/BOOKCHILD5/PSDERS/DER1N_BOOKCHILD5_BOOK_BOOKID.json",
+    "fKeyName" : "F03199448777C01379",
+    "logicName" : "名称",
+    "getMajorPSDataEntity" : {
+      "modelref" : true,
+      "path" : "PSMODULES/common/PSDATAENTITIES/Book.json"
+    },
+    "masterOrder" : -1,
+    "masterRS" : 0,
+    "minorCodeName" : "BOOKCHILD5s",
+    "getMinorPSDataEntity" : {
+      "modelref" : true,
+      "path" : "PSMODULES/Test/PSDATAENTITIES/BOOKCHILD5.json"
+    },
+    "name" : "DER1N_BOOKCHILD5_BOOK_BOOKID",
+    "orderValue" : 100,
+    "getPSPickupDEField" : {
+      "name" : "BOOKID",
+      "codeName" : "BookId"
+    },
+    "pickupDEFName" : "BOOKID",
+    "removeActionType" : -1,
+    "removeOrder" : 0,
+    "enableFKey" : true
   }, {
     "codeName" : "Book",
     "dERType" : "DER1N",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/TESTGRID.json

@@ -195,6 +195,9 @@
     }, {
       "name" : "TEST4",
       "codeName" : "Test4"
+    }, {
+      "name" : "GROUPNAME",
+      "codeName" : "GroupName"
     }, {
       "name" : "TESTGRIDID",
       "codeName" : "TESTGRIDId"
@@ -625,6 +628,83 @@
     "stdDataType" : 25,
     "stringLength" : 100,
     "valueFormat" : "%1$s"
+  }, {
+    "getAllPSDEFDTColumns" : [ {
+      "columnName" : "GROUPNAME",
+      "dBType" : "MYSQL5",
+      "name" : "GROUPNAME",
+      "queryCodeExp" : "t1.`GROUPNAME`",
+      "standardColumnName" : "`GROUPNAME`"
+    } ],
+    "getAllPSDEFUIModes" : [ {
+      "codeName" : "Default",
+      "name" : "[GROUPNAME][分组属性]",
+      "getPSDEFFormItem" : {
+        "codeName" : "Default",
+        "editorType" : "TEXTBOX",
+        "name" : "[GROUPNAME][分组属性]",
+        "stringLength" : 100,
+        "uIMode" : "DEFAULT"
+      },
+      "type" : "DEFAULT"
+    }, {
+      "codeName" : "MobileDefault",
+      "name" : "[GROUPNAME][分组属性]移动端默认",
+      "getPSDEFFormItem" : {
+        "codeName" : "MobileDefault",
+        "editorType" : "MOBTEXT",
+        "name" : "[GROUPNAME][分组属性]移动端默认",
+        "stringLength" : 100,
+        "uIMode" : "MOBILEDEFAULT",
+        "mobileMode" : true
+      },
+      "type" : "MOBILEDEFAULT",
+      "mobileMode" : true
+    } ],
+    "getAllPSDEFValueRules" : [ {
+      "codeName" : "Default",
+      "name" : "默认规则",
+      "getPSDEFVRGroupCondition" : {
+        "condOp" : "AND",
+        "condType" : "GROUP",
+        "name" : "默认组",
+        "getPSDEFVRConditions" : [ {
+          "condType" : "STRINGLENGTH",
+          "dEFName" : "GROUPNAME",
+          "maxValue" : 100,
+          "name" : "默认字符串长度",
+          "ruleInfo" : "内容长度必须小于等于[100]",
+          "includeMaxValue" : true,
+          "includeMinValue" : false,
+          "keyCond" : true
+        } ],
+        "ruleInfo" : "内容长度必须小于等于[100]"
+      },
+      "ruleInfo" : "内容长度必须小于等于[100]",
+      "checkDefault" : true,
+      "defaultMode" : true,
+      "enableBackend" : true,
+      "enableFront" : true
+    } ],
+    "codeName" : "GroupName",
+    "dEFType" : 1,
+    "dataType" : "TEXT",
+    "importOrder" : 1000,
+    "length" : 100,
+    "logicName" : "分组属性",
+    "name" : "GROUPNAME",
+    "getPSDEDBTable" : {
+      "modelref" : true,
+      "id" : "Table"
+    },
+    "getPSSysDBColumn" : {
+      "modelref" : true,
+      "id" : "GROUPNAME"
+    },
+    "serviceCodeName" : "GroupName",
+    "stdDataType" : 25,
+    "stringLength" : 100,
+    "valueFormat" : "%1$s"
   }, {
     "getAllPSDEFDTColumns" : [ {
       "columnName" : "TESTGRIDID",
@@ -1283,6 +1363,17 @@
       "stdDataType" : 25,
       "stringLength" : 100,
       "type" : "SIMPLE"
+    }, {
+      "logicName" : "分组属性",
+      "name" : "GroupName",
+      "getPSDEField" : {
+        "name" : "GROUPNAME",
+        "codeName" : "GroupName"
+      },
+      "sourceType" : "DEFIELD",
+      "stdDataType" : 25,
+      "stringLength" : 100,
+      "type" : "SIMPLE"
     }, {
       "jsonFormat" : "yyyy-MM-dd HH:mm:ss",
       "logicName" : "建立时间",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/TESTGRID/PSDEDATAQUERIES/Default/PSDEDQCODES/MYSQL5.json

@@ -7,6 +7,9 @@
   }, {
     "expression" : "t1.`CREATEMAN`",
     "name" : "CREATEMAN"
+  }, {
+    "expression" : "t1.`GROUPNAME`",
+    "name" : "GROUPNAME"
   }, {
     "expression" : "t1.`TEST1`",
     "name" : "TEST1"
@@ -32,6 +35,6 @@
     "expression" : "t1.`UPDATEMAN`",
     "name" : "UPDATEMAN"
   } ],
-  "queryCode" : "SELECT\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`TEST1`,\nt1.`TEST2`,\nt1.`TEST3`,\nt1.`TEST4`,\nt1.`TESTGRIDID`,\nt1.`TESTGRIDNAME`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_TESTGRID` t1 \n",
+  "queryCode" : "SELECT\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`GROUPNAME`,\nt1.`TEST1`,\nt1.`TEST2`,\nt1.`TEST3`,\nt1.`TEST4`,\nt1.`TESTGRIDID`,\nt1.`TESTGRIDNAME`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_TESTGRID` t1 \n",
   "id" : "PSMODULES/common/PSDATAENTITIES/TESTGRID/PSDEDATAQUERIES/Default/PSDEDQCODES/MYSQL5.json"
 }
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/TESTGRID/PSDEDATAQUERIES/View/PSDEDQCODES/MYSQL5.json

@@ -7,6 +7,9 @@
   }, {
     "expression" : "t1.`CREATEMAN`",
     "name" : "CREATEMAN"
+  }, {
+    "expression" : "t1.`GROUPNAME`",
+    "name" : "GROUPNAME"
   }, {
     "expression" : "t1.`TEST1`",
     "name" : "TEST1"
@@ -32,6 +35,6 @@
     "expression" : "t1.`UPDATEMAN`",
     "name" : "UPDATEMAN"
   } ],
-  "queryCode" : "SELECT\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`TEST1`,\nt1.`TEST2`,\nt1.`TEST3`,\nt1.`TEST4`,\nt1.`TESTGRIDID`,\nt1.`TESTGRIDNAME`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_TESTGRID` t1 \n",
+  "queryCode" : "SELECT\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`GROUPNAME`,\nt1.`TEST1`,\nt1.`TEST2`,\nt1.`TEST3`,\nt1.`TEST4`,\nt1.`TESTGRIDID`,\nt1.`TESTGRIDNAME`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_TESTGRID` t1 \n",
   "id" : "PSMODULES/common/PSDATAENTITIES/TESTGRID/PSDEDATAQUERIES/View/PSDEDQCODES/MYSQL5.json"
 }
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDATAENTITIES/BookChild1.json

@@ -323,6 +323,37 @@
     "builtinMethod" : false
   } ],
   "getAllPSAppDEFields" : [ {
+    "getAllPSAppDEFUIModes" : [ {
+      "codeName" : "MobileDefault",
+      "name" : "[TYPE][类型]移动端默认",
+      "getPSDEFFormItem" : {
+        "codeName" : "MobileDefault",
+        "editorType" : "MOBTEXT",
+        "name" : "[TYPE][类型]移动端默认",
+        "stringLength" : 100,
+        "uIMode" : "MOBILEDEFAULT",
+        "mobileMode" : true
+      },
+      "type" : "MOBILEDEFAULT",
+      "mobileMode" : true
+    }, {
+      "codeName" : "Default",
+      "name" : "[TYPE][类型]",
+      "getPSDEFFormItem" : {
+        "codeName" : "Default",
+        "editorType" : "TEXTBOX",
+        "name" : "[TYPE][类型]",
+        "stringLength" : 100,
+        "uIMode" : "DEFAULT"
+      },
+      "type" : "DEFAULT"
+    } ],
+    "codeName" : "TYPE",
+    "logicName" : "类型",
+    "name" : "TYPE",
+    "stdDataType" : 25,
+    "stringLength" : 100
+  }, {
     "getAllPSAppDEFUIModes" : [ {
       "codeName" : "Default",
       "name" : "[BOOKCHILD1NAME][图书子1名称]",
@@ -565,6 +596,17 @@
     "codeName" : "BookChild1DTO",
     "name" : "BookChild1DTO",
     "getPSAppDEMethodDTOFields" : [ {
+      "codeName" : "TYPE",
+      "logicName" : "类型",
+      "name" : "TYPE",
+      "getPSAppDEField" : {
+        "name" : "TYPE",
+        "codeName" : "TYPE"
+      },
+      "sourceType" : "DEFIELD",
+      "stdDataType" : 25,
+      "type" : "SIMPLE"
+    }, {
       "codeName" : "BookChild1Id",
       "logicName" : "图书子1标识",
       "name" : "BookChild1Id",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/BookChild1.json

@@ -323,6 +323,37 @@
     "builtinMethod" : false
   } ],
   "getAllPSAppDEFields" : [ {
+    "getAllPSAppDEFUIModes" : [ {
+      "codeName" : "MobileDefault",
+      "name" : "[TYPE][类型]移动端默认",
+      "getPSDEFFormItem" : {
+        "codeName" : "MobileDefault",
+        "editorType" : "MOBTEXT",
+        "name" : "[TYPE][类型]移动端默认",
+        "stringLength" : 100,
+        "uIMode" : "MOBILEDEFAULT",
+        "mobileMode" : true
+      },
+      "type" : "MOBILEDEFAULT",
+      "mobileMode" : true
+    }, {
+      "codeName" : "Default",
+      "name" : "[TYPE][类型]",
+      "getPSDEFFormItem" : {
+        "codeName" : "Default",
+        "editorType" : "TEXTBOX",
+        "name" : "[TYPE][类型]",
+        "stringLength" : 100,
+        "uIMode" : "DEFAULT"
+      },
+      "type" : "DEFAULT"
+    } ],
+    "codeName" : "TYPE",
+    "logicName" : "类型",
+    "name" : "TYPE",
+    "stdDataType" : 25,
+    "stringLength" : 100
+  }, {
     "getAllPSAppDEFUIModes" : [ {
       "codeName" : "Default",
       "name" : "[BOOKCHILD1NAME][图书子1名称]",
@@ -565,6 +596,17 @@
     "codeName" : "BookChild1DTO",
     "name" : "BookChild1DTO",
     "getPSAppDEMethodDTOFields" : [ {
+      "codeName" : "TYPE",
+      "logicName" : "类型",
+      "name" : "TYPE",
+      "getPSAppDEField" : {
+        "name" : "TYPE",
+        "codeName" : "TYPE"
+      },
+      "sourceType" : "DEFIELD",
+      "stdDataType" : 25,
+      "type" : "SIMPLE"
+    }, {
       "codeName" : "BookChild1Id",
       "logicName" : "图书子1标识",
       "name" : "BookChild1Id",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSSYSAPP.json

@@ -1279,16 +1279,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"
       }
     } ]
   }, {

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/BOOKCHILD2.json

@@ -323,6 +323,37 @@
     "builtinMethod" : false
   } ],
   "getAllPSAppDEFields" : [ {
+    "getAllPSAppDEFUIModes" : [ {
+      "codeName" : "Default",
+      "name" : "[TYPE][类型]",
+      "getPSDEFFormItem" : {
+        "codeName" : "Default",
+        "editorType" : "TEXTBOX",
+        "name" : "[TYPE][类型]",
+        "stringLength" : 100,
+        "uIMode" : "DEFAULT"
+      },
+      "type" : "DEFAULT"
+    }, {
+      "codeName" : "MobileDefault",
+      "name" : "[TYPE][类型]移动端默认",
+      "getPSDEFFormItem" : {
+        "codeName" : "MobileDefault",
+        "editorType" : "MOBTEXT",
+        "name" : "[TYPE][类型]移动端默认",
+        "stringLength" : 100,
+        "uIMode" : "MOBILEDEFAULT",
+        "mobileMode" : true
+      },
+      "type" : "MOBILEDEFAULT",
+      "mobileMode" : true
+    } ],
+    "codeName" : "TYPE",
+    "logicName" : "类型",
+    "name" : "TYPE",
+    "stdDataType" : 25,
+    "stringLength" : 100
+  }, {
     "getAllPSAppDEFUIModes" : [ {
       "codeName" : "MobileDefault",
       "name" : "[BOOKCHILD2ID][图书子2标识]移动端默认",
@@ -647,11 +678,61 @@
     "name" : "UPDATEDATE",
     "stdDataType" : 5,
     "valueFormat" : "YYYY-MM-DD HH:mm:ss"
+  }, {
+    "getAllPSAppDEFUIModes" : [ {
+      "codeName" : "MobileDefault",
+      "name" : "[BOOKID][书标识]移动端默认",
+      "getPSDEFFormItem" : {
+        "codeName" : "MobileDefault",
+        "editorType" : "HIDDEN",
+        "name" : "[BOOKID][书标识]移动端默认",
+        "getRefPSDataEntity" : {
+          "modelref" : true,
+          "path" : "PSMODULES/common/PSDATAENTITIES/Book.json"
+        },
+        "stringLength" : 100,
+        "uIMode" : "MOBILEDEFAULT",
+        "mobileMode" : true
+      },
+      "type" : "MOBILEDEFAULT",
+      "mobileMode" : true
+    }, {
+      "codeName" : "Default",
+      "name" : "[BOOKID][书标识]",
+      "getPSDEFFormItem" : {
+        "codeName" : "Default",
+        "editorType" : "HIDDEN",
+        "name" : "[BOOKID][书标识]",
+        "getRefPSDataEntity" : {
+          "modelref" : true,
+          "path" : "PSMODULES/common/PSDATAENTITIES/Book.json"
+        },
+        "stringLength" : 100,
+        "uIMode" : "DEFAULT"
+      },
+      "type" : "DEFAULT"
+    } ],
+    "codeName" : "BookId",
+    "logicName" : "书标识",
+    "name" : "BOOKID",
+    "stdDataType" : 25,
+    "stringLength" : 100
   } ],
   "getAllPSAppDEMethodDTOs" : [ {
     "codeName" : "BOOKCHILD2DTO",
     "name" : "BOOKCHILD2DTO",
     "getPSAppDEMethodDTOFields" : [ {
+      "codeName" : "TYPE",
+      "logicName" : "类型",
+      "name" : "TYPE",
+      "getPSAppDEField" : {
+        "name" : "TYPE",
+        "codeName" : "TYPE"
+      },
+      "sourceType" : "DEFIELD",
+      "stdDataType" : 25,
+      "type" : "SIMPLE"
+    }, {
       "codeName" : "BOOKCHILD2Id",
       "logicName" : "图书子2标识",
       "name" : "BOOKCHILD2Id",
@@ -674,6 +755,17 @@
       "sourceType" : "DEFIELD",
       "stdDataType" : 25,
       "type" : "SIMPLE"
+    }, {
+      "codeName" : "BookId",
+      "logicName" : "书标识",
+      "name" : "BookId",
+      "getPSAppDEField" : {
+        "name" : "BOOKID",
+        "codeName" : "BookId"
+      },
+      "sourceType" : "DEFIELD",
+      "stdDataType" : 25,
+      "type" : "SIMPLE"
     }, {
       "codeName" : "CreateDate",
       "jsonFormat" : "yyyy-MM-dd HH:mm:ss",
@@ -752,6 +844,17 @@
       "sourceType" : "DEFSEARCHMODE",
       "stdDataType" : 25,
       "type" : "SIMPLE"
+    }, {
+      "codeName" : "N_BOOKID_EQ",
+      "logicName" : "书标识",
+      "name" : "N_BOOKID_EQ",
+      "getPSAppDEField" : {
+        "name" : "BOOKID",
+        "codeName" : "BookId"
+      },
+      "sourceType" : "DEFSEARCHMODE",
+      "stdDataType" : 25,
+      "type" : "SIMPLE"
     } ],
     "sourceType" : "DE",
     "type" : "DEFILTER"

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/BOOKCHILD2/PSGRIDS/Main.json

+{
+  "aggMode" : "NONE",
+  "codeName" : "Main",
+  "columnEnableFilter" : 2,
+  "columnEnableLink" : 2,
+  "controlType" : "GRID",
+  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BOOKCHILD2/PSGRIDS/Main.json",
+  "getFetchPSControlAction" : {
+    "modelref" : true,
+    "id" : "fetch",
+    "actionType" : "DEDATASET",
+    "name" : "fetch",
+    "getPSAppDEMethod" : {
+      "modelref" : true,
+      "id" : "FetchDefault"
+    },
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BOOKCHILD2.json"
+    }
+  },
+  "groupMode" : "NONE",
+  "logicName" : "主表格",
+  "getPSAppDataEntity" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BOOKCHILD2.json"
+  },
+  "getPSDEGridColumns" : [ {
+    "align" : "LEFT",
+    "cLConvertMode" : "NONE",
+    "getCapPSLanguageRes" : {
+      "defaultContent" : "图书子2名称",
+      "lanResTag" : "DEF.LNAME.BOOKCHILD2NAME",
+      "lanResType" : "DEF.LNAME",
+      "name" : "属性逻辑名称（DEF.LNAME.*）[BOOKCHILD2NAME]",
+      "refFlag" : true
+    },
+    "caption" : "图书子2名称",
+    "codeName" : "bookchild2name",
+    "columnType" : "DEFGRIDCOLUMN",
+    "dataItemName" : "bookchild2name",
+    "excelCaption" : "图书子2名称",
+    "name" : "bookchild2name",
+    "noPrivDisplayMode" : 1,
+    "getPSAppDEField" : {
+      "name" : "BOOKCHILD2NAME",
+      "codeName" : "BOOKCHILD2Name"
+    },
+    "width" : 150,
+    "widthUnit" : "PX",
+    "enableRowEdit" : true,
+    "enableSort" : true
+  }, {
+    "align" : "LEFT",
+    "cLConvertMode" : "FRONT",
+    "caption" : "类型",
+    "codeName" : "type",
+    "columnType" : "DEFGRIDCOLUMN",
+    "dataItemName" : "type",
+    "excelCaption" : "类型",
+    "name" : "type",
+    "noPrivDisplayMode" : 1,
+    "getPSAppCodeList" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/CodeList44.json"
+    },
+    "getPSAppDEField" : {
+      "name" : "TYPE",
+      "codeName" : "TYPE"
+    },
+    "width" : 150,
+    "widthUnit" : "PX",
+    "enableRowEdit" : true,
+    "enableSort" : true
+  } ],
+  "getPSDEGridDataItems" : [ {
+    "dataType" : 25,
+    "name" : "bookchild2name",
+    "getPSAppDEField" : {
+      "name" : "BOOKCHILD2NAME",
+      "codeName" : "BOOKCHILD2Name"
+    }
+  }, {
+    "dataType" : 25,
+    "name" : "type",
+    "getPSAppDEField" : {
+      "name" : "TYPE",
+      "codeName" : "TYPE"
+    }
+  }, {
+    "dataType" : 25,
+    "name" : "srfkey",
+    "getPSAppDEField" : {
+      "name" : "BOOKCHILD2ID",
+      "codeName" : "BOOKCHILD2Id"
+    }
+  }, {
+    "dataType" : 25,
+    "name" : "srfdataaccaction",
+    "getPSAppDEField" : {
+      "name" : "BOOKCHILD2ID",
+      "codeName" : "BOOKCHILD2Id"
+    },
+    "dataAccessAction" : true
+  }, {
+    "dataType" : 25,
+    "name" : "bookid",
+    "getPSAppDEField" : {
+      "name" : "BOOKID",
+      "codeName" : "BookId"
+    }
+  }, {
+    "dataType" : 25,
+    "name" : "srfmajortext",
+    "getPSAppDEField" : {
+      "name" : "BOOKCHILD2NAME",
+      "codeName" : "BOOKCHILD2Name"
+    }
+  } ],
+  "getPSDEGridEditItems" : [ {
+    "caption" : "图书子2名称",
+    "codeName" : "bookchild2name",
+    "enableCond" : 3,
+    "ignoreInput" : 0,
+    "name" : "bookchild2name",
+    "getPSAppDEField" : {
+      "name" : "BOOKCHILD2NAME",
+      "codeName" : "BOOKCHILD2Name"
+    },
+    "getPSEditor" : {
+      "editorType" : "TEXTBOX",
+      "maxLength" : 200,
+      "name" : "bookchild2name"
+    },
+    "allowEmpty" : true
+  }, {
+    "caption" : "类型",
+    "codeName" : "type",
+    "enableCond" : 3,
+    "ignoreInput" : 0,
+    "name" : "type",
+    "getPSAppDEField" : {
+      "name" : "TYPE",
+      "codeName" : "TYPE"
+    },
+    "getPSEditor" : {
+      "editorType" : "DROPDOWNLIST",
+      "name" : "type",
+      "getPSAppCodeList" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/CodeList44.json"
+      },
+      "singleSelect" : true
+    },
+    "allowEmpty" : true,
+    "needCodeListConfig" : true
+  }, {
+    "caption" : "图书子2标识",
+    "codeName" : "srfkey",
+    "enableCond" : 3,
+    "ignoreInput" : 0,
+    "name" : "srfkey",
+    "getPSAppDEField" : {
+      "name" : "BOOKCHILD2ID",
+      "codeName" : "BOOKCHILD2Id"
+    },
+    "getPSEditor" : {
+      "editorType" : "HIDDEN",
+      "name" : "srfkey"
+    },
+    "allowEmpty" : true
+  } ],
+  "pagingSize" : 20,
+  "getRemovePSControlAction" : {
+    "actionName" : "Remove",
+    "actionType" : "DEACTION",
+    "dataAccessAction" : "DELETE",
+    "name" : "remove",
+    "getPSAppDEMethod" : {
+      "modelref" : true,
+      "id" : "Remove"
+    },
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BOOKCHILD2.json"
+    }
+  },
+  "sortMode" : "REMOTE",
+  "hasWFDataItems" : false,
+  "enableColFilter" : false,
+  "enableCustomized" : true,
+  "enableGroup" : false,
+  "enablePagingBar" : true,
+  "enableRowEdit" : false,
+  "enableRowEditOrder" : false,
+  "enableRowNew" : false,
+  "forceFit" : false,
+  "hideHeader" : false,
+  "noSort" : false,
+  "singleSelect" : false,
+  "modelid" : "b1dca72ce843b7645e11a4b32c655a69",
+  "modeltype" : "PSDEGRID"
+}
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/BOOKCHILD3.json

@@ -323,6 +323,37 @@
     "builtinMethod" : false
   } ],
   "getAllPSAppDEFields" : [ {
+    "getAllPSAppDEFUIModes" : [ {
+      "codeName" : "MobileDefault",
+      "name" : "[TYPE][类型]移动端默认",
+      "getPSDEFFormItem" : {
+        "codeName" : "MobileDefault",
+        "editorType" : "MOBTEXT",
+        "name" : "[TYPE][类型]移动端默认",
+        "stringLength" : 100,
+        "uIMode" : "MOBILEDEFAULT",
+        "mobileMode" : true
+      },
+      "type" : "MOBILEDEFAULT",
+      "mobileMode" : true
+    }, {
+      "codeName" : "Default",
+      "name" : "[TYPE][类型]",
+      "getPSDEFFormItem" : {
+        "codeName" : "Default",
+        "editorType" : "TEXTBOX",
+        "name" : "[TYPE][类型]",
+        "stringLength" : 100,
+        "uIMode" : "DEFAULT"
+      },
+      "type" : "DEFAULT"
+    } ],
+    "codeName" : "TYPE",
+    "logicName" : "类型",
+    "name" : "TYPE",
+    "stdDataType" : 25,
+    "stringLength" : 100
+  }, {
     "getAllPSAppDEFUIModes" : [ {
       "codeName" : "MobileDefault",
       "name" : "[BOOKCHILD3ID][图书子3标识]移动端默认",
@@ -647,11 +678,61 @@
     "name" : "UPDATEMAN",
     "stdDataType" : 25,
     "stringLength" : 60
+  }, {
+    "getAllPSAppDEFUIModes" : [ {
+      "codeName" : "Default",
+      "name" : "[BOOKID][书标识]",
+      "getPSDEFFormItem" : {
+        "codeName" : "Default",
+        "editorType" : "HIDDEN",
+        "name" : "[BOOKID][书标识]",
+        "getRefPSDataEntity" : {
+          "modelref" : true,
+          "path" : "PSMODULES/common/PSDATAENTITIES/Book.json"
+        },
+        "stringLength" : 100,
+        "uIMode" : "DEFAULT"
+      },
+      "type" : "DEFAULT"
+    }, {
+      "codeName" : "MobileDefault",
+      "name" : "[BOOKID][书标识]移动端默认",
+      "getPSDEFFormItem" : {
+        "codeName" : "MobileDefault",
+        "editorType" : "HIDDEN",
+        "name" : "[BOOKID][书标识]移动端默认",
+        "getRefPSDataEntity" : {
+          "modelref" : true,
+          "path" : "PSMODULES/common/PSDATAENTITIES/Book.json"
+        },
+        "stringLength" : 100,
+        "uIMode" : "MOBILEDEFAULT",
+        "mobileMode" : true
+      },
+      "type" : "MOBILEDEFAULT",
+      "mobileMode" : true
+    } ],
+    "codeName" : "BookId",
+    "logicName" : "书标识",
+    "name" : "BOOKID",
+    "stdDataType" : 25,
+    "stringLength" : 100
   } ],
   "getAllPSAppDEMethodDTOs" : [ {
     "codeName" : "BOOKCHILD3DTO",
     "name" : "BOOKCHILD3DTO",
     "getPSAppDEMethodDTOFields" : [ {
+      "codeName" : "TYPE",
+      "logicName" : "类型",
+      "name" : "TYPE",
+      "getPSAppDEField" : {
+        "name" : "TYPE",
+        "codeName" : "TYPE"
+      },
+      "sourceType" : "DEFIELD",
+      "stdDataType" : 25,
+      "type" : "SIMPLE"
+    }, {
       "codeName" : "BOOKCHILD3Id",
       "logicName" : "图书子3标识",
       "name" : "BOOKCHILD3Id",
@@ -674,6 +755,17 @@
       "sourceType" : "DEFIELD",
       "stdDataType" : 25,
       "type" : "SIMPLE"
+    }, {
+      "codeName" : "BookId",
+      "logicName" : "书标识",
+      "name" : "BookId",
+      "getPSAppDEField" : {
+        "name" : "BOOKID",
+        "codeName" : "BookId"
+      },
+      "sourceType" : "DEFIELD",
+      "stdDataType" : 25,
+      "type" : "SIMPLE"
     }, {
       "codeName" : "CreateDate",
       "jsonFormat" : "yyyy-MM-dd HH:mm:ss",
@@ -752,6 +844,17 @@
       "sourceType" : "DEFSEARCHMODE",
       "stdDataType" : 25,
       "type" : "SIMPLE"
+    }, {
+      "codeName" : "N_BOOKID_EQ",
+      "logicName" : "书标识",
+      "name" : "N_BOOKID_EQ",
+      "getPSAppDEField" : {
+        "name" : "BOOKID",
+        "codeName" : "BookId"
+      },
+      "sourceType" : "DEFSEARCHMODE",
+      "stdDataType" : 25,
+      "type" : "SIMPLE"
     } ],
     "sourceType" : "DE",
     "type" : "DEFILTER"

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/BOOKCHILD4.json

@@ -323,6 +323,37 @@
     "builtinMethod" : false
   } ],
   "getAllPSAppDEFields" : [ {
+    "getAllPSAppDEFUIModes" : [ {
+      "codeName" : "Default",
+      "name" : "[TYPE][类型]",
+      "getPSDEFFormItem" : {
+        "codeName" : "Default",
+        "editorType" : "TEXTBOX",
+        "name" : "[TYPE][类型]",
+        "stringLength" : 100,
+        "uIMode" : "DEFAULT"
+      },
+      "type" : "DEFAULT"
+    }, {
+      "codeName" : "MobileDefault",
+      "name" : "[TYPE][类型]移动端默认",
+      "getPSDEFFormItem" : {
+        "codeName" : "MobileDefault",
+        "editorType" : "MOBTEXT",
+        "name" : "[TYPE][类型]移动端默认",
+        "stringLength" : 100,
+        "uIMode" : "MOBILEDEFAULT",
+        "mobileMode" : true
+      },
+      "type" : "MOBILEDEFAULT",
+      "mobileMode" : true
+    } ],
+    "codeName" : "TYPE",
+    "logicName" : "类型",
+    "name" : "TYPE",
+    "stdDataType" : 25,
+    "stringLength" : 100
+  }, {
     "getAllPSAppDEFUIModes" : [ {
       "codeName" : "MobileDefault",
       "name" : "[BOOKCHILD4ID][图书子4标识]移动端默认",
@@ -647,11 +678,61 @@
     "name" : "CREATEMAN",
     "stdDataType" : 25,
     "stringLength" : 60
+  }, {
+    "getAllPSAppDEFUIModes" : [ {
+      "codeName" : "Default",
+      "name" : "[BOOKID][书标识]",
+      "getPSDEFFormItem" : {
+        "codeName" : "Default",
+        "editorType" : "HIDDEN",
+        "name" : "[BOOKID][书标识]",
+        "getRefPSDataEntity" : {
+          "modelref" : true,
+          "path" : "PSMODULES/common/PSDATAENTITIES/Book.json"
+        },
+        "stringLength" : 100,
+        "uIMode" : "DEFAULT"
+      },
+      "type" : "DEFAULT"
+    }, {
+      "codeName" : "MobileDefault",
+      "name" : "[BOOKID][书标识]移动端默认",
+      "getPSDEFFormItem" : {
+        "codeName" : "MobileDefault",
+        "editorType" : "HIDDEN",
+        "name" : "[BOOKID][书标识]移动端默认",
+        "getRefPSDataEntity" : {
+          "modelref" : true,
+          "path" : "PSMODULES/common/PSDATAENTITIES/Book.json"
+        },
+        "stringLength" : 100,
+        "uIMode" : "MOBILEDEFAULT",
+        "mobileMode" : true
+      },
+      "type" : "MOBILEDEFAULT",
+      "mobileMode" : true
+    } ],
+    "codeName" : "BookId",
+    "logicName" : "书标识",
+    "name" : "BOOKID",
+    "stdDataType" : 25,
+    "stringLength" : 100
   } ],
   "getAllPSAppDEMethodDTOs" : [ {
     "codeName" : "BOOKCHILD4DTO",
     "name" : "BOOKCHILD4DTO",
     "getPSAppDEMethodDTOFields" : [ {
+      "codeName" : "TYPE",
+      "logicName" : "类型",
+      "name" : "TYPE",
+      "getPSAppDEField" : {
+        "name" : "TYPE",
+        "codeName" : "TYPE"
+      },
+      "sourceType" : "DEFIELD",
+      "stdDataType" : 25,
+      "type" : "SIMPLE"
+    }, {
       "codeName" : "BOOKCHILD4Id",
       "logicName" : "图书子4标识",
       "name" : "BOOKCHILD4Id",
@@ -674,6 +755,17 @@
       "sourceType" : "DEFIELD",
       "stdDataType" : 25,
       "type" : "SIMPLE"
+    }, {
+      "codeName" : "BookId",
+      "logicName" : "书标识",
+      "name" : "BookId",
+      "getPSAppDEField" : {
+        "name" : "BOOKID",
+        "codeName" : "BookId"
+      },
+      "sourceType" : "DEFIELD",
+      "stdDataType" : 25,
+      "type" : "SIMPLE"
     }, {
       "codeName" : "CreateDate",
       "jsonFormat" : "yyyy-MM-dd HH:mm:ss",
@@ -752,6 +844,17 @@
       "sourceType" : "DEFSEARCHMODE",
       "stdDataType" : 25,
       "type" : "SIMPLE"
+    }, {
+      "codeName" : "N_BOOKID_EQ",
+      "logicName" : "书标识",
+      "name" : "N_BOOKID_EQ",
+      "getPSAppDEField" : {
+        "name" : "BOOKID",
+        "codeName" : "BookId"
+      },
+      "sourceType" : "DEFSEARCHMODE",
+      "stdDataType" : 25,
+      "type" : "SIMPLE"
     } ],
     "sourceType" : "DE",
     "type" : "DEFILTER"

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/BOOKCHILD5.json

@@ -323,6 +323,37 @@
     "builtinMethod" : false
   } ],
   "getAllPSAppDEFields" : [ {
+    "getAllPSAppDEFUIModes" : [ {
+      "codeName" : "Default",
+      "name" : "[TYPE][类型]",
+      "getPSDEFFormItem" : {
+        "codeName" : "Default",
+        "editorType" : "TEXTBOX",
+        "name" : "[TYPE][类型]",
+        "stringLength" : 100,
+        "uIMode" : "DEFAULT"
+      },
+      "type" : "DEFAULT"
+    }, {
+      "codeName" : "MobileDefault",
+      "name" : "[TYPE][类型]移动端默认",
+      "getPSDEFFormItem" : {
+        "codeName" : "MobileDefault",
+        "editorType" : "MOBTEXT",
+        "name" : "[TYPE][类型]移动端默认",
+        "stringLength" : 100,
+        "uIMode" : "MOBILEDEFAULT",
+        "mobileMode" : true
+      },
+      "type" : "MOBILEDEFAULT",
+      "mobileMode" : true
+    } ],
+    "codeName" : "TYPE",
+    "logicName" : "类型",
+    "name" : "TYPE",
+    "stdDataType" : 25,
+    "stringLength" : 100
+  }, {
     "getAllPSAppDEFUIModes" : [ {
       "codeName" : "MobileDefault",
       "name" : "[BOOKCHILD5NAME][图书子5名称]移动端默认",
@@ -647,11 +678,61 @@
     "name" : "UPDATEDATE",
     "stdDataType" : 5,
     "valueFormat" : "YYYY-MM-DD HH:mm:ss"
+  }, {
+    "getAllPSAppDEFUIModes" : [ {
+      "codeName" : "Default",
+      "name" : "[BOOKID][书标识]",
+      "getPSDEFFormItem" : {
+        "codeName" : "Default",
+        "editorType" : "HIDDEN",
+        "name" : "[BOOKID][书标识]",
+        "getRefPSDataEntity" : {
+          "modelref" : true,
+          "path" : "PSMODULES/common/PSDATAENTITIES/Book.json"
+        },
+        "stringLength" : 100,
+        "uIMode" : "DEFAULT"
+      },
+      "type" : "DEFAULT"
+    }, {
+      "codeName" : "MobileDefault",
+      "name" : "[BOOKID][书标识]移动端默认",
+      "getPSDEFFormItem" : {
+        "codeName" : "MobileDefault",
+        "editorType" : "HIDDEN",
+        "name" : "[BOOKID][书标识]移动端默认",
+        "getRefPSDataEntity" : {
+          "modelref" : true,
+          "path" : "PSMODULES/common/PSDATAENTITIES/Book.json"
+        },
+        "stringLength" : 100,
+        "uIMode" : "MOBILEDEFAULT",
+        "mobileMode" : true
+      },
+      "type" : "MOBILEDEFAULT",
+      "mobileMode" : true
+    } ],
+    "codeName" : "BookId",
+    "logicName" : "书标识",
+    "name" : "BOOKID",
+    "stdDataType" : 25,
+    "stringLength" : 100
   } ],
   "getAllPSAppDEMethodDTOs" : [ {
     "codeName" : "BOOKCHILD5DTO",
     "name" : "BOOKCHILD5DTO",
     "getPSAppDEMethodDTOFields" : [ {
+      "codeName" : "TYPE",
+      "logicName" : "类型",
+      "name" : "TYPE",
+      "getPSAppDEField" : {
+        "name" : "TYPE",
+        "codeName" : "TYPE"
+      },
+      "sourceType" : "DEFIELD",
+      "stdDataType" : 25,
+      "type" : "SIMPLE"
+    }, {
       "codeName" : "BOOKCHILD5Id",
       "logicName" : "图书子5标识",
       "name" : "BOOKCHILD5Id",
@@ -674,6 +755,17 @@
       "sourceType" : "DEFIELD",
       "stdDataType" : 25,
       "type" : "SIMPLE"
+    }, {
+      "codeName" : "BookId",
+      "logicName" : "书标识",
+      "name" : "BookId",
+      "getPSAppDEField" : {
+        "name" : "BOOKID",
+        "codeName" : "BookId"
+      },
+      "sourceType" : "DEFIELD",
+      "stdDataType" : 25,
+      "type" : "SIMPLE"
     }, {
       "codeName" : "CreateDate",
       "jsonFormat" : "yyyy-MM-dd HH:mm:ss",
@@ -752,6 +844,17 @@
       "sourceType" : "DEFSEARCHMODE",
       "stdDataType" : 25,
       "type" : "SIMPLE"
+    }, {
+      "codeName" : "N_BOOKID_EQ",
+      "logicName" : "书标识",
+      "name" : "N_BOOKID_EQ",
+      "getPSAppDEField" : {
+        "name" : "BOOKID",
+        "codeName" : "BookId"
+      },
+      "sourceType" : "DEFSEARCHMODE",
+      "stdDataType" : 25,
+      "type" : "SIMPLE"
     } ],
     "sourceType" : "DE",
     "type" : "DEFILTER"

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSFORMS/Main2.json

@@ -397,32 +397,11 @@
               "codeName" : "BookChild1Name"
             }
           }, {
-            "id" : "createman",
+            "id" : "type",
             "dataType" : 25,
             "getPSAppDEField" : {
-              "name" : "CREATEMAN",
-              "codeName" : "CreateMan"
-            }
-          }, {
-            "id" : "createdate",
-            "dataType" : 5,
-            "getPSAppDEField" : {
-              "name" : "CREATEDATE",
-              "codeName" : "CreateDate"
-            }
-          }, {
-            "id" : "updateman",
-            "dataType" : 25,
-            "getPSAppDEField" : {
-              "name" : "UPDATEMAN",
-              "codeName" : "UpdateMan"
-            }
-          }, {
-            "id" : "updatedate",
-            "dataType" : 5,
-            "getPSAppDEField" : {
-              "name" : "UPDATEDATE",
-              "codeName" : "UpdateDate"
+              "name" : "TYPE",
+              "codeName" : "TYPE"
             }
           }, {
             "id" : "bookchild1id",
@@ -473,163 +452,37 @@
                 },
                 "allowEmpty" : true,
                 "showCaption" : true
-              } ],
-              "getPSLayout" : {
-                "childColLG" : -1,
-                "childColMD" : 24,
-                "childColSM" : -1,
-                "childColXS" : -1,
-                "columnCount" : 24,
-                "layout" : "TABLE_24COL"
-              },
-              "getPSLayoutPos" : {
-                "colMD" : 24,
-                "layout" : "TABLE_24COL"
-              },
-              "infoGroupMode" : false,
-              "showCaption" : true
-            } ],
-            "getPSLayout" : {
-              "childColLG" : -1,
-              "childColMD" : 24,
-              "childColSM" : -1,
-              "childColXS" : -1,
-              "columnCount" : 24,
-              "layout" : "TABLE_24COL"
-            },
-            "infoGroupMode" : false
               }, {
-            "caption" : "其它",
-            "codeName" : "formpage2",
-            "detailStyle" : "DEFAULT",
-            "detailType" : "FORMPAGE",
-            "name" : "formpage2",
-            "getPSDEFormDetails" : [ {
-              "actionGroupExtractMode" : "ITEM",
-              "caption" : "操作信息",
-              "codeName" : "group2",
-              "detailStyle" : "DEFAULT",
-              "detailType" : "GROUPPANEL",
-              "name" : "group2",
-              "getPSDEFormDetails" : [ {
-                "caption" : "建立人",
-                "codeName" : "createman",
+                "caption" : "类型",
+                "codeName" : "type",
                 "dataType" : 25,
                 "detailStyle" : "DEFAULT",
                 "detailType" : "FORMITEM",
                 "enableCond" : 3,
-                "ignoreInput" : 3,
-                "labelPos" : "LEFT",
-                "labelWidth" : 130,
-                "name" : "createman",
-                "noPrivDisplayMode" : 1,
-                "getPSAppDEField" : {
-                  "name" : "CREATEMAN",
-                  "codeName" : "CreateMan"
-                },
-                "getPSEditor" : {
-                  "editorType" : "SPAN",
-                  "name" : "createman",
-                  "getPSAppCodeList" : {
-                    "modelref" : true,
-                    "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SysOperator.json"
-                  },
-                  "enableLinkView" : false
-                },
-                "getPSLayoutPos" : {
-                  "colMD" : 24,
-                  "layout" : "TABLE_24COL"
-                },
-                "allowEmpty" : true,
-                "convertToCodeItemText" : true,
-                "showCaption" : true
-              }, {
-                "caption" : "建立时间",
-                "codeName" : "createdate",
-                "dataType" : 5,
-                "detailStyle" : "DEFAULT",
-                "detailType" : "FORMITEM",
-                "enableCond" : 3,
-                "ignoreInput" : 3,
-                "labelPos" : "LEFT",
-                "labelWidth" : 130,
-                "name" : "createdate",
-                "noPrivDisplayMode" : 1,
-                "getPSAppDEField" : {
-                  "name" : "CREATEDATE",
-                  "codeName" : "CreateDate"
-                },
-                "getPSEditor" : {
-                  "editorType" : "SPAN",
-                  "name" : "createdate",
-                  "enableLinkView" : false
-                },
-                "getPSLayoutPos" : {
-                  "colMD" : 24,
-                  "layout" : "TABLE_24COL"
-                },
-                "valueFormat" : "YYYY-MM-DD HH:mm:ss",
-                "allowEmpty" : true,
-                "showCaption" : true
-              }, {
-                "caption" : "更新人",
-                "codeName" : "updateman",
-                "dataType" : 25,
-                "detailStyle" : "DEFAULT",
-                "detailType" : "FORMITEM",
-                "enableCond" : 3,
-                "ignoreInput" : 3,
+                "ignoreInput" : 0,
                 "labelPos" : "LEFT",
                 "labelWidth" : 130,
-                "name" : "updateman",
+                "name" : "type",
                 "noPrivDisplayMode" : 1,
                 "getPSAppDEField" : {
-                  "name" : "UPDATEMAN",
-                  "codeName" : "UpdateMan"
+                  "name" : "TYPE",
+                  "codeName" : "TYPE"
                 },
                 "getPSEditor" : {
-                  "editorType" : "SPAN",
-                  "name" : "updateman",
+                  "editorType" : "DROPDOWNLIST",
+                  "name" : "type",
                   "getPSAppCodeList" : {
                     "modelref" : true,
-                    "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SysOperator.json"
-                  },
-                  "enableLinkView" : false
-                },
-                "getPSLayoutPos" : {
-                  "colMD" : 24,
-                  "layout" : "TABLE_24COL"
-                },
-                "allowEmpty" : true,
-                "convertToCodeItemText" : true,
-                "showCaption" : true
-              }, {
-                "caption" : "更新时间",
-                "codeName" : "updatedate",
-                "dataType" : 5,
-                "detailStyle" : "DEFAULT",
-                "detailType" : "FORMITEM",
-                "enableCond" : 3,
-                "ignoreInput" : 3,
-                "labelPos" : "LEFT",
-                "labelWidth" : 130,
-                "name" : "updatedate",
-                "noPrivDisplayMode" : 1,
-                "getPSAppDEField" : {
-                  "name" : "UPDATEDATE",
-                  "codeName" : "UpdateDate"
+                    "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/CodeList44.json"
                   },
-                "getPSEditor" : {
-                  "editorType" : "SPAN",
-                  "name" : "updatedate",
-                  "enableLinkView" : false
+                  "singleSelect" : true
                 },
                 "getPSLayoutPos" : {
                   "colMD" : 24,
                   "layout" : "TABLE_24COL"
                 },
-                "valueFormat" : "YYYY-MM-DD HH:mm:ss",
                 "allowEmpty" : true,
+                "needCodeListConfig" : true,
                 "showCaption" : true
               } ],
               "getPSLayout" : {
@@ -698,7 +551,7 @@
               "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BookChild1.json"
             }
           },
-          "noTabHeader" : false,
+          "noTabHeader" : true,
           "name" : "mdctrl1_form",
           "modelid" : "93b32080d4141f98597ca14ea1667462",
           "modeltype" : "PSDEFORM_EDITFORM"

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/BookChild1.json

@@ -273,6 +273,38 @@
     "builtinMethod" : false
   } ],
   "getAllPSAppDEFields" : [ {
+    "getAllPSAppDEFUIModes" : [ {
+      "codeName" : "MobileDefault",
+      "name" : "[TYPE][类型]移动端默认",
+      "getPSDEFFormItem" : {
+        "codeName" : "MobileDefault",
+        "editorType" : "MOBTEXT",
+        "name" : "[TYPE][类型]移动端默认",
+        "stringLength" : 100,
+        "uIMode" : "MOBILEDEFAULT",
+        "mobileMode" : true
+      },
+      "type" : "MOBILEDEFAULT",
+      "mobileMode" : true
+    }, {
+      "codeName" : "Default",
+      "name" : "[TYPE][类型]",
+      "getPSDEFFormItem" : {
+        "codeName" : "Default",
+        "editorType" : "TEXTBOX",
+        "name" : "[TYPE][类型]",
+        "stringLength" : 100,
+        "uIMode" : "DEFAULT"
+      },
+      "type" : "DEFAULT"
+    } ],
+    "codeName" : "TYPE",
+    "logicName" : "类型",
+    "name" : "TYPE",
+    "stdDataType" : 25,
+    "stringLength" : 100,
+    "enableFrontOnly" : true
+  }, {
     "getAllPSAppDEFUIModes" : [ {
       "codeName" : "Default",
       "name" : "[BOOKCHILD1NAME][图书子1名称]",
@@ -522,6 +554,17 @@
     "codeName" : "BookChild1DTO",
     "name" : "BookChild1DTO",
     "getPSAppDEMethodDTOFields" : [ {
+      "codeName" : "TYPE",
+      "logicName" : "类型",
+      "name" : "TYPE",
+      "getPSAppDEField" : {
+        "name" : "TYPE",
+        "codeName" : "TYPE"
+      },
+      "sourceType" : "DEFIELD",
+      "stdDataType" : 25,
+      "type" : "SIMPLE"
+    }, {
       "codeName" : "BookChild1Id",
       "logicName" : "图书子1标识",
       "name" : "BookChild1Id",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/BookChild1/PSFORMS/Main.json

@@ -120,32 +120,11 @@
       "codeName" : "BookChild1Name"
     }
   }, {
-    "id" : "createman",
+    "id" : "type",
     "dataType" : 25,
     "getPSAppDEField" : {
-      "name" : "CREATEMAN",
-      "codeName" : "CreateMan"
-    }
-  }, {
-    "id" : "createdate",
-    "dataType" : 5,
-    "getPSAppDEField" : {
-      "name" : "CREATEDATE",
-      "codeName" : "CreateDate"
-    }
-  }, {
-    "id" : "updateman",
-    "dataType" : 25,
-    "getPSAppDEField" : {
-      "name" : "UPDATEMAN",
-      "codeName" : "UpdateMan"
-    }
-  }, {
-    "id" : "updatedate",
-    "dataType" : 5,
-    "getPSAppDEField" : {
-      "name" : "UPDATEDATE",
-      "codeName" : "UpdateDate"
+      "name" : "TYPE",
+      "codeName" : "TYPE"
     }
   }, {
     "id" : "bookchild1id",
@@ -196,163 +175,37 @@
         },
         "allowEmpty" : true,
         "showCaption" : true
-      } ],
-      "getPSLayout" : {
-        "childColLG" : -1,
-        "childColMD" : 24,
-        "childColSM" : -1,
-        "childColXS" : -1,
-        "columnCount" : 24,
-        "layout" : "TABLE_24COL"
-      },
-      "getPSLayoutPos" : {
-        "colMD" : 24,
-        "layout" : "TABLE_24COL"
-      },
-      "infoGroupMode" : false,
-      "showCaption" : true
-    } ],
-    "getPSLayout" : {
-      "childColLG" : -1,
-      "childColMD" : 24,
-      "childColSM" : -1,
-      "childColXS" : -1,
-      "columnCount" : 24,
-      "layout" : "TABLE_24COL"
-    },
-    "infoGroupMode" : false
-  }, {
-    "caption" : "其它",
-    "codeName" : "formpage2",
-    "detailStyle" : "DEFAULT",
-    "detailType" : "FORMPAGE",
-    "name" : "formpage2",
-    "getPSDEFormDetails" : [ {
-      "actionGroupExtractMode" : "ITEM",
-      "caption" : "操作信息",
-      "codeName" : "group2",
-      "detailStyle" : "DEFAULT",
-      "detailType" : "GROUPPANEL",
-      "name" : "group2",
-      "getPSDEFormDetails" : [ {
-        "caption" : "建立人",
-        "codeName" : "createman",
-        "dataType" : 25,
-        "detailStyle" : "DEFAULT",
-        "detailType" : "FORMITEM",
-        "enableCond" : 3,
-        "ignoreInput" : 3,
-        "labelPos" : "LEFT",
-        "labelWidth" : 130,
-        "name" : "createman",
-        "noPrivDisplayMode" : 1,
-        "getPSAppDEField" : {
-          "name" : "CREATEMAN",
-          "codeName" : "CreateMan"
-        },
-        "getPSEditor" : {
-          "editorType" : "SPAN",
-          "name" : "createman",
-          "getPSAppCodeList" : {
-            "modelref" : true,
-            "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SysOperator.json"
-          },
-          "enableLinkView" : false
-        },
-        "getPSLayoutPos" : {
-          "colMD" : 24,
-          "layout" : "TABLE_24COL"
-        },
-        "allowEmpty" : true,
-        "convertToCodeItemText" : true,
-        "showCaption" : true
       }, {
-        "caption" : "建立时间",
-        "codeName" : "createdate",
-        "dataType" : 5,
-        "detailStyle" : "DEFAULT",
-        "detailType" : "FORMITEM",
-        "enableCond" : 3,
-        "ignoreInput" : 3,
-        "labelPos" : "LEFT",
-        "labelWidth" : 130,
-        "name" : "createdate",
-        "noPrivDisplayMode" : 1,
-        "getPSAppDEField" : {
-          "name" : "CREATEDATE",
-          "codeName" : "CreateDate"
-        },
-        "getPSEditor" : {
-          "editorType" : "SPAN",
-          "name" : "createdate",
-          "enableLinkView" : false
-        },
-        "getPSLayoutPos" : {
-          "colMD" : 24,
-          "layout" : "TABLE_24COL"
-        },
-        "valueFormat" : "YYYY-MM-DD HH:mm:ss",
-        "allowEmpty" : true,
-        "showCaption" : true
-      }, {
-        "caption" : "更新人",
-        "codeName" : "updateman",
+        "caption" : "类型",
+        "codeName" : "type",
         "dataType" : 25,
         "detailStyle" : "DEFAULT",
         "detailType" : "FORMITEM",
         "enableCond" : 3,
-        "ignoreInput" : 3,
+        "ignoreInput" : 0,
         "labelPos" : "LEFT",
         "labelWidth" : 130,
-        "name" : "updateman",
+        "name" : "type",
         "noPrivDisplayMode" : 1,
         "getPSAppDEField" : {
-          "name" : "UPDATEMAN",
-          "codeName" : "UpdateMan"
+          "name" : "TYPE",
+          "codeName" : "TYPE"
         },
         "getPSEditor" : {
-          "editorType" : "SPAN",
-          "name" : "updateman",
+          "editorType" : "DROPDOWNLIST",
+          "name" : "type",
           "getPSAppCodeList" : {
             "modelref" : true,
-            "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SysOperator.json"
-          },
-          "enableLinkView" : false
-        },
-        "getPSLayoutPos" : {
-          "colMD" : 24,
-          "layout" : "TABLE_24COL"
-        },
-        "allowEmpty" : true,
-        "convertToCodeItemText" : true,
-        "showCaption" : true
-      }, {
-        "caption" : "更新时间",
-        "codeName" : "updatedate",
-        "dataType" : 5,
-        "detailStyle" : "DEFAULT",
-        "detailType" : "FORMITEM",
-        "enableCond" : 3,
-        "ignoreInput" : 3,
-        "labelPos" : "LEFT",
-        "labelWidth" : 130,
-        "name" : "updatedate",
-        "noPrivDisplayMode" : 1,
-        "getPSAppDEField" : {
-          "name" : "UPDATEDATE",
-          "codeName" : "UpdateDate"
+            "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/CodeList44.json"
           },
-        "getPSEditor" : {
-          "editorType" : "SPAN",
-          "name" : "updatedate",
-          "enableLinkView" : false
+          "singleSelect" : true
         },
         "getPSLayoutPos" : {
           "colMD" : 24,
           "layout" : "TABLE_24COL"
         },
-        "valueFormat" : "YYYY-MM-DD HH:mm:ss",
         "allowEmpty" : true,
+        "needCodeListConfig" : true,
         "showCaption" : true
       } ],
       "getPSLayout" : {
@@ -421,7 +274,7 @@
       "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BookChild1.json"
     }
   },
-  "noTabHeader" : false,
+  "noTabHeader" : true,
   "modelid" : "93b32080d4141f98597ca14ea1667462",
   "modeltype" : "PSDEFORM_EDITFORM"
 }
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TESTGRID.json

@@ -446,6 +446,37 @@
     "name" : "TEST4",
     "stdDataType" : 25,
     "stringLength" : 100
+  }, {
+    "getAllPSAppDEFUIModes" : [ {
+      "codeName" : "Default",
+      "name" : "[GROUPNAME][分组属性]",
+      "getPSDEFFormItem" : {
+        "codeName" : "Default",
+        "editorType" : "TEXTBOX",
+        "name" : "[GROUPNAME][分组属性]",
+        "stringLength" : 100,
+        "uIMode" : "DEFAULT"
+      },
+      "type" : "DEFAULT"
+    }, {
+      "codeName" : "MobileDefault",
+      "name" : "[GROUPNAME][分组属性]移动端默认",
+      "getPSDEFFormItem" : {
+        "codeName" : "MobileDefault",
+        "editorType" : "MOBTEXT",
+        "name" : "[GROUPNAME][分组属性]移动端默认",
+        "stringLength" : 100,
+        "uIMode" : "MOBILEDEFAULT",
+        "mobileMode" : true
+      },
+      "type" : "MOBILEDEFAULT",
+      "mobileMode" : true
+    } ],
+    "codeName" : "GroupName",
+    "logicName" : "分组属性",
+    "name" : "GROUPNAME",
+    "stdDataType" : 25,
+    "stringLength" : 100
   }, {
     "getAllPSAppDEFUIModes" : [ {
       "codeName" : "Default",
@@ -819,6 +850,17 @@
       "sourceType" : "DEFIELD",
       "stdDataType" : 25,
       "type" : "SIMPLE"
+    }, {
+      "codeName" : "GroupName",
+      "logicName" : "分组属性",
+      "name" : "GroupName",
+      "getPSAppDEField" : {
+        "name" : "GROUPNAME",
+        "codeName" : "GroupName"
+      },
+      "sourceType" : "DEFIELD",
+      "stdDataType" : 25,
+      "type" : "SIMPLE"
     }, {
       "codeName" : "CreateDate",
       "jsonFormat" : "yyyy-MM-dd HH:mm:ss",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TESTGRID/PSFORMS/Test.json

@@ -112,6 +112,13 @@
     "id" : "srfsourcekey",
     "hidden" : true,
     "dataType" : 25
+  }, {
+    "id" : "groupname",
+    "dataType" : 25,
+    "getPSAppDEField" : {
+      "name" : "GROUPNAME",
+      "codeName" : "GroupName"
+    }
   }, {
     "id" : "test1",
     "dataType" : 25,
@@ -161,6 +168,33 @@
       "detailType" : "GROUPPANEL",
       "name" : "grouppanel1",
       "getPSDEFormDetails" : [ {
+        "caption" : "分组属性",
+        "codeName" : "groupname",
+        "dataType" : 25,
+        "detailStyle" : "DEFAULT",
+        "detailType" : "FORMITEM",
+        "enableCond" : 3,
+        "ignoreInput" : 0,
+        "labelPos" : "LEFT",
+        "labelWidth" : 130,
+        "name" : "groupname",
+        "noPrivDisplayMode" : 1,
+        "getPSAppDEField" : {
+          "name" : "GROUPNAME",
+          "codeName" : "GroupName"
+        },
+        "getPSEditor" : {
+          "editorType" : "TEXTBOX",
+          "maxLength" : 100,
+          "name" : "groupname"
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "allowEmpty" : true,
+        "showCaption" : true
+      }, {
         "caption" : "属性",
         "codeName" : "test1",
         "dataType" : 25,

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TESTGRID/PSGRIDS/Usr08223952GridView_Grid.json

@@ -2,7 +2,7 @@
   "aggMode" : "NONE",
   "codeName" : "Usr08223952GridView_Grid",
   "columnEnableFilter" : 2,
-  "columnEnableLink" : 2,
+  "columnEnableLink" : 0,
   "controlType" : "GRID",
   "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TESTGRID/PSGRIDS/Usr08223952GridView_Grid.json",
   "emptyText" : "测试无值显示内容",
@@ -23,22 +23,18 @@
   "gridStyle" : "GROUPGRID",
   "groupMode" : "AUTO",
   "getGroupPSAppDEField" : {
-    "name" : "UPDATEMAN",
-    "codeName" : "UpdateMan"
-  },
-  "getGroupPSCodeList" : {
-    "modelref" : true,
-    "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SysOperator.json"
+    "name" : "GROUPNAME",
+    "codeName" : "GroupName"
   },
   "getGroupPSDEField" : {
-    "name" : "UPDATEMAN",
-    "codeName" : "UpdateMan"
+    "name" : "GROUPNAME",
+    "codeName" : "GroupName"
   },
   "logicName" : "数据表格数据模型_表格",
   "minorSortDir" : "DESC",
   "getMinorSortPSAppDEField" : {
-    "name" : "CREATEMAN",
-    "codeName" : "CreateMan"
+    "name" : "UPDATEDATE",
+    "codeName" : "UpdateDate"
   },
   "getPSAppDataEntity" : {
     "modelref" : true,
@@ -271,6 +267,23 @@
     "widthUnit" : "PX",
     "enableRowEdit" : true,
     "enableSort" : false
+  }, {
+    "align" : "LEFT",
+    "cLConvertMode" : "NONE",
+    "caption" : "分组属性",
+    "codeName" : "groupname",
+    "columnType" : "DEFGRIDCOLUMN",
+    "dataItemName" : "groupname",
+    "excelCaption" : "分组属性",
+    "name" : "groupname",
+    "noPrivDisplayMode" : 1,
+    "getPSAppDEField" : {
+      "name" : "GROUPNAME",
+      "codeName" : "GroupName"
+    },
+    "width" : 100,
+    "widthUnit" : "PX",
+    "enableSort" : false
   } ],
   "getPSDEGridDataItems" : [ {
     "dataType" : 25,
@@ -344,6 +357,13 @@
       "name" : "TEST1",
       "codeName" : "Test1"
     }
+  }, {
+    "dataType" : 25,
+    "name" : "groupname",
+    "getPSAppDEField" : {
+      "name" : "GROUPNAME",
+      "codeName" : "GroupName"
+    }
   }, {
     "dataType" : 25,
     "name" : "srfkey",
@@ -483,7 +503,7 @@
       "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TESTGRID.json"
     }
   },
-  "sortMode" : "REMOTE",
+  "sortMode" : "LOCAL",
   "hasWFDataItems" : false,
   "enableColFilter" : false,
   "enableCustomized" : true,

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTGRIDUsr08223952GridView.json

@@ -667,7 +667,7 @@
     "aggMode" : "NONE",
     "codeName" : "Usr08223952GridView_Grid",
     "columnEnableFilter" : 2,
-    "columnEnableLink" : 2,
+    "columnEnableLink" : 0,
     "controlType" : "GRID",
     "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TESTGRID/PSGRIDS/Usr08223952GridView_Grid.json",
     "emptyText" : "测试无值显示内容",
@@ -688,22 +688,18 @@
     "gridStyle" : "GROUPGRID",
     "groupMode" : "AUTO",
     "getGroupPSAppDEField" : {
-      "name" : "UPDATEMAN",
-      "codeName" : "UpdateMan"
-    },
-    "getGroupPSCodeList" : {
-      "modelref" : true,
-      "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SysOperator.json"
+      "name" : "GROUPNAME",
+      "codeName" : "GroupName"
     },
     "getGroupPSDEField" : {
-      "name" : "UPDATEMAN",
-      "codeName" : "UpdateMan"
+      "name" : "GROUPNAME",
+      "codeName" : "GroupName"
     },
     "logicName" : "数据表格数据模型_表格",
     "minorSortDir" : "DESC",
     "getMinorSortPSAppDEField" : {
-      "name" : "CREATEMAN",
-      "codeName" : "CreateMan"
+      "name" : "UPDATEDATE",
+      "codeName" : "UpdateDate"
     },
     "getPSAppDataEntity" : {
       "modelref" : true,
@@ -1023,6 +1019,23 @@
       "widthUnit" : "PX",
       "enableRowEdit" : true,
       "enableSort" : false
+    }, {
+      "align" : "LEFT",
+      "cLConvertMode" : "NONE",
+      "caption" : "分组属性",
+      "codeName" : "groupname",
+      "columnType" : "DEFGRIDCOLUMN",
+      "dataItemName" : "groupname",
+      "excelCaption" : "分组属性",
+      "name" : "groupname",
+      "noPrivDisplayMode" : 1,
+      "getPSAppDEField" : {
+        "name" : "GROUPNAME",
+        "codeName" : "GroupName"
+      },
+      "width" : 100,
+      "widthUnit" : "PX",
+      "enableSort" : false
     } ],
     "getPSDEGridDataItems" : [ {
       "dataType" : 25,
@@ -1096,6 +1109,13 @@
         "name" : "TEST1",
         "codeName" : "Test1"
       }
+    }, {
+      "dataType" : 25,
+      "name" : "groupname",
+      "getPSAppDEField" : {
+        "name" : "GROUPNAME",
+        "codeName" : "GroupName"
+      }
     }, {
       "dataType" : 25,
       "name" : "srfkey",
@@ -1235,7 +1255,7 @@
         "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TESTGRID.json"
       }
     },
-    "sortMode" : "REMOTE",
+    "sortMode" : "LOCAL",
     "hasWFDataItems" : false,
     "enableColFilter" : false,
     "enableCustomized" : true,

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTGRIDUsr4EditView.json

@@ -807,6 +807,13 @@
       "id" : "srfsourcekey",
       "hidden" : true,
       "dataType" : 25
+    }, {
+      "id" : "groupname",
+      "dataType" : 25,
+      "getPSAppDEField" : {
+        "name" : "GROUPNAME",
+        "codeName" : "GroupName"
+      }
     }, {
       "id" : "test1",
       "dataType" : 25,
@@ -856,6 +863,33 @@
         "detailType" : "GROUPPANEL",
         "name" : "grouppanel1",
         "getPSDEFormDetails" : [ {
+          "caption" : "分组属性",
+          "codeName" : "groupname",
+          "dataType" : 25,
+          "detailStyle" : "DEFAULT",
+          "detailType" : "FORMITEM",
+          "enableCond" : 3,
+          "ignoreInput" : 0,
+          "labelPos" : "LEFT",
+          "labelWidth" : 130,
+          "name" : "groupname",
+          "noPrivDisplayMode" : 1,
+          "getPSAppDEField" : {
+            "name" : "GROUPNAME",
+            "codeName" : "GroupName"
+          },
+          "getPSEditor" : {
+            "editorType" : "TEXTBOX",
+            "maxLength" : 100,
+            "name" : "groupname"
+          },
+          "getPSLayoutPos" : {
+            "colMD" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "allowEmpty" : true,
+          "showCaption" : true
+        }, {
           "caption" : "属性",
           "codeName" : "test1",
           "dataType" : 25,

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr5EditView.json

@@ -1092,32 +1092,11 @@
                 "codeName" : "BookChild1Name"
               }
             }, {
-              "id" : "createman",
+              "id" : "type",
               "dataType" : 25,
               "getPSAppDEField" : {
-                "name" : "CREATEMAN",
-                "codeName" : "CreateMan"
-              }
-            }, {
-              "id" : "createdate",
-              "dataType" : 5,
-              "getPSAppDEField" : {
-                "name" : "CREATEDATE",
-                "codeName" : "CreateDate"
-              }
-            }, {
-              "id" : "updateman",
-              "dataType" : 25,
-              "getPSAppDEField" : {
-                "name" : "UPDATEMAN",
-                "codeName" : "UpdateMan"
-              }
-            }, {
-              "id" : "updatedate",
-              "dataType" : 5,
-              "getPSAppDEField" : {
-                "name" : "UPDATEDATE",
-                "codeName" : "UpdateDate"
+                "name" : "TYPE",
+                "codeName" : "TYPE"
               }
             }, {
               "id" : "bookchild1id",
@@ -1168,163 +1147,37 @@
                   },
                   "allowEmpty" : true,
                   "showCaption" : true
-                } ],
-                "getPSLayout" : {
-                  "childColLG" : -1,
-                  "childColMD" : 24,
-                  "childColSM" : -1,
-                  "childColXS" : -1,
-                  "columnCount" : 24,
-                  "layout" : "TABLE_24COL"
-                },
-                "getPSLayoutPos" : {
-                  "colMD" : 24,
-                  "layout" : "TABLE_24COL"
-                },
-                "infoGroupMode" : false,
-                "showCaption" : true
-              } ],
-              "getPSLayout" : {
-                "childColLG" : -1,
-                "childColMD" : 24,
-                "childColSM" : -1,
-                "childColXS" : -1,
-                "columnCount" : 24,
-                "layout" : "TABLE_24COL"
-              },
-              "infoGroupMode" : false
                 }, {
-              "caption" : "其它",
-              "codeName" : "formpage2",
-              "detailStyle" : "DEFAULT",
-              "detailType" : "FORMPAGE",
-              "name" : "formpage2",
-              "getPSDEFormDetails" : [ {
-                "actionGroupExtractMode" : "ITEM",
-                "caption" : "操作信息",
-                "codeName" : "group2",
-                "detailStyle" : "DEFAULT",
-                "detailType" : "GROUPPANEL",
-                "name" : "group2",
-                "getPSDEFormDetails" : [ {
-                  "caption" : "建立人",
-                  "codeName" : "createman",
+                  "caption" : "类型",
+                  "codeName" : "type",
                   "dataType" : 25,
                   "detailStyle" : "DEFAULT",
                   "detailType" : "FORMITEM",
                   "enableCond" : 3,
-                  "ignoreInput" : 3,
-                  "labelPos" : "LEFT",
-                  "labelWidth" : 130,
-                  "name" : "createman",
-                  "noPrivDisplayMode" : 1,
-                  "getPSAppDEField" : {
-                    "name" : "CREATEMAN",
-                    "codeName" : "CreateMan"
-                  },
-                  "getPSEditor" : {
-                    "editorType" : "SPAN",
-                    "name" : "createman",
-                    "getPSAppCodeList" : {
-                      "modelref" : true,
-                      "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SysOperator.json"
-                    },
-                    "enableLinkView" : false
-                  },
-                  "getPSLayoutPos" : {
-                    "colMD" : 24,
-                    "layout" : "TABLE_24COL"
-                  },
-                  "allowEmpty" : true,
-                  "convertToCodeItemText" : true,
-                  "showCaption" : true
-                }, {
-                  "caption" : "建立时间",
-                  "codeName" : "createdate",
-                  "dataType" : 5,
-                  "detailStyle" : "DEFAULT",
-                  "detailType" : "FORMITEM",
-                  "enableCond" : 3,
-                  "ignoreInput" : 3,
-                  "labelPos" : "LEFT",
-                  "labelWidth" : 130,
-                  "name" : "createdate",
-                  "noPrivDisplayMode" : 1,
-                  "getPSAppDEField" : {
-                    "name" : "CREATEDATE",
-                    "codeName" : "CreateDate"
-                  },
-                  "getPSEditor" : {
-                    "editorType" : "SPAN",
-                    "name" : "createdate",
-                    "enableLinkView" : false
-                  },
-                  "getPSLayoutPos" : {
-                    "colMD" : 24,
-                    "layout" : "TABLE_24COL"
-                  },
-                  "valueFormat" : "YYYY-MM-DD HH:mm:ss",
-                  "allowEmpty" : true,
-                  "showCaption" : true
-                }, {
-                  "caption" : "更新人",
-                  "codeName" : "updateman",
-                  "dataType" : 25,
-                  "detailStyle" : "DEFAULT",
-                  "detailType" : "FORMITEM",
-                  "enableCond" : 3,
-                  "ignoreInput" : 3,
+                  "ignoreInput" : 0,
                   "labelPos" : "LEFT",
                   "labelWidth" : 130,
-                  "name" : "updateman",
+                  "name" : "type",
                   "noPrivDisplayMode" : 1,
                   "getPSAppDEField" : {
-                    "name" : "UPDATEMAN",
-                    "codeName" : "UpdateMan"
+                    "name" : "TYPE",
+                    "codeName" : "TYPE"
                   },
                   "getPSEditor" : {
-                    "editorType" : "SPAN",
-                    "name" : "updateman",
+                    "editorType" : "DROPDOWNLIST",
+                    "name" : "type",
                     "getPSAppCodeList" : {
                       "modelref" : true,
-                      "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SysOperator.json"
-                    },
-                    "enableLinkView" : false
-                  },
-                  "getPSLayoutPos" : {
-                    "colMD" : 24,
-                    "layout" : "TABLE_24COL"
-                  },
-                  "allowEmpty" : true,
-                  "convertToCodeItemText" : true,
-                  "showCaption" : true
-                }, {
-                  "caption" : "更新时间",
-                  "codeName" : "updatedate",
-                  "dataType" : 5,
-                  "detailStyle" : "DEFAULT",
-                  "detailType" : "FORMITEM",
-                  "enableCond" : 3,
-                  "ignoreInput" : 3,
-                  "labelPos" : "LEFT",
-                  "labelWidth" : 130,
-                  "name" : "updatedate",
-                  "noPrivDisplayMode" : 1,
-                  "getPSAppDEField" : {
-                    "name" : "UPDATEDATE",
-                    "codeName" : "UpdateDate"
+                      "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/CodeList44.json"
                     },
-                  "getPSEditor" : {
-                    "editorType" : "SPAN",
-                    "name" : "updatedate",
-                    "enableLinkView" : false
+                    "singleSelect" : true
                   },
                   "getPSLayoutPos" : {
                     "colMD" : 24,
                     "layout" : "TABLE_24COL"
                   },
-                  "valueFormat" : "YYYY-MM-DD HH:mm:ss",
                   "allowEmpty" : true,
+                  "needCodeListConfig" : true,
                   "showCaption" : true
                 } ],
                 "getPSLayout" : {
@@ -1393,7 +1246,7 @@
                 "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BookChild1.json"
               }
             },
-            "noTabHeader" : false,
+            "noTabHeader" : true,
             "name" : "mdctrl1_form",
             "modelid" : "93b32080d4141f98597ca14ea1667462",
             "modeltype" : "PSDEFORM_EDITFORM"

trainsys-provider/pom.xml

@@ -33,7 +33,7 @@
 
     <profiles>
         <profile>
-            <id>trainsys</id>
+            <id>runtime</id>
             <build>
                 <resources>
                     <resource>

trainsys-provider/src/main/docker/Dockerfile

@@ -10,6 +10,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Duser.timezone=$TZ -Djava.security.egd=file:/dev/./urandom -jar /trainsys-provider.jar
 
-EXPOSE 50000
+EXPOSE 8081
 
 ADD trainsys-provider.jar /trainsys-provider.jar

trainsys-provider/src/main/docker/trainsys-provider-trainsys-k8s.yaml

@@ -22,32 +22,7 @@ spec:
         image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
         imagePullPolicy: Always
         ports:
-        - containerPort: 50000
-        env:
-        - name: SPRING_CLOUD_NACOS_DISCOVERY_IP
-          value: "172.16.240.140"      
-        - name: SERVER_PORT
-          value: "50000"
-        - name: SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR
-          value: "172.16.240.140:8848"
-        - name: SPRING_REDIS_HOST
-          value: "127.0.0.1"
-        - name: SPRING_REDIS_PORT
-          value: "6379"
-        - name: SPRING_REDIS_DATABASE
-          value: "0"
-        - name: SPRING_DATASOURCE_USERNAME
-          value: "a_LAB01_d23cc850e"
-        - name: SPRING_DATASOURCE_PASSWORD
-          value: "f9Df4556"
-        - name: SPRING_DATASOURCE_URL
-          value: "jdbc:mysql://172.16.186.185:3306/a_LAB01_d23cc850e?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&serverTimezone=Asia/Shanghai&allowMultiQueries=true&serverTimezone=GMT%2B8"
-        - name: SPRING_DATASOURCE_DRIVER-CLASS-NAME
-          value: "com.mysql.jdbc.Driver"
-        - name: SPRING_DATASOURCE_DEFAULTSCHEMA
-          value: "a_LAB01_d23cc850e"
-        - name: NACOS
-          value: "172.16.240.140:8848"      
+        - containerPort: 8081
 
 ---
 apiVersion: v1
@@ -60,9 +35,9 @@ spec:
   type: NodePort
   ports:
   - name: http
-    port: 50000
-    targetPort: 50000
-    nodePort: 50000
+    port: 8081
+    targetPort: 8081
+    nodePort: 8081
     protocol: TCP
   selector:
     app: trainsys-provider

trainsys-provider/src/main/docker/trainsys-provider-trainsys.yaml

@@ -3,23 +3,9 @@ services:
   trainsys-provider:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
     ports:
-      - "50000:50000"
+      - "8081:8081"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.140
-      - SERVER_PORT=50000
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.140:8848
-      - SPRING_CLOUD_NACOS_CONFIG_SERVER-ADDR=172.16.240.140:8848
-      - SPRING_REDIS_HOST=127.0.0.1
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_LAB01_d23cc850e
-      - SPRING_DATASOURCE_PASSWORD=f9Df4556
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_d23cc850e?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&serverTimezone=Asia/Shanghai&allowMultiQueries=true&serverTimezone=GMT%2B8
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_d23cc850e
-      - NACOS=172.16.240.140:8848
     deploy:
       resources:
            limits: