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

2665b6cd · ibizdev · 334b39fb · 2665b6cd · 2665b6cd · 2665b6cd
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Book.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Book.json
@@ -7375,6 +7375,12 @@
    "name" : "树表格测试",
    "realModelSubType" : "DETREEGRIDVIEW",
    "realModelType" : "PSDEVIEWBASE"
+  }, {
+    "codeName" : "timeline_CalendarView",
+    "logicName" : "日历视图_时间轴",
+    "name" : "日历视图_时间轴",
+    "realModelSubType" : "DECALENDARVIEW",
+    "realModelType" : "PSDEVIEWBASE"
  }, {
    "codeName" : "RepeatEditView",
    "logicName" : "重复器测试",
@@ -7387,6 +7393,12 @@
    "name" : "书实体编辑视图(多数据部件测试_卡片11111)",
    "realModelSubType" : "DEEDITVIEW",
    "realModelType" : "PSDEVIEWBASE"
+  }, {
+    "codeName" : "weekCalendarView",
+    "logicName" : "日历视图_周",
+    "name" : "日历视图_周",
+    "realModelSubType" : "DECALENDARVIEW",
+    "realModelType" : "PSDEVIEWBASE"
  }, {
    "codeName" : "Usr10139588EditView",
    "logicName" : "表单编辑器",
@@ -7461,8 +7473,8 @@
    "realModelType" : "PSDEVIEWBASE"
  }, {
    "codeName" : "TestCtrlPlugDayCalendarView",
-    "logicName" : "测试日历部件插件天视图",
-    "name" : "测试日历部件插件天视图",
+    "logicName" : "日历视图_天",
+    "name" : "日历视图_天",
    "realModelSubType" : "DECALENDARVIEW",
    "realModelType" : "PSDEVIEWBASE"
  }, {
@@ -7575,8 +7587,8 @@
    "realModelType" : "PSDEVIEWBASE"
  }, {
    "codeName" : "TestCtrlPlugCalendarView",
-    "logicName" : "测试部件插件日历视图",
-    "name" : "测试部件插件日历视图",
+    "logicName" : "日历视图_月",
+    "name" : "日历视图_月",
    "realModelSubType" : "DECALENDARVIEW",
    "realModelType" : "PSDEVIEWBASE"
  }, {

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json
@@ -4421,6 +4421,10 @@
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr2MPickupView.json",
    "viewType" : "DEMPICKUPVIEW"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/booktimeline_CalendarView.json",
+    "viewType" : "DECALENDARVIEW"
  }, {
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookListView.json",
@@ -4581,6 +4585,10 @@
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookAutoGropuGridView.json",
    "viewType" : "DEGRIDVIEW"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookweekCalendarView.json",
+    "viewType" : "DECALENDARVIEW"
  }, {
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookPickupView2.json",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSCALENDARS/Timeline_CalendarView_Calendar.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSCALENDARS/Timeline_CalendarView_Calendar.json
+{
+  "calendarStyle" : "TIMELINE",
+  "codeName" : "Timeline_CalendarView_Calendar",
+  "controlStyle" : "LIGHT_CALENDAR",
+  "controlType" : "CALENDAR",
+  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSCALENDARS/Timeline_CalendarView_Calendar.json",
+  "groupMode" : "NONE",
+  "legendPos" : "TOP",
+  "logicName" : "日历视图_时间轴_日历部件",
+  "getPSAppDataEntity" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
+  },
+  "getPSSysCalendarItems" : [ {
+    "getBeginTimePSAppDEField" : {
+      "name" : "CREATEDATE",
+      "codeName" : "CreateDate"
+    },
+    "getEndTimePSAppDEField" : {
+      "name" : "UPDATEDATE",
+      "codeName" : "UpdateDate"
+    },
+    "getIdPSAppDEField" : {
+      "name" : "BOOKID",
+      "codeName" : "BookId"
+    },
+    "itemStyle" : "DEFAULT",
+    "itemType" : "calendarbookitem",
+    "maxSize" : -1,
+    "name" : "图书",
+    "getPSAppDEDataSet" : {
+      "modelref" : true,
+      "id" : "FetchDefault"
+    },
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
+    },
+    "getTextPSAppDEField" : {
+      "name" : "BOOKNAME",
+      "codeName" : "BookName"
+    },
+    "enableQuickCreate" : false,
+    "id" : "calendarbookitem"
+  }, {
+    "getBeginTimePSAppDEField" : {
+      "name" : "CREATEDATE",
+      "codeName" : "CreateDate"
+    },
+    "getEndTimePSAppDEField" : {
+      "name" : "UPDATEDATE",
+      "codeName" : "UpdateDate"
+    },
+    "getIdPSAppDEField" : {
+      "name" : "STUDENTID",
+      "codeName" : "StudentId"
+    },
+    "itemStyle" : "DEFAULT",
+    "itemType" : "calendarstudentitem",
+    "maxSize" : -1,
+    "name" : "学生",
+    "getPSAppDEDataSet" : {
+      "modelref" : true,
+      "id" : "FetchDefault"
+    },
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Student.json"
+    },
+    "getTextPSAppDEField" : {
+      "name" : "STUDENTNAME",
+      "codeName" : "StudentName"
+    },
+    "enableQuickCreate" : false,
+    "id" : "calendarstudentitem"
+  } ],
+  "getPSSysPFPlugin" : {
+    "pluginType" : "CUSTOM",
+    "pluginCode" : "LIGHT_CALENDAR"
+  },
+  "enableGroup" : false,
+  "modelid" : "CBCB0EF8-7840-42CD-A7F5-ED7182AC1BAF",
+  "modeltype" : "PSSYSCALENDAR"
+}
\ No newline at end of file
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSCALENDARS/WeekCalendarView_Calendar.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSCALENDARS/WeekCalendarView_Calendar.json
+{
+  "calendarStyle" : "WEEK",
+  "codeName" : "WeekCalendarView_Calendar",
+  "controlStyle" : "LIGHT_CALENDAR",
+  "controlType" : "CALENDAR",
+  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSCALENDARS/WeekCalendarView_Calendar.json",
+  "groupMode" : "NONE",
+  "legendPos" : "TOP",
+  "logicName" : "日历视图_周_日历部件",
+  "getPSAppDataEntity" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
+  },
+  "getPSAppViewLogics" : [ {
+    "logicTrigger" : "CUSTOM",
+    "logicType" : "APPUILOGIC",
+    "name" : "calendarbookitem_editdata",
+    "getPSAppUILogic" : {
+      "logicType" : "PREDEFINED",
+      "name" : "编辑数据",
+      "getOpenDataPSAppView" : {
+        "getRefPSAppView" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookEditView.json",
+          "viewType" : "DEEDITVIEW"
+        }
+      },
+      "getPSAppUILogicRefViews" : [ {
+        "getRefPSAppView" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookEditView.json",
+          "viewType" : "DEEDITVIEW"
+        }
+      } ],
+      "viewLogicType" : "APP_OPENDATA",
+      "editMode" : true
+    }
+  }, {
+    "logicTrigger" : "CUSTOM",
+    "logicType" : "APPUILOGIC",
+    "name" : "calendarbookitem_opendata",
+    "getPSAppUILogic" : {
+      "logicType" : "PREDEFINED",
+      "name" : "打开数据",
+      "getOpenDataPSAppView" : {
+        "getRefPSAppView" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookEditView.json",
+          "viewType" : "DEEDITVIEW"
+        }
+      },
+      "getPSAppUILogicRefViews" : [ {
+        "getRefPSAppView" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookEditView.json",
+          "viewType" : "DEEDITVIEW"
+        }
+      } ],
+      "viewLogicType" : "APP_OPENDATA",
+      "editMode" : false
+    }
+  } ],
+  "getPSSysCalendarItems" : [ {
+    "getBeginTimePSAppDEField" : {
+      "name" : "CREATEDATE",
+      "codeName" : "CreateDate"
+    },
+    "getEndTimePSAppDEField" : {
+      "name" : "UPDATEDATE",
+      "codeName" : "UpdateDate"
+    },
+    "getIdPSAppDEField" : {
+      "name" : "BOOKID",
+      "codeName" : "BookId"
+    },
+    "itemStyle" : "DEFAULT",
+    "itemType" : "calendarbookitem",
+    "maxSize" : -1,
+    "name" : "图书",
+    "getPSAppDEDataSet" : {
+      "modelref" : true,
+      "id" : "FetchDefault"
+    },
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
+    },
+    "getTextPSAppDEField" : {
+      "name" : "BOOKNAME",
+      "codeName" : "BookName"
+    },
+    "enableQuickCreate" : false,
+    "id" : "calendarbookitem"
+  }, {
+    "getBeginTimePSAppDEField" : {
+      "name" : "CREATEDATE",
+      "codeName" : "CreateDate"
+    },
+    "getEndTimePSAppDEField" : {
+      "name" : "UPDATEDATE",
+      "codeName" : "UpdateDate"
+    },
+    "getIdPSAppDEField" : {
+      "name" : "STUDENTID",
+      "codeName" : "StudentId"
+    },
+    "itemStyle" : "DEFAULT",
+    "itemType" : "calendarstudentitem",
+    "maxSize" : -1,
+    "name" : "学生",
+    "getPSAppDEDataSet" : {
+      "modelref" : true,
+      "id" : "FetchDefault"
+    },
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Student.json"
+    },
+    "getTextPSAppDEField" : {
+      "name" : "STUDENTNAME",
+      "codeName" : "StudentName"
+    },
+    "enableQuickCreate" : false,
+    "id" : "calendarstudentitem"
+  } ],
+  "getPSSysPFPlugin" : {
+    "pluginType" : "CUSTOM",
+    "pluginCode" : "LIGHT_CALENDAR"
+  },
+  "enableGroup" : false,
+  "modelid" : "22B2AC4A-938D-40C0-9B62-817EFB5631E7",
+  "modeltype" : "PSSYSCALENDAR"
+}
\ No newline at end of file
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/booktimeline_CalendarView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/booktimeline_CalendarView.json
+{
+  "accUserMode" : 2,
+  "caption" : "日历视图_时间轴",
+  "codeName" : "booktimeline_CalendarView",
+  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDEVIEWS/booktimeline_CalendarView.json",
+  "mDCtrlActiveMode" : 2,
+  "name" : "booktimeline_CalendarView",
+  "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
+    }
+  } ],
+  "getPSAppViewRefs" : [ {
+    "name" : "EDITDATA@calendarbookitem",
+    "realTitle" : "书编辑视图",
+    "getRefPSAppView" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookEditView.json",
+      "viewType" : "DEEDITVIEW"
+    }
+  } ],
+  "getPSControls" : [ {
+    "calendarStyle" : "TIMELINE",
+    "codeName" : "Timeline_CalendarView_Calendar",
+    "controlStyle" : "LIGHT_CALENDAR",
+    "controlType" : "CALENDAR",
+    "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSCALENDARS/Timeline_CalendarView_Calendar.json",
+    "groupMode" : "NONE",
+    "legendPos" : "TOP",
+    "logicName" : "日历视图_时间轴_日历部件",
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
+    },
+    "getPSControlHandler" : {
+      "enableDEFieldPrivilege" : false,
+      "id" : "calendar"
+    },
+    "getPSControlParam" : {
+      "autoLoad" : true,
+      "showBusyIndicator" : true,
+      "id" : "CALENDAR"
+    },
+    "getPSSysCalendarItems" : [ {
+      "getBeginTimePSAppDEField" : {
+        "name" : "CREATEDATE",
+        "codeName" : "CreateDate"
+      },
+      "getEndTimePSAppDEField" : {
+        "name" : "UPDATEDATE",
+        "codeName" : "UpdateDate"
+      },
+      "getIdPSAppDEField" : {
+        "name" : "BOOKID",
+        "codeName" : "BookId"
+      },
+      "itemStyle" : "DEFAULT",
+      "itemType" : "calendarbookitem",
+      "maxSize" : -1,
+      "name" : "图书",
+      "getPSAppDEDataSet" : {
+        "modelref" : true,
+        "id" : "FetchDefault"
+      },
+      "getPSAppDataEntity" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
+      },
+      "getTextPSAppDEField" : {
+        "name" : "BOOKNAME",
+        "codeName" : "BookName"
+      },
+      "enableQuickCreate" : false,
+      "id" : "calendarbookitem"
+    }, {
+      "getBeginTimePSAppDEField" : {
+        "name" : "CREATEDATE",
+        "codeName" : "CreateDate"
+      },
+      "getEndTimePSAppDEField" : {
+        "name" : "UPDATEDATE",
+        "codeName" : "UpdateDate"
+      },
+      "getIdPSAppDEField" : {
+        "name" : "STUDENTID",
+        "codeName" : "StudentId"
+      },
+      "itemStyle" : "DEFAULT",
+      "itemType" : "calendarstudentitem",
+      "maxSize" : -1,
+      "name" : "学生",
+      "getPSAppDEDataSet" : {
+        "modelref" : true,
+        "id" : "FetchDefault"
+      },
+      "getPSAppDataEntity" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Student.json"
+      },
+      "getTextPSAppDEField" : {
+        "name" : "STUDENTNAME",
+        "codeName" : "StudentName"
+      },
+      "enableQuickCreate" : false,
+      "id" : "calendarstudentitem"
+    } ],
+    "getPSSysPFPlugin" : {
+      "pluginType" : "CUSTOM",
+      "pluginCode" : "LIGHT_CALENDAR"
+    },
+    "enableGroup" : false,
+    "name" : "calendar",
+    "modelid" : "CBCB0EF8-7840-42CD-A7F5-ED7182AC1BAF",
+    "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" : "timeline_CalendarViewcaptionbar",
+    "controlType" : "CAPTIONBAR",
+    "name" : "captionbar",
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
+    },
+    "getPSControlParam" : { }
+  } ],
+  "getPSDEViewCodeName" : "timeline_CalendarView",
+  "getPSDEViewId" : "7AF6267D-461F-46E8-A1DA-17062712125F",
+  "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
+  },
+  "title" : "日历视图_时间轴",
+  "viewStyle" : "DEFAULT",
+  "viewType" : "DECALENDARVIEW",
+  "xDataControlName" : "calendar",
+  "enableDP" : true,
+  "enableFilter" : true,
+  "enableSearch" : true,
+  "modelid" : "59dc8ed19bbb84fb91b7885df94fed1c",
+  "modeltype" : "PSAPPDEVIEW"
+}
\ No newline at end of file
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookweekCalendarView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookweekCalendarView.json
+{
+  "accUserMode" : 2,
+  "caption" : "日历视图_周",
+  "codeName" : "bookweekCalendarView",
+  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookweekCalendarView.json",
+  "mDCtrlActiveMode" : 2,
+  "name" : "bookweekCalendarView",
+  "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
+    }
+  } ],
+  "getPSAppViewRefs" : [ {
+    "name" : "EDITDATA@calendarbookitem",
+    "realTitle" : "书编辑视图",
+    "getRefPSAppView" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookEditView.json",
+      "viewType" : "DEEDITVIEW"
+    }
+  } ],
+  "getPSControls" : [ {
+    "calendarStyle" : "WEEK",
+    "codeName" : "WeekCalendarView_Calendar",
+    "controlStyle" : "LIGHT_CALENDAR",
+    "controlType" : "CALENDAR",
+    "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSCALENDARS/WeekCalendarView_Calendar.json",
+    "groupMode" : "NONE",
+    "legendPos" : "TOP",
+    "logicName" : "日历视图_周_日历部件",
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
+    },
+    "getPSAppViewLogics" : [ {
+      "logicTrigger" : "CUSTOM",
+      "logicType" : "APPUILOGIC",
+      "name" : "calendarbookitem_editdata",
+      "getPSAppUILogic" : {
+        "logicType" : "PREDEFINED",
+        "name" : "编辑数据",
+        "getOpenDataPSAppView" : {
+          "getRefPSAppView" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookEditView.json",
+            "viewType" : "DEEDITVIEW"
+          }
+        },
+        "getPSAppUILogicRefViews" : [ {
+          "getRefPSAppView" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookEditView.json",
+            "viewType" : "DEEDITVIEW"
+          }
+        } ],
+        "viewLogicType" : "APP_OPENDATA",
+        "editMode" : true
+      }
+    }, {
+      "logicTrigger" : "CUSTOM",
+      "logicType" : "APPUILOGIC",
+      "name" : "calendarbookitem_opendata",
+      "getPSAppUILogic" : {
+        "logicType" : "PREDEFINED",
+        "name" : "打开数据",
+        "getOpenDataPSAppView" : {
+          "getRefPSAppView" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookEditView.json",
+            "viewType" : "DEEDITVIEW"
+          }
+        },
+        "getPSAppUILogicRefViews" : [ {
+          "getRefPSAppView" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookEditView.json",
+            "viewType" : "DEEDITVIEW"
+          }
+        } ],
+        "viewLogicType" : "APP_OPENDATA",
+        "editMode" : false
+      }
+    } ],
+    "getPSControlHandler" : {
+      "enableDEFieldPrivilege" : false,
+      "id" : "calendar"
+    },
+    "getPSControlParam" : {
+      "autoLoad" : true,
+      "showBusyIndicator" : true,
+      "id" : "CALENDAR"
+    },
+    "getPSSysCalendarItems" : [ {
+      "getBeginTimePSAppDEField" : {
+        "name" : "CREATEDATE",
+        "codeName" : "CreateDate"
+      },
+      "getEndTimePSAppDEField" : {
+        "name" : "UPDATEDATE",
+        "codeName" : "UpdateDate"
+      },
+      "getIdPSAppDEField" : {
+        "name" : "BOOKID",
+        "codeName" : "BookId"
+      },
+      "itemStyle" : "DEFAULT",
+      "itemType" : "calendarbookitem",
+      "maxSize" : -1,
+      "name" : "图书",
+      "getPSAppDEDataSet" : {
+        "modelref" : true,
+        "id" : "FetchDefault"
+      },
+      "getPSAppDataEntity" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
+      },
+      "getTextPSAppDEField" : {
+        "name" : "BOOKNAME",
+        "codeName" : "BookName"
+      },
+      "enableQuickCreate" : false,
+      "id" : "calendarbookitem"
+    }, {
+      "getBeginTimePSAppDEField" : {
+        "name" : "CREATEDATE",
+        "codeName" : "CreateDate"
+      },
+      "getEndTimePSAppDEField" : {
+        "name" : "UPDATEDATE",
+        "codeName" : "UpdateDate"
+      },
+      "getIdPSAppDEField" : {
+        "name" : "STUDENTID",
+        "codeName" : "StudentId"
+      },
+      "itemStyle" : "DEFAULT",
+      "itemType" : "calendarstudentitem",
+      "maxSize" : -1,
+      "name" : "学生",
+      "getPSAppDEDataSet" : {
+        "modelref" : true,
+        "id" : "FetchDefault"
+      },
+      "getPSAppDataEntity" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Student.json"
+      },
+      "getTextPSAppDEField" : {
+        "name" : "STUDENTNAME",
+        "codeName" : "StudentName"
+      },
+      "enableQuickCreate" : false,
+      "id" : "calendarstudentitem"
+    } ],
+    "getPSSysPFPlugin" : {
+      "pluginType" : "CUSTOM",
+      "pluginCode" : "LIGHT_CALENDAR"
+    },
+    "enableGroup" : false,
+    "name" : "calendar",
+    "modelid" : "22B2AC4A-938D-40C0-9B62-817EFB5631E7",
+    "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" : "weekCalendarViewcaptionbar",
+    "controlType" : "CAPTIONBAR",
+    "name" : "captionbar",
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
+    },
+    "getPSControlParam" : { }
+  } ],
+  "getPSDEViewCodeName" : "weekCalendarView",
+  "getPSDEViewId" : "8560DE16-D90E-4AF1-B54A-0EED5A587A99",
+  "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
+  },
+  "title" : "日历视图_周",
+  "viewStyle" : "DEFAULT",
+  "viewType" : "DECALENDARVIEW",
+  "xDataControlName" : "calendar",
+  "enableDP" : true,
+  "enableFilter" : true,
+  "enableSearch" : true,
+  "modelid" : "f0689f1d076d8577e1c8602df987cfbb",
+  "modeltype" : "PSAPPDEVIEW"
+}
\ No newline at end of file
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPINDEXVIEWS/AppIndex.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPINDEXVIEWS/AppIndex.json
@@ -2720,7 +2720,7 @@
      "name" : "menuitem163",
      "getPSAppMenuItems" : [ {
        "accUserMode" : 2,
-        "caption" : "测试日历部件月视图",
+        "caption" : "日历部件月视图",
        "itemType" : "MENUITEM",
        "name" : "menuitem162",
        "getPSAppFunc" : {
@@ -2739,10 +2739,10 @@
          "colMD" : 24,
          "layout" : "TABLE_24COL"
        },
-        "tooltip" : "测试日历部件月视图"
+        "tooltip" : "日历部件月视图"
      }, {
        "accUserMode" : 2,
-        "caption" : "测试日历日视图",
+        "caption" : "日历部件天视图",
        "itemType" : "MENUITEM",
        "name" : "menuitem164",
        "getPSAppFunc" : {
@@ -2761,7 +2761,51 @@
          "colMD" : 24,
          "layout" : "TABLE_24COL"
        },
-        "tooltip" : "测试日历日视图"
+        "tooltip" : "日历部件天视图"
+      }, {
+        "accUserMode" : 2,
+        "caption" : "日历部件周视图",
+        "itemType" : "MENUITEM",
+        "name" : "menuitem171",
+        "getPSAppFunc" : {
+          "modelref" : true,
+          "id" : "UsrAppFunc1218745420"
+        },
+        "getPSLayout" : {
+          "childColLG" : -1,
+          "childColMD" : 24,
+          "childColSM" : -1,
+          "childColXS" : -1,
+          "columnCount" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "tooltip" : "日历部件周视图"
+      }, {
+        "accUserMode" : 2,
+        "caption" : "日历部件时间轴视图",
+        "itemType" : "MENUITEM",
+        "name" : "menuitem172",
+        "getPSAppFunc" : {
+          "modelref" : true,
+          "id" : "UsrAppFunc1218941706"
+        },
+        "getPSLayout" : {
+          "childColLG" : -1,
+          "childColMD" : 24,
+          "childColSM" : -1,
+          "childColXS" : -1,
+          "columnCount" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "tooltip" : "日历部件时间轴视图"
      } ],
      "getPSLayout" : {
        "childColLG" : -1,

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPMENUS/AppIndex.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPMENUS/AppIndex.json
@@ -1207,24 +1207,44 @@
    "name" : "menuitem163",
    "getPSAppMenuItems" : [ {
      "accUserMode" : 2,
-      "caption" : "测试日历部件月视图",
+      "caption" : "日历部件月视图",
      "itemType" : "MENUITEM",
      "name" : "menuitem162",
      "getPSAppFunc" : {
        "modelref" : true,
        "id" : "UsrAppFunc1208375516"
      },
-      "tooltip" : "测试日历部件月视图"
+      "tooltip" : "日历部件月视图"
    }, {
      "accUserMode" : 2,
-      "caption" : "测试日历日视图",
+      "caption" : "日历部件天视图",
      "itemType" : "MENUITEM",
      "name" : "menuitem164",
      "getPSAppFunc" : {
        "modelref" : true,
        "id" : "UsrAppFunc1208696980"
      },
-      "tooltip" : "测试日历日视图"
+      "tooltip" : "日历部件天视图"
+    }, {
+      "accUserMode" : 2,
+      "caption" : "日历部件周视图",
+      "itemType" : "MENUITEM",
+      "name" : "menuitem171",
+      "getPSAppFunc" : {
+        "modelref" : true,
+        "id" : "UsrAppFunc1218745420"
+      },
+      "tooltip" : "日历部件周视图"
+    }, {
+      "accUserMode" : 2,
+      "caption" : "日历部件时间轴视图",
+      "itemType" : "MENUITEM",
+      "name" : "menuitem172",
+      "getPSAppFunc" : {
+        "modelref" : true,
+        "id" : "UsrAppFunc1218941706"
+      },
+      "tooltip" : "日历部件时间轴视图"
    } ],
    "tooltip" : "日历测试"
  }, {

--- 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
@@ -2670,6 +2670,16 @@
      "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/SysTodoDoneGridView.json",
      "viewType" : "DEGRIDVIEW"
    }
+  }, {
+    "appFuncType" : "APPVIEW",
+    "codeName" : "UsrAppFunc1218745420",
+    "name" : "日历部件周视图",
+    "openMode" : "INDEXVIEWTAB",
+    "getPSAppView" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookweekCalendarView.json",
+      "viewType" : "DECALENDARVIEW"
+    }
  }, {
    "appFuncType" : "APPVIEW",
    "codeName" : "AppFunc67",
@@ -4440,6 +4450,16 @@
      "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/phoneTreeExpView.json",
      "viewType" : "DETREEEXPVIEW"
    }
