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

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Book.json

@@ -7405,6 +7405,12 @@
     "name" : "书实体日历导航视图",
     "realModelSubType" : "DECALENDAREXPVIEW",
     "realModelType" : "PSDEVIEWBASE"
+  }, {
+    "codeName" : "TestCtrlPlugDayCalendarView",
+    "logicName" : "测试日历部件插件天视图",
+    "name" : "测试日历部件插件天视图",
+    "realModelSubType" : "DECALENDARVIEW",
+    "realModelType" : "PSDEVIEWBASE"
   }, {
     "codeName" : "Usr6EditView",
     "logicName" : "书实体编辑视图(多数据部件测试_列表)",

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

@@ -1495,16 +1495,16 @@
     "codeName" : "VMGroup2",
     "name" : "视图消息组2",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息2",
+      "name" : "视图消息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
       }
     }, {
-      "name" : "视图消息",
+      "name" : "视图消息2",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
       }
     } ]
   }, {

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

@@ -4481,6 +4481,10 @@
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookWFDynaEditView3.json",
     "viewType" : "DEWFDYNAEDITVIEW3"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookTestCtrlPlugDayCalendarView.json",
+    "viewType" : "DECALENDARVIEW"
   }, {
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookPickupGridView.json",

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

 {
   "calendarStyle" : "MONTH",
   "codeName" : "TestCtrlPlugCalendarView_Calendar",
-  "controlStyle" : "CALENDARTEST",
+  "controlStyle" : "CALENDARMONTH",
   "controlType" : "CALENDAR",
   "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSCALENDARS/TestCtrlPlugCalendarView_Calendar.json",
   "groupMode" : "NONE",
@@ -13,7 +13,7 @@
   },
   "getPSSysPFPlugin" : {
     "pluginType" : "CUSTOM",
-    "pluginCode" : "CALENDARTEST"
+    "pluginCode" : "CALENDARMONTH"
   },
   "enableGroup" : false,
   "modelid" : "56F6024E-D9F7-4A95-A422-5AEC791F397C",

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

+{
+  "calendarStyle" : "DAY",
+  "codeName" : "TestCtrlPlugDayCalendarView_Calendar",
+  "controlStyle" : "CALENDARDAY",
+  "controlType" : "CALENDAR",
+  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSCALENDARS/TestCtrlPlugDayCalendarView_Calendar.json",
+  "groupMode" : "NONE",
+  "legendPos" : "NONE",
+  "logicName" : "测试日历部件插件天视图_日历部件",
+  "getPSAppDataEntity" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
+  },
+  "getPSSysPFPlugin" : {
+    "pluginType" : "CUSTOM",
+    "pluginCode" : "CALENDARDAY"
+  },
+  "enableGroup" : false,
+  "modelid" : "48CB0996-1395-41B4-8529-1E98C1B9FB62",
+  "modeltype" : "PSSYSCALENDAR"
+}
\ No newline at end of file

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

