@opendesign-plus-test/components 0.0.1-rc.67 → 0.0.1-rc.68

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 (6) hide show
  1. package/dist/components.cjs.js +31 -31
  2. package/dist/components.css +1 -1
  3. package/dist/components.es.js +1840 -1832
  4. package/package.json +1 -1
  5. package/src/components/meeting/components/OMeetingCalendarList.vue +36 -19
  6. package/src/components/meeting/components/OMeetingDetail.vue +10 -5
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@opendesign-plus-test/components",
3
- "version": "0.0.1-rc.67",
3
+ "version": "0.0.1-rc.68",
4
4
  "type": "module",
5
5
  "publishConfig": {
6
6
  "access": "public",
package/src/components/meeting/components/OMeetingCalendarList.vue CHANGED
@@ -95,30 +95,32 @@ const computedList = computed<any[]>(() => {
95
95
  let end_date_time = '';
96
96
  if (type !== CalendarDataType.MEETING) {
97
97
  let activity_type = activityTypeMap.value.get(v.activity_type)?.label;
98
- if (v.start && v.end) {
99
- if (v.end_date === v.start_date) {
100
- dateRange = `${ props.disableFormat ? v.start_date : formatDate(v.start_date) } ${ v.start } - ${ v.end }`;
101
- } else {
102
- dateRange = `${ props.disableFormat ? v.start_date : formatDate(v.start_date) } ${ v.start } - ${ props.disableFormat ? v.end_date : formatDate(v.end_date) } ${ v.end }`;
98
+ if (v.start_date) {
99
+ dateRange = props.disableFormat ? v.start_date : formatDate(v.start_date);
100
+ }
101
+ if (v.start) {
102
+ dateRange += `${ dateRange ? ' ' : '' }${ v.start }`;
103
+ }
104
+ if (v.end_date || v.end) {
105
+ dateRange += `${ dateRange ? ' -' : '' }`;
106
+ if (v.end_date && v.end_date !== v.start_date) {
107
+ dateRange += `${ dateRange ? ' ' : '' }${ props.disableFormat ? v.end_date : formatDate(v.end_date) }`;
103
108
  }
104
- } else {
105
- if (v.start_date === v.end_date) {
106
- dateRange = props.disableFormat ? v.start_date : formatDate(v.start_date);
107
- } else {
108
- dateRange = `${ props.disableFormat ? v.start_date : formatDate(v.start_date) } - ${ props.disableFormat ? v.end_date : formatDate(v.end_date) }`;
109
+ if (v.end) {
110
+ dateRange += `${ dateRange ? ' ' : '' }${ v.end }`;
109
111
  }
110
112
  }
111
113
  if (v.start_date) {
112
114
  start_date_time = props.disableFormat ? v.start_date : formatDate(v.start_date);
113
- if (v.start) {
114
- start_date_time = `${ start_date_time } ${ v.start }`;
115
- }
115
+ }
116
+ if (v.start) {
117
+ start_date_time += `${ start_date_time ? ' ' : '' }${ v.start }`;
116
118
  }
117
119
  if (v.end_date) {
118
120
  end_date_time = props.disableFormat ? v.end_date : formatDate(v.end_date);
119
- if (v.end) {
120
- end_date_time = `${ end_date_time } ${ v.end }`;
121
- }
121
+ }
122
+ if (v.end) {
123
+ end_date_time += `${ start_date_time ? ' ' : '' }${ v.end }`;
122
124
  }
123
125
 
124
126
  return {
@@ -142,12 +144,27 @@ const computedList = computed<any[]>(() => {
142
144
  cycle_interval,
143
145
  cycle_point,
144
146
  } = v;
145
- dateRange = `${ props.disableFormat ? date : formatDate(date) } ${ start } - ${ end }`;
147
+ dateRange = props.disableFormat ? date : formatDate(date);
148
+ if (start && end) {
149
+ dateRange += `${ dateRange ? ' ' : '' } ${ start } - ${ end }`;
150
+ } else if (start || end) {
151
+ dateRange += `${ dateRange ? ' ' : '' } ${ start || end }`;
152
+ }
146
153
  if (is_cycle) {
147
154
  dateRange = `${ props.disableFormat ? cycle_start_date : formatDate(cycle_start_date) } - ${ props.disableFormat ? cycle_end_date : formatDate(cycle_end_date) }`;
148
155
  }
149
156
 
150
- let timeRange = `${ start } - ${ end }`;
157
+ let timeRange = '';
158
+ if (start && end) {
159
+ timeRange = `${ start } - ${ end }`;
160
+ } else {
161
+ if (start) {
162
+ timeRange = start;
163
+ }
164
+ if (end) {
165
+ timeRange = end;
166
+ }
167
+ }
151
168
  let replay_url = null;
152
169
  let hasObsData = false;
153
170
  const obsData = v.obs_data?.filter((v: ObsDataItemT) => v.text_video_url) || [];
@@ -218,7 +235,7 @@ const computedList = computed<any[]>(() => {
218
235
  <span class="start-time">
219
236
  <span>{{ item.dateRange }}</span>
220
237
  </span>
221
- <ODivider direction="v" />
238
+ <ODivider v-if="item.group_name || item.activity_type" direction="v" />
222
239
  <div>
223
240
  <template v-if="item.group_name">{{ i18n.SIG_GROUP }} {{ item.group_name }}</template>
224
241
  <template v-if="item.activity_type">{{ item.activity_type }}</template>
package/src/components/meeting/components/OMeetingDetail.vue CHANGED
@@ -69,7 +69,13 @@ interface ColumnItemT {
69
69
  extra?: string;
70
70
  }
71
71
 
72
- const getField = (key: string) => (props.data as Record<string, any>)[key];
72
+ const getField = (key: string) => {
73
+ const val = (props.data as Record<string, any>)[key];
74
+ if (key === 'register_end_date' && val) {
75
+ return formatDate(val, 'YYYY/MM/DD HH:mm');
76
+ }
77
+ return val;
78
+ };
73
79
 
74
80
  const columns = computed<ColumnItemT[]>(() => {
75
81
  if (props.data.type === CalendarDataType.EVENTS) {
@@ -204,10 +210,9 @@ defineExpose({ copyInfo });
204
210
  overflow: hidden;
205
211
  }
206
212
 
207
- &.type_events {
208
- .label {
209
- width: 6em;
210
- }
213
+ .more-text-wrapper {
214
+ position: relative;
215
+ top: -2px;
211
216
  }
212
217
 
213
218
  .o-link {