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

a610968e · ibizdev · 5329ca17 · a610968e · a610968e · a610968e
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST/PSSEARCHBARS/simple.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST/PSSEARCHBARS/simple.json
@@ -85,18 +85,9 @@
      "codeName" : "Time"
    },
    "getPSEditor" : {
-      "editorParams" : {
+      "editorStyle" : "DATE_RANGE_PQL",
-        "AC" : "TRUE",
+      "editorType" : "TEXTBOX",
-        "PICKUPVIEW" : "TRUE"
+      "name" : "time"
-      },
-      "editorType" : "PICKER",
-      "name" : "time",
-      "valueItemName" : "time_id",
-      "enableAC" : true,
-      "enablePickupView" : true,
-      "forceSelection" : true,
-      "showTrigger" : true,
-      "singleSelect" : true
    },
    "valueItemName" : "time_id",
    "allowEmpty" : true,

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDEVIEWS/TESTGridView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDEVIEWS/TESTGridView.json
@@ -1447,18 +1447,9 @@
        "codeName" : "Time"
      },
      "getPSEditor" : {
-        "editorParams" : {
+        "editorStyle" : "DATE_RANGE_PQL",
-          "AC" : "TRUE",
+        "editorType" : "TEXTBOX",
-          "PICKUPVIEW" : "TRUE"
+        "name" : "time"
-        },
-        "editorType" : "PICKER",
-        "name" : "time",
-        "valueItemName" : "time_id",
-        "enableAC" : true,
-        "enablePickupView" : true,
-        "forceSelection" : true,
-        "showTrigger" : true,
-        "singleSelect" : true
      },
      "valueItemName" : "time_id",
      "allowEmpty" : true,

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/TEST/PSSEARCHBARS/simple.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/TEST/PSSEARCHBARS/simple.json
@@ -85,18 +85,9 @@
      "codeName" : "Time"
    },
    "getPSEditor" : {
-      "editorParams" : {
+      "editorStyle" : "DATE_RANGE_PQL",
-        "AC" : "TRUE",
+      "editorType" : "TEXTBOX",
-        "PICKUPVIEW" : "TRUE"
+      "name" : "time"
-      },
-      "editorType" : "PICKER",
-      "name" : "time",
-      "valueItemName" : "time_id",
-      "enableAC" : true,
-      "enablePickupView" : true,
-      "forceSelection" : true,
-      "showTrigger" : true,
-      "singleSelect" : true
    },
    "valueItemName" : "time_id",
    "allowEmpty" : true,

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDEVIEWS/TESTGridView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDEVIEWS/TESTGridView.json
@@ -1462,18 +1462,9 @@
        "codeName" : "Time"
      },
      "getPSEditor" : {
-        "editorParams" : {
+        "editorStyle" : "DATE_RANGE_PQL",
-          "AC" : "TRUE",
+        "editorType" : "TEXTBOX",
-          "PICKUPVIEW" : "TRUE"
+        "name" : "time"
-        },
-        "editorType" : "PICKER",
-        "name" : "time",
-        "valueItemName" : "time_id",
-        "enableAC" : true,
-        "enablePickupView" : true,
-        "forceSelection" : true,
-        "showTrigger" : true,
-        "singleSelect" : true
      },
      "valueItemName" : "time_id",
      "allowEmpty" : true,

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSSYSAPP.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSSYSAPP.json
@@ -1387,6 +1387,12 @@
    },
    "pluginCode" : "CLIP_BOARD_SPAN",
    "styleCode" : "CLIP_BOARD_SPAN"
+  }, {
+    "codeName" : "DATE_RANGE_PQL",
+    "containerType" : "FORMITEM",
+    "editorType" : "TEXTBOX",
+    "name" : "时间范围PQL转换",
+    "styleCode" : "DATE_RANGE_PQL"
  }, {
    "codeName" : "EMOJI_PICKER",
    "containerType" : "FORMITEM",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSFORMS/FormTabPanelTest_Form.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSFORMS/FormTabPanelTest_Form.json
@@ -1762,18 +1762,9 @@
                  "codeName" : "Time"
                },
                "getPSEditor" : {
-                  "editorParams" : {
+                  "editorStyle" : "DATE_RANGE_PQL",
-                    "AC" : "TRUE",
+                  "editorType" : "TEXTBOX",
-                    "PICKUPVIEW" : "TRUE"
+                  "name" : "time"
-                  },
-                  "editorType" : "PICKER",
-                  "name" : "time",
-                  "valueItemName" : "time_id",
-                  "enableAC" : true,
-                  "enablePickupView" : true,
-                  "forceSelection" : true,
-                  "showTrigger" : true,
-                  "singleSelect" : true
                },
                "valueItemName" : "time_id",
                "allowEmpty" : true,

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSFORMS/Gnqrbdys.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSFORMS/Gnqrbdys.json
@@ -5927,18 +5927,9 @@
                "codeName" : "Time"
              },
              "getPSEditor" : {
-                "editorParams" : {
+                "editorStyle" : "DATE_RANGE_PQL",
-                  "AC" : "TRUE",
+                "editorType" : "TEXTBOX",
-                  "PICKUPVIEW" : "TRUE"
+                "name" : "time"
-                },
-                "editorType" : "PICKER",
-                "name" : "time",
-                "valueItemName" : "time_id",
-                "enableAC" : true,
-                "enablePickupView" : true,
-                "forceSelection" : true,
-                "showTrigger" : true,
-                "singleSelect" : true
              },
              "valueItemName" : "time_id",
              "allowEmpty" : true,
