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

b7bf4559 · ibizdev · c969c441 · b7bf4559 · b7bf4559 · b7bf4559
--- 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
@@ -1482,16 +1482,16 @@
    "codeName" : "VMGroup2",
    "name" : "视图消息组2",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息",
+      "name" : "视图消息2",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
      }
    }, {
-      "name" : "视图消息2",
+      "name" : "视图消息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
      }
    } ],
    "uniqueTag" : "VMGroup2"

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/phoneUsr0313383732ReportView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/phoneUsr0313383732ReportView.json
@@ -150,31 +150,101 @@
          "layout" : "FLEX"
        },
        "showCaption" : true
-      } ]
      }, {
+        "caption" : "滚动条容器",
+        "itemStyle" : "DEFAULT",
+        "itemType" : "CONTAINER",
+        "name" : "container_scroll",
+        "getPSLayout" : {
+          "layout" : "BORDER"
+        },
+        "getPSLayoutPos" : {
+          "grow" : -1,
+          "layout" : "FLEX"
+        },
+        "getPSPanelItems" : [ {
+          "caption" : "面板容器",
+          "itemStyle" : "DEFAULT",
+          "itemType" : "CONTAINER",
+          "name" : "container_scroll_main",
+          "getPSLayout" : {
+            "layout" : "BORDER"
+          },
+          "getPSLayoutPos" : {
+            "layout" : "BORDER",
+            "layoutPos" : "CENTER"
+          },
+          "getPSPanelItems" : [ {
            "caption" : "容器",
            "itemStyle" : "DEFAULT",
            "itemType" : "CONTAINER",
-      "name" : "view_content",
+            "name" : "container1",
            "getPSLayout" : {
              "layout" : "FLEX"
            },
            "getPSLayoutPos" : {
-        "grow" : 1,
+              "layout" : "BORDER",
+              "layoutPos" : "CENTER"
+            },
+            "getPSPanelItems" : [ {
+              "caption" : "图表",
+              "itemStyle" : "DEFAULT",
+              "itemType" : "CTRLPOS",
+              "name" : "chart",
+              "getPSLayoutPos" : {
+                "grow" : -1,
+                "layout" : "FLEX"
+              },
+              "showCaption" : true
+            } ]
+          } ],
+          "predefinedType" : "CONTAINER_SCROLL_MAIN",
+          "showCaption" : true
+        }, {
+          "caption" : "面板容器",
+          "contentWidth" : 200.0,
+          "itemStyle" : "DEFAULT",
+          "itemType" : "CONTAINER",
+          "name" : "container_scroll_left",
+          "getPSLayout" : {
+            "layout" : "BORDER"
+          },
+          "getPSLayoutPos" : {
+            "layout" : "BORDER",
+            "layoutPos" : "WEST",
+            "width" : 200,
+            "widthMode" : "PX"
+          },
+          "getPSPanelItems" : [ {
+            "caption" : "容器",
+            "itemStyle" : "DEFAULT",
+            "itemType" : "CONTAINER",
+            "name" : "container",
+            "getPSLayout" : {
              "layout" : "FLEX"
            },
+            "getPSLayoutPos" : {
+              "layout" : "BORDER",
+              "layoutPos" : "CENTER"
+            },
            "getPSPanelItems" : [ {
-        "caption" : "表格",
+              "caption" : "搜索表单",
              "itemStyle" : "DEFAULT",
              "itemType" : "CTRLPOS",
-        "name" : "reportpanel2",
+              "name" : "searchform1",
              "getPSLayoutPos" : {
                "grow" : -1,
                "layout" : "FLEX"
              },
              "showCaption" : true
+            } ]
          } ],
-      "predefinedType" : "VIEWCONTENT"
+          "predefinedType" : "CONTAINER_SCROLL_LEFT",
+          "width" : 200.0,
+          "showCaption" : true
+        } ],
+        "predefinedType" : "CONTAINER_SCROLL"
+      } ]
    } ],
    "layoutBodyOnly" : false,
    "layoutPanel" : true,
