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

package/src/components/meeting/OMeetingForm.vue

@@ -19,7 +19,7 @@ import {
 } from '@opensig/opendesign';
 import IconHelp from '~icons/meeting/icon-help.svg';
 import IconTip from '~icons/meeting/icon-tip.svg';
-import type { MeetingItemT, MeetingPostT, OptionItemT } from './types';
+import { MeetingFormPropsT, MeetingPostT, OptionItemT } from './types';
 import dayjs from 'dayjs';
 import { findLabelFromOptions, formatDateNumber, getDateNumber } from './utils';
 import {
@@ -36,18 +36,7 @@ import { useI18n } from '@/i18n';
 
 const { t, locale } = useI18n();
 
-const props = withDefaults(defineProps<{
-  data?: MeetingItemT;
-  isSub?: boolean;
-  isEdit?: boolean;
-  subId?: string;
-  createMeetingRequest: any,
-  editMeetingRequest: any;
-  editSubMeetingRequest: any;
-  getPlatformsRequest: any;
-  getGroupsRequest: any;
-  showBtns?: boolean
-}>(), {
+const props = withDefaults(defineProps<MeetingFormPropsT>(), {
   isSub: false,
   isEdit: false,
   showBtns: true,
@@ -78,7 +67,7 @@ const initForm = {
   cycle_interval: 1,
   cycle_type: INTERVAL_DAY,
   cycle_point: [],
-}
+};
 const form = ref<MeetingPostT>(Object.assign({}, initForm) as unknown as MeetingPostT); // 表单数据
 const formRef = ref(null); // 表单实例
 const loading = ref(false); // 提交状态
@@ -694,12 +683,6 @@ defineExpose({
 
 <style lang="scss">
 .o-meeting-form {
-  .el-input {
-    --el-border-color: var(--o-color-control1);
-    --el-input-border-color: var(--o-color-control1);
-    --el-input-hover-border-color:var(--o-color-control2);
-    --el-input-focus-border-color:var(--o-color-control3);
-  }
   .form-wrapper {
     & > .o-form-item {
       max-width: 592px;
@@ -718,6 +701,7 @@ defineExpose({
 
     &.o-form-layout-v {
       --form-item-gap: var(--o-gap-3);
+
       .o-form-item-label {
         margin-bottom: var(--o-gap-2);
       }
@@ -741,6 +725,13 @@ defineExpose({
       }
     }
 
+    .o-select {
+      --select-bd-color: var(--o-color-control1);
+      --select-bd-color-hover: var(--o-color-primary2);
+      --select-bd-color-focus: var(--o-color-primary3);
+      --select-bd-color-disabled: var(--o-color-control4);
+    }
+
     .o-form-item-label {
       flex: 0 0 100px;
       height: var(--o-control_size-l);
@@ -766,6 +757,7 @@ defineExpose({
 
       .o-form-item-label {
         margin: 0;
+        align-items: flex-start;
       }
 
       .o-form-item-main {
@@ -835,7 +827,7 @@ defineExpose({
     display: flex;
     align-items: center;
     border: 1px solid var(--o-color-control1);
-    border-radius: var(--o-radius_control-s);
+    border-radius: var(--o-radius-xs);
     padding: 0 15px;
     background-color: var(--o-color-fill2);
 
@@ -844,7 +836,7 @@ defineExpose({
     }
 
     &:hover {
-      border-color: var(--o-color-control2);
+      border-color: var(--o-color-primary2);
     }
 
     @include respond-to('phone') {
@@ -921,7 +913,7 @@ defineExpose({
     }
 
     .repeat-config {
-      background-color: var(--o-color-control2-light);
+      background-color: color-mix(in srgb, var(--o-color-control2-light), transparent 60%);
       padding: var(--o-gap-5);
       border-radius: var(--o-radius-xs);
       @include respond-to('<=pad_v') {
@@ -989,13 +981,14 @@ defineExpose({
 </style>
 
 <style lang="scss">
-.meeting-form-time-popover, o-meeting-form-date-picker-popper {
+.meeting-form-time-popover, .o-meeting-form-date-picker-popper {
   --el-color-primary: var(--o-color-primary1);
   --el-datepicker-active-color: var(--o-color-primary1);
   --el-fill-color-light: var(--o-color-control2-light);
   --el-input-bg-color: var(--o-color-control-light);
   --el-fill-color-blank: var(--o-color-control-light);
 }
+
 .o-meeting-form-popover-content {
   max-width: 256px;
   text-align: left;

package/src/components/meeting/OMeetingPlayback.vue

@@ -14,7 +14,7 @@ const props = withDefaults(defineProps<MeetingPlaybackPropsT>(), {
   detail: () => ({}) as any,
 });
 const emits = defineEmits(['change-date']);
-
+const { t } = useI18n();
 const playbackInstance = ref(null);
 const getInstance = (instance: any) => {
   playbackInstance.value = instance;

package/src/components/meeting/OMyMeetingCalendar.vue

@@ -835,12 +835,11 @@ const cancelActions = computed<DialogActionT[]>(() => {
     .list-calendar {
       width: 334px;
       flex-shrink: 0;
-      --table-bg: var(--o-color-control2-light);
 
       .el-calendar {
         min-height: 460px;
         height: calc(100% - 54px);
-        background-color: var(--table-bg);
+        background-color: color-mix(in srgb, var(--o-color-control2-light), transparent 60%);
         border-radius: var(--o-radius-xs);
 
         .el-calendar__header {
@@ -871,17 +870,17 @@ const cancelActions = computed<DialogActionT[]>(() => {
         .el-calendar__body {
           .el-calendar-table {
             tr {
-              background: var(--table-bg) !important;
+              background-color: color-mix(in srgb, var(--o-color-control2-light), transparent 60%) !important;
             }
 
             th {
               text-align: center;
-              background: var(--table-bg) !important;
+              background-color: color-mix(in srgb, var(--o-color-control2-light), transparent 60%) !important;
               border: none;
             }
 
             td {
-              background: var(--table-bg) !important;
+              background-color: color-mix(in srgb, var(--o-color-control2-light), transparent 60%) !important;
               border: none;
               text-align: center;
               transition: none;
@@ -1237,7 +1236,7 @@ const cancelActions = computed<DialogActionT[]>(() => {
           }
 
           &.o-collapse-item-expanded {
-            background-color: var(--o-color-control2-light);
+            background-color: color-mix(in srgb, var(--o-color-control2-light), transparent 60%) !important;
           }
         }
 

package/src/components/meeting/components/OMeetingCalendarList.vue

@@ -322,7 +322,7 @@ const computedList = computed(() => {
     }
 
     .o-collapse-item-body {
-      background-color: var(--o-color-control2-light);
+      background-color: color-mix(in srgb, var(--o-color-control2-light), transparent 60%);
       margin-bottom: 0;
 
       a {

package/src/components/meeting/types.ts

@@ -63,11 +63,17 @@ export interface MeetingPostT {
   is_notify?: boolean;
 }
 
-// sig组列表
-export interface GroupItemT {
-  id?: number;
-  group_name: string;
-  maillist?: string;
+export interface MeetingFormPropsT {
+  data?: MeetingItemT;
+  isSub?: boolean;
+  isEdit?: boolean;
+  subId?: string;
+  createMeetingRequest: any,
+  editMeetingRequest: any;
+  editSubMeetingRequest: any;
+  getPlatformsRequest: any;
+  getGroupsRequest: any;
+  showBtns?: boolean
 }
 
 // 会议详情

package/src/index.ts

@@ -4,8 +4,6 @@
 import OBanner from './components/OBanner.vue';
 import OCookieNotice from './components/OCookieNotice.vue';
 import OFooter from './components/OFooter.vue';
-import OHeader from './components/OHeader.vue';
-import OHeaderMoblie from './components/OHeaderMoblie.vue';
 import OHeaderSearch from './components/OHeaderSearch.vue';
 import OHeaderUser from './components/OHeaderUser.vue';
 import OPlusConfigProvider from './components/OPlusConfigProvider.vue';
@@ -18,8 +16,6 @@ const components = {
   OBanner,
   OCookieNotice,
   OFooter,
-  OHeader,
-  OHeaderMoblie,
   OHeaderSearch,
   OHeaderUser,
   OPlusConfigProvider,
@@ -29,12 +25,13 @@ const components = {
 };
 
 // 导出单个组件
-export { OBanner, OCookieNotice, OFooter, OHeader, OHeaderMoblie, OHeaderSearch, OHeaderUser, OPlusConfigProvider, OSection, OSourceCode, OThemeSwitcher };
+export { OBanner, OCookieNotice, OFooter, OHeaderSearch, OHeaderUser, OPlusConfigProvider, OSection, OSourceCode, OThemeSwitcher };
 
 // 重新导出子目录中的组件
 export * from './components/activity';
 export * from './components/element-plus';
 export * from './components/events';
+export * from './components/header';
 export * from './components/meeting';
 
 // 默认导出（用于Vue插件安装）

package/dist/components/activity/data.d.ts

@@ -1,51 +0,0 @@
-export declare const approveListRes: {
-    total: number;
-    page: string;
-    size: number;
-    data: {
-        id: number;
-        title: string;
-        start_date: string;
-        end_date: string;
-        activity_type: number;
-        synopsis: string;
-        activity_mode: number;
-        status: number;
-        create_time: string;
-        is_delete: number;
-        address: string;
-        sponsor: string;
-        start: string;
-        end: string;
-        register_url: string;
-        content_url: string;
-        update_activity_id: null;
-        register_end_date: string;
-    }[];
-};
-export declare const listRes: {
-    total: number;
-    page: string;
-    size: number;
-    data: {
-        id: number;
-        title: string;
-        start_date: string;
-        end_date: string;
-        activity_type: number;
-        synopsis: string;
-        activity_mode: number;
-        create_time: string;
-        address: string;
-        status: number;
-        sponsor: string;
-        is_delete: number;
-        start: string;
-        end: string;
-        register_url: string;
-        content_url: string;
-        register_end_date: string;
-        update_activity_id: null;
-        approver: string;
-    }[];
-};

package/src/components/OHeader.vue

@@ -1,97 +0,0 @@
-<script setup lang="ts">
-import ContentWrapper from './common/ContentWrapper.vue';
-import HeaderEulerNav from './common/HeaderEulerNav.vue';
-import HeaderUbmcNav from './common/HeaderUbmcNav.vue';
-
-export interface OHeaderT {
-  (e: 'go-home'): void;
-}
-
-const emit = defineEmits<OHeaderT>();
-
-const props = defineProps({
-  logo: undefined,
-  lang: undefined,
-  community: undefined,
-  navData: undefined,
-  bgLeft: undefined,
-  bgRight: undefined,
-  tagMap: undefined,
-});
-
-const goHome = () => {
-  emit('go-home');
-};
-</script>
-
-<template>
-  <div class="header">
-    <ContentWrapper class="header-wrap">
-      <!-- logo -->
-      <div class="header-logo" @click="goHome">
-        <slot name="logo">
-          <img v-if="props.logo" class="logo" alt="logo" :src="props.logo" />
-        </slot>
-      </div>
-      <!-- openEuler nav -->
-      <div v-if="props.community === 'openEuler'" class="header-nav">
-        <slot name="nav">
-          <HeaderEulerNav v-if="props.navData" :nav-data="props.navData" :bg-left="props.bgLeft" :bg-right="props.bgRight" />
-        </slot>
-      </div>
-      <!-- openUBMC nav -->
-      <div v-if="props.community === 'openUBMC'" class="header-content">
-        <slot name="nav">
-          <HeaderUbmcNav v-if="props.navData" :nav-data="props.navData" :has-perm="true" :tag-map="tagMap" />
-        </slot>
-      </div>
-      <!-- toolbar -->
-      <div v-if="$slots.toolbar" class="header-toolbar">
-        <slot name="toolbar"></slot>
-      </div>
-    </ContentWrapper>
-  </div>
-</template>
-
-<style lang="scss" scoped>
-.header {
-  background-color: var(--o-color-fill2);
-  position: relative;
-  z-index: 999;
-  box-shadow: 0 3px 9px 0 rgba(0, 18, 85, 0.08);
-  backdrop-filter: blur(5px);
-  --o-header-height: 72px;
-}
-.header-wrap {
-  display: flex;
-  align-items: center;
-  height: var(--o-header-height);
-}
-.header-logo {
-  height: 100%;
-  display: flex;
-  align-items: center;
-  cursor: pointer;
-  margin-right: 24px;
-  flex-shrink: 0;
-  @include respond-to('<=pad_v') {
-    width: 100%;
-  }
-}
-.logo {
-  height: 32px;
-}
-.header-nav {
-  flex: 1;
-  height: 100%;
-  overflow: hidden;
-}
-.header-content {
-  flex: 1;
-  min-width: 0;
-  height: 100%;
-}
-.header-toolbar {
-  height: 100%;
-}
-</style>