@@ -7511,18 +7502,9 @@
                "codeName" : "Time"
              },
              "getPSEditor" : {
-                "editorParams" : {
+                "editorStyle" : "DATE_RANGE_PQL",
-                  "AC" : "TRUE",
+                "editorType" : "TEXTBOX",
-                  "PICKUPVIEW" : "TRUE"
+                "name" : "time"
-                },
-                "editorType" : "PICKER",
-                "name" : "time",
-                "valueItemName" : "time_id",
-                "enableAC" : true,
-                "enablePickupView" : true,
-                "forceSelection" : true,
-                "showTrigger" : true,
-                "singleSelect" : true
              },
              "valueItemName" : "time_id",
              "allowEmpty" : true,
@@ -9094,18 +9076,9 @@
                "codeName" : "Time"
              },
              "getPSEditor" : {
-                "editorParams" : {
+                "editorStyle" : "DATE_RANGE_PQL",
-                  "AC" : "TRUE",
+                "editorType" : "TEXTBOX",
-                  "PICKUPVIEW" : "TRUE"
+                "name" : "time"
-                },
-                "editorType" : "PICKER",
-                "name" : "time",
-                "valueItemName" : "time_id",
-                "enableAC" : true,
-                "enablePickupView" : true,
-                "forceSelection" : true,
-                "showTrigger" : true,
-                "singleSelect" : true
              },
              "valueItemName" : "time_id",
              "allowEmpty" : true,
@@ -10677,18 +10650,9 @@
                "codeName" : "Time"
              },
              "getPSEditor" : {
-                "editorParams" : {
+                "editorStyle" : "DATE_RANGE_PQL",
-                  "AC" : "TRUE",
+                "editorType" : "TEXTBOX",
-                  "PICKUPVIEW" : "TRUE"
+                "name" : "time"
-                },
-                "editorType" : "PICKER",
-                "name" : "time",
-                "valueItemName" : "time_id",
-                "enableAC" : true,
-                "enablePickupView" : true,
-                "forceSelection" : true,
-                "showTrigger" : true,
-                "singleSelect" : true
              },
              "valueItemName" : "time_id",
              "allowEmpty" : true,
