@opendesign-plus-test/components 0.0.1-rc.49 → 0.0.1-rc.50

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (65) hide show
  1. package/dist/chunk-OElCookieNotice.cjs.js +1 -1
  2. package/dist/chunk-OElCookieNotice.es.js +48 -68
  3. package/dist/components/OHeaderSearch.vue.d.ts +534 -814
  4. package/dist/components/OThemeSwitcher.vue.d.ts +2 -5
  5. package/dist/components/activity/index.d.ts +2 -2
  6. package/dist/components/meeting/index.d.ts +3 -3
  7. package/dist/components.cjs.js +42 -42
  8. package/dist/components.css +1 -1
  9. package/dist/components.es.js +10448 -11464
  10. package/dist/index.d.ts +0 -1
  11. package/package.json +4 -6
  12. package/src/assets/styles/element-plus.scss +204 -0
  13. package/src/assets/svg-icons/icon-delete.svg +1 -5
  14. package/src/components/OHeaderSearch.vue +415 -436
  15. package/src/components/OThemeSwitcher.vue +51 -27
  16. package/src/components/activity/OActivityApproval.vue +10 -6
  17. package/src/components/activity/OActivityForm.vue +5 -3
  18. package/src/components/activity/{OMyActivityCalendar.vue → OActivityMyCalendar.vue} +43 -21
  19. package/src/components/activity/index.ts +4 -4
  20. package/src/components/events/OEventsApply.vue +2 -1
  21. package/src/components/events/OEventsCalendar.vue +7 -5
  22. package/src/components/events/OEventsList.vue +6 -4
  23. package/src/components/meeting/OMeetingCalendar.vue +15 -12
  24. package/src/components/meeting/OMeetingForm.vue +16 -10
  25. package/src/components/meeting/{OMyMeetingCalendar.vue → OMeetingMyCalendar.vue} +73 -38
  26. package/src/components/meeting/OMeetingPlayback.vue +32 -8
  27. package/src/components/meeting/{OSigMeetingCalendar.vue → OMeetingSigCalendar.vue} +6 -3
  28. package/src/components/meeting/components/OMeetingCalendarList.vue +3 -3
  29. package/src/components/meeting/components/OMeetingCalendarSelector.vue +1 -1
  30. package/src/components/meeting/components/OMeetingPlaybackSubtitles.vue +10 -9
  31. package/src/components/meeting/components/OMeetingPlaybackVideo.vue +6 -6
  32. package/src/components/meeting/components/{OSigMeetingAside.vue → OMeetingSigAside.vue} +1 -1
  33. package/src/components/meeting/config.ts +1 -1
  34. package/src/components/meeting/index.ts +8 -8
  35. package/src/i18n/en.ts +2 -12
  36. package/src/i18n/zh.ts +0 -10
  37. package/src/index.ts +0 -1
  38. package/vite.config.ts +1 -5
  39. package/dist/components/search/OSearchInput.vue.d.ts +0 -1003
  40. package/dist/components/search/composables/useImageSearch.d.ts +0 -48
  41. package/dist/components/search/composables/useKeywordHighlight.d.ts +0 -2
  42. package/dist/components/search/composables/useSearchHistory.d.ts +0 -14
  43. package/dist/components/search/index.d.ts +0 -590
  44. package/dist/components/search/internal/HighlightText.vue.d.ts +0 -9
  45. package/dist/components/search/internal/SearchImageInput.vue.d.ts +0 -716
  46. package/dist/components/search/internal/SearchPanel.vue.d.ts +0 -100
  47. package/dist/components/search/types.d.ts +0 -20
  48. package/src/assets/svg-icons/icon-delete-hover.svg +0 -4
  49. package/src/assets/svg-icons/icon-image-close.svg +0 -4
  50. package/src/assets/svg-icons/icon-image-upload.svg +0 -3
  51. package/src/assets/svg-icons/icon-image-zoomin.svg +0 -3
  52. package/src/assets/svg-icons/icon-refresh.svg +0 -3
  53. package/src/components/search/OSearchInput.vue +0 -463
  54. package/src/components/search/composables/useImageSearch.ts +0 -157
  55. package/src/components/search/composables/useKeywordHighlight.ts +0 -30
  56. package/src/components/search/composables/useSearchHistory.ts +0 -75
  57. package/src/components/search/index.ts +0 -23
  58. package/src/components/search/internal/HighlightText.vue +0 -37
  59. package/src/components/search/internal/SearchImageInput.vue +0 -488
  60. package/src/components/search/internal/SearchPanel.vue +0 -430
  61. package/src/components/search/types.ts +0 -25
  62. /package/dist/components/activity/{OMyActivityCalendar.vue.d.ts → OActivityMyCalendar.vue.d.ts} +0 -0
  63. /package/dist/components/meeting/{OMyMeetingCalendar.vue.d.ts → OMeetingMyCalendar.vue.d.ts} +0 -0
  64. /package/dist/components/meeting/{OSigMeetingCalendar.vue.d.ts → OMeetingSigCalendar.vue.d.ts} +0 -0
  65. /package/dist/components/meeting/components/{OSigMeetingAside.vue.d.ts → OMeetingSigAside.vue.d.ts} +0 -0
