@opendesign-plus-test/components 0.0.1-rc.29 → 0.0.1-rc.30

package/package.json

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

package/src/components/activity/OActivityForm.vue

@@ -183,7 +183,7 @@ const rules = ref<Record<string, RulesT[]>>({
   }],
   email_list: [{
     validator: (value: string) => {
-      const str = value.replaceAll(' ', '') || '';
+      const str = value.replaceAll(' ', '').replaceAll(',', ';') || '';
       if (str.length) {
         if (str.length > 1020) {
           return {

package/src/components/activity/OMyActivityCalendar.vue

@@ -866,22 +866,23 @@ const deleteActions = computed<DialogActionT[]>(() => {
       .el-calendar__body {
         .el-calendar-table {
           width: 100%;
-          tr {
-            background-color: color-mix(in srgb, var(--o-color-control2-light), transparent 60%) !important;
-          }
 
           th {
             text-align: center;
-            background-color: color-mix(in srgb, var(--o-color-control2-light), transparent 60%) !important;
             border: none;
+            --o-color-control3-light: transparent;
+          }
+
+          tr {
+            --o-color-fill2: transparent;
           }
 
           td {
-            background-color: color-mix(in srgb, var(--o-color-control2-light), transparent 60%) !important;
             border: none;
             text-align: center;
             transition: none;
             padding: 0;
+            background-color: transparent !important;
 
             .el-calendar-day {
               padding: 0;
@@ -1251,7 +1252,6 @@ const deleteActions = computed<DialogActionT[]>(() => {
             align-items: flex-start;
             gap: var(--o-gap-3);
             width: 100%;
-            margin-bottom: var(--o-gap-2);
             @include respond-to('phone') {
               flex-grow: 1;
               width: 100%;
@@ -1359,6 +1359,7 @@ const deleteActions = computed<DialogActionT[]>(() => {
             align-items: center;
             padding-left: calc(var(--o-gap-3) + var(--icon-size));
             gap: var(--o-gap-4);
+            margin-top: var(--o-gap-2);
             width: 100%;
 
             .o-link {

package/src/components/activity/config.ts

@@ -102,14 +102,14 @@ export const approvalStatusMap = new Map([
   [
     'rejected',
     {
-      label: '审核驳回',
+      label: '已驳回',
       value: 'rejected',
     },
   ],
   [
     'approved',
     {
-      label: '审核通过',
+      label: '已通过',
       value: 'approved',
     },
   ],

package/src/components/meeting/OMeetingCalendar.vue

@@ -90,6 +90,8 @@ const getActivityData = async (date) => {
       return {
         ...v,
         type: 'activity',
+        start_date_time: `${ formatDate(v.start_date) } ${ v.start }`,
+        end_date_time: `${ formatDate(v.end_date) } ${ v.end }`,
       };
     });
   } else {
@@ -144,12 +146,11 @@ const paramGetDaysData = async (params: { date: string; type: string }) => {
   }
 };
 
-
 const renderData = computed(() => {
   return [
     ...meetingData.value.filter((v) => !sig.value || v.group_name === sig.value),
-    ...eventsData.value.filter(v => v.dates.includes(currentDay.value)),
-    ...summitData.value.filter(v => v.dates.includes(currentDay.value)),
+    ...eventsData.value.filter(v => (!dayjs(v.start_date).isAfter(dayjs(currentDay.value)) && !dayjs(currentDay.value).isAfter(dayjs(v.end_date))) || v.dates?.includes(currentDay.value)),
+    ...summitData.value.filter(v => v.dates?.includes(currentDay.value)),
   ].filter((v) => {
     if (tabType.value === 'all') {
       return true;

package/src/components/meeting/OMeetingForm.vue

@@ -200,7 +200,7 @@ const rules = computed(() => {
           if (props.isEdit) {
             return {};
           }
-          const str = value.replaceAll(' ', '') || '';
+          const str = value.replaceAll(' ', '').replaceAll(',', ';') || '';
           if (str.length) {
             if (str.length > 1020) {
               return {

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

@@ -15,6 +15,7 @@ import { CYCLE_TYPE_OPTIONS, INTERVAL_DAY, INTERVAL_MONTH, INTERVAL_WEEK } from
 
 import { formatDate, getConfig, getPointStr } from '../utils.ts';
 import { useI18n } from '@/i18n';
+import { acticityTypeMap } from '@/components/activity/config.ts';
 
 const props = withDefaults(defineProps<{
   list: MeetingItemT[];
@@ -42,6 +43,7 @@ const i18n = computed(() => {
     LEARN_MORE: t('common.seeMore'),
     JOIN_MEETING: t('meeting.joinMeeting'),
     SIGN: t('meeting.sign'),
+    DETAILS: t('meeting.detail'),
   };
 });
 
@@ -83,6 +85,21 @@ const computedList = computed(() => {
   return props.list.map((v) => {
     const type = v.type;
     let dateRange = '';
+    if (['activity'].includes(type)) {
+      let activity_type = acticityTypeMap.get(v.activity_type)?.label;
+      if (v.end_date === v.start_date) {
+        return {
+          ...v,
+          activity_type,
+          dateRange: `${ formatDate(v.start_date) } ${ v.start }-${ v.end }`,
+        };
+      }
+      return {
+        ...v,
+        activity_type,
+        dateRange: `${ formatDate(v.start_date) } ${ v.start }-${ formatDate(v.end_date) } ${ v.end }`,
+      };
+    }
     if (['events', 'summit'].includes(type)) {
       dateRange = `${ formatDate(v.start_date, 'YYYY/MM/DD HH:mm') } ${ formatDate(v.end_date, 'YYYY/MM/DD HH:mm') }`;
       return {
@@ -168,7 +185,7 @@ const computedList = computed(() => {
               <component :is="getConfig(item.type, 'icon')" />
             </OIcon>
             <div class="text">
-              {{ item.topic || item.name }}
+              {{ item.topic || item.name || item.title }}
             </div>
             <div class="tag-wrapper" v-if="item.is_cycle">
               <OTag color="primary" variant="outline">{{ t('meeting.cycle') }}</OTag>
@@ -200,7 +217,15 @@ const computedList = computed(() => {
               </OIcon>
             </template>
           </OLink>
-          <OLink v-if="item.signUrl" :href="item.signUrl" target="_blank" class="jump-detail-link">
+          <OLink v-if="item.content_url" :href="item.content_url" target="_blank" class="jump-detail-link">
+            <span>{{ i18n.DETAILS }}</span>
+            <template #suffix>
+              <OIcon>
+                <IconChevronRight />
+              </OIcon>
+            </template>
+          </OLink>
+          <OLink v-if="item.register_url" :href="item.register_url" target="_blank" class="jump-detail-link">
             <span>{{ i18n.SIGN }}</span>
             <template #suffix>
               <OIcon>
@@ -324,12 +349,44 @@ const computedList = computed(() => {
     }
 
     .o-collapse-item-body {
-      background-color: color-mix(in srgb, var(--o-color-control2-light), transparent 60%);
       margin-bottom: 0;
+      padding: 0 12px 16px 12px;
 
       a {
         word-break: break-all;
       }
+
+      .calendar-info {
+        display: flex;
+        color: var(--o-color-info3);
+        flex-direction: column;
+        background-color: color-mix(in srgb, var(--o-color-control2-light), transparent 60%);
+        padding: 16px 16px 16px calc(var(--icon-right) + var(--icon-size2) + var(--o-gap-5) - 12px);
+        border-radius: var(--o-radius-xs);
+        @include tip1;
+
+        @include respond-to('<=pad_v') {
+          padding: 16px 16px 16px calc(var(--icon-right) + var(--icon-size2) + 16px - 12px);
+
+        }
+        @include respond-to('phone') {
+          padding: 12px 16px;
+        }
+
+        .info-item {
+          display: flex;
+          margin-top: 8px;
+
+          .item-title {
+            min-width: 110px;
+          }
+        }
+
+        .info-item:first-child {
+          margin-top: 0;
+        }
+      }
+
     }
 
     .jump-detail-link {
@@ -436,34 +493,6 @@ const computedList = computed(() => {
       }
     }
 
-    .calendar-info {
-      display: flex;
-      color: var(--o-color-info3);
-      flex-direction: column;
-      padding: 16px 16px 16px calc(var(--icon-right) + var(--icon-size2) + var(--o-gap-5));
-      @include tip1;
-
-      @include respond-to('<=pad_v') {
-        padding: 16px 16px 16px calc(var(--icon-right) + var(--icon-size2) + 16px);
-
-      }
-      @include respond-to('phone') {
-        padding: 12px 16px;
-      }
-
-      .info-item {
-        display: flex;
-        margin-top: 8px;
-
-        .item-title {
-          min-width: 110px;
-        }
-      }
-
-      .info-item:first-child {
-        margin-top: 0;
-      }
-    }
   }
 }
 

package/src/components/meeting/components/OMeetingDetail.vue

@@ -33,8 +33,8 @@ const activityInfoList = computed(() =>
     { label: '起始日期', key: 'start_date_time' },
     { label: '结束日期', key: 'end_date_time' },
     { label: '报名截止时间', key: 'register_end_date' },
-    { label: '活动详情地址', key: 'content_url', isLink: true },
     { label: '活动地点', key: 'address' },
+    { label: '活动详情地址', key: 'content_url', isLink: true },
     { label: '活动审批人', key: 'approver' },
     { label: '审核备注', key: 'approve_record', isRecord: true },
   ].slice(0, props.from === 'home' ? 4 : 7),
@@ -92,7 +92,7 @@ defineExpose({ copyInfo });
       }"
     >
       <template v-if="data[info.key] && !info.isRecord">
-        <span class="label">{{ info.label }}<i>{{ isZh ? '：' : ':' }}</i></span>
+        <span class="label">{{ info.label }}</span>
         <MoreText :show="show" v-if="info.ellipsis" :text="data[info.key] || '-'" />
         <OLink
           v-else-if="info.isLink"
@@ -111,7 +111,7 @@ defineExpose({ copyInfo });
         </span>
       </template>
       <template v-if="info.isRecord && data[info.key]?.length">
-        <span class="label">{{ info.label }}{{ isZh ? '：' : ':' }}</span>
+        <span class="label">{{ info.label }}</span>
         <div>
           <p v-for="re in data[info.key]" :key="re.create_time" class="value">
             {{ re.reason }}&nbsp;&nbsp;

package/src/i18n/en.ts

@@ -49,6 +49,7 @@ export default {
   'meeting.cycle': 'Recurrence',
   'meeting.joinMeeting': 'Join',
   'meeting.sign': 'Sign Up',
+  'meeting.detail': 'View Details',
   'meeting.meetingSummary': 'Minutes',
   'meeting.viewRecord': 'Playback',
   'meeting.editMeeting': 'Modify',

package/src/i18n/zh.ts

@@ -49,6 +49,7 @@ export default {
   'meeting.cycle': '周期',
   'meeting.joinMeeting': '加入会议',
   'meeting.sign': '我要报名',
+  'meeting.detail': '查看详情',
   'meeting.meetingSummary': '会议纪要',
   'meeting.viewRecord': '查看回放',
   'meeting.editMeeting': '修改会议',