tony001 部署微服务接口 [TrainSys，默认服务接口]

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

@@ -32,6 +32,9 @@
   }, {
     "modelref" : true,
     "path" : "PSMODULES/Test/PSCODELISTS/UsrCodeList0320261658.json"
+  }, {
+    "modelref" : true,
+    "path" : "PSMODULES/Test/PSCODELISTS/FileType.json"
   }, {
     "modelref" : true,
     "path" : "PSMODULES/Test/PSCODELISTS/TreeDynaCodeList.json"

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSCODELISTS/FileType.json

+{
+  "codeListTag" : "Test__FileType",
+  "codeListType" : "STATIC",
+  "codeName" : "FileType",
+  "dynaInstMode" : 0,
+  "dynaModelFilePath" : "PSMODULES/Test/PSCODELISTS/FileType.json",
+  "emptyText" : "未定义",
+  "name" : "文件类型",
+  "getPSSystemModule" : {
+    "modelref" : true,
+    "path" : "PSMODULES/Test.json"
+  },
+  "refFlag" : true,
+  "systemTag" : "TrainSys",
+  "codeItemValueNumber" : false,
+  "enableCache" : true,
+  "subSysAsCloud" : false,
+  "subSysCodeList" : false,
+  "userScope" : false
+}
\ No newline at end of file

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

@@ -184,6 +184,12 @@
   } ],
   "getAllPSDEDBTables" : [ {
     "getAllPSDEFields" : [ {
+      "name" : "ICON",
+      "codeName" : "ICON"
+    }, {
+      "name" : "TYPE",
+      "codeName" : "TYPE"
+    }, {
       "name" : "FILENAME",
       "codeName" : "FILEName"
     }, {
@@ -317,6 +323,172 @@
     "enableFront" : true
   } ],
   "getAllPSDEFields" : [ {
+    "getAllPSDEFDTColumns" : [ {
+      "columnName" : "ICON",
+      "dBType" : "MYSQL5",
+      "name" : "ICON",
+      "queryCodeExp" : "t1.`ICON`",
+      "standardColumnName" : "`ICON`"
+    } ],
+    "getAllPSDEFUIModes" : [ {
+      "codeName" : "Default",
+      "name" : "[ICON][图标]",
+      "getPSDEFFormItem" : {
+        "codeName" : "Default",
+        "editorType" : "TEXTBOX",
+        "name" : "[ICON][图标]",
+        "stringLength" : 100,
+        "uIMode" : "DEFAULT"
+      },
+      "type" : "DEFAULT"
+    }, {
+      "codeName" : "MobileDefault",
+      "name" : "[ICON][图标]移动端默认",
+      "getPSDEFFormItem" : {
+        "codeName" : "MobileDefault",
+        "editorType" : "MOBTEXT",
+        "name" : "[ICON][图标]移动端默认",
+        "stringLength" : 100,
+        "uIMode" : "MOBILEDEFAULT",
+        "mobileMode" : true
+      },
+      "type" : "MOBILEDEFAULT",
+      "mobileMode" : true
+    } ],
+    "getAllPSDEFValueRules" : [ {
+      "codeName" : "Default",
+      "name" : "默认规则",
+      "getPSDEFVRGroupCondition" : {
+        "condOp" : "AND",
+        "condType" : "GROUP",
+        "name" : "默认组",
+        "getPSDEFVRConditions" : [ {
+          "condType" : "STRINGLENGTH",
+          "dEFName" : "ICON",
+          "maxValue" : 100,
+          "name" : "默认字符串长度",
+          "ruleInfo" : "内容长度必须小于等于[100]",
+          "includeMaxValue" : true,
+          "includeMinValue" : false,
+          "keyCond" : true
+        } ],
+        "ruleInfo" : "内容长度必须小于等于[100]"
+      },
+      "ruleInfo" : "内容长度必须小于等于[100]",
+      "checkDefault" : true,
+      "defaultMode" : true,
+      "enableBackend" : true,
+      "enableFront" : true
+    } ],
+    "codeName" : "ICON",
+    "dEFType" : 1,
+    "dataType" : "TEXT",
+    "importOrder" : 1000,
+    "length" : 100,
+    "logicName" : "图标",
+    "name" : "ICON",
+    "getPSDEDBTable" : {
+      "modelref" : true,
+      "id" : "Table"
+    },
+    "getPSSysDBColumn" : {
+      "modelref" : true,
+      "id" : "ICON"
+    },
+    "serviceCodeName" : "ICON",
+    "stdDataType" : 25,
+    "stringLength" : 100,
+    "valueFormat" : "%1$s"
+  }, {
+    "getAllPSDEFDTColumns" : [ {
+      "columnName" : "TYPE",
+      "dBType" : "MYSQL5",
+      "name" : "TYPE",
+      "queryCodeExp" : "t1.`TYPE`",
+      "standardColumnName" : "`TYPE`"
+    } ],
+    "getAllPSDEFSearchModes" : [ {
+      "codeName" : "N_TYPE_EQ",
+      "name" : "N_TYPE_EQ",
+      "stdDataType" : 25,
+      "valueOP" : "EQ"
+    } ],
+    "getAllPSDEFUIModes" : [ {
+      "codeName" : "MobileDefault",
+      "name" : "[TYPE][类型]移动端默认",
+      "getPSDEFFormItem" : {
+        "codeName" : "MobileDefault",
+        "editorType" : "MOBDROPDOWNLIST",
+        "name" : "[TYPE][类型]移动端默认",
+        "stringLength" : 60,
+        "uIMode" : "MOBILEDEFAULT",
+        "mobileMode" : true,
+        "needCodeListConfig" : true
+      },
+      "type" : "MOBILEDEFAULT",
+      "mobileMode" : true
+    }, {
+      "codeName" : "Default",
+      "name" : "[TYPE][类型]",
+      "getPSDEFFormItem" : {
+        "codeName" : "Default",
+        "editorType" : "DROPDOWNLIST",
+        "name" : "[TYPE][类型]",
+        "stringLength" : 60,
+        "uIMode" : "DEFAULT",
+        "needCodeListConfig" : true
+      },
+      "type" : "DEFAULT"
+    } ],
+    "getAllPSDEFValueRules" : [ {
+      "codeName" : "Default",
+      "name" : "默认规则",
+      "getPSDEFVRGroupCondition" : {
+        "condOp" : "AND",
+        "condType" : "GROUP",
+        "name" : "默认组",
+        "getPSDEFVRConditions" : [ {
+          "condType" : "STRINGLENGTH",
+          "dEFName" : "TYPE",
+          "maxValue" : 60,
+          "name" : "默认字符串长度",
+          "ruleInfo" : "内容长度必须小于等于[60]",
+          "includeMaxValue" : true,
+          "includeMinValue" : false,
+          "keyCond" : true
+        } ],
+        "ruleInfo" : "内容长度必须小于等于[60]"
+      },
+      "ruleInfo" : "内容长度必须小于等于[60]",
+      "checkDefault" : true,
+      "defaultMode" : true,
+      "enableBackend" : true,
+      "enableFront" : true
+    } ],
+    "codeName" : "TYPE",
+    "dEFType" : 1,
+    "dataType" : "SSCODELIST",
+    "importOrder" : 1000,
+    "length" : 60,
+    "logicName" : "类型",
+    "name" : "TYPE",
+    "getPSCodeList" : {
+      "modelref" : true,
+      "path" : "PSMODULES/Test/PSCODELISTS/FileType.json"
+    },
+    "getPSDEDBTable" : {
+      "modelref" : true,
+      "id" : "Table"
+    },
+    "getPSSysDBColumn" : {
+      "modelref" : true,
+      "id" : "TYPE"
+    },
+    "serviceCodeName" : "TYPE",
+    "stdDataType" : 25,
+    "stringLength" : 60,
+    "valueFormat" : "%1$s"
+  }, {
     "getAllPSDEFDTColumns" : [ {
       "columnName" : "FILENAME",
       "dBType" : "MYSQL5",
@@ -1046,6 +1218,28 @@
   "getAllPSDEMethodDTOs" : [ {
     "name" : "FILEDTO",
     "getPSDEMethodDTOFields" : [ {
+      "logicName" : "图标",
+      "name" : "ICON",
+      "getPSDEField" : {
+        "name" : "ICON",
+        "codeName" : "ICON"
+      },
+      "sourceType" : "DEFIELD",
+      "stdDataType" : 25,
+      "stringLength" : 100,
+      "type" : "SIMPLE"
+    }, {
+      "logicName" : "类型",
+      "name" : "TYPE",
+      "getPSDEField" : {
+        "name" : "TYPE",
+        "codeName" : "TYPE"
+      },
+      "sourceType" : "DEFIELD",
+      "stdDataType" : 25,
+      "stringLength" : 60,
+      "type" : "SIMPLE"
+    }, {
       "jsonFormat" : "yyyy-MM-dd HH:mm:ss",
       "logicName" : "建立时间",
       "name" : "CreateDate",
@@ -1218,6 +1412,20 @@
       "sourceType" : "DEFSEARCHMODE",
       "stdDataType" : 25,
       "type" : "SIMPLE"
+    }, {
+      "logicName" : "类型",
+      "name" : "N_TYPE_EQ",
+      "getPSDEFSearchMode" : {
+        "modelref" : true,
+        "id" : "N_TYPE_EQ"
+      },
+      "getPSDEField" : {
+        "name" : "TYPE",
+        "codeName" : "TYPE"
+      },
+      "sourceType" : "DEFSEARCHMODE",
+      "stdDataType" : 25,
+      "type" : "SIMPLE"
     } ],
     "sourceType" : "DE",
     "type" : "DEFILTER",

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

@@ -13,12 +13,18 @@
   }, {
     "expression" : "t1.`FILENAME`",
     "name" : "FILENAME"
+  }, {
+    "expression" : "t1.`ICON`",
+    "name" : "ICON"
   }, {
     "expression" : "t1.`PFILEID`",
     "name" : "PFILEID"
   }, {
     "expression" : "t11.`FILENAME`",
     "name" : "PFILENAME"
+  }, {
+    "expression" : "t1.`TYPE`",
+    "name" : "TYPE"
   }, {
     "expression" : "t1.`UPDATEDATE`",
     "name" : "UPDATEDATE"
@@ -26,6 +32,6 @@
     "expression" : "t1.`UPDATEMAN`",
     "name" : "UPDATEMAN"
   } ],
-  "queryCode" : "SELECT\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`FILEID`,\nt1.`FILENAME`,\nt1.`PFILEID`,\nt11.`FILENAME` AS `PFILENAME`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_FILE` t1 \nLEFT JOIN `T_FILE` t11 ON t1.`PFILEID` = t11.`FILEID` \n",
+  "queryCode" : "SELECT\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`FILEID`,\nt1.`FILENAME`,\nt1.`ICON`,\nt1.`PFILEID`,\nt11.`FILENAME` AS `PFILENAME`,\nt1.`TYPE`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_FILE` t1 \nLEFT JOIN `T_FILE` t11 ON t1.`PFILEID` = t11.`FILEID` \n",
   "id" : "PSMODULES/Test/PSDATAENTITIES/FILE/PSDEDATAQUERIES/Default/PSDEDQCODES/MYSQL5.json"
 }
\ No newline at end of file

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

@@ -13,12 +13,18 @@
   }, {
     "expression" : "t1.`FILENAME`",
     "name" : "FILENAME"
+  }, {
+    "expression" : "t1.`ICON`",
+    "name" : "ICON"
   }, {
     "expression" : "t1.`PFILEID`",
     "name" : "PFILEID"
   }, {
     "expression" : "t11.`FILENAME`",
     "name" : "PFILENAME"
+  }, {
+    "expression" : "t1.`TYPE`",
+    "name" : "TYPE"
   }, {
     "expression" : "t1.`UPDATEDATE`",
     "name" : "UPDATEDATE"
@@ -26,6 +32,6 @@
     "expression" : "t1.`UPDATEMAN`",
     "name" : "UPDATEMAN"
   } ],
-  "queryCode" : "SELECT\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`FILEID`,\nt1.`FILENAME`,\nt1.`PFILEID`,\nt11.`FILENAME` AS `PFILENAME`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_FILE` t1 \nLEFT JOIN `T_FILE` t11 ON t1.`PFILEID` = t11.`FILEID` \n",
+  "queryCode" : "SELECT\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`FILEID`,\nt1.`FILENAME`,\nt1.`ICON`,\nt1.`PFILEID`,\nt11.`FILENAME` AS `PFILENAME`,\nt1.`TYPE`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_FILE` t1 \nLEFT JOIN `T_FILE` t11 ON t1.`PFILEID` = t11.`FILEID` \n",
   "id" : "PSMODULES/Test/PSDATAENTITIES/FILE/PSDEDATAQUERIES/View/PSDEDQCODES/MYSQL5.json"
 }
\ No newline at end of file

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

@@ -1495,16 +1495,16 @@
     "codeName" : "VMGroup2",
     "name" : "视图消息组2",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息2",
+      "name" : "视图消息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
       }
     }, {
-      "name" : "视图消息",
+      "name" : "视图消息2",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
       }
     } ]
   }, {

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPCODELISTS/FileType.json

+{
+  "codeListTag" : "Test__FileType",
+  "codeListType" : "STATIC",
+  "codeName" : "FileType",
+  "dynaInstMode" : 0,
+  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPCODELISTS/FileType.json",
+  "emptyText" : "未定义",
+  "name" : "文件类型",
+  "enableCache" : true
+}
\ No newline at end of file

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

@@ -323,6 +323,70 @@
     "builtinMethod" : false
   } ],
   "getAllPSAppDEFields" : [ {
+    "getAllPSAppDEFUIModes" : [ {
+      "codeName" : "Default",
+      "name" : "[ICON][图标]",
+      "getPSDEFFormItem" : {
+        "codeName" : "Default",
+        "editorType" : "TEXTBOX",
+        "name" : "[ICON][图标]",
+        "stringLength" : 100,
+        "uIMode" : "DEFAULT"
+      },
+      "type" : "DEFAULT"
+    }, {
+      "codeName" : "MobileDefault",
+      "name" : "[ICON][图标]移动端默认",
+      "getPSDEFFormItem" : {
+        "codeName" : "MobileDefault",
+        "editorType" : "MOBTEXT",
+        "name" : "[ICON][图标]移动端默认",
+        "stringLength" : 100,
+        "uIMode" : "MOBILEDEFAULT",
+        "mobileMode" : true
+      },
+      "type" : "MOBILEDEFAULT",
+      "mobileMode" : true
+    } ],
+    "codeName" : "ICON",
+    "logicName" : "图标",
+    "name" : "ICON",
+    "stdDataType" : 25,
+    "stringLength" : 100
+  }, {
+    "getAllPSAppDEFUIModes" : [ {
+      "codeName" : "MobileDefault",
+      "name" : "[TYPE][类型]移动端默认",
+      "getPSDEFFormItem" : {
+        "codeName" : "MobileDefault",
+        "editorType" : "MOBDROPDOWNLIST",
+        "name" : "[TYPE][类型]移动端默认",
+        "stringLength" : 60,
+        "uIMode" : "MOBILEDEFAULT",
+        "mobileMode" : true,
+        "needCodeListConfig" : true
+      },
+      "type" : "MOBILEDEFAULT",
+      "mobileMode" : true
+    }, {
+      "codeName" : "Default",
+      "name" : "[TYPE][类型]",
+      "getPSDEFFormItem" : {
+        "codeName" : "Default",
+        "editorType" : "DROPDOWNLIST",
+        "name" : "[TYPE][类型]",
+        "stringLength" : 60,
+        "uIMode" : "DEFAULT",
+        "needCodeListConfig" : true
+      },
+      "type" : "DEFAULT"
+    } ],
+    "codeName" : "TYPE",
+    "logicName" : "类型",
+    "name" : "TYPE",
+    "stdDataType" : 25,
+    "stringLength" : 60
+  }, {
     "getAllPSAppDEFUIModes" : [ {
       "codeName" : "Default",
       "name" : "[FILENAME][文件名称]",
@@ -618,6 +682,28 @@
     "codeName" : "FILEDTO",
     "name" : "FILEDTO",
     "getPSAppDEMethodDTOFields" : [ {
+      "codeName" : "ICON",
+      "logicName" : "图标",
+      "name" : "ICON",
+      "getPSAppDEField" : {
+        "name" : "ICON",
+        "codeName" : "ICON"
+      },
+      "sourceType" : "DEFIELD",
+      "stdDataType" : 25,
+      "type" : "SIMPLE"
+    }, {
+      "codeName" : "TYPE",
+      "logicName" : "类型",
+      "name" : "TYPE",
+      "getPSAppDEField" : {
+        "name" : "TYPE",
+        "codeName" : "TYPE"
+      },
+      "sourceType" : "DEFIELD",
+      "stdDataType" : 25,
+      "type" : "SIMPLE"
+    }, {
       "codeName" : "CreateDate",
       "jsonFormat" : "yyyy-MM-dd HH:mm:ss",
       "logicName" : "建立时间",
@@ -773,6 +859,17 @@
       "sourceType" : "DEFSEARCHMODE",
       "stdDataType" : 25,
       "type" : "SIMPLE"
+    }, {
+      "codeName" : "N_TYPE_EQ",
+      "logicName" : "类型",
+      "name" : "N_TYPE_EQ",
+      "getPSAppDEField" : {
+        "name" : "TYPE",
+        "codeName" : "TYPE"
+      },
+      "sourceType" : "DEFSEARCHMODE",
+      "stdDataType" : 25,
+      "type" : "SIMPLE"
     } ],
     "sourceType" : "DE",
     "type" : "DEFILTER"

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

@@ -120,47 +120,33 @@
       "codeName" : "FILEName"
     }
   }, {
-    "id" : "pfileid",
-    "hidden" : true,
+    "id" : "type",
     "dataType" : 25,
     "getPSAppDEField" : {
-      "name" : "PFILEID",
-      "codeName" : "Pfileid"
+      "name" : "TYPE",
+      "codeName" : "TYPE"
     }
   }, {
-    "id" : "pfilename",
+    "id" : "icon",
     "dataType" : 25,
     "getPSAppDEField" : {
-      "name" : "PFILENAME",
-      "codeName" : "Pfilename"
+      "name" : "ICON",
+      "codeName" : "ICON"
     }
   }, {
-    "id" : "createman",
+    "id" : "pfileid",
+    "hidden" : true,
     "dataType" : 25,
     "getPSAppDEField" : {
-      "name" : "CREATEMAN",
-      "codeName" : "CreateMan"
-    }
-  }, {
-    "id" : "createdate",
-    "dataType" : 5,
-    "getPSAppDEField" : {
-      "name" : "CREATEDATE",
-      "codeName" : "CreateDate"
+      "name" : "PFILEID",
+      "codeName" : "Pfileid"
     }
   }, {
-    "id" : "updateman",
+    "id" : "pfilename",
     "dataType" : 25,
     "getPSAppDEField" : {
-      "name" : "UPDATEMAN",
-      "codeName" : "UpdateMan"
-    }
-  }, {
-    "id" : "updatedate",
-    "dataType" : 5,
-    "getPSAppDEField" : {
-      "name" : "UPDATEDATE",
-      "codeName" : "UpdateDate"
+      "name" : "PFILENAME",
+      "codeName" : "Pfilename"
     }
   }, {
     "id" : "fileid",
@@ -206,7 +192,75 @@
           "name" : "filename"
         },
         "getPSLayoutPos" : {
-          "colMD" : 24,
+          "colLG" : 12,
+          "colMD" : 12,
+          "colSM" : 12,
+          "colXS" : 12,
+          "layout" : "TABLE_24COL"
+        },
+        "allowEmpty" : true,
+        "showCaption" : true
+      }, {
+        "caption" : "类型",
+        "codeName" : "type",
+        "dataType" : 25,
+        "detailStyle" : "DEFAULT",
+        "detailType" : "FORMITEM",
+        "enableCond" : 3,
+        "ignoreInput" : 0,
+        "labelPos" : "LEFT",
+        "labelWidth" : 130,
+        "name" : "type",
+        "noPrivDisplayMode" : 1,
+        "getPSAppDEField" : {
+          "name" : "TYPE",
+          "codeName" : "TYPE"
+        },
+        "getPSEditor" : {
+          "editorType" : "DROPDOWNLIST",
+          "name" : "type",
+          "getPSAppCodeList" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/FileType.json"
+          },
+          "singleSelect" : true
+        },
+        "getPSLayoutPos" : {
+          "colLG" : 12,
+          "colMD" : 12,
+          "colSM" : 12,
+          "colXS" : 12,
+          "layout" : "TABLE_24COL"
+        },
+        "allowEmpty" : true,
+        "needCodeListConfig" : true,
+        "showCaption" : true
+      }, {
+        "caption" : "图标",
+        "codeName" : "icon",
+        "dataType" : 25,
+        "detailStyle" : "DEFAULT",
+        "detailType" : "FORMITEM",
+        "enableCond" : 3,
+        "ignoreInput" : 0,
+        "labelPos" : "LEFT",
+        "labelWidth" : 130,
+        "name" : "icon",
+        "noPrivDisplayMode" : 1,
+        "getPSAppDEField" : {
+          "name" : "ICON",
+          "codeName" : "ICON"
+        },
+        "getPSEditor" : {
+          "editorType" : "TEXTBOX",
+          "maxLength" : 100,
+          "name" : "icon"
+        },
+        "getPSLayoutPos" : {
+          "colLG" : 12,
+          "colMD" : 12,
+          "colSM" : 12,
+          "colXS" : 12,
           "layout" : "TABLE_24COL"
         },
         "allowEmpty" : true,
@@ -232,7 +286,10 @@
           "name" : "pfileid"
         },
         "getPSLayoutPos" : {
-          "colMD" : 24,
+          "colLG" : 12,
+          "colMD" : 12,
+          "colSM" : 12,
+          "colXS" : 12,
           "layout" : "TABLE_24COL"
         },
         "allowEmpty" : true,
