@opendesign-plus-test/components 0.0.1-rc.24 → 0.0.1-rc.26

package/src/components/meeting/OMeetingForm.vue

@@ -416,7 +416,7 @@ const confirm = async () => {
         });
       }
     } else {
-      await props?.creatMeetingRequest({
+      await props?.createMeetingRequest({
         ...params,
         email_list: form.value.email_list.replaceAll(' ', ''),
       });
@@ -727,6 +727,10 @@ defineExpose({
       }
     }
 
+    .o-textarea {
+      --_box-radius: var(--o-radius-xs);
+    }
+
     input,
     textarea {
       color: var(--o-input-color);

package/src/components/meeting/OMyMeetingCalendar.vue

@@ -1011,15 +1011,15 @@ const cancelActions = computed<DialogActionT[]>(() => {
       flex-grow: 1;
       background-color: var(--o-color-fill2);
 
+      @include respond-to('phone') {
+        margin-top: calc(var(--phone-padding-top) - var(--o-gap-4));
+      }
       &.is-empty {
         display: flex;
         align-items: center;
         justify-content: center;
       }
 
-      @include respond-to('phone') {
-        margin-top: calc(var(--phone-padding-top) - var(--o-gap-4));
-      }
 
       .o-scroller {
         .o-scrollbar-rail {
@@ -1227,16 +1227,15 @@ const cancelActions = computed<DialogActionT[]>(() => {
             }
           }
 
+          @include respond-to('phone') {
+            --icon-size: 20px;
+          }
           &.o-collapse-item-expanded {
             @include respond-to('<=pad_v') {
               --copy-display: inline-flex;
             }
           }
 
-          @include respond-to('phone') {
-            --icon-size: 20px;
-          }
-
           &.o-collapse-item-expanded {
             background-color: var(--o-color-control2-light);
           }
@@ -1384,7 +1383,7 @@ const cancelActions = computed<DialogActionT[]>(() => {
               font-size: 18px;
               height: 18px;
               width: 18px;
-              //display: var(--copy-display);
+              display: var(--copy-display);
               @include respond-to('phone') {
                 bottom: var(--o-gap-2);
                 transform: revert;

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

@@ -4,6 +4,7 @@ import { computed, ref } from 'vue';
 import { MeetingItemT } from '@/components/meeting/types.ts';
 import MoreText from '@/components/common/MoreText.vue';
 import { Locales, useI18n } from '@/i18n';
+import { formatDate } from '@/components/meeting/utils.ts';
 
 const props = defineProps<{
   data: MeetingItemT;
@@ -80,11 +81,11 @@ defineExpose({ copyInfo });
     <div
       ref="domRef"
       class="label-item"
-      :class="`label-item_${data.id} type_${data.type} `"
+      :class="`label-item_${data.id} type_${data.type} ${!data[info.key]?.length ? 'is-empty' : ''}`"
       v-for="(info, infoIdx) in columns"
       :key="infoIdx"
     >
-      <template v-if="data[info.key]">
+      <template v-if="data[info.key] && !info.isRecord">
         <span class="label">{{ info.label }}<i>{{ isZh ? '：' : ':' }}</i></span>
         <MoreText :show="show" v-if="info.ellipsis" :text="data[info.key] || '-'" />
         <OLink
@@ -102,6 +103,14 @@ defineExpose({ copyInfo });
         {{ data[info.key] || '-' }}
       </span>
       </template>
+      <template v-if="info.isRecord && data[info.key]?.length">
+        <span class="label">{{ info.label }}{{ isZh ? '：' : ':' }}</span>
+        <p v-for="re in data[info.key]" :key="re.create_time" class="value">
+          {{ re.reason }}&nbsp;&nbsp;
+          {{ formatDate(re.create_time, 'YYYY/MM/DD HH:mm:ss') }}
+          审核{{ re.action === 1 ? '通过' : '驳回' }}
+        </p>
+      </template>
     </div>
   </div>
 
@@ -172,6 +181,10 @@ defineExpose({ copyInfo });
     margin-top: var(--o-gap-2);
   }
 
+  .label-item.is-empty {
+    margin: 0;
+  }
+
   .meeting-action {
     display: flex;
     align-items: center;