@opendesign-plus-test/components 0.0.1-rc.39 → 0.0.1-rc.41

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opendesign-plus-test/components",
-  "version": "0.0.1-rc.39",
+  "version": "0.0.1-rc.41",
   "type": "module",
   "publishConfig": {
     "access": "public",
@@ -32,8 +32,8 @@
     "dayjs": "^1.11.13",
     "video.js": "^8.23.7",
     "vue-dompurify-html": "^3.1.2",
-    "@opendesign-plus/composables": "0.0.1-rc.6",
-    "@opendesign-plus/styles": "0.0.1-rc.2"
+    "@opendesign-plus/styles": "0.0.1-rc.2",
+    "@opendesign-plus/composables": "0.0.1-rc.6"
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "^5.1.0",

package/src/components/activity/OActivityApproval.vue

@@ -140,7 +140,6 @@ const confirm = async () => {
   if (!props.approveActivityRequest || !props.rejectActivityRequest) {
     return;
   }
-  const msg = reviewStatus.value === 1 ? t('meeting.approveReview') : t('meeting.rejectReview');
   try {
     loading.value = true;
     const valid = await formRef.value?.validate();
@@ -158,12 +157,9 @@ const confirm = async () => {
     message.success({
       content: t('meeting.reviewSuccess', [currentRow.value?.title]),
     });
-  } catch {
+  } finally {
     reviewVisible.value = false;
     loading.value = false;
-    message.danger({
-      content: t('meeting.reviewFail', [currentRow.value?.title]),
-    });
   }
 };
 const cancel = () => {
@@ -187,12 +183,9 @@ const confirmCancel = async () => {
       message.success({
         content: t('meeting.activityActionSuccess', [currentRow.value?.title, cancelText.value]),
       });
-    } catch (err) {
+    } finally {
       loading.value = false;
       cancelVisible.value = false;
-      message.danger({
-        content: t('meeting.activityActionFail', [currentRow.value?.title, cancelText.value]),
-      });
     }
   }
 };

package/src/components/activity/OActivityForm.vue

@@ -310,13 +310,6 @@ const confirm = async (val: boolean) => {
     });
     close();
     emits('confirm');
-  } catch {
-    loading.value = false;
-    form.value.start_date = `${ form.value.start_date } ${ form.value.start }`;
-    form.value.end_date = `${ form.value.end_date } ${ form.value.end }`;
-    message.danger({
-      content: t('meeting.activityActionFail', [form.value.title, type.toLowerCase()]),
-    });
   } finally {
     loading.value = false;
   }
@@ -514,7 +507,7 @@ defineExpose({
       }
 
       .o-form-item-label {
-        flex: 0 0 80px;
+        flex: 0 0 88px;
       }
     }
   }

package/src/components/activity/OMyActivityCalendar.vue

@@ -320,11 +320,6 @@ const confirm = () => {
       reloadAll.value = true;
       getList();
     })
-    .catch(() => {
-      message.danger({
-        content: t('meeting.revokeActivityFail', [currentRow.value.title]),
-      });
-    })
     .finally(() => {
       revokeVisible.value = false;
       dialogLoading.value = false;
@@ -380,11 +375,6 @@ const handleSubmitReviewItem = (val: ActivityItemT) => {
       reloadAll.value = true;
       getList();
     })
-    .catch(() => {
-      message.danger({
-        content: t('meeting.submitReviewFail', [val.title]),
-      });
-    });
 };
 // 删除活动
 const deleteVisible = ref(false);
@@ -405,11 +395,6 @@ const confirmDelete = () => {
       reloadAll.value = true;
       getList();
     })
-    .catch(() => {
-      message.danger({
-        content: t('meeting.deleteActivityFail', [currentRow.value.title]),
-      });
-    })
     .finally(() => {
       deleteVisible.value = false;
       dialogLoading.value = false;

package/src/components/meeting/OMeetingCalendar.vue

@@ -100,7 +100,7 @@ const getActivityData = async (date) => {
 
 const getDateList = async (date) => {
   if (props.getDateListRequest) {
-    props.getDateListRequest(date).then(res => {
+    props.getDateListRequest(date, group.value || '').then(res => {
       dateList.value = res;
     });
   }
@@ -124,7 +124,7 @@ const paramGetDaysData = async (params: { date: string; type: string }) => {
     return;
   }
   try {
-    const res = await props.getMeetingListRequest(params.date, group.value);
+    const res = await props.getMeetingListRequest(params.date, group.value, '');
     meetingData.value = res.map((v) => {
       return {
         ...v,