@@ -286,7 +343,10 @@
           "singleSelect" : true
         },
         "getPSLayoutPos" : {
-          "colMD" : 24,
+          "colLG" : 12,
+          "colMD" : 12,
+          "colSM" : 12,
+          "colXS" : 12,
           "layout" : "TABLE_24COL"
         },
         "valueItemName" : "pfileid",
@@ -294,10 +354,10 @@
         "showCaption" : true
       } ],
       "getPSLayout" : {
-        "childColLG" : -1,
-        "childColMD" : 24,
-        "childColSM" : -1,
-        "childColXS" : -1,
+        "childColLG" : 12,
+        "childColMD" : 12,
+        "childColSM" : 12,
+        "childColXS" : 12,
         "columnCount" : 24,
         "layout" : "TABLE_24COL"
       },
@@ -344,164 +404,6 @@
       "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",
-        "dataType" : 25,
-        "detailStyle" : "DEFAULT",
-        "detailType" : "FORMITEM",
-        "enableCond" : 3,
-        "ignoreInput" : 3,
-        "labelPos" : "LEFT",
-        "labelWidth" : 130,
-        "name" : "updateman",
-        "noPrivDisplayMode" : 1,
-        "getPSAppDEField" : {
-          "name" : "UPDATEMAN",
-          "codeName" : "UpdateMan"
-        },
-        "getPSEditor" : {
-          "editorType" : "SPAN",
-          "name" : "updateman",
-          "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"
-        },
-        "getPSEditor" : {
-          "editorType" : "SPAN",
-          "name" : "updatedate",
-          "enableLinkView" : false
-        },
-        "getPSLayoutPos" : {
-          "colMD" : 24,
-          "layout" : "TABLE_24COL"
-        },
-        "valueFormat" : "YYYY-MM-DD HH:mm:ss",
-        "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
   } ],
   "getPSLayout" : {
     "childColLG" : -1,
@@ -544,7 +446,7 @@
       "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/FILE.json"
     }
   },
-  "noTabHeader" : false,
+  "noTabHeader" : true,
   "modelid" : "200e7a16e37c017e9237d259c4c8c7fc",
   "modeltype" : "PSDEFORM_EDITFORM"
 }
\ No newline at end of file

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

@@ -59,6 +59,44 @@
     "width" : 100,
     "widthUnit" : "PX",
     "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/FileType.json"
+    },
+    "getPSAppDEField" : {
+      "name" : "TYPE",
+      "codeName" : "TYPE"
+    },
+    "width" : 100,
+    "widthUnit" : "PX",
+    "enableSort" : true
+  }, {
+    "align" : "LEFT",
+    "cLConvertMode" : "NONE",
+    "caption" : "图标",
+    "codeName" : "icon",
+    "columnType" : "DEFGRIDCOLUMN",
+    "dataItemName" : "icon",
+    "excelCaption" : "图标",
+    "name" : "icon",
+    "noPrivDisplayMode" : 1,
+    "getPSAppDEField" : {
+      "name" : "ICON",
+      "codeName" : "ICON"
+    },
+    "width" : 100,
+    "widthUnit" : "PX",
+    "enableSort" : true
   }, {
     "align" : "LEFT",
     "cLConvertMode" : "FRONT",
@@ -113,6 +151,20 @@
       "name" : "PFILENAME",
       "codeName" : "Pfilename"
     }
