@opendesign-plus-test/components 0.0.1-rc.25 → 0.0.1-rc.26
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.
- package/dist/components/activity/types.d.ts +0 -1
- package/dist/components.cjs.js +34 -34
- package/dist/components.css +1 -1
- package/dist/components.es.js +4996 -4956
- package/package.json +1 -1
- package/src/components/activity/OActivityApproval.vue +205 -213
- package/src/components/activity/OActivityForm.vue +2 -2
- package/src/components/activity/OMyActivityCalendar.vue +201 -93
- package/src/components/activity/types.ts +0 -1
- package/src/components/meeting/OMeetingForm.vue +5 -1
- package/src/components/meeting/OMyMeetingCalendar.vue +7 -8
- package/src/components/meeting/components/OMeetingDetail.vue +15 -2
|
@@ -4,6 +4,7 @@ import { computed, ref } from 'vue';
|
|
|
4
4
|
import { MeetingItemT } from '@/components/meeting/types.ts';
|
|
5
5
|
import MoreText from '@/components/common/MoreText.vue';
|
|
6
6
|
import { Locales, useI18n } from '@/i18n';
|
|
7
|
+
import { formatDate } from '@/components/meeting/utils.ts';
|
|
7
8
|
|
|
8
9
|
const props = defineProps<{
|
|
9
10
|
data: MeetingItemT;
|
|
@@ -80,11 +81,11 @@ defineExpose({ copyInfo });
|
|
|
80
81
|
<div
|
|
81
82
|
ref="domRef"
|
|
82
83
|
class="label-item"
|
|
83
|
-
:class="`label-item_${data.id} type_${data.type} `"
|
|
84
|
+
:class="`label-item_${data.id} type_${data.type} ${!data[info.key]?.length ? 'is-empty' : ''}`"
|
|
84
85
|
v-for="(info, infoIdx) in columns"
|
|
85
86
|
:key="infoIdx"
|
|
86
87
|
>
|
|
87
|
-
<template v-if="data[info.key]">
|
|
88
|
+
<template v-if="data[info.key] && !info.isRecord">
|
|
88
89
|
<span class="label">{{ info.label }}<i>{{ isZh ? ':' : ':' }}</i></span>
|
|
89
90
|
<MoreText :show="show" v-if="info.ellipsis" :text="data[info.key] || '-'" />
|
|
90
91
|
<OLink
|
|
@@ -102,6 +103,14 @@ defineExpose({ copyInfo });
|
|
|
102
103
|
{{ data[info.key] || '-' }}
|
|
103
104
|
</span>
|
|
104
105
|
</template>
|
|
106
|
+
<template v-if="info.isRecord && data[info.key]?.length">
|
|
107
|
+
<span class="label">{{ info.label }}{{ isZh ? ':' : ':' }}</span>
|
|
108
|
+
<p v-for="re in data[info.key]" :key="re.create_time" class="value">
|
|
109
|
+
{{ re.reason }}
|
|
110
|
+
{{ formatDate(re.create_time, 'YYYY/MM/DD HH:mm:ss') }}
|
|
111
|
+
审核{{ re.action === 1 ? '通过' : '驳回' }}
|
|
112
|
+
</p>
|
|
113
|
+
</template>
|
|
105
114
|
</div>
|
|
106
115
|
</div>
|
|
107
116
|
|
|
@@ -172,6 +181,10 @@ defineExpose({ copyInfo });
|
|
|
172
181
|
margin-top: var(--o-gap-2);
|
|
173
182
|
}
|
|
174
183
|
|
|
184
|
+
.label-item.is-empty {
|
|
185
|
+
margin: 0;
|
|
186
|
+
}
|
|
187
|
+
|
|
175
188
|
.meeting-action {
|
|
176
189
|
display: flex;
|
|
177
190
|
align-items: center;
|