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

package/src/components/element-plus/OElCookieNotice.vue

@@ -3,7 +3,7 @@ import { ref, onMounted, computed, nextTick, watch } from 'vue';
 import ClientOnly from '../common/ClientOnlyWrapper';
 import { useScreen } from '@opendesign-plus/composables';
 import { useI18n } from '@/i18n';
-import { ElButton, ElDialog, ElSwitch, ElIcon } from 'element-plus';
+import { ElButton, ElDialog, ElSwitch, ElIcon, ElDivider } from 'element-plus';
 import { useVModel } from '@vueuse/core';
 
 const NOT_SIGNED = '0';
@@ -15,7 +15,6 @@ const COOKIE_KEY_EN = 'agreed-cookiepolicy-en';
 
 const props = defineProps<{
   visible?: boolean;
-  enableGrid?: boolean;
   community: string;
   detailUrl: string;
   wrapper?: string | HTMLElement;
@@ -26,10 +25,18 @@ const emits = defineEmits<{
   (e: 'update:visible', value: boolean): void;
 }>();
 
-const { lePadV } = useScreen();
+const { lePadV, isPhone } = useScreen();
 const { locale, t } = useI18n();
 const isZh = computed(() => locale.value === 'zh');
 
+const cookieNoticeRef = ref<HTMLDivElement>();
+const enableGrid = computed(() => {
+  if (cookieNoticeRef.value) {
+    return !!getComputedStyle(cookieNoticeRef.value!).getPropertyValue('--grid-content-width');
+  }
+  return false;
+});
+
 const cookieKey = computed(() => (isZh.value ? COOKIE_KEY_ZH : COOKIE_KEY_EN));
 
 // 是否允许分析cookie
@@ -148,37 +155,70 @@ defineExpose({
 <template>
   <ClientOnly>
     <Teleport :to="wrapper || '#app'">
-      <div v-if="visibleVmodel" class="cookie-notice">
+      <div ref="cookieNoticeRef" v-if="visibleVmodel" class="cookie-notice">
         <div class="cookie-notice-content">
           <div :type="locale" :class="{ 'cookie-notice-wrap-grid': enableGrid, 'cookie-notice-wrap': !enableGrid }">
-            <div class="cookie-notice-left">
-              <p v-if="isZh" class="cookie-desc" style="margin-top: 0">
-                {{ t('cookie.desc') }}
-                <a :href="detailUrl" target="_blank" rel="noopener noreferrer">
-                  {{ t('cookie.about') }}
-                </a>
-              </p>
-              <template v-else>
-                <p class="cookie-title">{{ t('cookie.title', [community]) }}</p>
-                <p class="cookie-desc">
+            <div class="cookie-title">
+              <template v-if="isZh">
+                <el-icon style="transform: rotate(180deg); font-size: 24px; margin-right: 4px">
+                  <svg style="width: 1em; height: 1em" xmlns="http://www.w3.org/2000/svg" version="1.1" width="24" height="24" viewBox="0 0 24 24">
+                    <path fill="#002fa7" d="M21 12c0 4.971-4.029 9-9 9s-9-4.029-9-9c0-4.971 4.029-9 9-9s9 4.029 9 9z" />
+                    <path
+                      fill="#fff"
+                      d="M12 9.4c0.552 0 1-0.448 1-1s-0.448-1-1-1c-0.552 0-1 0.448-1 1s0.448 1 1 1zM12.492 10.943c-0.042-0.233-0.246-0.41-0.492-0.41-0.276 0-0.5 0.224-0.5 0.5v5.5l0.008 0.090c0.042 0.233 0.246 0.41 0.492 0.41 0.276 0 0.5-0.224 0.5-0.5v-5.5l-0.008-0.090z"
+                    />
+                  </svg>
+                </el-icon>
+                <p class="cookie-zh-title" style="margin-top: 0">
                   {{ t('cookie.desc') }}
-                  <a :href="detailUrl" target="_blank" rel="noopener noreferrer">{{ t('cookie.about') }} </a>.
+                  <a :href="detailUrl" target="_blank" rel="noopener noreferrer">
+                    {{ t('cookie.about') }}
+                  </a>
                 </p>
               </template>
+              <p v-else class="cookie-en-title">{{ t('cookie.title', [community]) }}</p>
+              <el-icon class="cookie-notice-close" @click="toggleNoticeVisible(false)">
+                <slot name="close-icon">
+                  <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+                    <path
+                      fill="currentColor"
+                      d="M18.528 5.472a.7.7 0 0 1 .074.903l-.074.087L12.988 12l.006.006-.989.989-.006-.006-5.538 5.54a.7.7 0 0 1-1.064-.903l.074-.087L11.009 12 5.471 6.462l-.074-.087a.7.7 0 0 1 .977-.977l.087.074 5.538 5.539 5.539-5.539a.7.7 0 0 1 .99 0m-3.977 8.089 3.978 3.978.074.087a.7.7 0 0 1-.977.977l-.087-.074-3.978-3.978a.7.7 0 0 1 .99-.99"
+                    />
+                  </svg>
+                </slot>
+              </el-icon>
             </div>
-            <div v-if="!isZh" class="cookie-notice-right">
-              <el-button round type="primary" @click="acceptAll">{{ t('cookie.acceptAll') }}</el-button>
-              <el-button round type="primary" @click="rejectAll">{{ t('cookie.rejectAll') }}</el-button>
-              <el-button round type="primary" @click="toggleDlgVisible(true)">{{ t('cookie.manage') }}</el-button>
+            <div v-if="!isZh" class="cookie-en-content">
+              <p class="cookie-en-desc">
+                {{ t('cookie.desc') }}
+                <a :href="detailUrl" target="_blank" rel="noopener noreferrer">{{ t('cookie.about') }} </a>.
+              </p>
+              <div class="cookie-notice-right">
+                <el-button round type="primary" @click="acceptAll">{{ t('cookie.acceptAll') }}</el-button>
+                <el-button round type="primary" @click="rejectAll">{{ t('cookie.rejectAll') }}</el-button>
+                <el-button round type="primary" @click="toggleDlgVisible(true)">{{ t('cookie.manage') }}</el-button>
+              </div>
             </div>
-            <el-icon class="cookie-notice-close" :type="locale" @click="toggleNoticeVisible(false)">
-              <slot name="close-icon">
-                <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024"><path fill="currentColor" d="M764.288 214.592 512 466.88 259.712 214.592a31.936 31.936 0 0 0-45.12 45.12L466.752 512 214.528 764.224a31.936 31.936 0 1 0 45.12 45.184L512 557.184l252.288 252.288a31.936 31.936 0 0 0 45.12-45.12L557.12 512.064l252.288-252.352a31.936 31.936 0 1 0-45.12-45.184z" /></svg>
-              </slot>
-            </el-icon>
           </div>
         </div>
-        <el-dialog v-model="isDlgVisible" :width="lePadV ? '90%' : '50%'" :title="t('cookie.manage')" destroy-on-close @open="onDlgOpening">
+        <el-dialog
+          :show-close="false"
+          :class="{ 'cookie-dlg-bottom': lePadV, 'grid-width-dlg': enableGrid }"
+          v-model="isDlgVisible"
+          destroy-on-close
+          @open="onDlgOpening"
+        >
+          <template #header>
+            <div v-if="!lePadV" class="dlg-close-icon" @click="isDlgVisible = false">
+              <svg viewBox="0 0 24 24" class="o-icon-close">
+                <path
+                  fill="currentColor"
+                  d="M18.528 5.472a.7.7 0 0 1 .074.903l-.074.087L12.988 12l.006.006-.989.989-.006-.006-5.538 5.54a.7.7 0 0 1-1.064-.903l.074-.087L11.009 12 5.471 6.462l-.074-.087a.7.7 0 0 1 .977-.977l.087.074 5.538 5.539 5.539-5.539a.7.7 0 0 1 .99 0m-3.977 8.089 3.978 3.978.074.087a.7.7 0 0 1-.977.977l-.087-.074-3.978-3.978a.7.7 0 0 1 .99-.99"
+                />
+              </svg>
+            </div>
+            <span class="dlg-title">{{ t('cookie.manage') }}</span>
+          </template>
           <div class="cookie-dlg-content">
             <div class="content-item">
               <div class="item-header">
@@ -202,8 +242,15 @@ defineExpose({
             </div>
           </div>
           <template #footer>
-            <el-button round type="primary" @click="handleSave" style="margin-right: 16px">{{ t('cookie.saveSetting') }}</el-button>
-            <el-button round type="primary" @click="handleAllowAll">{{ t('cookie.acceptAll') }}</el-button>
+            <template v-if="lePadV">
+              <el-button type="text" @click="handleSave">{{ t('cookie.saveSetting') }}</el-button>
+              <el-divider direction="vertical" style="margin: 0 24px" />
+              <el-button type="text" @click="handleAllowAll">{{ t('cookie.acceptAll') }}</el-button>
+            </template>
+            <template v-else>
+              <el-button round type="primary" @click="handleSave">{{ t('cookie.saveSetting') }}</el-button>
+              <el-button round type="primary" @click="handleAllowAll">{{ t('cookie.acceptAll') }}</el-button>
+            </template>
           </template>
         </el-dialog>
       </div>
@@ -211,12 +258,28 @@ defineExpose({
   </ClientOnly>
 </template>
 
+<style lang="scss">
+.cookie-dlg-bottom {
+  margin: 0;
+  position: absolute;
+  bottom: 0;
+  left: 50%;
+  transform: translateX(-50%);
+}
+</style>
 <style lang="scss" scoped>
 .el-button {
   --el-button-bg-color: transparent;
+  --el-button-hover-bg-color: transparent;
+  --el-button-active-bg-color: transparent;
+
   --el-button-text-color: var(--o-color-primary1);
+  --el-button-hover-text-color: var(--o-color-primary2);
+  --el-button-active-text-color: var(--o-color-primary3);
+
   --el-button-border-color: var(--o-color-primary1);
-  --el-button-hover-bg-color: var(--o-color-primary1);
+  --el-button-hover-border-color: var(--o-color-primary2);
+  --el-button-active-border-color: var(--o-color-primary3);
 }
 
 .cookie-notice {
@@ -225,17 +288,6 @@ defineExpose({
   z-index: 999;
   width: 100%;
   --el-color-primary: var(--o-color-primary1);
-  .o-button {
-    --o-button-font-size-mini: 14px;
-  }
-  .o-button + .o-button {
-    margin-left: 16px;
-
-    @media (max-width: 840px) {
-      margin-left: 0;
-      margin-top: 12px;
-    }
-  }
 }
 
 .cookie-notice-content {
@@ -246,167 +298,306 @@ defineExpose({
 
 .cookie-notice-wrap {
   position: relative;
-  display: flex;
-  justify-content: space-between;
   margin: 0 auto;
-  padding: 24px var(--layout-content-padding);
+  padding: 16px var(--layout-content-padding);
   max-width: var(--layout-content-max-width);
+  @media (1680px >= width >= 1201px) {
+    padding: 12px var(--layout-content-padding);
+  }
+  @include respond-to('pad_h') {
+    padding: 8px var(--layout-content-padding);
+  }
+  @media (max-width: 840px) {
+    padding: 16px var(--layout-content-padding);
+  }
+  @include respond-to('phone') {
+    padding: 16px var(--layout-content-padding);
+  }
   &:not([type='zh']) {
     @media (max-width: 840px) {
       flex-direction: column;
-      align-items: center;
     }
   }
 }
 
 .cookie-notice-wrap-grid {
-  position: relative;
-  display: flex;
-  justify-content: space-between;
   width: var(--grid-content-width);
-  padding: 24px 0;
+  padding: 16px 0;
   margin: 0 auto;
+  @media (1680px >= width >= 1201px) {
+    padding: 12px 0;
+  }
+  @include respond-to('pad_h') {
+    padding: 8px 0;
+  }
   @media (max-width: 840px) {
     padding: 16px 0;
-    flex-direction: column;
-    align-items: center;
+  }
+  @include respond-to('phone') {
+    padding: 16px 0;
+  }
+  &:not([type='zh']) {
+    @media (max-width: 840px) {
+      padding: 16px 0;
+      flex-direction: column;
+    }
   }
 }
 
-.cookie-notice-left {
-  width: 60%;
-
-  @media (max-width: 1100px) {
-    width: 58%;
+.cookie-title {
+  display: flex;
+  font-size: 16px;
+  line-height: calc(1em + 8px);
+  color: var(--o-color-info1);
+  font-weight: 500;
+  @media (max-width: 1680px) {
+    font-size: 14px;
   }
-
-  @media (max-width: 840px) {
-    width: 100%;
+  @include respond-to('<=pad_v') {
+    text-align: center;
   }
+}
 
-  .cookie-title {
-    font-size: 16px;
-    line-height: 28px;
-    color: var(--o-color-info1);
-    font-weight: 500;
-    @media (max-width: 840px) {
-      font-size: 16px;
-      line-height: 24px;
-      text-align: center;
-    }
+.cookie-en-title {
+  @include respond-to('<=pad_v') {
+    margin-left: auto;
   }
+}
 
-  .cookie-desc {
+.cookie-zh-title {
+  font-size: 14px;
+  line-height: 22px;
+  margin-right: 8px;
+  text-align: start;
+  @include respond-to('<=pad_v') {
     font-size: 12px;
     line-height: 18px;
-    color: var(--o-color-info2);
-    margin-top: 8px;
   }
 }
 
-.cookie-notice-right {
+.cookie-en-content {
   display: flex;
-  align-items: center;
-  margin-top: 12px;
-
-  @media (max-width: 840px) {
-    width: 100%;
+  width: 100%;
+  margin-top: 8px;
+  @include respond-to('<=pad_v') {
+    flex-direction: column;
   }
+}
 
-  @media (max-width: 840px) {
-    flex-direction: column;
-    align-items: center;
+.cookie-en-desc {
+  font-size: 12px;
+  line-height: 18px;
+  color: var(--o-color-info2);
+  @media (min-width: 1681px) {
+    margin-right: 48px;
+  }
+  @media (1680px >= width >= 1201px) {
+    margin-right: 40px;
+  }
+  @include respond-to('pad') {
+    margin-right: 24px;
+  }
+  @include respond-to('<=pad_v') {
+    margin: 0;
   }
+}
+
+.cookie-notice-right {
+  display: flex;
+  margin-left: auto;
 
   .el-button:not(:first-child) {
     margin-left: 16px;
+    @media (1680px >= width >= 1201px) {
+      margin-left: 12px;
+    }
+    @include respond-to('pad_h') {
+      margin-left: 8px;
+    }
+    @media (min-width: 841px) {
+      margin-left: 12px;
+    }
   }
 
-  @media (max-width: 840px) {
+  @include respond-to('<=pad_v') {
+    margin-top: 16px;
+    width: 100%;
+    display: grid;
+    grid-template-columns: 1fr 1fr;
+    grid-template-rows: auto auto;
+    gap: 12px;
+
     .el-button {
-      align-self: stretch;
-      &:not(:first-child) {
-        margin-top: 12px;
-        margin-left: 0;
+      margin: 0;
+      &:nth-child(1) {
+        grid-column: 1;
+        grid-row: 1;
+      }
+      &:nth-child(2) {
+        grid-column: 2;
+        grid-row: 1;
+      }
+      &:nth-child(3) {
+        grid-column: 1 / span 2;
+        grid-row: 2;
       }
     }
   }
 }
 
 .cookie-notice-close {
-  &[type='en'] {
-    position: absolute;
-    top: 16px;
-    right: var(--layout-content-padding);
-    transform-origin: center;
-  }
+  display: block;
+  overflow: visible !important;
+  margin-left: auto;
   cursor: pointer;
   color: var(--o-color-info1);
-  font-size: 20px;
+  font-size: 24px;
   &:hover {
     color: var(--o-color-primary2);
   }
-  @media (max-width: 840px) {
-    font-size: 14px;
-  }
   @include x-svg-hover;
 }
 
 .cookie-dlg-content {
-  .content-item + .content-item {
-    margin-top: 24px;
-  }
-
   .content-item {
+    margin-top: 24px;
+    @media (1680px >= width >= 1201px) {
+      margin-top: 16px;
+    }
+    @include respond-to('<=pad') {
+      margin-top: 12px;
+    }
+    &:nth-child(2) {
+      .item-detail {
+        font-size: 16px !important;
+        line-height: calc(1em + 8px);
+      }
+    }
     .item-header {
       display: flex;
       align-items: center;
+      justify-content: space-between;
       .item-title {
-        font-size: 18px;
-        line-height: 32px;
+        font-size: 20px;
+        line-height: calc(1em + 8px);
         color: var(--o-color-info1);
         font-weight: 500;
+        @media (1680px >= width >= 1201px) {
+          font-size: 18px;
+        }
+        @include respond-to('<=pad') {
+          font-size: 16px;
+        }
       }
 
       .item-extra {
         font-size: 14px;
-        line-height: 22px;
         color: var(--o-color-info3);
         margin-left: 24px;
+        @include respond-to('<=pad') {
+          font-size: 12px;
+        }
       }
     }
-
     .item-detail {
       font-size: 16px;
-      line-height: 28px;
+      line-height: calc(1em + 8px);
       color: var(--o-color-info2);
-      margin-top: 12px;
-      @media (max-width: 840px) {
+      margin-top: 16px;
+      @media (max-width: 1680px) {
+        margin-top: 12px;
         font-size: 14px;
-        line-height: 21px;
+      }
+      @include respond-to('<=pad') {
         margin-top: 8px;
       }
+      @media (max-width: 840px) {
+        margin-top: 8px;
+      }
+    }
+  }
+}
+
+.dlg-title {
+  font-size: 24px;
+  line-height: calc(1em + 8px);
+  @media (1680px >= width >= 1201px) {
+    font-size: 20px;
+  }
+  @include respond-to('<=pad') {
+    font-size: 18px;
+  }
+}
+
+.dlg-close-icon {
+  font-size: 24px;
+  position: absolute;
+  top: 8px;
+  right: 8px;
+  color: var(--o-color-info1);
+  cursor: pointer;
+  .o-icon-close {
+    width: 1em;
+    height: 1em;
+    transition: all var(--o-duration-m1) var(--o-easing-standard-in);
+  }
+  @include hover {
+    color: var(--o-color-primary2);
+    .o-icon-close {
+      transform: rotate(180deg);
     }
   }
 }
 
 :deep(.el-dialog) {
-  .el-dialog__header {
-    text-align: center;
+  @include respond-to('<=pad_v') {
+    --el-dialog-width: 100vw;
   }
-  .el-dialog__title {
-    font-size: 32px;
-    @media (max-width: 840px) {
-      font-size: 22px;
+  &.grid-width-dlg {
+    @include respond-to('>pad') {
+      --el-dialog-width: var(--grid-14);
     }
+    @include respond-to('pad_h') {
+      --el-dialog-width: var(--grid-8);
+    }
+  }
+}
+
+:deep(.el-dialog) {
+  --el-bg-color: var(--o-color-control-light);
+  --el-dialog-padding-primary: 32px;
+  @include respond-to('laptop') {
+    --el-dialog-padding-primary: 24px;
+  }
+  @include respond-to('pad_h') {
+    --el-dialog-padding-primary: 16px;
+  }
+  @include respond-to('phone') {
+    --el-dialog-padding-primary: 16px 24px;
+  }
+  .el-dialog__header {
+    text-align: center;
+    padding: 0;
   }
   .el-dialog__footer {
     text-align: center;
-    @media (max-width: 840px) {
-      .o-button {
-        margin: 0 8px;
+    padding-top: 0;
+    margin-top: 24px;
+    @media (1680px >= width >= 1201px) {
+      margin-top: 16px;
+    }
+    @include respond-to('<=pad_h') {
+      margin-top: 12px;
+    }
+    .el-button+.el-button {
+      margin-left: 16px;
+      @media (1680px >= width >= 1201px) {
+        margin-left: 12px;
       }
     }
+    .el-button--text {
+      color: var(--o-color-info1);
+    }
   }
 }
 </style>

package/src/components/events/OEventsApply.vue

@@ -214,12 +214,17 @@ defineProps<EventsApplyPropsT>();
             .o-icon {
               font-size: 16px;
               margin-right: var(--o-gap-4);
+              color: #fff;
               @include respond-to('pad_v') {
                 margin-right: var(--o-gap-2);
               }
               @include respond-to('phone') {
                 margin-right: var(--o-gap-2);
               }
+
+              svg path {
+                fill: currentColor;
+              }
             }
 
             span {
@@ -352,6 +357,10 @@ defineProps<EventsApplyPropsT>();
           padding-right: var(--o-gap-4);
         }
 
+        .step-desc {
+          padding-bottom: var(--o-gap-5);
+        }
+
         .img-wrapper {
           width: 226px;
           height: 116px;
@@ -366,6 +375,13 @@ defineProps<EventsApplyPropsT>();
           }
         }
       }
+
+      &.step-5 {
+
+        .step-desc {
+          padding-bottom: var(--o-gap-5);
+        }
+      }
     }
 
     // 卡片1: 第1行第1列

package/src/components/events/OEventsList.vue

@@ -281,6 +281,7 @@ const list = computed(() => {
           position: absolute;
           top: var(--o-gap-3);
           right: var(--o-gap-3);
+          border-radius: var(--o-radius-xs);
           @include respond-to('<=pad_v') {
             --tag-padding: var(--o-gap-1);
           }
@@ -341,6 +342,8 @@ const list = computed(() => {
 
   .o-pagination {
     margin-top: var(--o-gap-6);
+    --pagination-item-bg-color-current: var(--o-color-primary1);
+    --pagination-item-color-current: #fff;
 
     .o-pagination-wrap {
       justify-content: flex-end;