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

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