cnhis-design-vue 2.1.115 → 2.1.116

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

@@ -286,12 +286,12 @@ export default create({
     },
     async delSchedule(params) {
       try {
-        const data = await delScheduleApi(params);
+        const data = await delScheduleApi({ ...params, userId: this.userId });
         if (data.success) {
           this.$message.success('删除成功');
-          this.calendarOptions.events = this.calendarOptions.events.filter(item => item.scheduleId === params.scheduleId);
+          // this.calendarOptions.events = this.calendarOptions.events.filter(item => item.scheduleId === params.scheduleId);
+          await this.queryScheduleList();
         }
-        // await this.queryScheduleList();
       } catch (error) {
         console.log(error);
       } finally {
@@ -299,15 +299,14 @@ export default create({
       }
     },
     eventContentRender(info) {
-      const { avatar, scheduleId, table, isAllDay, statusFlag } = info.event.extendedProps;
+      const { title, extendedProps, allDay, start, end } = info.event;
 
       const tagProps = {
         viewType: this.viewType,
-        statusFlag,
-        avatar,
-        title: info.event.title,
-        isAllDay,
-        item: info.event.extendedProps
+        title,
+        isAllDay: allDay,
+        state: extendedProps.state,
+        item: { ...extendedProps, title, startTime: moment(start).format('YYYY-MM-DD HH:mm:ss'), endTime: moment(end).format('YYYY-MM-DD HH:mm:ss') }
       };
       return [<Tag props={tagProps} on={this.$listeners}></Tag>];
     },
@@ -367,9 +366,11 @@ export default create({
     handleAdd() {
       this.$emit('add', {});
     },
-    handleSelect({ start, end }, type = 'add') {
+    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 params = { ...extendedProps, startTime, endTime, title };
       if (moment(start).valueOf() < moment().valueOf()) {
         this.$confirm({
           title: '提示',
@@ -377,7 +378,7 @@ export default create({
           okText: '确定',
           cancelText: '取消',
           onOk: () => {
-            this.$emit(type, { startTime, endTime });
+            this.$emit(type, params);
           },
           onCancel: () => {
             if (type === 'edit') {
@@ -386,7 +387,7 @@ export default create({
           }
         });
       } else {
-        this.$emit(type, { startTime, endTime });
+        this.$emit(type, params);
       }
     },
     handleDrop({ event, oldEvent }) {

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

@@ -64,7 +64,7 @@ export function queryScheduleListApi(params) {
 // 删除日程
 export function delScheduleApi(params) {
   return axiosInstance({
-    method: 'post',
+    method: 'get',
     url: '/schedule/deleteById',
     params
   });

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

@@ -9,11 +9,15 @@
         </div>
         <div class="list-tag__right">
           <div v-for="(item, index) in data.list" :key="index">
-            <tag v-bind="$attrs" v-on="$listeners" :item="item" :title="item.title" :statusFlag="data.statusFlag" :avatar="item.avatar" :isAllDay="item.isAllDay"></tag>
+            <tag v-bind="$attrs" v-on="$listeners" :item="item" :title="item.title" :state="data.state" :avatar="item.avatar" :isAllDay="item.isAllDay"></tag>
           </div>
         </div>
       </li>
     </ul>
+    <div class="no-data" v-show="formatedListData.length === 0">
+      <img :src="noDataSrc" alt="" />
+      <p>暂无数据</p>
+    </div>
   </div>
 </template>
 <script>
@@ -33,7 +37,9 @@ export default {
   },
   data() {
     this.curMoment = moment();
-    return {};
+    return {
+      noDataSrc: require('@/assets/img/nodata.png')
+    };
   },
   filters: {},
   computed: {
@@ -56,7 +62,7 @@ export default {
             week: date.format('ddd'),
             month: date.format('MMM'),
             list: [{ ...item }],
-            statusFlag: startTime < curValue ? 0 : 1
+            state: startTime < curValue ? 0 : 1
           };
         }
         return obj;
@@ -161,5 +167,9 @@ export default {
       }
     }
   }
+
+  .no-data p {
+    color: #666;
+  }
 }
 </style>

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

@@ -1,6 +1,6 @@
 <template>
   <div :class="['event-tag', 'event-tag-' + viewType, { 'event-tag--active': isActive }, { 'event-tag-allday': isAllDay }]" @click.stop="clickTag" ref="tagRef">
-    <div :class="['event-tag__main', statusClass[statusFlag]]">
+    <div :class="['event-tag__main', statusClass[state]]">
       <span class="event-tag__main__text-time" v-if="viewType === 'list'">{{ timeRange }}</span>
       <span class="event-tag__main__text-title">{{ title }}</span>
       <div :class="['right-operate', { 'right-operate-hasBtn': hasBtns }]">
@@ -31,10 +31,10 @@ export default {
   props: {
     item: { type: Object },
     title: { type: String },
-    avatar: { type: String },
+    // avatar: { type: String },
     viewType: { type: String },
     isAllDay: { type: Boolean, default: false },
-    statusFlag: { type: Number, default: 1 }
+    state: { type: Number, default: 1 }
   },
   data() {
     return {
@@ -93,7 +93,7 @@ export default {
           this.$emit('add', { startTime, endTime });
           break;
         case 'form':
-          this.$emit('edit', { startTime, endTime });
+          this.$emit('edit', this.item);
           break;
         case 'delete':
           this.$confirm({
@@ -103,6 +103,7 @@ export default {
             cancelText: '取消',
             onOk: () => {
               this.$emit('delete', { id: scheduleId });
+              this.tagDetailRef.$parent.delSchedule({ id: scheduleId });
             },
             onCancel() {}
           });
@@ -115,7 +116,6 @@ export default {
       this.tagDetailRef.title = this.item.title;
       this.tagDetailRef.content = this.item.content;
       this.tagDetailRef.item = this.item;
-
       this.tagDetailRef.$parent.tippyInstance = tippy(this.$refs.tagRef, {
         trigger: 'click',
         allowHTML: true,

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

@@ -116,7 +116,7 @@ export default {
           this.$emit('add', { startTime, endTime });
           break;
         case 'form':
-          this.$emit('edit', { startTime, endTime });
+          this.$emit('edit', this.item);
           break;
         case 'delete':
           this.$confirm({
@@ -126,6 +126,7 @@ export default {
             cancelText: '取消',
             onOk: () => {
               this.$emit('delete', { id: scheduleId });
+              this.$parent.delSchedule({ id: scheduleId });
             },
             onCancel() {}
           });

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

@@ -125,7 +125,6 @@ export function hanldeDateListArr(dateValue) {
     const month = addDay.format('MMM');
     const day = addDay.format('D');
     const week = addDay.format('ddd');
-    console.log('week', week);
     const obj = {
       id: curDay,
       month,
@@ -186,250 +185,6 @@ export function handleListRows(rows, v) {
   return res;
 }
 
-export const demoRows = [
-  {
-    icon: 'zujian',
-    description: 'testtest\n',
-    avatar: 'https://cdn.cnhis.cc/5425/234667/20230606/8c7e14b4aa624db8a1c9afdce8af5360.png',
-    title: 'oohu',
-    userId: 234667,
-    operatorColumn: ['1309332548932866048###1601004112487', '1309382315062857728###1601015982633'],
-    startTime: '2023-11-01 09:37:33',
-    endTime: '2023-11-01 09:34:49',
-    primaryKeyValue: '1719529073456128000',
-    table: {
-      SHOW_BUTTON_IDS: ['1309332548932866048###1601004112487', '1309382315062857728###1601015982633'],
-      theUniqueKey: '9db4fb7ba2e34d378d00cb1a26365fca0',
-      created_time: '2023-11-01 09:37:33',
-      user_name: '管理员',
-      end_time: '2023-11-01 09:34:49',
-      title: 'oohu',
-      created_by: 234667,
-      content: 'testtest',
-      start_time: '2023-11-01 09:37:33',
-      user_id: 234667,
-      operatorColumn: ['1309332548932866048###1601004112487', '1309382315062857728###1601015982633'],
-      id: '1719529073456128000',
-      status: '###{"value":"0","change_text":"未完成"}'
-    },
-    scheduleId: '1310904527607566336',
-    status: '###{"value":"0","change_text":"未完成"}',
-    statusFlag: 0
-  },
-  {
-    icon: 'zujian',
-    description: '测试内容\n',
-    avatar: 'https://cdn.cnhis.cc/5425/234667/20230606/8c7e14b4aa624db8a1c9afdce8af5360.png',
-    title: '特斯特',
-    userId: 234667,
-    operatorColumn: ['1309332548932866048###1601004112487', '1309382315062857728###1601015982633'],
-    startTime: '2023-11-01 09:37:33',
-    endTime: '2023-11-01 09:34:49',
-    primaryKeyValue: '1719528388018774016',
-    table: {
-      SHOW_BUTTON_IDS: ['1309332548932866048###1601004112487', '1309382315062857728###1601015982633'],
-      theUniqueKey: '723d294c3e91404f8a612359a7ae72e61',
-      created_time: '2023-11-01 09:34:49',
-      user_name: '管理员',
-      end_time: '2023-11-01 09:34:49',
-      title: '特斯特',
-      created_by: 234667,
-      content: '测试内容',
-      start_time: '2023-11-01 09:37:33',
-      user_id: 234667,
-      operatorColumn: ['1309332548932866048###1601004112487', '1309382315062857728###1601015982633'],
-      id: '1719528388018774016',
-      status: '###{"value":"0","change_text":"未完成"}'
-    },
-    scheduleId: '1310904527607566336',
-    status: '###{"value":"0","change_text":"未完成"}',
-    statusFlag: 0
-  },
-  {
-    icon: 'zujian',
-    description: '测试的内容\n',
-    avatar: 'https://cdn.cnhis.cc/5425/234667/20230606/8c7e14b4aa624db8a1c9afdce8af5360.png',
-    title: 'test',
-    userId: 234667,
-    operatorColumn: ['1309332548932866048###1601004112487', '1309382315062857728###1601015982633'],
-    startTime: '2023-11-01 09:37:33',
-    endTime: '2023-11-01 09:34:49',
-    primaryKeyValue: '1719319390971699200',
-    table: {
-      SHOW_BUTTON_IDS: ['1309332548932866048###1601004112487', '1309382315062857728###1601015982633'],
-      theUniqueKey: '836a0628fb974fa699b5e2ec4564b54b2',
-      created_time: '2023-10-31 19:44:20',
-      user_name: '管理员',
-      end_time: '2023-11-01 09:34:49',
-      title: 'test',
-      created_by: 234667,
-      content: '测试的内容',
-      start_time: '2023-11-01 09:37:33',
-      user_id: 234667,
-      operatorColumn: ['1309332548932866048###1601004112487', '1309382315062857728###1601015982633'],
-      id: '1719319390971699200',
-      status: '###{"value":"0","change_text":"未完成"}'
-    },
-    scheduleId: '1310904527607566336',
-    status: '###{"value":"0","change_text":"未完成"}',
-    statusFlag: 0
-  },
-  {
-    icon: 'zujian',
-    description: '测试的内容\n',
-    avatar: 'https://cdn.cnhis.cc/5425/234667/20230606/8c7e14b4aa624db8a1c9afdce8af5360.png',
-    title: 'test',
-    userId: 234667,
-    operatorColumn: ['1309332548932866048###1601004112487', '1309382315062857728###1601015982633'],
-    startTime: '2023-11-01 09:37:33',
-    endTime: '2023-11-01 09:34:49',
-    primaryKeyValue: '1718944007424253952',
-    table: {
-      SHOW_BUTTON_IDS: ['1309332548932866048###1601004112487', '1309382315062857728###1601015982633'],
-      theUniqueKey: 'cecb9e4098af43b9b36a09bc8715f2b03',
-      created_time: '2023-10-30 18:52:42',
-      user_name: '管理员',
-      end_time: '2023-11-01 09:34:49',
-      title: 'test',
-      created_by: 234667,
-      content: '测试的内容',
-      start_time: '2023-11-01 09:37:33',
-      user_id: 234667,
-      operatorColumn: ['1309332548932866048###1601004112487', '1309382315062857728###1601015982633'],
-      id: '1718944007424253952',
-      status: '###{"value":"0","change_text":"未完成"}'
-    },
-    scheduleId: '1310904527607566336',
-    status: '###{"value":"0","change_text":"未完成"}',
-    statusFlag: 0
-  },
-  {
-    icon: 'zujian',
-    description: '高低杠大概\n',
-    avatar: 'https://cdn.cnhis.cc/5425/234667/20230606/8c7e14b4aa624db8a1c9afdce8af5360.png',
-    title: '测试',
-    userId: 234667,
-    operatorColumn: ['1309332548932866048###1601004112487', '1309382315062857728###1601015982633'],
-    startTime: '2023-11-03 00:00:00',
-    endTime: '2023-11-04 00:00:00',
-    primaryKeyValue: '1720258985133547520',
-    table: {
-      SHOW_BUTTON_IDS: ['1309332548932866048###1601004112487', '1309382315062857728###1601015982633'],
-      theUniqueKey: '079410de74a644afb45da2b3ad5affc44',
-      created_time: '2023-11-03 09:57:57',
-      user_name: '管理员',
-      end_time: '2023-11-04 00:00:00',
-      title: '测试',
-      created_by: 234667,
-      content: '高低杠大概',
-      start_time: '2023-11-03 00:00:00',
-      user_id: 234667,
-      operatorColumn: ['1309332548932866048###1601004112487', '1309382315062857728###1601015982633'],
-      id: '1720258985133547520',
-      status: '###{"value":"0","change_text":"未完成"}'
-    },
-    scheduleId: '1310904527607566336',
-    status: '###{"value":"0","change_text":"未完成"}',
-    statusFlag: 0
-  }
-];
-
-export const listDataDemo = [
-  {
-    id: 3,
-    month: '11月',
-    day: '3',
-    week: '周五',
-    curDate: '2023-11-03T01:58:05.150Z',
-    curId: '20231103',
-    todayS: '2023-11-02T16:00:00.000Z',
-    todayE: '2023-11-03T15:59:59.999Z',
-    list: [
-      {
-        icon: 'zujian',
-        description: '高低杠大概\n',
-        avatar: 'https://cdn.cnhis.cc/5425/234667/20230606/8c7e14b4aa624db8a1c9afdce8af5360.png',
-        title: '测试',
-        userId: 234667,
-        operatorColumn: ['1309332548932866048###1601004112487', '1309382315062857728###1601015982633'],
-        startTime: '2023-11-03 00:00:00',
-        endTime: '2023-11-04 00:00:00',
-        primaryKeyValue: '1720258985133547520',
-        table: {
-          SHOW_BUTTON_IDS: ['1309332548932866048###1601004112487', '1309382315062857728###1601015982633'],
-          theUniqueKey: '2612203b10a443729b079824cff1edbc4',
-          created_time: '2023-11-03 09:57:57',
-          user_name: '管理员',
-          end_time: '2023-11-04 00:00:00',
-          title: '测试',
-          created_by: 234667,
-          content: '高低杠大概',
-          start_time: '2023-11-03 00:00:00',
-          user_id: 234667,
-          operatorColumn: ['1309332548932866048###1601004112487', '1309382315062857728###1601015982633'],
-          id: '1720258985133547520',
-          status: '###{"value":"0","change_text":"未完成"}'
-        },
-        scheduleId: '1310904527607566336',
-        status: '###{"value":"0","change_text":"未完成"}',
-        statusFlag: 0,
-        btns: [
-          {
-            id: '1309332153363861504',
-            tableId: '1309312355951185920',
-            name: '新增',
-            type: 'ADD',
-            setting:
-              '{"trigger_name":"日程-任务","obj_id":"1601003977074","display":"pop","trigger_id":"1309317566975447040","trigger_type":"FORM","isTips":"1","params":[{"p_value":"sch.start_time","p_text":"开始时间","p_name":"开始时间"},{"p_value":"sch.end_time","p_text":"结束时间","p_name":"结束时间"}]}',
-            settingList: '[{"trigger_name":"日程-任务","obj_id":"1601003977074","display":"pop","trigger_id":"1309317566975447040","trigger_type":"FORM","isTips":"1"}]',
-            createdTime: '2020-09-25 11:32:38',
-            updatedTime: '2020-09-25 11:32:38',
-            buttonType: 'PC',
-            showStyleSetting: '{"showStyle":"custom_bg","color":"#5585F5","toggle":"tile"}',
-            sid: '1309332153363861504'
-          },
-          {
-            id: '1309332548932866048',
-            tableId: '1309312355951185920',
-            name: '编辑',
-            type: 'EDIT',
-            setting:
-              '{"trigger_name":"日程-任务","obj_id":"1601004112487","display":"pop","trigger_id":"1309317566975447040","trigger_type":"FORM","isTips":"1","params":[{"p_value":"table.id","p_name":"id"},{"p_value":"table.title","p_name":"标题"},{"p_value":"table.status","p_name":"状态"},{"p_value":"table.start_time","p_name":"开始时间"},{"p_value":"table.end_time","p_name":"结束时间"},{"p_value":"table.content","p_name":"内容"},{"p_value":"sch.start_time","p_text":"开始时间","p_name":"开始时间"},{"p_value":"sch.end_time","p_text":"结束时间","p_name":"结束时间"}]}',
-            settingList:
-              '[{"trigger_name":"日程-任务","obj_id":"1601004112487","display":"pop","trigger_id":"1309317566975447040","trigger_type":"FORM","isTips":"1","params":[{"p_value":"table.id","p_name":"id"},{"p_value":"table.title","p_name":"标题"},{"p_value":"table.status","p_name":"状态"},{"p_value":"table.start_time","p_name":"开始时间"},{"p_value":"table.end_time","p_name":"结束时间"},{"p_value":"table.content","p_name":"内容"}]}]',
-            createdTime: '2021-03-27 09:37:05',
-            updatedTime: '2021-03-27 09:37:05',
-            buttonType: 'PC',
-            showStyleSetting: '{"showStyle":"custom_bg","chooseTwoData":"0","toggle":"tile"}',
-            sid: '1309332548932866048'
-          },
-          {
-            id: '1309382315062857728',
-            tableId: '1309312355951185920',
-            name: '删除',
-            type: 'DELETE',
-            setting:
-              '[{"trigger_name":"日程-任务","obj_id":"1601015982633","tipsMsg":"确认要删除此日程吗？","display":"pop","trigger_id":"1309315222820884480","trigger_type":"SQLSAVE","isTips":"1","params":[{"p_value":"2","p_name":"status"},{"p_value":"table.id","p_name":"id"},{"p_value":"table.start_time","p_name":"start_time"},{"p_value":"table.end_time","p_name":"end_time"},{"p_value":"table.title","p_name":"title"}]}]',
-            settingList:
-              '[{"trigger_name":"日程-任务","obj_id":"1601015982633","tipsMsg":"确认要删除此日程吗？","display":"pop","trigger_id":"1309315222820884480","trigger_type":"SQLSAVE","isTips":"1","params":[{"p_value":"2","p_name":"status"},{"p_value":"table.id","p_name":"id"},{"p_value":"table.start_time","p_name":"start_time"},{"p_value":"table.end_time","p_name":"end_time"},{"p_value":"table.title","p_name":"title"}]}]',
-            createdTime: '2021-05-15 15:29:33',
-            updatedTime: '2021-05-15 15:29:33',
-            buttonType: 'PC',
-            showStyleSetting: '{"showStyle":"custom_bg","chooseTwoData":"0","toggle":"tile"}',
-            buttonRemark: '删除',
-            sid: '1309382315062857728'
-          }
-        ],
-        isActive: false,
-        dateValue: 1698940800000,
-        dateValueE: 1699027200000,
-        allDay: true,
-        _timeStr: 1698977044273
-      }
-    ]
-  }
-];
-
 export const viewMap = {
   list: '列表',
   day: '日',