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

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

@@ -216,6 +216,9 @@
       "name" : "FIELD18",
       "codeName" : "Field18"
     }
+  }, {
+    "id" : "formitemex1",
+    "dataType" : 25
   }, {
     "id" : "bookid",
     "hidden" : true,
@@ -251,6 +254,8 @@
         "noPrivDisplayMode" : 1,
         "getPSEditor" : {
           "editorParams" : {
+            "CUSTOM" : "true",
+            "CUSTOMCOLORLIST" : "[{\"text\":\"颜色名字\",\"value\":[\"#123123\",\"#111222\",\"#333322\",\"#11ff33\"]}]",
             "MULTIPLE" : "true"
           },
           "editorType" : "COLORPICKER",
@@ -1009,6 +1014,41 @@
       "layout" : "TABLE_24COL"
     },
     "infoGroupMode" : false
+  }, {
+    "caption" : "复合表单项",
+    "codeName" : "formpage2",
+    "detailStyle" : "DEFAULT",
+    "detailType" : "FORMPAGE",
+    "name" : "formpage2",
+    "getPSDEFormDetails" : [ {
+      "codeName" : "formitemex1",
+      "dataType" : 25,
+      "detailStyle" : "DEFAULT",
+      "detailType" : "FORMITEM",
+      "enableCond" : 3,
+      "ignoreInput" : 0,
+      "labelPos" : "LEFT",
+      "labelWidth" : 130,
+      "name" : "formitemex1",
+      "noPrivDisplayMode" : 1,
+      "getPSEditor" : {
+        "editorType" : "TEXTBOX",
+        "name" : "formitemex1"
+      },
+      "getPSLayoutPos" : {
+        "colMD" : 24,
+        "layout" : "TABLE_24COL"
+      },
+      "allowEmpty" : true,
+      "compositeItem" : true,
+      "showCaption" : true
+    } ],
+    "getPSLayout" : {
+      "childColMD" : 24,
+      "columnCount" : 24,
+      "layout" : "TABLE_24COL"
+    },
+    "infoGroupMode" : false
   } ],
   "getPSLayout" : {
     "childColMD" : 24,

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Student/PSCHARTS/Usr08080936ChartView_Chart.json

@@ -122,6 +122,6 @@
   "modelid" : "8A98FCAE-82E5-425B-BF66-91FEE11E11F3",
   "modeltype" : "PSDECHART",
   "getUserParam" : {
-    "EC.color" : "[\"#5470c6\",\"#91cc75\",\"#fac858\",\"#ee6666\",\"#73c0de\",\"#3ba272\",\"#fc8452\",\"#9a60b4\",\"#ea7ccc\",\"#5470c6\",\"#91cc75\"]"
+    "EC.color" : "[\"#5470c6\",\"#91cc75\",\"#fac858\",\"#ee6666\",\"\"]"
   }
 }
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Student/PSDASHBOARDS/FullScreenDashboardView_Dashboard.json

@@ -3440,7 +3440,7 @@
               "modelid" : "8A98FCAE-82E5-425B-BF66-91FEE11E11F3",
               "modeltype" : "PSDECHART",
               "getUserParam" : {
-                "EC.color" : "[\"#5470c6\",\"#91cc75\",\"#fac858\",\"#ee6666\",\"#73c0de\",\"#3ba272\",\"#fc8452\",\"#9a60b4\",\"#ea7ccc\",\"#5470c6\",\"#91cc75\"]"
+                "EC.color" : "[\"#5470c6\",\"#91cc75\",\"#fac858\",\"#ee6666\",\"\"]"
               }
             }, {
               "caption" : "学生",

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

@@ -319,6 +319,9 @@
         "name" : "FIELD18",
         "codeName" : "Field18"
       }
