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

config.xml

@@ -55,12 +55,6 @@
 	  git clone -b master $para2 trainsys/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd trainsys/
-      mvn clean package -Ptrainsys
-      mvn install -Ptrainsys
-      cd trainsys-provider
-      mvn -Ptrainsys docker:build
-      mvn -Ptrainsys docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/trainsys-provider-trainsys.yaml ebsx --with-registry-auth      
       </command>
     </hudson.tasks.Shell>
   </builders>

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST/PSSEARCHBARS/simple.json

@@ -77,6 +77,7 @@
   }, {
     "dataType" : 5,
     "itemType" : "FILTER",
+    "itemWidth" : 160.0,
     "labelPos" : "NONE",
     "labelWidth" : 0,
     "name" : "time",
@@ -85,23 +86,13 @@
       "codeName" : "Time"
     },
     "getPSEditor" : {
+      "dateTimeFormat" : "YYYY-MM-DD HH:mm:ss",
       "editorParams" : {
-        "AC" : "TRUE",
-        "PICKUPVIEW" : "TRUE"
+        "TIMEFMT" : "YYYY-MM-DD HH:mm:ss"
       },
-      "editorStyle" : "DATE_RANGE_PQL",
-      "editorType" : "PICKER",
-      "name" : "time",
-      "getPSSysPFPlugin" : {
-        "pluginType" : "EDITOR_CUSTOMSTYLE",
-        "pluginCode" : "DATE_RANGE_PQL"
-      },
-      "valueItemName" : "time_id",
-      "enableAC" : true,
-      "enablePickupView" : true,
-      "forceSelection" : true,
-      "showTrigger" : true,
-      "singleSelect" : true
+      "editorType" : "DATEPICKER",
+      "editorWidth" : 160.0,
+      "name" : "time"
     },
     "valueItemName" : "time_id",
     "allowEmpty" : true,

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDEVIEWS/TESTGridView.json

