update

components/calendar.vue

@@ -22,11 +22,14 @@
       defaultView="dayGridMonth"
       :plugins="calendarPlugins"
       :selectable="useDraft"
-      :events="events"
+      :events="event"
       @select="drawSelect"
       :eventOrder="`start`"
       @eventClick="clickEvent"
       :views="views"
+      :displayEventEnd="true"
+      :displayEventTime="true"
+      :allday="true"
     />
   </div>
 </template>
@@ -35,6 +38,7 @@
 import FullCalendar from '@fullcalendar/vue';
 import dayGridPlugin from '@fullcalendar/daygrid';
 import interactionPlugin from '@fullcalendar/interaction';
+var moment = require('moment');
 import _ from 'lodash';
 export default {
   props: {
@@ -44,6 +48,7 @@ export default {
     useEvent: { type: Boolean, default: true },
     selfBtn: { type: Object, default: () => {} },
     eventLimit: { type: null, default: false },
+    vacation: { type: Array, default: () => [] },
   },
   components: {
     FullCalendar, // make the <FullCalendar> tag available
@@ -78,7 +83,12 @@ export default {
       this.$emit('click', arg);
     },
     drawSelect(arg) {
-      this.$emit('draft', arg);
+      arg.endStr = moment(arg.endStr)
+        .subtract(1, 'days')
+        .format('YYYY-MM-DD');
+      let is_possbile = this.$checkDate({ ...arg, vacation: this.vacation });
+      if (is_possbile == true) this.$emit('draft', arg);
+      else this.$message.error('您选择的时间段与假期重合,请您重新选择');
     },
     clickEvent(arg) {
       if (this.useEvent) this.$emit('eventClick', arg);
@@ -105,6 +115,23 @@ export default {
     rangeEnd() {
       return `${this.year}-12-31`;
     },
+    event() {
+      let nv = this.vacation.map(i => {
+        let object = JSON.parse(JSON.stringify(i));
+        object.end = moment(i.end)
+          .add(1, 'days')
+          .format('YYYY-MM-DD');
+        return object;
+      });
+      let ne = this.events.map(i => {
+        let object = JSON.parse(JSON.stringify(i));
+        object.end = moment(i.end)
+          .add(1, 'days')
+          .format('YYYY-MM-DD');
+        return object;
+      });
+      return nv.concat(ne);
+    },
   },
   watch: {
     selfBtn: {

components/wang-editor.vue

@@ -5,6 +5,7 @@
 import E from 'wangeditor';
 
 const menus = [
+  'code', // 插入代码
   'head', // 标题
   'bold', // 粗体
   'fontSize', // 字号
@@ -21,7 +22,6 @@ const menus = [
   // 'emoticon', // 表情
   'table', // 表格
   // 'video', // 插入视频
-  // 'code', // 插入代码
   'undo', // 撤销
   'redo', // 重复
 ];