@opendesign-plus/components 0.0.1-rc.18 → 0.0.1-rc.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opendesign-plus/components",
-  "version": "0.0.1-rc.18",
+  "version": "0.0.1-rc.19",
   "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/OHeaderUser.vue

@@ -31,6 +31,7 @@ interface UserPropsT {
   noticeTotal?: number;
   userInfo?: UserInfoT;
   options?: OptionsItemT[];
+  customSize?: number;
 }
 
 withDefaults(defineProps<UserPropsT>(), {
@@ -39,6 +40,7 @@ withDefaults(defineProps<UserPropsT>(), {
   noticeTotal: undefined,
   userInfo: undefined,
   options: undefined,
+  customSize: undefined,
 });
 
 export interface OHeaderUserEmitsT {
@@ -79,7 +81,7 @@ const jumpToPage = (val: any) => {
         >
           <div class="info-wrap hover-icon-rotate">
             <OBadge :value="noticeTotal" :dot="true" color="danger" class="header-message user-avatar" :class="{ 'notice-not': !noticeTotal }">
-              <AppAvatar :avatar="userInfo.photo" :name="userInfo.username" :custom-size="20" />
+              <AppAvatar :avatar="userInfo.photo" :name="userInfo.username" :custom-size="customSize" />
             </OBadge>
             <p class="user-account">{{ userInfo.username }}</p>
             <OIcon class="icon">
@@ -194,7 +196,7 @@ const jumpToPage = (val: any) => {
 
 <style lang="scss">
 .user-dropdown {
-  --dropdown-list-radius: var(--o-radius-m);
+  --dropdown-list-radius: var(--o-radius-xs);
 }
 .avatar-icon {
   font-size: 24px;
@@ -207,8 +209,6 @@ const jumpToPage = (val: any) => {
 }
 @include respond-to('<=pad_v') {
   .user-dropdown {
-    --dropdown-list-radius: 8px;
-
     .o-divider {
       display: none;
     }

package/src/components/OSourceCode.vue

@@ -38,7 +38,7 @@ const visibleChange = (val: boolean) => {
 
 <template>
   <div class="source-code">
-    <div v-if="url" class="info-wrap">
+    <div v-if="url" class="info-wrap" @click="itemChange({ url: url })">
       <span class="title">{{ title }}</span>
       <OIcon v-if="icon">
         <component :is="icon" class="icon" />

package/src/components/activity/OActivityApproval.vue

@@ -39,7 +39,7 @@ const params = reactive<ReviewParamsT>({
 });
 
 // -------------------- 申请人 --------------------
-const applicantValue = ref('');
+const applicantValue = ref<string[]>([]);
 const applicantOptions = computed(() => props.applicantList.map(v => ({ value: v, label: v })));
 
 const filterApplicantList = () => {
@@ -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/activity/composables/useActivityConfig.ts

@@ -1,141 +1,141 @@
-import { computed } from 'vue';
-import { useI18n } from '@/i18n';
-
-export const useActivityConfig = () => {
-  const { t } = useI18n();
-
-  const activityTypeMap = computed(() => new Map([
-    [
-      1,
-      {
-        label: t('meeting.offline'),
-        value: 1,
-      },
-    ],
-    [
-      2,
-      {
-        label: t('meeting.online'),
-        value: 2,
-      },
-    ],
-    [
-      3,
-      {
-        label: t('meeting.onlineOffline'),
-        value: 3,
-      },
-    ],
-  ]));
-
-  const statusMap = computed(() => new Map([
-    [
-      1,
-      {
-        id: 'draft',
-        label: t('meeting.statusDraft'),
-        text: t('meeting.statusDraft'),
-        value: 1,
-      },
-    ],
-    [
-      2,
-      {
-        id: 'under-review',
-        label: t('meeting.statusUnderReview'),
-        text: t('meeting.statusPending'),
-        value: 2,
-      },
-    ],
-    [
-      3,
-      {
-        id: 'registration',
-        label: t('meeting.statusRegistering'),
-        text: t('meeting.statusApproved'),
-        value: 3,
-      },
-    ],
-    [
-      4,
-      {
-        id: 'in-progress',
-        label: t('meeting.statusInProgress'),
-        text: t('meeting.statusApproved'),
-        value: 4,
-      },
-    ],
-    [
-      5,
-      {
-        id: 'ended',
-        label: t('meeting.statusEnded'),
-        text: t('meeting.statusEnded'),
-        value: 5,
-      },
-    ],
-    [
-      6,
-      {
-        id: 'modified',
-        label: t('meeting.statusModified'),
-        text: t('meeting.statusModified'),
-        value: 6,
-      },
-    ],
-    [
-      7,
-      {
-        id: 'reject',
-        label: t('meeting.statusRejected'),
-        text: t('meeting.statusRejected'),
-        value: 7,
-      },
-    ],
-  ]));
-
-  const approvalStatusMap = computed(() => new Map([
-    [
-      'all',
-      {
-        label: t('common.all'),
-        value: 'all',
-      },
-    ],
-    [
-      'rejected',
-      {
-        label: t('meeting.statusRejected'),
-        value: 'rejected',
-      },
-    ],
-    [
-      'approved',
-      {
-        label: t('meeting.statusApproved'),
-        value: 'approved',
-      },
-    ],
-    [
-      'publish',
-      {
-        label: t('meeting.statusPending'),
-        value: 'publish',
-      },
-    ],
-    [
-      'cancel',
-      {
-        label: t('meeting.statusCanceled'),
-        value: 'cancel',
-      },
-    ],
-  ]));
-
-  return {
-    t,
-    activityTypeMap,
-    statusMap,
-    approvalStatusMap,
-  };
+import { computed } from 'vue';
+import { useI18n } from '@/i18n';
+
+export const useActivityConfig = () => {
+  const { t } = useI18n();
+
+  const activityTypeMap = computed(() => new Map([
+    [
+      1,
+      {
+        label: t('meeting.offline'),
+        value: 1,
+      },
+    ],
+    [
+      2,
+      {
+        label: t('meeting.online'),
+        value: 2,
+      },
+    ],
+    [
+      3,
+      {
+        label: t('meeting.onlineOffline'),
+        value: 3,
+      },
+    ],
+  ]));
+
+  const statusMap = computed(() => new Map([
+    [
+      1,
+      {
+        id: 'draft',
+        label: t('meeting.statusDraft'),
+        text: t('meeting.statusDraft'),
+        value: 1,
+      },
+    ],
+    [
+      2,
+      {
+        id: 'under-review',
+        label: t('meeting.statusUnderReview'),
+        text: t('meeting.statusPending'),
+        value: 2,
+      },
+    ],
+    [
+      3,
+      {
+        id: 'registration',
+        label: t('meeting.statusRegistering'),
+        text: t('meeting.statusApproved'),
+        value: 3,
+      },
+    ],
+    [
+      4,
+      {
+        id: 'in-progress',
+        label: t('meeting.statusInProgress'),
+        text: t('meeting.statusApproved'),
+        value: 4,
+      },
+    ],
+    [
+      5,
+      {
+        id: 'ended',
+        label: t('meeting.statusEnded'),
+        text: t('meeting.statusEnded'),
+        value: 5,
+      },
+    ],
+    [
+      6,
+      {
+        id: 'modified',
+        label: t('meeting.statusModified'),
+        text: t('meeting.statusModified'),
+        value: 6,
+      },
+    ],
+    [
+      7,
+      {
+        id: 'reject',
+        label: t('meeting.statusRejected'),
+        text: t('meeting.statusRejected'),
+        value: 7,
+      },
+    ],
+  ]));
+
+  const approvalStatusMap = computed(() => new Map([
+    [
+      'all',
+      {
+        label: t('common.all'),
+        value: 'all',
+      },
+    ],
+    [
+      'rejected',
+      {
+        label: t('meeting.statusRejected'),
+        value: 'rejected',
+      },
+    ],
+    [
+      'approved',
+      {
+        label: t('meeting.statusApproved'),
+        value: 'approved',
+      },
+    ],
+    [
+      'publish',
+      {
+        label: t('meeting.statusPending'),
+        value: 'publish',
+      },
+    ],
+    [
+      'cancel',
+      {
+        label: t('meeting.statusCanceled'),
+        value: 'cancel',
+      },
+    ],
+  ]));
+
+  return {
+    t,
+    activityTypeMap,
+    statusMap,
+    approvalStatusMap,
+  };
 };

package/src/components/events/OEventsApply.vue

@@ -121,8 +121,7 @@ defineProps<EventsApplyPropsT>();
     @include respond-to('<=pad_v') {
       grid-template-columns: auto 1fr; // 第1列自适应，第2列占满
       grid-template-rows: auto; // 行数自动
-      gap: 0 var(--o-gap-3); // 列间距12px，行间距0
-      row-gap: var(--o-gap-6); // 行间距
+      gap: var(--o-gap-3); // 列间距12px，行间距12px
     }
 
     .step-item {

package/src/components/events/OEventsCalendar.vue

@@ -271,9 +271,13 @@ const getIcon = (item: CalendarItemT) => {
       .o-collapse-item-header {
         padding: var(--o-gap-4) var(--o-gap-6);
         align-items: center;
+        @include respond-to('<=pad_v') {
+          padding: var(--o-gap-2) var(--o-gap-3);
+        }
 
         .o-collapse-item-title {
           flex: 1;
+          margin-bottom: 0;
         }
       }
 
@@ -313,6 +317,9 @@ const getIcon = (item: CalendarItemT) => {
         justify-content: center;
         margin-right: var(--o-gap-4);
         background-color: rgb(var(--bg-color));
+        @include respond-to('<=pad_v') {
+          margin-right: var(--o-gap-2);
+        }
       }
 
       .o-icon {
@@ -542,6 +549,9 @@ const getIcon = (item: CalendarItemT) => {
         color: var(--o-color-info2);
         font-weight: 400;
         @include tip1;
+        @include respond-to('<=pad_v') {
+          @include text2;
+        }
       }
 
       .event-item {

package/src/components/header/OHeader.vue

@@ -4,7 +4,8 @@ import { ref } from 'vue';
 import ContentWrapper from '../common/ContentWrapper.vue';
 import HeaderNav from './components/HeaderNav.vue';
 import HeaderContent from './components/HeaderContent.vue';
-import HeaderUbmcNav from './components/HeaderUbmcNav.vue';
+
+import { type NavT } from './types.ts';
 
 import { useTheme } from '@opendesign-plus/composables';
 
@@ -17,16 +18,7 @@ export interface OHeaderT {
 
 const emit = defineEmits<OHeaderT>();
 
-const props = defineProps({
-  logo: undefined,
-  lang: undefined,
-  community: undefined,
-  navData: undefined,
-  bgLeft: undefined,
-  bgRight: undefined,
-  tagMap: undefined,
-  activeIndex: undefined,
-});
+const props = defineProps<NavT>();
 
 const hoverIndex = ref();
 const hoverId = ref();
@@ -69,7 +61,7 @@ const handleMouseleaveSub = (val: string) => {
           </slot>
         </div>
         <!-- nav -->
-        <div v-if="props.community !== 'openUBMC'" class="header-nav">
+        <div class="header-nav">
           <slot name="nav">
             <HeaderNav
               v-if="props.navData"
@@ -82,19 +74,13 @@ const handleMouseleaveSub = (val: string) => {
             ></HeaderNav>
           </slot>
         </div>
-        <!-- openUBMC nav -->
-        <div v-if="props.community === 'openUBMC'" class="header-nav-openubmc">
-          <slot name="nav">
-            <HeaderUbmcNav v-if="props.navData" :nav-data="props.navData" :has-perm="true" :tag-map="props.tagMap" />
-          </slot>
-        </div>
         <!-- toolbar -->
         <div v-if="$slots.toolbar" class="header-toolbar">
           <slot name="toolbar"></slot>
         </div>
       </ContentWrapper>
     </div>
-    <div v-if="props.community !== 'openUBMC'" class="header-nav-content">
+    <div class="header-nav-content">
       <HeaderContent
         :itemData="itemData"
         :item-visible="itemVisible"
@@ -147,13 +133,9 @@ const handleMouseleaveSub = (val: string) => {
   overflow: hidden;
   position: relative;
 }
-.header-nav-openubmc {
-  flex: 1;
-  height: 100%;
-  min-width: 0;
-}
 .header-toolbar {
   height: 100%;
+  position: relative;
 }
 .header-nav-content {
   position: fixed;