+  }, {
+    "dataType" : 25,
+    "name" : "type",
+    "getPSAppDEField" : {
+      "name" : "TYPE",
+      "codeName" : "TYPE"
+    }
+  }, {
+    "dataType" : 25,
+    "name" : "icon",
+    "getPSAppDEField" : {
+      "name" : "ICON",
+      "codeName" : "ICON"
+    }
   }, {
     "dataType" : 25,
     "name" : "updateman",

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

@@ -816,47 +816,33 @@
         "codeName" : "FILEName"
       }
     }, {
-      "id" : "pfileid",
-      "hidden" : true,
+      "id" : "type",
       "dataType" : 25,
       "getPSAppDEField" : {
-        "name" : "PFILEID",
-        "codeName" : "Pfileid"
+        "name" : "TYPE",
+        "codeName" : "TYPE"
       }
     }, {
-      "id" : "pfilename",
+      "id" : "icon",
       "dataType" : 25,
       "getPSAppDEField" : {
-        "name" : "PFILENAME",
-        "codeName" : "Pfilename"
+        "name" : "ICON",
+        "codeName" : "ICON"
       }
     }, {
-      "id" : "createman",
+      "id" : "pfileid",
+      "hidden" : true,
       "dataType" : 25,
       "getPSAppDEField" : {
-        "name" : "CREATEMAN",
-        "codeName" : "CreateMan"
-      }
-    }, {
-      "id" : "createdate",
-      "dataType" : 5,
-      "getPSAppDEField" : {
-        "name" : "CREATEDATE",
-        "codeName" : "CreateDate"
+        "name" : "PFILEID",
+        "codeName" : "Pfileid"
       }
     }, {
-      "id" : "updateman",
+      "id" : "pfilename",
       "dataType" : 25,
       "getPSAppDEField" : {
-        "name" : "UPDATEMAN",
-        "codeName" : "UpdateMan"
-      }
-    }, {
-      "id" : "updatedate",
-      "dataType" : 5,
-      "getPSAppDEField" : {
-        "name" : "UPDATEDATE",
-        "codeName" : "UpdateDate"
+        "name" : "PFILENAME",
+        "codeName" : "Pfilename"
       }
     }, {
       "id" : "fileid",
@@ -902,7 +888,75 @@
             "name" : "filename"
           },
           "getPSLayoutPos" : {
-            "colMD" : 24,
+            "colLG" : 12,
+            "colMD" : 12,
+            "colSM" : 12,
+            "colXS" : 12,
+            "layout" : "TABLE_24COL"
+          },
+          "allowEmpty" : true,
+          "showCaption" : true
+        }, {
+          "caption" : "类型",
+          "codeName" : "type",
+          "dataType" : 25,
+          "detailStyle" : "DEFAULT",
+          "detailType" : "FORMITEM",
+          "enableCond" : 3,
+          "ignoreInput" : 0,
+          "labelPos" : "LEFT",
+          "labelWidth" : 130,
+          "name" : "type",
+          "noPrivDisplayMode" : 1,
+          "getPSAppDEField" : {
+            "name" : "TYPE",
+            "codeName" : "TYPE"
+          },
+          "getPSEditor" : {
+            "editorType" : "DROPDOWNLIST",
+            "name" : "type",
+            "getPSAppCodeList" : {
+              "modelref" : true,
+              "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/FileType.json"
+            },
+            "singleSelect" : true
+          },
+          "getPSLayoutPos" : {
+            "colLG" : 12,
+            "colMD" : 12,
+            "colSM" : 12,
+            "colXS" : 12,
+            "layout" : "TABLE_24COL"
+          },
+          "allowEmpty" : true,
+          "needCodeListConfig" : true,
+          "showCaption" : true
+        }, {
+          "caption" : "图标",
+          "codeName" : "icon",
+          "dataType" : 25,
+          "detailStyle" : "DEFAULT",
+          "detailType" : "FORMITEM",
+          "enableCond" : 3,
+          "ignoreInput" : 0,
+          "labelPos" : "LEFT",
+          "labelWidth" : 130,
+          "name" : "icon",
+          "noPrivDisplayMode" : 1,
+          "getPSAppDEField" : {
+            "name" : "ICON",
+            "codeName" : "ICON"
+          },
+          "getPSEditor" : {
+            "editorType" : "TEXTBOX",
+            "maxLength" : 100,
+            "name" : "icon"
+          },
+          "getPSLayoutPos" : {
+            "colLG" : 12,
+            "colMD" : 12,
+            "colSM" : 12,
+            "colXS" : 12,
             "layout" : "TABLE_24COL"
           },
           "allowEmpty" : true,
@@ -928,7 +982,10 @@
             "name" : "pfileid"
           },
           "getPSLayoutPos" : {
-            "colMD" : 24,
+            "colLG" : 12,
+            "colMD" : 12,
+            "colSM" : 12,
+            "colXS" : 12,
             "layout" : "TABLE_24COL"
           },
           "allowEmpty" : true,
@@ -982,7 +1039,10 @@
             "singleSelect" : true
           },
           "getPSLayoutPos" : {
-            "colMD" : 24,
+            "colLG" : 12,
+            "colMD" : 12,
+            "colSM" : 12,
+            "colXS" : 12,
             "layout" : "TABLE_24COL"
           },
           "valueItemName" : "pfileid",
@@ -990,10 +1050,10 @@
           "showCaption" : true
         } ],
         "getPSLayout" : {
-          "childColLG" : -1,
-          "childColMD" : 24,
-          "childColSM" : -1,
-          "childColXS" : -1,
+          "childColLG" : 12,
+          "childColMD" : 12,
+          "childColSM" : 12,
+          "childColXS" : 12,
           "columnCount" : 24,
           "layout" : "TABLE_24COL"
         },
@@ -1040,164 +1100,6 @@
         "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",
-          "dataType" : 25,
-          "detailStyle" : "DEFAULT",
-          "detailType" : "FORMITEM",
-          "enableCond" : 3,
-          "ignoreInput" : 3,
-          "labelPos" : "LEFT",
-          "labelWidth" : 130,
-          "name" : "updateman",
-          "noPrivDisplayMode" : 1,
-          "getPSAppDEField" : {
-            "name" : "UPDATEMAN",
-            "codeName" : "UpdateMan"
-          },
-          "getPSEditor" : {
-            "editorType" : "SPAN",
-            "name" : "updateman",
-            "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"
-          },
-          "getPSEditor" : {
-            "editorType" : "SPAN",
-            "name" : "updatedate",
-            "enableLinkView" : false
-          },
-          "getPSLayoutPos" : {
-            "colMD" : 24,
-            "layout" : "TABLE_24COL"
-          },
-          "valueFormat" : "YYYY-MM-DD HH:mm:ss",
-          "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
     } ],
     "getPSLayout" : {
       "childColLG" : -1,
@@ -1240,7 +1142,7 @@
         "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/FILE.json"
       }
     },