@@ -1263,6 +1333,273 @@
      "name" : "reportpanel2",
      "modelid" : "102fe4f65129bafca1451c4ca125530f",
      "modeltype" : "PSDEGRID"
+    }, {
+      "codeName" : "Usr03134087_SearchForm",
+      "controlType" : "SEARCHFORM",
+      "defaultLabelWidth" : 130,
+      "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD2/PSSEARCHFORMS/Usr03134087_SearchForm.json",
+      "logicName" : "报表视图_搜索表单",
+      "getPSAppDataEntity" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD2.json"
+      },
+      "getPSControlHandler" : {
+        "getPSHandlerActions" : [ {
+          "actionType" : "FILTERACTION",
+          "name" : "load",
+          "getPSAppDEMethod" : {
+            "modelref" : true,
+            "id" : "FilterGet"
+          },
+          "getPSAppDataEntity" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD2.json"
+          }
+        }, {
+          "actionType" : "FILTERACTION",
+          "name" : "loaddraft",
+          "getPSAppDEMethod" : {
+            "modelref" : true,
+            "id" : "FilterGetDraft"
+          },
+          "getPSAppDataEntity" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD2.json"
+          }
+        }, {
+          "actionType" : "FILTERACTION",
+          "name" : "search",
+          "getPSAppDEMethod" : {
+            "modelref" : true,
+            "id" : "FilterSearch"
+          },
+          "getPSAppDataEntity" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD2.json"
+          }
+        } ],
+        "enableDEFieldPrivilege" : false,
+        "id" : "搜索表单处理器"
+      },
+      "getPSControlParam" : {
+        "autoLoad" : true,
+        "showBusyIndicator" : true,
+        "id" : "SEARCHFORM1"
+      },
+      "getPSDEFormPages" : [ {
+        "caption" : "常规条件",
+        "codeName" : "formpage1",
+        "detailStyle" : "DEFAULT",
+        "detailType" : "FORMPAGE",
+        "name" : "formpage1",
+        "getPSLayout" : {
+          "childColLG" : -1,
+          "childColMD" : 24,
+          "childColSM" : -1,
+          "childColXS" : -1,
+          "columnCount" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "infoGroupMode" : false
+      } ],
+      "getPSLayout" : {
+        "childColLG" : -1,
+        "childColMD" : 24,
+        "childColSM" : -1,
+        "childColXS" : -1,
+        "columnCount" : 24,
+        "layout" : "TABLE_24COL"
+      },
+      "searchButtonStyle" : "DEFAULT",
+      "tabHeaderPos" : "TOP",
+      "enableAdvanceSearch" : false,
+      "enableAutoSearch" : false,
+      "enableFilterSave" : false,
+      "noTabHeader" : true,
+      "name" : "searchform1",
+      "modelid" : "980188E5-5C3E-4862-92C4-1A0838811326",
+      "modeltype" : "PSDEFORM_SEARCHFORM"
+    }, {
+      "codeName" : "Chart",
+      "controlType" : "CHART",
+      "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD2/PSCHARTS/Chart.json",
+      "getFetchPSControlAction" : {
+        "modelref" : true,
+        "id" : "fetch",
+        "actionType" : "DEDATASET",
+        "name" : "fetch",
+        "getPSAppDEMethod" : {
+          "modelref" : true,
+          "id" : "FetchDefault"
+        },
+        "getPSAppDataEntity" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD2.json"
+        }
+      },
+      "logicName" : "Chart",
+      "getPSAppDataEntity" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD2.json"
+      },
+      "getPSChartCoordinateSystems" : [ {
+        "eChartsType" : "cartesian2d",
+        "index" : 0,
+        "name" : "[bar_0]直角坐标系[0]",
+        "getPSChartGrid" : {
+          "index" : 0,
+          "name" : "[bar_0]直角坐标系[0]",
+          "getPSChartCoordinateSystem" : {
+            "modelref" : true,
+            "id" : "0"
+          },
+          "type" : "grid",
+          "id" : "0"
+        },
+        "type" : "XY",
+        "id" : "0"
+      } ],
+      "getPSChartDataSetGroups" : [ {
+        "index" : 0,
+        "name" : "DEFAULT",
+        "getPSAppDEDataSet" : {
+          "modelref" : true,
+          "id" : "FetchDefault"
+        },
+        "getPSAppDataEntity" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD2.json"
+        },
+        "id" : "0"
+      } ],
+      "getPSChartDataSets" : [ {
+        "index" : 0,
+        "name" : "bar_0-DEFAULT",
+        "id" : "0"
+      } ],
+      "getPSChartGrids" : [ {
+        "index" : 0,
+        "name" : "[bar_0]直角坐标系[0]",
+        "getPSChartCoordinateSystem" : {
+          "modelref" : true,
+          "id" : "0"
+        },
+        "type" : "grid",
+        "id" : "0"
+      } ],
+      "getPSControlHandler" : {
+        "getPSHandlerActions" : [ {
+          "actionName" : "Get",
+          "actionType" : "DEACTION",
+          "dataAccessAction" : "READ",
+          "name" : "load",
+          "getPSAppDEMethod" : {
+            "modelref" : true,
+            "id" : "Get"
+          },
+          "getPSAppDataEntity" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD2.json"
+          }
+        }, {
+          "actionName" : "Create",
+          "actionType" : "DEACTION",
+          "dataAccessAction" : "CREATE",
+          "name" : "create",
+          "getPSAppDEMethod" : {
+            "modelref" : true,
+            "id" : "Create"
+          },
+          "getPSAppDataEntity" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD2.json"
+          }
+        }, {
+          "actionName" : "Update",
+          "actionType" : "DEACTION",
+          "dataAccessAction" : "UPDATE",
+          "name" : "update",
+          "getPSAppDEMethod" : {
+            "modelref" : true,
+            "id" : "Update"
+          },
+          "getPSAppDataEntity" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD2.json"
+          }
+        }, {
+          "actionName" : "Remove",
+          "actionType" : "DEACTION",
+          "dataAccessAction" : "DELETE",
+          "name" : "remove",
+          "getPSAppDEMethod" : {
+            "modelref" : true,
+            "id" : "Remove"
+          },
+          "getPSAppDataEntity" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD2.json"
+          }
+        }, {
+          "actionType" : "DEDATASET",
+          "name" : "fetch",
+          "getPSAppDEMethod" : {
+            "modelref" : true,
+            "id" : "FetchDefault"
+          },
+          "getPSAppDataEntity" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD2.json"
+          }
+        } ],
+        "userDRAction" : "READ",
+        "enableDEFieldPrivilege" : false,
+        "id" : "图形控件处理器"
+      },
+      "getPSControlParam" : {
+        "autoLoad" : true,
+        "showBusyIndicator" : true,
+        "id" : "CHART"
+      },
+      "getPSDEChartLegend" : {
+        "index" : 0,
+        "showLegend" : true,
+        "id" : "0"
+      },
+      "getPSDEChartSerieses" : [ {
+        "eChartsType" : "custom",
+        "index" : 0,
+        "name" : "bar_0",
+        "getPSChartCoordinateSystem" : {
+          "modelref" : true,
+          "id" : "0"
+        },
+        "getPSChartDataSet" : {
+          "modelref" : true,
+          "id" : "0"
+        },
+        "getPSChartSeriesEncode" : {
+          "index" : 0,
+          "name" : "坐标系编码",
+          "type" : "XY",
+          "id" : "0"
+        },
+        "seriesLayoutBy" : "column",
+        "seriesType" : "custom",
+        "enableChartDataSet" : true
+      } ],
+      "getPSDEChartTitle" : {
+        "index" : 0,
+        "showTitle" : true,
+        "id" : "0"
+      },
+      "readOnly" : true,
+      "name" : "chart",
+      "modelid" : "9C85658B-3C28-4805-9150-5FBFEE3C30F6",
+      "modeltype" : "PSDECHART",
+      "getUserParam" : {
+        "EC.color" : "[\"#5470c6\",\"#91cc75\",\"#fac858\",\"#ee6666\",\"#73c0de\",\"#3ba272\",\"#fc8452\",\"#9a60b4\",\"#ea7ccc\",\"#5470c6\",\"#91cc75\"]"
+      }
    }, {
      "controlType" : "SEARCHBAR",
      "name" : "searchbar",

--- 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
@@ -13358,16 +13358,16 @@
    "codeName" : "VMGroup2",
    "name" : "视图消息组2",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息",
+      "name" : "视图消息2",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
      }
    }, {
-      "name" : "视图消息2",
+      "name" : "视图消息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
      }
    } ],
    "uniqueTag" : "VMGroup2"