@@ -1,6 +1,6 @@
1
1
  <script lang="ts" setup>
2
- import { Component, computed } from 'vue';
3
- import { OIcon, OSwitch } from '@opensig/opendesign';
2
+ import { computed } from 'vue';
3
+ import { OIcon, OSwitch, OIconSun, OIconMoon } from '@opensig/opendesign';
4
4
  import { useScreen } from '@opendesign-plus/composables';
5
5
 
6
6
  import IconSun from '~icons/components/icon-sun.svg';
@@ -11,8 +11,7 @@ export interface OThemeSwitcherPropsT {
11
11
  type?: 'auto' | 'common' | 'mobile';
12
12
  lightValue?: string;
13
13
  darkValue?: string;
14
- lightIcon?: Component;
15
- darkIcon?: Component;
14
+ disabled?: boolean;
16
15
  }
17
16
 
18
17
  export interface OThemeSwitcherEmitsT {
@@ -25,8 +24,7 @@ const props = withDefaults(defineProps<OThemeSwitcherPropsT>(), {
25
24
  type: 'auto',
26
25
  lightValue: 'light',
27
26
  darkValue: 'dark',
28
- lightIcon: IconSun,
29
- darkIcon: IconMoon,
27
+ disabled: false,
30
28
  });
31
29
 
32
30
  const emit = defineEmits<OThemeSwitcherEmitsT>();
@@ -37,7 +35,7 @@ const switchVal = computed({
37
35
  get() {
38
36
  return props.theme;
39
37
  },
40
- set(val) {
38
+ set(val: string) {
41
39
  emit('update:theme', val);
42
40
  emit('change', val);
43
41
  },
@@ -48,13 +46,17 @@ const isCommon = computed(() => {
48
46
  });
49
47
 
50
48
  const toggleTheme = () => {
49
+ if (props.disabled) {
50
+ return;
51
+ }
52
+
51
53
  switchVal.value = switchVal.value === props.lightValue ? props.darkValue : props.lightValue;
52
54
  };
53
55
  </script>
54
56
 
55
57
  <template>
56
58
  <div class="o-theme-switcher">
57
- <div v-if="isCommon" class="o-theme-switcher-common" @click="toggleTheme">
59
+ <div v-if="isCommon" class="o-theme-switcher-common" :class="{ disabled }" @click="toggleTheme">
58
60
  <OIcon class="o-theme-icon">
59
61
  <IconMoon v-if="switchVal === lightValue" />
60
62
  <IconSun v-else />
@@ -62,16 +64,18 @@ const toggleTheme = () => {
62
64
  </div>
63
65
 
64
66
  <div v-else class="o-theme-switcher-mobile">
65
- <OSwitch v-model="switchVal" class="o-theme-switch" :checked-value="darkValue" :unchecked-value="lightValue">
66
- <template #on>
67
- <OIcon class="o-theme-icon">
68
- <IconSun />
69
- </OIcon>
67
+ <OSwitch v-model="switchVal" class="o-theme-switch" :checked-value="lightValue" :unchecked-value="darkValue" :disabled="disabled">
68
+ <template #inactive>
69
+ <OIconMoon />
70
+ </template>
71
+ <template #active>
72
+ <OIconSun />
70
73
  </template>
71
74
  <template #off>
72
- <OIcon class="o-theme-icon">
73
- <IconMoon />
74
- </OIcon>
75
+ <OIconSun />
76
+ </template>
77
+ <template #on>
78
+ <OIconMoon />
75
79
  </template>
76
80
  </OSwitch>
77
81
  </div>
@@ -80,29 +84,49 @@ const toggleTheme = () => {
80
84
 
81
85
  <style lang="scss" scoped>
82
86
  .o-theme-switcher-common {
83
- cursor: pointer;
84
- width: 20px;
85
- height: 20px;
86
87
  display: flex;
87
88
  align-items: center;
89
+ width: var(--o-icon_size-m);
90
+ height: var(--o-icon_size-m);
91
+ font-size: var(--o-icon_size-m);
92
+
93
+ @include respond-to('pad_h') {
94
+ width: var(--o-icon_size-s);
95
+ height: var(--o-icon_size-s);
96
+ font-size: var(--o-icon_size-s);
97
+ }
98
+ }
99
+
100
+ .o-theme-switcher-common:not(.disabled) {
101
+ cursor: pointer;
88
102
 
89
103
  .o-theme-icon {
90
- font-size: 24px;
91
- color: var(--o-color-info1);
104
+ color: var(--o-color-info2);
92
105
 
93
106
  @include hover {
94
- color: var(--o-color-primary1);
107
+ color: var(--o-color-primary2);
108
+ background-color: var(--o-color-control2-light);
109
+ border-radius: var(--o-radius-xs);
110
+ }
111
+
112
+ &:active {
113
+ color: var(--o-color-primary3);
95
114
  }
96
115
  }
97
116
  }
98
117
 
118
+ .o-theme-switcher-common.disabled {
119
+ cursor: not-allowed;
120
+
121
+ .o-theme-icon {
122
+ color: var(--o-color-info4);
123
+ }
124
+ }
125
+
99
126
  .o-theme-switcher-mobile {
100
127
  .o-theme-switch {
101
- background-color: var(--o-color-control1-light);
102
-
103
- .o-theme-icon {
104
- color: var(--o-color-white);
105
- }
128
+ --switch-handler-color: var(--o-color-white);
129
+ --switch-color: var(--o-color-info4);
106
130
  }
107
131
  }
108
132
  </style>
@@ -569,6 +569,8 @@ const reviewActions = computed<DialogActionT[]>(() => {
569
569
 
570
570
  <style lang="scss">
571
571
  .o-activity-table {
572
+ --activity-card-radius: var(--o-radius-xs);
573
+ --activity-input-radius: var(--o-radius-xs);
572
574
  .table-wrapper {
573
575
  .el-table {
574
576
  border-top: none;
@@ -695,7 +697,7 @@ const reviewActions = computed<DialogActionT[]>(() => {
695
697
  @include text1;
696
698
 
697
699
  .el-table__header-wrapper {
698
- border-radius: 12px 12px 0 0;
700
+ border-radius: var(--activity-card-radius) var(--activity-card-radius) 0 0;
699
701
 
700
702
  .el-table__cell {
701
703
  padding: 12px 0 11px;
@@ -725,7 +727,7 @@ const reviewActions = computed<DialogActionT[]>(() => {
725
727
  }
726
728
 
727
729
  .o-textarea {
728
- --_box-radius: 16px;
730
+ --_box-radius: var(--activity-input-radius);
729
731
  }
730
732
 
731
733
  .dialog-footer {
@@ -756,7 +758,7 @@ const reviewActions = computed<DialogActionT[]>(() => {
756
758
 
757
759
  .o-collapse {
758
760
  padding: 0;
759
- border-radius: 12px;
761
+ border-radius: var(--activity-card-radius);
760
762
 
761
763
  .o-collapse-item {
762
764
  --collapse-item-header-padding: 8px 0 12px;
@@ -826,11 +828,12 @@ const reviewActions = computed<DialogActionT[]>(() => {
826
828
 
827
829
  <style lang="scss">
828
830
  .handle-dialog-approval {
831
+ --activity-card-radius: var(--o-radius-xs);
829
832
  --dlg-width: 450px;
830
- --dlg-radius: var(--o-radius-xs);
833
+ --dlg-radius: var(--activity-card-radius);
831
834
  @include respond('<=pad_v') {
832
835
  width: 100%;
833
- --dlg-radius: var(--o-radius-xs) var(--o-radius-xs) 0 0;
836
+ --dlg-radius: var(--activity-card-radius) var(--activity-card-radius) 0 0;
834
837
  }
835
838
  }
836
839
 
@@ -841,6 +844,7 @@ const reviewActions = computed<DialogActionT[]>(() => {
841
844
  }
842
845
  .review-dialog {
843
846
  --dlg-width: 690px;
847
+ --activity-input-radius: var(--o-radius-xs);
844
848
 
845
849
  .o-form {
846
850
  width: 450px;
@@ -852,7 +856,7 @@ const reviewActions = computed<DialogActionT[]>(() => {
852
856
 
853
857
  .o-textarea {
854
858
  width: 100%;
855
- --_box-radius: var(--o-radius-xs);
859
+ --_box-radius: var(--activity-input-radius);
856
860
  }
857
861
  }
858
862
 
@@ -444,6 +444,8 @@ defineExpose({
444
444
 
445
445
  <style lang="scss">
446
446
  .o-activity-form {
447
+ --activity-card-radius: var(--o-radius-xs);
448
+ --activity-input-radius: var(--o-radius-xs);
447
449
  .form-wrapper {
448
450
  & > .o-form-item {
449
451
  max-width: 620px;
@@ -480,7 +482,7 @@ defineExpose({
480
482
  }
481
483
 
482
484
  .o-textarea {
483
- --_box-radius: var(--o-radius-xs);
485
+ --_box-radius: var(--activity-input-radius);
484
486
  width: 100%;
485
487
  }
486
488
 
@@ -489,7 +491,7 @@ defineExpose({
489
491
  }
490
492
 
491
493
  .el-input__wrapper {
492
- border-radius: var(--o-radius-xs);
494
+ border-radius: var(--activity-input-radius);
493
495
  }
494
496
 
495
497
  .time-config {
@@ -497,7 +499,7 @@ defineExpose({
497
499
  background-color: color-mix(in srgb, var(--o-color-control2-light) 40%, transparent);
498
500
  padding: var(--o-gap-5);
499
501
  padding-right: calc(var(--o-gap-4) + var(--o-gap-5));
500
- border-radius: var(--o-radius-xs);
502
+ border-radius: var(--activity-card-radius);
501
503
  @include respond('<=pad_v') {
502
504
  padding: var(--o-gap-4);
503
505
  }
@@ -21,7 +21,6 @@ import dayjs from 'dayjs';
21
21
  import { useDebounceFn } from '@vueuse/core';
22
22
 
23
23
  import IconCopy from '~icons/meeting/icon-copy.svg';
24
- import IconEvent from '~icons/meeting/icon-event.svg';
25
24
 
26
25
  import type { ActivityItemT, MyActivityCalendarPropsT, ParamsItemT } from './types';
27
26
  import { useScreen } from '@opendesign-plus/composables';
@@ -30,10 +29,12 @@ import { useActivityConfig } from './composables/useActivityConfig';
30
29
  import { CalendarDataType, MeetingItemT, PageParamsT } from '../meeting/types';
31
30
  import OMeetingDetail from '@/components/meeting/components/OMeetingDetail.vue';
32
31
  import { useI18n, Locales } from '@/i18n';
32
+ import { useMeetingConfig } from '@/components/meeting/composables/useMeetingConfig.ts';
33
33
 
34
34
  const { t, locale } = useI18n();
35
35
  const isZh = computed(() => locale.value === Locales.ZH);
36
36
  const { statusMap, activityTypeMap } = useActivityConfig();
37
+ const { getConfig } = useMeetingConfig();
37
38
 
38
39
  const formatMonthYear = (date: string | Date) => {
39
40
  const d = dayjs(date || new Date());
@@ -545,6 +546,9 @@ const deleteActions = computed<DialogActionT[]>(() => {
545
546
  clickable: allDateList.includes(data.day),
546
547
  approved: calcIfApproved(data.day),
547
548
  }"
549
+ :style="{
550
+ '--dot-bg': `${getConfig(CalendarDataType.EVENTS, 'color')}`
551
+ }"
548
552
  >
549
553
  <div class="date-cell-text">
550
554
  {{ Number(data.day.split('-')[2]) }}
@@ -602,9 +606,14 @@ const deleteActions = computed<DialogActionT[]>(() => {
602
606
  >
603
607
  <template #title>
604
608
  <div class="item-header-left">
605
- <div class="act-icon">
609
+ <div
610
+ class="act-icon"
611
+ :style="{
612
+ backgroundColor: `${getConfig(CalendarDataType.EVENTS, 'color')}`
613
+ }"
614
+ >
606
615
  <OIcon>
607
- <IconEvent />
616
+ <component :is="getConfig(CalendarDataType.EVENTS, 'icon')" />
608
617
  </OIcon>
609
618
  </div>
610
619
  <div class="header-info">
@@ -634,7 +643,12 @@ const deleteActions = computed<DialogActionT[]>(() => {
634
643
  </div>
635
644
  <div class="item-header-right"
636
645
  v-if="row.content_url && !row.is_delete && [3,4,5,6].includes(row.status)">
637
- <OLink v-if="row.content_url" :href="row.content_url" target="_blank" rel="noopener noreferrer">
646
+ <OLink
647
+ :hover-underline="false"
648
+ v-if="row.content_url"
649
+ :href="row.content_url"
650
+ target="_blank"
651
+ rel="noopener noreferrer">
638
652
  {{ t('meeting.activityDetail') }}
639
653
  <template #suffix>
640
654
  <OIcon>
@@ -643,6 +657,7 @@ const deleteActions = computed<DialogActionT[]>(() => {
643
657
  </template>
644
658
  </OLink>
645
659
  <OLink
660
+ :hover-underline="false"
646
661
  v-if="
647
662
  row.register_url && (
648
663
  row.status === 3 ||
@@ -735,6 +750,8 @@ const deleteActions = computed<DialogActionT[]>(() => {
735
750
  <style lang="scss">
736
751
 
737
752
  .o-my-activity-calendar {
753
+ --activity-card-radius: var(--o-radius-xs);
754
+ --activity-cell-radius: var(--o-radius-xs);
738
755
  height: 100%;
739
756
  display: flex;
740
757
  flex-direction: column;
@@ -853,9 +870,9 @@ const deleteActions = computed<DialogActionT[]>(() => {
853
870
 
854
871
  .el-calendar {
855
872
  min-height: 460px;
856
- height: calc(100% - 54px);
873
+ height: 100%;
857
874
  background-color: color-mix(in srgb, var(--o-color-control2-light) 40%, transparent);
858
- border-radius: var(--o-radius-xs);
875
+ border-radius: var(--activity-card-radius);
859
876
 
860
877
  .el-calendar__header {
861
878
  border-bottom: 1px solid var(--o-color-control4);
@@ -884,6 +901,7 @@ const deleteActions = computed<DialogActionT[]>(() => {
884
901
 
885
902
  .el-calendar__body {
886
903
  .el-calendar-table {
904
+ display: table;
887
905
  width: 100%;
888
906
 
889
907
  th {
@@ -929,7 +947,7 @@ const deleteActions = computed<DialogActionT[]>(() => {
929
947
  .date-cell-text {
930
948
  font-size: 14px;
931
949
  line-height: 36px;
932
- border-radius: var(--o-radius-xs);
950
+ border-radius: var(--activity-cell-radius);
933
951
  background-color: var(--o-color-control2-light);
934
952
  border: 1px solid transparent;
935
953
  }
@@ -981,7 +999,7 @@ const deleteActions = computed<DialogActionT[]>(() => {
981
999
  }
982
1000
 
983
1001
  &.approved::after {
984
- background-color: rgba(var(--o-cyan-6));
1002
+ background-color: var(--dot-bg);
985
1003
  }
986
1004
 
987
1005
  &.expired::after {
@@ -1194,18 +1212,14 @@ const deleteActions = computed<DialogActionT[]>(() => {
1194
1212
  }
1195
1213
 
1196
1214
  .height-placeholder {
1197
- height: 0;
1198
- transition: margin var(--o-easing-standard) var(--o-duration-s);
1199
- }
1200
-
1201
- .o-collapse-item-expanded + .height-placeholder {
1202
1215
  height: var(--o-gap-4);
1203
1216
  }
1204
1217
 
1205
1218
  .o-collapse-item {
1206
1219
  padding: var(--o-gap-4) var(--o-gap-5);
1220
+ padding-bottom: calc(var(--o-gap-5) - var(--o-gap-4));
1207
1221
  border-top: none;
1208
- border-radius: var(--o-radius-xs);
1222
+ border-radius: var(--activity-card-radius);
1209
1223
  transition: margin var(--o-easing-standard) var(--o-duration-s);
1210
1224
  --copy-display: none;
1211
1225
  --icon-size: 24px;
@@ -1214,6 +1228,9 @@ const deleteActions = computed<DialogActionT[]>(() => {
1214
1228
  }
1215
1229
 
1216
1230
  &:hover {
1231
+ .title-text {
1232
+ color: var(--o-color-primary1);
1233
+ }
1217
1234
  @include respond('>pad_v') {
1218
1235
  --copy-display: inline-flex;
1219
1236
  }
@@ -1224,19 +1241,20 @@ const deleteActions = computed<DialogActionT[]>(() => {
1224
1241
  }
1225
1242
 
1226
1243
  &.o-collapse-item-expanded {
1244
+ border-bottom: none;
1245
+ background-color: color-mix(in srgb, var(--o-color-control2-light) 40%, transparent);
1227
1246
  @include respond('<=pad_v') {
1228
1247
  --copy-display: inline-flex;
1229
1248
  }
1230
- }
1231
-
1232
1249
 
1233
- &.o-collapse-item-expanded {
1234
- background-color: color-mix(in srgb, var(--o-color-control2-light) 40%, transparent);
1250
+ .o-collapse-item-header {
1251
+ border-bottom: 1px solid var(--o-color-control4);
1252
+ }
1235
1253
  }
1236
1254
  }
1237
1255
 
1238
1256
  .o-collapse-item-header {
1239
- border-bottom: 1px solid var(--o-color-control4);
1257
+ border-bottom: none;
1240
1258
  padding-top: 0;
1241
1259
  padding-bottom: var(--o-gap-4);
1242
1260
  display: flex;
@@ -1325,7 +1343,7 @@ const deleteActions = computed<DialogActionT[]>(() => {
1325
1343
 
1326
1344
  .o-tag {
1327
1345
  margin-left: 8px;
1328
- --tag-radius: 4px;
1346
+ --tag-radius: var(--activity-cell-radius);
1329
1347
  font-weight: 500;
1330
1348
  padding: 0 8px;
1331
1349
  height: 24px;
@@ -1368,6 +1386,7 @@ const deleteActions = computed<DialogActionT[]>(() => {
1368
1386
  color: var(--o-color-info3);
1369
1387
  display: flex;
1370
1388
  align-items: center;
1389
+ font-weight: 400;
1371
1390
  @include tip1;
1372
1391
 
1373
1392
  .date-range {
@@ -1386,6 +1405,7 @@ const deleteActions = computed<DialogActionT[]>(() => {
1386
1405
  gap: var(--o-gap-4);
1387
1406
  margin-top: var(--o-gap-2);
1388
1407
  width: 100%;
1408
+ font-weight: 400;
1389
1409
 
1390
1410
  .o-link {
1391
1411
  font-size: 14px;
@@ -1409,6 +1429,7 @@ const deleteActions = computed<DialogActionT[]>(() => {
1409
1429
  height: 18px;
1410
1430
  width: 18px;
1411
1431
  display: var(--copy-display);
1432
+ color: var(--o-color-info1);
1412
1433
  @include respond('phone') {
1413
1434
  bottom: var(--o-gap-2);
1414
1435
  transform: revert;
@@ -1483,8 +1504,9 @@ const deleteActions = computed<DialogActionT[]>(() => {
1483
1504
 
1484
1505
  <style lang="scss">
1485
1506
  .handle-dialog-active {
1507
+ --activity-card-radius: var(--o-radius-xs);
1486
1508
  width: 450px;
1487
- --dlg-radius: var(--o-radius-xs);
1509
+ --dlg-radius: var(--activity-card-radius);
1488
1510
 
1489
1511
  .o-dlg-header {
1490
1512
  margin-bottom: var(--o-gap-5);
@@ -1,6 +1,6 @@
1
1
  import _OActivityForm from './OActivityForm.vue';
2
2
  import _OActivityApproval from './OActivityApproval.vue';
3
- import _OMyActivityCalendar from './OMyActivityCalendar.vue';
3
+ import _OActivityMyCalendar from './OActivityMyCalendar.vue';
4
4
  import type { App } from 'vue';
5
5
 
6
6
 
@@ -14,11 +14,11 @@ const OActivityApproval = Object.assign(_OActivityApproval, {
14
14
  app.component('OActivityApproval', _OActivityApproval);
15
15
  },
16
16
  });
17
- const OMyActivityCalendar = Object.assign(_OMyActivityCalendar, {
17
+ const OActivityMyCalendar = Object.assign(_OActivityMyCalendar, {
18
18
  install(app: App) {
19
- app.component('OMyActivityCalendar', _OMyActivityCalendar);
19
+ app.component('OActivityMyCalendar', OActivityMyCalendar);
20
20
  },
21
21
  });
22
22
 
23
- export { OActivityForm, OActivityApproval, OMyActivityCalendar };
23
+ export { OActivityForm, OActivityApproval, OActivityMyCalendar };
24
24
  export * from './types';
@@ -67,6 +67,7 @@ defineProps<EventsApplyPropsT>();
67
67
 
68
68
  <style lang="scss">
69
69
  .o-events-apply {
70
+ --events-card-radius: var(--o-radius-xs);
70
71
  width: 100%;
71
72
  // 移动端时间线序号
72
73
  .timeline-number {
@@ -126,7 +127,7 @@ defineProps<EventsApplyPropsT>();
126
127
 
127
128
  .step-item {
128
129
  background: var(--o-color-fill2);
129
- border-radius: var(--o-radius-xs);
130
+ border-radius: var(--events-card-radius);
130
131
  display: flex;
131
132
  flex-direction: column; // 垂直排列子元素
132
133
  --idx-size: 20px;
@@ -236,9 +236,11 @@ const getIcon = (item: CalendarItemT) => {
236
236
 
237
237
  <style lang="scss">
238
238
  .o-events-calendar {
239
+ --events-card-radius: var(--o-radius-xs);
240
+ --events-name-radius: var(--o-radius-xs);
239
241
  .month-list {
240
242
  display: flex;
241
- border-radius: var(--o-radius_control-l) var(--o-radius_control-l) 0 0;
243
+ border-radius: var(--events-card-radius) var(--events-card-radius) 0 0;
242
244
  background-color: var(--o-color-control2-light);
243
245
  color: var(--o-color-info1);
244
246
 
@@ -259,12 +261,12 @@ const getIcon = (item: CalendarItemT) => {
259
261
 
260
262
  .o-collapse {
261
263
  --collapse-padding: 0;
262
- --collapse-radius: 0 0 var(--o-radius_control-l) var(--o-radius_control-l);
264
+ --collapse-radius: 0 0 var(--events-card-radius) var(--events-card-radius);
263
265
  @include respond('pad_v') {
264
- --collapse-radius: var(--o-radius_control-l);
266
+ --collapse-radius: var(--events-card-radius);
265
267
  }
266
268
  @include respond('phone') {
267
- --collapse-radius: var(--o-radius_control-l);
269
+ --collapse-radius: var(--events-card-radius);
268
270
  }
269
271
 
270
272
  .o-collapse-item {
@@ -493,7 +495,7 @@ const getIcon = (item: CalendarItemT) => {
493
495
  color: var(--o-color-info1);
494
496
  min-height: 32px;
495
497
  padding: 2px var(--o-gap-2);
496
- border-radius: 4px;
498
+ border-radius: var(--events-name-radius);
497
499
  word-break: normal;
498
500
  overflow-wrap: anywhere;
499
501
  background: linear-gradient(to right, rgba(var(--bg-color), 0.06) 0%, rgba(var(--bg-color), 0.2) 100%), var(--o-color-fill2); // 底层实色背景遮住分割线
@@ -186,13 +186,15 @@ const list = computed(() => {
186
186
 
187
187
  <style lang="scss">
188
188
  .o-events-list {
189
+ --events-card-radius: var(--o-radius-xs);
190
+ --events-tag-radius: var(--o-radius-xs);
189
191
  .filter-wrapper {
190
192
  display: flex;
191
193
  align-items: center;
192
194
  flex-wrap: wrap;
193
195
  justify-content: space-between;
194
196
  background-color: var(--o-color-fill2);
195
- border-radius: var(--o-radius-xs);
197
+ border-radius: var(--events-card-radius);
196
198
  padding: var(--o-gap-5) var(--o-gap-6);
197
199
  gap: var(--o-gap-3) var(--o-gap-2);
198
200
  @include text1;
@@ -221,7 +223,7 @@ const list = computed(() => {
221
223
  .o-toggle {
222
224
  --toggle-size: 32px;
223
225
  --toggle-padding: 3px 15px;
224
- --toggle-radius: 4px;
226
+ --toggle-radius: var(--events-tag-radius);
225
227
  max-height: 32px;
226
228
  --toggle-bg-color: var(--o-color-fill1);
227
229
  --toggle-bg-color-hover: var(--o-color-control2-light);
@@ -316,7 +318,7 @@ const list = computed(() => {
316
318
  position: absolute;
317
319
  top: var(--o-gap-3);
318
320
  right: var(--o-gap-3);
319
- border-radius: var(--o-radius-xs);
321
+ border-radius: var(--events-tag-radius);
320
322
  @include respond('<=pad_v') {
321
323
  --tag-padding: var(--o-gap-1);
322
324
  }
@@ -368,7 +370,7 @@ const list = computed(() => {
368
370
  }
369
371
 
370
372
  .event-card {
371
- border-radius: var(--o-radius-xs);
373
+ border-radius: var(--events-card-radius);
372
374
  color: rgb(var(--o-white));
373
375
  background-size: cover;
374
376
  background-repeat: no-repeat;
@@ -402,11 +402,14 @@ const checkSelectedDay = (type: CalendarDataType, date: string) => {
402
402
  </template>
403
403
  <style lang="scss">
404
404
  .o-meeting-calendar {
405
+ --meeting-card-radius: var(--o-radius-xs);
406
+ --meeting-input-radius: var(--o-radius-xs);
407
+ --meeting-cell-radius: var(--o-radius-xs);
405
408
 
406
409
  .o-select {
407
410
  flex-grow: 1;
408
411
  max-width: 320px;
409
- --select-radius: var(--o-radius-xs);
412
+ --select-radius: var(--meeting-input-radius);
410
413
  }
411
414
 
412
415
  .el-calendar-table {
@@ -417,7 +420,7 @@ const checkSelectedDay = (type: CalendarDataType, date: string) => {
417
420
 
418
421
  .calendar-body {
419
422
  display: flex;
420
- border-radius: var(--o-radius-xs);
423
+ border-radius: var(--meeting-card-radius);
421
424
  background-color: var(--o-color-fill2);
422
425
  overflow: hidden;
423
426
  @include respond('<=pad_v') {
@@ -433,7 +436,7 @@ const checkSelectedDay = (type: CalendarDataType, date: string) => {
433
436
  width: 100%;
434
437
  flex-direction: column;
435
438
  background-color: var(--o-color-fill2);
436
- border-radius: var(--o-radius-xs);
439
+ border-radius: var(--meeting-card-radius);
437
440
  }
438
441
 
439
442
  .el-calendar__header {
@@ -548,13 +551,13 @@ const checkSelectedDay = (type: CalendarDataType, date: string) => {
548
551
  }
549
552
 
550
553
  th:first-child {
551
- border-top-left-radius: var(--o-radius-xs);
552
- border-bottom-left-radius: var(--o-radius-xs);
554
+ border-top-left-radius: var(--meeting-cell-radius);
555
+ border-bottom-left-radius: var(--meeting-cell-radius);
553
556
  }
554
557
 
555
558
  th:last-child {
556
- border-top-right-radius: var(--o-radius-xs);
557
- border-bottom-right-radius: var(--o-radius-xs);
559
+ border-top-right-radius: var(--meeting-cell-radius);
560
+ border-bottom-right-radius: var(--meeting-cell-radius);
558
561
  }
559
562
  }
560
563
  tr:last-child {
@@ -584,7 +587,7 @@ const checkSelectedDay = (type: CalendarDataType, date: string) => {
584
587
 
585
588
  .out-box {
586
589
  position: relative;
587
- border-radius: var(--o-radius-xs);
590
+ border-radius: var(--meeting-cell-radius);
588
591
  padding: 8px 12px;
589
592
  width: 100%;
590
593
  height: 100%;
@@ -709,7 +712,7 @@ const checkSelectedDay = (type: CalendarDataType, date: string) => {
709
712
  height: 24px;
710
713
  width: 40px;
711
714
  background-color: var(--o-color-control3-light);
712
- border-radius: var(--o-radius-l);
715
+ border-radius: var(--meeting-cell-radius);
713
716
  border: 1px solid var(--o-color-primary1);
714
717
  }
715
718
  }
@@ -745,7 +748,7 @@ const checkSelectedDay = (type: CalendarDataType, date: string) => {
745
748
  transform: translate(-50%, -50%);
746
749
  height: 24px;
747
750
  width: 40px;
748
- border-radius: var(--o-radius-l);
751
+ border-radius: var(--meeting-cell-radius);
749
752
  z-index: -1;
750
753
  }
751
754
  }
@@ -762,7 +765,7 @@ const checkSelectedDay = (type: CalendarDataType, date: string) => {
762
765
  padding-top: 16px;
763
766
  background-color: var(--o-color-fill2);
764
767
  width: 100%;
765
- border-radius: var(--o-radius-xs);
768
+ border-radius: var(--meeting-card-radius);
766
769
  }
767
770
  @include respond('phone') {
768
771
 
@@ -780,7 +783,7 @@ const checkSelectedDay = (type: CalendarDataType, date: string) => {
780
783
  margin: 16px 16px 12px;
781
784
  padding: 7px 12px;
782
785
  justify-content: center;
783
- border-radius: var(--o-radius-xs);
786
+ border-radius: var(--meeting-card-radius);
784
787
  background-color: var(--o-color-control4-light);
785
788
  @include text2;
786
789
  }