+  }, {
+    "appFuncType" : "APPVIEW",
+    "codeName" : "UsrAppFunc1218941706",
+    "name" : "日历视图_时间轴",
+    "openMode" : "INDEXVIEWTAB",
+    "getPSAppView" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/booktimeline_CalendarView.json",
+      "viewType" : "DECALENDARVIEW"
+    }
  }, {
    "appFuncType" : "APPVIEW",
    "codeName" : "AppFunc69",
@@ -12117,12 +12137,6 @@
    "codeName" : "VMGroup3",
    "name" : "视图消息类型测试",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-常规信息",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg4"
-      }
-    }, {
      "name" : "消息类型-警告信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
@@ -12134,6 +12148,12 @@
        "modelref" : true,
        "id" : "ViewMsg6"
      }
+    }, {
+      "name" : "消息类型-常规信息",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg4"
+      }
    } ]
  }, {
    "codeName" : "VMGroup7",
@@ -12154,12 +12174,6 @@
        "modelref" : true,
        "id" : "ViewMsg7"
      }
-    }, {
-      "name" : "消息位置-视图内容区",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg9"
-      }
    }, {
      "name" : "消息位置-视图下方",
      "getPSAppViewMsg" : {
@@ -12172,29 +12186,27 @@
        "modelref" : true,
        "id" : "ViewMsg10"
      }
+    }, {
+      "name" : "消息位置-视图内容区",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg9"
+      }
    } ]
  }, {
    "codeName" : "VMGroup8",
    "name" : "【静态测试】",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-警告信息",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg5"
-      },
-      "position" : "POPUP"
-    }, {
-      "name" : "消息类型-常规信息",
+      "name" : "消息位置-视图下方",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg4"
-      },
-      "position" : "POPUP"
+        "id" : "ViewMsg8"
+      }
    }, {
-      "name" : "关闭模式-无删除-上方-常规",
+      "name" : "关闭模式-默认删除-上方-错误",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg11"
+        "id" : "ViewMsg12"
      }
    }, {
      "name" : "消息位置-视图内容区",
@@ -12203,11 +12215,12 @@
        "id" : "ViewMsg9"
      }
    }, {
-      "name" : "关闭模式-默认删除-上方-错误",
+      "name" : "消息类型-警告信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg12"
-      }
+        "id" : "ViewMsg5"
+      },
+      "position" : "POPUP"
    }, {
      "name" : "关闭模式-本次删除-上方-警告",
      "getPSAppViewMsg" : {
@@ -12215,16 +12228,23 @@
        "id" : "ViewMsg13"
      }
    }, {
-      "name" : "消息位置-视图下方",
+      "name" : "消息类型-错误信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg6"
+      },
+      "position" : "POPUP"
+    }, {
+      "name" : "关闭模式-无删除-上方-常规",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg11"
      }
    }, {
-      "name" : "消息类型-错误信息",
+      "name" : "消息类型-常规信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg6"
+        "id" : "ViewMsg4"
      },
      "position" : "POPUP"
    } ]
