@opendesign-plus-test/components 0.0.1-rc.31 → 0.0.1-rc.33

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opendesign-plus-test/components",
-  "version": "0.0.1-rc.31",
+  "version": "0.0.1-rc.33",
   "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/styles": "0.0.1-rc.2",
-    "@opendesign-plus/composables": "0.0.1-rc.6"
+    "@opendesign-plus/composables": "0.0.1-rc.6",
+    "@opendesign-plus/styles": "0.0.1-rc.2"
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "^5.1.0",

package/src/components/activity/OActivityApproval.vue

@@ -2,10 +2,9 @@
 import { ElTable, ElTableColumn, dayjs } from 'element-plus';
 import {
   DialogActionT,
-  OButton,
-  OCollapse, OCollapseItem,
+  OCollapse,
+  OCollapseItem,
   ODialog,
-  ODivider,
   OForm,
   OFormItem, OLink,
   OPagination,
@@ -76,8 +75,10 @@ const COUNT_PER_PAGE = [10, 20, 30, 40];
 const getData = async () => {
   const { page, size, status, sponsor, order_by, search, is_delete } = params;
   let paramsData = { page, size, sponsor, order_by, search } as ReviewParamsT;
-  if (status === 'cancel') {
+  if (status !== 'all') {
     paramsData.is_delete = is_delete;
+  }
+  if (status === 'cancel') {
     paramsData.status = '';
   } else {
     paramsData.status = status;
@@ -557,7 +558,7 @@ const reviewActions = computed<DialogActionT[]>(() => {
     >
       <template #header>{{ cancelTitle }}</template>
       <div class="dialog-content">
-        是否确认{{ cancelText }}“{{ currentRow?.title }}”活动？{{ cancelText }}后将不在会议首页呈现，且已报名的数据也会被清空，请谨慎操作。
+        是否确认{{ cancelText }}“{{ currentRow?.title }}”活动？{{ cancelText }}后将不在会议首页呈现。
       </div>
     </ODialog>
   </div>

package/src/components/activity/OMyActivityCalendar.vue

@@ -20,6 +20,7 @@ import { ElCalendar } from 'element-plus';
 import dayjs from 'dayjs';
 import { useDebounceFn } from '@vueuse/core';
 
+import IconCopy from '~icons/meeting/icon-copy.svg';
 import IconEvent from '~icons/meeting/icon-event.svg';
 
 import type { ActivityItemT, MyActivityCalendarPropsT, ParamsItemT } from './types';
@@ -511,7 +512,7 @@ const deleteActions = computed<DialogActionT[]>(() => {
         </span>
       </div>
       <div class="left-calendar">
-        <ElCalendar ref="calendarRef">
+        <ElCalendar ref="calendarRef" v-model="selectedDate">
           <template #header>
             <span>{{ (selectedDate ? dayjs(new Date(selectedDate)) : dayjs()).format('YYYY MM月') }}</span>
             <div>
@@ -620,7 +621,8 @@ const deleteActions = computed<DialogActionT[]>(() => {
                           </div>
                         </div>
                       </div>
-                      <div class="item-header-right" v-if="!row.is_delete && [3,4,5,6].includes(row.status)">
+                      <div class="item-header-right"
+                           v-if="row.content_url && !row.is_delete && [3,4,5,6].includes(row.status)">
                         <OLink v-if="row.content_url" :href="row.content_url" target="_blank" rel="noopener noreferrer">
                           活动详情
                           <template #suffix>
@@ -631,9 +633,10 @@ const deleteActions = computed<DialogActionT[]>(() => {
                         </OLink>
                         <OLink
                           v-if="
+                          row.register_url && (
                             row.status === 3 ||
                             row.status === 4 ||
-                            (row.status === 2 && row.update_activity_id && new Date(row.register_end_date).getTime() > new Date().getTime())
+                            (row.status === 2 && row.update_activity_id && new Date(row.register_end_date).getTime() > new Date().getTime()))
                           "
                           :href="row.register_url"
                           target="_blank"
@@ -647,6 +650,9 @@ const deleteActions = computed<DialogActionT[]>(() => {
                           </template>
                         </OLink>
                       </div>
+                      <OIcon @click.stop="() => copyInfo(rowIdx)" class="copy-icon">
+                        <IconCopy />
+                      </OIcon>
                     </template>
                     <div class="activity-detail">
                       <OMeetingDetail
@@ -755,6 +761,7 @@ const deleteActions = computed<DialogActionT[]>(() => {
       gap: var(--o-gap-3);
       --phone-padding-top: calc(var(--o-gap-5) + var(--o-gap-3) + var(--o-gap-3));
     }
+
     .o-loading {
       .o-layer-mask {
         background-color: transparent;
@@ -832,6 +839,7 @@ const deleteActions = computed<DialogActionT[]>(() => {
     @include respond-to('phone') {
       display: none;
     }
+
     .el-calendar {
       min-height: 460px;
       height: calc(100% - 54px);
@@ -1002,6 +1010,7 @@ const deleteActions = computed<DialogActionT[]>(() => {
     .o-scroller {
       .o-scrollbar-rail {
         right: -16px;
+        height: 100%;
       }
     }
 
@@ -1222,6 +1231,7 @@ const deleteActions = computed<DialogActionT[]>(() => {
         display: flex;
         align-items: center;
         gap: var(--o-gap-4);
+        position: relative;
 
         .o-collapse-item-icon {
           position: relative;
@@ -1246,6 +1256,7 @@ const deleteActions = computed<DialogActionT[]>(() => {
           flex-direction: column;
           align-items: flex-start;
           justify-content: space-between;
+          margin-bottom: 0;
 
           .item-header-left {
             display: flex;
@@ -1299,6 +1310,7 @@ const deleteActions = computed<DialogActionT[]>(() => {
                   max-width: 100%;
                   @include text-truncate(1);
                 }
+
                 .o-tag {
                   margin-left: 8px;
                   --tag-radius: 4px;
@@ -1322,6 +1334,7 @@ const deleteActions = computed<DialogActionT[]>(() => {
                   }
 
                   &.tag-draft,
+                  &.tag-delete,
                   &.tag-cancel {
                     --tag-color: var(--o-color-info3);
                     --tag-bg-color: var(--o-color-control1-light);

package/src/components/meeting/OMeetingCalendar.vue

@@ -67,6 +67,7 @@ const calendar = ref();
 const calendarHeight = ref<string>('407px');
 const isLimit = ref(false);
 const currentDay = ref('');
+const isAutoClick = ref(false);
 // sig组列表
 const sig = ref('');
 const sigOptions = ref<GroupItemT[]>([]);
@@ -162,6 +163,7 @@ const renderData = computed(() => {
 
 const getDateData = async (day?: string) => {
   const date = dayjs(day).format('YYYY-MM-DD');
+  currentDay.value = date;
   getSummitData(date);
   getActivityData(date);
   getDateList(date);
@@ -184,7 +186,6 @@ const getDateData = async (day?: string) => {
     date: date,
     type: tabType.value,
   });
-  currentDay.value = date;
 };
 
 watch([() => tabType.value, () => tabs.value], () => {
@@ -202,6 +203,10 @@ function selectTab() {
 }
 
 const changeMeetingDay = useDebounceFn((day: string, event?: Event) => {
+  if (isAutoClick.value) {
+    isAutoClick.value = false;
+    return;
+  }
   if (new Date(day).getTime() / 1000 < 1610380800) {
     event?.stopPropagation();
     return;
@@ -217,7 +222,7 @@ const selectDate = (val: string, date: string) => {
   }
   isLimit.value = false;
   calendar.value.selectDate(val);
-  changeMeetingDay(calendar.value.selectedDay);
+  changeMeetingDay(formatDate(calendar.value.selectedDay));
 };
 
 const removeLeadingZero = (str: string) => {
@@ -249,10 +254,11 @@ onMounted(() => {
 const stopWatchData = watch(
   () => allDates.value.length,
   () => {
-    if (isClient) {
+    if (isClient && !currentDay.value) {
       nextTick(() => {
         const activeBoxes = document.querySelector('.is-today .out-box') as HTMLElement;
         if (activeBoxes) {
+          isAutoClick.value = true;
           activeBoxes.click();
           stopWatchData();
         }

package/src/components/meeting/OMeetingForm.vue

@@ -683,7 +683,7 @@ defineExpose({
     </OForm>
     <div class="form-btns" v-if="showBtns">
       <OButton color="primary" variant="solid" size="large" @click="confirm" :loading="loading">
-        {{ isEdit ? t('common.save') : t('meeting.book') }}
+        {{ isEdit ? t('common.save') : (bookText || t('meeting.book')) }}
       </OButton>
       <OButton color="primary" variant="outline" size="large" @click="cancel">{{ t('common.cancel') }}</OButton>
     </div>

package/src/components/meeting/OMyMeetingCalendar.vue

@@ -903,12 +903,16 @@ const cancelActions = computed<DialogActionT[]>(() => {
 
             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;
+              background-color: transparent !important;
               border: none;
               text-align: center;
               transition: none;
@@ -1026,9 +1030,6 @@ const cancelActions = computed<DialogActionT[]>(() => {
       .o-scroller {
         .o-scrollbar-rail {
           right: -16px;
-        }
-
-        .o-scrollbar {
           height: 100%;
         }
       }
@@ -1266,8 +1267,8 @@ const cancelActions = computed<DialogActionT[]>(() => {
               width: 20px;
               height: 20px;
               font-size: 20px;
-              bottom: var(--o-gap-2);
-              top: revert;
+              top: 50%;
+              transform: translateY(-50%);
             }
           }
 
@@ -1278,6 +1279,7 @@ const cancelActions = computed<DialogActionT[]>(() => {
             flex-direction: column;
             align-items: flex-start;
             justify-content: space-between;
+            margin-bottom: 0;
             .item-header-left {
               display: flex;
               align-items: flex-start;
@@ -1349,6 +1351,7 @@ const cancelActions = computed<DialogActionT[]>(() => {
                   color: var(--o-color-info3);
                   display: flex;
                   align-items: center;
+                  font-weight: 400;
                   @include tip1;
 
                   span:last-child {
@@ -1387,8 +1390,6 @@ const cancelActions = computed<DialogActionT[]>(() => {
               display: var(--copy-display);
               @include respond-to('phone') {
                 bottom: var(--o-gap-2);
-                transform: revert;
-                top: revert;
                 right: calc(20px + var(--o-gap-2))
               }
 

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

@@ -289,6 +289,10 @@ const computedList = computed(() => {
         background-color: var(--collapse-division-color);
       }
 
+      &:last-child::after {
+        display: none;
+      }
+
       @include hover {
         .text {
           color: var(--o-color-primary1);

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

@@ -137,7 +137,7 @@ defineExpose({ copyInfo });
 
     @include respond-to('phone') {
       font-size: 12px;
-      gap: var(--o-gap-1);
+      gap: var(--o-gap-2);
     }
 
     &:not(.is-empty) {

package/src/components/meeting/config.ts

@@ -7,11 +7,22 @@ import { CalendarDataType, meetingTabT } from './types.ts';
 
 const { t } = useI18n();
 
+const getMeetingColor = () => {
+  if (typeof document !== 'undefined') {
+    const deepBlue = getComputedStyle(document.documentElement)
+      .getPropertyValue('--o-deep-blue-6')?.trim();
+    if (deepBlue) {
+      return 'rgba(var(--o-deep-blue-6))';
+    }
+  }
+  return 'var(--o-color-primary1)';
+};
+
 export const TYPE_COLOR_MAP = {
-  summit: 'var(--o-color-warning1)',
+  summit: 'rgba(var(--o-orange-6))',
   events: 'rgba(var(--o-cyan-6))',
-  meeting: 'var(--o-color-primary1)',
-};
+  meeting: getMeetingColor(),
+};
 export const MEETING_TABS: meetingTabT[] = [
   {
     label: t('meeting.meetingTypeAll'),

package/src/components/meeting/types.ts

@@ -93,6 +93,7 @@ export interface MeetingFormPropsT {
   getGroupsRequest: any;
   showBtns?: boolean;
   groupType: MeetingGroupType;
+  bookText?: string
 }
 
 // 会议详情