@@ -40,7 +40,7 @@
   "getPSControls" : [ {
     "calendarStyle" : "MONTH",
     "codeName" : "TestCtrlPlugCalendarView_Calendar",
-    "controlStyle" : "CALENDARTEST",
+    "controlStyle" : "CALENDARMONTH",
     "controlType" : "CALENDAR",
     "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSCALENDARS/TestCtrlPlugCalendarView_Calendar.json",
     "groupMode" : "NONE",
@@ -61,7 +61,7 @@
     },
     "getPSSysPFPlugin" : {
       "pluginType" : "CUSTOM",
-      "pluginCode" : "CALENDARTEST"
+      "pluginCode" : "CALENDARMONTH"
     },
     "enableGroup" : false,
     "name" : "calendar",

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

+{
+  "accUserMode" : 2,
+  "caption" : "书",
+  "codeName" : "bookTestCtrlPlugDayCalendarView",
+  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookTestCtrlPlugDayCalendarView.json",
+  "mDCtrlActiveMode" : 2,
+  "name" : "bookTestCtrlPlugDayCalendarView",
+  "getPSAppDataEntity" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
+  },
+  "getPSAppModule" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPMODULES/Test.json"
+  },
+  "getPSAppViewLogics" : [ {
+    "logicTrigger" : "CUSTOM",
+    "logicType" : "APPUILOGIC",
+    "name" : "newdata",
+    "getPSAppUILogic" : {
+      "actionAfterWizard" : "DEFAULT",
+      "logicType" : "PREDEFINED",
+      "name" : "新建数据",
+      "viewLogicType" : "APP_NEWDATA",
+      "batchAddOnly" : false,
+      "enableBatchAdd" : false,
+      "enableWizardAdd" : false
+    }
+  }, {
+    "logicTrigger" : "CUSTOM",
+    "logicType" : "APPUILOGIC",
+    "name" : "opendata",
+    "getPSAppUILogic" : {
+      "logicType" : "PREDEFINED",
+      "name" : "打开数据",
+      "viewLogicType" : "APP_OPENDATA",
+      "editMode" : true
+    }
+  } ],
+  "getPSControls" : [ {
+    "calendarStyle" : "DAY",
+    "codeName" : "TestCtrlPlugDayCalendarView_Calendar",
+    "controlStyle" : "CALENDARDAY",
+    "controlType" : "CALENDAR",
+    "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSCALENDARS/TestCtrlPlugDayCalendarView_Calendar.json",
+    "groupMode" : "NONE",
+    "legendPos" : "NONE",
+    "logicName" : "测试日历部件插件天视图_日历部件",
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
+    },
+    "getPSControlHandler" : {
+      "enableDEFieldPrivilege" : false,
+      "id" : "calendar"
+    },
+    "getPSControlParam" : {
+      "autoLoad" : true,
+      "showBusyIndicator" : true,
+      "id" : "CALENDAR"
+    },
+    "getPSSysPFPlugin" : {
+      "pluginType" : "CUSTOM",
+      "pluginCode" : "CALENDARDAY"
+    },
+    "enableGroup" : false,
+    "name" : "calendar",
+    "modelid" : "48CB0996-1395-41B4-8529-1E98C1B9FB62",
+    "modeltype" : "PSSYSCALENDAR"
+  }, {
+    "controlType" : "SEARCHBAR",
+    "name" : "searchbar",
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
+    },
+    "getPSControlParam" : {
+      "id" : "searchbar"
+    },
+    "quickGroupCount" : -1,
+    "quickSearchMode" : 0,
+    "quickSearchWidth" : 0,
+    "enableFilter" : false,
+    "enableGroup" : false,
+    "enableQuickSearch" : false,
+    "mobileSearchBar" : false
+  }, {
+    "caption" : "书",
+    "codeName" : "TestCtrlPlugDayCalendarViewcaptionbar",
+    "controlType" : "CAPTIONBAR",
+    "name" : "captionbar",
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
+    },
+    "getPSControlParam" : { }
+  } ],
+  "getPSDEViewCodeName" : "TestCtrlPlugDayCalendarView",
+  "getPSDEViewId" : "A9DE82A9-B3B0-4323-BF75-790ACF25C6F5",
+  "getPSViewLayoutPanel" : {
+    "codeName" : "Layoutpanel",
+    "controlStyle" : "APPDECALENDARVIEW",
+    "controlType" : "VIEWLAYOUTPANEL",
+    "name" : "layoutpanel",
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
+    },
+    "getPSControlParam" : { },
+    "layoutBodyOnly" : true,
+    "layoutPanel" : true,
+    "useDefaultLayout" : true
+  },
+  "refFlag" : false,
+  "title" : "测试日历部件插件天视图",
+  "viewStyle" : "DEFAULT",
+  "viewType" : "DECALENDARVIEW",
+  "xDataControlName" : "calendar",
+  "enableDP" : true,
+  "enableFilter" : true,
+  "enableSearch" : true,
+  "modelid" : "af471259e3b5f8acdbe570f7f06e4b10",
+  "modeltype" : "PSAPPDEVIEW"
+}
\ No newline at end of file

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

@@ -2713,14 +2713,51 @@
       },
       "tooltip" : "测试动态控制"
     }, {
-      "accUserMode" : 2,
-      "caption" : "测试值规则",
+      "accUserMode" : 0,
+      "caption" : "日历测试",
       "itemType" : "MENUITEM",
-      "name" : "menuitem44",
-      "getPSAppFunc" : {
-        "modelref" : true,
-        "id" : "AppFunc48"
-      },
+      "name" : "menuitem163",
+      "getPSAppMenuItems" : [ {
+        "accUserMode" : 2,
+        "caption" : "测试日历部件月视图",
+        "itemType" : "MENUITEM",
+        "name" : "menuitem162",
+        "getPSAppFunc" : {
+          "modelref" : true,
+          "id" : "UsrAppFunc1208375516"
+        },
+        "getPSLayout" : {
+          "childColLG" : -1,
+          "childColMD" : 24,
+          "childColSM" : -1,
+          "childColXS" : -1,
+          "columnCount" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "tooltip" : "测试日历部件月视图"
+      }, {
+        "accUserMode" : 0,
+        "caption" : "测试日历日视图",
+        "itemType" : "MENUITEM",
+        "name" : "menuitem164",
+        "getPSLayout" : {
+          "childColLG" : -1,
+          "childColMD" : 24,
+          "childColSM" : -1,
+          "childColXS" : -1,
+          "columnCount" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "tooltip" : "测试日历日视图"
+      } ],
       "getPSLayout" : {
         "childColLG" : -1,
         "childColMD" : 24,
@@ -2733,15 +2770,15 @@
         "colMD" : 24,
         "layout" : "TABLE_24COL"
       },
-      "tooltip" : "测试值规则"
+      "tooltip" : "日历测试"
     }, {
       "accUserMode" : 2,
-      "caption" : "测试日历部件视图",
+      "caption" : "测试值规则",
       "itemType" : "MENUITEM",
-      "name" : "menuitem162",
+      "name" : "menuitem44",
       "getPSAppFunc" : {
         "modelref" : true,
-        "id" : "UsrAppFunc1208375516"
+        "id" : "AppFunc48"
       },
       "getPSLayout" : {
         "childColLG" : -1,
@@ -2755,7 +2792,7 @@
         "colMD" : 24,
         "layout" : "TABLE_24COL"
       },
-      "tooltip" : "测试日历部件视图"
+      "tooltip" : "测试值规则"
     }, {
       "accUserMode" : 0,
       "caption" : "布局面板发布承载(勿动)",

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

@@ -1200,6 +1200,29 @@
       "tooltip" : "测试表单"
     } ],
     "tooltip" : "测试动态控制"
+  }, {
+    "accUserMode" : 0,
+    "caption" : "日历测试",
+    "itemType" : "MENUITEM",
+    "name" : "menuitem163",
+    "getPSAppMenuItems" : [ {
+      "accUserMode" : 2,
+      "caption" : "测试日历部件月视图",
+      "itemType" : "MENUITEM",
+      "name" : "menuitem162",
+      "getPSAppFunc" : {
+        "modelref" : true,
+        "id" : "UsrAppFunc1208375516"
+      },
+      "tooltip" : "测试日历部件月视图"
+    }, {
+      "accUserMode" : 0,
+      "caption" : "测试日历日视图",
+      "itemType" : "MENUITEM",
+      "name" : "menuitem164",
+      "tooltip" : "测试日历日视图"
+    } ],
+    "tooltip" : "日历测试"
   }, {
     "accUserMode" : 2,
     "caption" : "测试值规则",
@@ -1210,16 +1233,6 @@
       "id" : "AppFunc48"
     },
     "tooltip" : "测试值规则"
-  }, {
-    "accUserMode" : 2,
-    "caption" : "测试日历部件视图",
-    "itemType" : "MENUITEM",
-    "name" : "menuitem162",
-    "getPSAppFunc" : {
-      "modelref" : true,
-      "id" : "UsrAppFunc1208375516"
-    },
-    "tooltip" : "测试日历部件视图"
   }, {
     "accUserMode" : 0,
     "caption" : "布局面板发布承载(勿动)",

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

@@ -150,12 +150,22 @@
     "refMode" : "DEMETHOD",
     "refTag" : "DEACTION"
   }, {
-    "name" : "日历部件插件",
+    "name" : "日历部件天插件",
     "getPSSysPFPlugin" : {
       "pluginType" : "CUSTOM",
-      "pluginCode" : "CALENDARTEST"
+      "pluginCode" : "CALENDARDAY"
     },
-    "pluginCode" : "CALENDARTEST",
+    "pluginCode" : "CALENDARDAY",
+    "pluginType" : "CUSTOM",
+    "refMode" : "CONTROL",
+    "refTag" : "CALENDAR"
+  }, {
+    "name" : "日历部件月插件",
+    "getPSSysPFPlugin" : {
+      "pluginType" : "CUSTOM",
+      "pluginCode" : "CALENDARMONTH"
+    },
+    "pluginCode" : "CALENDARMONTH",
     "pluginType" : "CUSTOM",
     "refMode" : "CONTROL",
     "refTag" : "CALENDAR"