@@ -12232,12 +12252,6 @@
    "codeName" : "VMGroup5",
    "name" : "视图消息关闭模式",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-默认删除",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg12"
-      }
-    }, {
      "name" : "关闭模式-本次删除",
      "getPSAppViewMsg" : {
        "modelref" : true,
@@ -12249,6 +12263,12 @@
        "modelref" : true,
        "id" : "ViewMsg11"
      }
+    }, {
+      "name" : "关闭模式-默认删除",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg12"
+      }
    } ]
  }, {
    "codeName" : "VMGroup6",
@@ -13305,6 +13325,12 @@
    "viewType" : "DEDATAVIEWEXPVIEW",
    "resource" : "Phone",
    "view" : "Usr0301495134DataViewExpView"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/booktimeline_CalendarView.json",
+    "viewType" : "DECALENDARVIEW",
+    "resource" : "Book",
+    "view" : "timeline_CalendarView"
  }, {
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTControlDefaultLoadTest.json",
@@ -14812,6 +14838,12 @@
    "viewType" : "DEGRIDVIEW",
    "resource" : "FILE",
    "view" : "GridView"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookweekCalendarView.json",
+    "viewType" : "DECALENDARVIEW",
+    "resource" : "Book",
+    "view" : "weekCalendarView"
  }, {
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoGridView.json",
@@ -17781,7 +17813,7 @@
          "name" : "menuitem163",
          "getPSAppMenuItems" : [ {
            "accUserMode" : 2,
-            "caption" : "测试日历部件月视图",
+            "caption" : "日历部件月视图",
            "itemType" : "MENUITEM",
            "name" : "menuitem162",
            "getPSAppFunc" : {
@@ -17800,10 +17832,10 @@
              "colMD" : 24,
              "layout" : "TABLE_24COL"
            },
-            "tooltip" : "测试日历部件月视图"
+            "tooltip" : "日历部件月视图"
          }, {
            "accUserMode" : 2,
-            "caption" : "测试日历日视图",
+            "caption" : "日历部件天视图",
            "itemType" : "MENUITEM",
            "name" : "menuitem164",
            "getPSAppFunc" : {
@@ -17822,7 +17854,51 @@
              "colMD" : 24,
              "layout" : "TABLE_24COL"
            },
-            "tooltip" : "测试日历日视图"
+            "tooltip" : "日历部件天视图"
+          }, {
+            "accUserMode" : 2,
+            "caption" : "日历部件周视图",
+            "itemType" : "MENUITEM",
+            "name" : "menuitem171",
+            "getPSAppFunc" : {
+              "modelref" : true,
+              "id" : "UsrAppFunc1218745420"
+            },
+            "getPSLayout" : {
+              "childColLG" : -1,
+              "childColMD" : 24,
+              "childColSM" : -1,
+              "childColXS" : -1,
+              "columnCount" : 24,
+              "layout" : "TABLE_24COL"
+            },
+            "getPSLayoutPos" : {
+              "colMD" : 24,
+              "layout" : "TABLE_24COL"
+            },
+            "tooltip" : "日历部件周视图"
+          }, {
+            "accUserMode" : 2,
+            "caption" : "日历部件时间轴视图",
+            "itemType" : "MENUITEM",
+            "name" : "menuitem172",
+            "getPSAppFunc" : {
+              "modelref" : true,
+              "id" : "UsrAppFunc1218941706"
+            },
+            "getPSLayout" : {
+              "childColLG" : -1,
+              "childColMD" : 24,
+              "childColSM" : -1,
+              "childColXS" : -1,
+              "columnCount" : 24,
+              "layout" : "TABLE_24COL"
+            },
+            "getPSLayoutPos" : {
+              "colMD" : 24,
+              "layout" : "TABLE_24COL"
+            },
+            "tooltip" : "日历部件时间轴视图"
          } ],
          "getPSLayout" : {
            "childColLG" : -1,
@@ -55397,6 +55473,10 @@
        "modelref" : true,
        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr2MPickupView.json",
        "viewType" : "DEMPICKUPVIEW"
+      }, {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/booktimeline_CalendarView.json",
+        "viewType" : "DECALENDARVIEW"
      }, {
        "modelref" : true,
        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookListView.json",
@@ -55557,6 +55637,10 @@
        "modelref" : true,
        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookAutoGropuGridView.json",
        "viewType" : "DEGRIDVIEW"
+      }, {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookweekCalendarView.json",
+        "viewType" : "DECALENDARVIEW"
      }, {
        "modelref" : true,
        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookPickupView2.json",