@@ -88,14 +88,7 @@
     }
   } ],
   "getPSAppViewRefs" : [ {
-    "name" : "EDITDATA",
-    "openMode" : "POPUPAPP",
-    "getPSNavigateContexts" : [ {
-      "key" : "SRFDEFAULTTOROUTEDEPTH",
-      "name" : "SRFDEFAULTTOROUTEDEPTH",
-      "rawValue" : true
-    } ],
-    "realOpenMode" : "POPUPAPP",
+    "name" : "NEWDATA",
     "realTitle" : "测试实体编辑视图",
     "getRealTitlePSLanguageRes" : {
       "lanResTag" : "PAGE.TITLE.TEST.EDITVIEW"
@@ -106,7 +99,14 @@
       "viewType" : "DEEDITVIEW"
     }
   }, {
-    "name" : "NEWDATA",
+    "name" : "EDITDATA",
+    "openMode" : "POPUPAPP",
+    "getPSNavigateContexts" : [ {
+      "key" : "SRFDEFAULTTOROUTEDEPTH",
+      "name" : "SRFDEFAULTTOROUTEDEPTH",
+      "rawValue" : true
+    } ],
+    "realOpenMode" : "POPUPAPP",
     "realTitle" : "测试实体编辑视图",
     "getRealTitlePSLanguageRes" : {
       "lanResTag" : "PAGE.TITLE.TEST.EDITVIEW"
@@ -1439,6 +1439,7 @@
     }, {
       "dataType" : 5,
       "itemType" : "FILTER",
+      "itemWidth" : 160.0,
       "labelPos" : "NONE",
       "labelWidth" : 0,
       "name" : "time",
@@ -1447,23 +1448,13 @@
         "codeName" : "Time"
       },
       "getPSEditor" : {
+        "dateTimeFormat" : "YYYY-MM-DD HH:mm:ss",
         "editorParams" : {
-          "AC" : "TRUE",
-          "PICKUPVIEW" : "TRUE"
+          "TIMEFMT" : "YYYY-MM-DD HH:mm:ss"
         },
-        "editorStyle" : "DATE_RANGE_PQL",
-        "editorType" : "PICKER",
-        "name" : "time",
-        "getPSSysPFPlugin" : {
-          "pluginType" : "EDITOR_CUSTOMSTYLE",
-          "pluginCode" : "DATE_RANGE_PQL"
-        },
-        "valueItemName" : "time_id",
-        "enableAC" : true,
-        "enablePickupView" : true,
-        "forceSelection" : true,
-        "showTrigger" : true,
-        "singleSelect" : true
+        "editorType" : "DATEPICKER",
+        "editorWidth" : 160.0,
+        "name" : "time"
       },
       "valueItemName" : "time_id",
       "allowEmpty" : true,

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

@@ -59,15 +59,6 @@
     "pluginCode" : "DATA_PICKER_CUSTOM_SELECT",
     "pluginType" : "AC_ITEM",
     "refMode" : "DEACMODE"
-  }, {
-    "name" : "时间范围PQL转换",
-    "getPSSysPFPlugin" : {
-      "pluginType" : "EDITOR_CUSTOMSTYLE",
-      "pluginCode" : "DATE_RANGE_PQL"
-    },
-    "pluginCode" : "DATE_RANGE_PQL",
-    "pluginType" : "EDITOR_CUSTOMSTYLE",
-    "refMode" : "EDITORSTYPE"
   }, {
     "name" : "测试应用实体方法插件",
     "getPSSysPFPlugin" : {

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/TEST/PSSEARCHBARS/simple.json

@@ -77,6 +77,7 @@
   }, {
     "dataType" : 5,
     "itemType" : "FILTER",
+    "itemWidth" : 160.0,
     "labelPos" : "NONE",
     "labelWidth" : 0,
     "name" : "time",
@@ -85,23 +86,13 @@
       "codeName" : "Time"
     },
     "getPSEditor" : {
+      "dateTimeFormat" : "YYYY-MM-DD HH:mm:ss",
       "editorParams" : {
-        "AC" : "TRUE",
-        "PICKUPVIEW" : "TRUE"
+        "TIMEFMT" : "YYYY-MM-DD HH:mm:ss"
       },
-      "editorStyle" : "DATE_RANGE_PQL",
-      "editorType" : "PICKER",
-      "name" : "time",
-      "getPSSysPFPlugin" : {
-        "pluginType" : "EDITOR_CUSTOMSTYLE",
-        "pluginCode" : "DATE_RANGE_PQL"
-      },
-      "valueItemName" : "time_id",
-      "enableAC" : true,
-      "enablePickupView" : true,
-      "forceSelection" : true,
-      "showTrigger" : true,
-      "singleSelect" : true
+      "editorType" : "DATEPICKER",
+      "editorWidth" : 160.0,
+      "name" : "time"
     },
     "valueItemName" : "time_id",
     "allowEmpty" : true,

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

@@ -88,14 +88,7 @@
     }
   } ],
   "getPSAppViewRefs" : [ {
-    "name" : "EDITDATA",
-    "openMode" : "POPUPAPP",
-    "getPSNavigateContexts" : [ {
-      "key" : "SRFDEFAULTTOROUTEDEPTH",
-      "name" : "SRFDEFAULTTOROUTEDEPTH",
-      "rawValue" : true
-    } ],
-    "realOpenMode" : "POPUPAPP",
+    "name" : "NEWDATA",
     "realTitle" : "测试实体编辑视图",
     "getRealTitlePSLanguageRes" : {
       "lanResTag" : "PAGE.TITLE.TEST.EDITVIEW"
@@ -106,7 +99,14 @@
       "viewType" : "DEEDITVIEW"
     }
   }, {
-    "name" : "NEWDATA",
+    "name" : "EDITDATA",
+    "openMode" : "POPUPAPP",
+    "getPSNavigateContexts" : [ {
+      "key" : "SRFDEFAULTTOROUTEDEPTH",
+      "name" : "SRFDEFAULTTOROUTEDEPTH",
+      "rawValue" : true
+    } ],
+    "realOpenMode" : "POPUPAPP",
     "realTitle" : "测试实体编辑视图",
     "getRealTitlePSLanguageRes" : {
       "lanResTag" : "PAGE.TITLE.TEST.EDITVIEW"
@@ -1454,6 +1454,7 @@
     }, {
       "dataType" : 5,
       "itemType" : "FILTER",
+      "itemWidth" : 160.0,
       "labelPos" : "NONE",
       "labelWidth" : 0,
       "name" : "time",
@@ -1462,23 +1463,13 @@
         "codeName" : "Time"
       },
       "getPSEditor" : {
+        "dateTimeFormat" : "YYYY-MM-DD HH:mm:ss",
         "editorParams" : {
-          "AC" : "TRUE",
-          "PICKUPVIEW" : "TRUE"
+          "TIMEFMT" : "YYYY-MM-DD HH:mm:ss"
         },
-        "editorStyle" : "DATE_RANGE_PQL",
-        "editorType" : "PICKER",
-        "name" : "time",
-        "getPSSysPFPlugin" : {
-          "pluginType" : "EDITOR_CUSTOMSTYLE",
-          "pluginCode" : "DATE_RANGE_PQL"
-        },
-        "valueItemName" : "time_id",
-        "enableAC" : true,
-        "enablePickupView" : true,
-        "forceSelection" : true,
-        "showTrigger" : true,
-        "singleSelect" : true
+        "editorType" : "DATEPICKER",
+        "editorWidth" : 160.0,
+        "name" : "time"
       },
       "valueItemName" : "time_id",
       "allowEmpty" : true,

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

@@ -1387,17 +1387,6 @@
     },
     "pluginCode" : "CLIP_BOARD_SPAN",
     "styleCode" : "CLIP_BOARD_SPAN"
-  }, {
-    "codeName" : "DATE_RANGE_PQL",
-    "containerType" : "FORMITEM",
-    "editorType" : "PICKER",
-    "name" : "时间范围PQL转换",
-    "getPSSysPFPlugin" : {
-      "pluginType" : "EDITOR_CUSTOMSTYLE",
-      "pluginCode" : "DATE_RANGE_PQL"
-    },
-    "pluginCode" : "DATE_RANGE_PQL",
-    "styleCode" : "DATE_RANGE_PQL"
   }, {
     "codeName" : "EMOJI_PICKER",
     "containerType" : "FORMITEM",
@@ -1648,15 +1637,6 @@
     "pluginCode" : "DATA_PICKER_CUSTOM_SELECT",
     "pluginType" : "AC_ITEM",
     "refMode" : "DEACMODE"
-  }, {
-    "name" : "时间范围PQL转换",
-    "getPSSysPFPlugin" : {
-      "pluginType" : "EDITOR_CUSTOMSTYLE",
-      "pluginCode" : "DATE_RANGE_PQL"
-    },
-    "pluginCode" : "DATE_RANGE_PQL",
-    "pluginType" : "EDITOR_CUSTOMSTYLE",
-    "refMode" : "EDITORSTYPE"
   }, {
     "name" : "测试向导面板绘制插件",
     "getPSSysPFPlugin" : {

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

@@ -145,15 +145,6 @@
     "pluginCode" : "DATA_PICKER_CUSTOM_SELECT",
     "pluginType" : "AC_ITEM",
     "refMode" : "DEACMODE"
-  }, {
-    "name" : "时间范围PQL转换",
-    "getPSSysPFPlugin" : {
-      "pluginType" : "EDITOR_CUSTOMSTYLE",
-      "pluginCode" : "DATE_RANGE_PQL"
-    },
-    "pluginCode" : "DATE_RANGE_PQL",
-    "pluginType" : "EDITOR_CUSTOMSTYLE",
-    "refMode" : "EDITORSTYPE"
   }, {
     "name" : "测试向导面板绘制插件",
     "getPSSysPFPlugin" : {

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

@@ -388,14 +388,7 @@
               }
             } ],
             "getPSAppViewRefs" : [ {
-              "name" : "EDITDATA",
-              "openMode" : "POPUPAPP",
-              "getPSNavigateContexts" : [ {
-                "key" : "SRFDEFAULTTOROUTEDEPTH",
-                "name" : "SRFDEFAULTTOROUTEDEPTH",
-                "rawValue" : true
-              } ],
-              "realOpenMode" : "POPUPAPP",
+              "name" : "NEWDATA",
               "realTitle" : "测试实体编辑视图",
               "getRealTitlePSLanguageRes" : {
                 "lanResTag" : "PAGE.TITLE.TEST.EDITVIEW"
@@ -406,7 +399,14 @@
                 "viewType" : "DEEDITVIEW"
               }
             }, {
-              "name" : "NEWDATA",
+              "name" : "EDITDATA",
+              "openMode" : "POPUPAPP",
+              "getPSNavigateContexts" : [ {
+                "key" : "SRFDEFAULTTOROUTEDEPTH",
+                "name" : "SRFDEFAULTTOROUTEDEPTH",
+                "rawValue" : true
+              } ],
+              "realOpenMode" : "POPUPAPP",
               "realTitle" : "测试实体编辑视图",
               "getRealTitlePSLanguageRes" : {
                 "lanResTag" : "PAGE.TITLE.TEST.EDITVIEW"
@@ -1754,6 +1754,7 @@
               }, {
                 "dataType" : 5,
                 "itemType" : "FILTER",
+                "itemWidth" : 160.0,
                 "labelPos" : "NONE",
                 "labelWidth" : 0,
                 "name" : "time",
@@ -1762,23 +1763,13 @@
                   "codeName" : "Time"
                 },
                 "getPSEditor" : {
+                  "dateTimeFormat" : "YYYY-MM-DD HH:mm:ss",
                   "editorParams" : {
-                    "AC" : "TRUE",
-                    "PICKUPVIEW" : "TRUE"
+                    "TIMEFMT" : "YYYY-MM-DD HH:mm:ss"
                   },
-                  "editorStyle" : "DATE_RANGE_PQL",
-                  "editorType" : "PICKER",
-                  "name" : "time",
-                  "getPSSysPFPlugin" : {
-                    "pluginType" : "EDITOR_CUSTOMSTYLE",
-                    "pluginCode" : "DATE_RANGE_PQL"
-                  },
-                  "valueItemName" : "time_id",
-                  "enableAC" : true,
-                  "enablePickupView" : true,
-                  "forceSelection" : true,
-                  "showTrigger" : true,
-                  "singleSelect" : true
+                  "editorType" : "DATEPICKER",
+                  "editorWidth" : 160.0,
+                  "name" : "time"
                 },
                 "valueItemName" : "time_id",
                 "allowEmpty" : true,

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

@@ -1275,14 +1275,7 @@
             }
           } ],
           "getPSAppViewRefs" : [ {
-            "name" : "EDITDATA",
-            "openMode" : "POPUPAPP",
-            "getPSNavigateContexts" : [ {
-              "key" : "SRFDEFAULTTOROUTEDEPTH",
-              "name" : "SRFDEFAULTTOROUTEDEPTH",
-              "rawValue" : true
-            } ],
-            "realOpenMode" : "POPUPAPP",
+            "name" : "NEWDATA",
             "realTitle" : "测试实体编辑视图",
             "getRealTitlePSLanguageRes" : {
               "lanResTag" : "PAGE.TITLE.TEST.EDITVIEW"
@@ -1293,7 +1286,14 @@
               "viewType" : "DEEDITVIEW"
             }
           }, {
-            "name" : "NEWDATA",
+            "name" : "EDITDATA",
+            "openMode" : "POPUPAPP",
+            "getPSNavigateContexts" : [ {
+              "key" : "SRFDEFAULTTOROUTEDEPTH",
+              "name" : "SRFDEFAULTTOROUTEDEPTH",
+              "rawValue" : true
+            } ],
+            "realOpenMode" : "POPUPAPP",
             "realTitle" : "测试实体编辑视图",
             "getRealTitlePSLanguageRes" : {
               "lanResTag" : "PAGE.TITLE.TEST.EDITVIEW"
@@ -2641,6 +2641,7 @@
             }, {
               "dataType" : 5,
               "itemType" : "FILTER",
+              "itemWidth" : 160.0,
               "labelPos" : "NONE",
               "labelWidth" : 0,
               "name" : "time",
@@ -2649,23 +2650,13 @@
                 "codeName" : "Time"
               },
               "getPSEditor" : {
+                "dateTimeFormat" : "YYYY-MM-DD HH:mm:ss",
                 "editorParams" : {
-                  "AC" : "TRUE",
-                  "PICKUPVIEW" : "TRUE"
+                  "TIMEFMT" : "YYYY-MM-DD HH:mm:ss"
                 },
-                "editorStyle" : "DATE_RANGE_PQL",
-                "editorType" : "PICKER",
-                "name" : "time",
-                "getPSSysPFPlugin" : {
-                  "pluginType" : "EDITOR_CUSTOMSTYLE",
-                  "pluginCode" : "DATE_RANGE_PQL"
-                },
-                "valueItemName" : "time_id",
-                "enableAC" : true,
-                "enablePickupView" : true,
-                "forceSelection" : true,
-                "showTrigger" : true,
-                "singleSelect" : true
+                "editorType" : "DATEPICKER",
+                "editorWidth" : 160.0,
+                "name" : "time"
               },
               "valueItemName" : "time_id",
               "allowEmpty" : true,

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

@@ -77,6 +77,7 @@
   }, {
     "dataType" : 5,
     "itemType" : "FILTER",
+    "itemWidth" : 160.0,
     "labelPos" : "NONE",
     "labelWidth" : 0,
     "name" : "time",
@@ -85,23 +86,13 @@
       "codeName" : "Time"
     },
     "getPSEditor" : {
+      "dateTimeFormat" : "YYYY-MM-DD HH:mm:ss",
       "editorParams" : {
-        "AC" : "TRUE",
-        "PICKUPVIEW" : "TRUE"
+        "TIMEFMT" : "YYYY-MM-DD HH:mm:ss"
       },
-      "editorStyle" : "DATE_RANGE_PQL",
-      "editorType" : "PICKER",
-      "name" : "time",
-      "getPSSysPFPlugin" : {
-        "pluginType" : "EDITOR_CUSTOMSTYLE",
-        "pluginCode" : "DATE_RANGE_PQL"
-      },
-      "valueItemName" : "time_id",
-      "enableAC" : true,
-      "enablePickupView" : true,
-      "forceSelection" : true,
-      "showTrigger" : true,
-      "singleSelect" : true
+      "editorType" : "DATEPICKER",
+      "editorWidth" : 160.0,
+      "name" : "time"
     },
     "valueItemName" : "time_id",
     "allowEmpty" : true,

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

@@ -509,14 +509,7 @@
                 }
               } ],
               "getPSAppViewRefs" : [ {
-                "name" : "EDITDATA",
-                "openMode" : "POPUPAPP",
-                "getPSNavigateContexts" : [ {
-                  "key" : "SRFDEFAULTTOROUTEDEPTH",
-                  "name" : "SRFDEFAULTTOROUTEDEPTH",
-                  "rawValue" : true
-                } ],
-                "realOpenMode" : "POPUPAPP",
+                "name" : "NEWDATA",
                 "realTitle" : "测试实体编辑视图",
                 "getRealTitlePSLanguageRes" : {
                   "lanResTag" : "PAGE.TITLE.TEST.EDITVIEW"
@@ -527,7 +520,14 @@
                   "viewType" : "DEEDITVIEW"
                 }
               }, {
-                "name" : "NEWDATA",
+                "name" : "EDITDATA",
+                "openMode" : "POPUPAPP",
+                "getPSNavigateContexts" : [ {
+                  "key" : "SRFDEFAULTTOROUTEDEPTH",
+                  "name" : "SRFDEFAULTTOROUTEDEPTH",
+                  "rawValue" : true
+                } ],
+                "realOpenMode" : "POPUPAPP",
                 "realTitle" : "测试实体编辑视图",
                 "getRealTitlePSLanguageRes" : {
                   "lanResTag" : "PAGE.TITLE.TEST.EDITVIEW"
@@ -1875,6 +1875,7 @@
                 }, {
                   "dataType" : 5,
                   "itemType" : "FILTER",
+                  "itemWidth" : 160.0,
                   "labelPos" : "NONE",
                   "labelWidth" : 0,
                   "name" : "time",
@@ -1883,23 +1884,13 @@
                     "codeName" : "Time"
                   },
                   "getPSEditor" : {
+                    "dateTimeFormat" : "YYYY-MM-DD HH:mm:ss",
                     "editorParams" : {
-                      "AC" : "TRUE",
-                      "PICKUPVIEW" : "TRUE"
+                      "TIMEFMT" : "YYYY-MM-DD HH:mm:ss"
                     },
-                    "editorStyle" : "DATE_RANGE_PQL",
-                    "editorType" : "PICKER",
-                    "name" : "time",
-                    "getPSSysPFPlugin" : {
-                      "pluginType" : "EDITOR_CUSTOMSTYLE",
-                      "pluginCode" : "DATE_RANGE_PQL"
-                    },
-                    "valueItemName" : "time_id",
-                    "enableAC" : true,
-                    "enablePickupView" : true,
-                    "forceSelection" : true,
-                    "showTrigger" : true,
-                    "singleSelect" : true
+                    "editorType" : "DATEPICKER",
+                    "editorWidth" : 160.0,
+                    "name" : "time"
                   },
                   "valueItemName" : "time_id",
                   "allowEmpty" : true,

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

@@ -87,14 +87,7 @@
     }
   } ],
   "getPSAppViewRefs" : [ {
-    "name" : "EDITDATA",
-    "openMode" : "POPUPAPP",
-    "getPSNavigateContexts" : [ {
-      "key" : "SRFDEFAULTTOROUTEDEPTH",
-      "name" : "SRFDEFAULTTOROUTEDEPTH",
-      "rawValue" : true
-    } ],
-    "realOpenMode" : "POPUPAPP",
+    "name" : "NEWDATA",
     "realTitle" : "测试实体编辑视图",
     "getRealTitlePSLanguageRes" : {
       "lanResTag" : "PAGE.TITLE.TEST.EDITVIEW"
@@ -105,7 +98,14 @@
       "viewType" : "DEEDITVIEW"
     }
   }, {
-    "name" : "NEWDATA",
+    "name" : "EDITDATA",
+    "openMode" : "POPUPAPP",
+    "getPSNavigateContexts" : [ {
+      "key" : "SRFDEFAULTTOROUTEDEPTH",
+      "name" : "SRFDEFAULTTOROUTEDEPTH",
+      "rawValue" : true
+    } ],
+    "realOpenMode" : "POPUPAPP",
     "realTitle" : "测试实体编辑视图",
     "getRealTitlePSLanguageRes" : {
       "lanResTag" : "PAGE.TITLE.TEST.EDITVIEW"
@@ -1453,6 +1453,7 @@
     }, {
       "dataType" : 5,
       "itemType" : "FILTER",
+      "itemWidth" : 160.0,
       "labelPos" : "NONE",
       "labelWidth" : 0,
       "name" : "time",
@@ -1461,23 +1462,13 @@
         "codeName" : "Time"
       },
       "getPSEditor" : {
+        "dateTimeFormat" : "YYYY-MM-DD HH:mm:ss",
         "editorParams" : {
-          "AC" : "TRUE",
-          "PICKUPVIEW" : "TRUE"
+          "TIMEFMT" : "YYYY-MM-DD HH:mm:ss"
         },
-        "editorStyle" : "DATE_RANGE_PQL",
-        "editorType" : "PICKER",
-        "name" : "time",
-        "getPSSysPFPlugin" : {
-          "pluginType" : "EDITOR_CUSTOMSTYLE",
-          "pluginCode" : "DATE_RANGE_PQL"
-        },
-        "valueItemName" : "time_id",
-        "enableAC" : true,
-        "enablePickupView" : true,
-        "forceSelection" : true,
-        "showTrigger" : true,
-        "singleSelect" : true
+        "editorType" : "DATEPICKER",
+        "editorWidth" : 160.0,
+        "name" : "time"
       },
       "valueItemName" : "time_id",
       "allowEmpty" : true,

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

@@ -509,6 +509,7 @@
     }, {
       "dataType" : 5,
       "itemType" : "FILTER",
+      "itemWidth" : 160.0,
       "labelPos" : "NONE",
       "labelWidth" : 0,
       "name" : "time",
@@ -517,23 +518,13 @@
         "codeName" : "Time"
       },
       "getPSEditor" : {
+        "dateTimeFormat" : "YYYY-MM-DD HH:mm:ss",
         "editorParams" : {
-          "AC" : "TRUE",
-          "PICKUPVIEW" : "TRUE"
+          "TIMEFMT" : "YYYY-MM-DD HH:mm:ss"
         },
-        "editorStyle" : "DATE_RANGE_PQL",
-        "editorType" : "PICKER",
-        "name" : "time",
-        "getPSSysPFPlugin" : {
-          "pluginType" : "EDITOR_CUSTOMSTYLE",
-          "pluginCode" : "DATE_RANGE_PQL"
-        },
-        "valueItemName" : "time_id",
-        "enableAC" : true,
-        "enablePickupView" : true,
-        "forceSelection" : true,
-        "showTrigger" : true,
-        "singleSelect" : true
+        "editorType" : "DATEPICKER",
+        "editorWidth" : 160.0,
+        "name" : "time"
       },
       "valueItemName" : "time_id",
       "allowEmpty" : true,

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

@@ -1395,14 +1395,7 @@
               }
             } ],
             "getPSAppViewRefs" : [ {
-              "name" : "EDITDATA",
-              "openMode" : "POPUPAPP",
-              "getPSNavigateContexts" : [ {
-                "key" : "SRFDEFAULTTOROUTEDEPTH",
-                "name" : "SRFDEFAULTTOROUTEDEPTH",
-                "rawValue" : true
-              } ],
-              "realOpenMode" : "POPUPAPP",
+              "name" : "NEWDATA",
               "realTitle" : "测试实体编辑视图",
               "getRealTitlePSLanguageRes" : {
                 "lanResTag" : "PAGE.TITLE.TEST.EDITVIEW"
@@ -1413,7 +1406,14 @@
                 "viewType" : "DEEDITVIEW"
               }
             }, {
-              "name" : "NEWDATA",
+              "name" : "EDITDATA",
+              "openMode" : "POPUPAPP",
+              "getPSNavigateContexts" : [ {
+                "key" : "SRFDEFAULTTOROUTEDEPTH",
+                "name" : "SRFDEFAULTTOROUTEDEPTH",
+                "rawValue" : true
+              } ],
+              "realOpenMode" : "POPUPAPP",
               "realTitle" : "测试实体编辑视图",
               "getRealTitlePSLanguageRes" : {
                 "lanResTag" : "PAGE.TITLE.TEST.EDITVIEW"
@@ -2761,6 +2761,7 @@
               }, {
                 "dataType" : 5,
                 "itemType" : "FILTER",
+                "itemWidth" : 160.0,
                 "labelPos" : "NONE",
                 "labelWidth" : 0,
                 "name" : "time",
@@ -2769,23 +2770,13 @@
                   "codeName" : "Time"
                 },
                 "getPSEditor" : {
+                  "dateTimeFormat" : "YYYY-MM-DD HH:mm:ss",
                   "editorParams" : {
-                    "AC" : "TRUE",
-                    "PICKUPVIEW" : "TRUE"
+                    "TIMEFMT" : "YYYY-MM-DD HH:mm:ss"
                   },
-                  "editorStyle" : "DATE_RANGE_PQL",
-                  "editorType" : "PICKER",
-                  "name" : "time",
-                  "getPSSysPFPlugin" : {
-                    "pluginType" : "EDITOR_CUSTOMSTYLE",
-                    "pluginCode" : "DATE_RANGE_PQL"
-                  },
-                  "valueItemName" : "time_id",
-                  "enableAC" : true,
-                  "enablePickupView" : true,
-                  "forceSelection" : true,
-                  "showTrigger" : true,
-                  "singleSelect" : true
+                  "editorType" : "DATEPICKER",
+                  "editorWidth" : 160.0,
+                  "name" : "time"
                 },
                 "valueItemName" : "time_id",
                 "allowEmpty" : true,

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

@@ -3038,17 +3038,6 @@
     },
     "pluginCode" : "CronEditor",
     "styleCode" : "CronEditor"
-  }, {
-    "codeName" : "DATE_RANGE_PQL",
-    "containerType" : "FORMITEM",
-    "editorType" : "PICKER",
-    "name" : "时间范围PQL转换",
-    "getPSSysPFPlugin" : {
-      "pluginType" : "EDITOR_CUSTOMSTYLE",
-      "pluginCode" : "DATE_RANGE_PQL"
-    },
-    "pluginCode" : "DATE_RANGE_PQL",
-    "styleCode" : "DATE_RANGE_PQL"
   }, {
     "codeName" : "DEPATMENTMULTIPLE",
     "containerType" : "FORMITEM",
@@ -7539,15 +7528,6 @@
     "pluginCode" : "ROUTE",
     "pluginType" : "EDITOR_CUSTOMSTYLE",
     "refMode" : "EDITORSTYPE"
-  }, {
-    "name" : "时间范围PQL转换",
-    "getPSSysPFPlugin" : {
-      "pluginType" : "EDITOR_CUSTOMSTYLE",
-      "pluginCode" : "DATE_RANGE_PQL"
-    },
-    "pluginCode" : "DATE_RANGE_PQL",
-    "pluginType" : "EDITOR_CUSTOMSTYLE",
-    "refMode" : "EDITORSTYPE"
   }, {
     "name" : "显示模式工具栏项",
     "getPSSysPFPlugin" : {

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

@@ -541,15 +541,6 @@
     "pluginCode" : "ROUTE",
     "pluginType" : "EDITOR_CUSTOMSTYLE",
     "refMode" : "EDITORSTYPE"
-  }, {
-    "name" : "时间范围PQL转换",
-    "getPSSysPFPlugin" : {
-      "pluginType" : "EDITOR_CUSTOMSTYLE",
-      "pluginCode" : "DATE_RANGE_PQL"
-    },
-    "pluginCode" : "DATE_RANGE_PQL",
-    "pluginType" : "EDITOR_CUSTOMSTYLE",
-    "refMode" : "EDITORSTYPE"
   }, {
     "name" : "显示模式工具栏项",
     "getPSSysPFPlugin" : {

trainsys-provider/pom.xml

@@ -33,7 +33,7 @@
 
     <profiles>
         <profile>
-            <id>trainsys</id>
+            <id>runtime</id>
             <build>
                 <resources>
                     <resource>

trainsys-provider/src/main/docker/Dockerfile

@@ -10,6 +10,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Duser.timezone=$TZ -Djava.security.egd=file:/dev/./urandom -jar /trainsys-provider.jar
 
-EXPOSE 50000
+EXPOSE 8081
 
 ADD trainsys-provider.jar /trainsys-provider.jar

trainsys-provider/src/main/docker/trainsys-provider-trainsys-k8s.yaml

@@ -22,32 +22,7 @@ spec:
         image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
         imagePullPolicy: Always
         ports:
-        - containerPort: 50000
-        env:
-        - name: SPRING_CLOUD_NACOS_DISCOVERY_IP
-          value: "172.16.240.140"      
-        - name: SERVER_PORT
-          value: "50000"
-        - name: SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR
-          value: "172.16.240.140:8848"
-        - name: SPRING_REDIS_HOST
-          value: "127.0.0.1"
-        - name: SPRING_REDIS_PORT
-          value: "6379"
-        - name: SPRING_REDIS_DATABASE
-          value: "0"
-        - name: SPRING_DATASOURCE_USERNAME
-          value: "a_LAB01_d23cc850e"
-        - name: SPRING_DATASOURCE_PASSWORD
-          value: "f9Df4556"
-        - name: SPRING_DATASOURCE_URL
-          value: "jdbc:mysql://172.16.186.185:3306/a_LAB01_d23cc850e?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&serverTimezone=Asia/Shanghai&allowMultiQueries=true&serverTimezone=GMT%2B8"
-        - name: SPRING_DATASOURCE_DRIVER-CLASS-NAME
-          value: "com.mysql.jdbc.Driver"
-        - name: SPRING_DATASOURCE_DEFAULTSCHEMA
-          value: "a_LAB01_d23cc850e"
-        - name: NACOS
-          value: "172.16.240.140:8848"      
+        - containerPort: 8081
 
 ---
 apiVersion: v1
@@ -60,9 +35,9 @@ spec:
   type: NodePort
   ports:
   - name: http
-    port: 50000
-    targetPort: 50000
-    nodePort: 50000
+    port: 8081
+    targetPort: 8081
+    nodePort: 8081
     protocol: TCP
   selector:
     app: trainsys-provider

trainsys-provider/src/main/docker/trainsys-provider-trainsys.yaml

@@ -3,23 +3,9 @@ services:
   trainsys-provider:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
     ports:
-      - "50000:50000"
+      - "8081:8081"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.140
-      - SERVER_PORT=50000
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.140:8848
-      - SPRING_CLOUD_NACOS_CONFIG_SERVER-ADDR=172.16.240.140:8848
-      - SPRING_REDIS_HOST=127.0.0.1
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_LAB01_d23cc850e
-      - SPRING_DATASOURCE_PASSWORD=f9Df4556
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_d23cc850e?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&serverTimezone=Asia/Shanghai&allowMultiQueries=true&serverTimezone=GMT%2B8
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_d23cc850e
-      - NACOS=172.16.240.140:8848
     deploy:
       resources:
            limits: