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

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/BXD/PSSYSTESTDATA/test.json

@@ -9,9 +9,12 @@
   },
   "getPSSysTestDataItems" : [ {
     "name" : "codelist",
+    "getPSCodeList" : {
+      "modelref" : true,
+      "path" : "PSMODULES/common/PSCODELISTS/Student_age.json"
+    },
     "stdDataType" : 25,
-    "valueType" : "CODELISTVALUE",
-    "nullValue" : false
+    "valueType" : "CODELISTVALUE"
   }, {
     "name" : "null",
     "stdDataType" : 25,
@@ -19,20 +22,26 @@
     "nullValue" : true
   }, {
     "name" : "random",
+    "getRefPSDEDataSet" : {
+      "modelref" : true,
+      "id" : "Default"
+    },
+    "getRefPSDataEntity" : {
+      "modelref" : true,
+      "path" : "PSMODULES/common/PSDATAENTITIES/Phone.json"
+    },
     "stdDataType" : 25,
-    "valueType" : "PICKUPVALUE",
-    "nullValue" : false
+    "valueType" : "PICKUPVALUE"
   }, {
     "name" : "range",
     "stdDataType" : 25,
     "valueType" : "VALUERANGE",
-    "nullValue" : false
+    "values" : [ "10", "1000" ]
   }, {
     "name" : "raw",
     "stdDataType" : 25,
     "value" : "100",
-    "valueType" : "VALUE",
-    "nullValue" : false
+    "valueType" : "VALUE"
   } ],
   "testDataType" : "DATA",
   "baseMode" : false

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

@@ -172,6 +172,9 @@
   }, {
     "id" : "formitem",
     "dataType" : 25
+  }, {
+    "id" : "formitem2",
+    "dataType" : 25
   }, {
     "id" : "formitem22",
     "dataType" : 5,
@@ -726,6 +729,32 @@
       },
       "allowEmpty" : true,
       "showCaption" : true
+    }, {
+      "caption" : "时间范围（可选单位）",
+      "codeName" : "formitem2",
+      "dataType" : 25,
+      "detailStyle" : "DEFAULT",
+      "detailType" : "FORMITEM",
+      "enableCond" : 3,
+      "ignoreInput" : 0,
+      "labelPos" : "LEFT",
+      "labelWidth" : 130,
+      "name" : "formitem2",
+      "noPrivDisplayMode" : 1,
+      "getPSEditor" : {
+        "editorParams" : {
+          "emitMode" : "TIME"
+        },
+        "editorStyle" : "SWITCHUNIT",
+        "editorType" : "DATERANGE",
+        "name" : "formitem2"
+      },
+      "getPSLayoutPos" : {
+        "colMD" : 24,
+        "layout" : "TABLE_24COL"
+      },
+      "allowEmpty" : true,
+      "showCaption" : true
     }, {
       "caption" : "时间范围",
       "codeName" : "formitem22",

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

@@ -275,6 +275,9 @@
     }, {
       "id" : "formitem",
       "dataType" : 25
+    }, {
+      "id" : "formitem2",
+      "dataType" : 25
     }, {
       "id" : "formitem22",
       "dataType" : 5,
@@ -829,6 +832,32 @@
         },
         "allowEmpty" : true,
         "showCaption" : true
+      }, {
+        "caption" : "时间范围（可选单位）",
+        "codeName" : "formitem2",
+        "dataType" : 25,
+        "detailStyle" : "DEFAULT",
+        "detailType" : "FORMITEM",
+        "enableCond" : 3,
+        "ignoreInput" : 0,
+        "labelPos" : "LEFT",
+        "labelWidth" : 130,
+        "name" : "formitem2",
+        "noPrivDisplayMode" : 1,
+        "getPSEditor" : {
+          "editorParams" : {
+            "emitMode" : "TIME"
+          },
+          "editorStyle" : "SWITCHUNIT",
+          "editorType" : "DATERANGE",
+          "name" : "formitem2"
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "allowEmpty" : true,
+        "showCaption" : true
       }, {
         "caption" : "时间范围",
         "codeName" : "formitem22",

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

@@ -3141,6 +3141,12 @@
     },
     "pluginCode" : "ROUTE",
     "styleCode" : "ROUTE"
+  }, {
+    "codeName" : "SWITCHUNIT",
+    "containerType" : "FORMITEM",
+    "editorType" : "DATERANGE",
+    "name" : "时间范围（可选单位）",
+    "styleCode" : "SWITCHUNIT"
   }, {
     "codeName" : "editorTest",
     "containerType" : "FORMITEM",

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

@@ -1091,6 +1091,16 @@
     },
     "styleCode" : "ALLORGSELECT",
     "replaceDefault" : false
+  }, {
+    "codeName" : "SWITCHUNIT",
+    "dynaModelFilePath" : "PSSYSEDITORSTYLES/SWITCHUNIT.json",
+    "editorHeight" : -1.0,
+    "editorType" : "DATERANGE",
+    "editorWidth" : -1.0,
+    "memo" : "defaultUnit：DAY：天；WEEK：周；MONTH：月；QUARTER：季度；YEAR：年；  单位默认为天\nswitchUnit : 是否显示单位选择；\nemitMode:'DEFAULT | TIME' ：选择时间范围后抛出值格式。默认抛出根据事件类型决定，选择抛出 ‘’TIME ‘  则会将对应的时间转换为 时间字符串的格式\n\n",
+    "name" : "时间范围（可选单位）",
+    "styleCode" : "SWITCHUNIT",
+    "replaceDefault" : false
   }, {
     "codeName" : "ALLDEPATMENTSELECT",
     "dynaModelFilePath" : "PSSYSEDITORSTYLES/ALLDEPATMENTSELECT.json",