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

fe0cb481 · ibizdev · e4990b83 · fe0cb481 · fe0cb481 · fe0cb481
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSFORMS/EditorTest.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSFORMS/EditorTest.json
@@ -113,17 +113,17 @@
      "id" : "Get"
    },
    "getPSDEFIUpdateDetails" : [ {
+      "name" : "field13"
+    }, {
      "name" : "field11"
    }, {
      "name" : "field14"
    }, {
      "name" : "field8"
    }, {
-      "name" : "field13"
+      "name" : "field17"
    }, {
      "name" : "type"
-    }, {
-      "name" : "field17"
    } ]
  } ],
  "getPSDEFormItemVRs" : [ {
@@ -2813,9 +2813,14 @@
            "editorParams" : {
              "TIMEFMT" : "YYYY-MM-DD HH:mm:ss"
            },
+            "editorStyle" : "SCREEN_DATE_PICKER",
            "editorType" : "DATEPICKER",
            "editorWidth" : 160.0,
-            "name" : "date"
+            "name" : "date",
+            "getPSSysPFPlugin" : {
+              "pluginType" : "EDITOR_CUSTOMSTYLE",
+              "pluginCode" : "SCREEN_DATE_PICKER"
+            }
          },
          "getPSLayoutPos" : {
            "colMD" : 24,

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Student/PSDASHBOARDS/ScreenDashboardView_Dashboard.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Student/PSDASHBOARDS/ScreenDashboardView_Dashboard.json
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookBookEditViewEditorTest.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookBookEditViewEditorTest.json
@@ -230,17 +230,17 @@
        "id" : "Get"
      },
      "getPSDEFIUpdateDetails" : [ {
+        "name" : "field13"
+      }, {
        "name" : "field11"
      }, {
        "name" : "field14"
      }, {
        "name" : "field8"
      }, {
-        "name" : "field13"
+        "name" : "field17"
      }, {
        "name" : "type"
-      }, {
-        "name" : "field17"
      } ]
    } ],
    "getPSDEFormItemVRs" : [ {
@@ -2930,9 +2930,14 @@
              "editorParams" : {
                "TIMEFMT" : "YYYY-MM-DD HH:mm:ss"
              },
+              "editorStyle" : "SCREEN_DATE_PICKER",
              "editorType" : "DATEPICKER",
              "editorWidth" : 160.0,
-              "name" : "date"
+              "name" : "date",
+              "getPSSysPFPlugin" : {
+                "pluginType" : "EDITOR_CUSTOMSTYLE",
+                "pluginCode" : "SCREEN_DATE_PICKER"
+              }
            },
            "getPSLayoutPos" : {
              "colMD" : 24,

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookHoverEditView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookHoverEditView.json
@@ -785,17 +785,17 @@
        "id" : "Get"
      },
      "getPSDEFIUpdateDetails" : [ {
+        "name" : "field13"
+      }, {
        "name" : "field11"
      }, {
        "name" : "field14"
      }, {
        "name" : "field8"
      }, {
-        "name" : "field13"
+        "name" : "field17"
      }, {
        "name" : "type"
-      }, {
-        "name" : "field17"
      } ]
    } ],
    "getPSDEFormItemVRs" : [ {
@@ -3485,9 +3485,14 @@
              "editorParams" : {
                "TIMEFMT" : "YYYY-MM-DD HH:mm:ss"
              },
+              "editorStyle" : "SCREEN_DATE_PICKER",
              "editorType" : "DATEPICKER",
              "editorWidth" : 160.0,
-              "name" : "date"
+              "name" : "date",
+              "getPSSysPFPlugin" : {
+                "pluginType" : "EDITOR_CUSTOMSTYLE",
+                "pluginCode" : "SCREEN_DATE_PICKER"
+              }
            },
            "getPSLayoutPos" : {
              "colMD" : 24,

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/studentScreenDashboardView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/studentScreenDashboardView.json
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/studentUsr08070298CustomView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/studentUsr08070298CustomView.json
@@ -153,7 +153,7 @@
              "contentType" : "RAW",
              "itemStyle" : "DEFAULT",
              "itemType" : "RAWITEM",
-              "name" : "static_label1",
+              "name" : "static_label3",
              "getPSLayoutPos" : {
                "colMD" : 24,
                "layout" : "TABLE_24COL"
@@ -161,23 +161,70 @@
              "getPSRawItem" : {
                "caption" : "本月指标",
                "contentType" : "RAW",
-                "name" : "static_label1",
-                "getPSRawItemParams" : [ {
-                  "key" : "UNIT",
-                  "name" : "panelitem2",
-                  "value" : "小时"
-                } ],
+                "name" : "static_label3",
                "predefinedType" : "STATIC_LABEL",
                "renderMode" : "PARAGRAPH"
              },
-              "getPSSysPFPlugin" : {
-                "pluginType" : "EDITOR_CUSTOMSTYLE",
-                "pluginCode" : "SCREEN_PANEL_ATTRIBUTE"
-              },
              "rawContent" : "本月指标",
              "showCaption" : true
            } ],
            "predefinedType" : "CONTAINER_SINGLEDATA"
+          }, {
+            "caption" : "本月指标",
+            "contentType" : "RAW",
+            "itemStyle" : "DEFAULT",
+            "itemType" : "RAWITEM",
+            "name" : "static_label2",
+            "getPSLayoutPos" : {
+              "colMD" : 24,
+              "layout" : "TABLE_24COL"
+            },
+            "getPSRawItem" : {
+              "caption" : "本月指标",
+              "contentType" : "RAW",
+              "name" : "static_label2",
+              "getPSRawItemParams" : [ {
+                "key" : "UNIT",
+                "name" : "panelitem3",
+                "value" : "小时"
+              } ],
+              "predefinedType" : "STATIC_LABEL",
+              "renderMode" : "PARAGRAPH"
+            },
+            "getPSSysPFPlugin" : {
+              "pluginType" : "EDITOR_CUSTOMSTYLE",
+              "pluginCode" : "SCREEN_PANEL_ATTRIBUTE"
+            },
+            "rawContent" : "本月指标",
+            "showCaption" : true
+          }, {
+            "caption" : "本月指标",
+            "contentType" : "RAW",
+            "itemStyle" : "DEFAULT",
+            "itemType" : "RAWITEM",
+            "name" : "static_label1",
+            "getPSLayoutPos" : {
+              "colMD" : 24,
+              "layout" : "TABLE_24COL"
+            },
+            "getPSRawItem" : {
+              "caption" : "本月指标",
+              "contentType" : "RAW",
+              "name" : "static_label1",
+              "getPSRawItemParams" : [ {
+                "key" : "UNIT",
+                "name" : "panelitem2",
+                "value" : "小时"
+              } ],
+              "predefinedType" : "STATIC_LABEL",
+              "renderMode" : "PARAGRAPH"
+            },
+            "getPSSysPFPlugin" : {
+              "pluginType" : "EDITOR_CUSTOMSTYLE",
+              "pluginCode" : "SCREEN_PANEL_ATTRIBUTE"
+            },
+            "rawContent" : "本月指标",
+            "showCaption" : true
          } ]
        }, {
          "caption" : "面板容器",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/studentUsr08078912ChartView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/studentUsr08078912ChartView.json
--- 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
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.simple.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.simple.json
@@ -470,6 +470,15 @@
    "pluginType" : "CUSTOM",
    "refMode" : "CONTROL",
    "refTag" : "DASHBOARD"
+  }, {
+    "name" : "大屏时间选择器",
+    "getPSSysPFPlugin" : {
+      "pluginType" : "EDITOR_CUSTOMSTYLE",
+      "pluginCode" : "SCREEN_DATE_PICKER"
+    },
+    "pluginCode" : "SCREEN_DATE_PICKER",
+    "pluginType" : "EDITOR_CUSTOMSTYLE",
+    "refMode" : "EDITORSTYPE"
  }, {
    "name" : "大屏门户边框",
    "getPSSysPFPlugin" : {
@@ -480,6 +489,16 @@
    "pluginType" : "PORTLET_CUSTOM",
    "refMode" : "CONTROL",
    "refTag" : "PORTLET"
+  }, {
+    "name" : "大屏面板属性",
+    "getPSSysPFPlugin" : {
+      "pluginType" : "EDITOR_CUSTOMSTYLE",
+      "pluginCode" : "SCREEN_PANEL_ATTRIBUTE"
+    },
+    "pluginCode" : "SCREEN_PANEL_ATTRIBUTE",
+    "pluginType" : "EDITOR_CUSTOMSTYLE",
+    "refMode" : "CONTROL",
+    "refTag" : "PORTLET"
  }, {
    "name" : "大屏面板属性",
    "getPSSysPFPlugin" : {

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSTEM.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSTEM.json
@@ -1163,6 +1163,19 @@
    },
    "styleCode" : "COMMENT_PROJECT",
    "replaceDefault" : false
+  }, {
+    "codeName" : "SCREEN_DATE_PICKER",
+    "dynaModelFilePath" : "PSSYSEDITORSTYLES/SCREEN_DATE_PICKER.json",
+    "editorHeight" : -1.0,
+    "editorType" : "DATEPICKER",
+    "editorWidth" : -1.0,
+    "name" : "大屏时间选择器",
+    "getPSSysPFPlugin" : {
+      "pluginType" : "EDITOR_CUSTOMSTYLE",
+      "pluginCode" : "SCREEN_DATE_PICKER"
+    },
+    "styleCode" : "SCREEN_DATE_PICKER",
+    "replaceDefault" : false
  }, {
    "codeName" : "DATE_RANGE_PQL",
    "dynaModelFilePath" : "PSSYSEDITORSTYLES/DATE_RANGE_PQL.json",