@opendesign-plus-test/components 0.0.1-rc.51 → 0.0.1-rc.52

package/src/components/meeting/OMeetingCalendar.vue

@@ -286,6 +286,10 @@ const checkSelectedDay = (type: CalendarDataType, date: string) => {
   }
   return false;
 };
+
+defineExpose({
+  refresh: getDateData,
+});
 </script>
 <template>
   <div class="o-meeting-calendar">
@@ -372,7 +376,7 @@ const checkSelectedDay = (type: CalendarDataType, date: string) => {
             >
               <OOption v-for="t in groups" :value="t" :key="t">{{ t }}</OOption>
             </OSelect>
-            <OTab v-model="tabType" :line="false">
+            <OTab v-model="tabType" :line="false" :max-show="9999">
               <OTabPane v-for="item in tabs" :key="item.value" :value="item.value">
                 <template #nav>
                   <OIcon>
@@ -402,11 +406,14 @@ const checkSelectedDay = (type: CalendarDataType, date: string) => {
 </template>
 <style lang="scss">
 .o-meeting-calendar {
+  --meeting-card-radius: var(--o-radius-xs);
+  --meeting-input-radius: var(--o-radius-xs);
+  --meeting-cell-radius: var(--o-radius-xs);
 
   .o-select {
     flex-grow: 1;
     max-width: 320px;
-    --select-radius: var(--o-radius-xs);
+    --select-radius: var(--meeting-input-radius);
   }
 
   .el-calendar-table {
@@ -417,7 +424,7 @@ const checkSelectedDay = (type: CalendarDataType, date: string) => {
 
   .calendar-body {
     display: flex;
-    border-radius: var(--o-radius-xs);
+    border-radius: var(--meeting-card-radius);
     background-color: var(--o-color-fill2);
     overflow: hidden;
     @include respond('<=pad_v') {
@@ -433,7 +440,7 @@ const checkSelectedDay = (type: CalendarDataType, date: string) => {
         width: 100%;
         flex-direction: column;
         background-color: var(--o-color-fill2);
-        border-radius: var(--o-radius-xs);
+        border-radius: var(--meeting-card-radius);
       }
 
       .el-calendar__header {
@@ -548,13 +555,13 @@ const checkSelectedDay = (type: CalendarDataType, date: string) => {
             }
 
             th:first-child {
-              border-top-left-radius: var(--o-radius-xs);
-              border-bottom-left-radius: var(--o-radius-xs);
+              border-top-left-radius: var(--meeting-cell-radius);
+              border-bottom-left-radius: var(--meeting-cell-radius);
             }
 
             th:last-child {
-              border-top-right-radius: var(--o-radius-xs);
-              border-bottom-right-radius: var(--o-radius-xs);
+              border-top-right-radius: var(--meeting-cell-radius);
+              border-bottom-right-radius: var(--meeting-cell-radius);
             }
           }
           tr:last-child {
@@ -584,7 +591,7 @@ const checkSelectedDay = (type: CalendarDataType, date: string) => {
 
         .out-box {
           position: relative;
-          border-radius: var(--o-radius-xs);
+          border-radius: var(--meeting-cell-radius);
           padding: 8px 12px;
           width: 100%;
           height: 100%;
@@ -709,7 +716,7 @@ const checkSelectedDay = (type: CalendarDataType, date: string) => {
                 height: 24px;
                 width: 40px;
                 background-color: var(--o-color-control3-light);
-                border-radius: var(--o-radius-l);
+                border-radius: var(--meeting-cell-radius);
                 border: 1px solid var(--o-color-primary1);
               }
             }
@@ -745,7 +752,7 @@ const checkSelectedDay = (type: CalendarDataType, date: string) => {
               transform: translate(-50%, -50%);
               height: 24px;
               width: 40px;
-              border-radius: var(--o-radius-l);
+              border-radius: var(--meeting-cell-radius);
               z-index: -1;
             }
           }
@@ -762,7 +769,7 @@ const checkSelectedDay = (type: CalendarDataType, date: string) => {
         padding-top: 16px;
         background-color: var(--o-color-fill2);
         width: 100%;
-        border-radius: var(--o-radius-xs);
+        border-radius: var(--meeting-card-radius);
       }
       @include respond('phone') {
 
@@ -780,7 +787,7 @@ const checkSelectedDay = (type: CalendarDataType, date: string) => {
           margin: 16px 16px 12px;
           padding: 7px 12px;
           justify-content: center;
-          border-radius: var(--o-radius-xs);
+          border-radius: var(--meeting-card-radius);
           background-color: var(--o-color-control4-light);
           @include text2;
         }
@@ -819,6 +826,7 @@ const checkSelectedDay = (type: CalendarDataType, date: string) => {
 
         .o-select {
           display: none;
+          margin-bottom: var(--o-gap-2);
           @include respond('<=pad_v') {
             display: inline-flex;
           }
@@ -826,6 +834,7 @@ const checkSelectedDay = (type: CalendarDataType, date: string) => {
             display: flex;
             width: 100%;
             max-width: 100%;
+            margin-bottom: 0;
           }
         }
 
@@ -854,17 +863,16 @@ const checkSelectedDay = (type: CalendarDataType, date: string) => {
           .o-icon {
             display: none;
           }
-          .o-tab-navs-wrap {
-            height: 40px;
+          .o-tab-navs-container {
 
             .o-tab-nav {
-              line-height: 2;
+              line-height: 32px;
             }
           }
         }
         @include respond('phone') {
-          .o-tab-navs-wrap {
-            height: auto;
+          .o-tab-nav {
+            line-height: 2;
           }
         }
 

package/src/components/meeting/OMeetingForm.vue

@@ -45,7 +45,7 @@ const intervalTypeMax = computed(() => {
   return findLabelFromOptions(form.value.cycle_type, cycleTypeOptions.value, 'max');
 });
 const initForm: MeetingPostT = {
-  is_record: false,
+  is_record: true,
   agenda: '',
   email_list: '',
   platform: 'WELINK',
@@ -265,15 +265,51 @@ const getPlatformOptions = async () => {
 };
 
 const emits = defineEmits(['confirm', 'cancel']);
+
+const getPropData = () => {
+  if (!props.data) {
+    return {};
+  }
+  const {
+    start,
+    end,
+    is_cycle,
+    cycle_start_date,
+    cycle_end_date,
+    cycle_point,
+    cycle_interval,
+    cycle_start,
+    cycle_end,
+  } = props.data;
+  return {
+    ...props.data,
+    time: `${ start }-${ end }`,
+    ...(is_cycle
+      ? {
+        date_range: [cycle_start_date, cycle_end_date],
+        cycle_point: cycle_point?.map((v) => parseInt(v)) || [],
+        cycle_interval: cycle_interval || 1,
+        time: `${ cycle_start }-${ cycle_end }`,
+        start: cycle_start,
+        end: cycle_end,
+      }
+      : {}),
+  };
+};
+
 watch(
   () => props.data,
   (data) => {
     if (data) {
-      const sub = data?.cycle_sub?.find((v) => v.sub_id === props.subId) || {} as unknown as CycleSubItemT;
+      const propData = getPropData() as unknown as CycleSubItemT;
+      console.log(1, propData);
+      console.log(props.subId, propData.sub_id);
+      const sub = propData?.cycle_sub?.find((v) => v.sub_id === props.subId || propData.sub_id) || {} as unknown as CycleSubItemT;
+      console.log(2, sub);
       const { mid, date, start, end, sub_id } = sub;
       Object.assign(
         form.value,
-        data,
+        propData,
         props.isSub
           ? {
             is_cycle: false,
@@ -285,6 +321,7 @@ watch(
           }
           : {},
       );
+      console.log(form.value);
     } else {
       const today = dayjs().format('YYYY-MM-DD');
       const now = dayjs().format('HH:mm');
@@ -373,6 +410,7 @@ const confirm = async () => {
       platform,
       is_cycle,
     } as MeetingPostT as unknown as any;
+    let flag = undefined;
     if (is_cycle) {
       params = {
         ...params,
@@ -401,7 +439,7 @@ const confirm = async () => {
       if (props.isSub) {
         const { mid, sub_id } = form.value;
         const { date, start, end } = params;
-        await props?.editSubMeetingRequest(sub_id, {
+        flag = await props?.editSubMeetingRequest(sub_id, {
           mid,
           date,
           start,
@@ -416,17 +454,21 @@ const confirm = async () => {
           etherpad: _etherpad,
           ...data
         } = params;
-        await props?.editMeetingRequest(props.data?.id as unknown as number, {
+        flag = await props?.editMeetingRequest(props.data?.id as unknown as number, {
           ...data,
           is_notify: true,
         });
       }
     } else {
-      await props?.createMeetingRequest({
+      flag = await props?.createMeetingRequest({
         ...params,
         email_list: form.value.email_list.replaceAll(' ', ''),
       });
     }
+    // 如果返回的是boolean，只有true表示回调成功
+    if (typeof flag === 'boolean' && !flag) {
+      return;
+    }
     const msg = t('meeting.meetingHandleSuccess', [form.value.topic, type]);
     message.success({
       content: msg,
@@ -695,7 +737,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') : (bookText || t('meeting.book')) }}
+        {{ isEdit ? t('common.save') : (confirmText || t('meeting.book')) }}
       </OButton>
       <OButton color="primary" variant="outline" size="large" @click="cancel">{{ t('common.cancel') }}</OButton>
     </div>
@@ -704,6 +746,9 @@ defineExpose({
 
 <style lang="scss">
 .o-meeting-form {
+  --meeting-card-radius: var(--o-radius-xs);
+  --meeting-input-radius: var(--o-radius-xs);
+  --meeting-cell-radius: var(--o-radius-xs);
   .form-wrapper {
     & > .o-form-item {
       max-width: 592px;
@@ -733,7 +778,7 @@ defineExpose({
     }
 
     .o-textarea {
-      --_box-radius: var(--o-radius-xs);
+      --_box-radius: var(--meeting-input-radius);
     }
 
     input,
@@ -741,8 +786,17 @@ defineExpose({
       color: var(--o-input-color);
       @include text1;
 
+      @include respond('phone') {
+        @include text2;
+      }
+
       &::placeholder {
         color: var(--o-placeholder-color);
+        @include text1;
+
+        @include respond('phone') {
+          font-size: 14px !important;
+        }
       }
     }
 
@@ -854,11 +908,8 @@ defineExpose({
     align-items: center;
 
     .o-btn {
-      height: 40px !important;
-      font-size: 16px !important;
-      line-height: 24px !important;
-      border-radius: 20px !important;
       --btn-min-width: 90px;
+      --btn-radius: calc(var(--btn-height) / 2);
     }
   }
 
@@ -867,7 +918,7 @@ defineExpose({
     display: flex;
     align-items: center;
     border: 1px solid var(--o-color-control1);
-    border-radius: var(--o-radius-xs);
+    border-radius: var(--meeting-card-radius);
     padding: 0 15px;
     background-color: var(--o-color-fill2);
 
@@ -899,9 +950,6 @@ defineExpose({
         gap: 0;
       }
 
-      .el-select__placeholder {
-        @include text1;
-      }
 
       .el-select__caret,
       .el-input__prefix-icon {
@@ -955,7 +1003,7 @@ defineExpose({
     .repeat-config {
       background-color: color-mix(in srgb, var(--o-color-control2-light) 40%, transparent);
       padding: var(--o-gap-5);
-      border-radius: var(--o-radius-xs);
+      border-radius: var(--meeting-card-radius);
       @include respond('<=pad_v') {
         padding: var(--o-gap-4);
       }