@@ -13399,10 +13399,10 @@
    "codeName" : "VMGroup3",
    "name" : "视图消息类型测试",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-常规信息",
+      "name" : "消息类型-错误信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg4"
+        "id" : "ViewMsg6"
      }
    }, {
      "name" : "消息类型-警告信息",
@@ -13411,10 +13411,10 @@
        "id" : "ViewMsg5"
      }
    }, {
-      "name" : "消息类型-错误信息",
+      "name" : "消息类型-常规信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg6"
+        "id" : "ViewMsg4"
      }
    } ],
    "uniqueTag" : "VMGroup3"
@@ -13433,28 +13433,28 @@
    "codeName" : "VMGroup4",
    "name" : "视图消息位置测试",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息位置-视图下方",
+      "name" : "消息位置-弹出",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg10"
      }
    }, {
-      "name" : "消息位置-弹出",
+      "name" : "消息位置-视图上方",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg10"
+        "id" : "ViewMsg7"
      }
    }, {
-      "name" : "消息位置-视图内容区",
+      "name" : "消息位置-视图下方",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg9"
+        "id" : "ViewMsg8"
      }
    }, {
-      "name" : "消息位置-视图上方",
+      "name" : "消息位置-视图内容区",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg7"
+        "id" : "ViewMsg9"
      }
    } ],
    "uniqueTag" : "VMGroup4"
