@opendesign-plus-test/components 0.0.1-rc.34 → 0.0.1-rc.36

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opendesign-plus-test/components",
-  "version": "0.0.1-rc.34",
+  "version": "0.0.1-rc.36",
   "type": "module",
   "publishConfig": {
     "access": "public",
@@ -33,7 +33,7 @@
     "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": "npm:@opendesign-plus-test/composables@0.0.1-rc.5"
   },
   "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

@@ -15,15 +15,14 @@ import {
 import { useScreen } from '@opendesign-plus/composables';
 import { onMounted, watch, ref, reactive, computed } from 'vue';
 import { ActivityItemT, ActivityTablePropsT, ReviewParamsT, TypeOptionT } from './types';
-import { getApprovalStatusMap, getStatusMap } from './config';
+import { useActivityConfig } from './composables/useActivityConfig';
 import ThFilter from '../common/ThFilter.vue';
 import OMeetingDetail from '@/components/meeting/components/OMeetingDetail.vue';
 import { useI18n } from '@/i18n';
 
 const { t, locale } = useI18n();
 const isZh = computed(() => locale.value === 'zh');
-const approvalStatusMap = getApprovalStatusMap();
-const statusMap = getStatusMap();
+const { approvalStatusMap, statusMap } = useActivityConfig();
 
 
 const message = useMessage(null);
@@ -58,7 +57,7 @@ const sortTime = () => {
 const statusValue = ref();
 const statusOptions = computed<TypeOptionT[]>(() => {
   let list: TypeOptionT[] | { label: string; value: string; }[] = [];
-  approvalStatusMap.forEach((item) => {
+  approvalStatusMap.value.forEach((item) => {
     list.push(item);
   });
   return list.slice(1);

package/src/components/activity/OActivityForm.vue

@@ -15,9 +15,10 @@ import { computed, ref, watch } from 'vue';
 import { ActivityFormPropsT, ParamsItemT } from './types';
 import { useScreen } from '@opendesign-plus/composables';
 import { dayjs, ElDatePicker } from 'element-plus';
-import { getActicityTypeMap, WEBSITE_REGEXP } from './config';
+import { WEBSITE_REGEXP } from './config';
 import { EMAIL_REGEX } from '@/components/meeting/config.ts';
 import { useI18n } from '@/i18n';
+import { useActivityConfig } from './composables/useActivityConfig';
 
 const emits = defineEmits(['confirm', 'close']);
 
@@ -25,7 +26,7 @@ const message = useMessage(null);
 const { lePadV } = useScreen();
 const { t } = useI18n();
 const $t = t;
-const acticityTypeMap = getActicityTypeMap();
+const { activityTypeMap } = useActivityConfig();
 
 interface TypeOptionT {
   label: string;
@@ -226,7 +227,7 @@ const approverList = computed(() => {
 
 const typeValue = ref<string>('');
 const typeOptions = ref<TypeOptionT[]>([]); // 活动类型
-acticityTypeMap.forEach((item) => {
+activityTypeMap.value.forEach((item) => {
   typeOptions.value.push(item);
 });
 const changeType = (val: SelectValueT) => {
@@ -279,7 +280,7 @@ watch(
         organizer,
       } as ParamsItemT;
       form.value = { ...params };
-      typeValue.value = acticityTypeMap.get(val.activity_type)?.label;
+      typeValue.value = activityTypeMap.value.get(val.activity_type)?.label;
       form.value.start_date = `${ form.value.start_date } ${ form.value.start }`;
       form.value.end_date = `${ form.value.end_date } ${ form.value.end }`;
     }
@@ -305,7 +306,7 @@ const confirm = async (val: boolean) => {
       await props.creatActivity?.(form.value);
     }
     message.success({
-      content: t('meeting.activityActionSuccess', [form.value.title, type.toLowerCase]),
+      content: t('meeting.activityActionSuccess', [form.value.title, type.toLowerCase()]),
     });
     close();
     emits('confirm');
@@ -314,7 +315,7 @@ const confirm = async (val: boolean) => {
     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]),
+      content: t('meeting.activityActionFail', [form.value.title, type.toLowerCase()]),
     });
   } finally {
     loading.value = false;

package/src/components/activity/OMyActivityCalendar.vue

@@ -26,15 +26,14 @@ import IconEvent from '~icons/meeting/icon-event.svg';
 import type { ActivityItemT, MyActivityCalendarPropsT, ParamsItemT } from './types';
 import { useScreen } from '@opendesign-plus/composables';
 import { formatDate, getDateNumber } from '../meeting/utils';
-import { getStatusMap, getActicityTypeMap } from './config';
+import { useActivityConfig } from './composables/useActivityConfig';
 import { PageParamsT } from '../meeting/types';
 import OMeetingDetail from '@/components/meeting/components/OMeetingDetail.vue';
 import { useI18n, Locales } from '@/i18n';
 
 const { t, locale } = useI18n();
 const isZh = computed(() => locale.value === Locales.ZH);
-const statusMap = getStatusMap();
-const acticityTypeMap = getActicityTypeMap();
+const { statusMap, activityTypeMap } = useActivityConfig();
 
 const formatMonthYear = (date: string | Date) => {
   const d = dayjs(date || new Date());
@@ -313,7 +312,7 @@ const confirm = () => {
     return;
   }
   dialogLoading.value = true;
-props.revokeActivityRequest(currentRow.value?.id)
+  props.revokeActivityRequest(currentRow.value?.id)
     .then(() => {
       message.success({
         content: t('meeting.revokeActivitySuccess', [currentRow.value.title]),
@@ -325,7 +324,7 @@ props.revokeActivityRequest(currentRow.value?.id)
       message.danger({
         content: t('meeting.revokeActivityFail', [currentRow.value.title]),
       });
-    })
+    })
     .finally(() => {
       revokeVisible.value = false;
       dialogLoading.value = false;
@@ -373,7 +372,7 @@ const handleSubmitReviewItem = (val: ActivityItemT) => {
     approver,
     is_publish: 'true',
   } as ParamsItemT;
-props.editActivityRequest(val.id, params)
+  props.editActivityRequest(val.id, params)
     .then(() => {
       message.success({
         content: t('meeting.submitReviewSuccess', [val.title]),
@@ -387,7 +386,7 @@ props.editActivityRequest(val.id, params)
       });
     });
 };
-// 删除活动
+// 删除活动
 const deleteVisible = ref(false);
 const handleDeleteItem = (val: ActivityItemT) => {
   currentRow.value = val;
@@ -398,7 +397,7 @@ const confirmDelete = () => {
     return;
   }
   dialogLoading.value = true;
-props.deleteActivityRequest(currentRow.value?.id)
+  props.deleteActivityRequest(currentRow.value?.id)
     .then(() => {
       message.success({
         content: t('meeting.deleteActivitySuccess', [currentRow.value.title]),
@@ -415,7 +414,7 @@ props.deleteActivityRequest(currentRow.value?.id)
       deleteVisible.value = false;
       dialogLoading.value = false;
     });
-};
+};
 const cancelDelete = () => {
   deleteVisible.value = false;
 };
@@ -628,7 +627,7 @@ const deleteActions = computed<DialogActionT[]>(() => {
                           <div class="act-info">
                             <span class="date-range">{{ row.dateRange }}</span>
                             <ODivider direction="v"></ODivider>
-                            <span>{{ acticityTypeMap.get(row.activity_type)?.label }}</span>
+                            <span>{{ activityTypeMap.get(row.activity_type)?.label }}</span>
                           </div>
                         </div>
                       </div>
@@ -720,7 +719,7 @@ const deleteActions = computed<DialogActionT[]>(() => {
       </div>
     </div>
   </div>
-<!-- 撤销审核弹窗 -->
+  <!-- 撤销审核弹窗 -->
   <ODialog v-model:visible="revokeVisible" main-class="handle-dialog-active" :actions="revokeActions">
     <template #header>{{ t('meeting.withdrawReview') }}</template>
     <div class="dialog-content">{{ t('meeting.confirmRevokeActivity', [currentRow.title]) }}</div>
@@ -730,7 +729,7 @@ const deleteActions = computed<DialogActionT[]>(() => {
     <template #header>{{ t('meeting.deleteActivity') }}</template>
     <div class="dialog-content">{{ t('meeting.confirmDeleteActivity', [currentRow.title]) }}</div>
   </ODialog>
-</template>
+</template>
 
 <style lang="scss">
 

package/src/components/activity/composables/useActivityConfig.ts

@@ -0,0 +1,143 @@
+import { computed, watch } from 'vue';
+import { useI18n } from '@/i18n';
+
+export const useActivityConfig = () => {
+  const { t, locale } = useI18n();
+  watch(() => locale.value, () => {
+    console.log(locale.value);
+  });
+  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/activity/config.ts

@@ -1,141 +1 @@
-import { useI18n } from '@/i18n';
-
-export const getActicityTypeMap = () => {
-  const { t } = useI18n();
-  return new Map([
-    [
-      1,
-      {
-        label: t('meeting.offline'),
-        value: 1,
-      },
-    ],
-    [
-      2,
-      {
-        label: t('meeting.online'),
-        value: 2,
-      },
-    ],
-    [
-      3,
-      {
-        label: t('meeting.onlineOffline'),
-        value: 3,
-      },
-    ],
-  ]);
-};
-
-export const WEBSITE_REGEXP = /^http(s)?:\/\/([\w-]+\.)+[\w-]+(\/[\w ./?%&=-]*)?$/;
-
-
-export const getStatusMap = () => {
-  const { t } = useI18n();
-  return 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,
-      },
-    ],
-  ]);
-};
-
-export const getApprovalStatusMap = () => {
-  const { t } = useI18n();
-  return 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',
-      },
-    ],
-  ]);
-};
+export const WEBSITE_REGEXP = /^http(s)?:\/\/([\w-]+\.)+[\w-]+(\/[\w ./?%&=-]*)?$/;

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;