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

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

@@ -201,7 +201,7 @@
   }, {
     "id" : "formitem2",
     "dataType" : 25,
-    "createDV" : "测试直接内容"
+    "createDV" : "<div style='color:red;'>测试直接内容html</div>"
   }, {
     "id" : "date",
     "dataType" : 5,
@@ -755,7 +755,7 @@
       }, {
         "caption" : "直接内容",
         "codeName" : "formitem2",
-        "createDV" : "测试直接内容",
+        "createDV" : "<div style='color:red;'>测试直接内容html</div>",
         "dataType" : 25,
         "detailStyle" : "DEFAULT",
         "detailType" : "FORMITEM",
@@ -767,6 +767,10 @@
         "name" : "formitem2",
         "noPrivDisplayMode" : 1,
         "getPSEditor" : {
+          "contentType" : "HTML",
+          "editorParams" : {
+            "CONTENTTYPE" : "HTML"
+          },
           "editorType" : "RAW",
           "name" : "formitem2"
         },

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

@@ -160,6 +160,37 @@
     },
     "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" : "表单项值规则",
@@ -207,37 +238,6 @@
     },
     "getPSDEFormItemName" : "field7",
     "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

@@ -289,6 +289,37 @@
       },
       "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" : "表单项值规则",
@@ -336,37 +367,6 @@
       },
       "getPSDEFormItemName" : "field7",
       "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

@@ -1537,7 +1537,7 @@
     }, {
       "id" : "formitem2",
       "dataType" : 25,
-      "createDV" : "测试直接内容"
+      "createDV" : "<div style='color:red;'>测试直接内容html</div>"
     }, {
       "id" : "date",
       "dataType" : 5,
@@ -2091,7 +2091,7 @@
         }, {
           "caption" : "直接内容",
           "codeName" : "formitem2",
-          "createDV" : "测试直接内容",
+          "createDV" : "<div style='color:red;'>测试直接内容html</div>",
           "dataType" : 25,
           "detailStyle" : "DEFAULT",
           "detailType" : "FORMITEM",
@@ -2103,6 +2103,10 @@
           "name" : "formitem2",
           "noPrivDisplayMode" : 1,
           "getPSEditor" : {
+            "contentType" : "HTML",
+            "editorParams" : {
+              "CONTENTTYPE" : "HTML"
+            },
             "editorType" : "RAW",
             "name" : "formitem2"
           },

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

@@ -16948,6 +16948,37 @@
           },
           "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" : "表单项值规则",
@@ -16995,37 +17026,6 @@
           },
           "getPSDEFormItemName" : "field7",
           "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" : "表单项值规则",