@@ -13462,55 +13462,55 @@
    "codeName" : "VMGroup8",
    "name" : "【静态测试】",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-错误信息",
+      "name" : "消息位置-视图下方",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg6"
-      },
-      "position" : "POPUP"
+        "id" : "ViewMsg8"
+      }
    }, {
-      "name" : "关闭模式-无删除-上方-常规",
+      "name" : "关闭模式-本次删除-上方-警告",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg11"
+        "id" : "ViewMsg13"
      }
    }, {
-      "name" : "消息类型-常规信息",
+      "name" : "消息类型-警告信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg4"
+        "id" : "ViewMsg5"
      },
      "position" : "POPUP"
    }, {
-      "name" : "消息位置-视图内容区",
+      "name" : "消息类型-错误信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg9"
-      }
+        "id" : "ViewMsg6"
+      },
+      "position" : "POPUP"
    }, {
-      "name" : "消息位置-视图下方",
+      "name" : "消息类型-常规信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg8"
-      }
+        "id" : "ViewMsg4"
+      },
+      "position" : "POPUP"
    }, {
-      "name" : "关闭模式-默认删除-上方-错误",
+      "name" : "关闭模式-无删除-上方-常规",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg12"
+        "id" : "ViewMsg11"
      }
    }, {
-      "name" : "消息类型-警告信息",
+      "name" : "消息位置-视图内容区",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg5"
-      },
-      "position" : "POPUP"
+        "id" : "ViewMsg9"
+      }
    }, {
-      "name" : "关闭模式-本次删除-上方-警告",
+      "name" : "关闭模式-默认删除-上方-错误",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg13"
+        "id" : "ViewMsg12"
      }
    } ],
    "uniqueTag" : "VMGroup8"
@@ -13518,16 +13518,16 @@
    "codeName" : "VMGroup5",
    "name" : "视图消息关闭模式",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-无删除",
+      "name" : "关闭模式-默认删除",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg11"
+        "id" : "ViewMsg12"
      }
    }, {
-      "name" : "关闭模式-默认删除",
+      "name" : "关闭模式-无删除",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg12"
+        "id" : "ViewMsg11"
      }
    }, {
      "name" : "关闭模式-本次删除",