cnhis-design-vue 2.1.118 → 2.1.119

package/packages/full-calendar/src/FullCalendar.vue

@@ -40,6 +40,8 @@
     </div>
 
     <TagDetail v-on="$listeners" ref="tagDetailRef"></TagDetail>
+
+    <div class="c-full-calendar__mask" v-if="!editable"></div>
   </div>
 </template>
 
@@ -55,11 +57,8 @@ import Tag from './components/Tag.vue';
 import ListTag from './components/ListTag.vue';
 import TagDetail from './components/TagDetail.vue';
 // import SvgIcon from '@/component/svg/index.vue';
-import { axiosInstance, getScheduleListApi, getScheduleSettingApi, getScheduleDataApi, queryScheduleListApi, saveOrUpdateScheduleApi, delScheduleApi } from './api';
 import vexutils, { moment } from '@/utils/vexutils';
-import { isAllDay, isAllDayWeek, getWeekEnd, isAllDayMonth, formatDate, weekIsMonth, hanldeDateListArr, handleListRows, viewMap } from './utils';
-
-window.moment = moment;
+import { formatDate, weekIsMonth, viewMap, getAddTime } from './utils';
 
 export default create({
   name: 'full-calendar',
@@ -77,13 +76,26 @@ export default create({
     [Icon.name]: Icon
   },
   props: {
-    serverPrefix: { type: String, default: 'inbox' },
+    // serverPrefix: { type: String, default: 'inbox' },
     // userInfo: { type: Object, default: () => {} },
-    orgId: { type: String },
-    userId: { type: String },
-    token: { type: String },
+    // orgId: { type: String },
+    // userId: { type: String },
+    // token: { type: String },
+    editable: { type: Boolean, default: true },
     showSearchHeader: { type: Boolean },
-    showSidebar: { type: Boolean }
+    showSidebar: { type: Boolean },
+    queryScheduleList: {
+      type: Function,
+      default: () => Promise.resolve([])
+    },
+    saveOrUpdateSchedule: {
+      type: Function,
+      default: () => Promise.resolve(true)
+    },
+    delSchedule: {
+      type: Function,
+      default: () => Promise.resolve(true)
+    }
   },
   computed: {
     disabledToday() {
@@ -224,73 +236,60 @@ export default create({
     };
   },
   beforeCreate() {
-    axiosInstance.interceptors.request.use(config => {
-      config.headers['Authorization'] = 'bearer ' + this.token;
-      config.baseURL = '/' + this.serverPrefix;
-      return config;
-    });
-  },
-  async created() {
-    // await this.queryScheduleList();
-    // await this.getSchedulerList();
-    // await this.getSchedulerData();
+    // axiosInstance.interceptors.request.use(config => {
+    //   config.headers['Authorization'] = 'bearer ' + this.token;
+    //   config.baseURL = '/' + this.serverPrefix;
+    //   return config;
+    // });
   },
+  async created() {},
   async mounted() {
     this.calendar = this.$refs.fullCalendar.calendar;
-    await this.queryScheduleList();
-    // try {
-    //   this.loading = true;
-    //   this.calendar = this.$refs.fullCalendar.calendar;
-    //   // await this.getScheduleSettingt();
-    //   // await this.getSchedulerList();
-    //   // await this.getSchedulerData();
-    // } catch (err) {
-    //   this.loading = false;
-    // } finally {
-    //   this.loading = false;
-    // }
+    this.setViewTime();
+    await this._queryScheduleList();
   },
   methods: {
-    async queryScheduleList() {
+    async _queryScheduleList() {
       this.loading = true;
       try {
-        const data = await queryScheduleListApi({
-          ...this.currentDate,
-          userId: this.userId,
-          orgId: this.orgId
+        const res = await this.queryScheduleList({
+          ...this.currentDate
+          // userId: this.userId,
+          // orgId: this.orgId
         });
-        if (!data.success) return;
+        // if (!data.success) return;
 
-        if (vexutils.isArray(data.data)) {
-          this.calendarOptions.events = data.data.map(item => ({ ...item, start: item.startTime, end: item.endTime }));
+        if (vexutils.isArray(res)) {
+          this.calendarOptions.events = res.map(item => ({ ...item, start: item.startTime, end: item.endTime }));
         } else {
           this.calendarOptions.events = [];
         }
-        // this.dateValue && this.calendar.gotoDate(this.dateValue._d);
       } catch (error) {
         console.log(error);
       } finally {
         this.loading = false;
       }
     },
-    async saveOrUpdateSchedule(params) {
+    async _saveOrUpdateSchedule(params) {
+      this.loading = true;
       try {
-        const data = await saveOrUpdateScheduleApi(params);
-        if (data.success) this.$message.success('保存成功');
-        await this.queryScheduleList();
+        await this.saveOrUpdateSchedule(params);
+        // if (data.success) this.$message.success('保存成功');
+        await this._queryScheduleList();
       } catch (error) {
         console.log(error);
       } finally {
         this.loading = false;
       }
     },
-    async delSchedule(params) {
+    async _delSchedule(params) {
+      this.loading = true;
       try {
-        const data = await delScheduleApi({ ...params, userId: this.userId });
-        if (data.success) {
-          this.$message.success('删除成功');
+        const data = await this.delSchedule(params);
+        if (data) {
+          // this.$message.success('删除成功');
           // this.calendarOptions.events = this.calendarOptions.events.filter(item => item.scheduleId === params.scheduleId);
-          await this.queryScheduleList();
+          await this._queryScheduleList();
         }
       } catch (error) {
         console.log(error);
@@ -349,28 +348,48 @@ export default create({
     handleCurrentDateChange() {
       const date = moment(this.dateValue).format('YYYY-MM-DD');
       let currentDate = {};
+
       switch (this.viewType) {
         case 'day':
           currentDate = formatDate(date, 'day');
           break;
-        case 'week':
-          currentDate = formatDate(date, 'week');
+        case 'list':
+          currentDate = formatDate(date, 'month');
           break;
         default:
-          currentDate = formatDate(date, 'month');
+          this.setViewTime();
           break;
       }
       Object.assign(this.currentDate, currentDate);
-      this.queryScheduleList();
+      this._queryScheduleList();
+    },
+    setViewTime() {
+      const currentDate = {};
+      const { activeStart, activeEnd } = this.calendar.view;
+      currentDate.startTime = moment(activeStart)
+        .clone()
+        .startOf('day')
+        .format('YYYY-MM-DD HH:mm:ss');
+      currentDate.endTime = moment(activeEnd)
+        .clone()
+        .subtract(1, 'day')
+        .endOf('day')
+        .format('YYYY-MM-DD HH:mm:ss');
+
+      Object.assign(this.currentDate, currentDate);
     },
     handleAdd() {
-      this.$emit('add', {});
+      this.$emit('add', getAddTime(this.dateValue));
     },
     handleSelect(event, type = 'add') {
       const { start, end, extendedProps, title } = event;
-      const startTime = moment(start).format('YYYY-MM-DD HH:mm:ss');
-      const endTime = moment(end).format('YYYY-MM-DD HH:mm:ss');
+      const { startTime, endTime } = getAddTime(start);
       const params = { ...extendedProps, startTime, endTime, title };
+      if (type === 'edit') {
+        params.startTime = moment(start).format('YYYY-MM-DD HH:mm:ss');
+        params.endTime = moment(end).format('YYYY-MM-DD HH:mm:ss');
+      }
+      const that = this;
       if (moment(start).valueOf() < moment().valueOf()) {
         this.$confirm({
           title: '提示',
@@ -378,16 +397,24 @@ export default create({
           okText: '确定',
           cancelText: '取消',
           onOk: () => {
-            this.$emit(type, params);
+            setEmit();
           },
           onCancel: () => {
             if (type === 'edit') {
-              this.queryScheduleList();
+              this._queryScheduleList();
             }
           }
         });
       } else {
-        this.$emit(type, params);
+        setEmit();
+      }
+
+      function setEmit() {
+        if (type === 'add') {
+          that.$emit('add', params);
+        } else {
+          that._saveOrUpdateSchedule(params);
+        }
       }
     },
     handleDrop({ event, oldEvent }) {
@@ -419,10 +446,18 @@ export default create({
 @primary-color: #2d7aff;
 
 .c-full-calendar {
+  position: relative;
   display: flex;
   flex-flow: column nowrap;
   width: 100%;
   height: 100%;
+  &__mask {
+    position: absolute;
+    z-index: 1;
+    width: 100%;
+    height: 100%;
+    background-color: rgba(0, 0, 0, 0);
+  }
   /deep/ .tag-detail-wrpper {
     display: none;
   }
@@ -452,7 +487,7 @@ export default create({
   .main-wrapper {
     display: flex;
     width: 100%;
-    flex: 1;
+    height: 100%;
     .full-calendar {
       display: flex;
       flex-flow: column nowrap;
@@ -561,6 +596,7 @@ export default create({
       /deep/ .full-calendar__body {
         width: 100%;
         flex: 1;
+        overflow-y: scroll;
         box-sizing: border-box;
 
         .fc-header-toolbar {

package/packages/full-calendar/src/components/Tag.vue

@@ -21,6 +21,7 @@ import { Tooltip, Icon } from 'ant-design-vue';
 import { moment } from '@/utils/vexutils';
 import tippy from 'tippy.js';
 import 'tippy.js/dist/tippy.css';
+import { getAddTime } from '../utils';
 
 export default {
   name: 'tag',
@@ -90,7 +91,7 @@ export default {
       const { startTime, endTime, scheduleId } = this.item;
       switch (btn.type) {
         case 'plus-square':
-          this.$emit('add', { startTime, endTime });
+          this.$emit('add', getAddTime(startTime));
           break;
         case 'form':
           this.$emit('edit', this.item);
@@ -102,8 +103,7 @@ export default {
             okText: '确定',
             cancelText: '取消',
             onOk: () => {
-              this.$emit('delete', { id: scheduleId });
-              this.tagDetailRef.$parent.delSchedule({ id: scheduleId });
+              this.tagDetailRef.$parent._delSchedule({ id: scheduleId });
             },
             onCancel() {}
           });

package/packages/full-calendar/src/components/TagDetail.vue

@@ -36,6 +36,7 @@
 <script>
 import { Tooltip, Icon } from 'ant-design-vue';
 import vexutils, { moment } from '@/utils/vexutils';
+import { getAddTime } from '../utils';
 
 export default {
   name: 'tag-detail',
@@ -113,7 +114,7 @@ export default {
       const { startTime, endTime, scheduleId } = this.item;
       switch (btn.type) {
         case 'plus-square':
-          this.$emit('add', { startTime, endTime });
+          this.$emit('add', getAddTime(startTime));
           break;
         case 'form':
           this.$emit('edit', this.item);
@@ -125,8 +126,7 @@ export default {
             okText: '确定',
             cancelText: '取消',
             onOk: () => {
-              this.$emit('delete', { id: scheduleId });
-              this.$parent.delSchedule({ id: scheduleId });
+              this.$parent._delSchedule({ id: scheduleId });
             },
             onCancel() {}
           });

package/packages/full-calendar/src/utils/index.js

@@ -185,6 +185,20 @@ export function handleListRows(rows, v) {
   return res;
 }
 
+export function getAddTime(start) {
+  const nearestHour = moment()
+    .clone()
+    .startOf('hour')
+    .add(1, 'hour');
+  const startTime = moment(start)
+    .set({ hour: nearestHour.hour(), minute: 0, second: 0 })
+    .format('YYYY-MM-DD HH:mm:ss');
+  const endTime = moment(startTime)
+    .add(1, 'hour')
+    .format('YYYY-MM-DD HH:mm:ss');
+  return { startTime, endTime };
+}
+
 export const viewMap = {
   list: '列表',
   day: '日',

package/packages/fabric-chart/src/mixins/type.js

@@ -1,6 +0,0 @@
-export const isNumber = num => {
-  return typeof num === 'number' && Number.isFinite(num);
-};
-export const isObject = obj => {
-  return Object.prototype.toString.call(obj) === '[object Object]';
-};