@@ -12292,18 +12256,9 @@
                "codeName" : "Time"
              },
              "getPSEditor" : {
-                "editorParams" : {
+                "editorStyle" : "DATE_RANGE_PQL",
-                  "AC" : "TRUE",
+                "editorType" : "TEXTBOX",
-                  "PICKUPVIEW" : "TRUE"
+                "name" : "time"
-                },
-                "editorType" : "PICKER",
-                "name" : "time",
-                "valueItemName" : "time_id",
-                "enableAC" : true,
-                "enablePickupView" : true,
-                "forceSelection" : true,
-                "showTrigger" : true,
-                "singleSelect" : true
              },
              "valueItemName" : "time_id",
              "allowEmpty" : true,

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSFORMS/TestControl.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSFORMS/TestControl.json
@@ -2649,18 +2649,9 @@
                "codeName" : "Time"
              },
              "getPSEditor" : {
-                "editorParams" : {
+                "editorStyle" : "DATE_RANGE_PQL",
-                  "AC" : "TRUE",
+                "editorType" : "TEXTBOX",
-                  "PICKUPVIEW" : "TRUE"
+                "name" : "time"
-                },
-                "editorType" : "PICKER",
-                "name" : "time",
-                "valueItemName" : "time_id",
-                "enableAC" : true,
-                "enablePickupView" : true,
-                "forceSelection" : true,
-                "showTrigger" : true,
-                "singleSelect" : true
              },
              "valueItemName" : "time_id",
              "allowEmpty" : true,

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSSEARCHBARS/simple.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSSEARCHBARS/simple.json
@@ -85,18 +85,9 @@
      "codeName" : "Time"
    },
    "getPSEditor" : {
-      "editorParams" : {
+      "editorStyle" : "DATE_RANGE_PQL",
-        "AC" : "TRUE",
+      "editorType" : "TEXTBOX",
-        "PICKUPVIEW" : "TRUE"
+      "name" : "time"
-      },
-      "editorType" : "PICKER",
-      "name" : "time",
-      "valueItemName" : "time_id",
-      "enableAC" : true,
-      "enablePickupView" : true,
-      "forceSelection" : true,
-      "showTrigger" : true,
-      "singleSelect" : true
    },
    "valueItemName" : "time_id",
    "allowEmpty" : true,

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTFormTabPanelTest.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTFormTabPanelTest.json
@@ -1883,18 +1883,9 @@
                    "codeName" : "Time"
                  },
                  "getPSEditor" : {
-                    "editorParams" : {
+                    "editorStyle" : "DATE_RANGE_PQL",
-                      "AC" : "TRUE",
+                    "editorType" : "TEXTBOX",
-                      "PICKUPVIEW" : "TRUE"
+                    "name" : "time"
-                    },
-                    "editorType" : "PICKER",
-                    "name" : "time",
-                    "valueItemName" : "time_id",
-                    "enableAC" : true,
-                    "enablePickupView" : true,
-                    "forceSelection" : true,
-                    "showTrigger" : true,
-                    "singleSelect" : true
                  },
                  "valueItemName" : "time_id",
                  "allowEmpty" : true,

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTGridView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTGridView.json
@@ -1461,18 +1461,9 @@
        "codeName" : "Time"
      },
      "getPSEditor" : {
-        "editorParams" : {
+        "editorStyle" : "DATE_RANGE_PQL",
-          "AC" : "TRUE",
+        "editorType" : "TEXTBOX",
-          "PICKUPVIEW" : "TRUE"
+        "name" : "time"
-        },
-        "editorType" : "PICKER",
-        "name" : "time",
-        "valueItemName" : "time_id",
-        "enableAC" : true,
-        "enablePickupView" : true,
-        "forceSelection" : true,
-        "showTrigger" : true,
-        "singleSelect" : true
      },
      "valueItemName" : "time_id",
      "allowEmpty" : true,

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTTabSearchListView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTTabSearchListView.json
@@ -517,18 +517,9 @@
        "codeName" : "Time"
      },
      "getPSEditor" : {
-        "editorParams" : {
+        "editorStyle" : "DATE_RANGE_PQL",
-          "AC" : "TRUE",
+        "editorType" : "TEXTBOX",
-          "PICKUPVIEW" : "TRUE"
+        "name" : "time"
-        },
-        "editorType" : "PICKER",
-        "name" : "time",
-        "valueItemName" : "time_id",
-        "enableAC" : true,
-        "enablePickupView" : true,
-        "forceSelection" : true,
-        "showTrigger" : true,
-        "singleSelect" : true
      },
      "valueItemName" : "time_id",
      "allowEmpty" : true,

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTTestControlEditView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTTestControlEditView.json
@@ -2769,18 +2769,9 @@
                  "codeName" : "Time"
                },
                "getPSEditor" : {
-                  "editorParams" : {
+                  "editorStyle" : "DATE_RANGE_PQL",
-                    "AC" : "TRUE",
+                  "editorType" : "TEXTBOX",
-                    "PICKUPVIEW" : "TRUE"
+                  "name" : "time"
-                  },
-                  "editorType" : "PICKER",
-                  "name" : "time",
-                  "valueItemName" : "time_id",
-                  "enableAC" : true,
-                  "enablePickupView" : true,
-                  "forceSelection" : true,
-                  "showTrigger" : true,
-                  "singleSelect" : true
                },
                "valueItemName" : "time_id",
                "allowEmpty" : true,

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr5EditView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr5EditView.json
@@ -6053,18 +6053,9 @@
                  "codeName" : "Time"
                },
                "getPSEditor" : {
-                  "editorParams" : {
+                  "editorStyle" : "DATE_RANGE_PQL",
-                    "AC" : "TRUE",
+                  "editorType" : "TEXTBOX",
-                    "PICKUPVIEW" : "TRUE"
+                  "name" : "time"
-                  },
-                  "editorType" : "PICKER",
-                  "name" : "time",
-                  "valueItemName" : "time_id",
-                  "enableAC" : true,
-                  "enablePickupView" : true,
-                  "forceSelection" : true,
-                  "showTrigger" : true,
-                  "singleSelect" : true
                },
                "valueItemName" : "time_id",
                "allowEmpty" : true,