+    }, {
+      "id" : "formitemex1",
+      "dataType" : 25
     }, {
       "id" : "bookid",
       "hidden" : true,
@@ -354,6 +357,8 @@
           "noPrivDisplayMode" : 1,
           "getPSEditor" : {
             "editorParams" : {
+              "CUSTOM" : "true",
+              "CUSTOMCOLORLIST" : "[{\"text\":\"颜色名字\",\"value\":[\"#123123\",\"#111222\",\"#333322\",\"#11ff33\"]}]",
               "MULTIPLE" : "true"
             },
             "editorType" : "COLORPICKER",
@@ -1112,6 +1117,41 @@
         "layout" : "TABLE_24COL"
       },
       "infoGroupMode" : false
+    }, {
+      "caption" : "复合表单项",
+      "codeName" : "formpage2",
+      "detailStyle" : "DEFAULT",
+      "detailType" : "FORMPAGE",
+      "name" : "formpage2",
+      "getPSDEFormDetails" : [ {
+        "codeName" : "formitemex1",
+        "dataType" : 25,
+        "detailStyle" : "DEFAULT",
+        "detailType" : "FORMITEM",
+        "enableCond" : 3,
+        "ignoreInput" : 0,
+        "labelPos" : "LEFT",
+        "labelWidth" : 130,
+        "name" : "formitemex1",
+        "noPrivDisplayMode" : 1,
+        "getPSEditor" : {
+          "editorType" : "TEXTBOX",
+          "name" : "formitemex1"
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "allowEmpty" : true,
+        "compositeItem" : true,
+        "showCaption" : true
+      } ],
+      "getPSLayout" : {
+        "childColMD" : 24,
+        "columnCount" : 24,
+        "layout" : "TABLE_24COL"
+      },
+      "infoGroupMode" : false
     } ],
     "getPSLayout" : {
       "childColMD" : 24,

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

@@ -3471,7 +3471,7 @@
                 "modelid" : "8A98FCAE-82E5-425B-BF66-91FEE11E11F3",
                 "modeltype" : "PSDECHART",
                 "getUserParam" : {
-                  "EC.color" : "[\"#5470c6\",\"#91cc75\",\"#fac858\",\"#ee6666\",\"#73c0de\",\"#3ba272\",\"#fc8452\",\"#9a60b4\",\"#ea7ccc\",\"#5470c6\",\"#91cc75\"]"
+                  "EC.color" : "[\"#5470c6\",\"#91cc75\",\"#fac858\",\"#ee6666\",\"\"]"
                 }
               }, {
                 "caption" : "学生",

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

@@ -296,7 +296,7 @@
     "modelid" : "8A98FCAE-82E5-425B-BF66-91FEE11E11F3",
     "modeltype" : "PSDECHART",
     "getUserParam" : {
-      "EC.color" : "[\"#5470c6\",\"#91cc75\",\"#fac858\",\"#ee6666\",\"#73c0de\",\"#3ba272\",\"#fc8452\",\"#9a60b4\",\"#ea7ccc\",\"#5470c6\",\"#91cc75\"]"
+      "EC.color" : "[\"#5470c6\",\"#91cc75\",\"#fac858\",\"#ee6666\",\"\"]"
     }
   }, {
     "caption" : "学生",

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

@@ -12892,7 +12892,7 @@
           "modelid" : "8A98FCAE-82E5-425B-BF66-91FEE11E11F3",
           "modeltype" : "PSDECHART",
           "getUserParam" : {
-            "EC.color" : "[\"#5470c6\",\"#91cc75\",\"#fac858\",\"#ee6666\",\"#73c0de\",\"#3ba272\",\"#fc8452\",\"#9a60b4\",\"#ea7ccc\",\"#5470c6\",\"#91cc75\"]"
+            "EC.color" : "[\"#5470c6\",\"#91cc75\",\"#fac858\",\"#ee6666\",\"\"]"
           }
         }, {
           "caption" : "学生",
@@ -93574,7 +93574,7 @@
                     "modelid" : "8A98FCAE-82E5-425B-BF66-91FEE11E11F3",
                     "modeltype" : "PSDECHART",
                     "getUserParam" : {
-                      "EC.color" : "[\"#5470c6\",\"#91cc75\",\"#fac858\",\"#ee6666\",\"#73c0de\",\"#3ba272\",\"#fc8452\",\"#9a60b4\",\"#ea7ccc\",\"#5470c6\",\"#91cc75\"]"
+                      "EC.color" : "[\"#5470c6\",\"#91cc75\",\"#fac858\",\"#ee6666\",\"\"]"
                     }
                   }, {
                     "caption" : "学生",