@@ -373,14 +326,8 @@ export default {
exportCheckinShow: false,
exportApproveShow: false,
-
dialogMsgSubscribe: null,
- projectKeyValue: '',
- projectKeyLoading: 0,
- projectSearchShow: false,
-
- openMenu: {},
visibleMenu: false,
showMobileMenu: false,
@@ -394,10 +341,6 @@ export default {
reportTabs: "my",
- operateStyles: {},
- operateVisible: false,
- operateItem: {},
-
needStartHome: false,
}
},
@@ -448,8 +391,6 @@ export default {
'cacheUserBasic',
'cacheTasks',
'cacheDialogs',
- 'cacheProjects',
- 'projectTotal',
'wsOpenNum',
'columnTemplate',
@@ -608,19 +549,6 @@ export default {
return array
},
- projectLists() {
- const {projectKeyValue, cacheProjects} = this;
- const data = $A.cloneJSON(cacheProjects).sort((a, b) => {
- if (a.top_at || b.top_at) {
- return $A.Date(b.top_at) - $A.Date(a.top_at);
- }
- return b.id - a.id;
- });
- if (projectKeyValue) {
- return data.filter(item => $A.strExists(`${item.name} ${item.desc}`, projectKeyValue));
- }
- return data;
- },
taskBrowseLists() {
const {cacheTasks, cacheTaskBrowse, userId} = this;
@@ -646,17 +574,6 @@ export default {
this.chackPass();
},
- projectKeyValue(val) {
- if (val == '') {
- return;
- }
- setTimeout(() => {
- if (this.projectKeyValue == val) {
- this.searchProject();
- }
- }, 600);
- },
-
wsOpenNum(num) {
if (num <= 1) return
this.$store.dispatch("getBasicData", 600)
@@ -668,25 +585,6 @@ export default {
}
},
- 'cacheProjects.length': {
- handler() {
- this.$nextTick(_ => {
- const menuProject = this.$refs.menuProject
- const lastEl = $A.last($A.getObject(menuProject, 'children.0.children'))
- if (lastEl) {
- const lastRect = lastEl.getBoundingClientRect()
- const menuRect = menuProject.getBoundingClientRect()
- if (lastRect.top > menuRect.top + menuRect.height) {
- this.projectSearchShow = true
- return
- }
- }
- this.projectSearchShow = false
- })
- },
- immediate: true
- },
-
unreadAndOverdue: {
handler(val) {
if (this.$Electron) {
@@ -733,10 +631,6 @@ export default {
this.goForward(location);
},
- toggleOpenMenu(id) {
- this.$set(this.openMenu, id, !this.openMenu[id])
- },
-
settingRoute(path) {
switch (path) {
case 'allUser':
@@ -786,8 +680,8 @@ export default {
return;
case 'okrManage':
case 'okrAnalyze':
- this.goForward({
- path:'/manage/apps/' + ( path == 'okrManage' ? '/#/list' : '/#/analysis'),
+ this.goForward({
+ path:'/manage/apps/' + ( path == 'okrManage' ? '/#/list' : '/#/analysis'),
});
return;
case 'logout':
@@ -833,7 +727,7 @@ export default {
classNameRoute(path) {
let routeName = this.routeName
- if(routeName == 'manage-approve' || routeName == 'manage-apps'){
+ if(routeName == 'manage-approve' || routeName == 'manage-apps' || routeName == 'manage-calendar'){
routeName = `manage-application`
}
return {
@@ -841,14 +735,6 @@ export default {
};
},
- classNameProject(item) {
- return {
- "active": this.routeName === 'manage-project' && this.$route.params.projectId == item.id,
- "open-menu": this.openMenu[item.id] === true,
- "operate": item.id == this.operateItem.id && this.operateVisible
- };
- },
-
onAddMenu(name) {
switch (name) {
case 'task':
@@ -900,18 +786,6 @@ export default {
});
},
- searchProject() {
- setTimeout(() => {
- this.projectKeyLoading++;
- }, 1000)
- this.$store.dispatch("getProjects", {
- keys: {
- name: this.projectKeyValue
- }
- }).finally(_ => {
- this.projectKeyLoading--;
- });
- },
selectChange(index) {
this.$nextTick(() => {
@@ -1063,45 +937,6 @@ export default {
}
},
- handleLongpress(event, el) {
- const projectId = $A.getAttr(el, 'data-id')
- const projectItem = this.projectLists.find(item => item.id == projectId)
- if (!projectItem) {
- return
- }
- this.operateVisible = false;
- this.operateItem = $A.isJson(projectItem) ? projectItem : {};
- this.$nextTick(() => {
- const projectRect = el.getBoundingClientRect();
- const wrapRect = this.$refs.menuProject.getBoundingClientRect();
- this.operateStyles = {
- left: `${event.clientX - wrapRect.left}px`,
- top: `${projectRect.top + this.windowScrollY}px`,
- height: projectRect.height + 'px',
- }
- this.operateVisible = true;
- })
- },
-
- handleTopClick() {
- this.$store.dispatch("call", {
- url: 'project/top',
- data: {
- project_id: this.operateItem.id,
- },
- }).then(({data}) => {
- this.$store.dispatch("saveProject", data);
- this.$nextTick(() => {
- const active = this.$refs.menuProject.querySelector(".active")
- if (active) {
- $A.scrollIntoViewIfNeeded(active);
- }
- });
- }).catch(({msg}) => {
- $A.modalError(msg);
- });
- },
-
onTabbarClick(act) {
switch (act) {
case 'addTask':
diff --git a/resources/assets/js/pages/manage/application.vue b/resources/assets/js/pages/manage/application.vue
index c35ca0104..f69c27403 100644
--- a/resources/assets/js/pages/manage/application.vue
+++ b/resources/assets/js/pages/manage/application.vue
@@ -309,7 +309,8 @@ export default {
{ value: "okr", label: "OKR管理" },
{ value: "robot", label: "AI机器人" },
{ value: "signin", label: "签到" },
- { value: "meeting", label: "会议" }
+ { value: "meeting", label: "会议" },
+ { value: "calendar", label: "日历" },
];
// wap模式
let appApplyList = this.windowOrientation != 'portrait' ? (
@@ -317,7 +318,6 @@ export default {
{ value: "scan", label: "扫一扫" }
] : []
) : [
- { value: "calendar", label: "日历" },
{ value: "file", label: "文件" },
{ value: "addProject", label: "创建项目" },
{ value: "addTask", label: "添加任务" },
diff --git a/resources/assets/js/pages/manage/calendar.vue b/resources/assets/js/pages/manage/calendar.vue
index b0c2ba2b7..3369975d3 100644
--- a/resources/assets/js/pages/manage/calendar.vue
+++ b/resources/assets/js/pages/manage/calendar.vue
@@ -4,7 +4,7 @@
diff --git a/resources/assets/js/pages/manage/components/Calendar.vue b/resources/assets/js/pages/manage/components/Calendar.vue
index 76e1f9746..1cfc565bc 100644
--- a/resources/assets/js/pages/manage/components/Calendar.vue
+++ b/resources/assets/js/pages/manage/components/Calendar.vue
@@ -151,25 +151,28 @@ export default {
}
},
mounted() {
+ console.log(this.view)
+ console.log(this.calendars)
this.calendarInstance = new Calendar(this.$refs.tuiCalendar, {
defaultView: this.view,
- taskView: this.taskView,
- scheduleView: this.scheduleView,
- theme: this.theme,
- template: this.template,
- week: this.week,
- month: this.month,
- calendars: this.calendars,
- useCreationPopup: this.useCreationPopup,
- useDetailPopup: this.useDetailPopup,
- timezones: this.timezones,
- disableDblClick: this.disableDblClick,
- disableClick: this.disableClick,
- isReadOnly: this.isReadOnly,
- usageStatistics: this.usageStatistics
+ calendars: [],
+ // taskView: this.taskView,
+ // scheduleView: this.scheduleView,
+ // theme: this.theme,
+ // template: this.template,
+ // week: this.week,
+ // month: this.month,
+ // calendars: this.calendars,
+ // useCreationPopup: this.useCreationPopup,
+ // useDetailPopup: this.useDetailPopup,
+ // timezones: this.timezones,
+ // disableDblClick: this.disableDblClick,
+ // disableClick: this.disableClick,
+ // isReadOnly: this.isReadOnly,
+ // usageStatistics: this.usageStatistics
});
- this.addEventListeners();
- this.reflectSchedules();
+ // this.addEventListeners();
+ // this.reflectSchedules();
},
beforeDestroy() {
this.calendarInstance.off();
diff --git a/resources/assets/js/pages/manage/components/HomeCalendar.vue b/resources/assets/js/pages/manage/components/HomeCalendar.vue
new file mode 100644
index 000000000..7490e093c
--- /dev/null
+++ b/resources/assets/js/pages/manage/components/HomeCalendar.vue
@@ -0,0 +1,454 @@
+
+
+
+
+
+
+
+
+
+ | {{$L('日')}} |
+ {{$L('一')}} |
+ {{$L('二')}} |
+ {{$L('三')}} |
+ {{$L('四')}} |
+ {{$L('五')}} |
+ {{$L('六')}} |
+
+
+
+
+
+ |
+
+
+
+
+ |
+
+
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
{{warningMsg}}
@@ -83,15 +83,19 @@
+
+
+