@@ -7637,18 +7628,9 @@
                  "codeName" : "Time"
                },
                "getPSEditor" : {
-                  "editorParams" : {
+                  "editorStyle" : "DATE_RANGE_PQL",
-                    "AC" : "TRUE",
+                  "editorType" : "TEXTBOX",
-                    "PICKUPVIEW" : "TRUE"
+                  "name" : "time"
-                  },
-                  "editorType" : "PICKER",
-                  "name" : "time",
-                  "valueItemName" : "time_id",
-                  "enableAC" : true,
-                  "enablePickupView" : true,
-                  "forceSelection" : true,
-                  "showTrigger" : true,
-                  "singleSelect" : true
                },
                "valueItemName" : "time_id",
                "allowEmpty" : true,
@@ -9220,18 +9202,9 @@
                  "codeName" : "Time"
                },
                "getPSEditor" : {
-                  "editorParams" : {
+                  "editorStyle" : "DATE_RANGE_PQL",
-                    "AC" : "TRUE",
+                  "editorType" : "TEXTBOX",
-                    "PICKUPVIEW" : "TRUE"
+                  "name" : "time"
-                  },
-                  "editorType" : "PICKER",
-                  "name" : "time",
-                  "valueItemName" : "time_id",
-                  "enableAC" : true,
-                  "enablePickupView" : true,
-                  "forceSelection" : true,
-                  "showTrigger" : true,
-                  "singleSelect" : true
                },
                "valueItemName" : "time_id",
                "allowEmpty" : true,
@@ -10803,18 +10776,9 @@
                  "codeName" : "Time"
                },
                "getPSEditor" : {
-                  "editorParams" : {
+                  "editorStyle" : "DATE_RANGE_PQL",
-                    "AC" : "TRUE",
+                  "editorType" : "TEXTBOX",
-                    "PICKUPVIEW" : "TRUE"
+                  "name" : "time"
-                  },
-                  "editorType" : "PICKER",
-                  "name" : "time",
-                  "valueItemName" : "time_id",
-                  "enableAC" : true,
-                  "enablePickupView" : true,
-                  "forceSelection" : true,
-                  "showTrigger" : true,
-                  "singleSelect" : true
                },
                "valueItemName" : "time_id",
                "allowEmpty" : true,
@@ -12418,18 +12382,9 @@
                  "codeName" : "Time"
                },
                "getPSEditor" : {
-                  "editorParams" : {
+                  "editorStyle" : "DATE_RANGE_PQL",
-                    "AC" : "TRUE",
+                  "editorType" : "TEXTBOX",
-                    "PICKUPVIEW" : "TRUE"
+                  "name" : "time"
-                  },
-                  "editorType" : "PICKER",
-                  "name" : "time",
-                  "valueItemName" : "time_id",
-                  "enableAC" : true,
-                  "enablePickupView" : true,
-                  "forceSelection" : true,
-                  "showTrigger" : true,
-                  "singleSelect" : true
                },
                "valueItemName" : "time_id",
                "allowEmpty" : true,

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
@@ -3005,6 +3005,12 @@
    },
    "pluginCode" : "CronEditor",
    "styleCode" : "CronEditor"
+  }, {
+    "codeName" : "DATE_RANGE_PQL",
+    "containerType" : "FORMITEM",
+    "editorType" : "TEXTBOX",
+    "name" : "时间范围PQL转换",
+    "styleCode" : "DATE_RANGE_PQL"
  }, {
    "codeName" : "DEPATMENTMULTIPLE",
    "containerType" : "FORMITEM",
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSTEM.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSTEM.json
@@ -1401,6 +1401,15 @@
    },
    "styleCode" : "ALLEMPSELECT",
    "replaceDefault" : false
+  }, {
+    "codeName" : "DATE_RANGE_PQL",
+    "dynaModelFilePath" : "PSSYSEDITORSTYLES/DATE_RANGE_PQL.json",
+    "editorHeight" : -1.0,
+    "editorType" : "TEXTBOX",
+    "editorWidth" : -1.0,
+    "name" : "时间范围PQL转换",
+    "styleCode" : "DATE_RANGE_PQL",
+    "replaceDefault" : false
  }, {
    "codeName" : "PERSONEL_SELECT_PROJECT",
    "dynaModelFilePath" : "PSSYSEDITORSTYLES/PERSONEL_SELECT_PROJECT.json",