@opendesign-plus-test/components 0.0.1-rc.42 → 0.0.1-rc.45

package/src/components/OHeaderUser.vue

@@ -169,7 +169,7 @@ const jumpToPage = (val: any) => {
   @include text-truncate(1);
 }
 
-@include respond-to('<=pad_v') {
+@include respond('<=pad_v') {
   .header-user {
     min-width: auto;
 
@@ -207,7 +207,8 @@ const jumpToPage = (val: any) => {
     color: var(--o-color-primary1);
   }
 }
-@include respond-to('<=pad_v') {
+
+@include respond('<=pad_v') {
   .user-dropdown {
     .o-divider {
       display: none;

package/src/components/OSection.vue

@@ -121,11 +121,11 @@ const props = withDefaults(defineProps<SectionPropsT>(), {
     color: var(--o-color-info2);
     @include text1;
 
-    @include respond-to('pad-laptop') {
+    @include respond('pad-laptop') {
       margin-top: 8px;
     }
 
-    @include respond-to('phone') {
+    @include respond('phone') {
       margin-top: 12px;
       text-align: center;
     }
@@ -155,11 +155,11 @@ const props = withDefaults(defineProps<SectionPropsT>(), {
       border-radius: var(--btn-height);
     }
 
-    @include respond-to('<=laptop') {
+    @include respond('<=laptop') {
       margin-top: 16px;
     }
 
-    @include respond-to('phone') {
+    @include respond('phone') {
       margin-top: 12px;
     }
 

package/src/components/OSourceCode.vue

@@ -6,28 +6,26 @@ import IconChevronDown from '~icons/components/icon-chevron-down.svg';
 
 interface CodeItemT {
   label: string;
-  url: string;
+  href: string;
   icon?: string;
+  target?: string;
 }
 
 interface CodePropsT {
   title?: string;
   options?: CodeItemT[];
-  url?: string;
+  href?: string;
+  target?: string;
   icon?: string;
   justify?: string;
 }
 
 withDefaults(defineProps<CodePropsT>(), {
-  title: undefined,
-  options: undefined,
-  url: undefined,
-  icon: undefined,
   justify: 'center',
 });
 
-const itemChange = (data: any) => {
-  window.open(data.url, '_blank');
+const itemChange = (data: Pick<CodeItemT, 'href' | 'target'>) => {
+  window.open(data.href, data.target ? data.target : '_blank');
 };
 
 const dropdownVisible = ref(false);
@@ -38,7 +36,7 @@ const visibleChange = (val: boolean) => {
 
 <template>
   <div class="source-code">
-    <div v-if="url" class="info-wrap" @click="itemChange({ url: url })">
+    <div v-if="href" class="info-wrap" @click="itemChange({ href: href, target: target })">
       <span class="title">{{ title }}</span>
       <OIcon v-if="icon">
         <component :is="icon" class="icon" />
@@ -57,7 +55,7 @@ const visibleChange = (val: boolean) => {
         <OIcon class="icon"><IconChevronDown /></OIcon>
       </div>
       <template #dropdown>
-        <ODropdownItem v-for="item in options" @click="itemChange(item)" :key="item.url" class="list" :style="{ '--dropdown-item-justify': justify }">
+        <ODropdownItem v-for="item in options" @click="itemChange(item)" :key="item.href" class="list" :style="{ '--dropdown-item-justify': justify }">
           {{ item.label }}
           <OIcon v-if="item.icon">
             <component :is="item.icon" class="icon" />

package/src/components/activity/OActivityApproval.vue

@@ -14,12 +14,12 @@ import {
 } from '@opensig/opendesign';
 import { useScreen } from '@opendesign-plus/composables';
 import { onMounted, watch, ref, reactive, computed } from 'vue';
-import { ActivityItemT, ActivityTablePropsT, ReviewParamsT, TypeOptionT } from './types';
+import { ActivityItemT, ActivityTablePropsT, ReviewParamsT } from './types';
 import { useActivityConfig } from './composables/useActivityConfig';
 import ThFilter from '../common/ThFilter.vue';
 import OMeetingDetail from '@/components/meeting/components/OMeetingDetail.vue';
 import { useI18n } from '@/i18n';
-import { CalendarDataType } from '@/components/meeting';
+import { CalendarDataType, MeetingItemT } from '@/components/meeting';
 
 const { t, locale } = useI18n();
 const isZh = computed(() => locale.value === 'zh');
@@ -55,13 +55,12 @@ const sortTime = () => {
 
 // -------------------- 状态 --------------------
 const statusValue = ref();
-const statusOptions = computed<TypeOptionT[]>(() => {
-  let list: TypeOptionT[] | { label: string; value: string; }[] = [];
+const statusOptions = computed(() => {
+  const list: { label: string; value: string | number }[] = [];
   approvalStatusMap.value.forEach((item) => {
     list.push(item);
   });
   return list.slice(1);
-
 });
 const filterStatusList = () => {
   params.status = statusValue.value;
@@ -72,7 +71,7 @@ const filterStatusList = () => {
   }
 };
 
-const tableData = ref([]);
+const tableData = ref<ActivityItemT[]>([]);
 const total = ref(0);
 
 const COUNT_PER_PAGE = [10, 20, 30, 40];
@@ -93,7 +92,7 @@ const getData = async () => {
   }
   const res = await props.getTableDataRequest(paramsData);
   tableData.value = (res.data || [])
-    .map((item) => {
+    .map((item: ActivityItemT) => {
       const { start_date, end_date, start, end, activity_type } = item;
       return [
         {
@@ -144,14 +143,14 @@ const confirm = async () => {
   try {
     loading.value = true;
     const valid = await formRef.value?.validate();
-    if (valid.some((v) => !!v)) {
+    if (!valid || valid.some((v: any) => !!v)) {
       loading.value = false;
       return;
     }
     if (reviewStatus.value === 1) {
-      await props.approveActivityRequest(currentRow.value.id, form.value);
+      await props.approveActivityRequest(currentRow.value?.id, form.value);
     } else {
-      await props.rejectActivityRequest(currentRow.value.id, form.value);
+      await props.rejectActivityRequest(currentRow.value?.id, form.value);
     }
     getData();
     cancel();
@@ -175,9 +174,9 @@ const confirmCancel = async () => {
     try {
       loading.value = true;
       if (cancelStatus.value === 1) {
-        await props.cancelActivityRequest(currentRow.value.id, form.value);
+        await props.cancelActivityRequest(currentRow.value!.id, form.value);
       } else {
-        await props.deleteActivityRequest(currentRow.value.id, form.value);
+        await props.deleteActivityRequest(currentRow.value!.id, form.value);
       }
       getData();
       cancel();
@@ -224,16 +223,17 @@ const rejectItem = (row: ActivityItemT) => {
   reviewVisible.value = true;
 };
 
-const expandList = ref([]);
-const expandedRows = ref([]);
+const expandList = ref<string[]>([]);
+const expandedRows = ref<string[]>([]);
 
-const getActivityDetail = (val: number) => {
+const getActivityDetail = (id: number) => {
+  const val = id.toString();
   if (!props.getActivityDetailRequest) {
     return;
   }
   if (!expandList.value.includes(val)) {
     expandList.value.push(val);
-    props.getActivityDetailRequest(val).then((res) => {
+    props.getActivityDetailRequest(val).then((res: ActivityItemT) => {
       tableData.value?.forEach((item) => {
         if (item.id === res.id) {
           item.approve_record = res.approve_record;
@@ -250,26 +250,26 @@ const getActivityDetail = (val: number) => {
   }
 };
 
-const expandChange = (val) => {
+const expandChange = (val: ActivityItemT) => {
   getActivityDetail(val.id);
 };
 
-const getRowKey = (row) => {
-  return row.id;
+const getRowKey = (row: ActivityItemT): string => {
+  return row.id.toString();
 };
 
 // -------------------- 移动端 ---------------------
-const expanded = ref([]); // 展开的数据，id
-const change = (val: number[]) => {
+const expanded = ref<(string | number)[]>([]); // 展开的数据，id
+const change = (val: (string | number)[]) => {
   if (val.length) {
-    val.forEach((item: number) => {
-      getActivityDetail(item);
+    val.forEach((item) => {
+      getActivityDetail(item as number);
     });
   }
 };
 
-const detailRefs = ref({});
-const getDetailRefs = (insRef, id) => {
+const detailRefs = ref<Record<number, any>>({});
+const getDetailRefs = (insRef: any, id: number) => {
   if (insRef && id) {
     detailRefs.value[id] = insRef;
   }
@@ -345,7 +345,7 @@ const reviewActions = computed<DialogActionT[]>(() => {
         <ElTableColumn type="expand">
           <template #default="props">
             <div class="expand-detail">
-              <OMeetingDetail :data="props.row" page="approval" show />
+              <OMeetingDetail :data="props.row" :page="CalendarDataType.APPROVAL" show />
             </div>
           </template>
         </ElTableColumn>
@@ -447,7 +447,7 @@ const reviewActions = computed<DialogActionT[]>(() => {
     </div>
     <div v-else class="collapse-wrapper">
       <OCollapse v-model="expanded" :accordion="isPhone" @change="change">
-        <template v-for="(act, idx) in tableData" :key="act.id">
+        <template v-for="(act) in tableData" :key="act.id">
           <div class="title-top">
             <p class="act-title">{{ act.title }}</p>
             <OTag v-if="act.is_delete !== 1" color="primary" variant="outline"
@@ -502,7 +502,7 @@ const reviewActions = computed<DialogActionT[]>(() => {
             <div class="activity-detail">
               <OMeetingDetail
                 :show="expanded.includes(act.id)"
-                :data="act"
+                :data="act as unknown as MeetingItemT"
                 :ref="(insRef) => getDetailRefs(insRef, act.id)"
                 :page="CalendarDataType.APPROVAL"
               />
@@ -589,12 +589,12 @@ const reviewActions = computed<DialogActionT[]>(() => {
       margin-left: 24px;
     }
 
-    @include respond-to('<=pad_v') {
+    @include respond('<=pad_v') {
       .o-btn + .o-btn {
         margin-left: 16px;
       }
     }
-    @include respond-to('phone') {
+    @include respond('phone') {
       margin-top: 8px;
       .o-btn + .o-btn {
         margin-left: 12px;
@@ -737,7 +737,7 @@ const reviewActions = computed<DialogActionT[]>(() => {
       margin-left: 16px;
     }
 
-    @include respond-to('<=pad_v') {
+    @include respond('<=pad_v') {
       .o-btn {
         width: 140px;
         color: var(--o-color-info1);
@@ -828,7 +828,7 @@ const reviewActions = computed<DialogActionT[]>(() => {
 .handle-dialog-approval {
   --dlg-width: 450px;
   --dlg-radius: var(--o-radius-xs);
-  @include respond-to('<=pad_v') {
+  @include respond('<=pad_v') {
     width: 100%;
     --dlg-radius: var(--o-radius-xs) var(--o-radius-xs) 0 0;
   }

package/src/components/activity/OActivityForm.vue

@@ -225,7 +225,7 @@ const approverList = computed(() => {
   return props.admins || [];
 });
 
-const typeValue = ref<string>('');
+const typeValue = ref<string | undefined>('');
 const typeOptions = ref<TypeOptionT[]>([]); // 活动类型
 activityTypeMap.value.forEach((item) => {
   typeOptions.value.push(item);
@@ -280,7 +280,7 @@ watch(
         organizer,
       } as ParamsItemT;
       form.value = { ...params };
-      typeValue.value = activityTypeMap.value.get(val.activity_type)?.label;
+      typeValue.value = activityTypeMap.value.get(Number(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 }`;
     }
@@ -292,7 +292,7 @@ const confirm = async (val: boolean) => {
   let type = isEdit.value ? t('meeting.modifyActivity') : val ? t('meeting.create') : t('meeting.saveDraft');
   try {
     const valid = await formRef.value?.validate();
-    if (valid.some((v) => !!v)) {
+    if (valid.some((v: any) => !!v)) {
       return;
     }
     loading.value = true;
@@ -498,7 +498,7 @@ defineExpose({
       padding: var(--o-gap-5);
       padding-right: calc(var(--o-gap-4) + var(--o-gap-5));
       border-radius: var(--o-radius-xs);
-      @include respond-to('<=pad_v') {
+      @include respond('<=pad_v') {
         padding: var(--o-gap-4);
       }
 
@@ -522,7 +522,7 @@ defineExpose({
     margin-left: var(--o-gap-4);
   }
 
-  @include respond-to('<=pad_v') {
+  @include respond('<=pad_v') {
     .o-btn {
       --btn-min-width: 74px;
     }