-    "noTabHeader" : false,
+    "noTabHeader" : true,
     "name" : "form",
     "modelid" : "200e7a16e37c017e9237d259c4c8c7fc",
     "modeltype" : "PSDEFORM_EDITFORM"

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

@@ -236,6 +236,44 @@
       "width" : 100,
       "widthUnit" : "PX",
       "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/FileType.json"
+      },
+      "getPSAppDEField" : {
+        "name" : "TYPE",
+        "codeName" : "TYPE"
+      },
+      "width" : 100,
+      "widthUnit" : "PX",
+      "enableSort" : true
+    }, {
+      "align" : "LEFT",
+      "cLConvertMode" : "NONE",
+      "caption" : "图标",
+      "codeName" : "icon",
+      "columnType" : "DEFGRIDCOLUMN",
+      "dataItemName" : "icon",
+      "excelCaption" : "图标",
+      "name" : "icon",
+      "noPrivDisplayMode" : 1,
+      "getPSAppDEField" : {
+        "name" : "ICON",
+        "codeName" : "ICON"
+      },
+      "width" : 100,
+      "widthUnit" : "PX",
+      "enableSort" : true
     }, {
       "align" : "LEFT",
       "cLConvertMode" : "FRONT",
@@ -290,6 +328,20 @@
         "name" : "PFILENAME",
         "codeName" : "Pfilename"
       }
+    }, {
+      "dataType" : 25,
+      "name" : "type",
+      "getPSAppDEField" : {
+        "name" : "TYPE",
+        "codeName" : "TYPE"
+      }
+    }, {
+      "dataType" : 25,
+      "name" : "icon",
+      "getPSAppDEField" : {
+        "name" : "ICON",
+        "codeName" : "ICON"
+      }
     }, {
       "dataType" : 25,
       "name" : "updateman",

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

@@ -376,6 +376,15 @@
       "value" : "CANCELED"
     } ],
     "enableCache" : true
+  }, {
+    "codeListTag" : "Test__FileType",
+    "codeListType" : "STATIC",
+    "codeName" : "FileType",
+    "dynaInstMode" : 0,
+    "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPCODELISTS/FileType.json",
+    "emptyText" : "未定义",
+    "name" : "文件类型",
+    "enableCache" : true
   }, {
     "codeListTag" : "Test__MapDataType",
     "codeListType" : "STATIC",
@@ -11380,16 +11389,16 @@
     "codeName" : "VMGroup2",
     "name" : "视图消息组2",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息2",
+      "name" : "视图消息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
       }
     }, {
-      "name" : "视图消息",
+      "name" : "视图消息2",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
       }
     } ]
   }, {
@@ -11418,16 +11427,16 @@
     "codeName" : "VMGroup3",
     "name" : "视图消息类型测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-警告信息",
+      "name" : "消息类型-错误信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg5"
+        "id" : "ViewMsg6"
       }
     }, {
-      "name" : "消息类型-错误信息",
+      "name" : "消息类型-警告信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg6"
+        "id" : "ViewMsg5"
       }
     }, {
       "name" : "消息类型-常规信息",
@@ -11450,52 +11459,45 @@
     "codeName" : "VMGroup4",
     "name" : "视图消息位置测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息位置-视图上方",
+      "name" : "消息位置-弹出",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg7"
+        "id" : "ViewMsg10"
       }
     }, {
-      "name" : "消息位置-弹出",
+      "name" : "消息位置-视图内容区",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg10"
+        "id" : "ViewMsg9"
       }
     }, {
-      "name" : "消息位置-视图下方",
+      "name" : "消息位置-视图上方",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg7"
       }
     }, {
-      "name" : "消息位置-视图内容区",
+      "name" : "消息位置-视图下方",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg9"
+        "id" : "ViewMsg8"
       }
     } ]
   }, {
     "codeName" : "VMGroup8",
     "name" : "【静态测试】",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息位置-视图下方",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg8"
-      }
-    }, {
       "name" : "关闭模式-本次删除-上方-警告",
       "getPSAppViewMsg" : {
         "modelref" : true,
         "id" : "ViewMsg13"
       }
     }, {
-      "name" : "消息类型-警告信息",
+      "name" : "消息位置-视图下方",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg5"
-      },
-      "position" : "POPUP"
+        "id" : "ViewMsg8"
+      }
     }, {
       "name" : "消息类型-错误信息",
       "getPSAppViewMsg" : {
@@ -11517,32 +11519,39 @@
       },
       "position" : "POPUP"
     }, {
-      "name" : "消息位置-视图内容区",
+      "name" : "消息类型-警告信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg9"
-      }
+        "id" : "ViewMsg5"
+      },
+      "position" : "POPUP"
     }, {
       "name" : "关闭模式-默认删除-上方-错误",
       "getPSAppViewMsg" : {
         "modelref" : true,
         "id" : "ViewMsg12"
       }
+    }, {
+      "name" : "消息位置-视图内容区",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg9"
+      }
     } ]
   }, {
     "codeName" : "VMGroup5",
     "name" : "视图消息关闭模式",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-默认删除",
+      "name" : "关闭模式-无删除",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg12"
+        "id" : "ViewMsg11"
       }
     }, {
-      "name" : "关闭模式-无删除",
+      "name" : "关闭模式-默认删除",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg11"
+        "id" : "ViewMsg12"
       }
     }, {
       "name" : "关闭模式-本次删除",
@@ -11555,16 +11564,16 @@
     "codeName" : "VMGroup6",
     "name" : "视图消息动态模式测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "动态模式-静态内容",
+      "name" : "动态模式-实体数据集",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg15"
+        "id" : "ViewMsg14"
       }
     }, {
-      "name" : "动态模式-实体数据集",
+      "name" : "动态模式-静态内容",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg14"
+        "id" : "ViewMsg15"
       }
     } ]
   } ],

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSDBSCHEMES/DEFAULT.json

@@ -1676,6 +1676,13 @@
       "name" : "FILENAME",
       "stdDataType" : 25,
       "nullable" : true
+    }, {
+      "codeName" : "ICON",
+      "length" : 100,
+      "logicName" : "图标",
+      "name" : "ICON",
+      "stdDataType" : 25,
+      "nullable" : true
     }, {
       "codeName" : "PFILEID",
       "length" : 100,
@@ -1697,6 +1704,13 @@
       "name" : "PNAME",
       "stdDataType" : 25,
       "nullable" : true
+    }, {
+      "codeName" : "TYPE",
+      "length" : 60,
+      "logicName" : "类型",
+      "name" : "TYPE",
+      "stdDataType" : 25,
+      "nullable" : true
     }, {
       "codeName" : "UPDATEDATE",
       "length" : 8,

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSSERVICEAPIS/TrainSys.json

@@ -7882,6 +7882,32 @@
     } ],
     "name" : "FILE",
     "getPSDEServiceAPIFields" : [ {
+      "codeName" : "ICON",
+      "codeName2" : "ICON",
+      "logicName" : "图标",
+      "name" : "ICON",
+      "orderValue" : 180,
+      "stdDataType" : 25,
+      "stringLength" : 100,
+      "allowEmpty" : true,
+      "enableCreate" : true,
+      "enableModify" : true,
+      "keyField" : false,
+      "majorField" : false
+    }, {
+      "codeName" : "TYPE",
+      "codeName2" : "TYPE",
+      "logicName" : "类型",
+      "name" : "TYPE",
+      "orderValue" : 190,
+      "stdDataType" : 25,
+      "stringLength" : 60,
+      "allowEmpty" : true,
+      "enableCreate" : true,
+      "enableModify" : true,
+      "keyField" : false,
+      "majorField" : false
+    }, {
       "codeName" : "FILEName",
       "codeName2" : "FILEName",
       "logicName" : "文件名称",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSTEM.json

@@ -330,6 +330,9 @@
   }, {
     "modelref" : true,
     "path" : "PSCODELISTS/CodeList54.json"
+  }, {
+    "modelref" : true,
+    "path" : "PSMODULES/Test/PSCODELISTS/FileType.json"
   }, {
     "modelref" : true,
     "path" : "PSCODELISTS/CodeList12.json"
@@ -1078,6 +1081,9 @@
     }, {
       "modelref" : true,
       "path" : "PSMODULES/Test/PSCODELISTS/UsrCodeList0320261658.json"
+    }, {
+      "modelref" : true,
+      "path" : "PSMODULES/Test/PSCODELISTS/FileType.json"
     }, {
       "modelref" : true,
       "path" : "PSMODULES/Test/PSCODELISTS/TreeDynaCodeList.json"