scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-10 17:36:33 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix label printing and experiment description [SCI-10662]

Browse source
This commit is contained in:
Anton 2024-04-23 14:07:46 +02:00
parent ffbf36e1e8
commit 77f09e5e3c
2 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/label_templates_controller.rb
View file

@ -4,7 +4,7 @@ class LabelTemplatesController < ApplicationController
include InputSanitizeHelper
include TeamsHelper
before_action :check_feature_enabled, except: %i(index zpl_preview)
before_action :check_feature_enabled, except: %i(index zpl_preview list)
before_action :load_label_templates, only: %i(index datatable list)
before_action :load_label_template, only: %i(show set_default update template_tags)
before_action :check_view_permissions, except: %i(create duplicate set_default delete update)

44
app/javascript/vue/experiments/renderers/description.vue
View file

@ -1,32 +1,32 @@
<template>
<div class="group relative flex items-center group-hover:marker text-xs h-full w-full"
:style="{ lineHeight: 'unset' }">
<div class="flex gap-2 w-full"
:style="{ lineHeight: 'unset' }"
:class="{
'items-center text-sm': params.dtComponent.currentViewRender === 'table',
'items-end text-xs': params.dtComponent.currentViewRender === 'cards'
}">
<span v-if="shouldTruncateText"
class="cursor-pointer grow"
:class="{
'line-clamp-1': params.dtComponent.currentViewRender === 'table',
'line-clamp-2': params.dtComponent.currentViewRender === 'cards'
}"
<template v-if="params.dtComponent.currentViewRender === 'table'">
<div class="group relative flex items-center group-hover:marker text-xs h-full w-full leading-[unset]">
<div class="flex gap-2 w-full items-center text-sm leading-[unset]">
<span class="cursor-pointer line-clamp-1 leading-[unset]"
@click.stop="showDescriptionModal"
v-html="params.data.sa_description">
</span>
<span v-else class="grow" v-html="params.data.sa_description"></span>
<span v-if="shouldTruncateText" @click.stop="showDescriptionModal" class="text-sn-blue cursor-pointer shrink-0 inline-block"
:style="{ lineHeight: 'unset' }"
:class="{
'text-xs': params.dtComponent.currentViewRender === 'cards',
'text-sm': params.dtComponent.currentViewRender === 'table'
}">
<span @click.stop="showDescriptionModal" class="text-sn-blue cursor-pointer shrink-0 inline-block text-sm">
{{ i18n.t('experiments.card.more') }}
</span>
</div>
</div>
</template>
<template v-else>
<div class="group relative flex items-center group-hover:marker text-xs h-full w-full">
<div class="flex gap-2 w-full items-end text-xs">
<span v-if="shouldTruncateText"
class="cursor-pointer grow line-clamp-2"
@click.stop="showDescriptionModal"
v-html="params.data.sa_description">
</span>
<span v-else class="grow" v-html="params.data.sa_description"></span>
<span v-if="shouldTruncateText" @click.stop="showDescriptionModal" class="text-sn-blue cursor-pointer shrink-0 inline-block text-xs">
{{ i18n.t('experiments.card.more') }}
</span>
</div>
</div>
</template>
</template>
<script>
@ -39,7 +39,7 @@ export default {
},
computed: {
shouldTruncateText() {
return this.params.data.description?.length > 80;
return this.params.data.description?.length > 60;
}
},
methods: {