mirror of
https://github.com/scinote-eln/scinote-web.git
synced 2025-10-29 07:26:28 +08:00
Merge pull request #8942 from aignatov-bio/ai-sci-12458-fix-details-css
Fix details section css [SCI-12458]
This commit is contained in:
commit
a066d8f7ca
5 changed files with 32 additions and 15 deletions
|
|
@ -7,6 +7,7 @@
|
|||
size="xs"
|
||||
:borderless="true"
|
||||
:optionRenderer="optionRenderer"
|
||||
:oneLineLabel="true"
|
||||
:labelRenderer="optionRenderer"
|
||||
/>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -81,12 +81,13 @@
|
|||
<span class="tw-hidden lg:block ml-2">
|
||||
{{ i18n.t('my_modules.details.start_date') }}
|
||||
</span>
|
||||
<div class="w-48 font-bold">
|
||||
<div class="w-48">
|
||||
<DateTimePicker
|
||||
v-if="myModule.attributes.permissions.manage_due_date"
|
||||
@change="setDueDate"
|
||||
@change="setStartDate"
|
||||
:defaultValue="startDate"
|
||||
mode="datetime"
|
||||
:class="{'font-bold': myModule.attributes.start_date_cell.value_formatted}"
|
||||
size="mb"
|
||||
:noBorder="true"
|
||||
:noIcons="true"
|
||||
|
|
@ -94,9 +95,10 @@
|
|||
:placeholder="i18n.t('my_modules.details.no_start_date_placeholder')"
|
||||
:clearable="true"
|
||||
/>
|
||||
<span v-else class="font-bold ml-2">
|
||||
{{ myModule.attributes.start_date_cell.value_formatted || i18n.t('my_modules.details.no_start_date_placeholder') }}
|
||||
</span>
|
||||
<div v-else class="ml-2 py-2">
|
||||
<span v-if="myModule.attributes.start_date_cell.value_formatted" class="font-bold">{{ myModule.attributes.start_date_cell.value_formatted }}</span>
|
||||
<span v-else class="text-sn-grey">{{ i18n.t('my_modules.details.no_due_date') }}</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="flex items-center">
|
||||
|
|
@ -104,12 +106,13 @@
|
|||
<span class="tw-hidden lg:block ml-2">
|
||||
{{ i18n.t('my_modules.details.due_date') }}
|
||||
</span>
|
||||
<div class="w-48 font-bold">
|
||||
<div class="w-48">
|
||||
<DateTimePicker
|
||||
v-if="myModule.attributes.permissions.manage_due_date"
|
||||
@change="setDueDate"
|
||||
mode="datetime"
|
||||
:defaultValue="dueDate"
|
||||
:class="{'font-bold': myModule.attributes.due_date_cell.value_formatted}"
|
||||
size="mb"
|
||||
:noBorder="true"
|
||||
:noIcons="true"
|
||||
|
|
@ -117,9 +120,10 @@
|
|||
:placeholder="i18n.t('my_modules.details.no_due_date_placeholder')"
|
||||
:clearable="true"
|
||||
/>
|
||||
<span v-else class="font-bold ml-2">
|
||||
{{ myModule.attributes.due_date_cell.value_formatted || i18n.t('my_modules.details.no_due_date_placeholder') }}
|
||||
</span>
|
||||
<div v-else class="ml-2 py-2">
|
||||
<span v-if="myModule.attributes.due_date_cell.value_formatted" class="font-bold">{{ myModule.attributes.due_date_cell.value_formatted }}</span>
|
||||
<span v-else class="text-sn-grey">{{ i18n.t('my_modules.details.no_due_date') }}</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div v-if="myModule.attributes.completed_on" class="flex items-center gap-2 h-10">
|
||||
|
|
@ -135,6 +139,7 @@
|
|||
</span>
|
||||
<div class="grow -mt-2.5">
|
||||
<SelectDropdown
|
||||
v-if="myModule.attributes.permissions.manage_designated_users"
|
||||
@change="setUsers"
|
||||
:options="formattedUsers"
|
||||
:option-renderer="usersRenderer"
|
||||
|
|
@ -146,6 +151,12 @@
|
|||
:placeholder="i18n.t('experiments.canvas.new_my_module_modal.assigned_users_placeholder')"
|
||||
:tagsView="true">
|
||||
</SelectDropdown>
|
||||
<div v-else class="flex items-center flex-wrap gap-2 mt-2.5">
|
||||
<div class="sci-tag bg-sn-super-light-grey" v-for="user in selectedUsers" :key="user.id">
|
||||
<img :src="user.attributes.avatar_url" class="rounded-full w-5 h-5" />
|
||||
<span :title="user.attributes.name" class="truncate">{{ user.attributes.name }}</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="flex gap-2 mb-6 mt-2.5">
|
||||
|
|
@ -214,6 +225,9 @@ export default {
|
|||
{ avatar_url: user.attributes.avatar_url }
|
||||
]
|
||||
));
|
||||
},
|
||||
selectedUsers() {
|
||||
return this.allUsers.filter(user => this.users.includes(parseInt(user.id, 10)));
|
||||
}
|
||||
},
|
||||
created() {
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@
|
|||
@change="changeStatus"
|
||||
size="xs"
|
||||
:borderless="true"
|
||||
:oneLineLabel="true"
|
||||
:optionRenderer="optionRenderer"
|
||||
:labelRenderer="optionRenderer"
|
||||
/>
|
||||
|
|
|
|||
|
|
@ -150,7 +150,8 @@ export default {
|
|||
tagsView: { type: Boolean, default: false },
|
||||
urlParams: { type: Object, default: () => ({}) },
|
||||
e2eValue: { type: String, default: '' },
|
||||
ajaxMethod: { type: String, default: 'get' }
|
||||
ajaxMethod: { type: String, default: 'get' },
|
||||
oneLineLabel: { type: Boolean, default: false }
|
||||
},
|
||||
directives: {
|
||||
'click-outside': vOnClickOutside
|
||||
|
|
@ -181,13 +182,13 @@ export default {
|
|||
sizeStyle() {
|
||||
switch (this.size) {
|
||||
case 'xs':
|
||||
return 'min-height: 36px';
|
||||
return this.oneLineLabel ? 'height: 36px' : 'min-height: 36px';
|
||||
case 'sm':
|
||||
return 'min-height: 40px';
|
||||
return this.oneLineLabel ? 'height: 40px' : 'min-height: 40px';
|
||||
case 'md':
|
||||
return 'min-height: 44px';
|
||||
return this.oneLineLabel ? 'height: 44px' : 'min-height: 44px';
|
||||
default:
|
||||
return 'min-height: 44px';
|
||||
return this.oneLineLabel ? 'height: 44px' : 'min-height: 44px';
|
||||
}
|
||||
},
|
||||
canClear() {
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
<i v-if="canAssign" @click.stop="unlinkTag(tag)" class="sn-icon sn-icon-close"></i>
|
||||
</div>
|
||||
</template>
|
||||
<div v-else-if="!opened" class="sci-tag bg-sn-super-light-grey">
|
||||
<div v-else-if="!opened && canAssign" class="sci-tag bg-sn-super-light-grey">
|
||||
{{ i18n.t('tags.tags_input.add_tag') }}
|
||||
</div>
|
||||
<input v-if="opened"
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue