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

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

@@ -798,7 +798,7 @@
       "name" : "FIELD",
       "orderValue" : 1000,
       "rTMOSFilePath" : "psdefgroupdetails/Field",
-      "stringLength" : 1048576,
+      "stringLength" : 2000,
       "enableUserInsert" : true,
       "enableUserUpdate" : true
     }, {
@@ -1769,7 +1769,7 @@
       "mOSFilePath" : "psmodules/common/psdataentities/BOOK/psdefields/FIELD/psdefsfitems/N_FIELD_EQ",
       "name" : "N_FIELD_EQ",
       "rTMOSFilePath" : "psmodules/common/psdataentities/BOOK/psdefields/FIELD/psdefsearchmodes/N_FIELD_EQ",
-      "stdDataType" : 21,
+      "stdDataType" : 25,
       "valueOP" : "EQ"
     } ],
     "getAllPSDEFUIModes" : [ {
@@ -1778,11 +1778,11 @@
       "name" : "[FIELD][属性]",
       "getPSDEFFormItem" : {
         "codeName" : "Default",
-        "editorType" : "HTMLEDITOR",
+        "editorType" : "TEXTAREA_10",
         "mOSFilePath" : "psmodules/common/psdataentities/BOOK/psdefields/FIELD/psdefformitems/Default",
         "name" : "[FIELD][属性]",
         "rTMOSFilePath" : "psmodules/common/psdataentities/BOOK/psdefields/FIELD/psdefformitems/Default",
-        "stringLength" : 1048576,
+        "stringLength" : 2000,
         "uIMode" : "DEFAULT"
       },
       "rTMOSFilePath" : "psmodules/common/psdataentities/BOOK/psdefields/FIELD/psdefuimodes/Default",
@@ -1793,11 +1793,11 @@
       "name" : "[FIELD][属性]移动端默认",
       "getPSDEFFormItem" : {
         "codeName" : "MobileDefault",
-        "editorType" : "HTMLEDITOR",
+        "editorType" : "MOBTEXTAREA",
         "mOSFilePath" : "psmodules/common/psdataentities/BOOK/psdefields/FIELD/psdefformitems/MobileDefault",
         "name" : "[FIELD][属性]移动端默认",
         "rTMOSFilePath" : "psmodules/common/psdataentities/BOOK/psdefields/FIELD/psdefformitems/MobileDefault",
-        "stringLength" : 1048576,
+        "stringLength" : 2000,
         "uIMode" : "MOBILEDEFAULT",
         "mobileMode" : true
       },
@@ -1816,17 +1816,17 @@
         "getPSDEFVRConditions" : [ {
           "condType" : "STRINGLENGTH",
           "dEFName" : "FIELD",
-          "maxValue" : 1048576,
+          "maxValue" : 2000,
           "name" : "默认字符串长度",
-          "ruleInfo" : "内容长度必须小于等于[1048576]",
+          "ruleInfo" : "内容长度必须小于等于[2000]",
           "includeMaxValue" : true,
           "includeMinValue" : false,
           "keyCond" : true
         } ],
-        "ruleInfo" : "内容长度必须小于等于[1048576]"
+        "ruleInfo" : "内容长度必须小于等于[2000]"
       },
       "rTMOSFilePath" : "psmodules/common/psdataentities/BOOK/psdefields/FIELD/psdefvaluerules/Default",
-      "ruleInfo" : "内容长度必须小于等于[1048576]",
+      "ruleInfo" : "内容长度必须小于等于[2000]",
       "checkDefault" : true,
       "defaultMode" : true,
       "enableBackend" : true,
@@ -1835,9 +1835,9 @@
     "codeName" : "Field",
     "dEFType" : 1,
     "dEMSFieldMode" : "STATE1",
-    "dataType" : "HTMLTEXT",
+    "dataType" : "LONGTEXT_1000",
     "importOrder" : 1000,
-    "length" : 1048576,
+    "length" : 2000,
     "logicName" : "属性",
     "mOSFilePath" : "psmodules/common/psdataentities/BOOK/psdefields/FIELD",
     "name" : "FIELD",
@@ -1851,10 +1851,9 @@
     },
     "rTMOSFilePath" : "psmodules/common/psdataentities/BOOK/psdefields/FIELD",
     "serviceCodeName" : "Field",
-    "stdDataType" : 21,
-    "stringLength" : 1048576,
-    "valueFormat" : "%1$s",
-    "queryColumn" : false
+    "stdDataType" : 25,
+    "stringLength" : 2000,
+    "valueFormat" : "%1$s"
   }, {
     "getAllPSDEFDTColumns" : [ {
       "columnName" : "FIELD2",
@@ -5939,8 +5938,8 @@
       },
       "rTMOSFilePath" : "psmodules/common/psdataentities/BOOK/psdemethoddtos/BookDTO/psdemethoddtofields/Field",
       "sourceType" : "DEFIELD",
-      "stdDataType" : 21,
-      "stringLength" : 1048576,
+      "stdDataType" : 25,
+      "stringLength" : 2000,
       "type" : "SIMPLE"
     }, {
       "jsonFormat" : "yyyy-MM-dd",
@@ -6589,7 +6588,7 @@
       },
       "rTMOSFilePath" : "psmodules/common/psdataentities/BOOK/psdemethoddtos/BookFilterDTO/psdemethoddtofields/N_FIELD_EQ",
       "sourceType" : "DEFSEARCHMODE",
-      "stdDataType" : 21,
+      "stdDataType" : 25,
       "type" : "SIMPLE"
     } ],
     "rTMOSFilePath" : "psmodules/common/psdataentities/BOOK/psdemethoddtos/BookFilterDTO",
@@ -6672,8 +6671,8 @@
       },
       "rTMOSFilePath" : "psmodules/common/psdataentities/BOOK/psdemethoddtos/BookSimpleDTO/psdemethoddtofields/Field",
       "sourceType" : "DEFGROUPDETAIL",
-      "stdDataType" : 21,
-      "stringLength" : 1048576,
+      "stdDataType" : 25,
+      "stringLength" : 2000,
       "type" : "SIMPLE"
     }, {
       "logicName" : "属性2",

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

@@ -3,9 +3,6 @@
   "mOSFilePath" : "psmodules/common/psdataentities/BOOK/psdedataqueries/DEFAULT/psdedqcodes/MYSQL5",
   "name" : "MySQL5",
   "getPSDEDataQueryCodeExps" : [ {
-    "expression" : "t1.`FIELD`",
-    "name" : "FIELD"
-  }, {
     "expression" : "t1.`FIELD24`",
     "name" : "FIELD24"
   }, {
@@ -29,6 +26,9 @@
   }, {
     "expression" : "t1.`END`",
     "name" : "END"
+  }, {
+    "expression" : "t1.`FIELD`",
+    "name" : "FIELD"
   }, {
     "expression" : "t1.`FIELD10`",
     "name" : "FIELD10"
@@ -168,7 +168,7 @@
     "expression" : "t1.`UPDATEMAN`",
     "name" : "UPDATEMAN"
   } ],
-  "queryCode" : "SELECT\nt1.`BOOKID`,\nt1.`BOOKNAME`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`DATE`,\nt1.`DEPTID`,\nt1.`END`,\nt1.`FIELD10`,\nt1.`FIELD11`,\nt1.`FIELD12`,\nt1.`FIELD13`,\nt1.`FIELD14`,\nt1.`FIELD15`,\nt1.`FIELD16`,\nt1.`FIELD17`,\nt1.`FIELD18`,\nt1.`FIELD19`,\nt1.`FIELD2`,\nt1.`FIELD20`,\nt1.`FIELD21`,\nt1.`FIELD22`,\nt1.`FIELD23`,\nt1.`FIELD25`,\nt1.`FIELD26`,\nt1.`FIELD27`,\nt1.`FIELD28`,\nt1.`FIELD29`,\nt1.`FIELD3`,\nt1.`FIELD30`,\nt1.`FIELD31`,\nt1.`FIELD32`,\nt1.`FIELD33`,\nt1.`FIELD34`,\nt1.`FIELD35`,\nt1.`FIELD36`,\nt1.`FIELD37`,\nt1.`FIELD38`,\nt1.`FIELD39`,\nt1.`FIELD4`,\nt1.`FIELD40`,\nt1.`FIELD41`,\nt1.`FIELD42`,\nt1.`FIELD43`,\nt1.`FIELD44`,\nt1.`FIELD5`,\nt1.`FIELD6`,\nt1.`FIELD7`,\nt1.`FIELD8`,\nt1.`FIELD9`,\nt1.`ORGID`,\nt1.`TYPE`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_BOOK` t1 \n",
+  "queryCode" : "SELECT\nt1.`BOOKID`,\nt1.`BOOKNAME`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`DATE`,\nt1.`DEPTID`,\nt1.`END`,\nt1.`FIELD`,\nt1.`FIELD10`,\nt1.`FIELD11`,\nt1.`FIELD12`,\nt1.`FIELD13`,\nt1.`FIELD14`,\nt1.`FIELD15`,\nt1.`FIELD16`,\nt1.`FIELD17`,\nt1.`FIELD18`,\nt1.`FIELD19`,\nt1.`FIELD2`,\nt1.`FIELD20`,\nt1.`FIELD21`,\nt1.`FIELD22`,\nt1.`FIELD23`,\nt1.`FIELD25`,\nt1.`FIELD26`,\nt1.`FIELD27`,\nt1.`FIELD28`,\nt1.`FIELD29`,\nt1.`FIELD3`,\nt1.`FIELD30`,\nt1.`FIELD31`,\nt1.`FIELD32`,\nt1.`FIELD33`,\nt1.`FIELD34`,\nt1.`FIELD35`,\nt1.`FIELD36`,\nt1.`FIELD37`,\nt1.`FIELD38`,\nt1.`FIELD39`,\nt1.`FIELD4`,\nt1.`FIELD40`,\nt1.`FIELD41`,\nt1.`FIELD42`,\nt1.`FIELD43`,\nt1.`FIELD44`,\nt1.`FIELD5`,\nt1.`FIELD6`,\nt1.`FIELD7`,\nt1.`FIELD8`,\nt1.`FIELD9`,\nt1.`ORGID`,\nt1.`TYPE`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_BOOK` t1 \n",
   "rTMOSFilePath" : "psmodules/common/psdataentities/BOOK/psdedataqueries/DEFAULT/psdedqcodes/MYSQL5",
   "id" : "PSMODULES/common/PSDATAENTITIES/Book/PSDEDATAQUERIES/Default/PSDEDQCODES/MYSQL5.json"
 }
\ No newline at end of file

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

@@ -1012,11 +1012,11 @@
       "name" : "[FIELD][属性]",
       "getPSDEFFormItem" : {
         "codeName" : "Default",
-        "editorType" : "HTMLEDITOR",
+        "editorType" : "TEXTAREA_10",
         "mOSFilePath" : "psmodules/common/psdataentities/BOOK/psdefields/FIELD/psdefformitems/Default",
         "name" : "[FIELD][属性]",
         "rTMOSFilePath" : "pssysapps/Web/psappdataentities/Book/psappdefields/Field/psdefformitems/Default",
-        "stringLength" : 1048576,
+        "stringLength" : 2000,
         "uIMode" : "DEFAULT"
       },
       "rTMOSFilePath" : "pssysapps/Web/psappdataentities/Book/psappdefields/Field/psappdefuimodes/Default",
@@ -1027,11 +1027,11 @@
       "name" : "[FIELD][属性]移动端默认",
       "getPSDEFFormItem" : {
         "codeName" : "MobileDefault",
-        "editorType" : "HTMLEDITOR",
+        "editorType" : "MOBTEXTAREA",
         "mOSFilePath" : "psmodules/common/psdataentities/BOOK/psdefields/FIELD/psdefformitems/MobileDefault",
         "name" : "[FIELD][属性]移动端默认",
         "rTMOSFilePath" : "pssysapps/Web/psappdataentities/Book/psappdefields/Field/psdefformitems/MobileDefault",
-        "stringLength" : 1048576,
+        "stringLength" : 2000,
         "uIMode" : "MOBILEDEFAULT",
         "mobileMode" : true
       },
@@ -1043,8 +1043,8 @@
     "logicName" : "属性",
     "name" : "FIELD",
     "rTMOSFilePath" : "pssysapps/Web/psappdataentities/Book/psappdefields/Field",
-    "stdDataType" : 21,
-    "stringLength" : 1048576
+    "stdDataType" : 25,
+    "stringLength" : 2000
   }, {
     "getAllPSAppDEFUIModes" : [ {
       "codeName" : "Default",
@@ -2906,7 +2906,7 @@
       },
       "rTMOSFilePath" : "pssysapps/Web/psappdataentities/Book/psappdemethoddtos/BookDTO/psappdemethoddtofields/Field",
       "sourceType" : "DEFIELD",
-      "stdDataType" : 21,
+      "stdDataType" : 25,
       "type" : "SIMPLE"
     }, {
       "codeName" : "Field10",
@@ -3541,7 +3541,7 @@
       },
       "rTMOSFilePath" : "pssysapps/Web/psappdataentities/Book/psappdemethoddtos/BookFilterDTO/psappdemethoddtofields/N_FIELD_EQ",
       "sourceType" : "DEFSEARCHMODE",
-      "stdDataType" : 21,
+      "stdDataType" : 25,
       "type" : "SIMPLE"
     } ],
     "rTMOSFilePath" : "pssysapps/Web/psappdataentities/Book/psappdemethoddtos/BookFilterDTO",
@@ -3624,7 +3624,7 @@
       },
       "rTMOSFilePath" : "pssysapps/Web/psappdataentities/Book/psappdemethoddtos/BookSimpleDTO/psappdemethoddtofields/Field",
       "sourceType" : "DEFGROUPDETAIL",
-      "stdDataType" : 21,
+      "stdDataType" : 25,
       "type" : "SIMPLE"
     }, {
       "codeName" : "Field2",

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

@@ -89,7 +89,7 @@
     }
   }, {
     "id" : "field",
-    "dataType" : 21,
+    "dataType" : 25,
     "getPSAppDEField" : {
       "name" : "FIELD",
       "codeName" : "Field"
@@ -184,7 +184,7 @@
       }, {
         "caption" : "富文本",
         "codeName" : "field",
-        "dataType" : 21,
+        "dataType" : 25,
         "detailStyle" : "DEFAULT",
         "detailType" : "FORMITEM",
         "enableCond" : 3,

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

@@ -139,9 +139,7 @@
     }
   }, {
     "id" : "field",
-    "dataType" : 21,
-    "createDVT" : "SESSION",
-    "createDV" : "book",
+    "dataType" : 25,
     "updateDVT" : "CURTIME",
     "getPSAppDEField" : {
       "name" : "FIELD",
@@ -619,9 +617,7 @@
       }, {
         "caption" : "文本框",
         "codeName" : "field",
-        "createDV" : "book",
-        "createDVT" : "SESSION",
-        "dataType" : 21,
+        "dataType" : 25,
         "detailStyle" : "DEFAULT",
         "detailType" : "FORMITEM",
         "enableCond" : 3,
@@ -643,7 +639,7 @@
             "aaa" : "1"
           },
           "editorType" : "TEXTBOX",
-          "maxLength" : 1048576,
+          "maxLength" : 2000,
           "name" : "field",
           "getPSNavigateContexts" : [ {
             "key" : "DEVICE",

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

@@ -113,7 +113,7 @@
     }
   }, {
     "id" : "field",
-    "dataType" : 21,
+    "dataType" : 25,
     "getPSAppDEField" : {
       "name" : "FIELD",
       "codeName" : "Field"
@@ -347,7 +347,7 @@
           "getPSDEFormDetails" : [ {
             "caption" : "属性",
             "codeName" : "field",
-            "dataType" : 21,
+            "dataType" : 25,
             "detailStyle" : "DEFAULT",
             "detailType" : "FORMITEM",
             "enableCond" : 3,
@@ -382,7 +382,7 @@
               "editorHeight" : 299.0,
               "editorType" : "TEXTBOX",
               "editorWidth" : 199.0,
-              "maxLength" : 1048576,
+              "maxLength" : 2000,
               "name" : "field"
             },
             "getPSLayoutPos" : {

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

@@ -122,7 +122,7 @@
     "rTMOSFilePath" : "psdegridcols/field",
     "width" : 200,
     "widthUnit" : "PX",
-    "enableSort" : false
+    "enableSort" : true
   }, {
     "align" : "RIGHT",
     "cLConvertMode" : "FRONT",

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

@@ -214,7 +214,7 @@
     "width" : 150,
     "widthUnit" : "PX",
     "enableRowEdit" : true,
-    "enableSort" : false
+    "enableSort" : true
   }, {
     "align" : "LEFT",
     "cLConvertMode" : "NONE",
@@ -414,7 +414,7 @@
       "codeName" : "End"
     }
   }, {
-    "dataType" : 21,
+    "dataType" : 25,
     "name" : "field",
     "getPSAppDEField" : {
       "name" : "FIELD",
@@ -645,8 +645,13 @@
       "codeName" : "Field"
     },
     "getPSEditor" : {
-      "editorType" : "HTMLEDITOR",
-      "name" : "field"
+      "editorParams" : {
+        "HEIGHT" : "200"
+      },
+      "editorType" : "TEXTAREA_10",
+      "maxLength" : 2000,
+      "name" : "field",
+      "showMaxLength" : true
     },
     "rTMOSFilePath" : "psdegridcols/field",
     "allowEmpty" : true

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

@@ -152,7 +152,7 @@
     "width" : 150,
     "widthUnit" : "PX",
     "enableRowEdit" : true,
-    "enableSort" : false
+    "enableSort" : true
   }, {
     "align" : "LEFT",
     "cLConvertMode" : "FRONT",
@@ -363,7 +363,7 @@
       "codeName" : "Field11"
     }
   }, {
-    "dataType" : 21,
+    "dataType" : 25,
     "name" : "field",
     "getPSAppDEField" : {
       "name" : "FIELD",

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

@@ -68,6 +68,37 @@
     },
     "getPSDEFormItemName" : "field",
     "valueRuleType" : "DEFVALUERULE"
+  }, {
+    "checkMode" : 3,
+    "name" : "表单项值规则",
+    "getPSDEFValueRule" : {
+      "codeName" : "ValueRule",
+      "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/AMOUNT/psdefvaluerules/ValueRule",
+      "name" : "amount值规则",
+      "getPSDEFVRGroupCondition" : {
+        "condOp" : "AND",
+        "condType" : "GROUP",
+        "name" : "默认组",
+        "getPSDEFVRConditions" : [ {
+          "condOp" : "EQ",
+          "condType" : "SIMPLE",
+          "dEFName" : "AMOUNT",
+          "name" : "[常规条件] 等于(=) (100)",
+          "paramType" : "SRCENTITYFIELD",
+          "paramValue" : "100",
+          "ruleInfo" : "amount等于100"
+        } ],
+        "ruleInfo" : "amount等于100"
+      },
+      "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/AMOUNT/psdefvaluerules/ValueRule",
+      "ruleInfo" : "amount等于100",
+      "checkDefault" : false,
+      "defaultMode" : false,
+      "enableBackend" : true,
+      "enableFront" : true
+    },
+    "getPSDEFormItemName" : "amount",
+    "valueRuleType" : "DEFVALUERULE"
   }, {
     "checkMode" : 3,
     "name" : "表单项值规则",
@@ -319,37 +350,6 @@
     },
     "getPSDEFormItemName" : "field8",
     "valueRuleType" : "DEFVALUERULE"
-  }, {
-    "checkMode" : 3,
-    "name" : "表单项值规则",
-    "getPSDEFValueRule" : {
-      "codeName" : "ValueRule",
-      "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/AMOUNT/psdefvaluerules/ValueRule",
-      "name" : "amount值规则",
-      "getPSDEFVRGroupCondition" : {
-        "condOp" : "AND",
-        "condType" : "GROUP",
-        "name" : "默认组",
-        "getPSDEFVRConditions" : [ {
-          "condOp" : "EQ",
-          "condType" : "SIMPLE",
-          "dEFName" : "AMOUNT",
-          "name" : "[常规条件] 等于(=) (100)",
-          "paramType" : "SRCENTITYFIELD",
-          "paramValue" : "100",
-          "ruleInfo" : "amount等于100"
-        } ],
-        "ruleInfo" : "amount等于100"
-      },
-      "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/AMOUNT/psdefvaluerules/ValueRule",
-      "ruleInfo" : "amount等于100",
-      "checkDefault" : false,
-      "defaultMode" : false,
-      "enableBackend" : true,
-      "enableFront" : true
-    },
-    "getPSDEFormItemName" : "amount",
-    "valueRuleType" : "DEFVALUERULE"
   }, {
     "checkMode" : 3,
     "name" : "表单项值规则",

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

@@ -197,6 +197,37 @@
       },
       "getPSDEFormItemName" : "field",
       "valueRuleType" : "DEFVALUERULE"
+    }, {
+      "checkMode" : 3,
+      "name" : "表单项值规则",
+      "getPSDEFValueRule" : {
+        "codeName" : "ValueRule",
+        "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/AMOUNT/psdefvaluerules/ValueRule",
+        "name" : "amount值规则",
+        "getPSDEFVRGroupCondition" : {
+          "condOp" : "AND",
+          "condType" : "GROUP",
+          "name" : "默认组",
+          "getPSDEFVRConditions" : [ {
+            "condOp" : "EQ",
+            "condType" : "SIMPLE",
+            "dEFName" : "AMOUNT",
+            "name" : "[常规条件] 等于(=) (100)",
+            "paramType" : "SRCENTITYFIELD",
+            "paramValue" : "100",
+            "ruleInfo" : "amount等于100"
+          } ],
+          "ruleInfo" : "amount等于100"
+        },
+        "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/AMOUNT/psdefvaluerules/ValueRule",
+        "ruleInfo" : "amount等于100",
+        "checkDefault" : false,
+        "defaultMode" : false,
+        "enableBackend" : true,
+        "enableFront" : true
+      },
+      "getPSDEFormItemName" : "amount",
+      "valueRuleType" : "DEFVALUERULE"
     }, {
       "checkMode" : 3,
       "name" : "表单项值规则",
@@ -448,37 +479,6 @@
       },
       "getPSDEFormItemName" : "field8",
       "valueRuleType" : "DEFVALUERULE"
-    }, {
-      "checkMode" : 3,
-      "name" : "表单项值规则",
-      "getPSDEFValueRule" : {
-        "codeName" : "ValueRule",
-        "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/AMOUNT/psdefvaluerules/ValueRule",
-        "name" : "amount值规则",
-        "getPSDEFVRGroupCondition" : {
-          "condOp" : "AND",
-          "condType" : "GROUP",
-          "name" : "默认组",
-          "getPSDEFVRConditions" : [ {
-            "condOp" : "EQ",
-            "condType" : "SIMPLE",
-            "dEFName" : "AMOUNT",
-            "name" : "[常规条件] 等于(=) (100)",
-            "paramType" : "SRCENTITYFIELD",
-            "paramValue" : "100",
-            "ruleInfo" : "amount等于100"
-          } ],
-          "ruleInfo" : "amount等于100"
-        },
-        "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/AMOUNT/psdefvaluerules/ValueRule",
-        "ruleInfo" : "amount等于100",
-        "checkDefault" : false,
-        "defaultMode" : false,
-        "enableBackend" : true,
-        "enableFront" : true
-      },
-      "getPSDEFormItemName" : "amount",
-      "valueRuleType" : "DEFVALUERULE"
     }, {
       "checkMode" : 3,
       "name" : "表单项值规则",

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

@@ -1475,9 +1475,7 @@
       }
     }, {
       "id" : "field",
-      "dataType" : 21,
-      "createDVT" : "SESSION",
-      "createDV" : "book",
+      "dataType" : 25,
       "updateDVT" : "CURTIME",
       "getPSAppDEField" : {
         "name" : "FIELD",
@@ -1955,9 +1953,7 @@
         }, {
           "caption" : "文本框",
           "codeName" : "field",
-          "createDV" : "book",
-          "createDVT" : "SESSION",
-          "dataType" : 21,
+          "dataType" : 25,
           "detailStyle" : "DEFAULT",
           "detailType" : "FORMITEM",
           "enableCond" : 3,
@@ -1979,7 +1975,7 @@
               "aaa" : "1"
             },
             "editorType" : "TEXTBOX",
-            "maxLength" : 1048576,
+            "maxLength" : 2000,
             "name" : "field",
             "getPSNavigateContexts" : [ {
               "key" : "DEVICE",

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

@@ -231,7 +231,7 @@
       }
     }, {
       "id" : "field",
-      "dataType" : 21,
+      "dataType" : 25,
       "getPSAppDEField" : {
         "name" : "FIELD",
         "codeName" : "Field"
@@ -465,7 +465,7 @@
             "getPSDEFormDetails" : [ {
               "caption" : "属性",
               "codeName" : "field",
-              "dataType" : 21,
+              "dataType" : 25,
               "detailStyle" : "DEFAULT",
               "detailType" : "FORMITEM",
               "enableCond" : 3,
@@ -500,7 +500,7 @@
                 "editorHeight" : 299.0,
                 "editorType" : "TEXTBOX",
                 "editorWidth" : 199.0,
-                "maxLength" : 1048576,
+                "maxLength" : 2000,
                 "name" : "field"
               },
               "getPSLayoutPos" : {

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

@@ -1450,7 +1450,7 @@
       }
     }, {
       "id" : "field",
-      "dataType" : 21,
+      "dataType" : 25,
       "getPSAppDEField" : {
         "name" : "FIELD",
         "codeName" : "Field"
@@ -1684,7 +1684,7 @@
             "getPSDEFormDetails" : [ {
               "caption" : "属性",
               "codeName" : "field",
-              "dataType" : 21,
+              "dataType" : 25,
               "detailStyle" : "DEFAULT",
               "detailType" : "FORMITEM",
               "enableCond" : 3,
@@ -1719,7 +1719,7 @@
                 "editorHeight" : 299.0,
                 "editorType" : "TEXTBOX",
                 "editorWidth" : 199.0,
-                "maxLength" : 1048576,
+                "maxLength" : 2000,
                 "name" : "field"
               },
               "getPSLayoutPos" : {

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

@@ -317,7 +317,7 @@
       }
     }, {
       "id" : "field",
-      "dataType" : 21,
+      "dataType" : 25,
       "getPSAppDEField" : {
         "name" : "FIELD",
         "codeName" : "Field"
@@ -551,7 +551,7 @@
             "getPSDEFormDetails" : [ {
               "caption" : "属性",
               "codeName" : "field",
-              "dataType" : 21,
+              "dataType" : 25,
               "detailStyle" : "DEFAULT",
               "detailType" : "FORMITEM",
               "enableCond" : 3,
@@ -586,7 +586,7 @@
                 "editorHeight" : 299.0,
                 "editorType" : "TEXTBOX",
                 "editorWidth" : 199.0,
-                "maxLength" : 1048576,
+                "maxLength" : 2000,
                 "name" : "field"
               },
               "getPSLayoutPos" : {

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

@@ -680,7 +680,7 @@
       "width" : 150,
       "widthUnit" : "PX",
       "enableRowEdit" : true,
-      "enableSort" : false
+      "enableSort" : true
     }, {
       "align" : "LEFT",
       "cLConvertMode" : "NONE",
@@ -880,7 +880,7 @@
         "codeName" : "End"
       }
     }, {
-      "dataType" : 21,
+      "dataType" : 25,
       "name" : "field",
       "getPSAppDEField" : {
         "name" : "FIELD",
@@ -1111,8 +1111,13 @@
         "codeName" : "Field"
       },
       "getPSEditor" : {
-        "editorType" : "HTMLEDITOR",
-        "name" : "field"
+        "editorParams" : {
+          "HEIGHT" : "200"
+        },
+        "editorType" : "TEXTAREA_10",
+        "maxLength" : 2000,
+        "name" : "field",
+        "showMaxLength" : true
       },
       "rTMOSFilePath" : "psdegridcols/field",
       "allowEmpty" : true

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

@@ -255,7 +255,7 @@
       }
     }, {
       "id" : "field",
-      "dataType" : 21,
+      "dataType" : 25,
       "getPSAppDEField" : {
         "name" : "FIELD",
         "codeName" : "Field"
@@ -489,7 +489,7 @@
             "getPSDEFormDetails" : [ {
               "caption" : "属性",
               "codeName" : "field",
-              "dataType" : 21,
+              "dataType" : 25,
               "detailStyle" : "DEFAULT",
               "detailType" : "FORMITEM",
               "enableCond" : 3,
@@ -524,7 +524,7 @@
                 "editorHeight" : 299.0,
                 "editorType" : "TEXTBOX",
                 "editorWidth" : 199.0,
-                "maxLength" : 1048576,
+                "maxLength" : 2000,
                 "name" : "field"
               },
               "getPSLayoutPos" : {

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

@@ -748,7 +748,7 @@
             "width" : 150,
             "widthUnit" : "PX",
             "enableRowEdit" : true,
-            "enableSort" : false
+            "enableSort" : true
           }, {
             "align" : "LEFT",
             "cLConvertMode" : "NONE",
@@ -948,7 +948,7 @@
               "codeName" : "End"
             }
           }, {
-            "dataType" : 21,
+            "dataType" : 25,
             "name" : "field",
             "getPSAppDEField" : {
               "name" : "FIELD",
@@ -1179,8 +1179,13 @@
               "codeName" : "Field"
             },
             "getPSEditor" : {
-              "editorType" : "HTMLEDITOR",
-              "name" : "field"
+              "editorParams" : {
+                "HEIGHT" : "200"
+              },
+              "editorType" : "TEXTAREA_10",
+              "maxLength" : 2000,
+              "name" : "field",
+              "showMaxLength" : true
             },
             "rTMOSFilePath" : "psdegridcols/field",
             "allowEmpty" : true

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

@@ -1425,7 +1425,7 @@
       }
     }, {
       "id" : "field",
-      "dataType" : 21,
+      "dataType" : 25,
       "getPSAppDEField" : {
         "name" : "FIELD",
         "codeName" : "Field"
@@ -1520,7 +1520,7 @@
         }, {
           "caption" : "富文本",
           "codeName" : "field",
-          "dataType" : 21,
+          "dataType" : 25,
           "detailStyle" : "DEFAULT",
           "detailType" : "FORMITEM",
           "enableCond" : 3,

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

@@ -359,7 +359,7 @@
       "width" : 150,
       "widthUnit" : "PX",
       "enableRowEdit" : true,
-      "enableSort" : false
+      "enableSort" : true
     }, {
       "align" : "LEFT",
       "cLConvertMode" : "FRONT",
@@ -570,7 +570,7 @@
         "codeName" : "Field11"
       }
     }, {
-      "dataType" : 21,
+      "dataType" : 25,
       "name" : "field",
       "getPSAppDEField" : {
         "name" : "FIELD",

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

@@ -587,7 +587,7 @@
       "rTMOSFilePath" : "psdegridcols/field",
       "width" : 200,
       "widthUnit" : "PX",
-      "enableSort" : false
+      "enableSort" : true
     }, {
       "align" : "RIGHT",
       "cLConvertMode" : "FRONT",

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

@@ -231,7 +231,7 @@
       }
     }, {
       "id" : "field",
-      "dataType" : 21,
+      "dataType" : 25,
       "getPSAppDEField" : {
         "name" : "FIELD",
         "codeName" : "Field"
@@ -465,7 +465,7 @@
             "getPSDEFormDetails" : [ {
               "caption" : "属性",
               "codeName" : "field",
-              "dataType" : 21,
+              "dataType" : 25,
               "detailStyle" : "DEFAULT",
               "detailType" : "FORMITEM",
               "enableCond" : 3,
@@ -500,7 +500,7 @@
                 "editorHeight" : 299.0,
                 "editorType" : "TEXTBOX",
                 "editorWidth" : 199.0,
-                "maxLength" : 1048576,
+                "maxLength" : 2000,
                 "name" : "field"
               },
               "getPSLayoutPos" : {

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

@@ -276,7 +276,7 @@
       }
     }, {
       "id" : "field",
-      "dataType" : 21,
+      "dataType" : 25,
       "getPSAppDEField" : {
         "name" : "FIELD",
         "codeName" : "Field"
@@ -510,7 +510,7 @@
             "getPSDEFormDetails" : [ {
               "caption" : "属性",
               "codeName" : "field",
-              "dataType" : 21,
+              "dataType" : 25,
               "detailStyle" : "DEFAULT",
               "detailType" : "FORMITEM",
               "enableCond" : 3,
@@ -545,7 +545,7 @@
                 "editorHeight" : 299.0,
                 "editorType" : "TEXTBOX",
                 "editorWidth" : 199.0,
-                "maxLength" : 1048576,
+                "maxLength" : 2000,
                 "name" : "field"
               },
               "getPSLayoutPos" : {

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

@@ -4970,7 +4970,7 @@
             "width" : 150,
             "widthUnit" : "PX",
             "enableRowEdit" : true,
-            "enableSort" : false
+            "enableSort" : true
           }, {
             "align" : "LEFT",
             "cLConvertMode" : "NONE",
@@ -5170,7 +5170,7 @@
               "codeName" : "End"
             }
           }, {
-            "dataType" : 21,
+            "dataType" : 25,
             "name" : "field",
             "getPSAppDEField" : {
               "name" : "FIELD",
@@ -5401,8 +5401,13 @@
               "codeName" : "Field"
             },
             "getPSEditor" : {
-              "editorType" : "HTMLEDITOR",
-              "name" : "field"
+              "editorParams" : {
+                "HEIGHT" : "200"
+              },
+              "editorType" : "TEXTAREA_10",
+              "maxLength" : 2000,
+              "name" : "field",
+              "showMaxLength" : true
             },
             "rTMOSFilePath" : "psdegridcols/field",
             "allowEmpty" : true

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

@@ -9475,7 +9475,7 @@
                 "width" : 150,
                 "widthUnit" : "PX",
                 "enableRowEdit" : true,
-                "enableSort" : false
+                "enableSort" : true
               }, {
                 "align" : "LEFT",
                 "cLConvertMode" : "NONE",
@@ -9675,7 +9675,7 @@
                   "codeName" : "End"
                 }
               }, {
-                "dataType" : 21,
+                "dataType" : 25,
                 "name" : "field",
                 "getPSAppDEField" : {
                   "name" : "FIELD",
@@ -9906,8 +9906,13 @@
                   "codeName" : "Field"
                 },
                 "getPSEditor" : {
-                  "editorType" : "HTMLEDITOR",
-                  "name" : "field"
+                  "editorParams" : {
+                    "HEIGHT" : "200"
+                  },
+                  "editorType" : "TEXTAREA_10",
+                  "maxLength" : 2000,
+                  "name" : "field",
+                  "showMaxLength" : true
                 },
                 "rTMOSFilePath" : "psdegridcols/field",
                 "allowEmpty" : true
@@ -14583,7 +14588,7 @@
           }
         }, {
           "id" : "field",
-          "dataType" : 21,
+          "dataType" : 25,
           "getPSAppDEField" : {
             "name" : "FIELD",
             "codeName" : "Field"
@@ -14817,7 +14822,7 @@
                 "getPSDEFormDetails" : [ {
                   "caption" : "属性",
                   "codeName" : "field",
-                  "dataType" : 21,
+                  "dataType" : 25,
                   "detailStyle" : "DEFAULT",
                   "detailType" : "FORMITEM",
                   "enableCond" : 3,
@@ -14852,7 +14857,7 @@
                     "editorHeight" : 299.0,
                     "editorType" : "TEXTBOX",
                     "editorWidth" : 199.0,
-                    "maxLength" : 1048576,
+                    "maxLength" : 2000,
                     "name" : "field"
                   },
                   "getPSLayoutPos" : {
@@ -15943,7 +15948,7 @@
           }
         }, {
           "id" : "field",
-          "dataType" : 21,
+          "dataType" : 25,
           "getPSAppDEField" : {
             "name" : "FIELD",
             "codeName" : "Field"
@@ -16177,7 +16182,7 @@
                 "getPSDEFormDetails" : [ {
                   "caption" : "属性",
                   "codeName" : "field",
-                  "dataType" : 21,
+                  "dataType" : 25,
                   "detailStyle" : "DEFAULT",
                   "detailType" : "FORMITEM",
                   "enableCond" : 3,
@@ -16212,7 +16217,7 @@
                     "editorHeight" : 299.0,
                     "editorType" : "TEXTBOX",
                     "editorWidth" : 199.0,
-                    "maxLength" : 1048576,
+                    "maxLength" : 2000,
                     "name" : "field"
                   },
                   "getPSLayoutPos" : {
@@ -17269,6 +17274,37 @@
           },
           "getPSDEFormItemName" : "field",
           "valueRuleType" : "DEFVALUERULE"
+        }, {
+          "checkMode" : 3,
+          "name" : "表单项值规则",
+          "getPSDEFValueRule" : {
+            "codeName" : "ValueRule",
+            "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/AMOUNT/psdefvaluerules/ValueRule",
+            "name" : "amount值规则",
+            "getPSDEFVRGroupCondition" : {
+              "condOp" : "AND",
+              "condType" : "GROUP",
+              "name" : "默认组",
+              "getPSDEFVRConditions" : [ {
+                "condOp" : "EQ",
+                "condType" : "SIMPLE",
+                "dEFName" : "AMOUNT",
+                "name" : "[常规条件] 等于(=) (100)",
+                "paramType" : "SRCENTITYFIELD",
+                "paramValue" : "100",
+                "ruleInfo" : "amount等于100"
+              } ],
+              "ruleInfo" : "amount等于100"
+            },
+            "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/AMOUNT/psdefvaluerules/ValueRule",
+            "ruleInfo" : "amount等于100",
+            "checkDefault" : false,
+            "defaultMode" : false,
+            "enableBackend" : true,
+            "enableFront" : true
+          },
+          "getPSDEFormItemName" : "amount",
+          "valueRuleType" : "DEFVALUERULE"
         }, {
           "checkMode" : 3,
           "name" : "表单项值规则",
@@ -17520,37 +17556,6 @@
           },
           "getPSDEFormItemName" : "field8",
           "valueRuleType" : "DEFVALUERULE"
-        }, {
-          "checkMode" : 3,
-          "name" : "表单项值规则",
-          "getPSDEFValueRule" : {
-            "codeName" : "ValueRule",
-            "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/AMOUNT/psdefvaluerules/ValueRule",
-            "name" : "amount值规则",
-            "getPSDEFVRGroupCondition" : {
-              "condOp" : "AND",
-              "condType" : "GROUP",
-              "name" : "默认组",
-              "getPSDEFVRConditions" : [ {
-                "condOp" : "EQ",
-                "condType" : "SIMPLE",
-                "dEFName" : "AMOUNT",
-                "name" : "[常规条件] 等于(=) (100)",
-                "paramType" : "SRCENTITYFIELD",
-                "paramValue" : "100",
-                "ruleInfo" : "amount等于100"
-              } ],
-              "ruleInfo" : "amount等于100"
-            },
-            "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/AMOUNT/psdefvaluerules/ValueRule",
-            "ruleInfo" : "amount等于100",
-            "checkDefault" : false,
-            "defaultMode" : false,
-            "enableBackend" : true,
-            "enableFront" : true
-          },
-          "getPSDEFormItemName" : "amount",
-          "valueRuleType" : "DEFVALUERULE"
         }, {
           "checkMode" : 3,
           "name" : "表单项值规则",
@@ -22378,11 +22383,11 @@
           "name" : "[FIELD][属性]",
           "getPSDEFFormItem" : {
             "codeName" : "Default",
-            "editorType" : "HTMLEDITOR",
+            "editorType" : "TEXTAREA_10",
             "mOSFilePath" : "psmodules/common/psdataentities/BOOK/psdefields/FIELD/psdefformitems/Default",
             "name" : "[FIELD][属性]",
             "rTMOSFilePath" : "pssysapps/Web/psappdataentities/Book/psappdefields/Field/psdefformitems/Default",
-            "stringLength" : 1048576,
+            "stringLength" : 2000,
             "uIMode" : "DEFAULT"
           },
           "rTMOSFilePath" : "pssysapps/Web/psappdataentities/Book/psappdefields/Field/psappdefuimodes/Default",
@@ -22393,11 +22398,11 @@
           "name" : "[FIELD][属性]移动端默认",
           "getPSDEFFormItem" : {
             "codeName" : "MobileDefault",
-            "editorType" : "HTMLEDITOR",
+            "editorType" : "MOBTEXTAREA",
             "mOSFilePath" : "psmodules/common/psdataentities/BOOK/psdefields/FIELD/psdefformitems/MobileDefault",
             "name" : "[FIELD][属性]移动端默认",
             "rTMOSFilePath" : "pssysapps/Web/psappdataentities/Book/psappdefields/Field/psdefformitems/MobileDefault",
-            "stringLength" : 1048576,
+            "stringLength" : 2000,
             "uIMode" : "MOBILEDEFAULT",
             "mobileMode" : true
           },
@@ -22409,8 +22414,8 @@
         "logicName" : "属性",
         "name" : "FIELD",
         "rTMOSFilePath" : "pssysapps/Web/psappdataentities/Book/psappdefields/Field",
-        "stdDataType" : 21,
-        "stringLength" : 1048576
+        "stdDataType" : 25,
+        "stringLength" : 2000
       }, {
         "getAllPSAppDEFUIModes" : [ {
           "codeName" : "Default",
@@ -24272,7 +24277,7 @@
           },
           "rTMOSFilePath" : "pssysapps/Web/psappdataentities/Book/psappdemethoddtos/BookDTO/psappdemethoddtofields/Field",
           "sourceType" : "DEFIELD",
-          "stdDataType" : 21,
+          "stdDataType" : 25,
           "type" : "SIMPLE"
         }, {
           "codeName" : "Field10",
@@ -24907,7 +24912,7 @@
           },
           "rTMOSFilePath" : "pssysapps/Web/psappdataentities/Book/psappdemethoddtos/BookFilterDTO/psappdemethoddtofields/N_FIELD_EQ",
           "sourceType" : "DEFSEARCHMODE",
-          "stdDataType" : 21,
+          "stdDataType" : 25,
           "type" : "SIMPLE"
         } ],
         "rTMOSFilePath" : "pssysapps/Web/psappdataentities/Book/psappdemethoddtos/BookFilterDTO",
@@ -24990,7 +24995,7 @@
           },
           "rTMOSFilePath" : "pssysapps/Web/psappdataentities/Book/psappdemethoddtos/BookSimpleDTO/psappdemethoddtofields/Field",
           "sourceType" : "DEFGROUPDETAIL",
-          "stdDataType" : 21,
+          "stdDataType" : 25,
           "type" : "SIMPLE"
         }, {
           "codeName" : "Field2",

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

@@ -2635,8 +2635,8 @@
       "name" : "FIELD",
       "orderValue" : 1000,
       "rTMOSFilePath" : "pssysserviceapis/TrainSys/psdeserviceapis/Book/psdeserviceapifields/Field",
-      "stdDataType" : 21,
-      "stringLength" : 1048576,
+      "stdDataType" : 25,
+      "stringLength" : 2000,
       "allowEmpty" : true,
       "enableCreate" : true,
       "enableModify" : true,