cnhis-design-vue 2.1.118 → 2.1.120

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,30 @@ export function handleListRows(rows, v) {
   return res;
 }
 
+export function getAddTime(start, end) {
+  const nearestHour = moment()
+    .clone()
+    .startOf('hour')
+    .add(1, 'hour');
+  const startTime = moment(start)
+    .clone()
+    .set({ hour: nearestHour.hour() })
+    .startOf('hour')
+    .format('YYYY-MM-DD HH:mm:ss');
+  const endTime = end
+    ? moment(end)
+        .clone()
+        .subtract(1, 'day')
+        .set({ hour: nearestHour.hour() + 1 })
+        .startOf('hour')
+        .format('YYYY-MM-DD HH:mm:ss')
+    : moment(startTime)
+        .clone()
+        .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]';
-};