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

package/package.json

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

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';
@@ -647,6 +648,9 @@ const deleteActions = computed<DialogActionT[]>(() => {
                           </template>
                         </OLink>
                       </div>
+                      <OIcon @click.stop="() => copyInfo(rowIdx)" class="copy-icon">
+                        <IconCopy />
+                      </OIcon>
                     </template>
                     <div class="activity-detail">
                       <OMeetingDetail
@@ -1169,6 +1173,13 @@ const deleteActions = computed<DialogActionT[]>(() => {
       display: flex;
       flex-direction: column;
 
+      .o-collapse-item {
+        &.last-item {
+          .o-collapse-item-header {
+            border-bottom: none;
+          }
+        }
+      }
       .o-collapse-item-expanded + .o-collapse-item-expanded {
         margin-top: var(--o-gap-4);
       }
@@ -1322,6 +1333,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/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,7 +903,6 @@ const cancelActions = computed<DialogActionT[]>(() => {
 
             th {
               text-align: center;
-              background-color: color-mix(in srgb, var(--o-color-control2-light), transparent 60%) !important;
               border: none;
             }
 

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
 }
 
 // 会议详情