@opendesign-plus-test/components 0.0.1-rc.57 → 0.0.1-rc.59

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opendesign-plus-test/components",
-  "version": "0.0.1-rc.57",
+  "version": "0.0.1-rc.59",
   "type": "module",
   "publishConfig": {
     "access": "public",

package/src/components/activity/OActivityMyCalendar.vue

@@ -410,7 +410,7 @@ const confirmDelete = () => {
   }
   dialogLoading.value = true;
   props.deleteActivityRequest(currentRow.value?.id)
-    .then((flag) => {
+    .then((flag: any) => {
       if (typeof flag === 'boolean' && !flag) {
         return;
       }

package/src/components/header/types.ts

@@ -35,6 +35,7 @@ export interface NavItemT {
   withPicture: boolean; // 快捷链接是否显示缩略图
   children: ChildrenItemT[]; // 导航子项
   shortcut: ShortcutItemT[]; // 右侧快捷链接
+  tag?: string; // 标签
 }
 
 export interface CodeItemT {

package/src/components/meeting/OMeetingForm.vue

@@ -19,7 +19,15 @@ import {
 } from '@opensig/opendesign';
 import IconHelp from '~icons/meeting/icon-help.svg';
 import IconTip from '~icons/meeting/icon-tip.svg';
-import { CycleSubItemT, MeetingFormPropsT, MeetingGroupType, MeetingPostT, OptionItemT, PlatformT } from './types';
+import {
+  CycleSubItemT,
+  MeetingFormPropsT,
+  MeetingGroupType,
+  MeetingItemT,
+  MeetingPostT,
+  OptionItemT,
+  PlatformT,
+} from './types';
 import dayjs from 'dayjs';
 import { findLabelFromOptions, formatDateNumber, getDateNumber } from './utils';
 import { EMAIL_REGEX, INTERVAL_DAY, INTERVAL_MONTH, INTERVAL_WEEK } from './config';
@@ -31,8 +39,6 @@ import { ValidatorResultT } from '@opensig/opendesign/lib/form/types';
 const { t, locale, cycleTypeOptions0, intervalWeekOptions, getPlatformLabel } = useMeetingConfig();
 
 const props = withDefaults(defineProps<MeetingFormPropsT>(), {
-  isSub: false,
-  isEdit: false,
   showBtns: true,
   groupType: MeetingGroupType.SIG,
 });
@@ -41,6 +47,8 @@ const message = useMessage(null);
 const cycleTypeOptions = cycleTypeOptions0;
 const weekOptions = intervalWeekOptions;
 
+const isEdit = computed(() => Object.keys(props?.data || {}).length > 0);
+const isSub = computed(() => !!props.subId);
 const intervalTypeMax = computed(() => {
   return findLabelFromOptions(form.value.cycle_type, cycleTypeOptions.value, 'max');
 });
@@ -202,7 +210,7 @@ const rules = computed<Record<string, RulesT[]>>(() => {
     email_list: [
       {
         validator: (value: any) => {
-          if (props.isEdit) {
+          if (isEdit.value) {
             return {} as unknown as ValidatorResultT;
           }
           const str = value.replaceAll(' ', '').replaceAll(',', ';') || '';
@@ -287,7 +295,7 @@ const getPropData = () => {
     ...(is_cycle
       ? {
         date_range: [cycle_start_date, cycle_end_date],
-        cycle_point: cycle_point?.map((v) => parseInt(v)) || [],
+        cycle_point: cycle_point?.map((v) => parseInt(v as unknown as string)) || [],
         cycle_interval: cycle_interval || 1,
         time: `${ cycle_start }-${ cycle_end }`,
         start: cycle_start,
@@ -301,13 +309,13 @@ watch(
   () => props.data,
   (data) => {
     if (data) {
-      const propData = getPropData() as unknown as CycleSubItemT;
-      const sub = propData?.cycle_sub?.find((v) => v.sub_id === (props.subId || propData.sub_id)) || {} as unknown as CycleSubItemT;
+      const propData = getPropData() as unknown as MeetingItemT;
+      const sub = propData?.cycle_sub?.find((v) => v.sub_id === (props.subId)) || {} as unknown as CycleSubItemT;
       const { mid, date, start, end, sub_id } = sub;
       Object.assign(
         form.value,
         propData,
-        props.isSub
+        isSub.value
           ? {
             is_cycle: false,
             mid,
@@ -368,12 +376,12 @@ const changeIntervalType = () => {
 };
 
 const changeIsCycle = () => {
-  form.value.platform = 'WELINK';
+  form.value.platform = typeOptions.value.find(v => (v.value as unknown as string).toLowerCase() === 'welink')?.value as unknown as string || 'WeLink';
 };
 
 const { lePadV } = useScreen();
 const confirm = async () => {
-  let type = props.isEdit ? t('meeting.editSuccess') : t('meeting.booSuccess');
+  let type = isEdit.value ? t('meeting.editSuccess') : t('meeting.booSuccess');
   try {
     loading.value = true;
     const valid = await formRef.value.validate();
@@ -431,8 +439,8 @@ const confirm = async () => {
         end,
       };
     }
-    if (props.isEdit) {
-      if (props.isSub) {
+    if (isEdit.value) {
+      if (isSub.value) {
         const { mid, sub_id } = form.value;
         const { date, start, end } = params;
         flag = await props?.editSubMeetingRequest(sub_id, {
@@ -482,7 +490,7 @@ onMounted(() => {
 
 const changeSig = (sig: any) => {
   const find = sigOptions.value.find((v) => v.value === sig);
-  if (!props.isEdit) {
+  if (!isEdit.value) {
     form.value.etherpad = find?.etherpad || '';
     form.value.email_list = find?.email_list || '';
   }

package/src/components/meeting/components/OMeetingCalendarList.vue

@@ -90,7 +90,11 @@ const computedList = computed<any[]>(() => {
           dateRange = `${ formatDate(v.start_date) } ${ v.start }-${ formatDate(v.end_date) } ${ v.end }`;
         }
       } else {
-        dateRange = `${ formatDate(v.start_date, 'YYYY/MM/DD') } ${ formatDate(v.end_date, 'YYYY/MM/DD') }`;
+        if (v.start_date === v.end_date) {
+          dateRange = formatDate(v.start_date, 'YYYY/MM/DD');
+        } else {
+          dateRange = `${ formatDate(v.start_date, 'YYYY/MM/DD') }-${ formatDate(v.end_date, 'YYYY/MM/DD') }`;
+        }
       }
 
       return {

package/src/components/meeting/types.ts

@@ -37,7 +37,7 @@ export interface OptionItemT {
 }
 
 
-export type PlatformT = 'welink' | 'tencent' | 'zoom' | 'WELINK' | 'TENCENT' | 'ZOOM';
+export type PlatformT = 'welink' | 'tencent' | 'zoom' | 'WELINK' | 'TENCENT' | 'ZOOM' | 'WeLink' | 'Tencent';
 
 export enum MeetingGroupType {
   SIG = 'sig',
@@ -63,7 +63,7 @@ export interface MeetingPostT {
   topic: string; // 会议主题 128
   sponsor?: string; // 会议发起人 20
   group_name: string; // 所属SIG 64
-  platform: PlatformT; // 会议平台
+  platform: PlatformT | string; // 会议平台
   date: string; // 会议日期
   date_range?: string[]; // 日期返回
   time: string; // 会议时间
@@ -88,8 +88,6 @@ export interface MeetingPostT {
 
 export interface MeetingFormPropsT {
   data?: MeetingItemT;
-  isSub?: boolean;
-  isEdit?: boolean;
   subId?: string;
   createMeetingRequest: any,
   editMeetingRequest: any;