Commit dc20c99d authored by 郜超's avatar 郜超

a

parent bf3ed7ac
...@@ -269,23 +269,12 @@ ...@@ -269,23 +269,12 @@
type: Object, type: Object,
required: true required: true
}, },
width: {
type: String,
required: false
},
initTime: { initTime: {
required: false required: false
}, },
title: { demoEvent: {
required: false type: Object,
},
events: {
required: false
},
timeOrder: {
required: false
},
date: {
required: false required: false
} }
}, },
...@@ -494,14 +483,14 @@ ...@@ -494,14 +483,14 @@
const self = this const self = this
var saveTime = '' var saveTime = ''
request(self.schema.modelUnderscorePlural, { request(self.schema.modelUnderscorePlural, {
params: { 'sortItem': self.timeOrder, 'pageSize': 10000 } params: { 'sortItem': self.demoEvent.timeOrder, 'pageSize': 10000 }
}).then(resp => { }).then(resp => {
console.log(resp.data, '=========') console.log(resp.data, '=========')
_.each(resp.data, function(item) { _.each(resp.data, function(item) {
item.time = moment(item[self.date]).format('YYYY-MM-DD') item.time = moment(item[self.demoEvent.date]).format('YYYY-MM-DD')
item.date = moment(item[self.date]).format('X') * 1000 item.date = moment(item[self.demoEvent.date]).format('X') * 1000
item.title = item[self.title] item.title = item[self.demoEvent.title]
item.allEvents = item[self.events] item.allEvents = item[self.demoEvent.events]
if (saveTime === item.time) { if (saveTime === item.time) {
self.schedules[self.schedules.length - 1].allEvents.push(item.allEvents) self.schedules[self.schedules.length - 1].allEvents.push(item.allEvents)
} else { } else {
......
<template> <template>
<div class="app-container calendar-list-container"> <div class="app-container calendar-list-container">
<hm-full-calendar <hm-full-calendar
:width="width"
:schema="schema['HmUser']" :schema="schema['HmUser']"
:title="title" :demoEvent="demoEvent"
:events="events"
:date="date"
:timeOrder="timeOrder"
@dateChange="datechange" @dateChange="datechange"
@monthChange="monthchange" @monthChange="monthchange"
></hm-full-calendar> ></hm-full-calendar>
...@@ -27,14 +23,16 @@ ...@@ -27,14 +23,16 @@
data() { data() {
return { return {
show: false, show: false,
demoEvent: {
width: '300px', width: '300px',
// title为需要传入的事件名所对应的的字段名,date为时间所对应的字段,events为事件所对应的字段,都不是必传
title: 'loginid', title: 'loginid',
date: 'createTime', date: 'createTime',
events: 'email', events: 'email',
// timeOrder为所有所有事件按照数据库的哪个字段排序,为下划线格式
timeOrder: 'create_time' timeOrder: 'create_time'
} }
// title为需要传入的事件名所对应的的字段名,date为时间所对应的字段,events为事件所对应的字段,都不是必传
// timeOrder为所有所有事件按照数据库的哪个字段排序,为下划线格式
}
}, },
filters: { filters: {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment